From 79e2c8d9cff8cf2f16a4b9c33ed3fd800ac3b770 Mon Sep 17 00:00:00 2001 From: Neetu Jain Date: Thu, 14 May 2015 10:41:18 -0500 Subject: [PATCH 1/4] correct arguement name --- SoftLayer/CLI/loadbal/service_add.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoftLayer/CLI/loadbal/service_add.py b/SoftLayer/CLI/loadbal/service_add.py index 5a9fa982a..0b0d0da9f 100644 --- a/SoftLayer/CLI/loadbal/service_add.py +++ b/SoftLayer/CLI/loadbal/service_add.py @@ -24,7 +24,7 @@ @click.option('--healthcheck-type', required=True, help="The health check type") -@click.option('--ip-address', '--ip', +@click.option('--ip-address', required=True, help="The IP of the service") @environment.pass_env From 97e0d925588a3b5ad7f71ddba5a5d0b87906069b Mon Sep 17 00:00:00 2001 From: Neetu Jain Date: Thu, 14 May 2015 10:47:19 -0500 Subject: [PATCH 2/4] change argument name --- SoftLayer/CLI/loadbal/service_add.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/SoftLayer/CLI/loadbal/service_add.py b/SoftLayer/CLI/loadbal/service_add.py index 0b0d0da9f..9b84c8505 100644 --- a/SoftLayer/CLI/loadbal/service_add.py +++ b/SoftLayer/CLI/loadbal/service_add.py @@ -24,11 +24,11 @@ @click.option('--healthcheck-type', required=True, help="The health check type") -@click.option('--ip-address', +@click.option('--ip', required=True, help="The IP of the service") @environment.pass_env -def cli(env, identifier, enabled, port, weight, healthcheck_type, ip_address): +def cli(env, identifier, enabled, port, weight, healthcheck_type, ip): """Adds a new load balancer service.""" mgr = SoftLayer.LoadBalancerManager(env.client) @@ -37,10 +37,11 @@ def cli(env, identifier, enabled, port, weight, healthcheck_type, ip_address): # check if the IP is valid ip_address_id = None - if ip_address: + if ip: ip_service = env.client['Network_Subnet_IpAddress'] - ip_record = ip_service.getByIpAddress(ip_address) - ip_address_id = ip_record['id'] + ip_record = ip_service.getByIpAddress(ip) + if len(ip_record)>0: + ip_address_id = ip_record['id'] mgr.add_service(loadbal_id, group_id, From bdff0e2cc984357ae573a4fc6cf778445c5a06e0 Mon Sep 17 00:00:00 2001 From: Neetu Jain Date: Tue, 26 May 2015 13:27:37 -0500 Subject: [PATCH 3/4] cleaning --- SoftLayer/CLI/loadbal/service_add.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoftLayer/CLI/loadbal/service_add.py b/SoftLayer/CLI/loadbal/service_add.py index 9b84c8505..735aee75a 100644 --- a/SoftLayer/CLI/loadbal/service_add.py +++ b/SoftLayer/CLI/loadbal/service_add.py @@ -40,7 +40,7 @@ def cli(env, identifier, enabled, port, weight, healthcheck_type, ip): if ip: ip_service = env.client['Network_Subnet_IpAddress'] ip_record = ip_service.getByIpAddress(ip) - if len(ip_record)>0: + if len(ip_record) > 0: ip_address_id = ip_record['id'] mgr.add_service(loadbal_id, From b4484ef88ac3ae2cecb4ef8539a1dd20af8c1b71 Mon Sep 17 00:00:00 2001 From: Kevin McDonald Date: Fri, 5 Jun 2015 21:11:25 -0500 Subject: [PATCH 4/4] Fix small style issue --- SoftLayer/CLI/loadbal/service_add.py | 10 +++++----- SoftLayer/testing/xmlrpc.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SoftLayer/CLI/loadbal/service_add.py b/SoftLayer/CLI/loadbal/service_add.py index 735aee75a..a9fdc04d9 100644 --- a/SoftLayer/CLI/loadbal/service_add.py +++ b/SoftLayer/CLI/loadbal/service_add.py @@ -24,11 +24,11 @@ @click.option('--healthcheck-type', required=True, help="The health check type") -@click.option('--ip', +@click.option('--ip-address', required=True, - help="The IP of the service") + help="The IP address of the service") @environment.pass_env -def cli(env, identifier, enabled, port, weight, healthcheck_type, ip): +def cli(env, identifier, enabled, port, weight, healthcheck_type, ip_address): """Adds a new load balancer service.""" mgr = SoftLayer.LoadBalancerManager(env.client) @@ -37,9 +37,9 @@ def cli(env, identifier, enabled, port, weight, healthcheck_type, ip): # check if the IP is valid ip_address_id = None - if ip: + if ip_address: ip_service = env.client['Network_Subnet_IpAddress'] - ip_record = ip_service.getByIpAddress(ip) + ip_record = ip_service.getByIpAddress(ip_address) if len(ip_record) > 0: ip_address_id = ip_record['id'] diff --git a/SoftLayer/testing/xmlrpc.py b/SoftLayer/testing/xmlrpc.py index 920f86e17..47272616e 100644 --- a/SoftLayer/testing/xmlrpc.py +++ b/SoftLayer/testing/xmlrpc.py @@ -92,6 +92,6 @@ def create_test_server(transport, host='localhost', port=0): """Create a test XML-RPC server in a new thread.""" server = TestServer(transport, (host, port), TestHandler) thread = threading.Thread(target=server.serve_forever, - kwargs={'poll_interval': 0.05}) + kwargs={'poll_interval': 0.01}) thread.start() return server