lbaasv2 plugin changes for newton

Closes-Bug:#1665181 Change-Id: I4a30ca8d0a479e6bc5af59a7ad339b8a3843d39b
Juniper · Feb 16, 2017 · 7c63d95 · 7c63d95
1 parent 1fc6aef
commit 7c63d95
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/loadbalancer_db.py b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/loadbalancer_db.py
@@ -73,7 +73,7 @@ def __init__(self):
             self.auth_url = "/v2.0/tokens"
 
         try:
-            self.auth_type = cfg.CONF.keystone_authtoken.auth_type
+            self.auth_type = cfg.CONF.auth_strategy
         except cfg.NoSuchOptError:
             self.auth_type = "keystone"
 

diff --git a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/resource_manager.py b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/resource_manager.py
@@ -24,10 +24,15 @@
 except ImportError:
     from neutron_lib.exceptions import NotAuthorized
 from neutron.common.exceptions import TenantNetworksDisabled
+
 try:
-    from neutron.extensions import loadbalancer
+    from neutron.extensions.loadbalancer import StateInvalid
 except ImportError:
-    from neutron_lbaas.extensions import loadbalancer
+    try:
+        from neutron_lbaas.extensions.loadbalancerv2 import StateInvalid
+    except ImportError:
+        from neutron_lbaas.extensions.loadbalancer import StateInvalid
+
 try:
     from neutron_lib import constants
 except ImportError:
@@ -315,8 +320,7 @@ def update(self, context, id, resource):
 
         id_perms = obj.get_id_perms()
         if not id_perms or not id_perms.enable:
-            raise loadbalancer.StateInvalid(id=id,
-                                            state=constants.PENDING_DELETE)
+            raise StateInvalid(id=id, state=constants.PENDING_DELETE)
         r = resource[self.neutron_name]
         if r:
             update = False

diff --git a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_db.py b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_db.py
@@ -60,7 +60,7 @@ def __init__(self):
             self.auth_url = "/v2.0/tokens"
 
         try:
-            self.auth_type = cfg.CONF.keystone_authtoken.auth_type
+            self.auth_type = cfg.CONF.auth_strategy
         except cfg.NoSuchOptError:
             self.auth_type = "keystone"
 
@@ -280,3 +280,5 @@ def update_l7policy_rule(self, context, id, rule, l7policy_id):
     def delete_l7policy_rule(self, context, id, l7policy_id):
         pass
 
+    def create_graph(self, context, graph):
+        pass