From b7fe4e206b54f5f43d520c1e9504f268fc1dff9a Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Fri, 17 May 2013 22:01:03 -0700 Subject: 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 --- nova/virt/baremetal/pxe.py | 2 +- nova/virt/baremetal/tilera.py | 2 +- nova/virt/hyperv/imagecache.py | 2 +- nova/virt/libvirt/blockinfo.py | 2 +- nova/virt/libvirt/driver.py | 2 +- nova/virt/powervm/blockdev.py | 2 +- nova/virt/powervm/driver.py | 2 +- nova/virt/xenapi/vm_utils.py | 6 +++--- nova/virt/xenapi/vmops.py | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'nova/virt') diff --git a/nova/virt/baremetal/pxe.py b/nova/virt/baremetal/pxe.py index 4c63f2b07..6a5a5ece5 100644 --- a/nova/virt/baremetal/pxe.py +++ b/nova/virt/baremetal/pxe.py @@ -174,7 +174,7 @@ def get_pxe_config_file_path(instance): def get_partition_sizes(instance): - instance_type = flavors.extract_instance_type(instance) + instance_type = flavors.extract_flavor(instance) root_mb = instance_type['root_gb'] * 1024 swap_mb = instance_type['swap'] diff --git a/nova/virt/baremetal/tilera.py b/nova/virt/baremetal/tilera.py index 7906fdddd..64335298c 100755 --- a/nova/virt/baremetal/tilera.py +++ b/nova/virt/baremetal/tilera.py @@ -108,7 +108,7 @@ def get_tilera_nfs_path(node_id): def get_partition_sizes(instance): - instance_type = flavors.extract_instance_type(instance) + instance_type = flavors.extract_flavor(instance) root_mb = instance_type['root_gb'] * 1024 swap_mb = instance_type['swap'] diff --git a/nova/virt/hyperv/imagecache.py b/nova/virt/hyperv/imagecache.py index 85588a769..8f29a62dc 100644 --- a/nova/virt/hyperv/imagecache.py +++ b/nova/virt/hyperv/imagecache.py @@ -52,7 +52,7 @@ class ImageCache(object): def _get_root_vhd_size_gb(self, instance): try: # In case of resizes we need the old root disk size - old_instance_type = flavors.extract_instance_type( + old_instance_type = flavors.extract_flavor( instance, prefix='old_') return old_instance_type['root_gb'] except KeyError: diff --git a/nova/virt/libvirt/blockinfo.py b/nova/virt/libvirt/blockinfo.py index 39b6292b1..3e9e359e6 100644 --- a/nova/virt/libvirt/blockinfo.py +++ b/nova/virt/libvirt/blockinfo.py @@ -300,7 +300,7 @@ def get_disk_mapping(virt_type, instance, Returns the guest disk mapping for the devices.""" - inst_type = flavors.extract_instance_type(instance) + inst_type = flavors.extract_flavor(instance) mapping = {} diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index c0cec7a43..91d5b1a50 100755 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -1798,7 +1798,7 @@ class LibvirtDriver(driver.ComputeDriver): user_id=instance['user_id'], project_id=instance['project_id']) - inst_type = flavors.extract_instance_type(instance) + inst_type = flavors.extract_flavor(instance) # NOTE(ndipanov): Even if disk_mapping was passed in, which # currently happens only on rescue - we still don't want to diff --git a/nova/virt/powervm/blockdev.py b/nova/virt/powervm/blockdev.py index 73099b148..9f567b746 100644 --- a/nova/virt/powervm/blockdev.py +++ b/nova/virt/powervm/blockdev.py @@ -177,7 +177,7 @@ class PowerVMLocalVolumeAdapter(PowerVMDiskAdapter): # calculate root device size in bytes # we respect the minimum root device size in constants - instance_type = flavors.extract_instance_type(instance) + instance_type = flavors.extract_flavor(instance) size_gb = max(instance_type['root_gb'], constants.POWERVM_MIN_ROOT_GB) size = size_gb * 1024 * 1024 * 1024 diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py index 5117bdf72..58c0d5f09 100755 --- a/nova/virt/powervm/driver.py +++ b/nova/virt/powervm/driver.py @@ -290,7 +290,7 @@ class PowerVMDriver(driver.ComputeDriver): """ lpar_obj = self._powervm._create_lpar_instance(instance, network_info) - instance_type = flavors.extract_instance_type(instance) + instance_type = flavors.extract_flavor(instance) new_lv_size = instance_type['root_gb'] old_lv_size = disk_info['old_lv_size'] if 'root_disk_file' in disk_info: diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 0c54dc1dd..9c8c73ba9 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -213,7 +213,7 @@ def create_vm(session, instance, name_label, kernel, ramdisk, 3. Using hardware virtualization """ - instance_type = flavors.extract_instance_type(instance) + instance_type = flavors.extract_flavor(instance) mem = str(long(instance_type['memory_mb']) * 1024 * 1024) vcpus = str(instance_type['vcpus']) @@ -326,7 +326,7 @@ def is_vm_shutdown(session, vm_ref): def ensure_free_mem(session, instance): - instance_type = flavors.extract_instance_type(instance) + instance_type = flavors.extract_flavor(instance) mem = long(instance_type['memory_mb']) * 1024 * 1024 host = session.get_xenapi_host() host_free_mem = long(session.call_xenapi("host.compute_free_memory", @@ -1194,7 +1194,7 @@ def _get_vdi_chain_size(session, vdi_uuid): def _check_vdi_size(context, session, instance, vdi_uuid): - instance_type = flavors.extract_instance_type(instance) + instance_type = flavors.extract_flavor(instance) allowed_size = instance_type['root_gb'] * (1024 ** 3) if not allowed_size: diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index e178d08fd..90ca3cbed 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -577,7 +577,7 @@ class VMOps(object): def _attach_disks(self, instance, vm_ref, name_label, vdis, disk_image_type, admin_password=None, files=None): ctx = nova_context.get_admin_context() - instance_type = flavors.extract_instance_type(instance) + instance_type = flavors.extract_flavor(instance) # Attach (required) root disk if disk_image_type == vm_utils.ImageType.DISK_ISO: @@ -702,7 +702,7 @@ class VMOps(object): agent.resetnetwork() # Set VCPU weight - instance_type = flavors.extract_instance_type(instance) + instance_type = flavors.extract_flavor(instance) vcpu_weight = instance_type['vcpu_weight'] if vcpu_weight is not None: LOG.debug(_("Setting VCPU weight"), instance=instance) -- cgit