Merge lp:~julian-edwards/pyjuju/maas-get-nodes-fix into lp:pyjuju

[Julian Edwards]

Fix the MAAS API call that is used for get_nodes so that it only returns allocated nodes. Also add MAASUnitAddress.

Fix the MAAS API call that is used for get_nodes so that it only returns allocated nodes. Also a MAASUnitAddress was missing so I've added one.

[lp:~julian-edwards/pyjuju/maas-get-nodes-fix]

488. By Julian Edwards on 2012-03-22

Add MAASUnitAddress

[William Reade (fwereade)]

LGTM, I will land this shortly.

review: Approve

=== modified file 'juju/providers/maas/maas.py'
--- juju/providers/maas/maas.py	2012-03-06 11:21:45 +0000
+++ juju/providers/maas/maas.py	2012-03-22 09:11:18 +0000
@@ -66,7 +66,7 @@
 
         :return: A Deferred whose value is the list of nodes.
         """
-        params = [("op", "list")]
+        params = [("op", "list_allocated")]
         if system_ids is not None:
             params.extend(("id", system_id) for system_id in system_ids)
         return self._get("/api/1.0/nodes/", params)

=== modified file 'juju/providers/maas/tests/testing.py'
--- juju/providers/maas/tests/testing.py	2012-03-08 01:19:31 +0000
+++ juju/providers/maas/tests/testing.py	2012-03-22 09:11:18 +0000
@@ -111,10 +111,10 @@
 
     def get(self):
         # List all nodes.
-        if self.url.endswith("/nodes/?op=list"):
+        if self.url.endswith("/nodes/?op=list_allocated"):
             return self.list_nodes()
         # List some nodes.
-        elif "nodes/?op=list&id=" in self.url:
+        elif "nodes/?op=list_allocated&id=" in self.url:
             return self.list_some_nodes()
         # Not recognized.
         else:

=== modified file 'juju/unit/address.py'
--- juju/unit/address.py	2011-10-01 03:55:03 +0000
+++ juju/unit/address.py	2012-03-22 09:11:18 +0000
@@ -22,6 +22,8 @@
         returnValue(OrchestraUnitAddress())
     elif provider_type == "dummy":
         returnValue(DummyUnitAddress())
+    elif provider_type == "maas":
+        returnValue(MAASUnitAddress())
 
     raise JujuError(
         "Unknown provider type: %r, unit addresses unknown." % provider_type)
@@ -84,3 +86,15 @@
     def _get_address(self):
         output = subprocess.check_output(["hostname", "-f"])
         return output.strip()
+
+class MAASUnitAddress(UnitAddress):
+
+    def get_private_address(self):
+        return deferToThread(self._get_address)
+
+    def get_public_address(self):
+        return deferToThread(self._get_address)
+
+    def _get_address(self):
+        output = subprocess.check_output(["hostname", "-f"])
+        return output.strip()

=== modified file 'juju/unit/tests/test_address.py'
--- juju/unit/tests/test_address.py	2011-10-01 03:55:03 +0000
+++ juju/unit/tests/test_address.py	2012-03-22 09:11:18 +0000
@@ -8,7 +8,7 @@
 from juju.lib.testing import TestCase
 from juju.unit.address import (
     EC2UnitAddress, LocalUnitAddress, OrchestraUnitAddress, DummyUnitAddress,
-    get_unit_address)
+    MAASUnitAddress, get_unit_address)
 from juju.state.environment import GlobalSettingsStateManager
 
 
@@ -46,6 +46,11 @@
         address = yield self.get_address_for("dummy")
         self.assertTrue(isinstance(address, DummyUnitAddress))
 
+    @inlineCallbacks
+    def test_get_MAAS_address(self):
+        address = yield self.get_address_for("maas")
+        self.assertTrue(isinstance(address, MAASUnitAddress))
+
     def test_get_unknown_address(self):
         return self.assertFailure(self.get_address_for("foobar"), JujuError)
 
@@ -124,3 +129,23 @@
         self.assertEqual(
             (yield self.address.get_private_address()),
             "slice.foobar.domain.net")
+
+
+class MAASAddressTest(TestCase):
+
+    def setUp(self):
+        self.address = OrchestraUnitAddress()
+
+    @inlineCallbacks
+    def test_get_address(self):
+        self.patch(
+            subprocess, "check_output",
+            lambda args: "absent.friends.net\n")
+
+        self.assertEqual(
+            (yield self.address.get_public_address()),
+            "absent.friends.net")
+
+        self.assertEqual(
+            (yield self.address.get_private_address()),
+            "absent.friends.net")