Merge pull request #1432 from caberos/issue1424

Add routers for each DC in `slcli hw create-options`

Author: allmightyspiff

SoftLayer/CLI/hardware/create_options.py

@@ -5,6 +5,7 @@
 
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
+from SoftLayer.managers import account
 from SoftLayer.managers import hardware
 
 
@@ -18,8 +19,9 @@ def cli(env, prices, location=None):
     """Server order options for a given chassis."""
 
     hardware_manager = hardware.HardwareManager(env.client)
+    account_manager = account.AccountManager(env.client)
     options = hardware_manager.get_create_options(location)
-
+    routers = account_manager.get_routers(location)
     tables = []
 
     # Datacenters
@@ -34,6 +36,7 @@ def cli(env, prices, location=None):
     tables.append(_os_prices_table(options['operating_systems'], prices))
     tables.append(_port_speed_prices_table(options['port_speeds'], prices))
     tables.append(_extras_prices_table(options['extras'], prices))
+    tables.append(_get_routers(routers))
 
     # since this is multiple tables, this is required for a valid JSON object to be rendered.
     env.fout(formatting.listing(tables, separator='\n'))
@@ -50,7 +53,7 @@ def _preset_prices_table(sizes, prices=False):
         for size in sizes:
             if size.get('hourlyRecurringFee', 0) + size.get('recurringFee', 0) + 1 > 0:
                 table.add_row([size['name'], size['key'], "%.4f" % size['hourlyRecurringFee'],
-                              "%.4f" % size['recurringFee']])
+                               "%.4f" % size['recurringFee']])
     else:
         table = formatting.Table(['Size', 'Value'], title="Sizes")
         for size in sizes:
@@ -146,3 +149,18 @@ def _get_price_data(price, item):
     if item in price:
         result = price[item]
     return result
+
+
+def _get_routers(routers):
+    """Get all routers information
+
+    :param routers: Routers data
+    """
+
+    table = formatting.Table(["id", "hostname", "name"], title='Routers')
+    for router in routers:
+        table.add_row([router['id'],
+                       router['hostname'],
+                       router['topLevelLocation']['longName'], ])
+    table.align = 'l'
+    return table

SoftLayer/fixtures/SoftLayer_Account.py

@@ -1020,3 +1020,21 @@
         "resourceTableId": 777777
     }
 ]
+
+getRouters = [
+    {
+        "accountId": 1,
+        "bareMetalInstanceFlag": 0,
+        "domain": "softlayer.com",
+        "fullyQualifiedDomainName": "fcr01a.ams01.softlayer.com",
+        "hardwareStatusId": 5,
+        "hostname": "fcr01a.ams01",
+        "id": 123456,
+        "serviceProviderId": 1,
+        "topLevelLocation": {
+            "id": 265592,
+            "longName": "Amsterdam 1",
+            "name": "ams01",
+            "statusId": 2
+        }
+    }]

SoftLayer/managers/account.py

@@ -276,3 +276,20 @@ def get_account_all_billing_orders(self, limit=100, mask=None):
                """
         return self.client.call('Billing_Order', 'getAllObjects',
                                 limit=limit, mask=mask)
+
+    def get_routers(self, mask=None, location=None):
+        """Gets all the routers currently active on the account
+
+        :param string mask: Object Mask
+        :param string location: location string
+        :returns: Routers
+        """
+        object_filter = ''
+        if location:
+            object_filter = {
+                'routers': {
+                    'topLevelLocation': {'name': {'operation': location}}
+                }
+            }
+
+        return self.client['SoftLayer_Account'].getRouters(filter=object_filter, mask=mask)

tests/managers/account_tests.py

@@ -149,3 +149,7 @@ def test_get_item_details_with_invoice_item_id(self):
         self.manager.get_item_detail(123456)
         self.assert_called_with('SoftLayer_Billing_Item', 'getObject', identifier=123456)
         self.assert_called_with('SoftLayer_Billing_Invoice_Item', 'getBillingItem', identifier=123456)
+
+    def test_get_routers(self):
+        self.manager.get_routers()
+        self.assert_called_with("SoftLayer_Account", "getRouters")