Reviewers: mp+149586_code.launchpad.net,

Message:
Please take a look.

Description:
Properly encode maas tags in urls.

Hopefully the last in the sordid history of maas tag support. Revno 616
reverted
attempts to string serialize tags for urls, but which had broken
constraint
comparisions. Those string serialization had been attempt in revno 597
and 598
to encode maas tags properly for maas client usage. This branch properly

captures the raw tags string for use by the client, while preserving the

constraint comparisons restored in revno 516.

https://code.launchpad.net/~hazmat/juju/maas-with-tags/+merge/149586

(do not edit description out of merge proposal)


Please review this at https://codereview.appspot.com/7365044/

Affected files:
   A [revision details]
   M juju/providers/maas/maas.py
   M juju/providers/maas/tests/test_launch.py
   M juju/providers/maas/tests/test_maas.py


Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: juju/providers/maas/maas.py
=== modified file 'juju/providers/maas/maas.py'
--- juju/providers/maas/maas.py	2012-11-06 16:51:30 +0000
+++ juju/providers/maas/maas.py	2013-02-20 14:40:46 +0000
@@ -47,17 +47,25 @@
          return match.group("system_id")


-def _int_str(value):
+def _int_str(value, k, c):
      """Convert value to integer then string"""
      return str(int(value))


+def _str(value, k, c):
+    return str(value)
+
+
+def _raw(value, k, c):
+    return c.data.get(k)
+
+
  class MAASClient(MAASOAuthConnection):

      _handled_constraints = (
-        ("maas-name", "name", str),
-        ("maas-tags", "tags", str),
-        ("arch", "arch", str),
+        ("maas-name", "name", _str),
+        ("maas-tags", "tags", _raw),
+        ("arch", "arch", _str),
          ("cpu", "cpu_count", _int_str),
          ("mem", "mem", _int_str),
          )
@@ -140,7 +148,7 @@
              for key_from, key_to, translate in self._handled_constraints:
                  value = constraints.get(key_from, None)
                  if value is not None:
-                    params[key_to] = translate(value)
+                    params[key_to] = translate(value, key_from,  
constraints)
          return self.post("api/1.0/nodes/", params)

      def start_node(self, resource_uri, ubuntu_series, user_data):
@@ -154,7 +162,9 @@
          """
          assert isinstance(user_data, str), (
              "User data must be a byte string.")
-        params = {"op": "start", "distro_series":  
ubuntu_series, "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):


Index: juju/providers/maas/tests/test_launch.py
=== modified file 'juju/providers/maas/tests/test_launch.py'
--- juju/providers/maas/tests/test_launch.py	2012-09-28 11:50:35 +0000
+++ juju/providers/maas/tests/test_launch.py	2013-02-20 14:40:46 +0000
@@ -3,9 +3,11 @@

  """Tests for juju.providers.maas.launch"""

+import json
+
  from StringIO import StringIO
  from twisted.internet import defer
-from twisted.internet.defer import inlineCallbacks
+from twisted.internet.defer import inlineCallbacks, succeed

  from juju.errors import ProviderError
  from juju.lib.mocker import ANY
@@ -108,7 +110,7 @@
              "values")

      @inlineCallbacks
-    def test_launch_with_name_constraint(self):
+    def test_launch_with_constraints(self):
          # Try to launch a particular machine by its name using the
          # "maas-name" constraint.

@@ -116,8 +118,25 @@
          target_node = NODE_JSON[1]
          self.assertEqual("moon", target_node["hostname"])
          machine_id = "foo"
-        provider = self._get_provider(FakeMAASHTTPConnection)
-        constraints = {"maas-name": "moon", "ubuntu-series": "splendid"}
+
+        test = self
+
+        class FakeWithTags(FakeMAASHTTPConnection):
+
+            def acquire_node(self):
+                test.assertIn("clawed|furry", self.data)
+                return super(FakeWithTags, self).acquire_node()
+
+            def list_tags(self):
+                return succeed(json.dumps([
+                     
{'name': 'furry', 'definition': 'fuzzy', 'comment': ''},
+                     
{'name': 'clawed', 'definition': 'curvy', 'comment': ''}
+                    ]))
+
+        provider = self._get_provider(FakeWithTags)
+        cs = yield provider.get_constraint_set()
+        constraints = cs.parse(["maas-name=moon", "maas-tags=clawed| 
furry"])
+        constraints = constraints.with_series('splendid')
          machine_data = {"machine-id": machine_id, "constraints":  
constraints}
          machine_list = yield provider.start_machine(machine_data)



Index: juju/providers/maas/tests/test_maas.py
=== modified file 'juju/providers/maas/tests/test_maas.py'
--- juju/providers/maas/tests/test_maas.py	2012-10-27 07:32:50 +0000
+++ juju/providers/maas/tests/test_maas.py	2013-02-20 14:40:46 +0000
@@ -11,6 +11,7 @@
  from twisted.web.error import Error

  from juju.errors import ProviderError
+from juju.providers.maas import MachineProvider
  from juju.providers.maas.maas import extract_system_id, MAASClient
  from juju.providers.maas.tests.testing import (
      CONFIG, FakeMAASHTTPConnection,
@@ -383,9 +384,23 @@
          mem = client.post.params_used.get("mem")
          self.assertEqual("2048", mem)

+    @inlineCallbacks
      def test_acquire_node_handles_arbitrary_tag_query(self):
+        mock_client = self.mocker.patch(MAASClient(CONFIG))
+        mock_client.list_tags()
+        self.mocker.result(succeed([
+            {'name': 'red', 'definition': '', 'comment': ''},
+            {'name': 'white', 'definition': '', 'comment': ''},
+            {'name': 'blue', 'definition': '', 'comment': ''}]))
+        self.mocker.replay()
+
+        provider = MachineProvider("mymaas", CONFIG)
+        provider.maas_client = mock_client
+        cs = yield provider.get_constraint_set()
+        constraints = cs.parse(["maas-tags=red&!white|blue"])
+        constraints = constraints.with_series('splendid')
+
          client = self.set_up_client_with_fake()
-        constraints = {"maas-tags": "red&!white|blue"}
          client.acquire_node(constraints)

          tags = client.post.params_used.get("tags")