From: Salvatore Orlando Date: Wed, 12 Dec 2012 12:22:50 +0000 (-0800) Subject: Bad translation from network types to nvp transport types X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=80e7451e412e555e9a9d5c8604ef0d4bbbe66581;p=openstack-build%2Fneutron-build.git Bad translation from network types to nvp transport types Bug 1117769 'Flat' and 'Vlan' where not being converted into 'bridge' This change cannot have unit tests because the fake nvp api client does not validate such constraints at the moment Change-Id: I2b918265cb8becf6f023abc7937b92b3058d9446 --- diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py b/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py index 653bd15fa..2eb4d2779 100644 --- a/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py +++ b/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py @@ -358,12 +358,14 @@ class NvpPluginV2(db_base_plugin_v2.QuantumDbPluginV2, "network %s"), net_data.get('name', '')) tenant_id = self._get_tenant_id_for_create(context, net_data) target_cluster = self._find_target_cluster(net_data) - lswitch = nvplib.create_lswitch(target_cluster, - tenant_id, - net_data.get('name'), - net_data.get(pnet.NETWORK_TYPE), - net_data.get(pnet.PHYSICAL_NETWORK), - net_data.get(pnet.SEGMENTATION_ID)) + nvp_binding_type = net_data.get(pnet.NETWORK_TYPE) + if nvp_binding_type in ('flat', 'vlan'): + nvp_binding_type = 'bridge' + lswitch = nvplib.create_lswitch( + target_cluster, tenant_id, net_data.get('name'), + nvp_binding_type, + net_data.get(pnet.PHYSICAL_NETWORK), + net_data.get(pnet.SEGMENTATION_ID)) network['network']['id'] = lswitch['uuid'] with context.session.begin(subtransactions=True):