Merge pull request #149 from olehermanse/master

CFE-4565: Relaxed assertion related to cloud provider drivers

Author: olehermanse

cf_remote/spawn.py

@@ -77,8 +77,9 @@ def get_by_ip(cls, ip, driver=None, nodes=None):
                 print("Don't know which driver to use: %s" % _DRIVERS.keys())
                 return None
 
-        assert driver is not None, "TODO: How does this happen?"
-        nodes = nodes or driver.list_nodes()
+        if not nodes:
+            assert driver is not None
+            nodes = driver.list_nodes()
         for node in nodes:
             if node.state in (0, "running") and (
                 ip in node.public_ips or ip in node.private_ips
@@ -96,8 +97,9 @@ def get_by_name(cls, name, driver=None, nodes=None):
                 print("Don't know which driver to use: %s" % _DRIVERS.keys())
                 return None
 
-        assert driver is not None, "TODO: How does this happen?"
-        nodes = nodes or driver.list_nodes()
+        if not nodes:
+            assert driver is not None
+            nodes = driver.list_nodes()
         for node in nodes:
             if node.state in (0, "running") and node.name == name:
                 return cls(node.name, driver, node)
@@ -113,8 +115,9 @@ def get_by_uuid(cls, uuid, driver=None, nodes=None):
                 print("Don't know which driver to use: %s" % _DRIVERS.keys())
                 return None
 
-        assert driver is not None, "TODO: How does this happen?"
-        nodes = nodes or driver.list_nodes()
+        if not nodes:
+            assert driver is not None
+            nodes = driver.list_nodes()
         for node in nodes:
             if node.uuid == uuid:
                 return cls(node.name, driver, node)