openstack/nova
Code Issues Proposed changes

Merge "Remove unused methods"

Browse Source
This commit is contained in:
Zuul 2019-09-04 19:59:25 +00:00 committed by Gerrit Code Review
commit 2b2a5cedfc
8 changed files with 5 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/api/openstack/compute/baremetal_nodes.py
View File

@ -78,14 +78,6 @@ def _no_ironic_proxy(cmd):
class BareMetalNodeController(wsgi.Controller):
"""The Bare-Metal Node API controller for the OpenStack API."""
def _node_dict(self, node_ref):
d = {}
for f in node_fields:
d[f] = node_ref.get(f)
for f in node_ext_fields:
d[f] = node_ref.get(f)
return d
@wsgi.Controller.api_version("2.1", MAX_PROXY_API_SUPPORT_VERSION)
@wsgi.expected_errors((404, 501))
def index(self, req):

7
nova/api/openstack/compute/extension_info.py
View File

@ -852,13 +852,6 @@ EXTENSION_LIST_LEGACY_V2_COMPATIBLE = sorted(
class ExtensionInfoController(wsgi.Controller):
def _add_vif_extension(self, all_extensions):
vif_extension_info = {'name': 'ExtendedVIFNet',
'alias': 'OS-EXT-VIF-NET',
'description': 'Adds network id parameter'
' to the virtual interface list.'}
all_extensions.append(vif_extension_info)
@wsgi.expected_errors(())
def index(self, req):
context = req.environ['nova.context']

15
nova/compute/api.py
View File

@ -20,7 +20,6 @@
networking and storage of VMs, and compute hosts on which they run)."""
import collections
import copy
import functools
import re
import string
@ -1468,20 +1467,6 @@ class API(base.Base):
bdm.instance_uuid = instance.uuid
return instance_block_device_mapping
def _create_block_device_mapping(self, block_device_mapping):
# Copy the block_device_mapping because this method can be called
# multiple times when more than one instance is booted in a single
# request. This avoids 'id' being set and triggering the object dupe
# detection
db_block_device_mapping = copy.deepcopy(block_device_mapping)
# Create the BlockDeviceMapping objects in the db.
for bdm in db_block_device_mapping:
# TODO(alaski): Why is this done?
if bdm.volume_size == 0:
continue
bdm.update_or_create()
@staticmethod
def _check_requested_volume_type(bdm, volume_type_id_or_name,
volume_types):

26
nova/objects/migrate_data.py
View File

@ -19,7 +19,6 @@ from oslo_serialization import jsonutils
from oslo_utils import versionutils
from nova import exception
from nova import objects
from nova.objects import base as obj_base
from nova.objects import fields
@ -256,31 +255,6 @@ class LibvirtLiveMigrateData(LiveMigrateData):
if target_version < (1, 1) and 'target_connect_addr' in primitive:
del primitive['target_connect_addr']
def _bdms_to_legacy(self, legacy):
if not self.obj_attr_is_set('bdms'):
return
legacy['volume'] = {}
for bdmi in self.bdms:
legacy['volume'][bdmi.serial] = {
'disk_info': bdmi.as_disk_info(),
'connection_info': bdmi.connection_info}
def _bdms_from_legacy(self, legacy_pre_result):
self.bdms = []
volume = legacy_pre_result.get('volume', {})
for serial in volume:
vol = volume[serial]
bdmi = objects.LibvirtLiveMigrateBDMInfo(serial=serial)
bdmi.connection_info = vol['connection_info']
bdmi.bus = vol['disk_info']['bus']
bdmi.dev = vol['disk_info']['dev']
bdmi.type = vol['disk_info']['type']
if 'format' in vol:
bdmi.format = vol['disk_info']['format']
if 'boot_index' in vol:
bdmi.boot_index = int(vol['disk_info']['boot_index'])
self.bdms.append(bdmi)
def is_on_shared_storage(self):
return self.is_shared_block_storage or self.is_shared_instance_path

18
nova/tests/unit/compute/test_compute_api.py
View File

@ -4391,11 +4391,10 @@ class _ComputeAPIUnitTestMixIn(object):
@mock.patch.object(objects.Instance, 'create')
@mock.patch.object(self.compute_api.security_group_api,
'ensure_default')
@mock.patch.object(self.compute_api, '_create_block_device_mapping')
@mock.patch.object(objects.RequestSpec, 'from_components')
def do_test(
mock_req_spec_from_components, _mock_create_bdm,
_mock_ensure_default, _mock_create, mock_check_num_inst_quota):
mock_req_spec_from_components, _mock_ensure_default,
_mock_create, mock_check_num_inst_quota):
req_spec_mock = mock.MagicMock()
mock_check_num_inst_quota.return_value = 1
@ -4487,8 +4486,7 @@ class _ComputeAPIUnitTestMixIn(object):
'create_db_entry_for_new_instance')
@mock.patch.object(self.compute_api,
'_bdm_validate_set_size_and_instance')
@mock.patch.object(self.compute_api, '_create_block_device_mapping')
def do_test(mock_cbdm, mock_bdm_v, mock_cdb, mock_sg, mock_cniq):
def do_test(mock_bdm_v, mock_cdb, mock_sg, mock_cniq):
mock_cniq.return_value = 1
self.compute_api._provision_instances(self.context,
mock.sentinel.flavor,
@ -4610,8 +4608,6 @@ class _ComputeAPIUnitTestMixIn(object):
'ensure_default', new=mock.MagicMock())
@mock.patch.object(self.compute_api, '_validate_bdm',
new=mock.MagicMock())
@mock.patch.object(self.compute_api, '_create_block_device_mapping',
new=mock.MagicMock())
@mock.patch.object(objects.RequestSpec, 'from_components',
mock.MagicMock())
@mock.patch('nova.objects.InstanceMapping')
@ -4700,14 +4696,12 @@ class _ComputeAPIUnitTestMixIn(object):
@mock.patch.object(objects, 'Instance')
@mock.patch.object(self.compute_api.security_group_api,
'ensure_default')
@mock.patch.object(self.compute_api, '_create_block_device_mapping')
@mock.patch.object(objects.RequestSpec, 'from_components')
@mock.patch.object(objects, 'BuildRequest')
@mock.patch.object(objects, 'InstanceMapping')
def do_test(mock_inst_mapping, mock_build_req,
mock_req_spec_from_components, _mock_create_bdm,
_mock_ensure_default, mock_inst, mock_check_num_inst_quota,
mock_create_rs_br_im):
mock_req_spec_from_components, _mock_ensure_default,
mock_inst, mock_check_num_inst_quota, mock_create_rs_br_im):
min_count = 1
max_count = 2
@ -4794,8 +4788,6 @@ class _ComputeAPIUnitTestMixIn(object):
@mock.patch('nova.compute.utils.check_num_instances_quota')
@mock.patch.object(self.compute_api, 'security_group_api')
@mock.patch.object(compute_api, 'objects')
@mock.patch.object(self.compute_api, '_create_block_device_mapping',
new=mock.MagicMock())
@mock.patch.object(self.compute_api,
'create_db_entry_for_new_instance',
new=mock.MagicMock())

65
nova/tests/unit/virt/vmwareapi/test_vm_util.py
View File

@ -22,7 +22,6 @@ from oslo_utils import uuidutils
from oslo_vmware import exceptions as vexc
from oslo_vmware.objects import datastore as ds_obj
from oslo_vmware import pbm
from oslo_vmware import vim_util as vutil
from nova import exception
from nova.network import model as network_model
@ -1872,70 +1871,6 @@ class VMwareVMUtilTestCase(test.NoDBTestCase):
parent_folder,
name=child_name)
def test_get_folder_does_not_exist(self):
session = fake.FakeSession()
with mock.patch.object(session, '_call_method',
return_value=None):
ret = vm_util._get_folder(session, 'fake-parent', 'fake-name')
self.assertIsNone(ret)
expected_invoke_api = [mock.call(vutil, 'get_object_property',
'fake-parent',
'childEntity')]
self.assertEqual(expected_invoke_api,
session._call_method.mock_calls)
def test_get_folder_child_entry_not_folder(self):
child_entity = mock.Mock()
child_entity._type = 'NotFolder'
prop_val = mock.Mock()
prop_val.ManagedObjectReference = [child_entity]
session = fake.FakeSession()
with mock.patch.object(session, '_call_method',
return_value=prop_val):
ret = vm_util._get_folder(session, 'fake-parent', 'fake-name')
self.assertIsNone(ret)
expected_invoke_api = [mock.call(vutil, 'get_object_property',
'fake-parent',
'childEntity')]
self.assertEqual(expected_invoke_api,
session._call_method.mock_calls)
def test_get_folder_child_entry_not_matched(self):
child_entity = mock.Mock()
child_entity._type = 'Folder'
prop_val = mock.Mock()
prop_val.ManagedObjectReference = [child_entity]
session = fake.FakeSession()
with mock.patch.object(session, '_call_method',
side_effect=[prop_val, 'fake-1-name']):
ret = vm_util._get_folder(session, 'fake-parent', 'fake-name')
self.assertIsNone(ret)
expected_invoke_api = [mock.call(vutil, 'get_object_property',
'fake-parent',
'childEntity'),
mock.call(vutil, 'get_object_property',
child_entity, 'name')]
self.assertEqual(expected_invoke_api,
session._call_method.mock_calls)
def test_get_folder_child_entry_matched(self):
child_entity = mock.Mock()
child_entity._type = 'Folder'
prop_val = mock.Mock()
prop_val.ManagedObjectReference = [child_entity]
session = fake.FakeSession()
with mock.patch.object(session, '_call_method',
side_effect=[prop_val, 'fake-name']):
ret = vm_util._get_folder(session, 'fake-parent', 'fake-name')
self.assertEqual(ret, child_entity)
expected_invoke_api = [mock.call(vutil, 'get_object_property',
'fake-parent',
'childEntity'),
mock.call(vutil, 'get_object_property',
child_entity, 'name')]
self.assertEqual(expected_invoke_api,
session._call_method.mock_calls)
def test_folder_path_ref_cache(self):
path = 'OpenStack/Project (e2b86092bf064181ade43deb3188f8e4)'
self.assertIsNone(vm_util.folder_ref_cache_get(path))

17
nova/virt/vmwareapi/vm_util.py
View File

@ -1633,23 +1633,6 @@ def get_swap(session, vm_ref):
return device
def _get_folder(session, parent_folder_ref, name):
# Get list of child entities for the parent folder
prop_val = session._call_method(vutil, 'get_object_property',
parent_folder_ref,
'childEntity')
if prop_val:
child_entities = prop_val.ManagedObjectReference
# Return if the child folder with input name is already present
for child_entity in child_entities:
if child_entity._type != 'Folder':
continue
child_entity_name = vim_util.get_entity_name(session, child_entity)
if child_entity_name == name:
return child_entity
def create_folder(session, parent_folder_ref, name):
"""Creates a folder in vCenter

3
nova/virt/xenapi/fake.py
View File

@ -502,9 +502,6 @@ class Failure(Exception):
except Exception:
return "XenAPI Fake Failure: %s" % str(self.details)
def _details_map(self):
return {str(i): self.details[i] for i in range(len(self.details))}
class SessionBase(object):
"""Base class for Fake Sessions."""