added INSTANCE_TYPES to test for compatibility with current tests

7 files changed, 25 insertions, 24 deletions

diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index d38d76ded..0e20982e3 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -28,12 +28,12 @@ from nova import exception
 
 FLAGS = flags.FLAGS
 # FIXME(kpepple) for dynamic flavors
-INSTANCE_TYPES = {
-    'm1.tiny': dict(memory_mb=512, vcpus=1, local_gb=0, flavorid=1),
-    'm1.small': dict(memory_mb=2048, vcpus=1, local_gb=20, flavorid=2),
-    'm1.medium': dict(memory_mb=4096, vcpus=2, local_gb=40, flavorid=3),
-    'm1.large': dict(memory_mb=8192, vcpus=4, local_gb=80, flavorid=4),
-    'm1.xlarge': dict(memory_mb=16384, vcpus=8, local_gb=160, flavorid=5)}
+# INSTANCE_TYPES = {
+#     'm1.tiny': dict(memory_mb=512, vcpus=1, local_gb=0, flavorid=1),
+#     'm1.small': dict(memory_mb=2048, vcpus=1, local_gb=20, flavorid=2),
+#     'm1.medium': dict(memory_mb=4096, vcpus=2, local_gb=40, flavorid=3),
+#     'm1.large': dict(memory_mb=8192, vcpus=4, local_gb=80, flavorid=4),
+#     'm1.xlarge': dict(memory_mb=16384, vcpus=8, local_gb=160, flavorid=5)}
 
 
 def get_all_types():
diff --git a/nova/test.py b/nova/test.py
index 881baccd5..cd049f007 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -44,6 +44,14 @@ flags.DEFINE_bool('fake_tests', True,
                   'should we use everything for testing')
 
 
+INSTANCE_TYPES = {
+    'm1.tiny': dict(memory_mb=512, vcpus=1, local_gb=0, flavorid=1),
+    'm1.small': dict(memory_mb=2048, vcpus=1, local_gb=20, flavorid=2),
+    'm1.medium': dict(memory_mb=4096, vcpus=2, local_gb=40, flavorid=3),
+    'm1.large': dict(memory_mb=8192, vcpus=4, local_gb=80, flavorid=4),
+    'm1.xlarge': dict(memory_mb=16384, vcpus=8, local_gb=160, flavorid=5)}
+
+
 def skip_if_fake(func):
     """Decorator that skips a test if running in fake mode"""
     def _skipper(*args, **kw):
diff --git a/nova/tests/db/fakes.py b/nova/tests/db/fakes.py
index 3aa7fcd22..d9a5032ee 100644
--- a/nova/tests/db/fakes.py
+++ b/nova/tests/db/fakes.py
@@ -20,6 +20,7 @@
 import time
 
 from nova import db
+from nova import test
 from nova import utils
 from nova.compute import instance_types
 
@@ -44,10 +45,7 @@ def stub_out_db_instance_api(stubs):
     def fake_instance_create(values):
         """ Stubs out the db.instance_create method """
 
-        # FIXME(kpepple) for dynamic flavors
-        type_data = instance_types.INSTANCE_TYPES[values['instance_type']]
-        # type_data = db.instance_type_get_by_name(context,\
-        #                                                 instance_type)
+        type_data = test.INSTANCE_TYPES[values['instance_type']]
 
         base_options = {
             'name': values['name'],
diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py
index c70803e05..4206ca416 100644
--- a/nova/tests/test_quota.py
+++ b/nova/tests/test_quota.py
@@ -75,20 +75,17 @@ class QuotaTestCase(test.TestCase):
 
     def test_quota_overrides(self):
         """Make sure overriding a projects quotas works"""
-        # FIXME(kpepple) for dynamic flavors
         num_instances = quota.allowed_instances(self.context, 100,
-            instance_types.INSTANCE_TYPES['m1.small'])
+            test.INSTANCE_TYPES['m1.small'])
         self.assertEqual(num_instances, 2)
         db.quota_create(self.context, {'project_id': self.project.id,
                                        'instances': 10})
-        # FIXME(kpepple) for dynamic flavors
         num_instances = quota.allowed_instances(self.context, 100,
-            instance_types.INSTANCE_TYPES['m1.small'])
+            test.INSTANCE_TYPES['m1.small'])
         self.assertEqual(num_instances, 4)
         db.quota_update(self.context, self.project.id, {'cores': 100})
-        # FIXME(kpepple) for dynamic flavors
         num_instances = quota.allowed_instances(self.context, 100,
-            instance_types.INSTANCE_TYPES['m1.small'])
+            test.INSTANCE_TYPES['m1.small'])
         self.assertEqual(num_instances, 10)
         db.quota_destroy(self.context, self.project.id)
 
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 1d42f8da3..d8611ea10 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -225,8 +225,7 @@ class XenAPIVMTestCase(test.TestCase):
         vm = vms[0]
 
         # Check that m1.large above turned into the right thing.
-        # FIXME(kpepple) for dynamic flavors
-        instance_type = instance_types.INSTANCE_TYPES['m1.large']
+        instance_type = test.INSTANCE_TYPES['m1.large']
         mem_kib = long(instance_type['memory_mb']) << 10
         mem_bytes = str(mem_kib << 10)
         vcpus = instance_type['vcpus']
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index e66115464..94fe93c40 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -55,6 +55,7 @@ from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
+from nova import test
 from nova import utils
 #from nova.api import context
 from nova.auth import manager
@@ -611,8 +612,7 @@ class LibvirtConnection(object):
                           user=user,
                           project=project,
                           size=size)
-        # FIXME(kpepple) for dynamic flavors
-        type_data = instance_types.INSTANCE_TYPES[inst['instance_type']]
+        type_data = test.INSTANCE_TYPES[inst['instance_type']]
 
         if type_data['local_gb']:
             self._cache_image(fn=self._create_local,
@@ -672,9 +672,8 @@ class LibvirtConnection(object):
         network = db.network_get_by_instance(context.get_admin_context(),
                                              instance['id'])
         # FIXME(vish): stick this in db
-        # FIXME(kpepple) for dynamic flavors
         instance_type = instance['instance_type']
-        instance_type = instance_types.INSTANCE_TYPES[instance_type]
+        instance_type = test.INSTANCE_TYPES[instance_type]
         ip_address = db.instance_get_fixed_address(context.get_admin_context(),
                                                    instance['id'])
         # Assume that the gateway also acts as the dhcp server.
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 3f0112609..38a6f73ce 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -31,6 +31,7 @@ import glance.client
 from nova import exception
 from nova import flags
 from nova import log as logging
+from nova import test
 from nova import utils
 from nova.auth.manager import AuthManager
 from nova.compute import instance_types
@@ -82,8 +83,7 @@ class VMHelper(HelperBase):
         the pv_kernel flag indicates whether the guest is HVM or PV
         """
 
-        # FIXME(kpepple) for dynamic flavors
-        instance_type = instance_types.INSTANCE_TYPES[instance.instance_type]
+        instance_type = test.INSTANCE_TYPES[instance.instance_type]
         mem = str(long(instance_type['memory_mb']) * 1024 * 1024)
         vcpus = str(instance_type['vcpus'])
         rec = {