Merge "mitaka: neutron_plugin changes to support mitaka"

neutron_plugin_contrail/extensions/vpcroutetable.py

@@ -28,11 +28,10 @@
 from neutron.api.v2 import base
 from neutron.common import exceptions as qexception
 from neutron import manager
-
 try:
-    from neutron import quota
-except ImportError:
     from neutron.quota import resource_registry as quota
+except ImportError:
+    from neutron.quota import QUOTAS as quota
 
 try:
     from neutron.openstack.common import uuidutils
@@ -131,7 +130,7 @@ def get_resources(cls):
         for resource_name in ['route_table', 'nat_instance']:
             collection_name = resource_name.replace('_', '-') + "s"
             params = RESOURCE_ATTRIBUTE_MAP.get(resource_name + "s", dict())
-            quota.QUOTAS.register_resource_by_name(resource_name)
+            quota.register_resource_by_name(resource_name)
             controller = base.create_resource(collection_name,
                                               resource_name,
                                               plugin, params, allow_bulk=True,

neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_db.py

@@ -192,3 +192,35 @@ def stats(self, context, loadbalancer_id):
 
     def statuses(self, context, loadbalancer_id):
         pass
+
+    def get_l7policies(self, context, filters=None, fields=None):
+        pass
+
+    def get_l7policy(self, context, id, fields=None):
+        pass
+
+    def create_l7policy(self, context, l7policy):
+        pass
+
+    def update_l7policy(self, context, id, l7policy):
+        pass
+
+    def delete_l7policy(self, context, id):
+        pass
+
+    def get_l7policy_rules(self, context, l7policy_id,
+                           filters=None, fields=None):
+        pass
+
+    def get_l7policy_rule(self, context, id, l7policy_id, fields=None):
+        pass
+
+    def create_l7policy_rule(self, context, rule, l7policy_id):
+        pass
+
+    def update_l7policy_rule(self, context, id, rule, l7policy_id):
+        pass
+
+    def delete_l7policy_rule(self, context, id, l7policy_id):
+        pass
+