Merge lp:~mskalka/juju-ci-tools/better-internet-test into lp:juju-ci-tools

[Michael Skalka]

Changes the behavior of the internet test to work with containers.

[Curtis Hovey (sinzui)]

ty

review: Approve (code)

[lp:~mskalka/juju-ci-tools/better-internet-test]

1943. By Michael Skalka on 2017-03-21

changed internet test behavior to work with containers

=== modified file 'assess_network_health.py'
--- assess_network_health.py	2017-03-21 16:28:36 +0000
+++ assess_network_health.py	2017-03-21 18:36:35 +0000
@@ -242,19 +242,19 @@
                      "machine: {}".format(unit[0]))
             results[unit[0]] = False
             try:
-                routes = self.ssh(client, unit[0], 'ip route show')
+                routes = client.run(['ip route show'], machines=[unit[0]])
             except subprocess.CalledProcessError:
                 log.error('Could not connect to address for unit: {0}, '
                           'unable to find default route.'.format(unit[0]))
                 continue
-            default_route = re.search(r'^default\s+via\s+([\d\.]+)\s+', routes,
-                                      re.MULTILINE)
+            default_route = re.search(r'(default via )+([\d\.]+)\s+',
+                                      json.dumps(routes[0]))
             if default_route:
-                rc = client.juju('ssh', ('--proxy', unit[0],
-                                         'ping -c1 -q ' +
-                                         default_route.group(1)),
-                                 check=False)
-                if rc != 0:
+                rc = client.run(
+                    ['ping -c1 -q {}'.format(default_route.group(2))],
+                    machines=[unit[0]])
+                sucess = re.search(r'(1 received)', json.dumps(rc[0]))
+                if not sucess:
                     log.error('{} unable to ping default route'.format(unit))
                     continue
             else:
@@ -436,7 +436,7 @@
                 for service, unit_res in service_result.items():
                     if False in unit_res.values():
                         failed = [u for u, r in unit_res.items() if r is False]
-                        error = ('NH-Unit {0} failed to contact '
+                        error = ('Unit {0} failed to contact '
                                  'targets(s): {1}'.format(nh_source, failed))
                         error_string.append(error)
         for unit, res in internet.items():

=== modified file 'tests/test_assess_network_health.py'
--- tests/test_assess_network_health.py	2017-03-20 17:50:50 +0000
+++ tests/test_assess_network_health.py	2017-03-21 18:36:35 +0000
@@ -263,27 +263,38 @@
 
         self.assertEqual(expected, out)
 
-    def test_internet_connection(self):
+    def test_internet_connection_with_pass(self):
         args = parse_args([])
         net_health = AssessNetworkHealth(args)
         client = fake_juju_client()
         client.bootstrap()
-        default = dedent("""
-        default via 1.1.1.1
-        default via 1.1.1.1
-        """)
+        default = ["default via 1.1.1.1 1 received"]
+
         now = datetime.now() + timedelta(days=1)
         with patch('utility.until_timeout.now', return_value=now):
             with patch.object(client, 'get_status', return_value=status):
-                with patch('subprocess.check_output',
-                           return_value=None):
-                    with patch('assess_network_health.AssessNetworkHealth.ssh',
-                               return_value=default):
-                        with patch.object(client, 'juju', return_value=0):
-                            out = net_health.internet_connection(client)
+                with patch('subprocess.check_output', return_value=None):
+                    with patch.object(client, 'run', return_value=default):
+                        out = net_health.internet_connection(client)
         expected = {'1': True, '0': True}
         self.assertEqual(expected, out)
 
+    def test_internet_connection_with_fail(self):
+        args = parse_args([])
+        net_health = AssessNetworkHealth(args)
+        client = fake_juju_client()
+        client.bootstrap()
+        default = ["default via 1.1.1.1 0 received"]
+
+        now = datetime.now() + timedelta(days=1)
+        with patch('utility.until_timeout.now', return_value=now):
+            with patch.object(client, 'get_status', return_value=status):
+                with patch('subprocess.check_output', return_value=None):
+                    with patch.object(client, 'run', return_value=default):
+                        out = net_health.internet_connection(client)
+        expected = {'1': False, '0': False}
+        self.assertEqual(expected, out)
+
     def test_ensure_exposed(self):
         args = parse_args([])
         net_health = AssessNetworkHealth(args)