Refactor hw upgrade.

Author: Fernando

SoftLayer/CLI/hardware/upgrade.py

@@ -68,8 +68,8 @@ def cli(env, identifier, memory, network, drive_controller, public_bandwidth, ad
         if test:
             add_data_to_table(response, table)
         else:
-            table.add_row(['order_date', response.get('orderDate')])
-            table.add_row(['order_id', response.get('orderId')])
+            table.add_row(['Order Date', response.get('orderDate')])
+            table.add_row(['Order Id', response.get('orderId')])
             add_data_to_table(response['orderDetails'], table)
             place_order_table = get_place_order_information(response)
             table.add_row(['Place Order Information', place_order_table])
@@ -83,21 +83,21 @@ def add_data_to_table(response, table):
     """Add the hardware server upgrade result to the table"""
     table.add_row(['location', utils.lookup(response, 'locationObject', 'longName')])
     table.add_row(['quantity', response.get('quantity')])
-    table.add_row(['package_id', response.get('packageId')])
-    table.add_row(['currency_short_name', response.get('currencyShortName')])
-    table.add_row(['prorated_initial_charge', response.get('proratedInitialCharge')])
-    table.add_row(['prorated_order_total', response.get('proratedOrderTotal')])
-    table.add_row(['use_hourly_pricing', response.get('useHourlyPricing')])
+    table.add_row(['Package Id', response.get('packageId')])
+    table.add_row(['Currency Short Name', response.get('currencyShortName')])
+    table.add_row(['Prorated Initial Charge', response.get('proratedInitialCharge')])
+    table.add_row(['Prorated Order Total', response.get('proratedOrderTotal')])
+    table.add_row(['Hourly Pricing', response.get('useHourlyPricing')])
     table_hardware = get_hardware_detail(response)
     table.add_row(['Hardware', table_hardware])
     table_prices = get_hardware_prices(response)
-    table.add_row(['prices', table_prices])
+    table.add_row(['Prices', table_prices])
 
 
 def get_place_order_information(response):
     """Get the hardware server place order information."""
-    table_place_order = formatting.Table(['id', 'account_id', 'status', 'Account CompanyName',
-                                          'UserRecord FirstName', 'UserRecord lastName', 'UserRecord Username'])
+    table_place_order = formatting.Table(['Id', 'Account Id', 'Status', 'Account CompanyName',
+                                          'UserRecord FirstName', 'UserRecord LastName', 'UserRecord Username'])
     table_place_order.add_row([response.get('id'),
                                response.get('accountId'),
                                response.get('status'),
@@ -111,8 +111,8 @@ def get_place_order_information(response):
 
 def get_hardware_detail(response):
     """Get the hardware server detail."""
-    table_hardware = formatting.Table(['account_id', 'hostname', 'domain'])
-    for hardware in response['hardware']:
+    table_hardware = formatting.Table(['Account Id', 'Hostname', 'Domain'])
+    for hardware in response['Hardware']:
         table_hardware.add_row([hardware.get('accountId'),
                                 hardware.get('hostname'),
                                 hardware.get('domain')])
@@ -122,7 +122,7 @@ def get_hardware_detail(response):
 
 def get_hardware_prices(response):
     """Get the hardware server prices."""
-    table_prices = formatting.Table(['id', 'hourlyRecurringFee', 'recurringFee', 'categories', 'Item Description',
+    table_prices = formatting.Table(['Id', 'HourlyRecurringFee', 'RecurringFee', 'Categories', 'Item Description',
                                      'Item Units'])
     for price in response['prices']:
         categories = price.get('categories')[0]
@@ -138,9 +138,9 @@ def get_hardware_prices(response):
 
 def get_order_detail(response):
     """Get the hardware server order detail."""
-    table_order_detail = formatting.Table(['billing_city', 'billing_country_code', 'billing_email',
-                                           'billing_name_first', 'billing_name_last', 'billing_postal_code',
-                                           'billing_state'])
+    table_order_detail = formatting.Table(['Billing City', 'Billing Country Code', 'Billing Email',
+                                           'Billing Name First', 'Billing Name Last', 'Billing Postal Code',
+                                           'Billing State'])
     table_order_detail.add_row([utils.lookup(response, 'orderDetails', 'billingInformation', 'billingCity'),
                                 utils.lookup(response, 'orderDetails', 'billingInformation', 'billingCountryCode'),
                                 utils.lookup(response, 'orderDetails', 'billingInformation', 'billingEmail'),

SoftLayer/fixtures/SoftLayer_Product_Order.py

@@ -69,7 +69,7 @@
         {
             "accountId": 1111,
             "domain": "testedit.com",
-            "hostname": "bardcabero",
+            "hostname": "test",
             "globalIdentifier": "81434794-af69-44d5-bb97-12312asdasdasd"
         }
     ],
@@ -135,8 +135,8 @@
                 "accountId": 1111111,
                 "bareMetalInstanceFlag": 0,
                 "domain": "testedit.com",
-                "fullyQualifiedDomainName": "bardcabero.testedit.com",
-                "hostname": "bardcabero",
+                "fullyQualifiedDomainName": "test.testedit.com",
+                "hostname": "test",
                 "globalIdentifier": "81434794-af69-44d5-bb97-1111111"
             }
         ],
@@ -205,8 +205,8 @@
             "accountId": 1234,
             "firstName": "test",
             "id": 3333,
-            "lastName": "cabero",
-            "username": "sl1234-dcabero"
+            "lastName": "test",
+            "username": "sl1234-test"
         }
     }
 }

SoftLayer/managers/hardware.py

@@ -908,7 +908,8 @@ def get_maintenance_windows_id(self, location_id):
         result_windows = self.client['SoftLayer_Provisioning_Maintenance_Window'].getMaintenanceWindows(begin_date,
                                                                                                         end_date,
                                                                                                         location_id)
-        return result_windows[0]['id']
+        if len(result_windows) > 0:
+            return result_windows[0].get('id')
 
     @retry(logger=LOGGER)
     def get_instance(self, instance_id):