Merge lp:~vila/uci-engine/1300769-optional-tunnel into lp:uci-engine

[Vincent Ladeuil]

Be explicit about which env var is not set. OS_NETWORK_NAME is not needed, we use only one network.

Be explicit about which env var is not set.

[lp:~vila/uci-engine/1300769-optional-tunnel]

420. By Vincent Ladeuil on 2014-04-02

We don't need OS_NETWORK_NAME after all, there is only one network.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:419
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/469/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/469/rebuild

review: Approve (continuous-integration)

[Evan (ev)]

Looks good! +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:420
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/470/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/470/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/run.py'
--- tests/run.py	2014-04-01 15:02:54 +0000
+++ tests/run.py	2014-04-02 10:41:30 +0000
@@ -333,6 +333,8 @@
     This is a pre-requisite to setup a tunnel.
 
     :raises: NotFound if the instance has not been spawned.
+
+    :raises: Exception if no IP can be found after max_tries*3 seconds.
     """
 
     log.info("Getting the bootstrap IP address.")
@@ -343,27 +345,25 @@
               'service_type': 'compute'}
     nt = client.Client(*args, **kwargs)
 
-    net = ''
     tries = 0
-    network_name = os.environ['OS_NETWORK_NAME']
     while tries < max_tries:
         # Raises NotFound if the instance does not exist.
         server = nt.servers.get(instance)
-        net = server.networks.get(network_name)
-        if net:
-            # Either we have a single address or the last one has been added to
-            # make the instance reachable (floating or public).
-            net = net[-1]
-            # Don't sleep anymore. We have our IP; break out of the loop.
-            break
+        networks = server.networks.values()
+        if networks:
+            # We use a single network and don't care how it's named
+            net = networks[0]
+            if net:
+                # Either we have a single address or the last one has been
+                # added to make the instance reachable (floating or public).
+                net = net[-1]
+                # Don't sleep anymore. We have our IP, let's move on
+                return net
 
         tries += 1
         if tries != max_tries:
             time.sleep(3)
-    else:
-        raise Exception('Timed out waiting for bootstrap IP.')
-
-    return net
+    raise Exception('Timed out waiting for bootstrap IP.')
 
 
 def destroy_tunnel():
@@ -454,9 +454,10 @@
 
     We assume that the targeted cloud is openstack based.
     """
-    for key in ('OS_USERNAME', 'OS_NETWORK_NAME', 'OS_REQUIRES_TUNNEL'):
+    for key in ('OS_USERNAME', 'OS_REQUIRES_TUNNEL'):
         if os.environ.get(key, None) is None:
-            msg = 'Please source a novarc file before running this harness.'
+            msg = ('Please source a novarc file before running this harness.'
+                   ' {} is not currently set'.format(key))
             log.error(msg)
             sys.exit(1)