openstack
/
senlin
Code Issues Proposed changes

Pass in correct port id parameter 

When calling interface create on a server, the port id must be passed in
port_id as specified in [1].  Passing in the incorrect parameter was
causing nodes to go into error state during cluster update that involved
a profile whose network was changed.

[1] https://docs.openstack.org/api-ref/compute/?expanded=create-interface-detail#create-interface

Change-Id: I4627cba1064097234c765a7c97cfd1be8b3224a7
Closes-Bug: #1895759
(cherry picked from commit aca5b42d81)
This commit is contained in:
Duc Truong 2020-09-16 00:45:39 +00:00 committed by Erik Olof Gunnar Andersson
parent c87b5b4916
commit 366ee0084c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
senlin/profiles/os/nova/server.py
View File

@ -1183,7 +1183,7 @@ class ServerProfile(base.Profile):
ports = self._create_ports_from_properties(
obj, networks, 'update')
for port in ports:
params = {'port': port['id']}
params = {'port_id': port['id']}
try:
cc.server_interface_create(server, **params)
except exc.InternalError as ex:

4
senlin/tests/unit/drivers/test_nova_v2.py
View File

@ -371,9 +371,9 @@ class TestNovaV2(base.SenlinTestCase):
def test_server_interface_create(self):
server = mock.Mock()
d = nova_v2.NovaClient(self.conn_params)
d.server_interface_create(server, name='foo')
d.server_interface_create(server, port_id='fake-port-id')
self.compute.create_server_interface.assert_called_once_with(
server, name='foo')
server, port_id='fake-port-id')
def test_server_interface_list(self):
d = nova_v2.NovaClient(self.conn_params)

6
senlin/tests/unit/profiles/test_nova_server_update.py
View File

@ -798,9 +798,9 @@ class TestNovaServerUpdate(base.SenlinTestCase):
mock_validate.assert_has_calls(validation_calls)
mock_get_port.assert_called_with(obj, {'port': 'port4'})
create_calls = [
mock.call(server_obj, port='port1_id'),
mock.call(server_obj, port='port2_id'),
mock.call(server_obj, port='port4_id'),
mock.call(server_obj, port_id='port1_id'),
mock.call(server_obj, port_id='port2_id'),
mock.call(server_obj, port_id='port4_id'),
]
cc.server_interface_create.assert_has_calls(create_calls)