openstack/python-neutronclient
Code Issues Proposed changes

Update tls_container_id to tls_container_ref

Browse Source 
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
This commit is contained in:
Stephen Balukoff
2015-08-27 09:34:45 -07:00
parent 017591d837
commit a4f64f69b6
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
neutronclient/neutron/v2_0/lb/v2/listener.py
View File

@@ -64,14 +64,15 @@ class CreateListener(neutronV20.CreateCommand):
'--name', '--name',
help=_('The name of the listener.')) help=_('The name of the listener.'))
parser.add_argument( parser.add_argument(
'--default-tls-container-id', '--default-tls-container-ref',
dest='default_tls_container_id', dest='default_tls_container_ref',
help=_('Default TLS container ID to retrieve TLS information.')) help=_('Default TLS container reference'
' to retrieve TLS information.'))
parser.add_argument( parser.add_argument(
'--sni-container-ids', '--sni-container-refs',
dest='sni_container_ids', dest='sni_container_refs',
nargs='+', nargs='+',
help=_('List of TLS container IDs for SNI.')) help=_('List of TLS container references for SNI.'))
parser.add_argument( parser.add_argument(
'--loadbalancer', '--loadbalancer',
required=True, required=True,
@@ -105,8 +106,8 @@ class CreateListener(neutronV20.CreateCommand):
neutronV20.update_dict(parsed_args, body[self.resource], neutronV20.update_dict(parsed_args, body[self.resource],
['connection-limit', 'description', ['connection-limit', 'description',
'loadbalancer_id', 'name', 'loadbalancer_id', 'name',
'default_tls_container_id', 'default_tls_container_ref',
'sni_container_ids', 'sni_container_refs',
'tenant_id']) 'tenant_id'])
return body return body

10
neutronclient/tests/unit/lb/v2/test_cli20_listener.py
View File

@@ -49,17 +49,17 @@ class CLITestV20LbListenerJSON(test_cli20.CLITestV20Base):
loadbalancer = 'loadbalancer' loadbalancer = 'loadbalancer'
protocol = 'TCP' protocol = 'TCP'
protocol_port = '80' protocol_port = '80'
def_tls_cont_id = '11111' def_tls_cont_ref = '11111'
args = ['--admin-state-down', args = ['--admin-state-down',
'--protocol', protocol, '--protocol-port', protocol_port, '--protocol', protocol, '--protocol-port', protocol_port,
'--loadbalancer', loadbalancer, '--loadbalancer', loadbalancer,
'--default-tls-container-id', def_tls_cont_id, '--default-tls-container-ref', def_tls_cont_ref,
'--sni-container-ids', '1111', '2222', '3333'] '--sni-container-refs', '1111', '2222', '3333']
position_names = ['admin_state_up', position_names = ['admin_state_up',
'protocol', 'protocol_port', 'loadbalancer_id', '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, 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, self._test_create_resource(resource, cmd, '', my_id, args,
position_names, position_values, position_names, position_values,
cmd_resource=cmd_resource) cmd_resource=cmd_resource)