fix the team code review comments

Author: caberos

SoftLayer/CLI/loadbal/protocol_add.py

@@ -28,15 +28,15 @@ def parse_proto(ctx, param, value):
 @click.option('--method', '-m', help="Balancing Method.", default='ROUNDROBIN', show_default=True,
               type=click.Choice(['ROUNDROBIN', 'LEASTCONNECTION', 'WEIGHTED_RR']))
 @click.option('--session', '-s', required=True,
-              help="Session stickiness type. Valid values are “SOURCE_IP” “HTTP_COOKIE”")
-@click.option('--max', help="Use a Public to Public loadbalancer.")
+              help="Session stickiness type. Valid values are SOURCE_IP or HTTP_COOKIE ")
+@click.option('--max', help="Max Connections setting", type=int)
 @environment.pass_env
 def cli(env, identifier, **args):
     """Add a new load balancer protocol."""
 
     mgr = SoftLayer.LoadBalancerManager(env.client)
 
-    uuid = mgr.get_lb(identifier)['uuid']
+    uuid = mgr.get_lb_uuid(identifier)
 
     backend = args.get('backend')
     frontend = args.get('frontend')
@@ -60,7 +60,7 @@ def cli(env, identifier, **args):
     table.add_row(['Id', protocol.get('id')])
     table.add_row(['UUI', protocol.get('uuid')])
     table.add_row(['Address', protocol.get('address')])
-    table.add_row(['Type', SoftLayer.LoadBalancerManager.TYPE.get(protocol.get('type'))])
+    table.add_row(['Type', mgr.get_lb_type(protocol.get('type'))])
     table.add_row(['Description', protocol.get('description')])
 
     env.fout(table)

SoftLayer/CLI/loadbal/protocol_edit.py

@@ -29,15 +29,15 @@ def parse_proto(ctx, param, value):
 @click.option('--method', '-m', help="Balancing Method.", default='ROUNDROBIN', show_default=True,
               type=click.Choice(['ROUNDROBIN', 'LEASTCONNECTION', 'WEIGHTED_RR']))
 @click.option('--session', '-s', required=True,
-              help="Session stickiness type. Valid values are “SOURCE_IP” “HTTP_COOKIE”")
-@click.option('--max', help="Use a Public to Public loadbalancer.")
+              help="Session stickiness type. Valid values are SOURCE_IP or HTTP_COOKIE ")
+@click.option('--max', help="Max Connections setting", type=int)
 @environment.pass_env
 def cli(env, identifier, **args):
     """Edit a load balancer protocol."""
 
     mgr = SoftLayer.LoadBalancerManager(env.client)
 
-    uuid_lb = mgr.get_lb(identifier)['uuid']
+    uuid = mgr.get_lb_uuid(identifier)
 
     backend = args.get('backend')
     frontend = args.get('frontend')
@@ -53,15 +53,15 @@ def cli(env, identifier, **args):
         }
     ]
     protocol_configurations[0]['listenerUuid'] = args.get('uuid')
-    protocol = mgr.add_protocols(uuid_lb, protocol_configurations)
+    protocol = mgr.add_protocols(uuid, protocol_configurations)
 
     table = formatting.KeyValueTable(['name', 'value'])
     table.align['name'] = 'r'
     table.align['value'] = 'l'
     table.add_row(['Id', protocol.get('id')])
     table.add_row(['UUI', protocol.get('uuid')])
     table.add_row(['Address', protocol.get('address')])
-    table.add_row(['Type', SoftLayer.LoadBalancerManager.TYPE.get(protocol.get('type'))])
+    table.add_row(['Type', mgr.get_lb_type(protocol.get('type'))])
     table.add_row(['Description', protocol.get('description')])
 
     env.fout(table)

SoftLayer/managers/load_balancer.py

@@ -5,6 +5,7 @@
 
     :license: MIT, see LICENSE for more details.
 """
+import SoftLayer
 from SoftLayer import exceptions
 from SoftLayer.managers import ordering
 from SoftLayer import utils
@@ -295,3 +296,15 @@ def delete_protocol(self, uuid_lb, uuid):
         """
         return self.client.call('SoftLayer_Network_LBaaS_Listener', 'deleteLoadBalancerProtocols',
                                 uuid_lb, [uuid])
+
+    def get_lb_uuid(self, identifier):
+        """this sample show the uuid from loadbalancer.
+
+        :param identifier int: loadbalancer identifier.
+        """
+        lb = self.lbaas.getObject(id=identifier, mask="mask[id,uuid]")
+        return lb.get('uuid')
+
+    def get_lb_type(self, lb_type):
+
+        return SoftLayer.LoadBalancerManager.TYPE.get(lb_type)