LAVA: Align param name in user_args
LAVA related scripts need to be re-used.
Align param name in user_args from different files for convenience.
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I489c189bb04ae9476487ea719a62b926d9a8c161
diff --git a/lava_helper/lava_helper.py b/lava_helper/lava_helper.py
index 6e10323..462c690 100755
--- a/lava_helper/lava_helper.py
+++ b/lava_helper/lava_helper.py
@@ -9,7 +9,7 @@
__copyright__ = """
/*
- * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -316,9 +316,9 @@
if user_args.token_from_env:
usr = os.environ['LAVA_USER']
secret = os.environ['LAVA_TOKEN']
- elif user_args.token_usr and user_args.token_secret:
- usr = user_args.token_usr
- secret = user_args.token_secret
+ elif user_args.lava_user and user_args.lava_token:
+ usr = user_args.lava_user
+ secret = user_args.lava_token
# Do not submit job without complete credentials
if not len(usr) or not len(secret):
@@ -334,7 +334,7 @@
raise Exception("Server rejected user authentication")
except Exception as e:
print("Credential validation failed with : %s" % e)
- print("Did you set set --lava_token_usr, --lava_token_secret?")
+ print("Did you set set --lava_user, --lava_token?")
sys.exit(1)
return lava
@@ -588,11 +588,11 @@
"(i.e www.domain.com/APP)\n"
"By default set to RPC2")
disp_g.add_argument("-du", "--dispatch-lava_token_usr",
- dest="token_usr",
+ dest="lava_user",
action="store",
help="Lava user submitting the job")
disp_g.add_argument("-ds", "--dispatch-lava_token_secret",
- dest="token_secret",
+ dest="lava_token",
action="store",
help="Hash token used to authenticate"
"user during job submission")