diff options
| author | Joe Gordon <jogo@cloudscaling.com> | 2013-05-07 20:08:53 +0000 |
|---|---|---|
| committer | Joe Gordon <jogo@cloudscaling.com> | 2013-05-07 21:41:19 +0000 |
| commit | 3222d8bb021effb3156ed86e263cdc0ac64fd44a (patch) | |
| tree | 748c322d33532f654acee8659ab9cc4725e68d53 /nova/tests/conductor | |
| parent | f917d24bd333e7068ae17cc1027dd8e80896e5a5 (diff) | |
| download | nova-3222d8bb021effb3156ed86e263cdc0ac64fd44a.tar.gz nova-3222d8bb021effb3156ed86e263cdc0ac64fd44a.tar.xz nova-3222d8bb021effb3156ed86e263cdc0ac64fd44a.zip | |
Rename nova.compute.instance_types to flavors
First step in removing references to instance_types. Rename instnace_types.py
and update references to it. We currently use instance_type and flavor as
synonyms, to reduce confusion we are picking one. We are going with our own
terminology, flavors.
renamed: nova/compute/instance_types.py -> nova/compute/flavors.py
Partially implements bp flavor-instance-type-dedup
Change-Id: I9dc04cf311aa8813be4f5329f23729d2c43cae6d
Diffstat (limited to 'nova/tests/conductor')
| -rw-r--r-- | nova/tests/conductor/test_conductor.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py index b3088855a..3780fc7cf 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/conductor/test_conductor.py @@ -17,7 +17,7 @@ import mox from nova.api.ec2 import ec2utils -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import utils as compute_utils from nova.compute import vm_states from nova import conductor @@ -73,7 +73,7 @@ class _BaseTestCase(object): inst['user_id'] = self.user_id inst['project_id'] = self.project_id inst['host'] = 'fake_host' - type_id = instance_types.get_instance_type_by_name(type_name)['id'] + type_id = flavors.get_instance_type_by_name(type_name)['id'] inst['instance_type_id'] = type_id inst['ami_launch_index'] = 0 inst['memory_mb'] = 0 |