diff options
| author | Stephen Balukoff <sbalukoff@bluebox.net> | 2015-08-27 09:34:45 -0700 |
|---|---|---|
| committer | Stephen Balukoff <sbalukoff@bluebox.net> | 2015-08-27 09:36:04 -0700 |
| commit | a4f64f69b629045e5712957be7faea36fc0b52df (patch) | |
| tree | 619bad569e9e816d05312d1f8970d72c6edb26ab | |
| parent | 017591d83799b65306bbd1ad387444e9f87e71c3 (diff) | |
| download | python-neutronclient-a4f64f69b629045e5712957be7faea36fc0b52df.tar.gz | |
Update tls_container_id to tls_container_ref
Since the Listener TLS container references are not
UUIDs, the API was changes slightly to refer them as
'refs'. This commit updates the CLI to reflect this
subtle but important change as well.
Change-Id: Ifd4639de79469d531f683f4a02455dbdb4b12f7f
| -rw-r--r-- | neutronclient/neutron/v2_0/lb/v2/listener.py | 17 | ||||
| -rw-r--r-- | neutronclient/tests/unit/lb/v2/test_cli20_listener.py | 10 |
2 files changed, 14 insertions, 13 deletions
diff --git a/neutronclient/neutron/v2_0/lb/v2/listener.py b/neutronclient/neutron/v2_0/lb/v2/listener.py index 4adea39..46afc50 100644 --- a/neutronclient/neutron/v2_0/lb/v2/listener.py +++ b/neutronclient/neutron/v2_0/lb/v2/listener.py @@ -64,14 +64,15 @@ class CreateListener(neutronV20.CreateCommand): '--name', help=_('The name of the listener.')) parser.add_argument( - '--default-tls-container-id', - dest='default_tls_container_id', - help=_('Default TLS container ID to retrieve TLS information.')) + '--default-tls-container-ref', + dest='default_tls_container_ref', + help=_('Default TLS container reference' + ' to retrieve TLS information.')) parser.add_argument( - '--sni-container-ids', - dest='sni_container_ids', + '--sni-container-refs', + dest='sni_container_refs', nargs='+', - help=_('List of TLS container IDs for SNI.')) + help=_('List of TLS container references for SNI.')) parser.add_argument( '--loadbalancer', required=True, @@ -105,8 +106,8 @@ class CreateListener(neutronV20.CreateCommand): neutronV20.update_dict(parsed_args, body[self.resource], ['connection-limit', 'description', 'loadbalancer_id', 'name', - 'default_tls_container_id', - 'sni_container_ids', + 'default_tls_container_ref', + 'sni_container_refs', 'tenant_id']) return body diff --git a/neutronclient/tests/unit/lb/v2/test_cli20_listener.py b/neutronclient/tests/unit/lb/v2/test_cli20_listener.py index 4a70fd6..6ecac35 100644 --- a/neutronclient/tests/unit/lb/v2/test_cli20_listener.py +++ b/neutronclient/tests/unit/lb/v2/test_cli20_listener.py @@ -49,17 +49,17 @@ class CLITestV20LbListenerJSON(test_cli20.CLITestV20Base): loadbalancer = 'loadbalancer' protocol = 'TCP' protocol_port = '80' - def_tls_cont_id = '11111' + def_tls_cont_ref = '11111' args = ['--admin-state-down', '--protocol', protocol, '--protocol-port', protocol_port, '--loadbalancer', loadbalancer, - '--default-tls-container-id', def_tls_cont_id, - '--sni-container-ids', '1111', '2222', '3333'] + '--default-tls-container-ref', def_tls_cont_ref, + '--sni-container-refs', '1111', '2222', '3333'] position_names = ['admin_state_up', 'protocol', 'protocol_port', 'loadbalancer_id', - 'default_tls_container_id', 'sni_container_ids'] + 'default_tls_container_ref', 'sni_container_refs'] position_values = [False, protocol, protocol_port, loadbalancer, - def_tls_cont_id, ['1111', '2222', '3333']] + def_tls_cont_ref, ['1111', '2222', '3333']] self._test_create_resource(resource, cmd, '', my_id, args, position_names, position_values, cmd_resource=cmd_resource) |