From 49ddd813d3fb9b04c2361f0677b655361ab43238 Mon Sep 17 00:00:00 2001 From: Aaron Rosen Date: Wed, 11 Sep 2013 11:24:54 -0700 Subject: [PATCH] Fixed typo defult_tz_uuid Fixes bug: 1224038 Change-Id: I0a4c7a63fefc02c4b8ae52d61fd036be8d375351 --- neutron/plugins/nicira/NeutronPlugin.py | 2 +- .../tests/unit/nicira/test_nicira_plugin.py | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/neutron/plugins/nicira/NeutronPlugin.py b/neutron/plugins/nicira/NeutronPlugin.py index f5b276e1b..2b4ec1bf8 100644 --- a/neutron/plugins/nicira/NeutronPlugin.py +++ b/neutron/plugins/nicira/NeutronPlugin.py @@ -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 diff --git a/neutron/tests/unit/nicira/test_nicira_plugin.py b/neutron/tests/unit/nicira/test_nicira_plugin.py index 2a8984757..3d94c2fb3 100644 --- a/neutron/tests/unit/nicira/test_nicira_plugin.py +++ b/neutron/tests/unit/nicira/test_nicira_plugin.py @@ -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): -- 2.45.2