Merge lp:~hazmat/pyjuju/maas-tags-redux into lp:pyjuju

[Kapil Thangavelu]

Fix broken maas-tags constraint.

The maas tags wasn't properly converting values for comparision
and was not previously testing tag constraint comparisons.

[Kapil Thangavelu (hazmat)]

Please take a look.

[Kapil Thangavelu (hazmat)]

*** Submitted:

Fix broken maas-tags constraint.

The maas tags wasn't properly converting values for comparision
and was not previously testing tag constraint comparisons.

[Martin Packman (gz)]

This looks like a straight revert of r597 which confuses me somewhat. Does this mean bug 1064734 is unfixed by this change, or have we changed something since?

=== modified file 'juju/lib/serializer.py'
--- juju/lib/serializer.py	2012-09-14 15:33:33 +0000
+++ juju/lib/serializer.py	2013-02-16 15:14:26 +0000
@@ -2,20 +2,22 @@
 from yaml import dump as _dump
 from yaml import load as _load
 
+
 def dump(value):
     return _dump(value, Dumper=CSafeDumper)
 
 yaml_dump = dump
 
+
 def load(value):
     return _load(value, Loader=CSafeLoader)
 
 yaml_load = load
 
+
 def yaml_mark_with_path(path, mark):
     # yaml c ext, cant be modded, convert to capture path
     return Mark(
         path, mark.index,
         mark.line, mark.column,
         mark.buffer, mark.pointer)
-
 
=== modified file 'juju/machine/tests/test_constraints.py'
--- juju/machine/tests/test_constraints.py	2012-07-24 15:05:16 +0000
+++ juju/machine/tests/test_constraints.py	2013-02-16 15:14:26 +0000
@@ -165,6 +165,7 @@
         other_cs = ConstraintSet("other")
         other_cs.register_generics([])
         other_constraints = other_cs.parse([])
+
         instances = (
             dummy_constraints.with_series("x"),
             dummy_constraints.with_series("y"),
 
=== modified file 'juju/providers/maas/provider.py'
--- juju/providers/maas/provider.py	2012-10-10 15:24:48 +0000
+++ juju/providers/maas/provider.py	2013-02-16 15:14:26 +0000
@@ -45,7 +45,7 @@
             if tag not in self.tag_names:
                 raise ValueError("tag %r does not exist" % (tag,))
             tags.add(tag)
-        return tag_expression
+        return tags
 
 
 class MachineProvider(MachineProviderBase):
@@ -79,7 +79,7 @@
         tags_info = yield self.maas_client.list_tags()
         handler = _TagHandler(tags_info)
         cs.register("maas-tags", converter=handler.convert,
-            comparer=handler.compare)
+                    comparer=handler.compare)
         returnValue(cs)
 
     def get_serialization_data(self):
 
=== modified file 'juju/providers/maas/tests/test_provider.py'
--- juju/providers/maas/tests/test_provider.py	2012-10-10 13:16:45 +0000
+++ juju/providers/maas/tests/test_provider.py	2013-02-16 15:14:26 +0000
@@ -7,6 +7,9 @@
 
 from juju.errors import ConstraintError, MachinesNotFound, ProviderError
 from juju.lib.mocker import ANY
+from juju.lib import serializer
+from juju.machine.constraints import Constraints
+
 from juju.providers.maas import MachineProvider
 from juju.providers.maas.maas import MAASClient
 from juju.providers.maas.tests.testing import (
@@ -183,14 +186,35 @@
             {'name': "clawed", 'definition': "HAS claws", 'comment': ""},
             ]))
         self.mocker.replay()
+
         provider = MachineProvider("maasiv", CONFIG)
         provider.maas_client = mock_client
         cs = yield provider.get_constraint_set()
         bear = cs.parse(["maas-tags=clawed, furry"])
-        bear.can_satisfy(bear)
-        self.assertEqual("clawed, furry", bear["maas-tags"])
-        err = self.assertRaises(ConstraintError,
+
+        # Incomplete constraints (no series) can't satisify
+        self.assertFalse(bear.can_satisfy(bear))
+
+        self.assertEqual(set(["clawed", "furry"]), bear["maas-tags"])
+
+        err = self.assertRaises(
+            ConstraintError,
             cs.parse, ["maas-tags=furry, bouncy"])
-        self.assertEqual("Bad 'maas-tags' constraint 'furry, bouncy': "
+
+        self.assertEqual(
+            "Bad 'maas-tags' constraint 'furry, bouncy': "
             "tag 'bouncy' does not exist",
             str(err))
+
+        bear = bear.with_series("precise")
+
+        # Ensure we can roundtrip through serialization.
+        raw = serializer.dump(bear.data)
+        grizzly = cs.load(serializer.load(raw))
+
+        self.assertTrue(grizzly.can_satisfy(bear))
+        rodent = cs.parse(
+            ["maas-tags=clawed"]).with_series("raring")
+        self.assertFalse(rodent.can_satisfy(grizzly))
+        self.assertTrue(grizzly.can_satisfy(
+            rodent.with_series("precise")))
 
=== modified file 'juju/unit/lifecycle.py'
--- juju/unit/lifecycle.py	2013-02-14 22:59:57 +0000
+++ juju/unit/lifecycle.py	2013-02-16 15:14:26 +0000
@@ -401,13 +401,11 @@
         added = self._sort_relations(
             set(new_relations.keys()) - set(self._relations.keys()),
             new_relations)
-        print 'add', added, [new_relations[a] for a in added]
 
         removed = self._sort_relations(
             set(self._relations.keys()) - set(new_relations.keys()),
             self._relations,
             invert=True)
-        print 'removed', removed
 
         # Could this service be a principal container?
         is_principal = not (yield self._service.is_subordinate())