From ad822190fac4156c032167a2182cbefdc411255e Mon Sep 17 00:00:00 2001 From: Marga Millet Date: Thu, 14 Aug 2014 22:05:23 -0700 Subject: [PATCH] Cisco N1kv plugin to send subtype on network profile creation Make sure that the cisco n1kv neutron plugin sends the sub_type too when a overlay network profile is created Change-Id: I37e63131039077fa80a28fe725c09f0307acc2ea Closes-Bug: 1357125 --- neutron/plugins/cisco/n1kv/n1kv_client.py | 2 ++ neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/neutron/plugins/cisco/n1kv/n1kv_client.py b/neutron/plugins/cisco/n1kv/n1kv_client.py index 5a400dec48..b07e1c51f1 100644 --- a/neutron/plugins/cisco/n1kv/n1kv_client.py +++ b/neutron/plugins/cisco/n1kv/n1kv_client.py @@ -256,6 +256,8 @@ class Client(object): 'id': network_profile['id'], 'logicalNetwork': logical_network_name, 'tenantId': tenant_id} + if network_profile['segment_type'] == c_const.NETWORK_TYPE_OVERLAY: + body['subType'] = network_profile['sub_type'] return self._post( self.network_segment_pool_path % network_profile['id'], body=body) diff --git a/neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py b/neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py index cbe4d46831..3c0240d780 100644 --- a/neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py +++ b/neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py @@ -273,6 +273,13 @@ class TestN1kvNetworkProfiles(N1kvPluginTestCase): res = net_p_req.get_response(self.ext_api) self.assertEqual(res.status_int, 201) + def test_create_network_profile_overlay_missing_subtype(self): + data = self._prepare_net_profile_data(c_const.NETWORK_TYPE_OVERLAY) + data['network_profile'].pop('sub_type') + net_p_req = self.new_create_request('network_profiles', data) + res = net_p_req.get_response(self.ext_api) + self.assertEqual(res.status_int, 400) + def test_create_network_profile_trunk(self): data = self._prepare_net_profile_data(c_const.NETWORK_TYPE_TRUNK) net_p_req = self.new_create_request('network_profiles', data)