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

9 files changed, 16 insertions, 16 deletions

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 8f4e20798..537f74efa 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -1092,7 +1092,7 @@ class CloudController(object):
 
     @staticmethod
     def _format_instance_type(instance, result):
-        instance_type = flavors.extract_instance_type(instance)
+        instance_type = flavors.extract_flavor(instance)
         result['instanceType'] = instance_type['name']
 
     @staticmethod
@@ -1326,7 +1326,7 @@ class CloudController(object):
             raise exception.EC2APIError(_('Image must be available'))
 
         (instances, resv_id) = self.compute_api.create(context,
-            instance_type=flavors.get_instance_type_by_name(
+            instance_type=flavors.get_flavor_by_name(
                 kwargs.get('instance_type', None)),
             image_href=image_uuid,
             max_count=int(kwargs.get('max_count', min_count)),
diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py
index d53241308..425e5bf53 100644
--- a/nova/api/metadata/base.py
+++ b/nova/api/metadata/base.py
@@ -209,7 +209,7 @@ class InstanceMetadata():
             meta_data['product-codes'] = []
 
         if self._check_version('2007-08-29', version):
-            instance_type = flavors.extract_instance_type(self.instance)
+            instance_type = flavors.extract_flavor(self.instance)
             meta_data['instance-type'] = instance_type['name']
 
         if False and self._check_version('2007-10-10', version):
diff --git a/nova/api/openstack/compute/contrib/flavor_access.py b/nova/api/openstack/compute/contrib/flavor_access.py
index 47d7e07e2..bea92d883 100644
--- a/nova/api/openstack/compute/contrib/flavor_access.py
+++ b/nova/api/openstack/compute/contrib/flavor_access.py
@@ -71,7 +71,7 @@ def _marshall_flavor_access(flavor_id):
     rval = []
     try:
         access_list = flavors.\
-                      get_instance_type_access_by_flavor_id(flavor_id)
+                      get_flavor_access_by_flavor_id(flavor_id)
     except exception.FlavorNotFound:
         explanation = _("Flavor not found.")
         raise webob.exc.HTTPNotFound(explanation=explanation)
@@ -95,7 +95,7 @@ class FlavorAccessController(object):
         authorize(context)
 
         try:
-            flavor = flavors.get_instance_type_by_flavor_id(flavor_id)
+            flavor = flavors.get_flavor_by_flavor_id(flavor_id)
         except exception.FlavorNotFound:
             explanation = _("Flavor not found.")
             raise webob.exc.HTTPNotFound(explanation=explanation)
@@ -119,7 +119,7 @@ class FlavorActionController(wsgi.Controller):
     def _get_flavor_refs(self, context):
         """Return a dictionary mapping flavorid to flavor_ref."""
 
-        flavor_refs = flavors.get_all_types(context)
+        flavor_refs = flavors.get_all_flavors(context)
         rval = {}
         for name, obj in flavor_refs.iteritems():
             rval[obj['flavorid']] = obj
@@ -173,7 +173,7 @@ class FlavorActionController(wsgi.Controller):
         tenant = vals['tenant']
 
         try:
-            flavors.add_instance_type_access(id, tenant, context)
+            flavors.add_flavor_access(id, tenant, context)
         except exception.FlavorAccessExists as err:
             raise webob.exc.HTTPConflict(explanation=err.format_message())
 
@@ -190,7 +190,7 @@ class FlavorActionController(wsgi.Controller):
         tenant = vals['tenant']
 
         try:
-            flavors.remove_instance_type_access(id, tenant, context)
+            flavors.remove_flavor_access(id, tenant, context)
         except exception.FlavorAccessNotFound as e:
             raise webob.exc.HTTPNotFound(explanation=e.format_message())
 
diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py
index 8dc942f18..43d5d2110 100644
--- a/nova/api/openstack/compute/contrib/flavormanage.py
+++ b/nova/api/openstack/compute/contrib/flavormanage.py
@@ -40,7 +40,7 @@ class FlavorManageController(wsgi.Controller):
         authorize(context)
 
         try:
-            flavor = flavors.get_instance_type_by_flavor_id(
+            flavor = flavors.get_flavor_by_flavor_id(
                     id, read_deleted="no")
         except exception.NotFound as e:
             raise webob.exc.HTTPNotFound(explanation=e.format_message())
diff --git a/nova/api/openstack/compute/contrib/simple_tenant_usage.py b/nova/api/openstack/compute/contrib/simple_tenant_usage.py
index e5f9b44b7..cee1f6d85 100644
--- a/nova/api/openstack/compute/contrib/simple_tenant_usage.py
+++ b/nova/api/openstack/compute/contrib/simple_tenant_usage.py
@@ -108,7 +108,7 @@ class SimpleTenantUsageController(object):
         """Get flavor information from the instance's system_metadata,
         allowing a fallback to lookup by-id for deleted instances only."""
         try:
-            return flavors.extract_instance_type(instance)
+            return flavors.extract_flavor(instance)
         except KeyError:
             if not instance['deleted']:
                 # Only support the fallback mechanism for deleted instances
diff --git a/nova/api/openstack/compute/flavors.py b/nova/api/openstack/compute/flavors.py
index 744fe5e93..4da130e9b 100644
--- a/nova/api/openstack/compute/flavors.py
+++ b/nova/api/openstack/compute/flavors.py
@@ -85,7 +85,7 @@ class Controller(wsgi.Controller):
     def show(self, req, id):
         """Return data about the given flavor id."""
         try:
-            flavor = flavors.get_instance_type_by_flavor_id(id)
+            flavor = flavors.get_flavor_by_flavor_id(id)
             req.cache_db_flavor(flavor)
         except exception.NotFound:
             raise webob.exc.HTTPNotFound()
@@ -134,7 +134,7 @@ class Controller(wsgi.Controller):
                 msg = _('Invalid minDisk filter [%s]') % req.params['minDisk']
                 raise webob.exc.HTTPBadRequest(explanation=msg)
 
-        limited_flavors = flavors.get_all_types(context, filters=filters)
+        limited_flavors = flavors.get_all_flavors(context, filters=filters)
         flavors_list = limited_flavors.values()
         sorted_flavors = sorted(flavors_list,
                                 key=lambda item: item['flavorid'])
diff --git a/nova/api/openstack/compute/plugins/v3/servers.py b/nova/api/openstack/compute/plugins/v3/servers.py
index e4dc5db92..b12988010 100644
--- a/nova/api/openstack/compute/plugins/v3/servers.py
+++ b/nova/api/openstack/compute/plugins/v3/servers.py
@@ -955,8 +955,8 @@ class ServersController(wsgi.Controller):
         #    scheduler_hints = server_dict.get('scheduler_hints', {})
 
         try:
-            _get_inst_type = flavors.get_instance_type_by_flavor_id
-            inst_type = _get_inst_type(flavor_id, read_deleted="no")
+            inst_type = flavors.get_flavor_by_flavor_id(
+                    flavor_id, read_deleted="no")
 
             (instances, resv_id) = self.compute_api.create(context,
                             inst_type,
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index a996a843b..67d64127a 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -877,7 +877,7 @@ class Controller(wsgi.Controller):
             scheduler_hints = server_dict.get('scheduler_hints', {})
 
         try:
-            _get_inst_type = flavors.get_instance_type_by_flavor_id
+            _get_inst_type = flavors.get_flavor_by_flavor_id
             inst_type = _get_inst_type(flavor_id, read_deleted="no")
 
             (instances, resv_id) = self.compute_api.create(context,
diff --git a/nova/api/openstack/compute/views/servers.py b/nova/api/openstack/compute/views/servers.py
index 0cd6afaa1..bf7123ba7 100644
--- a/nova/api/openstack/compute/views/servers.py
+++ b/nova/api/openstack/compute/views/servers.py
@@ -181,7 +181,7 @@ class ViewBuilder(common.ViewBuilder):
             return ""
 
     def _get_flavor(self, request, instance):
-        instance_type = flavors.extract_instance_type(instance)
+        instance_type = flavors.extract_flavor(instance)
         if not instance_type:
             LOG.warn(_("Instance has had its instance_type removed "
                     "from the DB"), instance=instance)