diff options
| author | Joe Gordon <joe.gordon0@gmail.com> | 2013-05-17 22:01:03 -0700 |
|---|---|---|
| committer | Joe Gordon <joe.gordon0@gmail.com> | 2013-06-11 10:36:39 -0700 |
| commit | b7fe4e206b54f5f43d520c1e9504f268fc1dff9a (patch) | |
| tree | 4858654bf5f34b6d2686df69be095f5f46c32434 /nova/scheduler | |
| parent | 685228d96b7d40f537cf6144014234e24e8cd7fd (diff) | |
| download | nova-b7fe4e206b54f5f43d520c1e9504f268fc1dff9a.tar.gz nova-b7fe4e206b54f5f43d520c1e9504f268fc1dff9a.tar.xz nova-b7fe4e206b54f5f43d520c1e9504f268fc1dff9a.zip | |
Rename functions in nova.compute.flavors from instance_type
Second step in removing references to instance_types. Remove all
references to instance_type in nova.compute.flavors.
Also update compute devref to reflect changed name.
Partially implements bp flavor-instance-type-dedup
renamed: nova/tests/test_instance_types.py -> test_flavors.py
Change-Id: I7413bf832c61d04ab90ec8b1370d3f01372c4172
Diffstat (limited to 'nova/scheduler')
| -rw-r--r-- | nova/scheduler/driver.py | 2 | ||||
| -rw-r--r-- | nova/scheduler/filter_scheduler.py | 2 | ||||
| -rw-r--r-- | nova/scheduler/utils.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py index 4ad6b8513..5fed1e397 100644 --- a/nova/scheduler/driver.py +++ b/nova/scheduler/driver.py @@ -257,7 +257,7 @@ class Scheduler(object): # If dest is not specified, have scheduler pick one. if dest is None: - instance_type = flavors.extract_instance_type(instance_ref) + instance_type = flavors.extract_flavor(instance_ref) if not instance_ref['image_ref']: image = None else: diff --git a/nova/scheduler/filter_scheduler.py b/nova/scheduler/filter_scheduler.py index 186cecc14..08cb6a20e 100644 --- a/nova/scheduler/filter_scheduler.py +++ b/nova/scheduler/filter_scheduler.py @@ -392,7 +392,7 @@ class FilterScheduler(driver.Scheduler): host_state = self.host_manager.host_state_cls(dest, node) host_state.update_from_compute_node(compute) - instance_type = flavors.extract_instance_type(instance_ref) + instance_type = flavors.extract_flavor(instance_ref) filter_properties = {'instance_type': instance_type} hosts = self.host_manager.get_filtered_hosts([host_state], diff --git a/nova/scheduler/utils.py b/nova/scheduler/utils.py index 315f9df2b..d17ab89b2 100644 --- a/nova/scheduler/utils.py +++ b/nova/scheduler/utils.py @@ -28,6 +28,6 @@ def build_request_spec(image, instances): request_spec = { 'image': image, 'instance_properties': instance, - 'instance_type': flavors.extract_instance_type(instance), + 'instance_type': flavors.extract_flavor(instance), 'instance_uuids': [inst['uuid'] for inst in instances]} return request_spec |