From bb2a379e2827ceccc5b46b0a9936e6dcedc6499e Mon Sep 17 00:00:00 2001
From: Ken Pepple <ken.pepple@gmail.com>
Date: Mon, 7 Feb 2011 15:04:26 -0800
Subject: added INSTANCE_TYPES to test for compatibility with current tests

---
 nova/virt/libvirt_conn.py    | 7 +++----
 nova/virt/xenapi/vm_utils.py | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'nova/virt')

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 = {
-- 
cgit