add hourly/monthly API option

novboy · Mar 7, 2016 · c989658 · c989658
1 parent e151c17
commit c989658
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/mist/io/methods.py b/src/mist/io/methods.py
@@ -1615,7 +1615,7 @@ def create_machine(user, cloud_id, key_id, machine_name, location_id,
                    azure_port_bindings='', hostname='', plugins=None,
                    disk_size=None, disk_path=None,
                    post_script_id='', post_script_params='', cloud_init='',
-                   associate_floating_ip=False, associate_floating_ip_subnet=None, project_id=None, bare_metal=False):
+                   associate_floating_ip=False, associate_floating_ip_subnet=None, project_id=None, bare_metal=False, hourly=True):
 
     """Creates a new virtual machine on the specified cloud.
 
@@ -1719,7 +1719,7 @@ def create_machine(user, cloud_id, key_id, machine_name, location_id,
     elif conn.type is Provider.SOFTLAYER:
         node = _create_machine_softlayer(conn, key_id, private_key, public_key,
                                          machine_name, image, size,
-                                         location, bare_metal, cloud_init)
+                                         location, bare_metal, cloud_init, hourly)
     elif conn.type is Provider.DIGITAL_OCEAN:
         node = _create_machine_digital_ocean(conn, key_id, private_key,
                                              public_key, machine_name,
@@ -2104,7 +2104,7 @@ def _create_machine_nephoscale(conn, key_name, private_key, public_key,
 
 
 def _create_machine_softlayer(conn, key_name, private_key, public_key,
-                             machine_name, image, size, location, bare_metal, cloud_init):
+                             machine_name, image, size, location, bare_metal, cloud_init, hourly):
     """Create a machine in Softlayer.
 
     Here there is no checking done, all parameters are expected to be
@@ -2150,7 +2150,8 @@ def _create_machine_softlayer(conn, key_name, private_key, public_key,
                 location=location,
                 sshKeys=server_key,
                 bare_metal=bare_metal,
-                postInstallScriptUri=postInstallScriptUri
+                postInstallScriptUri=postInstallScriptUri,
+                ex_hourly=hourly
             )
         except Exception as e:
             raise MachineCreationError("Softlayer, got exception %s" % e, e)

diff --git a/src/mist/io/tasks.py b/src/mist/io/tasks.py
@@ -880,7 +880,7 @@ def create_machine_async(email, cloud_id, key_id, machine_name, location_id,
                          docker_port_bindings={}, docker_exposed_ports={},
                          azure_port_bindings='', hostname='', plugins=None,
                          disk_size=None, disk_path=None,
-                         cloud_init='', associate_floating_ip=False, associate_floating_ip_subnet=None, project_id=None, bare_metal=False):
+                         cloud_init='', associate_floating_ip=False, associate_floating_ip_subnet=None, project_id=None, bare_metal=False, hourly=True):
     from multiprocessing.dummy import Pool as ThreadPool
     from mist.io.methods import create_machine
     from mist.io.exceptions import MachineCreationError

diff --git a/src/mist/io/views.py b/src/mist/io/views.py
@@ -515,6 +515,7 @@ def create_machine(request):
         associate_floating_ip_subnet = request.json_body.get('attach_floating_ip_subnet', None)
         project_id = request.json_body.get('project', None)
         bare_metal = request.json_body.get('bare_metal', False)
+        hourly = request.json_body.get('hourly', True)
     except Exception as e:
         raise RequiredParameterMissingError(e)
 
@@ -538,7 +539,7 @@ def create_machine(request):
               'cloud_init': cloud_init,
               'associate_floating_ip': associate_floating_ip,
               'associate_floating_ip_subnet': associate_floating_ip_subnet,
-              'project_id': project_id, 'bare_metal': bare_metal}
+              'project_id': project_id, 'bare_metal': bare_metal, 'hourly': hourly}
     if not async:
         ret = methods.create_machine(user, *args, **kwargs)
     else: