Merge pull request #1427 from caberos/issue1426

Allow modifying Timeout for LoadBalancers

Author: allmightyspiff

SoftLayer/CLI/loadbal/pools.py

@@ -84,6 +84,8 @@ def add(env, identifier, **args):
 @click.option('--method', '-m', help="Balancing Method",
               type=click.Choice(['ROUNDROBIN', 'LEASTCONNECTION', 'WEIGHTED_RR']))
 @click.option('--connections', '-c', type=int, help="Maximum number of connections to allow.")
+@click.option('--clientTimeout', '-t', type=int,
+              help="maximum idle time in seconds(Range: 1 to 7200).")
 @click.option('--sticky', '-s', is_flag=True, callback=sticky_option, help="Make sessions sticky based on source_ip.")
 @click.option('--sslCert', '-x', help="SSL certificate ID. See `slcli ssl list`")
 @environment.pass_env
@@ -108,6 +110,7 @@ def edit(env, identifier, listener, **args):
         'method': 'loadBalancingMethod',
         'connections': 'maxConn',
         'sticky': 'sessionType',
+        'clienttimeout': 'clientTimeout',
         'sslcert': 'tlsCertificateId'
     }
 

SoftLayer/fixtures/SoftLayer_Network_LBaaS_LoadBalancer.py

@@ -48,6 +48,7 @@
     ],
     'listeners': [
         {
+            'clientTimeout': 15,
             'defaultPool': {
                 'healthMonitor': {
                     'uuid': '222222ab-bbcc-4f32-9b31-1b6d3a1959c8'
@@ -97,6 +98,7 @@
          'protocolPort': 110,
          'provisioningStatus': 'ACTIVE',
          'tlsCertificateId': None,
+         'clientTimeout': 30,
          'uuid': 'a509723d-a3cb-4ae4-bc5b-5ecf04f890ff'}
     ],
     'members': [

tests/CLI/modules/loadbal_tests.py

@@ -49,7 +49,7 @@ def test_delete_pool(self):
 
     def test_edit_pool(self):
         result = self.run_command(['loadbal', 'pool-edit', '111111', '370a9f12-b3be-47b3-bfa5-8e460010000', '-f 510',
-                                   '-b 256', '-c 5'])
+                                   '-b 256', '-c 5', '-t 10'])
         self.assert_no_fail(result)
 
     def test_add_7p(self):