Support Mitaka

Author: zhaoqin-github

f5_openstack_agent/lbaasv2/drivers/bigip/resource_manager.py

@@ -249,7 +249,11 @@ def _check_nonshared_network(self, service):
         lb_net_id = loadbalancer['network_id']
         network = self.driver.service_adapter.get_network_from_service(
             service, lb_net_id)
-        net_project_id = network["project_id"]
+        if "project_id" in network:
+            net_project_id = network["project_id"]
+        else:
+            # Mitaka compatibility
+            net_project_id = network["tenant_id"]
 
         if self.driver.conf.f5_global_routed_mode:
             shared = network["shared"]
@@ -1184,7 +1188,11 @@ def _check_nonshared_network(self, service):
             meb_net_id = meb["network_id"]
             network = self.driver.service_adapter.get_network_from_service(
                 service, meb_net_id)
-            net_project_id = network["project_id"]
+            if "project_id" in network:
+                net_project_id = network["project_id"]
+            else:
+                # Mitaka compatibility
+                net_project_id = network["tenant_id"]
 
             if self.driver.conf.f5_global_routed_mode:
                 shared = network["shared"]