Manager tests

port of lp:~tiramisu/openstack-dashboard/dashboard_manager_tests

.gitignore

@@ -0,0 +1,13 @@
+*.pyc
+django-openstack/.installed.cfg
+django-openstack/bin
+django-openstack/develop-eggs/
+django-openstack/downloads/
+django-openstack/eggs/
+django-openstack/parts/
+django-openstack/src/django_nova.egg-info
+django-openstack/src/django_openstack.egg-info
+django-nova-syspanel/src/django_nova_syspanel.egg-info
+openstack-dashboard/.dashboard-venv
+openstack-dashboard/local/dashboard_openstack.sqlite3
+openstack-dashboard/local/local_settings.py

django-openstack/src/django_openstack/nova/manager.py

@@ -24,7 +24,7 @@
 import boto.exception
 import boto.s3
 from django.conf import settings
-from django_openstack.core.connection import get_nova_admin_connection
+from django_openstack.core import connection
 from django_openstack.nova.exceptions import wrap_nova_error
 
 
@@ -39,7 +39,7 @@ def get_openstack_connection(self):
         """
         Returns a boto connection for a user's project.
         """
-        openstack = get_nova_admin_connection()
+        openstack = connection.get_nova_admin_connection()
         return openstack.connection_for(self.username,
                                    self.projectname,
                                    clc_url=self.region['endpoint'],
@@ -50,7 +50,7 @@ def get_zip(self):
         Returns a buffer of a zip file containing signed credentials
         for the project's Nova user.
         """
-        openstack = get_nova_admin_connection()
+        openstack = connection.get_nova_admin_connection()
         return openstack.get_zip(self.username, self.projectname)
 
     def get_images(self, image_ids=None):

django-openstack/src/django_openstack/nova/tests/__init__.py

@@ -2,5 +2,6 @@
 from image_tests import *
 from instance_tests import *
 from keypair_tests import *
+from manager_tests import *
 from region_tests import *
 from volume_tests import *