Merge pull request #1620 from grycap/devel

Devel

Author: micafer

IM/InfrastructureManager.py

@@ -402,9 +402,10 @@ def search_vm(inf, radl_sys, auth):
             cloud_site = c.getCloudConnector(inf)
             try:
                 images = cloud_site.list_images(auth, filters={"distribution": dist, "version": version})
-            except Exception:
+            except Exception as ex:
                 images = []
-                InfrastructureManager.logger.warn("Inf ID: " + inf.id + ": Error getting images from cloud: " + c.id)
+                InfrastructureManager.logger.warning("Inf ID: %s: Error getting images " % inf.id +
+                                                     "from cloud: %s (%s)" % (c.id, ex))
 
             if images:
                 new_sys = system(radl_sys.name)

IM/connectors/OpenStack.py

@@ -959,9 +959,11 @@ def get_router_public(self, driver, radl, inf_id, create=False):
                     break
 
             # Get the OST public net ids and names
+            pool_names = [pool.name for pool in driver.ex_list_floating_ip_pools()]
+            _, ost_nets = self.get_ost_network_info(driver, pool_names)
             pub_nets = {}
-            for net in driver.ex_list_networks():
-                if 'router:external' in net.extra and net.extra['router:external']:
+            for net in ost_nets:
+                if net.extra['is_public']:
                     pub_nets[net.id] = net.name
 
             # Get the routers associated with public nets

test/unit/connectors/OpenStack.py

@@ -233,6 +233,7 @@ def test_20_launch(self, get_image_data, save_data, get_driver):
         net2.name = "private"
         net2.id = "net2id"
         net2.cidr = "10.0.0.0/24"
+        net2.extra = {}
         driver.ex_list_networks.return_value = [net2, net1]
 
         sg = MagicMock()
@@ -806,6 +807,7 @@ def test_60_finalize(self, sleep, get_driver):
         net1.cidr = None
         net1.extra = {'subnets': ["subnet1"]}
         net2 = MagicMock()
+        net2.id = 'net2id'
         net2.name = "public"
         net2.cidr = None
         net2.extra = {'subnets': [], 'router:external': True}