From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 26 Feb 2014 23:19:52 +0000 (+0000)
Subject: Merge "Support Port Binding Extension in Cisco N1kv plugin"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=720e42a78343f9bd6d0ee558214922eb5c327a67;p=openstack-build%2Fneutron-build.git

Merge "Support Port Binding Extension in Cisco N1kv plugin"
---

720e42a78343f9bd6d0ee558214922eb5c327a67
diff --cc neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
index 392f04238,ceef16b6f..a76d78490
--- a/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
+++ b/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
@@@ -91,9 -94,9 +94,9 @@@ class N1kvNeutronPluginV2(db_base_plugi
      # bulk operations.
      __native_bulk_support = False
      supported_extension_aliases = ["provider", "agent",
 -                                   "n1kv_profile", "network_profile",
 +                                   "n1kv", "network_profile",
                                     "policy_profile", "external-net", "router",
-                                    "credential"]
+                                    "binding", "credential"]
  
      def __init__(self, configfile=None):
          """
diff --cc neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py
index f872111b7,ad67c709f..909df2590
--- a/neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py
+++ b/neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py
@@@ -304,9 -306,12 +306,12 @@@ class TestN1kvHTTPResponse(test_plugin.
  
  
  class TestN1kvPorts(test_plugin.TestPortsV2,
-                     N1kvPluginTestCase):
+                     N1kvPluginTestCase,
+                     test_bindings.PortBindingsTestCase):
+     VIF_TYPE = portbindings.VIF_TYPE_OVS
+     HAS_PORT_FILTER = False
  
 -    def test_create_port_with_default_n1kv_profile_id(self):
 +    def test_create_port_with_default_n1kv_policy_profile_id(self):
          """Test port create without passing policy profile id."""
          with self.port() as port:
              db_session = db.get_session()