#1158 tox style fixes

Author: allmightyspiff

SoftLayer/fixtures/SoftLayer_Network_Application_Delivery_Controller.py

@@ -21,4 +21,4 @@
         'keyName': 'NETSCALER_VPX',
         'name': 'NetScaler VPX'
     }
-}
+}

SoftLayer/fixtures/SoftLayer_Network_LBaaS_HealthMonitor.py

@@ -6,4 +6,4 @@
     'maxRetries': 10,
     'timeout': 10,
     'urlPath': None
-}
+}

SoftLayer/fixtures/SoftLayer_Network_LBaaS_L7Pool.py

@@ -1,2 +1,2 @@
 createL7Pool = {}
-deleteObject = {}
+deleteObject = {}

SoftLayer/fixtures/SoftLayer_Network_LBaaS_Listener.py

@@ -1,3 +1,3 @@
 # https://sldn.softlayer.com/reference/datatypes/SoftLayer_Network_LBaaS_Listener/
 updateLoadBalancerProtocols = {}
-deleteLoadBalancerProtocols = {}
+deleteLoadBalancerProtocols = {}

SoftLayer/fixtures/SoftLayer_Network_LBaaS_LoadBalancer.py

@@ -1,4 +1,4 @@
-getObject =  {
+getObject = {
         'accountId': 1234,
         'address': '01-307608-ams01.clb.appdomain.cloud',
         'createDate': '2019-08-12T07:49:43-06:00',
@@ -39,4 +39,4 @@
 getHealthMonitors = {}
 
 getLoadBalancer = getObject
-cancelLoadBalancer = getObject
+cancelLoadBalancer = getObject

SoftLayer/fixtures/SoftLayer_Network_LBaaS_Member.py

@@ -1,3 +1,3 @@
-#Should be sldn.softlayer.com/reference/datatypes/SoftLayer_Network_LBaaS_LoadBalancer
+# Should be sldn.softlayer.com/reference/datatypes/SoftLayer_Network_LBaaS_LoadBalancer
 deleteLoadBalancerMembers = {}
-addLoadBalancerMembers = deleteLoadBalancerMembers
+addLoadBalancerMembers = deleteLoadBalancerMembers

SoftLayer/managers/load_balancer.py

@@ -107,8 +107,7 @@ def delete_lb_member(self, identifier, member_id):
         :param member_id: Member UUID to remove.
         """
         return self.client.call('SoftLayer_Network_LBaaS_Member', 'deleteLoadBalancerMembers',
-                                 identifier, [member_id])
-
+                                identifier, [member_id])
 
     def add_lb_member(self, identifier, service_info):
         """Adds a member to a LBaaS instance
@@ -119,8 +118,7 @@ def add_lb_member(self, identifier, service_info):
         """
 
         return self.client.call('SoftLayer_Network_LBaaS_Member', 'addLoadBalancerMembers',
-                                 identifier, [service_info])
-
+                                identifier, [service_info])
 
     def add_lb_listener(self, identifier, listener):
         """Adds or update a listener to a LBaaS instance
@@ -134,7 +132,7 @@ def add_lb_listener(self, identifier, listener):
         """
 
         return self.client.call('SoftLayer_Network_LBaaS_Listener', 'updateLoadBalancerProtocols',
-                                 identifier, [listener])
+                                identifier, [listener])
 
     def add_lb_l7_pool(self, identifier, pool, members, health, session):
         """Creates a new l7 pool for a LBaaS instance
@@ -150,7 +148,7 @@ def add_lb_l7_pool(self, identifier, pool, members, health, session):
         """
 
         return self.client.call('SoftLayer_Network_LBaaS_L7Pool', 'createL7Pool',
-                                 identifier, pool, members, health, session)
+                                identifier, pool, members, health, session)
 
     def del_lb_l7_pool(self, identifier):
         """Deletes a l7 pool
@@ -167,7 +165,7 @@ def remove_lb_listener(self, identifier, listener):
         """
 
         return self.client.call('SoftLayer_Network_LBaaS_Listener', 'deleteLoadBalancerProtocols',
-                                 identifier, [listener])
+                                identifier, [listener])
 
     def order_lbaas(self, datacenter, name, desc, protocols, subnet_id, public=False, verify=False):
         """Allows to order a Load Balancer

tests/managers/loadbal_tests.py

@@ -65,15 +65,15 @@ def test_updated_lb_health(self):
     def test_get_lbaas_uuid_id_uuid(self):
         uuid = '1a1aa111-4474-4e16-9f02-4de959229b85'
         my_id = 1111111
-        lb_uuid,lb_id = self.lb_mgr.get_lbaas_uuid_id(uuid)
+        lb_uuid, lb_id = self.lb_mgr.get_lbaas_uuid_id(uuid)
         self.assert_called_with('SoftLayer_Network_LBaaS_LoadBalancer', 'getLoadBalancer', args=(uuid,))
         self.assertEqual(lb_uuid, uuid)
         self.assertEqual(lb_id, my_id)
 
     def test_get_lbaas_uuid_id_id(self):
         uuid = '1a1aa111-4474-4e16-9f02-4de959229b85'
         my_id = 1111111
-        lb_uuid,lb_id = self.lb_mgr.get_lbaas_uuid_id(my_id)
+        lb_uuid, lb_id = self.lb_mgr.get_lbaas_uuid_id(my_id)
         self.assert_called_with('SoftLayer_Network_LBaaS_LoadBalancer', 'getObject', identifier=my_id)
         self.assertEqual(lb_uuid, uuid)
         self.assertEqual(lb_id, my_id)
@@ -121,16 +121,49 @@ def test_remove_lb_listener(self):
         self.assert_called_with('SoftLayer_Network_LBaaS_Listener', 'deleteLoadBalancerProtocols',
                                 args=(uuid, [listener]))
 
-    def order_lbaas(self):
+    def test_order_lbaas(self):
         datacenter = 'tes01'
         name = 'test-lb'
         desc = 'my lb'
         protocols = {'frontendPort': 80, 'frontendProtocol': 'HTTP'}
         subnet_id = 12345
         public = True
         verify = False
+        package = [
+            {
+                'id': 805,
+                'keyNake': 'LBAAS',
+                'itemPrices': [
+                    {
+                        'id': 1,
+                        'name': 'A test price',
+                        'locationGroupId': None
+                    },
+                    {
+                        'id': 2,
+                        'name': 'A test price 2',
+                        'locationGroupId': 123
+                    }
+                ]
+            }
+        ]
+        mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
+        mock.return_value = package
+        order_data = {
+            'complexType': 'SoftLayer_Container_Product_Order_Network_LoadBalancer_AsAService',
+            'name': name,
+            'description': desc,
+            'location': datacenter,
+            'packageId': package[0]['id'],
+            'useHourlyPricing': True,       # Required since LBaaS is an hourly service
+            'prices': [{'id': package[0]['itemPrices'][0]['id']}],
+            'protocolConfigurations': protocols,
+            'subnets': [{'id': subnet_id}],
+            'isPublic': public
+        }
         self.lb_mgr.order_lbaas(datacenter, name, desc, protocols, subnet_id, public, verify)
-        self.assert_called_with('SoftLayer_Product_Order', 'placeOrder')
+        self.assert_called_with('SoftLayer_Product_Order', 'placeOrder', args=(order_data,))
+        self.assert_called_with('SoftLayer_Product_Package', 'getAllObjects')
         verify = True
         self.lb_mgr.order_lbaas(datacenter, name, desc, protocols, subnet_id, public, verify)
         self.assert_called_with('SoftLayer_Product_Order', 'verifyOrder')
@@ -143,4 +176,3 @@ def test_cancel_lbaas(self):
         uuid = 'aa-bb-cc'
         self.lb_mgr.cancel_lbaas(uuid)
         self.assert_called_with('SoftLayer_Network_LBaaS_LoadBalancer', 'cancelLoadBalancer', args=(uuid,))
-