x/ranger
Code Issues Proposed changes

Change X-AIC-ORM to X-RANGER

Browse Source 
Change-Id: I16b361b3f2aadc1a9c67da8d8a4515d325d1185f
This commit is contained in:
hosingh000 2017-09-22 10:50:45 -05:00
parent 50756599b5
commit 694989f6ae
5 changed files with 72 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -30,6 +30,8 @@ cover/
nosetests.xml nosetests.xml
.testrepository .testrepository
.venv .venv
.idea/
.stestr/
# Translations # Translations
*.mo *.mo

56
orm/orm_client/ormcli/cmscli.py
View File

@ -36,7 +36,7 @@ def add_to_parser(service_sub):
parser.add_argument('--orm-base-url', type=str, help='ORM base URL', parser.add_argument('--orm-base-url', type=str, help='ORM base URL',
default=get_environment_variable('orm-base-url')) default=get_environment_variable('orm-base-url'))
parser.add_argument('--tracking_id', type=str, 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('--port', type=int, help='port number of CMS server')
parser.add_argument('--timeout', type=int, parser.add_argument('--timeout', type=int,
help='request timeout in seconds (default: 10)') help='request timeout in seconds (default: 10)')
@ -51,7 +51,7 @@ def add_to_parser(service_sub):
# customer # customer
parser_create_customer = subparsers.add_parser('create_customer', parser_create_customer = subparsers.add_parser('create_customer',
help='[<"X-AIC-ORM-Client" ' help='[<"X-RANGER-Client" '
'header>] <data file ' 'header>] <data file '
'with new customer ' 'with new customer '
'JSON>') 'JSON>')
@ -63,7 +63,7 @@ def add_to_parser(service_sub):
'JSON>') 'JSON>')
parser_delete_customer = subparsers.add_parser('delete_customer', parser_delete_customer = subparsers.add_parser('delete_customer',
help='[<"X-AIC-ORM-Client" ' help='[<"X-RANGER-Client" '
'header>] <customer ' 'header>] <customer '
'id>') 'id>')
parser_delete_customer.add_argument('client', parser_delete_customer.add_argument('client',
@ -72,7 +72,7 @@ def add_to_parser(service_sub):
help='<customer id>') help='<customer id>')
parser_update_customer = subparsers.add_parser('update_customer', parser_update_customer = subparsers.add_parser('update_customer',
help='[<"X-AIC-ORM-Client" ' help='[<"X-RANGER-Client" '
'header>] <customer ' 'header>] <customer '
'id> <data file with ' 'id> <data file with '
'updated customer ' 'updated customer '
@ -88,7 +88,7 @@ def add_to_parser(service_sub):
# region # region
parser_add_region = subparsers.add_parser('add_region', parser_add_region = subparsers.add_parser('add_region',
help='[<"X-AIC-ORM-Client" ' help='[<"X-RANGER-Client" '
'header>] <customer id> ' 'header>] <customer id> '
'<data file with region(' '<data file with region('
's) JSON>') 's) JSON>')
@ -98,7 +98,7 @@ def add_to_parser(service_sub):
help='<data file with region(s) JSON>') help='<data file with region(s) JSON>')
parser_replace_region = subparsers.add_parser('replace_region', parser_replace_region = subparsers.add_parser('replace_region',
help='[<"X-AIC-ORM-Client" ' help='[<"X-RANGER-Client" '
'header>] <customer ' 'header>] <customer '
'id> <data file with ' 'id> <data file with '
'region(s) JSON>') 'region(s) JSON>')
@ -110,7 +110,7 @@ def add_to_parser(service_sub):
help='<data file with region(s) JSON>') help='<data file with region(s) JSON>')
parser_delete_region = subparsers.add_parser('delete_region', parser_delete_region = subparsers.add_parser('delete_region',
help='[<"X-AIC-ORM-Client" ' help='[<"X-RANGER-Client" '
'header>] <customer id> ' 'header>] <customer id> '
'<region id>') '<region id>')
parser_delete_region.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_delete_region.add_argument('client', **cli_common.ORM_CLIENT_KWARGS)
@ -119,7 +119,7 @@ def add_to_parser(service_sub):
# add user # add user
parser_add_user = subparsers.add_parser('add_user', parser_add_user = subparsers.add_parser('add_user',
help='[<"X-AIC-ORM-Client" ' help='[<"X-RANGER-Client" '
'header>] <customer id> ' 'header>] <customer id> '
'<region id> <data file ' '<region id> <data file '
'with user(s) JSON>') 'with user(s) JSON>')
@ -131,7 +131,7 @@ def add_to_parser(service_sub):
# replace user # replace user
parser_replace_user = subparsers.add_parser('replace_user', parser_replace_user = subparsers.add_parser('replace_user',
help='[<"X-AIC-ORM-Client" ' help='[<"X-RANGER-Client" '
'header>] <customer id> ' 'header>] <customer id> '
'<region id> <data file ' '<region id> <data file '
'with user(s) JSON>') 'with user(s) JSON>')
@ -144,7 +144,7 @@ def add_to_parser(service_sub):
# delete user # delete user
parser_delete_user = subparsers.add_parser( parser_delete_user = subparsers.add_parser(
'delete_user', 'delete_user',
help='[<"X-AIC-ORM-Client" header>] ' help='[<"X-RANGER-Client" header>] '
'<customer id> <region id> <user id>') '<customer id> <region id> <user id>')
parser_delete_user.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_delete_user.add_argument('client', **cli_common.ORM_CLIENT_KWARGS)
parser_delete_user.add_argument('custid', type=str, parser_delete_user.add_argument('custid', type=str,
@ -157,7 +157,7 @@ def add_to_parser(service_sub):
# add default user # add default user
parser_add_default_user = \ parser_add_default_user = \
subparsers.add_parser('add_default_user', subparsers.add_parser('add_default_user',
help='[<"X-AIC-ORM-Client" header>] ' help='[<"X-RANGER-Client" header>] '
'<customer id> ' '<customer id> '
'<data file with ' '<data file with '
'region(s) JSON>') 'region(s) JSON>')
@ -172,7 +172,7 @@ def add_to_parser(service_sub):
# replace default user # replace default user
parser_replace_default_user = \ parser_replace_default_user = \
subparsers.add_parser('replace_default_user', subparsers.add_parser('replace_default_user',
help='[<"X-AIC-ORM-Client" header>] ' help='[<"X-RANGER-Client" header>] '
'<customer id> ' '<customer id> '
'<data file ' '<data file '
'with region(s) ' 'with region(s) '
@ -188,7 +188,7 @@ def add_to_parser(service_sub):
# change enable # change enable
parser_enable_customer = subparsers.add_parser('enabled', parser_enable_customer = subparsers.add_parser('enabled',
help='[<"X-AIC-ORM-Client" ' help='[<"X-RANGER-Client" '
'header>] ' 'header>] '
'<customer id> ' '<customer id> '
'<data file with ' '<data file with '
@ -205,7 +205,7 @@ def add_to_parser(service_sub):
# delete default user # delete default user
parser_delete_default_user = \ parser_delete_default_user = \
subparsers.add_parser('delete_default_user', subparsers.add_parser('delete_default_user',
help='[<"X-AIC-ORM-Client" header>] <customer ' help='[<"X-RANGER-Client" header>] <customer '
'id> <user id>') 'id> <user id>')
parser_delete_default_user.add_argument('client', parser_delete_default_user.add_argument('client',
**cli_common.ORM_CLIENT_KWARGS) **cli_common.ORM_CLIENT_KWARGS)
@ -216,10 +216,10 @@ def add_to_parser(service_sub):
# add metadata # add metadata
h1, h2, h3 = \ h1, h2, h3 = \
'[<"X-AIC-ORM-Client" header>]', '<customer id>', '<data file ' \ '[<"X-RANGER-Client" header>]', '<customer id>', '<data file ' \
'with ' \ 'with ' \
'metadata(' \ 'metadata(' \
's) JSON>' 's) JSON>'
parser_add_metadata = subparsers.add_parser('add_metadata', parser_add_metadata = subparsers.add_parser('add_metadata',
help='%s %s %s' % (h1, h2, h3)) help='%s %s %s' % (h1, h2, h3))
parser_add_metadata.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_add_metadata.add_argument('client', **cli_common.ORM_CLIENT_KWARGS)
@ -230,10 +230,10 @@ def add_to_parser(service_sub):
# replace metadata # replace metadata
h1, h2, h3 = \ h1, h2, h3 = \
'[<"X-AIC-ORM-Client" header>]', '<customer id>', '<data file ' \ '[<"X-RANGER-Client" header>]', '<customer id>', '<data file ' \
'with ' \ 'with ' \
'metadata(' \ 'metadata(' \
's) JSON>' 's) JSON>'
parser_replace_metadata = subparsers.add_parser('replace_metadata', parser_replace_metadata = subparsers.add_parser('replace_metadata',
help='%s %s %s' % ( help='%s %s %s' % (
h1, h2, h3)) h1, h2, h3))
@ -247,13 +247,13 @@ def add_to_parser(service_sub):
# get customer # get customer
parser_get_customer = subparsers.add_parser('get_customer', parser_get_customer = subparsers.add_parser('get_customer',
help='[<"X-AIC-ORM-Client" ' help='[<"X-RANGER-Client" '
'header>] <customer id>') 'header>] <customer id>')
parser_get_customer.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_get_customer.add_argument('client', **cli_common.ORM_CLIENT_KWARGS)
parser_get_customer.add_argument('custid', type=str, help='<customer id>') parser_get_customer.add_argument('custid', type=str, help='<customer id>')
# list customers # list customers
h1 = '[<"X-AIC-ORM-Client" header>]' h1 = '[<"X-RANGER-Client" header>]'
h2 = '[--region <name>] [--user <name>] [--metadata <key:value>]' \ h2 = '[--region <name>] [--user <name>] [--metadata <key:value>]' \
' [starts_with <name>] [contains <name>]' ' [starts_with <name>] [contains <name>]'
parser_list_customer = subparsers.add_parser('list_customers', parser_list_customer = subparsers.add_parser('list_customers',
@ -385,7 +385,7 @@ def get_token(timeout, args, host):
def get_environment_variable(argument): def get_environment_variable(argument):
# The rules are: all caps, underscores instead of dashes and prefixed # The rules are: all caps, underscores instead of dashes and prefixed
environment_variable = 'AIC_ORM_{}'.format( environment_variable = 'RANGER_{}'.format(
argument.replace('-', '_').upper()) argument.replace('-', '_').upper())
return os.environ.get(environment_variable) return os.environ.get(environment_variable)
@ -415,9 +415,9 @@ def run(args):
'content-type': 'application/json', 'content-type': 'application/json',
'X-Auth-Token': auth_token, 'X-Auth-Token': auth_token,
'X-Auth-Region': auth_region, 'X-Auth-Region': auth_region,
'X-AIC-ORM-Requester': requester, 'X-RANGER-Requester': requester,
'X-AIC-ORM-Client': client, 'X-RANGER-Client': client,
'X-AIC-ORM-Tracking-Id': tracking_id 'X-RANGER-Tracking-Id': tracking_id
} }
if args.verbose: if args.verbose:

44
orm/orm_client/ormcli/fmscli.py
View File

@ -48,7 +48,7 @@ def add_to_parser(service_sub):
metavar='<subcommand> [-h] <args>') metavar='<subcommand> [-h] <args>')
# flavor # flavor
h1, h2 = ('[<"X-AIC-ORM-Client" header>]', h1, h2 = ('[<"X-RANGER-Client" header>]',
'<data file with new flavor JSON>') '<data file with new flavor JSON>')
parser_create_flavor = subparsers.add_parser('create_flavor', parser_create_flavor = subparsers.add_parser('create_flavor',
help='%s %s' % (h1, h2)) 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'), parser_create_flavor.add_argument('datafile', type=argparse.FileType('r'),
help=h2) help=h2)
h1, h2, h3 = ('[<"X-AIC-ORM-Client" header>]', '<flavor id>', h1, h2, h3 = ('[<"X-RANGER-Client" header>]', '<flavor id>',
'<data file with tag(s) JSON>',) '<data file with tag(s) JSON>',)
parser_add_tags = subparsers.add_parser('add_tags', parser_add_tags = subparsers.add_parser('add_tags',
help='%s %s %s' % (h1, h2, h3)) 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'), parser_add_tags.add_argument('datafile', type=argparse.FileType('r'),
help=h3) help=h3)
h1, h2, h3 = ('[<"X-AIC-ORM-Client" header>]', '<flavor id>', h1, h2, h3 = ('[<"X-RANGER-Client" header>]', '<flavor id>',
'<data file with tag(s) JSON>',) '<data file with tag(s) JSON>',)
parser_replace_tags = subparsers.add_parser('replace_tags', parser_replace_tags = subparsers.add_parser('replace_tags',
help='%s %s %s' % (h1, h2, h3)) 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'), parser_replace_tags.add_argument('datafile', type=argparse.FileType('r'),
help=h3) help=h3)
h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '<flavor id>', '<tag name>' h1, h2, h3 = '[<"X-RANGER-Client" header>]', '<flavor id>', '<tag name>'
parser_delete_tag = subparsers.add_parser('delete_tag', parser_delete_tag = subparsers.add_parser('delete_tag',
help='%s %s %s' % (h1, h2, h3)) help='%s %s %s' % (h1, h2, h3))
parser_delete_tag.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) 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('flavorid', type=str, help=h2)
parser_delete_tag.add_argument('tagname', type=str, help=h3) parser_delete_tag.add_argument('tagname', type=str, help=h3)
h1, h2 = '[<"X-AIC-ORM-Client" header>]', '<flavor id>' h1, h2 = '[<"X-RANGER-Client" header>]', '<flavor id>'
parser_delete_all_tags = subparsers.add_parser('delete_all_tags', parser_delete_all_tags = subparsers.add_parser('delete_all_tags',
help='%s %s' % (h1, h2)) help='%s %s' % (h1, h2))
parser_delete_all_tags.add_argument('client', parser_delete_all_tags.add_argument('client',
**cli_common.ORM_CLIENT_KWARGS) **cli_common.ORM_CLIENT_KWARGS)
parser_delete_all_tags.add_argument('flavorid', type=str, help=h2) parser_delete_all_tags.add_argument('flavorid', type=str, help=h2)
h1, h2 = '[<"X-AIC-ORM-Client" header>]', '<flavor id>' h1, h2 = '[<"X-RANGER-Client" header>]', '<flavor id>'
parser_get_tags = subparsers.add_parser('get_tags', parser_get_tags = subparsers.add_parser('get_tags',
help='%s %s' % (h1, h2)) help='%s %s' % (h1, h2))
parser_get_tags.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_get_tags.add_argument('client', **cli_common.ORM_CLIENT_KWARGS)
parser_get_tags.add_argument('flavorid', type=str, help=h2) parser_get_tags.add_argument('flavorid', type=str, help=h2)
# extra specs # extra specs
h1, h2 = '[<"X-AIC-ORM-Client" header>]', '<flavor id>' h1, h2 = '[<"X-RANGER-Client" header>]', '<flavor id>'
parser_get_extra_specs = subparsers.add_parser('get_extra_specs', parser_get_extra_specs = subparsers.add_parser('get_extra_specs',
help='%s %s' % (h1, h2)) help='%s %s' % (h1, h2))
parser_get_extra_specs.add_argument('client', parser_get_extra_specs.add_argument('client',
**cli_common.ORM_CLIENT_KWARGS) **cli_common.ORM_CLIENT_KWARGS)
parser_get_extra_specs.add_argument('flavorid', type=str, help=h2) parser_get_extra_specs.add_argument('flavorid', type=str, help=h2)
h1, h2, h3 = ('[<"X-AIC-ORM-Client" header>]', '<flavor id>', h1, h2, h3 = ('[<"X-RANGER-Client" header>]', '<flavor id>',
'<datafile with extra_specs json>',) '<datafile with extra_specs json>',)
parser_replace_extra_specs = subparsers.add_parser('replace_extra_specs', parser_replace_extra_specs = subparsers.add_parser('replace_extra_specs',
help='%s %s %s' % (h1, help='%s %s %s' % (h1,
@ -115,14 +115,14 @@ def add_to_parser(service_sub):
type=argparse.FileType('r'), type=argparse.FileType('r'),
help=h3) help=h3)
h1, h2 = '[<"X-AIC-ORM-Client" header>]', '<flavor id>' h1, h2 = '[<"X-RANGER-Client" header>]', '<flavor id>'
parser_delete_all_extra_specs = subparsers.add_parser( parser_delete_all_extra_specs = subparsers.add_parser(
'delete_all_extra_specs', help='%s %s' % (h1, h2)) 'delete_all_extra_specs', help='%s %s' % (h1, h2))
parser_delete_all_extra_specs.add_argument('client', parser_delete_all_extra_specs.add_argument('client',
**cli_common.ORM_CLIENT_KWARGS) **cli_common.ORM_CLIENT_KWARGS)
parser_delete_all_extra_specs.add_argument('flavorid', type=str, help=h2) parser_delete_all_extra_specs.add_argument('flavorid', type=str, help=h2)
h1, h2, h3 = ('[<"X-AIC-ORM-Client" header>]', '<flavor id>', h1, h2, h3 = ('[<"X-RANGER-Client" header>]', '<flavor id>',
'<extra_spec key name>',) '<extra_spec key name>',)
parser_delete_extra_spec = subparsers.add_parser('delete_extra_spec', parser_delete_extra_spec = subparsers.add_parser('delete_extra_spec',
help='%s%s%s' % ( 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('flavorid', type=str, help=h2)
parser_delete_extra_spec.add_argument('eskeyname', type=str, help=h3) parser_delete_extra_spec.add_argument('eskeyname', type=str, help=h3)
h1, h2, h3 = ('[<"X-AIC-ORM-Client" header>]', '<flavor id>', h1, h2, h3 = ('[<"X-RANGER-Client" header>]', '<flavor id>',
'<datafile with extra_specs json>',) '<datafile with extra_specs json>',)
parser_add_extra_specs = subparsers.add_parser('add_extra_specs', parser_add_extra_specs = subparsers.add_parser('add_extra_specs',
help='%s%s%s' % ( help='%s%s%s' % (
@ -144,19 +144,19 @@ def add_to_parser(service_sub):
type=argparse.FileType('r'), type=argparse.FileType('r'),
help=h3) help=h3)
h1, h2 = '[<"X-AIC-ORM-Client" header>]', '<flavor id>' h1, h2 = '[<"X-RANGER-Client" header>]', '<flavor id>'
parser_delete_flavor = subparsers.add_parser('delete_flavor', parser_delete_flavor = subparsers.add_parser('delete_flavor',
help='%s %s' % (h1, h2)) help='%s %s' % (h1, h2))
parser_delete_flavor.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_delete_flavor.add_argument('client', **cli_common.ORM_CLIENT_KWARGS)
parser_delete_flavor.add_argument('flavorid', type=str, help=h2) parser_delete_flavor.add_argument('flavorid', type=str, help=h2)
h1, h2 = '[<"X-AIC-ORM-Client" header>]', '<flavor id or flavor_name>' h1, h2 = '[<"X-RANGER-Client" header>]', '<flavor id or flavor_name>'
parser_get_flavor = subparsers.add_parser('get_flavor', parser_get_flavor = subparsers.add_parser('get_flavor',
help='%s %s' % (h1, h2)) help='%s %s' % (h1, h2))
parser_get_flavor.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_get_flavor.add_argument('client', **cli_common.ORM_CLIENT_KWARGS)
parser_get_flavor.add_argument('flavorid', type=str, help=h2) parser_get_flavor.add_argument('flavorid', type=str, help=h2)
h1, h2 = ('[<"X-AIC-ORM-Client" header>]', h1, h2 = ('[<"X-RANGER-Client" header>]',
'[--visibility <public|private>] [--region <name>] [--tenant ' '[--visibility <public|private>] [--region <name>] [--tenant '
'<id>] [--series {gv,nv,ns,nd,ss}] [--alias <alias>]') '<id>] [--series {gv,nv,ns,nd,ss}] [--alias <alias>]')
parser_list_flavor = subparsers.add_parser('list_flavors', 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') parser_list_flavor.add_argument('--alias', type=str, help='flavor alias')
# region for flavor # region for flavor
h1, h2, h3 = ('[<"X-AIC-ORM-Client" header>]', '<flavor id>', h1, h2, h3 = ('[<"X-RANGER-Client" header>]', '<flavor id>',
'<data file with region(s) JSON>',) '<data file with region(s) JSON>',)
parser_add_region = subparsers.add_parser('add_region', parser_add_region = subparsers.add_parser('add_region',
help='%s %s %s' % (h1, h2, h3)) 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'), parser_add_region.add_argument('datafile', type=argparse.FileType('r'),
help=h3) help=h3)
h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '<flavor id>', '<region id>' h1, h2, h3 = '[<"X-RANGER-Client" header>]', '<flavor id>', '<region id>'
parser_delete_region = subparsers.add_parser('delete_region', parser_delete_region = subparsers.add_parser('delete_region',
help='%s %s %s' % ( help='%s %s %s' % (
h1, h2, h3)) h1, h2, h3))
@ -193,7 +193,7 @@ def add_to_parser(service_sub):
parser_delete_region.add_argument('regionid', type=str, help=h3) parser_delete_region.add_argument('regionid', type=str, help=h3)
# tenant for flavor # tenant for flavor
h1, h2, h3 = ('[<"X-AIC-ORM-Client" header>]', '<flavor id>', h1, h2, h3 = ('[<"X-RANGER-Client" header>]', '<flavor id>',
'<data file with tenant(s) JSON>',) '<data file with tenant(s) JSON>',)
parser_add_tenant = subparsers.add_parser('add_tenant', parser_add_tenant = subparsers.add_parser('add_tenant',
help='%s %s %s' % (h1, h2, h3)) 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'), parser_add_tenant.add_argument('datafile', type=argparse.FileType('r'),
help=h3) help=h3)
h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '<flavor id>', '<tenant id>' h1, h2, h3 = '[<"X-RANGER-Client" header>]', '<flavor id>', '<tenant id>'
parser_delete_tenant = subparsers.add_parser('delete_tenant', parser_delete_tenant = subparsers.add_parser('delete_tenant',
help='%s %s %s' % ( help='%s %s %s' % (
h1, h2, h3)) h1, h2, h3))
@ -332,7 +332,7 @@ def get_token(timeout, args, host):
def get_environment_variable(argument): def get_environment_variable(argument):
# The rules are: all caps, underscores instead of dashes and prefixed # The rules are: all caps, underscores instead of dashes and prefixed
environment_variable = 'AIC_ORM_{}'.format( environment_variable = 'RANGER_{}'.format(
argument.replace('-', '_').upper()) argument.replace('-', '_').upper())
return os.environ.get(environment_variable) return os.environ.get(environment_variable)
@ -362,9 +362,9 @@ def run(args):
'content-type': 'application/json', 'content-type': 'application/json',
'X-Auth-Token': auth_token, 'X-Auth-Token': auth_token,
'X-Auth-Region': auth_region, 'X-Auth-Region': auth_region,
'X-AIC-ORM-Requester': requester, 'X-RANGER-Requester': requester,
'X-AIC-ORM-Client': client, 'X-RANGER-Client': client,
'X-AIC-ORM-Tracking-Id': tracking_id 'X-RANGER-Tracking-Id': tracking_id
} }
if args.verbose: if args.verbose:

32
orm/orm_client/ormcli/imscli.py
View File

@ -48,14 +48,14 @@ def add_to_parser(service_sub):
metavar='<subcommand> [-h] <args>') metavar='<subcommand> [-h] <args>')
# image # image
h1, h2 = '[<"X-AIC-ORM-Client" header>]', '<data file with new image JSON>' h1, h2 = '[<"X-RANGER-Client" header>]', '<data file with new image JSON>'
parser_create_image = subparsers.add_parser('create_image', parser_create_image = subparsers.add_parser('create_image',
help='%s %s' % (h1, h2)) help='%s %s' % (h1, h2))
parser_create_image.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_create_image.add_argument('client', **cli_common.ORM_CLIENT_KWARGS)
parser_create_image.add_argument('datafile', type=argparse.FileType('r'), parser_create_image.add_argument('datafile', type=argparse.FileType('r'),
help=h2) help=h2)
h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '<image id>', \ h1, h2, h3 = '[<"X-RANGER-Client" header>]', '<image id>', \
'<data file with updated image JSON>' '<data file with updated image JSON>'
parser_update_image = subparsers.add_parser('update_image', parser_update_image = subparsers.add_parser('update_image',
help='%s %s %s' % (h1, 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'), parser_update_image.add_argument('datafile', type=argparse.FileType('r'),
help=h3) help=h3)
h1, h2 = '[<"X-AIC-ORM-Client" header>]', '<image id>' h1, h2 = '[<"X-RANGER-Client" header>]', '<image id>'
parser_delete_image = subparsers.add_parser('delete_image', parser_delete_image = subparsers.add_parser('delete_image',
help='%s %s' % (h1, h2)) help='%s %s' % (h1, h2))
parser_delete_image.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_delete_image.add_argument('client', **cli_common.ORM_CLIENT_KWARGS)
parser_delete_image.add_argument('imageid', type=str, help=h2) parser_delete_image.add_argument('imageid', type=str, help=h2)
# get images # get images
h1, h2 = '[<"X-AIC-ORM-Client" header>]', '<image id>' h1, h2 = '[<"X-RANGER-Client" header>]', '<image id>'
parser_get_image = subparsers.add_parser('get_image', parser_get_image = subparsers.add_parser('get_image',
help='%s %s' % (h1, h2)) help='%s %s' % (h1, h2))
parser_get_image.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) parser_get_image.add_argument('client', **cli_common.ORM_CLIENT_KWARGS)
parser_get_image.add_argument('imageid', type=str, help=h2) parser_get_image.add_argument('imageid', type=str, help=h2)
h1, h2 = '[<"X-AIC-ORM-Client" header>]', \ h1, h2 = '[<"X-RANGER-Client" header>]', \
'[--visibility <public|private>] ' \ '[--visibility <public|private>] ' \
'[--region <name>] [--customer <id>]' '[--region <name>] [--customer <id>]'
parser_list_images = subparsers.add_parser('list_images', 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') parser_list_images.add_argument('--customer', type=str, help='customer id')
# activate/deactivate image # activate/deactivate image
h1, h2 = '[<"X-AIC-ORM-Client" header>]', '<image id>' h1, h2 = '[<"X-RANGER-Client" header>]', '<image id>'
parser_enable = subparsers.add_parser('enable', parser_enable = subparsers.add_parser('enable',
help='%s %s' % (h1, h2)) help='%s %s' % (h1, h2))
parser_enable.add_argument('client', **cli_common.ORM_CLIENT_KWARGS) 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) parser_disable.add_argument('imageid', type=str, help=h2)
# region for image # region for image
h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '<image id>', \ h1, h2, h3 = '[<"X-RANGER-Client" header>]', '<image id>', \
'<data file with region(s) JSON>' '<data file with region(s) JSON>'
parser_add_regions = subparsers.add_parser('add_regions', parser_add_regions = subparsers.add_parser('add_regions',
help='%s %s %s' % (h1, h2, h3)) help='%s %s %s' % (h1, h2, h3))
@ -114,7 +114,7 @@ def add_to_parser(service_sub):
type=argparse.FileType('r'), type=argparse.FileType('r'),
help=h3) help=h3)
h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '<image id>', \ h1, h2, h3 = '[<"X-RANGER-Client" header>]', '<image id>', \
'<data file with region(s) JSON>' '<data file with region(s) JSON>'
parser_update_regions = subparsers.add_parser('update_regions', parser_update_regions = subparsers.add_parser('update_regions',
help='%s %s %s' % (h1, help='%s %s %s' % (h1,
@ -127,7 +127,7 @@ def add_to_parser(service_sub):
type=argparse.FileType('r'), type=argparse.FileType('r'),
help=h3) help=h3)
h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '<image id>', '<region id>' h1, h2, h3 = '[<"X-RANGER-Client" header>]', '<image id>', '<region id>'
parser_delete_region = subparsers.add_parser('delete_region', parser_delete_region = subparsers.add_parser('delete_region',
help='%s %s %s' % (h1, help='%s %s %s' % (h1,
h2, h2,
@ -137,7 +137,7 @@ def add_to_parser(service_sub):
parser_delete_region.add_argument('regionid', type=str, help=h3) parser_delete_region.add_argument('regionid', type=str, help=h3)
# customer for image # customer for image
h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '<image id>', \ h1, h2, h3 = '[<"X-RANGER-Client" header>]', '<image id>', \
'<data file with customer(s) JSON>' '<data file with customer(s) JSON>'
parser_add_customers = subparsers.add_parser('add_customers', parser_add_customers = subparsers.add_parser('add_customers',
help='%s %s %s' % (h1, help='%s %s %s' % (h1,
@ -149,7 +149,7 @@ def add_to_parser(service_sub):
type=argparse.FileType('r'), type=argparse.FileType('r'),
help=h3) help=h3)
h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '<image id>', \ h1, h2, h3 = '[<"X-RANGER-Client" header>]', '<image id>', \
'<data file with customer(s) JSON>' '<data file with customer(s) JSON>'
parser_update_customer = subparsers.add_parser('update_customers', parser_update_customer = subparsers.add_parser('update_customers',
help='%s %s %s' % (h1, help='%s %s %s' % (h1,
@ -162,7 +162,7 @@ def add_to_parser(service_sub):
type=argparse.FileType('r'), type=argparse.FileType('r'),
help=h3) help=h3)
h1, h2, h3 = '[<"X-AIC-ORM-Client" header>]', '<image id>', \ h1, h2, h3 = '[<"X-RANGER-Client" header>]', '<image id>', \
'<customer id>' '<customer id>'
parser_delete_customer = subparsers.add_parser('delete_customer', parser_delete_customer = subparsers.add_parser('delete_customer',
help='%s %s %s' % (h1, help='%s %s %s' % (h1,
@ -299,7 +299,7 @@ def cmd_data(args):
def get_environment_variable(argument): def get_environment_variable(argument):
# The rules are: all caps, underscores instead of dashes and prefixed # The rules are: all caps, underscores instead of dashes and prefixed
environment_variable = 'AIC_ORM_{}'.format( environment_variable = 'RANGER_{}'.format(
argument.replace('-', '_').upper()) argument.replace('-', '_').upper())
return os.environ.get(environment_variable) return os.environ.get(environment_variable)
@ -328,9 +328,9 @@ def run(args):
'content-type': 'application/json', 'content-type': 'application/json',
'X-Auth-Token': auth_token, 'X-Auth-Token': auth_token,
'X-Auth-Region': auth_region, 'X-Auth-Region': auth_region,
'X-AIC-ORM-Requester': requester, 'X-RANGER-Requester': requester,
'X-AIC-ORM-Client': client, 'X-RANGER-Client': client,
'X-AIC-ORM-Tracking-Id': tracking_id 'X-RANGER-Tracking-Id': tracking_id
} }
if args.verbose: if args.verbose:

8
orm/orm_client/ormcli/rmscli.py
View File

@ -305,7 +305,7 @@ def get_path(args):
def get_environment_variable(argument): def get_environment_variable(argument):
# The rules are: all caps, underscores instead of dashes and prefixed # The rules are: all caps, underscores instead of dashes and prefixed
environment_variable = 'AIC_ORM_{}'.format( environment_variable = 'RANGER_{}'.format(
argument.replace('-', '_').upper()) argument.replace('-', '_').upper())
return os.environ.get(environment_variable) return os.environ.get(environment_variable)
@ -347,9 +347,9 @@ def run(args):
'content-type': 'application/json', 'content-type': 'application/json',
'X-Auth-Token': auth_token, 'X-Auth-Token': auth_token,
'X-Auth-Region': auth_region, 'X-Auth-Region': auth_region,
'X-AIC-ORM-Requester': requester, 'X-RANGER-Requester': requester,
'X-AIC-ORM-Client': client, 'X-RANGER-Client': client,
'X-AIC-ORM-Tracking-Id': tracking_id 'X-RANGER-Tracking-Id': tracking_id
} }
if args.verbose: if args.verbose:
print("Sending API:\ntimeout: %d\ndata: %s\n" print("Sending API:\ntimeout: %d\ndata: %s\n"