Merge lp:~andreserl/pyjuju/maas_provider_distro_series into lp:pyjuju

[Andres Rodriguez]

Add support for distro/ubuntu series to MAAS provider

Add maas support for release series

Removes hardcoded precise series, as maas now supports multiple distro
series.

[Andres Rodriguez (andreserl)]

All,

I can't seem to figure out the test above and I'd appreciate if someone else could have a look and help me out since we would like to get this merged ASAP.

Cheers.

[Kapil Thangavelu (hazmat)]

this appears to be a request for help rather than a merge proposal. a diff/patch that fixes this test failure is here.
http://paste.ubuntu.com/1219433/

please repropose if this intended for a review and merge.

[Andres Rodriguez (andreserl)]

Hi Kapil,

Thanks for the path. I have set this back to 'Needs Review'.

Thank you.

[Kapil Thangavelu (hazmat)]

tests were broken... should be using lib.serializer.dump

+ self.write_config(yaml.dump(config), other_path=True)

would have been nice to see a test for a non supported series.

the branch looks fine though, nice to see the maas provider improvements.

review: Approve

[Kapil Thangavelu (hazmat)]

*** Submitted:

Add maas support for release series

Removes hardcoded precise series, as maas now supports multiple distro
series.

=== modified file 'juju/environment/config.py'
--- juju/environment/config.py	2012-09-15 19:24:00 +0000
+++ juju/environment/config.py	2012-09-24 17:16:21 +0000
@@ -118,7 +118,7 @@
             "placement": _EITHER_PLACEMENT,
             # MAAS currently only provisions precise; any other default-series
             # would just lead to errors down the line.
-            "default-series": Constant("precise")},
+            "default-series": String()},
             optional=["placement"]),
         "local": KeyDict({
             "admin-secret": String(),

=== modified file 'juju/environment/tests/test_config.py'
--- juju/environment/tests/test_config.py	2012-09-15 18:00:48 +0000
+++ juju/environment/tests/test_config.py	2012-09-24 17:16:21 +0000
@@ -722,13 +722,11 @@
     def test_maas_default_series(self):
         config = serializer.yaml_load(SAMPLE_MAAS)
         config["environments"]["sample"]["default-series"] = "magnificent"
-        self.write_config(serializer.yaml_dump(config), other_path=True)
-        e = self.assertRaises(
-            EnvironmentsConfigError, self.config.load, self.other_path)
-        self.assertIn(
-            "environments.sample.default-series: expected 'precise', got "
-            "'magnificent'",
-            str(e))
+        self.write_config(yaml.dump(config), other_path=True)
+        self.config.load(self.other_path)
+
+        provider = self.config.get_default().get_machine_provider()
+        self.assertEqual(provider.config["default-series"], "magnificent")
 
     def test_maas_verifies_placement(self):
         config = serializer.yaml_load(SAMPLE_MAAS)

=== modified file 'juju/providers/maas/launch.py'
--- juju/providers/maas/launch.py	2012-03-28 14:40:14 +0000
+++ juju/providers/maas/launch.py	2012-09-24 17:16:21 +0000
@@ -36,6 +36,7 @@
         :rtype: :class:`twisted.internet.defer.Deferred`
         """
         maas_client = self._provider.maas_client
+        series = self._constraints["ubuntu-series"]
         instance_data = yield maas_client.acquire_node(self._constraints)
         instance_uri = instance_data["resource_uri"]
         # If anything goes wrong after the acquire and before the launch
@@ -45,7 +46,7 @@
             cloud_init.set_provider_type("maas")
             cloud_init.set_instance_id_accessor(instance_uri)
             node_data = yield maas_client.start_node(
-                instance_uri, cloud_init.render())
+                instance_uri, series, cloud_init.render())
             machine = MAASMachine.from_dict(node_data)
         except Exception:
             log.exception(

=== modified file 'juju/providers/maas/maas.py'
--- juju/providers/maas/maas.py	2012-05-25 06:49:32 +0000
+++ juju/providers/maas/maas.py	2012-09-24 17:16:21 +0000
@@ -124,7 +124,7 @@
                 params["name"] = name
         return self.post("api/1.0/nodes/", params)
 
-    def start_node(self, resource_uri, user_data):
+    def start_node(self, resource_uri, ubuntu_series, user_data):
         """Ask MAAS to start a node.
 
         :param resource_uri: The MAAS URI for the node you want to start.
@@ -135,7 +135,7 @@
         """
         assert isinstance(user_data, str), (
             "User data must be a byte string.")
-        params = {"op": "start", "user_data": b64encode(user_data)}
+        params = {"op": "start", "distro_series": ubuntu_series, "user_data": b64encode(user_data)}
         return self.post(resource_uri, params)
 
     def stop_node(self, resource_uri):

=== modified file 'juju/providers/maas/provider.py'
--- juju/providers/maas/provider.py	2012-03-28 14:40:14 +0000
+++ juju/providers/maas/provider.py	2012-09-24 17:16:21 +0000
@@ -38,13 +38,7 @@
         """Return the set of constraints that are valid for this provider."""
         cs = yield super(MachineProvider, self).get_constraint_set()
 
-        def require_precise(s):
-            if s != "precise":
-                raise ValueError(
-                     "MAAS currently only provisions machines running precise")
-            return s
-
-        cs.register("ubuntu-series", converter=require_precise, visible=False)
+        cs.register("ubuntu-series", visible=False)
         cs.register("maas-name")
         returnValue(cs)
 

=== modified file 'juju/providers/maas/tests/test_launch.py'
--- juju/providers/maas/tests/test_launch.py	2012-05-25 06:32:24 +0000
+++ juju/providers/maas/tests/test_launch.py	2012-09-24 17:16:21 +0000
@@ -72,7 +72,8 @@
         provider = self._get_provider(
             FakeMAASHTTPConnectionWithNoAvailableNodes)
         machine_data = {
-            "machine-id": "foo", "constraints": {"maas-name": None}}
+            "machine-id": "foo", "constraints": {"maas-name": None,
+            "ubuntu-series": "splendid"}}
         d = provider.start_machine(machine_data)
 
         # These arbitrary fake failure values come from
@@ -94,7 +95,8 @@
         # Try to start up that node using the fake MAAS.
         provider = self._get_provider(FakeMAASHTTPConnection)
         machine_data = {
-            "machine-id": machine_id, "constraints": {"maas-name": None}}
+            "machine-id": machine_id, "constraints": {"maas-name": None,
+            "ubuntu-series": "splendid"}}
         machine_list = yield provider.start_machine(machine_data)
 
         # Test that it returns a list containing a single MAASMachine
@@ -118,7 +120,7 @@
         self.assertEqual("moon", target_node["hostname"])
         machine_id = "foo"
         provider = self._get_provider(FakeMAASHTTPConnection)
-        constraints = {"maas-name": "moon"}
+        constraints = {"maas-name": "moon", "ubuntu-series": "splendid"}
         machine_data = {"machine-id": machine_id, "constraints": constraints}
         machine_list = yield provider.start_machine(machine_data)
 
@@ -147,10 +149,10 @@
         # The following operations happen in sequence.
         mocker.order()
         # First, the node is acquired.
-        mock_client.acquire_node({"maas-name": None})
+        mock_client.acquire_node({"maas-name": None, "ubuntu-series": "precise"})
         mocker.result({"resource_uri": "/node/123"})
         # Second, the node is started. We simulate a failure at this stage.
-        mock_client.start_node("/node/123", ANY)
+        mock_client.start_node("/node/123", "precise", ANY)
         mocker.throw(ZeroDivisionError)
         # Last, the node is released.
         mock_client.release_node("/node/123")
@@ -158,5 +160,6 @@
 
         mocker.replay()
         return self.assertFailure(
-            MAASLaunchMachine(mock_provider, {"maas-name": None}).run("fred"),
+            MAASLaunchMachine(mock_provider,
+                              {"maas-name": None, "ubuntu-series": "precise"}).run("fred"),
             ZeroDivisionError)

=== modified file 'juju/providers/maas/tests/test_maas.py'
--- juju/providers/maas/tests/test_maas.py	2012-06-06 19:08:04 +0000
+++ juju/providers/maas/tests/test_maas.py	2012-09-24 17:16:21 +0000
@@ -222,9 +222,10 @@
     @inlineCallbacks
     def test_start_node(self):
         resource_uri = NODE_JSON[0]["resource_uri"]
+        series = "splendid"
         data = "This is test data."
         client, log = self.get_client()
-        returned_data = yield client.start_node(resource_uri, data)
+        returned_data = yield client.start_node(resource_uri, series, data)
         self.assertEqual(returned_data, NODE_JSON[0])
         # Also make sure that the connection was passed the user_data in
         # the POST data.
@@ -242,7 +243,7 @@
     @inlineCallbacks
     def test_start_node_connects_with_oauth_credentials(self):
         client, log = self.get_client()
-        yield client.start_node("foo", "bar")
+        yield client.start_node("foo", "splendid", "bar")
         [factory_call] = [
             record for record in log if record.called == "factory"]
         self.assertIn("Authorization", factory_call.result.headers)

=== modified file 'juju/providers/maas/tests/test_provider.py'
--- juju/providers/maas/tests/test_provider.py	2012-03-28 14:40:14 +0000
+++ juju/providers/maas/tests/test_provider.py	2012-09-24 17:16:21 +0000
@@ -164,15 +164,3 @@
         self.assertFalse(nil.can_satisfy(ben))
         self.assertFalse(ben.can_satisfy(bill))
         self.assertFalse(bill.can_satisfy(ben))
-
-    @inlineCallbacks
-    def test_precise_only_constraints(self):
-        provider = MachineProvider("blah", CONFIG)
-        cs = yield provider.get_constraint_set()
-        e = self.assertRaises(
-             ConstraintError, cs.parse([]).with_series, "not-precise")
-        self.assertEquals(
-            str(e),
-            "Bad 'ubuntu-series' constraint 'not-precise': MAAS currently "
-            "only provisions machines running precise")
-