Merge "Routing table configuration support on L3"

diff --cc quantum/agent/l3_agent.py
Simple merge

diff --cc quantum/db/db_base_plugin_v2.py
Simple merge

diff --cc quantum/plugins/linuxbridge/lb_quantum_plugin.py
index 2ec8980ac78e2a745c7537e19a9fb5fe7c536d69,8eff5112debedb65c0b81c9f0a32ee45fbdb46ad..54e4beea22671b10aa6befba796a46f390a8a346
--- 1/quantum/plugins/linuxbridge/lb_quantum_plugin.py
--- 2/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 ab1908ef4147bf0116f4b90ffb0a2b1d5c37e5d7,e17a56468db7b21154382041efec55c87f538c55..ce22d9edb50601c3376e25a2b6df7be6f0d65731
--- 1/quantum/plugins/openvswitch/ovs_quantum_plugin.py
--- 2/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"