Merge pull request #31 from UpCloudLtd/0.3.8-devel

0.3.8 devel

Author: Elias Nygren

setup.py

@@ -4,15 +4,15 @@
 
 setup(
     name='upcloud-api',
-    version='0.3.7',
+    version='0.3.8',
     description='UpCloud API Client',
     author='Elias Nygren',
     author_email='elias.nygren@upcloud.com',
     maintainer='Elias Nygren',
     maintainer_email='elias.nygren@upcloud.com',
     url='https://github.com/UpCloudLtd/upcloud-python-api',
     packages=['upcloud_api', 'upcloud_api.cloud_manager'],
-    download='https://github.com/UpCloudLtd/upcloud-python-api/tarball/v0.3.7',
+    download='https://github.com/UpCloudLtd/upcloud-python-api/tarball/v0.3.8',
     license='MIT',
     install_requires=[
         'requests>=2.6.0',

upcloud_api/__init__.py

@@ -7,7 +7,7 @@
 from __future__ import unicode_literals
 from __future__ import absolute_import
 
-__version__ = '0.3.7'
+__version__ = '0.3.8'
 __author__ = 'Elias Nygren'
 __author_email__ = 'elias.nygren@upcloud.com'
 __license__ = 'MIT'

upcloud_api/server.py

@@ -135,9 +135,9 @@ def save(self):
     def destroy(self):  # noqa
         self.cloud_manager.delete_server(self.uuid)
 
-    def shutdown(self):
+    def shutdown(self, hard=False, timeout=30):
         """
-        Shutdown/stop the server. Issue a soft shutdown with a timeout of 30s.
+        Shutdown/stop the server. By default, issue a soft shutdown with a timeout of 30s.
 
         After the a timeout a hard shutdown is performed if the server has not stopped.
 
@@ -147,8 +147,8 @@ def shutdown(self):
         """
         body = dict()
         body['stop_server'] = {
-            'stop_type': 'soft',
-            'timeout': '30'
+            'stop_type': 'hard' if hard else 'soft',
+            'timeout': '{0}'.format(timeout)
         }
 
         path = '/server/{0}/stop'.format(self.uuid)
@@ -171,9 +171,10 @@ def start(self):
         self.cloud_manager.post_request(path)
         object.__setattr__(self, 'state', 'started')
 
-    def restart(self):
+    def restart(self, hard=False, timeout=30, force=True):
         """
-        Restart the server. Issue a soft restart with a timeout of 30s.
+        Restart the server. By default, issue a soft restart with a timeout of 30s
+        and a hard restart after the timeout.
 
         After the a timeout a hard restart is performed if the server has not stopped.
 
@@ -183,9 +184,9 @@ def restart(self):
         """
         body = dict()
         body['restart_server'] = {
-            'stop_type': 'soft',
-            'timeout': '30',
-            'timeout_action': 'destroy'
+            'stop_type': 'hard' if hard else 'soft',
+            'timeout': '{0}'.format(timeout),
+            'timeout_action': 'destroy' if force else 'ignore'
         }
 
         path = '/server/{0}/restart'.format(self.uuid)