x/vmware-nsx
Code Issues Proposed changes

Fixed typo defult_tz_uuid

Browse Source 
Fixes bug: 1224038

Change-Id: I0a4c7a63fefc02c4b8ae52d61fd036be8d375351
This commit is contained in:
Aaron Rosen
2013-09-11 11:24:54 -07:00
parent ca99b92719
commit 49ddd813d3
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/nicira/NeutronPlugin.py
View File

@@ -927,7 +927,7 @@ class NvpPluginV2(addr_pair_db.AllowedAddressPairsMixin,
transport_entry['transport_type'] = transport_type
transport_entry['zone_uuid'] = (
transport_zone[pnet.PHYSICAL_NETWORK] or
cluster.deafult_tz_uuid)
cluster.default_tz_uuid)
nvp_transport_zones_config.append(transport_entry)
return nvp_transport_zones_config

27
neutron/tests/unit/nicira/test_nicira_plugin.py
View File

@@ -135,6 +135,33 @@ class TestNiciraV2HTTPResponse(test_plugin.TestV2HTTPResponse,
pass
class TestNiciraProvidernet(NiciraPluginV2TestCase):
def test_create_provider_network_default_physical_net(self):
data = {'network': {'name': 'net1',
'admin_state_up': True,
'tenant_id': 'admin',
pnet.NETWORK_TYPE: 'vlan',
pnet.SEGMENTATION_ID: 411}}
network_req = self.new_create_request('networks', data, self.fmt)
net = self.deserialize(self.fmt, network_req.get_response(self.api))
self.assertEqual(net['network'][pnet.NETWORK_TYPE], 'vlan')
self.assertEqual(net['network'][pnet.SEGMENTATION_ID], 411)
def test_create_provider_network(self):
data = {'network': {'name': 'net1',
'admin_state_up': True,
'tenant_id': 'admin',
pnet.NETWORK_TYPE: 'vlan',
pnet.SEGMENTATION_ID: 411,
pnet.PHYSICAL_NETWORK: 'physnet1'}}
network_req = self.new_create_request('networks', data, self.fmt)
net = self.deserialize(self.fmt, network_req.get_response(self.api))
self.assertEqual(net['network'][pnet.NETWORK_TYPE], 'vlan')
self.assertEqual(net['network'][pnet.SEGMENTATION_ID], 411)
self.assertEqual(net['network'][pnet.PHYSICAL_NETWORK], 'physnet1')
class TestNiciraPortsV2(NiciraPluginV2TestCase,
test_plugin.TestPortsV2,
test_bindings.PortBindingsTestCase):