Merge lp:~james-page/juju-deployer/fixup-to-for-strings into lp:juju-deployer/darwin

[James Page]

Support use of string based machine identifiers in force-machine and
terminate-machine calls

[Kapil Thangavelu (hazmat)]

merged with minor change around the condition as it wouldn't work with mid = '0'. instead two separate clauses of the condition one with (mid.isdigit() and int(mid) == 0) to preserve original intent/behavior.

review: Approve

=== modified file 'deployer/env/base.py'
--- deployer/env/base.py	2013-09-13 13:36:22 +0000
+++ deployer/env/base.py	2013-09-30 10:52:29 +0000
@@ -82,7 +82,7 @@
                     repo = "."
                 params.extend(["--repository=%s" % repo])
             if force_machine is not None:
-                params.extend(["--to=%d" % force_machine])
+                params.extend(["--to=%s" % force_machine])
 
             params.extend([charm_url, name])
             self._check_call(
@@ -96,7 +96,7 @@
         delete the machine (ie units have finished executing stop hooks and are
         removed)
         """
-        if int(mid) == 0:
+        if isinstance(mid, int) and int(mid) == 0:
             raise RuntimeError("Can't terminate machine 0")
         params = self._named_env(["juju", "terminate-machine"])
         params.append(mid)