Merge lp:~gnuoy/python-jujuclient/ipv6 into lp:python-jujuclient

[Liam Young]

[Martin Packman (gz)]

Needs unit test. I'd add a new port-splitting function used here that can be validated with some ipv4 and ipv6 inputs.

review: Needs Fixing

[lp:~gnuoy/python-jujuclient/ipv6]

57. By Liam Young on 2015-05-11

Add unit tests and move host port splitting into its own function

[Martin Packman (gz)]

Looks good. Python style nits inline.

review: Approve

[Kapil Thangavelu (hazmat)]

lgtm, with martin's style nits addressed.

review: Approve

[lp:~gnuoy/python-jujuclient/ipv6]

58. By Liam Young on 2015-05-11

Tipdyup after mp feedback

=== modified file 'jujuclient.py'
--- jujuclient.py	2015-02-27 12:03:22 +0000
+++ jujuclient.py	2015-05-11 14:34:07 +0000
@@ -19,6 +19,7 @@
 import logging
 import os
 import pprint
+import re
 import shutil
 import signal
 import socket
@@ -218,9 +219,18 @@
             data = yaml.safe_load(fh.read())
             return jhome, data
 
+    @staticmethod
+    def split_host_port(server):
+        m = re.match('(.*):(.*)', server)
+        if not m:
+            raise ValueError("Not an ipaddr/port {!r}".format(server))
+        address = m.group(1).strip("[]")
+        port = m.group(2)
+        return address, port
+
     def is_server_available(self, server):
         """ Given address/port, return true/false if it's up """
-        address, port = server.split(":")
+        address, port = Connector.split_host_port(server)
         try:
             socket.create_connection((address, port), 3)
             return True

=== modified file 'test_jujuclient.py'
--- test_jujuclient.py	2015-01-27 22:32:46 +0000
+++ test_jujuclient.py	2015-05-11 14:34:07 +0000
@@ -60,6 +60,28 @@
         self.assertFalse(
             Connector().is_server_available("foo.example.com:7070"))
 
+    def test_split_host_port_dns(self):
+        self.assertEqual(
+            Connector.split_host_port('foo.example.com:7070'),
+            ('foo.example.com', '7070')
+        )
+
+    def test_is_server_available_ipv4(self):
+        self.assertEqual(
+            Connector.split_host_port('10.0.0.10:7070'),
+            ('10.0.0.10', '7070')
+        )
+
+    def test_is_server_available_ipv6(self):
+        self.assertEqual(
+            Connector.split_host_port('[2001:db8::1]:7070'),
+            ('2001:db8::1', '7070')
+        )
+
+    def test_is_server_available_invalid_input(self):
+        self.assertRaises(
+            ValueError, Connector.split_host_port, 'I am not an ip/port combo'
+        )
 
 class KeyManagerTest(unittest.TestCase):
     def setUp(self):