Merge lp:~devcamcar/django-nova/improve_unittests into lp:django-nova

[Devin Carlen]

Results of refactoring view tests and adding mox. Still in progress but merging in what's there to date.

[Devin Carlen (devcamcar)]

approve

review: Approve

[lp:~devcamcar/django-nova/improve_unittests]

11. By Devin Carlen on 2011-01-25

Merged lp:~devcamcar/django-nova/improve_unittests

=== modified file 'buildout.cfg'
--- buildout.cfg	2011-01-12 20:02:06 +0000
+++ buildout.cfg	2011-01-25 23:54:53 +0000
@@ -10,7 +10,7 @@
 
 [django]
 recipe = djangorecipe
-version = 1.2.3
+version = 1.2.4
 project = django_nova
 projectegg = django_nova
 settings = testsettings

=== modified file 'setup.py'
--- setup.py	2011-01-12 20:02:06 +0000
+++ setup.py	2011-01-25 23:54:53 +0000
@@ -15,7 +15,7 @@
     author_email = '[e-mail]',
     packages = find_packages('src'),
     package_dir = {'': 'src'},
-    install_requires = ['setuptools'],
+    install_requires = ['setuptools', 'boto==1.9b', 'mox>=0.5.0'],
     classifiers = [
         'Development Status :: 4 - Beta',
         'Framework :: Django',

=== modified file 'src/django_nova/forms.py'
--- src/django_nova/forms.py	2011-01-16 03:46:33 +0000
+++ src/django_nova/forms.py	2011-01-25 23:54:53 +0000
@@ -49,13 +49,13 @@
 
 def get_instance_choices(project):
     choices = [(i.id, i.id) for i in project.get_instances()]
-    if len(choices) == 0:
+    if not len(choices):
         choices = [('', 'none available')]
     return choices
 
 def get_key_pair_choices(project):
     choices = [(k.name, k.name) for k in project.get_key_pairs()]
-    if len(choices) == 0:
+    if not len(choices):
         choices = [('', 'none available')]
     return choices
 
@@ -68,7 +68,7 @@
 def get_available_volume_choices(project):
     choices = [(v.id, '%s %s - %dGB' % (v.id, v.displayName, v.size)) for v in \
                project.get_volumes() if v.status != "in-use"]
-    if len(choices) == 0:
+    if not len(choices):
         choices = [('', 'none available')]
     return choices
 

=== modified file 'src/django_nova/manager.py'
--- src/django_nova/manager.py	2011-01-15 09:27:24 +0000
+++ src/django_nova/manager.py	2011-01-25 23:54:53 +0000
@@ -87,6 +87,16 @@
         return conn.get_object('UpdateImage', params, boto.ec2.image.Image)
 
     @wrap_nova_error
+    def modify_image_attribute(self, image_id, attribute=None, operation=None,
+                               groups='all'):
+        conn = self.get_nova_connection()
+        return conn.modify_image_attribute(image_id,
+                                           attribute='launchPermission',
+                                           operation='remove',
+                                           groups='all',)
+
+
+    @wrap_nova_error
     def run_instances(self, image_id, **kwargs):
         """
         Runs instances of the specified image id.
@@ -201,7 +211,7 @@
         """
         Indicates whether a security group with the specified name exists in this project.
         """
-        return self.get_security_group(name) != None
+        return self.get_security_group(name) is not None
 
     @wrap_nova_error
     def create_security_group(self, name, description):

=== modified file 'src/django_nova/models.py'
--- src/django_nova/models.py	2011-01-12 20:02:06 +0000
+++ src/django_nova/models.py	2011-01-25 23:54:53 +0000
@@ -107,6 +107,11 @@
     """
     Creates a Nova User when a new Django User is created.
     """
+
+    # NOTE(devcamcar): If running unit tests, don't use a real endpoint.
+    if settings.NOVA_DEFAULT_ENDPOINT == 'none':
+        return
+
     if created:
         nova = get_nova_admin_connection()
         if not nova.has_user(instance.username):

=== modified file 'src/django_nova/shortcuts.py'
--- src/django_nova/shortcuts.py	2011-01-17 06:58:19 +0000
+++ src/django_nova/shortcuts.py	2011-01-25 23:54:53 +0000
@@ -15,6 +15,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
 """
 Helper methods for commonly used operations.
 """
@@ -115,13 +116,13 @@
     user_has_modify_permissions = False
 
     # checks global roles, if user is a sysadmin they can modify image attribtues.
-    if user_has_modify_permissions == False:
+    if not user_has_modify_permissions:
         for role in nova.get_user_roles(username):
             if role.role == "sysadmin":
                 user_has_modify_permissions = True
 
     # checks project roles, if user is a sysadmin they can modify image attribtues.
-    if user_has_modify_permissions == False:
+    if not user_has_modify_permissions:
         for role in nova.get_user_roles(username, project_name):
             if role.role == "sysadmin":
                 user_has_modify_permissions = True

=== added directory 'src/django_nova/tests'
=== added file 'src/django_nova/tests/__init__.py'
--- src/django_nova/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ src/django_nova/tests/__init__.py	2011-01-25 23:54:53 +0000
@@ -0,0 +1,1 @@
+from view_tests import *
\ No newline at end of file

=== added directory 'src/django_nova/tests/templates'
=== added file 'src/django_nova/tests/templates/base-sidebar.html'
=== added file 'src/django_nova/tests/urls.py'
--- src/django_nova/tests/urls.py	1970-01-01 00:00:00 +0000
+++ src/django_nova/tests/urls.py	2011-01-25 23:54:53 +0000
@@ -0,0 +1,32 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""
+URL patterns for testing django-nova views.
+"""
+
+from django.conf.urls.defaults import *
+from django.conf.urls.defaults import *
+
+
+urlpatterns = patterns('',
+    url(r'^projects/', include('django_nova.urls.project')),
+    url(r'^region/', include('django_nova.urls.region')),
+    url(r'^admin/projects/', include('django_nova.urls.admin_project')),
+    url(r'^admin/roles/', include('django_nova.urls.admin_roles')),
+)
\ No newline at end of file

=== added directory 'src/django_nova/tests/view_tests'
=== added file 'src/django_nova/tests/view_tests/__init__.py'
--- src/django_nova/tests/view_tests/__init__.py	1970-01-01 00:00:00 +0000
+++ src/django_nova/tests/view_tests/__init__.py	2011-01-25 23:54:53 +0000
@@ -0,0 +1,3 @@
+from keypair_tests import *
+from image_tests import *
+from instance_tests import *
\ No newline at end of file

=== added file 'src/django_nova/tests/view_tests/base.py'
--- src/django_nova/tests/view_tests/base.py	1970-01-01 00:00:00 +0000
+++ src/django_nova/tests/view_tests/base.py	2011-01-25 23:54:53 +0000
@@ -0,0 +1,51 @@
+import mox
+
+from django import test
+from django.conf import settings
+from django.contrib.auth import models as auth_models
+from django_nova import adminclient
+from django_nova import manager
+from django_nova import shortcuts
+
+
+TEST_PROJECT = 'test'
+TEST_USER = 'test'
+TEST_REGION = 'test'
+
+
+class BaseProjectViewTests(test.TestCase):
+    def setUp(self):
+        project = adminclient.ProjectInfo()
+        project.projectname = TEST_PROJECT
+        project.projectManagerId = TEST_USER
+
+        self.mox = mox.Mox()
+        self.user = auth_models.User.objects.create_user(TEST_USER,
+                                                         '[e-mail]',
+                                                         password='test')
+        login = self.client.login(username=TEST_USER, password='test')
+        self.failUnless(login, 'Unable to login')
+
+        self.region = adminclient.RegionInfo(name=TEST_REGION,
+                                             endpoint='http://test:8773/')
+        self.project = manager.ProjectManager(self.user.username,
+                                              project,
+                                              self.region)
+        self.mox.StubOutWithMock(shortcuts, 'get_project_or_404')
+        shortcuts.get_project_or_404(mox.IgnoreArg(),
+                                     'test').AndReturn(self.project)
+
+    def tearDown(self):
+        self.mox.UnsetStubs()
+
+    def assertRedirectsNoFollow(self, response, expected_url):
+        self.assertEqual(response._headers['location'],
+                         ('Location', settings.TESTSERVER + expected_url))
+        self.assertEqual(response.status_code, 302)
+
+    def create_key_pair_choices(self, key_names):
+        return [(k, k) for k in key_names]
+
+    def create_instance_type_choices(self):
+        return [('m1.medium', 'm1.medium'),
+                ('m1.large', 'm1.large')]

=== added file 'src/django_nova/tests/view_tests/image_tests.py'
--- src/django_nova/tests/view_tests/image_tests.py	1970-01-01 00:00:00 +0000
+++ src/django_nova/tests/view_tests/image_tests.py	2011-01-25 23:54:53 +0000
@@ -0,0 +1,210 @@
+import boto.ec2.image
+import boto.ec2.instance
+import mox
+
+from django.core.urlresolvers import reverse
+from django_nova import forms
+from django_nova import shortcuts
+from django_nova.tests.view_tests.base import BaseProjectViewTests, TEST_PROJECT
+
+
+TEST_IMAGE_ID = 'ami_test'
+TEST_INSTANCE_ID = 'i-abcdefg'
+TEST_KEY = 'foo'
+
+
+class ImageViewTests(BaseProjectViewTests):
+    def setUp(self):
+        self.ami = boto.ec2.image.Image()
+        self.ami.id = TEST_IMAGE_ID
+        setattr(self.ami, 'displayName', TEST_IMAGE_ID)
+        setattr(self.ami, 'description', TEST_IMAGE_ID)
+        super(ImageViewTests, self).setUp()
+
+    def test_index(self):
+        self.mox.StubOutWithMock(self.project, 'get_images')
+        self.mox.StubOutWithMock(forms, 'get_key_pair_choices')
+        self.mox.StubOutWithMock(forms, 'get_instance_type_choices')
+
+        self.project.get_images().AndReturn([])
+        forms.get_key_pair_choices(self.project).AndReturn([])
+        forms.get_instance_type_choices().AndReturn([])
+
+        self.mox.ReplayAll()
+
+        res = self.client.get(reverse('nova_images', args=[TEST_PROJECT]))
+        self.assertEqual(res.status_code, 200)
+        self.assertTemplateUsed(res, 'django_nova/images/index.html')
+        self.assertEqual(len(res.context['image_lists']), 3)
+
+        self.mox.VerifyAll()
+
+    def test_launch_form(self):
+        self.mox.StubOutWithMock(self.project, 'get_image')
+        self.mox.StubOutWithMock(forms, 'get_key_pair_choices')
+        self.mox.StubOutWithMock(forms, 'get_instance_type_choices')
+
+        self.project.get_image(TEST_IMAGE_ID).AndReturn(self.ami)
+        forms.get_key_pair_choices(self.project).AndReturn([])
+        forms.get_instance_type_choices().AndReturn([])
+
+        self.mox.ReplayAll()
+
+        args = [TEST_PROJECT, TEST_IMAGE_ID]
+        res = self.client.get(reverse('nova_images_launch', args=args))
+        self.assertEqual(res.status_code, 200)
+        self.assertTemplateUsed(res, 'django_nova/images/launch.html')
+        self.assertEqual(res.context['ami'].id, TEST_IMAGE_ID)
+
+        self.mox.VerifyAll()
+
+    def test_launch(self):
+        instance = boto.ec2.instance.Instance()
+        instance.id = TEST_INSTANCE_ID
+        instance.image_id = TEST_IMAGE_ID
+        reservation = boto.ec2.instance.Reservation()
+        reservation.instances = [instance]
+
+        self.mox.StubOutWithMock(forms, 'get_key_pair_choices')
+        self.mox.StubOutWithMock(forms, 'get_instance_type_choices')
+        self.mox.StubOutWithMock(self.project, 'run_instances')
+
+        forms.get_key_pair_choices(self.project).AndReturn(
+                self.create_key_pair_choices([TEST_KEY]))
+        forms.get_instance_type_choices().AndReturn(
+                self.create_instance_type_choices())
+        self.project.run_instances(TEST_IMAGE_ID,
+                                   addressing_type=mox.IgnoreArg(),
+                                   key_name=TEST_KEY,
+                                   user_data='',
+                                   instance_type='m1.medium',
+                                   min_count='1',
+                                   max_count='1').AndReturn(reservation)
+        self.mox.ReplayAll()
+
+        url = reverse('nova_images_launch', args=[TEST_PROJECT, TEST_IMAGE_ID])
+        data = {'key_name': TEST_KEY,
+                'count': '1',
+                'size': 'm1.medium',
+                'user_data': ''}
+        res = self.client.post(url, data)
+        self.assertRedirectsNoFollow(res, reverse('nova_instances',
+                                                  args=[TEST_PROJECT]))
+        self.mox.VerifyAll()
+
+    def test_detail(self):
+        self.mox.StubOutWithMock(self.project, 'get_images')
+        self.mox.StubOutWithMock(self.project, 'get_image')
+        self.mox.StubOutWithMock(shortcuts, 'get_user_image_permissions')
+        self.mox.StubOutWithMock(forms, 'get_key_pair_choices')
+        self.mox.StubOutWithMock(forms, 'get_instance_type_choices')
+
+        self.project.get_images().AndReturn([self.ami])
+        self.project.get_image(TEST_IMAGE_ID).AndReturn(self.ami)
+        shortcuts.get_user_image_permissions(mox.IgnoreArg(),
+                                             TEST_PROJECT).AndReturn(True)
+        forms.get_key_pair_choices(self.project).AndReturn(
+            self.create_key_pair_choices([TEST_KEY]))
+        forms.get_instance_type_choices().AndReturn(
+            self.create_instance_type_choices())
+
+        self.mox.ReplayAll()
+
+        res = self.client.get(reverse('nova_images_detail',
+                                      args=[TEST_PROJECT, TEST_IMAGE_ID]))
+        self.assertEqual(res.status_code, 200)
+        self.assertTemplateUsed(res, 'django_nova/images/index.html')
+        self.assertEqual(res.context['ami'].id, TEST_IMAGE_ID)
+
+        self.mox.VerifyAll()
+
+    def test_remove_form(self):
+        self.mox.StubOutWithMock(self.project, 'get_image')
+        self.project.get_image(TEST_IMAGE_ID).AndReturn(self.ami)
+        self.mox.ReplayAll()
+
+        res = self.client.get(reverse('nova_images_remove',
+                                      args=[TEST_PROJECT, TEST_IMAGE_ID]))
+        self.assertEqual(res.status_code, 200)
+        self.assertTemplateUsed(res, 'django_nova/images/detail_list.html')
+        self.assertEqual(res.context['ami'].id, TEST_IMAGE_ID)
+
+        self.mox.VerifyAll()
+
+    def test_remove(self):
+        self.mox.StubOutWithMock(self.project, 'deregister_image')
+        self.project.deregister_image(TEST_IMAGE_ID).AndReturn(True)
+        self.mox.ReplayAll()
+
+        res = self.client.post(reverse('nova_images_remove',
+                                       args=[TEST_PROJECT, TEST_IMAGE_ID]))
+        self.assertRedirectsNoFollow(res, reverse('nova_images',
+                                                       args=[TEST_PROJECT]))
+
+        self.mox.VerifyAll()
+
+    def test_make_public(self):
+        self.mox.StubOutWithMock(self.project, 'get_image')
+        self.mox.StubOutWithMock(self.project, 'modify_image_attribute')
+
+        self.ami.is_public = False
+        self.project.get_image(TEST_IMAGE_ID).AndReturn(self.ami)
+        self.project.modify_image_attribute(TEST_IMAGE_ID,
+                                            attribute='launchPermission',
+                                            operation='add').AndReturn(True)
+        self.mox.ReplayAll()
+
+        res = self.client.post(reverse('nova_images_privacy',
+                                       args=[TEST_PROJECT, TEST_IMAGE_ID]))
+        self.assertRedirectsNoFollow(res, reverse('nova_images_detail',
+                                          args=[TEST_PROJECT, TEST_IMAGE_ID]))
+        self.mox.VerifyAll()
+
+    def test_make_private(self):
+        self.mox.StubOutWithMock(self.project, 'get_image')
+        self.mox.StubOutWithMock(self.project, 'modify_image_attribute')
+
+        self.ami.is_public = True
+        self.project.get_image(TEST_IMAGE_ID).AndReturn(self.ami)
+        self.project.modify_image_attribute(TEST_IMAGE_ID,
+                                            attribute='launchPermission',
+                                            operation='remove').AndReturn(True)
+        self.mox.ReplayAll()
+
+        args = [TEST_PROJECT, TEST_IMAGE_ID]
+        res = self.client.post(reverse('nova_images_privacy', args=args))
+        self.assertRedirectsNoFollow(res, reverse('nova_images_detail',
+                                                  args=args))
+        self.mox.VerifyAll()
+
+    def test_update_form(self):
+        self.mox.StubOutWithMock(self.project, 'get_image')
+        self.project.get_image(TEST_IMAGE_ID).AndReturn(self.ami)
+        self.mox.ReplayAll()
+
+        args = [TEST_PROJECT, TEST_IMAGE_ID]
+        res = self.client.get(reverse('nova_images_update', args=args))
+        self.assertEqual(res.status_code, 200)
+        self.assertTemplateUsed(res, 'django_nova/images/edit.html')
+        self.assertEqual(res.context['ami'].id, TEST_IMAGE_ID)
+
+        self.mox.VerifyAll()
+
+    def test_update(self):
+        self.mox.StubOutWithMock(self.project, 'get_image')
+        self.mox.StubOutWithMock(self.project, 'update_image')
+
+        self.project.get_image(TEST_IMAGE_ID).AndReturn(self.ami)
+        self.project.update_image(TEST_IMAGE_ID, 'test', 'test').AndReturn(True)
+
+        self.mox.ReplayAll()
+
+        args = [TEST_PROJECT, TEST_IMAGE_ID]
+        data = {'nickname': 'test',
+                'description': 'test'}
+        url = reverse('nova_images_update', args=args)
+        res = self.client.post(url, data)
+        expected_url = reverse('nova_images_detail', args=args)
+        self.assertRedirectsNoFollow(res, expected_url)
+
+        self.mox.VerifyAll()

=== added file 'src/django_nova/tests/view_tests/instance_tests.py'
--- src/django_nova/tests/view_tests/instance_tests.py	1970-01-01 00:00:00 +0000
+++ src/django_nova/tests/view_tests/instance_tests.py	2011-01-25 23:54:53 +0000
@@ -0,0 +1,45 @@
+import boto.ec2.instance
+import mox
+
+from django.core.urlresolvers import reverse
+from django_nova.tests.view_tests.base import BaseProjectViewTests, TEST_PROJECT
+
+
+TEST_INSTANCE_ID = 'i-abcdefgh'
+
+
+class InstanceViewTests(BaseProjectViewTests):
+    def test_index(self):
+        self.mox.StubOutWithMock(self.project, 'get_instances')
+        self.project.get_instances().AndReturn([])
+
+        self.mox.ReplayAll()
+
+        res = self.client.get(reverse('nova_instances', args=[TEST_PROJECT]))
+        self.assertEqual(res.status_code, 200)
+        self.assertTemplateUsed(res, 'django_nova/instances/index.html')
+        self.assertEqual(len(res.context['instances']), 0)
+
+        self.mox.VerifyAll()
+
+    def test_detail(self):
+       instance = boto.ec2.instance.Instance()
+       instance.id = TEST_INSTANCE_ID
+       instance.displayName = instance.id
+       instance.displayDescription = instance.id
+
+       self.mox.StubOutWithMock(self.project, 'get_instance')
+       self.project.get_instance(instance.id).AndReturn(instance)
+       self.mox.StubOutWithMock(self.project, 'get_instances')
+       self.project.get_instances().AndReturn([instance])
+
+       self.mox.ReplayAll()
+
+       res = self.client.get(reverse('nova_instances_detail',
+                                     args=[TEST_PROJECT, TEST_INSTANCE_ID]))
+       self.assertEqual(res.status_code, 200)
+       self.assertTemplateUsed(res, 'django_nova/instances/index.html')
+       self.assertEqual(res.context['selected_instance'].id, instance.id)
+
+       self.mox.VerifyAll()
+

=== added file 'src/django_nova/tests/view_tests/keypair_tests.py'
--- src/django_nova/tests/view_tests/keypair_tests.py	1970-01-01 00:00:00 +0000
+++ src/django_nova/tests/view_tests/keypair_tests.py	2011-01-25 23:54:53 +0000
@@ -0,0 +1,71 @@
+import boto.ec2.keypair
+import mox
+
+from django.core.urlresolvers import reverse
+from django_nova.tests.view_tests.base import BaseProjectViewTests, TEST_PROJECT
+
+
+TEST_KEY = 'test_key'
+
+
+class KeyPairViewTests(BaseProjectViewTests):
+    def test_index(self):
+        self.mox.StubOutWithMock(self.project, 'get_key_pairs')
+        self.project.get_key_pairs().AndReturn([])
+
+        self.mox.ReplayAll()
+
+        response = self.client.get(reverse('nova_keypairs',
+                                           args=[TEST_PROJECT]))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'django_nova/keypairs/index.html')
+        self.assertEqual(len(response.context['keypairs']), 0)
+
+        self.mox.VerifyAll()
+
+    def test_add_keypair(self):
+        key = boto.ec2.keypair.KeyPair()
+        key.name = TEST_KEY
+
+        self.mox.StubOutWithMock(self.project, 'create_key_pair')
+        self.project.create_key_pair(key.name).AndReturn(key)
+        self.mox.StubOutWithMock(self.project, 'has_key_pair')
+        self.project.has_key_pair(key.name).AndReturn(False)
+
+        self.mox.ReplayAll()
+
+        url = reverse('nova_keypairs_add', args=[TEST_PROJECT])
+        data = {'js': '0', 'name': key.name}
+        res = self.client.post(url,
+                               data)
+        self.assertEqual(res.status_code, 200)
+        self.assertEqual(res['Content-Type'], 'application/binary')
+
+        self.mox.VerifyAll()
+
+    def test_delete_keypair(self):
+        self.mox.StubOutWithMock(self.project, 'delete_key_pair')
+        self.project.delete_key_pair(TEST_KEY).AndReturn(None)
+
+        self.mox.ReplayAll()
+
+        data = {'key_name': TEST_KEY}
+        url = reverse('nova_keypairs_delete', args=[TEST_PROJECT])
+        res = self.client.post(url, data)
+        self.assertRedirectsNoFollow(res, reverse('nova_keypairs',
+                                                  args=[TEST_PROJECT]))
+
+        self.mox.VerifyAll()
+
+    def test_download_keypair(self):
+        material = 'abcdefgh'
+        session = self.client.session
+        session['key.%s' % TEST_KEY] = material
+        session.save()
+
+        res = self.client.get(reverse('nova_keypairs_download',
+                                      args=['test', TEST_KEY]))
+        self.assertEqual(res.status_code, 200)
+        self.assertEqual(res['Content-Type'], 'application/binary')
+        self.assertContains(res, material)
+

=== modified file 'src/django_nova/testsettings.py'
--- src/django_nova/testsettings.py	2011-01-12 20:02:06 +0000
+++ src/django_nova/testsettings.py	2011-01-25 23:54:53 +0000
@@ -1,5 +1,19 @@
+import os
+
+ROOT_PATH = os.path.dirname(os.path.abspath(__file__))
+DEBUG = True
+TESTSERVER = 'http://testserver'
 DATABASE_ENGINE = 'sqlite3'
 DATABASE_NAME = '/tmp/django-nova.db'
-INSTALLED_APPS = ['django_nova']
-ROOT_URLCONF = ['django_nova.urls']
-
+INSTALLED_APPS = ['django.contrib.auth',
+                  'django.contrib.contenttypes',
+                  'django.contrib.sessions',
+                  'django_nova']
+ROOT_URLCONF = 'django_nova.tests.urls'
+TEMPLATE_DIRS = (
+    os.path.join(ROOT_PATH, 'tests', 'templates')
+)
+NOVA_DEFAULT_ENDPOINT = 'none'
+NOVA_DEFAULT_REGION = 'test'
+NOVA_ACCESS_KEY = 'test'
+NOVA_SECRET_KEY = 'test'

=== modified file 'src/django_nova/views/images.py'
--- src/django_nova/views/images.py	2011-01-24 23:17:58 +0000
+++ src/django_nova/views/images.py	2011-01-25 23:54:53 +0000
@@ -30,8 +30,8 @@
 from django.shortcuts import redirect, render_to_response
 from django_nova import exceptions
 from django_nova import forms
+from django_nova import shortcuts
 from django_nova.exceptions import handle_nova_error
-from django_nova.shortcuts import get_project_or_404, get_user_image_permissions
 
 
 def _image_lists(images, project_id):
@@ -52,7 +52,7 @@
 @login_required
 @handle_nova_error
 def index(request, project_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
     images = project.get_images()
 
     return render_to_response('django_nova/images/index.html', {
@@ -66,7 +66,7 @@
 @login_required
 @handle_nova_error
 def launch(request, project_id, image_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
 
     if request.method == 'POST':
         form = forms.LaunchInstanceForm(project, request.POST)
@@ -107,14 +107,15 @@
 @login_required
 @handle_nova_error
 def detail(request, project_id, image_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
     images = project.get_images()
 
     ami = project.get_image(image_id)
+    can_modify = shortcuts.get_user_image_permissions(request.user.username,
+                                                      project_id)
 
     if not ami:
         raise http.Http404()
-
     return render_to_response('django_nova/images/index.html', {
         'form': forms.LaunchInstanceForm(project),
         'update_form': forms.UpdateImageForm(ami),
@@ -123,14 +124,14 @@
         'images': images,
         'image_lists': _image_lists(images, project_id),
         'ami': ami,
-        'can_modify': get_user_image_permissions(request.user.username, project_id),
+        'can_modify': can_modify,
     }, context_instance = template.RequestContext(request))
 
 
 @login_required
 @handle_nova_error
 def remove(request, project_id, image_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
 
     if request.method == 'POST':
         try:
@@ -159,34 +160,27 @@
 @login_required
 @handle_nova_error
 def privacy(request, project_id, image_id):
-    project = get_project_or_404(request, project_id)
-    conn = project.get_nova_connection()
+    project = shortcuts.get_project_or_404(request, project_id)
 
     if request.method == 'POST':
         ami = project.get_image(image_id)
 
         if ami.is_public:
-            # TODO(devcamcar): create a wrapper in manager.ProjectManager
-            # for modifying image attributes.
             try:
-                conn.modify_image_attribute(image_id,
-                                            attribute='launchPermission',
-                                            operation='remove',
-                                            groups='all',)
-            except boto.exception.EC2ResponseError, e:
+                project.modify_image_attribute(image_id,
+                                               attribute='launchPermission',
+                                               operation='remove')
+            except exceptions.NovaApiError, e:
                 messages.error(request,
-                               'Unable to make image private: %s - %s' %
-                               (e.code, e.message,))
+                               'Unable to make image private: %s' % e.message)
         else:
             try:
-                conn.modify_image_attribute(image_id,
-                                            attribute='launchPermission',
-                                            operation='add',
-                                            groups='all')
-            except boto.exception.EC2ResponseError, e:
+                project.modify_image_attribute(image_id,
+                                               attribute='launchPermission',
+                                               operation='add')
+            except exceptions.NovaApiError, e:
                 messages.error(request,
-                               'Unable to make image public: %s - %s' %
-                               (e.code, e.message,))
+                               'Unable to make image public: %s' % e.message)
 
     return redirect('nova_images_detail', project_id, image_id)
 
@@ -194,7 +188,7 @@
 @login_required
 @handle_nova_error
 def update(request, project_id, image_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
     ami = project.get_image(image_id)
 
     if request.method == 'POST':
@@ -221,7 +215,6 @@
                 'form': form,
                 'region': project.region,
                 'project': project,
-                'project_list': project_list,
                 'ami': ami,
             }, context_instance = template.RequestContext(request))
     else:

=== modified file 'src/django_nova/views/instances.py'
--- src/django_nova/views/instances.py	2011-01-18 23:07:26 +0000
+++ src/django_nova/views/instances.py	2011-01-25 23:54:53 +0000
@@ -27,14 +27,14 @@
 from django.shortcuts import redirect, render_to_response
 from django_nova import exceptions
 from django_nova import forms as nova_forms
+from django_nova import shortcuts
 from django_nova.exceptions import handle_nova_error
-from django_nova.shortcuts import get_project_or_404
 
 
 @login_required
 @handle_nova_error
 def index(request, project_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
     instances = sorted(project.get_instances(), key=lambda k: k.public_dns_name)
 
     return render_to_response('django_nova/instances/index.html', {
@@ -48,7 +48,7 @@
 @login_required
 @handle_nova_error
 def detail(request, project_id, instance_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
     instance = project.get_instance(instance_id)
     instances = sorted(project.get_instances(), key=lambda k: k.public_dns_name)
 
@@ -68,7 +68,7 @@
 @login_required
 @handle_nova_error
 def performance(request, project_id, instance_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
     instance = project.get_instance(instance_id)
 
     if not instance:
@@ -88,7 +88,7 @@
     if not request.user.is_authenticated():
         return http.HttpResponseForbidden()
 
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
     instances = sorted(project.get_instances(), key=lambda k: k.public_dns_name)
 
     return render_to_response('django_nova/instances/_instances_list.html', {
@@ -103,7 +103,7 @@
     if not request.user.is_authenticated():
         return http.HttpResponseForbidden()
 
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
     instance = project.get_instance(instance_id)
     instances = sorted(project.get_instances(), key=lambda k: k.public_dns_name)
 
@@ -117,7 +117,7 @@
 @login_required
 @handle_nova_error
 def terminate(request, project_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
 
     if request.method == 'POST':
         instance_id = request.POST['instance_id']
@@ -138,7 +138,7 @@
 @login_required
 @handle_nova_error
 def console(request, project_id, instance_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
     conn = project.get_nova_connection()
     console = conn.get_console_output(instance_id)
     response = http.HttpResponse(mimetype='text/plain')
@@ -151,7 +151,7 @@
 @login_required
 @handle_nova_error
 def graph(request, project_id, instance_id, graph_name):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
     graph = project.get_instance_graph(instance_id, graph_name)
 
     if graph is None:
@@ -166,10 +166,10 @@
 @login_required
 @handle_nova_error
 def update(request, project_id, instance_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
     instance = project.get_instance(instance_id)
 
-    if instance is None:
+    if not instance:
         raise http.Http404()
 
     if request.method == 'POST':

=== modified file 'src/django_nova/views/keypairs.py'
--- src/django_nova/views/keypairs.py	2011-01-18 23:07:26 +0000
+++ src/django_nova/views/keypairs.py	2011-01-25 23:54:53 +0000
@@ -27,14 +27,14 @@
 from django.shortcuts import redirect, render_to_response
 from django_nova import exceptions
 from django_nova import forms
+from django_nova import shortcuts
 from django_nova.exceptions import handle_nova_error
-from django_nova.shortcuts import get_project_or_404
 
 
 @login_required
 @handle_nova_error
 def index(request, project_id, download_key=None):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
     keypairs = project.get_key_pairs()
 
     return render_to_response('django_nova/keypairs/index.html', {
@@ -48,7 +48,7 @@
 @login_required
 @handle_nova_error
 def add(request, project_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
 
     if request.method == 'POST':
         form = forms.CreateKeyPairForm(project, request.POST)
@@ -87,7 +87,7 @@
 @login_required
 @handle_nova_error
 def delete(request, project_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
 
     if request.method == 'POST':
         key_name = request.POST['key_name']
@@ -108,7 +108,7 @@
 @handle_nova_error
 def download(request, project_id, key_name):
     # Ensure the project exists.
-    get_project_or_404(request, project_id)
+    shortcuts.get_project_or_404(request, project_id)
 
     try:
         material = request.session.pop('key.%s' % key_name)