Merge lp:~tvansteenburgh/python-jujuclient/juju2-fixes into lp:python-jujuclient

[Tim Van Steenburgh]

[lp:~tvansteenburgh/python-jujuclient/juju2-fixes]

76. By Tim Van Steenburgh on 2016-04-06

Fix out-of-order line

[David Britton (dpb)]

looks good in general

review: Approve

[lp:~tvansteenburgh/python-jujuclient/juju2-fixes]

77. By Tim Van Steenburgh on 2016-04-11

Remove unnecessary override

[Tim Van Steenburgh (tvansteenburgh)]

I removed the WaitForNoMachines.run() override as it was unnecessary - an artifact of some earlier testing I was doing.

=== modified file 'jujuclient.py'
--- jujuclient.py	2016-04-04 20:56:02 +0000
+++ jujuclient.py	2016-04-11 14:00:37 +0000
@@ -311,7 +311,7 @@
 
         data = yaml.safe_load(output)
         try:
-            if controller_name == None:
+            if controller_name is None:
                 controller_name = data['current-controller']
             controller = data['controllers'][controller_name]
             return controller_name, controller
@@ -733,7 +733,7 @@
         conn = HTTPSConnection(host, int(port))
         path = ""
         if self._env_uuid:
-            path = self.endpoint_segment  + "/%s" % self._env_uuid
+            path = self.endpoint_segment + "/%s" % self._env_uuid
         return conn, self._make_headers(), path
 
     # Charm ops / see charm facade for listing charms in environ.
@@ -911,8 +911,9 @@
         return self._rpc({
             "Type": "Client",
             "Request": self.set_constraints_request,
-            "Params": {"ServiceName": "",
-                       "Constraints": self.env._prepare_constraints(constraints)}})
+            "Params": {
+                "ServiceName": "",
+                "Constraints": self.env._prepare_constraints(constraints)}})
 
     def get_env_config(self):
         """Get the environment configuration.
@@ -956,14 +957,14 @@
         """
         return self._rpc({
             "Type": "Client",
-            "Request": unset_request,
+            "Request": self.unset_request,
             "Params": {"Keys": keys}})
 
     def set_env_agent_version(self, version):
         """Upgrade an environment to the given agent version."""
         return self._rpc({
             "Type": "Client",
-            "Request": agent_version_request,
+            "Request": self.agent_version_request,
             "Params": {"Version": version}})
 
     def agent_version(self):
@@ -1398,7 +1399,8 @@
         facade_map[factory.name] = factory
 
     facades = {}
-    for fenv in server_info.get('Facades', []):
+    # juju1 - Facades, juju2 - facades
+    for fenv in server_info.get('Facades') or server_info.get('facades') or []:
         factory = facade_map.get(fenv['Name'])
         if factory is None:
             continue
@@ -2591,9 +2593,9 @@
     Wait for all non state servers to be terminated.
     """
 
-    def __init__(self, watch):
+    def __init__(self, watch, initial_machines=None):
         super(WaitForNoMachines, self).__init__(watch)
-        self.machines = {}
+        self.machines = initial_machines or {}
 
     def process(self, entity_type, change, data):
         if entity_type != 'machine':
@@ -2604,7 +2606,9 @@
             self.machines[data['Id']] = data
 
     def complete(self):
-        if list(self.machines.keys()) == ['0']:
+        if list(self.machines.keys()) == ['0'] and self.watch.version == 0:
+            return True
+        elif not self.machines:
             return True
 
 

=== modified file 'test_jujuclient.py'
--- test_jujuclient.py	2016-04-04 20:11:17 +0000
+++ test_jujuclient.py	2016-04-11 14:00:37 +0000
@@ -54,11 +54,12 @@
     status = env.status()
     for s in status['Services'].keys():
         env.destroy_service(s)
-    env.destroy_machines(
-        sorted(status['Machines'].keys())[1:],
-        force=True)
+    if env.version == 0:
+        env.destroy_machines(sorted(status['Machines'].keys())[1:], force=True)
+    else:
+        env.destroy_machines(sorted(status['Machines'].keys()), force=True)
     watch = env.get_watch()
-    WaitForNoMachines(watch).run()
+    WaitForNoMachines(watch, status['Machines']).run()
     while True:
         status = env.status()
         if len(status['Services']) == 0: