Merge lp:~daker/pyjuju/small-fix into lp:pyjuju

[Adnane Belmadiaf]

[Ahmed Kamal (kim0)]

I would actually love it if shutdown took a -y argument as well

[lp:~daker/pyjuju/small-fix]

277. By Adnane Belmadiaf on 2011-07-15

Added -y argument to shutdown command.

[William Reade (fwereade)]

Line 13 goes well over 80 characters, please break it.

Also: can I suggest that you use a name other than "choice" for the dest and variable names? I think something like "confirmed" would be a bit clearer (which environment you're using is also a choice, and so will be any other options we add in the future).

Otherwise, it works perfectly :).

review: Needs Resubmitting

[lp:~daker/pyjuju/small-fix]

278. By Adnane Belmadiaf on 2011-07-21

* Added --yes argument to shutdown command
* Changed dest variable name
* Other fixes

[William Reade (fwereade)]

Sorry, I think I was unclear before: I meant that the source line should be broken, not that the help text itself needed a line break.

I also just noticed that you've put spaces before colons, which isn't necessary. Please remove those, but otherwise I'm happy; +1.

review: Approve

[lp:~daker/pyjuju/small-fix]

279. By Adnane Belmadiaf on 2011-07-21

* Small fix

280. By Adnane Belmadiaf on 2011-07-21

* Remove spaces

[Kapil Thangavelu (hazmat)]

There aren't any tests here. There should be a default=False for the param, especially given the is False condition afaics.

review: Needs Fixing

[lp:~daker/pyjuju/small-fix]

281. By Adnane Belmadiaf on 2011-07-21

* Added a default value

282. By Adnane Belmadiaf on 2011-07-21

* Added test case, props hazmat

[Kapil Thangavelu (hazmat)]

Looks good +1

review: Approve

[Kapil Thangavelu (hazmat)]

one additional question.. have you signed the contributor agreement per?
http://www.canonical.com/contributors

else it looks good to get merged.

[Kapil Thangavelu (hazmat)]

marking work in progress while waiting on contrib agreement.

[Adnane Belmadiaf (daker)]

Ok, sorry for the late reply, i signed the agreement.

Unmerged revisions

282. By Adnane Belmadiaf on 2011-07-21

* Added test case, props hazmat

281. By Adnane Belmadiaf on 2011-07-21

* Added a default value

280. By Adnane Belmadiaf on 2011-07-21

* Remove spaces

279. By Adnane Belmadiaf on 2011-07-21

* Small fix

278. By Adnane Belmadiaf on 2011-07-21

* Added --yes argument to shutdown command
* Changed dest variable name
* Other fixes

277. By Adnane Belmadiaf on 2011-07-15

Added -y argument to shutdown command.

276. By Adnane Belmadiaf on 2011-07-14

Small fix.

=== modified file 'ensemble/control/shutdown.py'
--- ensemble/control/shutdown.py	2011-06-09 15:13:03 +0000
+++ ensemble/control/shutdown.py	2011-07-21 17:57:49 +0000
@@ -9,9 +9,12 @@
     sub_parser.add_argument(
         "--environment", "-e",
         help="Ensemble environment to operate in.")
+    sub_parser.add_argument(
+        "--yes", "-y", dest='confirmed', action='store_true', default=False,
+        help="Destroy all machines and services in the environment "
+             "automatically.")
     return sub_parser
 
-
 @inlineCallbacks
 def command(options):
     """
@@ -19,14 +22,15 @@
     """
     environment = get_environment(options)
     provider = environment.get_machine_provider()
-
-    value = raw_input(
-        "Warning, this will destroy all machines and services in the\n"
-        "environment. Continue [y/N]")
-
-    if value.strip().lower() not in ("y", "yes"):
-        options.log.info("Shutdown aborted")
-        returnValue(None)
+    confirmed = options.confirmed
+    if confirmed is False:
+        value = raw_input(
+            "Warning, this will destroy all machines and services in the\n"
+            "environment. Continue [y/N]: ")
+
+        if value.strip().lower() not in ("y", "ye", "yes"):
+            options.log.info("Shutdown aborted")
+            returnValue(None)
     options.log.info("Shutting down environment %r (type: %s)..." % (
         environment.name, environment.type))
     yield provider.shutdown()

=== added file 'ensemble/tests/test_shutdown.py'
--- ensemble/tests/test_shutdown.py	1970-01-01 00:00:00 +0000
+++ ensemble/tests/test_shutdown.py	2011-07-21 17:57:49 +0000
@@ -0,0 +1,32 @@
+@inlineCallbacks
+def test_shutdown_with_cli_confirm(self):
+    """                                                                                                                                                                                                
+    'ensemble-control shutdown' will shutdown all configured instances                                                                                                                                 
+    in the specified environment. The confirmation prompt can be bypassed                                                                                                                              
+    via a cli option.                                                                                                                                                                                  
+    """
+    config = {
+        "ensemble": "environments",
+        "environments": {"firstenv": {"type": "dummy"},
+        "secondenv": {"type": "dummy"}}}
+    self.write_config(dump(config))
+    finished = self.setup_cli_reactor()
+
+    envs = set(("firstenv", "secondenv"))
+
+    def track_shutdown_call(self):
+        envs.remove(self.environment_name)
+        return succeed(True)
+
+    provider = self.mocker.patch(MachineProvider)
+    provider.shutdown()
+    self.mocker.call(track_shutdown_call, with_object=True)
+
+    self.setup_exit(0)
+    self.mocker.replay()
+
+    main(["shutdown", "-y", "-e", "firstenv"])
+    yield finished
+    msg = "Shutting down environment 'firstenv' (type: dummy)..."
+    self.assertIn(msg, self.log.getvalue())
+    self.assertEqual(envs, set(["secondenv"]))