Merge "Network: correct VMware DVS port group name lookup"

nova/network/neutronv2/api.py

@@ -1373,10 +1373,9 @@ class API(base_api.NetworkAPI):
             bridge = "brq" + port['network_id']
             should_create_bridge = True
         elif vif_type == network_model.VIF_TYPE_DVS:
-            if network_name is None:
-                bridge = port['network_id']
-            else:
-                bridge = '%s-%s' % (network_name, port['network_id'])
+            # The name of the DVS port group will contain the neutron
+            # network id
+            bridge = port['network_id']
 
         # Prune the bridge name if necessary. For the DVS this is not done
         # as the bridge is a '<network-name>-<network-UUID>'.

nova/tests/unit/network/test_neutronv2.py

@@ -2366,7 +2366,7 @@ class TestNeutronv2(TestNeutronv2Base):
 
     def test_nw_info_build_network_dvs(self):
         net, iid = self._test_nw_info_build_network(model.VIF_TYPE_DVS)
-        self.assertEqual('foo-net-id', net['bridge'])
+        self.assertEqual('net-id', net['bridge'])
         self.assertNotIn('should_create_bridge', net)
         self.assertNotIn('ovs_interfaceid', net)
         self.assertIsNone(iid)