Merge branch 'pr31'

Closes #31

* pr31:
  add termination_time
  add spot instance support
  sort long list of params

Author: mmlb

packet/Device.py

@@ -8,21 +8,23 @@ class Device():
     def __init__(self, data, manager):
         self.manager = manager
 
-        self.id = data['id']
-        self.plan = data['plan']
+        self.billing_cycle = data['billing_cycle']
+        self.created_at = data['created_at']
+        self.facility = data['facility']
         self.hostname = data['hostname']
         self.href = data['href']
-        self.userdata = data['userdata']
-        self.operating_system = OperatingSystem(data['operating_system'])
+        self.id = data['id']
+        self.ip_addresses = data['ip_addresses']
         self.locked = data['locked']
+        self.operating_system = OperatingSystem(data['operating_system'])
+        self.plan = data['plan']
+        self.spot_instance = data.get('spot_instance')
+        self.spot_price_max = data.get('spot_price_max')
+        self.state = data['state']
         self.tags = data['tags']
-        self.created_at = data['created_at']
+        self.termination_time = data.get('termination_time')
         self.updated_at = data['updated_at']
-        self.state = data['state']
-        self.billing_cycle = data['billing_cycle']
         self.user = data['user']
-        self.ip_addresses = data['ip_addresses']
-        self.facility = data['facility']
 
     def update(self):
         params = {

packet/Manager.py

@@ -77,33 +77,40 @@ def create_device(self,
                       plan,
                       facility,
                       operating_system,
+                      always_pxe=False,
                       billing_cycle='hourly',
-                      userdata='',
-                      locked=False,
-                      tags={},
                       features={},
                       ipxe_script_url='',
-                      always_pxe=False,
-                      public_ipv4_subnet_size=31):
+                      locked=False,
+                      public_ipv4_subnet_size=31,
+                      spot_instance=False,
+                      spot_price_max=-1,
+                      tags={},
+                      termination_time=None,
+                      userdata=''):
 
         params = {
-            'hostname': hostname,
-            'project_id': project_id,
-            'plan': plan,
-            'facility': facility,
-            'operating_system': operating_system,
             'billing_cycle': billing_cycle,
-            'userdata': userdata,
-            'locked': locked,
+            'facility': facility,
             'features': features,
+            'hostname': hostname,
+            'locked': locked,
+            'operating_system': operating_system,
+            'plan': plan,
+            'project_id': project_id,
             'public_ipv4_subnet_size': public_ipv4_subnet_size,
             'tags': tags,
+            'userdata': userdata,
         }
 
         if ipxe_script_url != '':
-            params['operating_system'] = 'custom_ipxe'
-            params['ipxe_script_url'] = ipxe_script_url
             params['always_pxe'] = always_pxe
+            params['ipxe_script_url'] = ipxe_script_url
+            params['operating_system'] = 'custom_ipxe'
+        if spot_instance:
+            params['spot_instance'] = spot_instance
+            params['spot_price_max'] = spot_price_max
+            params['termination_time'] = termination_time
         data = self.call_api('projects/%s/devices' % project_id, type='POST', params=params)
         return Device(data, self)
 
@@ -173,3 +180,7 @@ def validate_capacity(self, servers):
                 return False
             else:
                 raise e
+
+    def get_spot_market_prices(self, params={}):
+        data = self.call_api('/market/spot/prices', params=params)
+        return data["spot_market_prices"]