Fixed typo defult_tz_uuid

Fixes bug: 1224038

Change-Id: I0a4c7a63fefc02c4b8ae52d61fd036be8d375351

diff --git a/neutron/plugins/nicira/NeutronPlugin.py b/neutron/plugins/nicira/NeutronPlugin.py
index f5b276e1b5978faf0bfae63de14f22725ffb0f28..2b4ec1bf89e2ca8cb8e019aa2cc2af79d6658a5c 100644 (file)
--- 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 2a89847573533db0895f1d2ec25da1c2e1e8b3a0..3d94c2fb39c4882844cb5a8fe0c6c629626667e5 100644 (file)
--- 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):