Merge branch 'Loadbal_Support' of

anasouma · anasouma · commit 03ef8d556e87 · 2014-04-16T13:51:40.000-07:00
https://github.com/anasouma/softlayer-python into Loadbal_Support Conflicts: SoftLayer/CLI/environment.py SoftLayer/managers/__init__.py SoftLayer/managers/load_balancer.py
diff --git a/SoftLayer/CLI/modules/loadbal.py b/SoftLayer/CLI/modules/loadbal.py
@@ -12,7 +12,7 @@
   group-delete     Delete a service group from the load balancer
   group-edit       Edit the properties of a service group
   group-reset      Resets all the connections on a service group
-  health-checks    List the different health check values
+  health-check     List the different health check values
   list             List active load balancers
   routing-methods  List supported routing methods
   routing-types    List supported routing types
@@ -29,6 +29,19 @@
 from SoftLayer.CLI.helpers import CLIAbort
 
 
+def get_ids(input_id):
+    """ Helper package to retrieve the actual IDs
+
+    :param input_id: the ID provided by the user
+    :returns: A list of valid IDs
+    """
+    key_value = input_id.split(':')
+    if len(key_value) != 2:
+        raise CLIAbort('Invalid ID %s: ID should be of the form xxx:yyy'
+                       % input_id)
+    return key_value
+
+
 def get_local_lbs_table(load_balancers):
     """ Helper package to format the local load balancers into a table.
 
@@ -42,11 +55,7 @@ def get_local_lbs_table(load_balancers):
                    'Connections/second',
                    'Type'])
 
-    table.align['VIP Address'] = 'r'
-    table.align['Location'] = 'r'
-    table.align['Connections/second'] = 'r'
     table.align['Connections/second'] = 'r'
-    table.align['Type'] = 'r'
 
     for load_balancer in load_balancers:
         ssl_support = 'Not Supported'
@@ -113,7 +122,9 @@ def get_local_lb_table(load_balancer):
 
             table3 = Table(['Service_ID', 'IP Address', 'Port',
                             'Health Check', 'Weight', 'Enabled', 'Status'])
+            service_exist = False
             for service in group['services']:
+                service_exist = True
                 health_check = service['healthChecks'][0]
                 table3.add_row([
                     '%s:%s' % (load_balancer['id'], service['id']),
@@ -125,7 +136,10 @@ def get_local_lb_table(load_balancer):
                     service['enabled'],
                     service['status']
                 ])
-            table.add_row([' Services', table3])
+            if service_exist:
+                table.add_row([' Services', table3])
+            else:
+                table.add_row([' Services', 'None'])
     return table
 
 
@@ -147,11 +161,11 @@ def execute(self, args):
 
 class LoadBalancerHealthChecks(CLIRunnable):
     """
-usage: sl loadbal health-check-types [options]
+usage: sl loadbal health-checks [options]
 
 List load balancer service health check types that can be used
 """
-    action = 'health-check-types'
+    action = 'health-checks'
 
     def execute(self, args):
         mgr = LoadBalancerManager(self.client)
@@ -222,7 +236,7 @@ def execute(self, args):
 
         input_id = args.get('<identifier>')
 
-        key_value = input_id.split(':')
+        key_value = get_ids(input_id)
         loadbal_id = int(key_value[1])
 
         load_balancer = mgr.get_local_lb(loadbal_id)
@@ -234,18 +248,16 @@ class LoadBalancerCancel(CLIRunnable):
 usage: sl loadbal cancel <identifier> [options]
 
 Cancels an existing load_balancer
-Options:
-  --really     Whether to skip the confirmation prompt
 
 """
     action = 'cancel'
-    options = ['really']
+    options = ['confirm']
 
     def execute(self, args):
         mgr = LoadBalancerManager(self.client)
         input_id = args.get('<identifier>')
 
-        key_value = input_id.split(':')
+        key_value = get_ids(input_id)
         loadbal_id = int(key_value[1])
 
         if args['--really'] or confirm("This action will cancel a load "
@@ -261,18 +273,16 @@ class LoadBalancerServiceDelete(CLIRunnable):
 usage: sl loadbal service-delete <identifier> [options]
 
 Deletes an existing load_balancer service
-Options:
-   --really     Whether to skip the confirmation prompt
 
 """
     action = 'service-delete'
-    options = ['really']
+    options = ['confirm']
 
     def execute(self, args):
         mgr = LoadBalancerManager(self.client)
         input_id = args.get('<identifier>')
 
-        key_value = input_id.split(':')
+        key_value = get_ids(input_id)
         service_id = int(key_value[1])
 
         if args['--really'] or confirm("This action will cancel a service "
@@ -288,18 +298,16 @@ class LoadBalancerServiceToggle(CLIRunnable):
 usage: sl loadbal service-toggle <identifier> [options]
 
 Toggle the status of an existing load_balancer service
-Options:
-  --really     Whether to skip the confirmation prompt
 
 """
     action = 'service-toggle'
-    options = ['really']
+    options = ['confirm']
 
     def execute(self, args):
         mgr = LoadBalancerManager(self.client)
         input_id = args.get('<identifier>')
 
-        key_value = input_id.split(':')
+        key_value = get_ids(input_id)
         service_id = int(key_value[1])
 
         if args['--really'] or confirm("This action will toggle the service "
@@ -329,7 +337,7 @@ def execute(self, args):
         mgr = LoadBalancerManager(self.client)
         input_id = args.get('<identifier>')
 
-        key_value = input_id.split(':')
+        key_value = get_ids(input_id)
         loadbal_id = int(key_value[0])
         service_id = int(key_value[1])
 
@@ -339,7 +347,7 @@ def execute(self, args):
             return 'At least one property is required to be changed!'
 
         # check if the IP is valid
-        ip_address_id = 0
+        ip_address_id = None
         if args['--ip']:
             ip_address = mgr.get_ip_address(args['--ip'])
             if not ip_address:
@@ -350,10 +358,10 @@ def execute(self, args):
         mgr.edit_service(loadbal_id,
                          service_id,
                          ip_address_id=ip_address_id,
-                         enabled=int(args.get('--enabled') or -1),
-                         port=int(args.get('--port') or -1),
-                         weight=int(args.get('--weight') or -1),
-                         hc_type=int(args.get('--hc_type') or -1))
+                         enabled=args.get('--enabled'),
+                         port=args.get('--port'),
+                         weight=args.get('--weight'),
+                         hc_type=args.get('--hc_type'))
         return 'Load balancer service %s is being modified!' % input_id
 
 
@@ -377,7 +385,7 @@ def execute(self, args):
         mgr = LoadBalancerManager(self.client)
         input_id = args.get('<identifier>')
 
-        key_value = input_id.split(':')
+        key_value = get_ids(input_id)
         loadbal_id = int(key_value[0])
         group_id = int(key_value[1])
 
@@ -403,18 +411,16 @@ class LoadBalancerServiceGroupDelete(CLIRunnable):
 usage: sl loadbal group-delete <identifier> [options]
 
 Deletes an existing load_balancer service group
-Options:
-  --really     Whether to skip the confirmation prompt
 
 """
     action = 'group-delete'
-    options = ['really']
+    options = ['confirm']
 
     def execute(self, args):
         mgr = LoadBalancerManager(self.client)
         input_id = args.get('<identifier>')
 
-        key_value = input_id.split(':')
+        key_value = get_ids(input_id)
         group_id = int(key_value[1])
 
         if args['--really'] or confirm("This action will cancel a service"
@@ -431,7 +437,7 @@ class LoadBalancerServiceGroupEdit(CLIRunnable):
 
 Edits an existing load_balancer service group
 Options:
---allocation=ALLOC       Change the allocated % of connections
+--allocation=PERC        Change the allocated % of connections
 --port=PORT              Change the port
 --routing_type=TYPE      Change the port routing type
 --routing_method=METHOD  Change the routing method
@@ -443,7 +449,7 @@ def execute(self, args):
         mgr = LoadBalancerManager(self.client)
         input_id = args.get('<identifier>')
 
-        key_value = input_id.split(':')
+        key_value = get_ids(input_id)
         loadbal_id = int(key_value[0])
         group_id = int(key_value[1])
 
@@ -457,10 +463,10 @@ def execute(self, args):
 
         mgr.edit_service_group(loadbal_id,
                                group_id,
-                               allocation=int(args.get('--allocation') or -1),
-                               port=int(args.get('--port') or 0),
-                               routing_type=int(routing_type or 0),
-                               routing_method=int(routing_method or 0))
+                               allocation=args.get('--allocation'),
+                               port=args.get('--port'),
+                               routing_type=routing_type,
+                               routing_method=routing_method)
 
         return 'Load balancer service group %s is being updated!' % input_id
 
@@ -478,7 +484,7 @@ def execute(self, args):
         mgr = LoadBalancerManager(self.client)
         input_id = args.get('<identifier>')
 
-        key_value = input_id.split(':')
+        key_value = get_ids(input_id)
         loadbal_id = int(key_value[0])
         group_id = int(key_value[1])
 
@@ -488,12 +494,12 @@ def execute(self, args):
 
 class LoadBalancerServiceGroupAdd(CLIRunnable):
     """
-usage: sl loadbal group-add <identifier> --allocation=ALLOC --port=PORT \
+usage: sl loadbal group-add <identifier> --allocation=PERC --port=PORT \
 --routing_type=TYPE --routing_method=METHOD [options]
 
 Adds a new load_balancer service
 Required:
---allocation=ALLOC       The % of connections that will be allocated
+--allocation=PERC        The % of connections that will be allocated
 --port=PORT              The virtual port number for the group
 --routing_type=TYPE      The routing type for the group
 --routing_method=METHOD  The routing method for the group
@@ -504,7 +510,7 @@ class LoadBalancerServiceGroupAdd(CLIRunnable):
     def execute(self, args):
         mgr = LoadBalancerManager(self.client)
         input_id = args.get('<identifier>')
-        key_value = input_id.split(':')
+        key_value = get_ids(input_id)
 
         loadbal_id = int(key_value[1])
 
@@ -527,10 +533,9 @@ class LoadBalancerCreate(CLIRunnable):
   -d, --datacenter=DC    Datacenter shortname (sng01, dal05, ...)
                          Note: Omitting this value defaults to the first
                            available datacenter
-  --really     Whether to skip the confirmation prompt
 """
     action = 'create'
-    options = ['really']
+    options = ['confirm']
 
     def execute(self, args):
         mgr = LoadBalancerManager(self.client)
diff --git a/SoftLayer/managers/load_balancer.py b/SoftLayer/managers/load_balancer.py
@@ -170,8 +170,8 @@ def toggle_service_status(self, service_id):
                           'LoadBalancer_Service']
         return svc.toggleStatus(id=service_id)
 
-    def edit_service(self, loadbal_id, service_id, ip_address_id=0, port=-1,
-                     enabled=-1, hc_type=-1, weight=-1):
+    def edit_service(self, loadbal_id, service_id, ip_address_id=None,
+                     port=None, enabled=None, hc_type=None, weight=None):
         """ Edits an existing service properties
         :param int loadbal_id: The id of the loadbal where the service resides
         :param int service_id: The id of the service to edit
@@ -194,15 +194,16 @@ def edit_service(self, loadbal_id, service_id, ip_address_id=0, port=-1,
                                                         **kwargs)
         for service in virtual_servers[0]['serviceGroups'][0]['services']:
             if service['id'] == service_id:
-                if enabled != -1:
-                    service['enabled'] = enabled
-                if port != -1:
-                    service['port'] = port
-                if weight != -1:
-                    service['groupReferences'][0]['weight'] = weight
-                if hc_type != -1:
-                    service['healthChecks'][0]['healthCheckTypeId'] = hc_type
-                if ip_address_id != 0:
+                if enabled is not None:
+                    service['enabled'] = int(enabled)
+                if port is not None:
+                    service['port'] = int(port)
+                if weight is not None:
+                    service['groupReferences'][0]['weight'] = int(weight)
+                if hc_type is not None:
+                    service['healthChecks'][0]['healthCheckTypeId'] = \
+                        int(hc_type)
+                if ip_address_id is not None:
                     service['ipAddressId'] = ip_address_id
 
         template = {'virtualServers': virtual_servers}
@@ -277,8 +278,8 @@ def add_service_group(self, lb_id, allocation=100, port=80,
         virtual_servers.append(service_template)
         return self.lb_svc.editObject(load_balancer, id=lb_id)
 
-    def edit_service_group(self, loadbal_id, group_id, allocation=-1, port=0,
-                           routing_type=0, routing_method=0):
+    def edit_service_group(self, loadbal_id, group_id, allocation=None,
+                           port=None, routing_type=None, routing_method=None):
         """ Edit an existing service group
         :param int loadbal_id: The id of the loadbal where the service resides
         :param int group_id: The id of the service group
@@ -296,14 +297,14 @@ def edit_service_group(self, loadbal_id, group_id, allocation=-1, port=0,
         for virtual_server in virtual_servers:
             if virtual_server['id'] == group_id:
                 service_group = virtual_server['serviceGroups'][0]
-                if allocation != -1:
-                    virtual_server['allocation'] = allocation
-                if port != 0:
-                    virtual_server['port'] = port
-                if routing_type != 0:
-                    service_group['routingTypeId'] = routing_type
-                if routing_method != 0:
-                    service_group['routingMethodId'] = routing_method
+                if allocation is not None:
+                    virtual_server['allocation'] = int(allocation)
+                if port is not None:
+                    virtual_server['port'] = int(port)
+                if routing_type is not None:
+                    service_group['routingTypeId'] = int(routing_type)
+                if routing_method is not None:
+                    service_group['routingMethodId'] = int(routing_method)
                 break
         return self.lb_svc.editObject(load_balancer, id=loadbal_id)
 
diff --git a/setup.cfg b/setup.cfg
@@ -2,10 +2,9 @@
 verbosity=2
 detailed-errors=1
 with-coverage=1
-cover-min-percentage=68
 cover-erase=true
 cover-package=SoftLayer
 cover-html=1
 
 [wheel]
-universal=1
+universal=1
