From 694989f6ae15652e86f78fe27b3558b08bed4f46 Mon Sep 17 00:00:00 2001 From: hosingh000 Date: Fri, 22 Sep 2017 10:50:45 -0500 Subject: [PATCH] Change X-AIC-ORM to X-RANGER Change-Id: I16b361b3f2aadc1a9c67da8d8a4515d325d1185f --- .gitignore | 2 ++ orm/orm_client/ormcli/cmscli.py | 56 ++++++++++++++++----------------- orm/orm_client/ormcli/fmscli.py | 44 +++++++++++++------------- orm/orm_client/ormcli/imscli.py | 32 +++++++++---------- orm/orm_client/ormcli/rmscli.py | 8 ++--- 5 files changed, 72 insertions(+), 70 deletions(-) diff --git a/.gitignore b/.gitignore index d17645b3..b1956860 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,8 @@ cover/ nosetests.xml .testrepository .venv +.idea/ +.stestr/ # Translations *.mo diff --git a/orm/orm_client/ormcli/cmscli.py b/orm/orm_client/ormcli/cmscli.py index e0f96590..0fb867d8 100644 --- a/orm/orm_client/ormcli/cmscli.py +++ b/orm/orm_client/ormcli/cmscli.py @@ -36,7 +36,7 @@ def add_to_parser(service_sub): parser.add_argument('--orm-base-url', type=str, help='ORM base URL', default=get_environment_variable('orm-base-url')) parser.add_argument('--tracking_id', type=str, - help='"X-AIC-ORM-Tracking-Id" header') + help='"X-RANGER-Tracking-Id" header') parser.add_argument('--port', type=int, help='port number of CMS server') parser.add_argument('--timeout', type=int, help='request timeout in seconds (default: 10)') @@ -51,7 +51,7 @@ def add_to_parser(service_sub): # customer parser_create_customer = subparsers.add_parser('create_customer', - help='[<"X-AIC-ORM-Client" ' + help='[<"X-RANGER-Client" ' 'header>] ') @@ -63,7 +63,7 @@ def add_to_parser(service_sub): 'JSON>') parser_delete_customer = subparsers.add_parser('delete_customer', - help='[<"X-AIC-ORM-Client" ' + help='[<"X-RANGER-Client" ' 'header>] ') parser_delete_customer.add_argument('client', @@ -72,7 +72,7 @@ def add_to_parser(service_sub): help='') parser_update_customer = subparsers.add_parser('update_customer', - help='[<"X-AIC-ORM-Client" ' + help='[<"X-RANGER-Client" ' 'header>] ] ' '') @@ -98,7 +98,7 @@ def add_to_parser(service_sub): help='') parser_replace_region = subparsers.add_parser('replace_region', - help='[<"X-AIC-ORM-Client" ' + help='[<"X-RANGER-Client" ' 'header>] ') @@ -110,7 +110,7 @@ def add_to_parser(service_sub): help='') parser_delete_region = subparsers.add_parser('delete_region', - help='[<"X-AIC-ORM-Client" ' + help='[<"X-RANGER-Client" ' 'header>] ' '') parser_delete_region.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) @@ -119,7 +119,7 @@ def add_to_parser(service_sub): # add user parser_add_user = subparsers.add_parser('add_user', - help='[<"X-AIC-ORM-Client" ' + help='[<"X-RANGER-Client" ' 'header>] ' ' ') @@ -131,7 +131,7 @@ def add_to_parser(service_sub): # replace user parser_replace_user = subparsers.add_parser('replace_user', - help='[<"X-AIC-ORM-Client" ' + help='[<"X-RANGER-Client" ' 'header>] ' ' ') @@ -144,7 +144,7 @@ def add_to_parser(service_sub): # delete user parser_delete_user = subparsers.add_parser( 'delete_user', - help='[<"X-AIC-ORM-Client" header>] ' + help='[<"X-RANGER-Client" header>] ' ' ') parser_delete_user.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_delete_user.add_argument('custid', type=str, @@ -157,7 +157,7 @@ def add_to_parser(service_sub): # add default user parser_add_default_user = \ subparsers.add_parser('add_default_user', - help='[<"X-AIC-ORM-Client" header>] ' + help='[<"X-RANGER-Client" header>] ' ' ' '') @@ -172,7 +172,7 @@ def add_to_parser(service_sub): # replace default user parser_replace_default_user = \ subparsers.add_parser('replace_default_user', - help='[<"X-AIC-ORM-Client" header>] ' + help='[<"X-RANGER-Client" header>] ' ' ' '] ' ' ' ' ') parser_delete_default_user.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) @@ -216,10 +216,10 @@ def add_to_parser(service_sub): # add metadata h1, h2, h3 = \ - '[<"X-AIC-ORM-Client" header>]', '', '' + '[<"X-RANGER-Client" header>]', '', '' parser_add_metadata = subparsers.add_parser('add_metadata', help='%s %s %s' % (h1, h2, h3)) parser_add_metadata.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) @@ -230,10 +230,10 @@ def add_to_parser(service_sub): # replace metadata h1, h2, h3 = \ - '[<"X-AIC-ORM-Client" header>]', '', '' + '[<"X-RANGER-Client" header>]', '', '' parser_replace_metadata = subparsers.add_parser('replace_metadata', help='%s %s %s' % ( h1, h2, h3)) @@ -247,13 +247,13 @@ def add_to_parser(service_sub): # get customer parser_get_customer = subparsers.add_parser('get_customer', - help='[<"X-AIC-ORM-Client" ' + help='[<"X-RANGER-Client" ' 'header>] ') parser_get_customer.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_get_customer.add_argument('custid', type=str, help='') # list customers - h1 = '[<"X-AIC-ORM-Client" header>]' + h1 = '[<"X-RANGER-Client" header>]' h2 = '[--region ] [--user ] [--metadata ]' \ ' [starts_with ] [contains ]' parser_list_customer = subparsers.add_parser('list_customers', @@ -385,7 +385,7 @@ def get_token(timeout, args, host): def get_environment_variable(argument): # The rules are: all caps, underscores instead of dashes and prefixed - environment_variable = 'AIC_ORM_{}'.format( + environment_variable = 'RANGER_{}'.format( argument.replace('-', '_').upper()) return os.environ.get(environment_variable) @@ -415,9 +415,9 @@ def run(args): 'content-type': 'application/json', 'X-Auth-Token': auth_token, 'X-Auth-Region': auth_region, - 'X-AIC-ORM-Requester': requester, - 'X-AIC-ORM-Client': client, - 'X-AIC-ORM-Tracking-Id': tracking_id + 'X-RANGER-Requester': requester, + 'X-RANGER-Client': client, + 'X-RANGER-Tracking-Id': tracking_id } if args.verbose: diff --git a/orm/orm_client/ormcli/fmscli.py b/orm/orm_client/ormcli/fmscli.py index 065147e6..1f3d384e 100644 --- a/orm/orm_client/ormcli/fmscli.py +++ b/orm/orm_client/ormcli/fmscli.py @@ -48,7 +48,7 @@ def add_to_parser(service_sub): metavar=' [-h] ') # flavor - h1, h2 = ('[<"X-AIC-ORM-Client" header>]', + h1, h2 = ('[<"X-RANGER-Client" header>]', '') parser_create_flavor = subparsers.add_parser('create_flavor', help='%s %s' % (h1, h2)) @@ -56,7 +56,7 @@ def add_to_parser(service_sub): parser_create_flavor.add_argument('datafile', type=argparse.FileType('r'), help=h2) - h1, h2, h3 = ('[<"X-AIC-ORM-Client" header>]', '', + h1, h2, h3 = ('[<"X-RANGER-Client" header>]', '', '',) parser_add_tags = subparsers.add_parser('add_tags', help='%s %s %s' % (h1, h2, h3)) @@ -65,7 +65,7 @@ def add_to_parser(service_sub): parser_add_tags.add_argument('datafile', type=argparse.FileType('r'), help=h3) - h1, h2, h3 = ('[<"X-AIC-ORM-Client" header>]', '', + h1, h2, h3 = ('[<"X-RANGER-Client" header>]', '', '',) parser_replace_tags = subparsers.add_parser('replace_tags', help='%s %s %s' % (h1, h2, h3)) @@ -74,35 +74,35 @@ def add_to_parser(service_sub): parser_replace_tags.add_argument('datafile', type=argparse.FileType('r'), help=h3) - h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '', '' + h1, h2, h3 = '[<"X-RANGER-Client" header>]', '', '' parser_delete_tag = subparsers.add_parser('delete_tag', help='%s %s %s' % (h1, h2, h3)) parser_delete_tag.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_delete_tag.add_argument('flavorid', type=str, help=h2) parser_delete_tag.add_argument('tagname', type=str, help=h3) - h1, h2 = '[<"X-AIC-ORM-Client" header>]', '' + h1, h2 = '[<"X-RANGER-Client" header>]', '' parser_delete_all_tags = subparsers.add_parser('delete_all_tags', help='%s %s' % (h1, h2)) parser_delete_all_tags.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_delete_all_tags.add_argument('flavorid', type=str, help=h2) - h1, h2 = '[<"X-AIC-ORM-Client" header>]', '' + h1, h2 = '[<"X-RANGER-Client" header>]', '' parser_get_tags = subparsers.add_parser('get_tags', help='%s %s' % (h1, h2)) parser_get_tags.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_get_tags.add_argument('flavorid', type=str, help=h2) # extra specs - h1, h2 = '[<"X-AIC-ORM-Client" header>]', '' + h1, h2 = '[<"X-RANGER-Client" header>]', '' parser_get_extra_specs = subparsers.add_parser('get_extra_specs', help='%s %s' % (h1, h2)) parser_get_extra_specs.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_get_extra_specs.add_argument('flavorid', type=str, help=h2) - h1, h2, h3 = ('[<"X-AIC-ORM-Client" header>]', '', + h1, h2, h3 = ('[<"X-RANGER-Client" header>]', '', '',) parser_replace_extra_specs = subparsers.add_parser('replace_extra_specs', help='%s %s %s' % (h1, @@ -115,14 +115,14 @@ def add_to_parser(service_sub): type=argparse.FileType('r'), help=h3) - h1, h2 = '[<"X-AIC-ORM-Client" header>]', '' + h1, h2 = '[<"X-RANGER-Client" header>]', '' parser_delete_all_extra_specs = subparsers.add_parser( 'delete_all_extra_specs', help='%s %s' % (h1, h2)) parser_delete_all_extra_specs.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_delete_all_extra_specs.add_argument('flavorid', type=str, help=h2) - h1, h2, h3 = ('[<"X-AIC-ORM-Client" header>]', '', + h1, h2, h3 = ('[<"X-RANGER-Client" header>]', '', '',) parser_delete_extra_spec = subparsers.add_parser('delete_extra_spec', help='%s%s%s' % ( @@ -132,7 +132,7 @@ def add_to_parser(service_sub): parser_delete_extra_spec.add_argument('flavorid', type=str, help=h2) parser_delete_extra_spec.add_argument('eskeyname', type=str, help=h3) - h1, h2, h3 = ('[<"X-AIC-ORM-Client" header>]', '', + h1, h2, h3 = ('[<"X-RANGER-Client" header>]', '', '',) parser_add_extra_specs = subparsers.add_parser('add_extra_specs', help='%s%s%s' % ( @@ -144,19 +144,19 @@ def add_to_parser(service_sub): type=argparse.FileType('r'), help=h3) - h1, h2 = '[<"X-AIC-ORM-Client" header>]', '' + h1, h2 = '[<"X-RANGER-Client" header>]', '' parser_delete_flavor = subparsers.add_parser('delete_flavor', help='%s %s' % (h1, h2)) parser_delete_flavor.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_delete_flavor.add_argument('flavorid', type=str, help=h2) - h1, h2 = '[<"X-AIC-ORM-Client" header>]', '' + h1, h2 = '[<"X-RANGER-Client" header>]', '' parser_get_flavor = subparsers.add_parser('get_flavor', help='%s %s' % (h1, h2)) parser_get_flavor.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_get_flavor.add_argument('flavorid', type=str, help=h2) - h1, h2 = ('[<"X-AIC-ORM-Client" header>]', + h1, h2 = ('[<"X-RANGER-Client" header>]', '[--visibility ] [--region ] [--tenant ' '] [--series {gv,nv,ns,nd,ss}] [--alias ]') parser_list_flavor = subparsers.add_parser('list_flavors', @@ -175,7 +175,7 @@ def add_to_parser(service_sub): parser_list_flavor.add_argument('--alias', type=str, help='flavor alias') # region for flavor - h1, h2, h3 = ('[<"X-AIC-ORM-Client" header>]', '', + h1, h2, h3 = ('[<"X-RANGER-Client" header>]', '', '',) parser_add_region = subparsers.add_parser('add_region', help='%s %s %s' % (h1, h2, h3)) @@ -184,7 +184,7 @@ def add_to_parser(service_sub): parser_add_region.add_argument('datafile', type=argparse.FileType('r'), help=h3) - h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '', '' + h1, h2, h3 = '[<"X-RANGER-Client" header>]', '', '' parser_delete_region = subparsers.add_parser('delete_region', help='%s %s %s' % ( h1, h2, h3)) @@ -193,7 +193,7 @@ def add_to_parser(service_sub): parser_delete_region.add_argument('regionid', type=str, help=h3) # tenant for flavor - h1, h2, h3 = ('[<"X-AIC-ORM-Client" header>]', '', + h1, h2, h3 = ('[<"X-RANGER-Client" header>]', '', '',) parser_add_tenant = subparsers.add_parser('add_tenant', help='%s %s %s' % (h1, h2, h3)) @@ -202,7 +202,7 @@ def add_to_parser(service_sub): parser_add_tenant.add_argument('datafile', type=argparse.FileType('r'), help=h3) - h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '', '' + h1, h2, h3 = '[<"X-RANGER-Client" header>]', '', '' parser_delete_tenant = subparsers.add_parser('delete_tenant', help='%s %s %s' % ( h1, h2, h3)) @@ -332,7 +332,7 @@ def get_token(timeout, args, host): def get_environment_variable(argument): # The rules are: all caps, underscores instead of dashes and prefixed - environment_variable = 'AIC_ORM_{}'.format( + environment_variable = 'RANGER_{}'.format( argument.replace('-', '_').upper()) return os.environ.get(environment_variable) @@ -362,9 +362,9 @@ def run(args): 'content-type': 'application/json', 'X-Auth-Token': auth_token, 'X-Auth-Region': auth_region, - 'X-AIC-ORM-Requester': requester, - 'X-AIC-ORM-Client': client, - 'X-AIC-ORM-Tracking-Id': tracking_id + 'X-RANGER-Requester': requester, + 'X-RANGER-Client': client, + 'X-RANGER-Tracking-Id': tracking_id } if args.verbose: diff --git a/orm/orm_client/ormcli/imscli.py b/orm/orm_client/ormcli/imscli.py index 81de9c2c..67fe8854 100644 --- a/orm/orm_client/ormcli/imscli.py +++ b/orm/orm_client/ormcli/imscli.py @@ -48,14 +48,14 @@ def add_to_parser(service_sub): metavar=' [-h] ') # image - h1, h2 = '[<"X-AIC-ORM-Client" header>]', '' + h1, h2 = '[<"X-RANGER-Client" header>]', '' parser_create_image = subparsers.add_parser('create_image', help='%s %s' % (h1, h2)) parser_create_image.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_create_image.add_argument('datafile', type=argparse.FileType('r'), help=h2) - h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '', \ + h1, h2, h3 = '[<"X-RANGER-Client" header>]', '', \ '' parser_update_image = subparsers.add_parser('update_image', help='%s %s %s' % (h1, @@ -66,20 +66,20 @@ def add_to_parser(service_sub): parser_update_image.add_argument('datafile', type=argparse.FileType('r'), help=h3) - h1, h2 = '[<"X-AIC-ORM-Client" header>]', '' + h1, h2 = '[<"X-RANGER-Client" header>]', '' parser_delete_image = subparsers.add_parser('delete_image', help='%s %s' % (h1, h2)) parser_delete_image.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_delete_image.add_argument('imageid', type=str, help=h2) # get images - h1, h2 = '[<"X-AIC-ORM-Client" header>]', '' + h1, h2 = '[<"X-RANGER-Client" header>]', '' parser_get_image = subparsers.add_parser('get_image', help='%s %s' % (h1, h2)) parser_get_image.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_get_image.add_argument('imageid', type=str, help=h2) - h1, h2 = '[<"X-AIC-ORM-Client" header>]', \ + h1, h2 = '[<"X-RANGER-Client" header>]', \ '[--visibility ] ' \ '[--region ] [--customer ]' parser_list_images = subparsers.add_parser('list_images', @@ -91,7 +91,7 @@ def add_to_parser(service_sub): parser_list_images.add_argument('--customer', type=str, help='customer id') # activate/deactivate image - h1, h2 = '[<"X-AIC-ORM-Client" header>]', '' + h1, h2 = '[<"X-RANGER-Client" header>]', '' parser_enable = subparsers.add_parser('enable', help='%s %s' % (h1, h2)) parser_enable.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) @@ -104,7 +104,7 @@ def add_to_parser(service_sub): parser_disable.add_argument('imageid', type=str, help=h2) # region for image - h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '', \ + h1, h2, h3 = '[<"X-RANGER-Client" header>]', '', \ '' parser_add_regions = subparsers.add_parser('add_regions', help='%s %s %s' % (h1, h2, h3)) @@ -114,7 +114,7 @@ def add_to_parser(service_sub): type=argparse.FileType('r'), help=h3) - h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '', \ + h1, h2, h3 = '[<"X-RANGER-Client" header>]', '', \ '' parser_update_regions = subparsers.add_parser('update_regions', help='%s %s %s' % (h1, @@ -127,7 +127,7 @@ def add_to_parser(service_sub): type=argparse.FileType('r'), help=h3) - h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '', '' + h1, h2, h3 = '[<"X-RANGER-Client" header>]', '', '' parser_delete_region = subparsers.add_parser('delete_region', help='%s %s %s' % (h1, h2, @@ -137,7 +137,7 @@ def add_to_parser(service_sub): parser_delete_region.add_argument('regionid', type=str, help=h3) # customer for image - h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '', \ + h1, h2, h3 = '[<"X-RANGER-Client" header>]', '', \ '' parser_add_customers = subparsers.add_parser('add_customers', help='%s %s %s' % (h1, @@ -149,7 +149,7 @@ def add_to_parser(service_sub): type=argparse.FileType('r'), help=h3) - h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '', \ + h1, h2, h3 = '[<"X-RANGER-Client" header>]', '', \ '' parser_update_customer = subparsers.add_parser('update_customers', help='%s %s %s' % (h1, @@ -162,7 +162,7 @@ def add_to_parser(service_sub): type=argparse.FileType('r'), help=h3) - h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '', \ + h1, h2, h3 = '[<"X-RANGER-Client" header>]', '', \ '' parser_delete_customer = subparsers.add_parser('delete_customer', help='%s %s %s' % (h1, @@ -299,7 +299,7 @@ def cmd_data(args): def get_environment_variable(argument): # The rules are: all caps, underscores instead of dashes and prefixed - environment_variable = 'AIC_ORM_{}'.format( + environment_variable = 'RANGER_{}'.format( argument.replace('-', '_').upper()) return os.environ.get(environment_variable) @@ -328,9 +328,9 @@ def run(args): 'content-type': 'application/json', 'X-Auth-Token': auth_token, 'X-Auth-Region': auth_region, - 'X-AIC-ORM-Requester': requester, - 'X-AIC-ORM-Client': client, - 'X-AIC-ORM-Tracking-Id': tracking_id + 'X-RANGER-Requester': requester, + 'X-RANGER-Client': client, + 'X-RANGER-Tracking-Id': tracking_id } if args.verbose: diff --git a/orm/orm_client/ormcli/rmscli.py b/orm/orm_client/ormcli/rmscli.py index 3ac08e29..e4d4d3e7 100644 --- a/orm/orm_client/ormcli/rmscli.py +++ b/orm/orm_client/ormcli/rmscli.py @@ -305,7 +305,7 @@ def get_path(args): def get_environment_variable(argument): # The rules are: all caps, underscores instead of dashes and prefixed - environment_variable = 'AIC_ORM_{}'.format( + environment_variable = 'RANGER_{}'.format( argument.replace('-', '_').upper()) return os.environ.get(environment_variable) @@ -347,9 +347,9 @@ def run(args): 'content-type': 'application/json', 'X-Auth-Token': auth_token, 'X-Auth-Region': auth_region, - 'X-AIC-ORM-Requester': requester, - 'X-AIC-ORM-Client': client, - 'X-AIC-ORM-Tracking-Id': tracking_id + 'X-RANGER-Requester': requester, + 'X-RANGER-Client': client, + 'X-RANGER-Tracking-Id': tracking_id } if args.verbose: print("Sending API:\ntimeout: %d\ndata: %s\n"