rename port to port_protocol for lbaas cli

fixes bug 1133057

Change-Id: Ic4b35e0c6335e3fc65022203a56ea2cce89f975c

2 files changed, 21 insertions, 20 deletions

diff --git a/quantumclient/tests/unit/lb/test_cli20_member.py b/quantumclient/tests/unit/lb/test_cli20_member.py
index 7155073..609bba1 100644
--- a/quantumclient/tests/unit/lb/test_cli20_member.py
+++ b/quantumclient/tests/unit/lb/test_cli20_member.py
@@ -33,12 +33,11 @@ class CLITestV20LbMember(test_cli20.CLITestV20Base):
         tenant_id = 'my-tenant'
         my_id = 'my-id'
         pool_id = 'pool-id'
-        args = ['--address', address, '--port', port,
+        args = ['--address', address, '--protocol-port', port,
                 '--tenant-id', tenant_id, pool_id]
-        position_names = ['address', 'port', 'tenant_id', 'pool_id',
+        position_names = ['address', 'protocol_port', 'tenant_id', 'pool_id',
                           'admin_state_up']
-        position_values = [address, port, tenant_id, pool_id,
-                           True]
+        position_values = [address, port, tenant_id, pool_id, True]
         self._test_create_resource(resource, cmd, None, my_id, args,
                                    position_names, position_values,
                                    admin_state_up=None)
@@ -55,10 +54,12 @@ class CLITestV20LbMember(test_cli20.CLITestV20Base):
         my_id = 'my-id'
         pool_id = 'pool-id'
         args = ['--address', address, '--admin-state-down',
-                '--port', port, '--weight', weight,
+                '--protocol-port', port, '--weight', weight,
                 '--tenant-id', tenant_id, pool_id]
-        position_names = ['address', 'admin_state_up', 'port', 'weight',
-                          'tenant_id', 'pool_id']
+        position_names = [
+            'address', 'admin_state_up', 'protocol_port', 'weight',
+            'tenant_id', 'pool_id'
+        ]
         position_values = [address, admin_state_up, port, weight,
                            tenant_id, pool_id]
         self._test_create_resource(resource, cmd, None, my_id, args,
diff --git a/quantumclient/tests/unit/lb/test_cli20_vip.py b/quantumclient/tests/unit/lb/test_cli20_vip.py
index 8b7d176..880c20a 100644
--- a/quantumclient/tests/unit/lb/test_cli20_vip.py
+++ b/quantumclient/tests/unit/lb/test_cli20_vip.py
@@ -31,19 +31,19 @@ class CLITestV20LbVip(test_cli20.CLITestV20Base):
         pool_id = 'my-pool-id'
         name = 'my-name'
         subnet_id = 'subnet-id'
-        port = '1000'
+        protocol_port = '1000'
         protocol = 'tcp'
         tenant_id = 'my-tenant'
         my_id = 'my-id'
         args = ['--name', name,
-                '--port', port,
+                '--protocol-port', protocol_port,
                 '--protocol', protocol,
                 '--subnet-id', subnet_id,
                 '--tenant-id', tenant_id,
                 pool_id]
-        position_names = ['pool_id', 'name', 'port', 'protocol',
+        position_names = ['pool_id', 'name', 'protocol_port', 'protocol',
                           'subnet_id', 'tenant_id']
-        position_values = [pool_id, name, port, protocol,
+        position_values = [pool_id, name, protocol_port, protocol,
                            subnet_id, tenant_id]
         self._test_create_resource(resource, cmd, name, my_id, args,
                                    position_names, position_values,
@@ -60,7 +60,7 @@ class CLITestV20LbVip(test_cli20.CLITestV20Base):
         admin_state = False
         connection_limit = '1000'
         subnet_id = 'subnet-id'
-        port = '80'
+        protocol_port = '80'
         protocol = 'tcp'
         tenant_id = 'my-tenant'
         my_id = 'my-id'
@@ -69,17 +69,17 @@ class CLITestV20LbVip(test_cli20.CLITestV20Base):
                 '--address', address,
                 '--admin-state-down',
                 '--connection-limit', connection_limit,
-                '--port', port,
+                '--protocol-port', protocol_port,
                 '--protocol', protocol,
                 '--subnet-id', subnet_id,
                 '--tenant-id', tenant_id,
                 pool_id]
         position_names = ['pool_id', 'name', 'description', 'address',
-                          'admin_state_up', 'connection_limit', 'port',
-                          'protocol', 'subnet_id',
+                          'admin_state_up', 'connection_limit',
+                          'protocol_port', 'protocol', 'subnet_id',
                           'tenant_id']
         position_values = [pool_id, name, description, address,
-                           admin_state, connection_limit, port,
+                           admin_state, connection_limit, protocol_port,
                            protocol, subnet_id,
                            tenant_id]
         self._test_create_resource(resource, cmd, name, my_id, args,
@@ -92,12 +92,12 @@ class CLITestV20LbVip(test_cli20.CLITestV20Base):
         pool_id = 'my-pool-id'
         name = 'my-name'
         subnet_id = 'subnet-id'
-        port = '1000'
+        protocol_port = '1000'
         protocol = 'tcp'
         tenant_id = 'my-tenant'
         my_id = 'my-id'
         args = ['--name', name,
-                '--port', port,
+                '--protocol-port', protocol_port,
                 '--protocol', protocol,
                 '--subnet-id', subnet_id,
                 '--tenant-id', tenant_id,
@@ -105,9 +105,9 @@ class CLITestV20LbVip(test_cli20.CLITestV20Base):
                 '--session-persistence', 'type=dict',
                 'type=cookie,cookie_name=pie',
                 '--optional-param', 'any']
-        position_names = ['pool_id', 'name', 'port', 'protocol',
+        position_names = ['pool_id', 'name', 'protocol_port', 'protocol',
                           'subnet_id', 'tenant_id', 'optional_param']
-        position_values = [pool_id, name, port, protocol,
+        position_values = [pool_id, name, protocol_port, protocol,
                            subnet_id, tenant_id, 'any']
         extra_body = {
             'session_persistence': {