Merge into shadow-trunk-1204 : retire-direct-constraints-creation : Code : pyjuju

Status:	Merged
Approved by:	William Reade on 2012-03-28
Approved revision:	508
Merged at revision:	507
Proposed branch:	lp:~fwereade/pyjuju/retire-direct-constraints-creation
Merge into:	lp:~fwereade/pyjuju/shadow-trunk-1204
Prerequisite:	lp:~fwereade/pyjuju/constraints-via-provider
Diff against target:	0 lines
To merge this branch:	bzr merge lp:~fwereade/pyjuju/retire-direct-constraints-creation
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
William Reade			Pending
Review via email: mp+99651@code.launchpad.net

Description of the change

Remove most remaining direct uses of Constraints

The contents of constraint_test will soon scatter amongst the providers;
leaving them in as verification for now.

https://codereview.appspot.com/5933050/

Revision history for this message

William Reade (fwereade) wrote on 2012-03-28:

#

Download full text (16.2 KiB)

Reviewers: mp+99651_code.launchpad.net,

Message:
Please take a look.

Description:
Remove most remaining direct uses of Constraints

The contents of constraint_test will soon scatter amongst the providers;
leaving them in as verification for now.

https://code.launchpad.net/~fwereade/juju/retire-direct-constraints-creation/+merge/99651

Requires:
https://code.launchpad.net/~fwereade/juju/constraints-via-provider/+merge/99650

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M juju/agents/tests/test_machine.py
   M juju/agents/tests/test_provision.py
   M juju/machine/tests/test_constraints.py
   M juju/state/tests/test_firewall.py
   M juju/state/tests/test_machine.py
   M juju/state/tests/test_placement.py
   M juju/state/tests/test_relation.py
   M juju/state/tests/test_service.py
   M juju/unit/tests/test_deploy.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/agents/tests/test_machine.py
=== modified file 'juju/agents/tests/test_machine.py'
--- juju/agents/tests/test_machine.py 2012-03-27 22:46:44 +0000
+++ juju/agents/tests/test_machine.py 2012-03-28 00:38:16 +0000
@@ -13,7 +13,8 @@
  from juju.charm.tests import local_charm_id
  from juju.charm.tests.test_repository import RepositoryTestBase
  from juju.lib.mocker import MATCH
-from juju.machine.constraints import Constraints
+from juju.machine.tests.test_constraints import (
+ dummy_constraints, series_constraints)
  from juju.state.machine import MachineStateManager, MachineState
  from juju.state.service import ServiceStateManager
  from juju.tests.common import get_test_zookeeper_address
@@ -50,8 +51,7 @@
          # the machine.
          self.service_state_manager = ServiceStateManager(self.client)
          self.service = yield self.service_state_manager.add_service_state(
- "fatality-blog", self.charm_state,
- Constraints.from_strs("dummy", []))
+ "fatality-blog", self.charm_state, dummy_constraints)

      @inlineCallbacks
      def get_agent_config(self):
@@ -60,7 +60,7 @@
          machine_state_manager = MachineStateManager(self.client)

self.machine_state = yield machine_state_manager.add_machine_state(
- Constraints.from_strs("dummy", []).with_series("series"))
+ series_constraints)

self.change_environment(
JUJU_MACHINE_ID="0",

Index: juju/agents/tests/test_provision.py
=== modified file 'juju/agents/tests/test_provision.py'
--- juju/agents/tests/test_provision.py 2012-03-27 23:22:28 +0000
+++ juju/agents/tests/test_provision.py 2012-03-28 00:38:16 +0000
@@ -6,7 +6,7 @@
  from juju.agents.provision import ProvisioningAgent
  from juju.environment.environment import Environment
  from juju.environment.errors import EnvironmentsConfigError
-from juju.machine.constraints import Constraints
+from juju.mach...

Reviewers: mp+99651_code.launchpad.net,

Message:
Please take a look.

Description:
Remove most remaining direct uses of Constraints

The contents of constraint_test will soon scatter amongst the providers;
leaving them in as verification for now.

https://code.launchpad.net/~fwereade/juju/retire-direct-constraints-creation/+merge/99651

Requires:
https://code.launchpad.net/~fwereade/juju/constraints-via-provider/+merge/99650

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M juju/agents/tests/test_machine.py
   M juju/agents/tests/test_provision.py
   M juju/machine/tests/test_constraints.py
   M juju/state/tests/test_firewall.py
   M juju/state/tests/test_machine.py
   M juju/state/tests/test_placement.py
   M juju/state/tests/test_relation.py
   M juju/state/tests/test_service.py
   M juju/unit/tests/test_deploy.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: fwereade@gmail.com-20120327235609-pu5ajqtdqhp83cs9
+New revision: fwereade@gmail.com-20120328003816-yc6ppza8m29cvngz

Index: juju/agents/tests/test_machine.py
=== modified file 'juju/agents/tests/test_machine.py'
--- juju/agents/tests/test_machine.py	2012-03-27 22:46:44 +0000
+++ juju/agents/tests/test_machine.py	2012-03-28 00:38:16 +0000
@@ -13,7 +13,8 @@
  from juju.charm.tests import local_charm_id
  from juju.charm.tests.test_repository import RepositoryTestBase
  from juju.lib.mocker import MATCH
-from juju.machine.constraints import Constraints
+from juju.machine.tests.test_constraints import (
+    dummy_constraints, series_constraints)
  from juju.state.machine import MachineStateManager, MachineState
  from juju.state.service import ServiceStateManager
  from juju.tests.common import get_test_zookeeper_address
@@ -50,8 +51,7 @@
          # the machine.
          self.service_state_manager = ServiceStateManager(self.client)
          self.service = yield self.service_state_manager.add_service_state(
-            "fatality-blog", self.charm_state,
-            Constraints.from_strs("dummy", []))
+            "fatality-blog", self.charm_state, dummy_constraints)

@inlineCallbacks
      def get_agent_config(self):
@@ -60,7 +60,7 @@
          machine_state_manager = MachineStateManager(self.client)

self.machine_state = yield machine_state_manager.add_machine_state(
-            Constraints.from_strs("dummy", []).with_series("series"))
+            series_constraints)

self.change_environment(
              JUJU_MACHINE_ID="0",

Index: juju/agents/tests/test_provision.py
=== modified file 'juju/agents/tests/test_provision.py'
--- juju/agents/tests/test_provision.py	2012-03-27 23:22:28 +0000
+++ juju/agents/tests/test_provision.py	2012-03-28 00:38:16 +0000
@@ -6,7 +6,7 @@
  from juju.agents.provision import ProvisioningAgent
  from juju.environment.environment import Environment
  from juju.environment.errors import EnvironmentsConfigError
-from juju.machine.constraints import Constraints
+from juju.machine.tests.test_constraints import dummy_cs,  
series_constraints
  from juju.errors import ProviderInteractionError
  from juju.lib.mocker import MATCH
  from juju.providers.dummy import DummyMachine
@@ -33,8 +33,7 @@

def add_machine_state(self, constraints=None):
          return self.machine_manager.add_machine_state(
-            constraints or
-            Constraints.from_strs("dummy", []).with_series("series"))
+            constraints or series_constraints)

class ProvisioningAgentStartupTest(ProvisioningTestBase):
@@ -291,9 +290,9 @@
          the error and continue.
          """
          machine_state0 = yield self.add_machine_state(
-            Constraints.from_strs("dummy",  
["cpu=10"]).with_series("series"))
+            dummy_cs.parse(["cpu=10"]).with_series("series"))
          machine_state1 = yield self.add_machine_state(
-            Constraints.from_strs("dummy",  
["cpu=20"]).with_series("series"))
+            dummy_cs.parse(["cpu=20"]).with_series("series"))

mock_provider = self.mocker.patch(self.agent.provider)
          mock_provider.start_machine({

Index: juju/machine/tests/test_constraints.py
=== modified file 'juju/machine/tests/test_constraints.py'
--- juju/machine/tests/test_constraints.py	2012-03-27 10:59:39 +0000
+++ juju/machine/tests/test_constraints.py	2012-03-28 00:38:16 +0000
@@ -4,6 +4,11 @@
  from juju.lib.testing import TestCase
  from juju.machine.constraints import Constraints, ConstraintSet

+# These objects exist for the convenience of other test files
+dummy_cs = ConstraintSet("dummy")
+dummy_cs.register_generics([])
+dummy_constraints = dummy_cs.parse([])
+series_constraints = dummy_constraints.with_series("series")

generic_defaults = {
      "arch": "amd64", "cpu": 1, "mem": 512,

Index: juju/state/tests/test_firewall.py
=== modified file 'juju/state/tests/test_firewall.py'
--- juju/state/tests/test_firewall.py	2012-03-27 23:56:09 +0000
+++ juju/state/tests/test_firewall.py	2012-03-28 00:38:16 +0000
@@ -5,7 +5,7 @@

from juju.errors import ProviderInteractionError
  from juju.lib.mocker import MATCH
-from juju.machine.constraints import Constraints
+from juju.machine.tests.test_constraints import series_constraints
  from juju.providers.dummy import DummyMachine, MachineProvider
  from juju.state.errors import StopWatcher
  from juju.state.firewall import FirewallManager
@@ -262,8 +262,7 @@

def add_machine_state(self):
          manager = MachineStateManager(self.client)
-        constraints = Constraints.from_strs("dummy",  
[]).with_series("series")
-        return manager.add_machine_state(constraints)
+        return manager.add_machine_state(series_constraints)

@inlineCallbacks
      def get_provider_ports(self, machine):

Index: juju/state/tests/test_machine.py
=== modified file 'juju/state/tests/test_machine.py'
--- juju/state/tests/test_machine.py	2012-03-27 23:22:28 +0000
+++ juju/state/tests/test_machine.py	2012-03-28 00:38:16 +0000
@@ -6,7 +6,8 @@

from juju.charm.tests import local_charm_id
  from juju.errors import ConstraintError
-from juju.machine.constraints import Constraints
+from juju.machine.tests.test_constraints import (
+    dummy_constraints, series_constraints)
  from juju.state.charm import CharmStateManager
  from juju.state.machine import MachineStateManager
  from juju.state.service import ServiceStateManager
@@ -15,9 +16,6 @@

from juju.state.tests.common import StateTestBase

-dummy_constraints = Constraints.from_strs("dummy", [])
-series_constraints = dummy_constraints.with_series("series")
-

class MachineStateManagerTest(StateTestBase):

Index: juju/state/tests/test_placement.py
=== modified file 'juju/state/tests/test_placement.py'
--- juju/state/tests/test_placement.py	2012-01-13 14:09:25 +0000
+++ juju/state/tests/test_placement.py	2012-03-28 00:38:16 +0000
@@ -2,12 +2,11 @@
  from twisted.internet.defer import inlineCallbacks

from juju.errors import InvalidPlacementPolicy
-from juju.machine.constraints import Constraints
+from juju.machine.tests.test_constraints import (
+    dummy_constraints, series_constraints)
  from juju.state.placement import place_unit, pick_policy
  from juju.state.tests.test_service import ServiceStateManagerTestBase

-base_constraints = Constraints.from_strs("dummy", [])
-

class TestPlacement(ServiceStateManagerTestBase):

@@ -44,16 +43,16 @@
      def test_unassign_placement(self):
          # Never picked; bad constraints
          yield self.machine_state_manager.add_machine_state(
-            base_constraints.with_series("different-series"))
+            dummy_constraints.with_series("different-series"))

# Would be picked if not hosting another unit
          machine1 = yield self.machine_state_manager.add_machine_state(
-            base_constraints.with_series("series"))
+            series_constraints)
          yield self.unit_state.assign_to_machine(machine1)

# Actually will be picked
          machine2 = yield self.machine_state_manager.add_machine_state(
-            base_constraints.with_series("series"))
+            series_constraints)

# This will have the default constraints already set, and will
          # therefore accept machine2
@@ -67,20 +66,20 @@
          ms3 = yield place_unit(self.client, "unassigned", unit3)
          self.assertEqual(ms3.id, machine2.id + 1)
          constraints = yield ms3.get_constraints()
-        self.assertEqual(constraints,  
base_constraints.with_series("series"))
+        self.assertEqual(constraints, series_constraints)

@inlineCallbacks
      def test_local_placement(self):
          ms0 = yield self.machine_state_manager.add_machine_state(
-            base_constraints.with_series("series"))
+            series_constraints)
          self.assertEqual(ms0.id, 0)

# These shouldn't be used with local (but should be available
          # to prove a different policy is at work)
          yield self.machine_state_manager.add_machine_state(
-            base_constraints.with_series("series"))
+            series_constraints)
          yield self.machine_state_manager.add_machine_state(
-            base_constraints.with_series("series"))
+            series_constraints)
          unit2 = yield self.service.add_unit_state()

ms1 = yield place_unit(self.client, "local", self.unit_state)

Index: juju/state/tests/test_relation.py
=== modified file 'juju/state/tests/test_relation.py'
--- juju/state/tests/test_relation.py	2012-03-27 23:22:28 +0000
+++ juju/state/tests/test_relation.py	2012-03-28 00:38:16 +0000
@@ -9,7 +9,7 @@
  from txzookeeper import ZookeeperClient

from juju.charm.tests import local_charm_id
-from juju.machine.constraints import Constraints
+from juju.machine.tests.test_constraints import dummy_constraints
  from juju.state.charm import CharmStateManager
  from juju.state.endpoint import RelationEndpoint
  from juju.state.errors import (
@@ -41,7 +41,7 @@
                  local_charm_id(self.charm), self.charm, "")
          try:
              service_state = yield self.service_manager.add_service_state(
-                name, self.charm_state, Constraints.from_strs("dummy", []))
+                name, self.charm_state, dummy_constraints)
          except ServiceStateNameInUse:
              service_state = yield  
self.service_manager.get_service_state(name)
          returnValue(service_state)

Index: juju/state/tests/test_service.py
=== modified file 'juju/state/tests/test_service.py'
--- juju/state/tests/test_service.py	2012-03-27 23:22:28 +0000
+++ juju/state/tests/test_service.py	2012-03-28 00:38:16 +0000
@@ -9,7 +9,8 @@
  from juju.charm.directory import CharmDirectory
  from juju.charm.tests import local_charm_id
  from juju.charm.tests.test_metadata import test_repository_path
-from juju.machine.constraints import Constraints
+from juju.machine.tests.test_constraints import (
+    dummy_constraints, dummy_cs, series_constraints)
  from juju.state.charm import CharmStateManager
  from juju.state.endpoint import RelationEndpoint
  from juju.state.service import (
@@ -24,14 +25,9 @@
      MachineStateNotFound, NoUnusedMachines,  
ServiceUnitResolvedAlreadyEnabled,
      ServiceUnitRelationResolvedAlreadyEnabled, StopWatcher)

-
  from juju.state.tests.common import StateTestBase

-dummy_constraints = Constraints.from_strs("dummy", [])
-series_constraints = dummy_constraints.with_series("series")
-
-
  class ServiceStateManagerTestBase(StateTestBase):

@inlineCallbacks
@@ -99,8 +95,7 @@

def add_machine_state(self, constraints=None):
          return self.machine_state_manager.add_machine_state(
-            constraints or
-            Constraints.from_strs("dummy", []).with_series("series"))
+            constraints or series_constraints)

@inlineCallbacks
      def assert_machine_states(self, present, absent):
@@ -164,8 +159,7 @@
          self.assertTrue(details)
          self.assertEquals(details.get("charm"), "local:series/dummy-1")
          self.assertFalse(isinstance(details.get("charm"), unicode))
-        self.assertEquals(
-            Constraints(None, details.get("constraints")),  
series_constraints)
+        self.assertEquals(details.get("constraints"),  
series_constraints.data)

topology = yield self.get_topology()
          self.assertEquals(topology.find_service_with_name("wordpress"),
@@ -266,8 +260,7 @@
      @inlineCallbacks
      def test_get_service_constraints(self):
          """The service state should make constraints available"""
-        initial_constraints = Constraints.from_strs(
-            "dummy", ["cpu=256", "arch=amd64"])
+        initial_constraints = dummy_cs.parse(["cpu=256", "arch=amd64"])
          yield self.service_state_manager.add_service_state(
              "wordpress", self.charm_state, initial_constraints)
          service_state = yield self.service_state_manager.get_service_state(
@@ -316,14 +309,12 @@
      @inlineCallbacks
      def test_set_service_constraints(self):
          """The service state should make constraints available for  
change"""
-        initial_constraints = Constraints.from_strs(
-            "dummy", ["cpu=256", "arch=amd64"])
+        initial_constraints = dummy_cs.parse(["cpu=256", "arch=amd64"])
          yield self.service_state_manager.add_service_state(
              "wordpress", self.charm_state, initial_constraints)
          service_state = yield self.service_state_manager.get_service_state(
              "wordpress")
-        new_constraints = Constraints.from_strs(
-            "dummy", ["mem=2G", "arch=arm"])
+        new_constraints = dummy_cs.parse(["mem=2G", "arch=arm"])
          yield service_state.set_constraints(new_constraints)
          retrieved_constraints = yield service_state.get_constraints()
          self.assertEquals(
@@ -1452,7 +1443,7 @@
          """Constraints are inherited both from juju defaults and service"""
          service_state = yield self.service_state_manager.add_service_state(
              "wordpress", self.charm_state,
-            Constraints.from_strs("dummy", ["arch=arm", "mem=1G"]))
+            dummy_cs.parse(["arch=arm", "mem=1G"]))
          unit_state = yield service_state.add_unit_state()
          constraints = yield unit_state.get_constraints()
          expected = {
@@ -1576,7 +1567,7 @@
          yield mysql_unit_state.assign_to_machine(mysql_machine_state)
          yield self.service_state_manager.remove_service_state(
              mysql_service_state)
-        other_constraints = Constraints.from_strs("dummy", ["arch=arm"])
+        other_constraints = dummy_cs.parse(["arch=arm"])
          wordpress_service_state = yield self.add_service_from_charm(
              "wordpress",  
constraints=other_constraints.with_series("series"))
          wordpress_unit_state = yield  
wordpress_service_state.add_unit_state()

Index: juju/unit/tests/test_deploy.py
=== modified file 'juju/unit/tests/test_deploy.py'
--- juju/unit/tests/test_deploy.py	2012-03-27 23:22:28 +0000
+++ juju/unit/tests/test_deploy.py	2012-03-28 00:38:16 +0000
@@ -9,7 +9,8 @@
  from juju.charm.tests import local_charm_id
  from juju.lib import under
  from juju.lib.mocker import MATCH
-from juju.machine.constraints import Constraints
+from juju.machine.tests.test_constraints import (
+    dummy_constraints, series_constraints)
  from juju.machine.unit import UnitMachineDeployment
  from juju.state.machine import MachineStateManager
  from juju.state.service import ServiceStateManager
@@ -41,11 +42,10 @@
          self.service_state_manager = ServiceStateManager(self.client)
          self.machine_state_manager = MachineStateManager(self.client)
          self.service = yield self.service_state_manager.add_service_state(
-            "myblog", self.charm_state, Constraints.from_strs("dummy", []))
+            "myblog", self.charm_state, dummy_constraints)
          self.unit_state = yield self.service.add_unit_state()
          self.machine_state = yield self.machine_state_manager.\
-            add_machine_state(Constraints.from_strs(
-                "dummy", []).with_series("series"))
+            add_machine_state(series_constraints)
          yield self.unit_state.assign_to_machine(self.machine_state)

# NOTE machine_id must be a str to use with one of the

lp:~fwereade/pyjuju/retire-direct-constraints-creation updated on 2012-03-28