Correcting networking-odl to mitaka/stable + app topology patch

Change-Id: Iddcd8dda2d49fcdd8e0f37a1d052a6fa8a24b035
Signed-off-by: Wojciech Dec <wdec@cisco.com>

1 files changed, 1 insertions, 15 deletions

diff --git a/networking-odl/networking_odl/tests/unit/ml2/test_legacy_port_binding.py b/networking-odl/networking_odl/tests/unit/ml2/test_legacy_port_binding.py
index 932c961..8ebda22 100644
--- a/networking-odl/networking_odl/tests/unit/ml2/test_legacy_port_binding.py
+++ b/networking-odl/networking_odl/tests/unit/ml2/test_legacy_port_binding.py
@@ -15,11 +15,10 @@
 
 import mock
 
-from neutron.extensions import portbindings
+from neutron.common import constants as n_constants
 from neutron.plugins.common import constants
 from neutron.plugins.ml2 import driver_api as api
 from neutron.plugins.ml2 import driver_context as ctx
-from neutron_lib import constants as n_constants
 
 from networking_odl.ml2 import legacy_port_binding
 from networking_odl.tests import base
@@ -74,16 +73,3 @@ class TestLegacyPortBindingManager(base.DietTestCase):
         port_context.set_binding.assert_called_once_with(
             self.valid_segment[api.ID], vif_type,
             mgr.vif_details, status=n_constants.PORT_STATUS_ACTIVE)
-
-    def test_bind_port_unsupported_vnic_type(self):
-        network = mock.MagicMock(spec=api.NetworkContext)
-        port_context = mock.MagicMock(
-            spec=ctx.PortContext,
-            current={'id': 'CURRENT_CONTEXT_ID',
-                     portbindings.VNIC_TYPE: portbindings.VNIC_DIRECT},
-            segments_to_bind=[self.valid_segment, self.invalid_segment],
-            network=network)
-
-        mgr = legacy_port_binding.LegacyPortBindingManager()
-        mgr.bind_port(port_context)
-        port_context.set_binding.assert_not_called()