Merge "Add client_crl_container_ref for Listener API in CLI"
This commit is contained in:
commit
167b2ac63c
|
@ -72,7 +72,8 @@ LISTENER_ROWS = (
|
||||||
'timeout_tcp_inspect',
|
'timeout_tcp_inspect',
|
||||||
'updated_at',
|
'updated_at',
|
||||||
'client_ca_tls_container_ref',
|
'client_ca_tls_container_ref',
|
||||||
'client_authentication')
|
'client_authentication',
|
||||||
|
'client_crl_container_ref')
|
||||||
|
|
||||||
LISTENER_COLUMNS = (
|
LISTENER_COLUMNS = (
|
||||||
'id',
|
'id',
|
||||||
|
|
|
@ -150,7 +150,13 @@ class CreateListener(command.ShowOne):
|
||||||
help="The TLS client authentication verify options for "
|
help="The TLS client authentication verify options for "
|
||||||
"TERMINATED_TLS listeners."
|
"TERMINATED_TLS listeners."
|
||||||
)
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
'--client-crl-container-ref',
|
||||||
|
metavar='<client_crl_container_ref>',
|
||||||
|
help="The URI to the key manager service secrets container "
|
||||||
|
"containting the CA revocation list file for TERMINATED_TLS "
|
||||||
|
"listeners."
|
||||||
|
)
|
||||||
return parser
|
return parser
|
||||||
|
|
||||||
def take_action(self, parsed_args):
|
def take_action(self, parsed_args):
|
||||||
|
@ -387,6 +393,13 @@ class SetListener(command.Command):
|
||||||
help="The TLS client authentication verify options for "
|
help="The TLS client authentication verify options for "
|
||||||
"TERMINATED_TLS listeners."
|
"TERMINATED_TLS listeners."
|
||||||
)
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
'--client-crl-container-ref',
|
||||||
|
metavar='<client_crl_container_ref>',
|
||||||
|
help="The URI to the key manager service secrets container "
|
||||||
|
"containting the CA revocation list file for TERMINATED_TLS "
|
||||||
|
"listeners."
|
||||||
|
)
|
||||||
return parser
|
return parser
|
||||||
|
|
||||||
def take_action(self, parsed_args):
|
def take_action(self, parsed_args):
|
||||||
|
|
|
@ -214,6 +214,8 @@ def get_listener_attrs(client_manager, parsed_args):
|
||||||
'client_ca_tls_container_ref': ('client_ca_tls_container_ref',
|
'client_ca_tls_container_ref': ('client_ca_tls_container_ref',
|
||||||
_format_str_if_need_treat_unset),
|
_format_str_if_need_treat_unset),
|
||||||
'client_authentication': ('client_authentication', str),
|
'client_authentication': ('client_authentication', str),
|
||||||
|
'client_crl_container_ref': ('client_crl_container_ref',
|
||||||
|
_format_str_if_need_treat_unset),
|
||||||
}
|
}
|
||||||
|
|
||||||
_attrs = vars(parsed_args)
|
_attrs = vars(parsed_args)
|
||||||
|
|
|
@ -74,6 +74,7 @@ LISTENER_ATTRS = {
|
||||||
"timeout_tcp_inspect": 0,
|
"timeout_tcp_inspect": 0,
|
||||||
'client_ca_tls_container_ref': uuidutils.generate_uuid(dashed=True),
|
'client_ca_tls_container_ref': uuidutils.generate_uuid(dashed=True),
|
||||||
'client_authentication': "OPTIONAL",
|
'client_authentication': "OPTIONAL",
|
||||||
|
'client_crl_container_ref': uuidutils.generate_uuid(dashed=True),
|
||||||
}
|
}
|
||||||
|
|
||||||
LOADBALANCER_ATTRS = {
|
LOADBALANCER_ATTRS = {
|
||||||
|
|
|
@ -142,7 +142,9 @@ class TestListenerCreate(TestListener):
|
||||||
'--client-ca-tls-container-ref',
|
'--client-ca-tls-container-ref',
|
||||||
self._listener.client_ca_tls_container_ref,
|
self._listener.client_ca_tls_container_ref,
|
||||||
'--client-authentication',
|
'--client-authentication',
|
||||||
self._listener.client_authentication]
|
self._listener.client_authentication,
|
||||||
|
'--client-crl-container-ref',
|
||||||
|
self._listener.client_crl_container_ref]
|
||||||
verifylist = [
|
verifylist = [
|
||||||
('loadbalancer', 'mock_lb_id'),
|
('loadbalancer', 'mock_lb_id'),
|
||||||
('name', self._listener.name),
|
('name', self._listener.name),
|
||||||
|
@ -153,7 +155,9 @@ class TestListenerCreate(TestListener):
|
||||||
self._listener.default_tls_container_ref),
|
self._listener.default_tls_container_ref),
|
||||||
('client_ca_tls_container_ref',
|
('client_ca_tls_container_ref',
|
||||||
self._listener.client_ca_tls_container_ref),
|
self._listener.client_ca_tls_container_ref),
|
||||||
('client_authentication', self._listener.client_authentication)
|
('client_authentication', self._listener.client_authentication),
|
||||||
|
('client_crl_container_ref',
|
||||||
|
self._listener.client_crl_container_ref)
|
||||||
]
|
]
|
||||||
|
|
||||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||||
|
@ -227,7 +231,9 @@ class TestListenerSet(TestListener):
|
||||||
'--client-ca-tls-container-ref',
|
'--client-ca-tls-container-ref',
|
||||||
self._listener.client_ca_tls_container_ref,
|
self._listener.client_ca_tls_container_ref,
|
||||||
'--client-authentication',
|
'--client-authentication',
|
||||||
self._listener.client_authentication]
|
self._listener.client_authentication,
|
||||||
|
'--client-crl-container-ref',
|
||||||
|
self._listener.client_crl_container_ref]
|
||||||
verifylist = [
|
verifylist = [
|
||||||
('listener', self._listener.id),
|
('listener', self._listener.id),
|
||||||
('name', 'new_name'),
|
('name', 'new_name'),
|
||||||
|
@ -237,7 +243,9 @@ class TestListenerSet(TestListener):
|
||||||
('client_ca_tls_container_ref',
|
('client_ca_tls_container_ref',
|
||||||
self._listener.client_ca_tls_container_ref),
|
self._listener.client_ca_tls_container_ref),
|
||||||
('client_authentication',
|
('client_authentication',
|
||||||
self._listener.client_authentication)
|
self._listener.client_authentication),
|
||||||
|
('client_crl_container_ref',
|
||||||
|
self._listener.client_crl_container_ref)
|
||||||
]
|
]
|
||||||
|
|
||||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||||
|
@ -252,7 +260,9 @@ class TestListenerSet(TestListener):
|
||||||
'client_ca_tls_container_ref':
|
'client_ca_tls_container_ref':
|
||||||
self._listener.client_ca_tls_container_ref,
|
self._listener.client_ca_tls_container_ref,
|
||||||
'client_authentication':
|
'client_authentication':
|
||||||
self._listener.client_authentication
|
self._listener.client_authentication,
|
||||||
|
'client_crl_container_ref':
|
||||||
|
self._listener.client_crl_container_ref
|
||||||
}})
|
}})
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue