diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-09 04:32:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-09 04:32:17 +0000 |
| commit | a7667e2926d15791773628bb7cdc3bb41989beed (patch) | |
| tree | 29164b36b25e32ff78f7e19c4a5d04f9731e1be1 | |
| parent | ccfe4025ccc83d125fff420fbd7eb16f04b00155 (diff) | |
| parent | 66334ed7b52cd1bb21e507ea5da384cefcadc138 (diff) | |
| download | nova-a7667e2926d15791773628bb7cdc3bb41989beed.tar.gz | |
Merge "Clean port dns_name in case of port detach" into stable/mitaka
| -rw-r--r-- | nova/network/neutronv2/api.py | 3 | ||||
| -rw-r--r-- | nova/tests/unit/network/test_neutronv2.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py index adee8f59e0..d5865bfa33 100644 --- a/nova/network/neutronv2/api.py +++ b/nova/network/neutronv2/api.py @@ -327,7 +327,8 @@ class API(base_api.NetworkAPI): # in case the caller forgot to filter the list. if port_id is None: continue - port_req_body = {'port': {'device_id': '', 'device_owner': ''}} + port_req_body = {'port': {'device_id': '', 'device_owner': '', + 'dns_name': ''}} if port_binding: port_req_body['port']['binding:host_id'] = None port_req_body['port']['binding:profile'] = {} diff --git a/nova/tests/unit/network/test_neutronv2.py b/nova/tests/unit/network/test_neutronv2.py index 46c20b12a2..2d1190f5ff 100644 --- a/nova/tests/unit/network/test_neutronv2.py +++ b/nova/tests/unit/network/test_neutronv2.py @@ -3527,7 +3527,7 @@ class TestNeutronv2WithMock(test.TestCase): api = neutronapi.API() api._unbind_ports(mock_ctx, ports, mock_client) - body = {'port': {'device_id': '', 'device_owner': ''}} + body = {'port': {'device_id': '', 'device_owner': '', 'dns_name': ''}} if has_ext: body['port']['binding:host_id'] = None body['port']['binding:profile'] = {} |