From af33f1d051278969391de8f6963ec08071d4998f Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Wed, 12 Dec 2012 04:22:50 -0800 Subject: [PATCH] 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 --- .../nicira/nicira_nvp_plugin/QuantumPlugin.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py b/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py index 653bd15faf..2eb4d27791 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):