Merge pull request #1633 from caberos/issue1632

fix issue on loadbal order command

Author: allmightyspiff

SoftLayer/CLI/loadbal/order.py

@@ -41,8 +41,14 @@ def order(env, **args):
     """Creates a LB. Protocols supported are TCP, HTTP, and HTTPS."""
 
     mgr = SoftLayer.LoadBalancerManager(env.client)
+    network = SoftLayer.NetworkManager(env.client)
+
+    datacenter = network.get_datacenter(datacenter=args.get('datacenter'))
+    if datacenter:
+        location = {'id': datacenter[0]['id']}
+    else:
+        raise exceptions.CLIHalt('Datacenter {} was not found'.format(datacenter))
 
-    location = args.get('datacenter')
     name = args.get('name')
     description = args.get('label', None)
 

SoftLayer/managers/load_balancer.py

@@ -245,7 +245,7 @@ def order_lbaas(self, datacenter, name, desc, protocols, subnet_id, public=False
             'complexType': 'SoftLayer_Container_Product_Order_Network_LoadBalancer_AsAService',
             'name': name,
             'description': desc,
-            'location': datacenter,
+            'locationObject': datacenter,
             'packageId': package.get('id'),
             'useHourlyPricing': True,  # Required since LBaaS is an hourly service
             'prices': [{'id': price_id} for price_id in prices],

tests/managers/loadbal_tests.py

@@ -143,7 +143,7 @@ def test_remove_lb_listener(self):
                                 args=(uuid, [listener]))
 
     def test_order_lbaas(self):
-        datacenter = 'tes01'
+        datacenter = {'id': 1854895}
         name = 'test-lb'
         desc = 'my lb'
         protocols = {'frontendPort': 80, 'frontendProtocol': 'HTTP'}
@@ -174,7 +174,7 @@ def test_order_lbaas(self):
             'complexType': 'SoftLayer_Container_Product_Order_Network_LoadBalancer_AsAService',
             'name': name,
             'description': desc,
-            'location': datacenter,
+            'locationObject': {'id': 1854895},
             'packageId': package[0]['id'],
             'useHourlyPricing': True,  # Required since LBaaS is an hourly service
             'prices': [{'id': package[0]['itemPrices'][0]['id']}],