womax/nova
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Follow up for I220fa02ee916728e241503084b14984bab4b0c3b"

Browse Source
This commit is contained in:
Zuul
2019-09-14 05:27:34 +00:00
committed by Gerrit Code Review
parent 476c28848c 46a2bc689b
commit 5672f55a83
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nova/network/neutronv2/api.py
+8 -2
View File
@@ -3369,8 +3369,14 @@ class API(base_api.NetworkAPI):
# mapping based on that.
raise exception.PortUpdateFailed(
port_id=p['id'],
reason=_("Provider mappings wasn't provided for the "
"port with resource request"))
reason=_(
"Provider mappings are not available to the "
"compute service but are required for ports with "
"a resource request. If compute RPC API versions "
"are pinned for a rolling upgrade, you will need "
"to retry this operation once the RPC version is "
"unpinned and the nova-compute services are all "
"upgraded."))
# NOTE(gibi): In the resource provider mapping there can be
# more than one RP fulfilling a request group. But resource
nova/tests/unit/network/test_neutronv2.py
+9 -6
View File
@@ -4543,8 +4543,8 @@ class TestNeutronv2WithMock(TestNeutronv2Base):
constants.BINDING_PROFILE:
{'allocation': uuids.source_compute_rp},
'resource_request': mock.sentinel.resource_request}]}
migration = {'status': 'confirmed',
'migration_type': "migration"}
migration = objects.Migration(
status='confirmed', migration_type='migration')
list_ports_mock = mock.Mock(return_value=fake_ports)
get_client_mock.return_value.list_ports = list_ports_mock
@@ -4569,8 +4569,8 @@ class TestNeutronv2WithMock(TestNeutronv2Base):
constants.BINDING_PROFILE:
{'allocation': uuids.source_compute_rp},
'resource_request': mock.sentinel.resource_request}]}
migration = {'status': 'confirmed',
'migration_type': "migration"}
migration = objects.Migration(
status='confirmed', migration_type='migration')
list_ports_mock = mock.Mock(return_value=fake_ports)
get_client_mock.return_value.list_ports = list_ports_mock
@@ -4579,8 +4579,11 @@ class TestNeutronv2WithMock(TestNeutronv2Base):
self.api._update_port_binding_for_instance, self.context,
instance, 'new-host', migration, provider_mappings=None)
self.assertIn(
"Provider mappings wasn't provided for the port with resource "
"request", six.text_type(ex))
"Provider mappings are not available to the compute service but "
"are required for ports with a resource request. If compute RPC "
"API versions are pinned for a rolling upgrade, you will need to "
"retry this operation once the RPC version is unpinned and the "
"nova-compute services are all upgraded.", six.text_type(ex))
def test_get_pci_mapping_for_migration(self):
instance = fake_instance.fake_instance_obj(self.context)