From 3b2f2705919a11bcf92fdb346c26c1baa4710ad5 Mon Sep 17 00:00:00 2001
From: Stavros Sachtouris <saxtouri@admin.grnet.gr>
Date: Wed, 18 Jun 2014 14:47:02 +0300
Subject: [PATCH] Remove deprecated "--hard" arg. from server reboot

---
 Changelog                   | 1 +
 kamaki/cli/cmds/cyclades.py | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Changelog b/Changelog
index 693f3124..03373300 100644
--- a/Changelog
+++ b/Changelog
@@ -25,4 +25,5 @@ Features:
 - Update account API commands to reflect changes in synnefo 0.16
 - Implement a get_endpoint_url method and use it
 - Rename kamaki.clients.Client.base_url --> endpoint_url, keep BW compatibility [#9]
+- Remove deprecated --hard argument in "kamaki server reboot"
 
diff --git a/kamaki/cli/cmds/cyclades.py b/kamaki/cli/cmds/cyclades.py
index 47cd0e2f..c7c56b2f 100644
--- a/kamaki/cli/cmds/cyclades.py
+++ b/kamaki/cli/cmds/cyclades.py
@@ -744,8 +744,6 @@ class server_reboot(_CycladesInit, _ServerWait):
     """Reboot a virtual server"""
 
     arguments = dict(
-        hard=FlagArgument(
-            'perform a hard reboot (deprecated)', ('-f', '--force')),
         type=ValueArgument('SOFT or HARD - default: SOFT', ('--type')),
         wait=FlagArgument('Wait server to be destroyed', ('-w', '--wait'))
     )
@@ -754,11 +752,7 @@ class server_reboot(_CycladesInit, _ServerWait):
     @errors.Cyclades.connection
     @errors.Cyclades.server_id
     def _run(self, server_id):
-        hard_reboot = self['hard']
-        if hard_reboot:
-            self.error(
-                'WARNING: -f/--force will be deprecated in version 0.12\n'
-                '\tIn the future, please use --type=hard instead')
+        hard_reboot = None
         if self['type']:
             if self['type'].lower() in ('soft', ):
                 hard_reboot = False
-- 
GitLab