Improve display of help and list certificate.
This commit is contained in:
@@ -381,7 +381,7 @@ def self_signed(hostname:str, verify:bool, username: str, password: str, bearer=
|
|||||||
|
|
||||||
|
|
||||||
@typechecked
|
@typechecked
|
||||||
def get_certificates(hostname:str, verify:bool, username: str, password: str,
|
def get_certificates(hostname:str, verify:bool, username: str, password: str,
|
||||||
bearer=None) -> dict[int, dict]:
|
bearer=None) -> dict[int, dict]:
|
||||||
"""
|
"""
|
||||||
Retrieve a list of certificates from an HP CDM server.
|
Retrieve a list of certificates from an HP CDM server.
|
||||||
@@ -535,11 +535,11 @@ def main():
|
|||||||
|
|
||||||
subparsers.add_parser('self', help='Create a self-signed certificate.')
|
subparsers.add_parser('self', help='Create a self-signed certificate.')
|
||||||
|
|
||||||
parser_delete = subparsers.add_parser('del', help='Delete a certificate')
|
parser_delete = subparsers.add_parser('del', help='Delete a certificate.')
|
||||||
parser_delete.add_argument("-#", "--number", dest='certid', required=True, type=int,
|
parser_delete.add_argument("-#", "--number", dest='certid', required=True, type=int,
|
||||||
help="Certificate number as given by list command.")
|
help="Certificate number as given by list command.")
|
||||||
|
|
||||||
parser_create_csr = subparsers.add_parser('csr', help='Create CSR')
|
parser_create_csr = subparsers.add_parser('csr', help='Create a certificate signing request.')
|
||||||
parser_create_csr.add_argument("-C", "--country", dest='country', required=False, default='US',
|
parser_create_csr.add_argument("-C", "--country", dest='country', required=False, default='US',
|
||||||
help="Country.")
|
help="Country.")
|
||||||
parser_create_csr.add_argument("-s", "--state", dest='state', required=False, help="State.")
|
parser_create_csr.add_argument("-s", "--state", dest='state', required=False, help="State.")
|
||||||
@@ -551,7 +551,7 @@ def main():
|
|||||||
parser_create_csr.add_argument("-o", "--output", dest='output', required=False, default=None,
|
parser_create_csr.add_argument("-o", "--output", dest='output', required=False, default=None,
|
||||||
help="Output file.")
|
help="Output file.")
|
||||||
|
|
||||||
parser_install_certificate = subparsers.add_parser('pem', help='Install certificate')
|
parser_install_certificate = subparsers.add_parser('pem', help='Install a certificate.')
|
||||||
parser_install_certificate.add_argument("-i", "--input", dest='input', required=True,
|
parser_install_certificate.add_argument("-i", "--input", dest='input', required=True,
|
||||||
default=None, help="Input file.")
|
default=None, help="Input file.")
|
||||||
|
|
||||||
@@ -639,8 +639,8 @@ def main():
|
|||||||
subject = cert.get('subject')
|
subject = cert.get('subject')
|
||||||
issuer = cert.get('issuer')
|
issuer = cert.get('issuer')
|
||||||
validity = cert.get('validity')
|
validity = cert.get('validity')
|
||||||
begin = parse(validity.get('fromDate'))
|
begin = parse(validity.get('fromDate')).strftime('%Y-%m-%d (%H:%M)')
|
||||||
end = parse(validity.get('toDate'))
|
end = parse(validity.get('toDate')).strftime('%Y-%m-%d (%H:%M)')
|
||||||
print(f'{certid} - {subject} issued by {issuer}. From: {begin} to {end}')
|
print(f'{certid} - {subject} issued by {issuer}. From: {begin} to {end}')
|
||||||
case 'del':
|
case 'del':
|
||||||
bearer = get_bearer(hostname=args.hostname, verify=args.verify, username=args.username,
|
bearer = get_bearer(hostname=args.hostname, verify=args.verify, username=args.username,
|
||||||
|
|||||||
Reference in New Issue
Block a user