openstack
/
nova
Code Issues Proposed changes

Remove unused flavor_delete_info() method 

This hasn't been used, outside of a test,
since a6ff9efda3
in liberty.

Change-Id: I976c322931dc7ee4c099cff04070202bb688d6ef
This commit is contained in:
Matt Riedemann 2018-08-03 12:44:52 -04:00
parent 3ac6deb94c
commit cc42724274
2 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nova/compute/flavors.py
View File

@ -260,30 +260,6 @@ def save_flavor_info(metadata, instance_type, prefix=''):
return metadata
# NOTE(danms): This method is deprecated, do not use it!
# Instances no longer store flavor information in system_metadata
def delete_flavor_info(metadata, *prefixes):
"""Delete flavor instance_type information from instance's system_metadata
by prefix.
"""
for key in system_metadata_flavor_props.keys():
for prefix in prefixes:
to_key = '%sinstance_type_%s' % (prefix, key)
del metadata[to_key]
# NOTE(danms): We do NOT save all of extra_specs, but only the
# NUMA-related ones that we need to avoid an uglier alternative. This
# should be replaced by a general split-out of flavor information from
# system_metadata very soon.
for key in list(metadata.keys()):
for prefix in prefixes:
if key.startswith('%sinstance_type_extra_' % prefix):
del metadata[key]
return metadata
def validate_extra_spec_keys(key_names_list):
for key_name in key_names_list:
if not VALID_EXTRASPEC_NAME_REGEX.match(key_name):

10
nova/tests/unit/test_flavors.py
View File

@ -109,14 +109,6 @@ class InstanceTypeToolsTest(test.TestCase):
flavors.save_flavor_info(metadata, instance_type, 'foo')
self.assertEqual(example_prefix, metadata)
def test_delete_flavor_info(self):
instance_type = flavors.get_default_flavor()
metadata = {}
flavors.save_flavor_info(metadata, instance_type)
flavors.save_flavor_info(metadata, instance_type, '_')
flavors.delete_flavor_info(metadata, '', '_')
self.assertEqual(metadata, {})
def test_flavor_numa_extras_are_saved(self):
instance_type = flavors.get_default_flavor()
instance_type['extra_specs'] = {
@ -135,8 +127,6 @@ class InstanceTypeToolsTest(test.TestCase):
'hw:numa_cpus.1': 'ABC',
}
self.assertEqual(expected_extra_specs, _instance_type['extra_specs'])
flavors.delete_flavor_info(sysmeta, '')
self.assertEqual({}, sysmeta)
class InstanceTypeFilteringTest(test.TestCase):