openstack/ironic
Code Issues Proposed changes

Merge "Do not change admin_state for tenant port"

Browse Source
This commit is contained in:
Jenkins 2017-02-01 22:34:57 +00:00 committed by Gerrit Code Review
commit 92e8bdb493
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ironic/drivers/modules/network/neutron.py
View File

@ -192,12 +192,11 @@ class NeutronNetwork(common.VIFPortIDMixin,
client_id_opt = (
{'opt_name': 'client-id', 'opt_value': client_id})
# NOTE(sambetts) Only update required binding: attributes and
# admin state, because other port attributes may have been set by
# the user or nova.
# NOTE(sambetts) Only update required binding: attributes,
# because other port attributes may have been set by the user or
# nova.
body = {
'port': {
'admin_state_up': True,
'binding:vnic_type': 'baremetal',
'binding:host_id': node.uuid,
'binding:profile': {

3
ironic/tests/unit/drivers/modules/network/test_neutron.py
View File

@ -254,7 +254,6 @@ class NeutronInterfaceTestCase(db_base.DbTestCase):
self, log_mock, client_mock):
expected_body = {
'port': {
'admin_state_up': True,
'binding:vnic_type': 'baremetal',
'binding:host_id': self.node.uuid,
'binding:profile': {'local_link_information':
@ -315,7 +314,6 @@ class NeutronInterfaceTestCase(db_base.DbTestCase):
expected_body = {
'port': {
'admin_state_up': True,
'binding:vnic_type': 'baremetal',
'binding:host_id': self.node.uuid,
}
@ -391,7 +389,6 @@ class NeutronInterfaceTestCase(db_base.DbTestCase):
client_mock.return_value.update_port = upd_mock
expected_body = {
'port': {
'admin_state_up': True,
'binding:vnic_type': 'baremetal',
'binding:host_id': self.node.uuid,
}