From 3222d8bb021effb3156ed86e263cdc0ac64fd44a Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Tue, 7 May 2013 20:08:53 +0000 Subject: 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 --- nova/virt/baremetal/pxe.py | 4 ++-- nova/virt/baremetal/tilera.py | 4 ++-- nova/virt/hyperv/imagecache.py | 4 ++-- nova/virt/libvirt/blockinfo.py | 4 ++-- nova/virt/libvirt/driver.py | 4 ++-- nova/virt/powervm/blockdev.py | 4 ++-- nova/virt/powervm/driver.py | 4 ++-- nova/virt/xenapi/vm_utils.py | 10 +++++----- nova/virt/xenapi/vmops.py | 6 +++--- 9 files changed, 22 insertions(+), 22 deletions(-) (limited to 'nova/virt') diff --git a/nova/virt/baremetal/pxe.py b/nova/virt/baremetal/pxe.py index 795099ebc..4c63f2b07 100644 --- a/nova/virt/baremetal/pxe.py +++ b/nova/virt/baremetal/pxe.py @@ -25,7 +25,7 @@ import os from oslo.config import cfg -from nova.compute import instance_types +from nova.compute import flavors from nova import exception from nova.openstack.common.db import exception as db_exc from nova.openstack.common import fileutils @@ -174,7 +174,7 @@ def get_pxe_config_file_path(instance): def get_partition_sizes(instance): - instance_type = instance_types.extract_instance_type(instance) + instance_type = flavors.extract_instance_type(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 c926817cd..d9a065bf1 100755 --- a/nova/virt/baremetal/tilera.py +++ b/nova/virt/baremetal/tilera.py @@ -24,7 +24,7 @@ import os from oslo.config import cfg -from nova.compute import instance_types +from nova.compute import flavors from nova import exception from nova.openstack.common.db import exception as db_exc from nova.openstack.common import fileutils @@ -117,7 +117,7 @@ def get_tilera_nfs_path(node_id): def get_partition_sizes(instance): - instance_type = instance_types.extract_instance_type(instance) + instance_type = flavors.extract_instance_type(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 5d68bab61..2e28dc9db 100644 --- a/nova/virt/hyperv/imagecache.py +++ b/nova/virt/hyperv/imagecache.py @@ -19,7 +19,7 @@ Image caching and management. """ import os -from nova.compute import instance_types +from nova.compute import flavors from nova.openstack.common import excutils from nova.openstack.common import lockutils from nova.openstack.common import log as logging @@ -51,7 +51,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 = instance_types.extract_instance_type( + old_instance_type = flavors.extract_instance_type( 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 8f1e72ab0..39b6292b1 100644 --- a/nova/virt/libvirt/blockinfo.py +++ b/nova/virt/libvirt/blockinfo.py @@ -68,7 +68,7 @@ variables / types used from oslo.config import cfg from nova import block_device -from nova.compute import instance_types +from nova.compute import flavors from nova import exception from nova.virt import configdrive from nova.virt import driver @@ -300,7 +300,7 @@ def get_disk_mapping(virt_type, instance, Returns the guest disk mapping for the devices.""" - inst_type = instance_types.extract_instance_type(instance) + inst_type = flavors.extract_instance_type(instance) mapping = {} diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index a0d2d0a7b..5571e8810 100755 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -63,7 +63,7 @@ from xml.dom import minidom from nova.api.metadata import base as instance_metadata from nova import block_device -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import power_state from nova.compute import task_states from nova.compute import vm_mode @@ -1788,7 +1788,7 @@ class LibvirtDriver(driver.ComputeDriver): user_id=instance['user_id'], project_id=instance['project_id']) - inst_type = instance_types.extract_instance_type(instance) + inst_type = flavors.extract_instance_type(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 657e96f06..7c67c03c1 100644 --- a/nova/virt/powervm/blockdev.py +++ b/nova/virt/powervm/blockdev.py @@ -20,7 +20,7 @@ import re from oslo.config import cfg -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import task_states from nova.image import glance from nova.openstack.common import excutils @@ -175,7 +175,7 @@ class PowerVMLocalVolumeAdapter(PowerVMDiskAdapter): # calculate root device size in bytes # we respect the minimum root device size in constants - instance_type = instance_types.extract_instance_type(instance) + instance_type = flavors.extract_instance_type(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 603ee0b61..199b10704 100755 --- a/nova/virt/powervm/driver.py +++ b/nova/virt/powervm/driver.py @@ -19,7 +19,7 @@ import time from oslo.config import cfg -from nova.compute import instance_types +from nova.compute import flavors from nova.image import glance from nova.openstack.common import log as logging from nova.virt import driver @@ -290,7 +290,7 @@ class PowerVMDriver(driver.ComputeDriver): """ lpar_obj = self._powervm._create_lpar_instance(instance, network_info) - instance_type = instance_types.extract_instance_type(instance) + instance_type = flavors.extract_instance_type(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 904f12e30..fb25ccbf4 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -37,7 +37,7 @@ from oslo.config import cfg from nova.api.metadata import base as instance_metadata from nova import block_device -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import power_state from nova.compute import task_states from nova import exception @@ -210,7 +210,7 @@ def create_vm(session, instance, name_label, kernel, ramdisk, 3. Using hardware virtualization """ - instance_type = instance_types.extract_instance_type(instance) + instance_type = flavors.extract_instance_type(instance) mem = str(long(instance_type['memory_mb']) * 1024 * 1024) vcpus = str(instance_type['vcpus']) @@ -323,7 +323,7 @@ def _is_vm_shutdown(session, vm_ref): def ensure_free_mem(session, instance): - instance_type = instance_types.extract_instance_type(instance) + instance_type = flavors.extract_instance_type(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", @@ -777,7 +777,7 @@ def resize_disk(session, instance, vdi_ref, instance_type): def auto_configure_disk(session, vdi_ref, new_gb): """Partition and resize FS to match the size specified by - instance_types.root_gb. + flavors.root_gb. This is a fail-safe to prevent accidentally destroying data on a disk erroneously marked as auto_disk_config=True. @@ -1177,7 +1177,7 @@ def _check_vdi_size(context, session, instance, vdi_uuid): # FIXME(jk0): this was copied directly from compute.manager.py, let's # refactor this to a common area - instance_type = instance_types.extract_instance_type(instance) + instance_type = flavors.extract_instance_type(instance) allowed_size_gb = instance_type['root_gb'] allowed_size_bytes = allowed_size_gb * 1024 * 1024 * 1024 diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index e7dd3cff0..72a156cb6 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -29,7 +29,7 @@ from oslo.config import cfg from nova import block_device from nova.compute import api as compute -from nova.compute import instance_types +from nova.compute import flavors from nova.compute import power_state from nova.compute import task_states from nova.compute import vm_mode @@ -564,7 +564,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 = instance_types.extract_instance_type(instance) + instance_type = flavors.extract_instance_type(instance) # Attach (required) root disk if disk_image_type == vm_utils.ImageType.DISK_ISO: @@ -689,7 +689,7 @@ class VMOps(object): agent.resetnetwork() # Set VCPU weight - instance_type = instance_types.extract_instance_type(instance) + instance_type = flavors.extract_instance_type(instance) vcpu_weight = instance_type['vcpu_weight'] if vcpu_weight is not None: LOG.debug(_("Setting VCPU weight"), instance=instance) -- cgit