Use juju ssh to reboot machines in acceptance tests

achilleasa · achilleasa · commit 102b81ee630e · 2020-12-18T16:01:14.000Z
Prior to this change, some of the acceptance tests would use `juju run`
to reboot machines. However, the develop branch has removed support for
'--machine' from juju run causing these tests to fail. This commit
updates the affected tests to use `juju ssh` instead.

In addition, this commit also updates assess_container_networking to
work with python 3 by changing x.iteritems() to iter(x.items()).
diff --git a/acceptancetests/assess_container_networking.py b/acceptancetests/assess_container_networking.py
@@ -121,8 +121,8 @@ def make_machines(client, container_types, space):
     sargs = []
     if space:
         sargs = ['--constraints', 'spaces=' + space]
-         
-    for host, containers in required.iteritems():
+
+    for host, containers in iter(required.items()):
         for container in containers:
             client.juju('add-machine', tuple(['{}:{}'.format(container, host)] + sargs))
 
@@ -342,9 +342,14 @@ def assess_container_networking(client, types, space):
     try:
         for host in hosts:
             log.info("Restarting hosted machine: {}".format(host))
-            client.juju(
-                'run', ('--machine', host, 'sudo shutdown -r +1'))
-            client.juju('operations', ('--machine', host, '--action', 'juju-run'))
+            try:
+                client.juju('ssh', (host, 'sudo shutdown -r now'))
+            except subprocess.CalledProcessError as e:
+                if e.returncode != 255:
+                    raise e
+                log.info("Ignoring `juju ssh` exit status after triggering reboot")
+            hostname = client.get_status().get_machine_dns_name(host)
+            wait_for_port(hostname, 22, timeout=240)
 
         log.info("Restarting controller machine 0")
         controller_client = client.get_controller_client()
diff --git a/acceptancetests/assess_network_health.py b/acceptancetests/assess_network_health.py
@@ -464,8 +464,13 @@ def reboot_machines(self, client):
                     self.ssh(client, machine,
                              'sudo lxc restart {}'.format(' '.join(cont_ids)))
                 log.info("Restarting machine: {}".format(machine))
-                client.juju('run', ('--machine', machine,
-                                    'sudo shutdown -r now'))
+                try:
+                    client.juju('ssh', (machine, 'sudo shutdown -r now'))
+                except subprocess.CalledProcessError as e:
+                    if e.returncode != 255:
+                        raise e
+                    log.info("Ignoring `juju ssh` exit status after triggering reboot")
+
                 hostname = client.get_status().get_machine_dns_name(machine)
                 wait_for_port(hostname, 22, timeout=240)
 
