laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/42235?usp=email )

Change subject: contrib/smpp-ota-tool: use '-' instead of '_' in command line args ......................................................................

contrib/smpp-ota-tool: use '-' instead of '_' in command line args

Some commandline arguments have an underscore in their name. Let's replace those with dashes.

Change-Id: Icbe9d753d59263997e9ca34d46ed0daca36ca16c Related: SYS#6868 --- M contrib/smpp-ota-tool.py M tests/pySim-smpp2sim_test/pySim-smpp2sim_test.sh 2 files changed, 5 insertions(+), 5 deletions(-)

Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved

diff --git a/contrib/smpp-ota-tool.py b/contrib/smpp-ota-tool.py index 9fac76b..203f37c 100755 --- a/contrib/smpp-ota-tool.py +++ b/contrib/smpp-ota-tool.py @@ -187,12 +187,12 @@ option_parser.add_argument("--algo-auth", choices=algo_auth_choices, default='triple_des_cbc2', help="OTA auth algorithm") option_parser.add_argument('--kic', required=True, type=is_hexstr, help='OTA key (KIC)') - option_parser.add_argument('--kic_idx', default=1, type=int, help='OTA key index (KIC)') + option_parser.add_argument('--kic-idx', default=1, type=int, help='OTA key index (KIC)') option_parser.add_argument('--kid', required=True, type=is_hexstr, help='OTA key (KID)') - option_parser.add_argument('--kid_idx', default=1, type=int, help='OTA key index (KID)') + option_parser.add_argument('--kid-idx', default=1, type=int, help='OTA key index (KID)') option_parser.add_argument('--cntr', default=0, type=int, help='replay protection counter') option_parser.add_argument('--tar', required=True, type=is_hexstr, help='Toolkit Application Reference') - option_parser.add_argument("--cntr_req", choices=CNTR_REQ.decmapping.values(), default='no_counter', + option_parser.add_argument("--cntr-req", choices=CNTR_REQ.decmapping.values(), default='no_counter', help="Counter requirement") option_parser.add_argument('--no-ciphering', action='store_true', default=False, help='Disable ciphering') option_parser.add_argument("--rc-cc-ds", choices=RC_CC_DS.decmapping.values(), default='cc', @@ -202,7 +202,7 @@ option_parser.add_argument('--por-no-ciphering', action='store_true', default=False, help='Disable ciphering (PoR)') option_parser.add_argument("--por-rc-cc-ds", choices=RC_CC_DS.decmapping.values(), default='cc', help="PoR check (rc=redundency check, cc=crypt. checksum, ds=digital signature)") - option_parser.add_argument("--por_req", choices=POR_REQ.decmapping.values(), default='por_required', + option_parser.add_argument("--por-req", choices=POR_REQ.decmapping.values(), default='por_required', help="Proof of Receipt requirements") option_parser.add_argument('--src-addr', default='12', type=str, help='SMS source address (MSISDN)') option_parser.add_argument('--dest-addr', default='23', type=str, help='SMS destination address (MSISDN)') diff --git a/tests/pySim-smpp2sim_test/pySim-smpp2sim_test.sh b/tests/pySim-smpp2sim_test/pySim-smpp2sim_test.sh index 0881319..cb12fb2 100755 --- a/tests/pySim-smpp2sim_test/pySim-smpp2sim_test.sh +++ b/tests/pySim-smpp2sim_test/pySim-smpp2sim_test.sh @@ -49,7 +49,7 @@ R_APDU_EXPECTED=$2

echo "Sending: $C_APDU" - COMMANDLINE="$PYSIM_SMPPOTATOOL --verbose --port $PYSIM_SMPP2SIM_PORT --kic $KIC --kid $KID --kic_idx $KEY_INDEX --kid_idx $KEY_INDEX --algo-crypt $ALGO_CRYPT --algo-auth $ALGO_AUTH --tar $TAR --apdu $C_APDU" + COMMANDLINE="$PYSIM_SMPPOTATOOL --verbose --port $PYSIM_SMPP2SIM_PORT --kic $KIC --kid $KID --kic-idx $KEY_INDEX --kid-idx $KEY_INDEX --algo-crypt $ALGO_CRYPT --algo-auth $ALGO_AUTH --tar $TAR --apdu $C_APDU" echo "Commandline: $COMMANDLINE" R_APDU=`$COMMANDLINE 2> $PYSIM_SMPPOTATOOL_LOG` if [ $? -ne 0 ]; then