From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 20 Feb 2013 07:55:10 +0000 (+0000)
Subject: Merge "Routing table configuration support on L3"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=50b061cc141b8fc42b93241df987e14827006ae0;p=openstack-build%2Fneutron-build.git

Merge "Routing table configuration support on L3"
---

50b061cc141b8fc42b93241df987e14827006ae0
diff --cc quantum/plugins/linuxbridge/lb_quantum_plugin.py
index 2ec8980ac,8eff5112d..54e4beea2
--- a/quantum/plugins/linuxbridge/lb_quantum_plugin.py
+++ b/quantum/plugins/linuxbridge/lb_quantum_plugin.py
@@@ -192,14 -192,12 +192,14 @@@ class LinuxBridgePluginV2(db_base_plugi
      """
  
      # This attribute specifies whether the plugin supports or not
 -    # bulk operations. Name mangling is used in order to ensure it
 -    # is qualified by class
 +    # bulk/pagination/sorting operations. Name mangling is used in
 +    # order to ensure it is qualified by class
      __native_bulk_support = True
 +    __native_pagination_support = True
 +    __native_sorting_support = True
  
      supported_extension_aliases = ["provider", "router", "binding", "quotas",
-                                    "security-group", "agent"]
+                                    "security-group", "agent", "extraroute"]
  
      network_view = "extension:provider_network:view"
      network_set = "extension:provider_network:set"
diff --cc quantum/plugins/openvswitch/ovs_quantum_plugin.py
index ab1908ef4,e17a56468..ce22d9edb
--- a/quantum/plugins/openvswitch/ovs_quantum_plugin.py
+++ b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
@@@ -231,15 -230,13 +230,16 @@@ class OVSQuantumPluginV2(db_base_plugin
      """
  
      # This attribute specifies whether the plugin supports or not
 -    # bulk operations. Name mangling is used in order to ensure it
 -    # is qualified by class
 +    # bulk/pagination/sorting operations. Name mangling is used in
 +    # order to ensure it is qualified by class
      __native_bulk_support = True
 +    __native_pagination_support = True
 +    __native_sorting_support = True
 +
      supported_extension_aliases = ["provider", "router",
                                     "binding", "quotas", "security-group",
-                                    "agent"]
+                                    "agent",
+                                    "extraroute"]
  
      network_view = "extension:provider_network:view"
      network_set = "extension:provider_network:set"