openstack
/
neutron
Code Issues Proposed changes

Merge "Cisco N1kv plugin to send subtype on network profile creation"

This commit is contained in:
Jenkins 2014-08-18 01:28:04 +00:00 committed by Gerrit Code Review
parent 1c796676bf e6ffc08de7
commit e87f003522
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/cisco/n1kv/n1kv_client.py
View File

@ -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)

7
neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py
View File

@ -272,6 +272,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)