cmd-type: default autodetect

Signed-off-by: Maximilian Deubel <[email protected]>

Author: maxd-nordic

src/nrfcloud_utils/cli_helpers.py

@@ -210,7 +210,7 @@ def parser_add_comms_args(parser):
     parser.add_argument("--rtt",
                         help="Use RTT instead of serial. Requires device run Modem Shell sample application configured with RTT overlay",
                         action='store_true', default=False)
-    parser.add_argument("--cmd-type", default=CMD_TYPE_AT, choices=[CMD_TYPE_AT, CMD_TYPE_AT_SHELL, CMD_TYPE_TLS_SHELL], type=str.lower,
+    parser.add_argument("--cmd-type", default=CMD_TYPE_AUTO, choices=[CMD_TYPE_AUTO, CMD_TYPE_AT, CMD_TYPE_AT_SHELL, CMD_TYPE_TLS_SHELL], type=str.lower,
                     help=f"Specify the device command line type. '{CMD_TYPE_AT}' will use AT commands, '{CMD_TYPE_AT_SHELL}' will prefix AT commands with 'at ', and '{CMD_TYPE_TLS_SHELL}' will use TLS Credentials Shell commands.")
     parser.add_argument("--term", type=str,
                         help="AT command termination",choices=list(CMD_TERM_DICT.keys()),

tests/test_claim_and_provision_device.py

@@ -45,9 +45,10 @@ class TestClaimAndProvisionDevice:
     @patch("nrfcredstore.comms.serial.Serial", return_value=FakeSerial())
     def test_provisioning_tags(self, ser, select_device, diap):
         diap.claim_device = Mock(return_value=TEST_RESPONSE)
-        args = f"--port /not/a/real/device --api-key NOTAKEY --provisioning-tags nrf-cloud-onboarding".split()
+        args = f"--port /not/a/real/device --cmd-type at --api-key NOTAKEY --provisioning-tags nrf-cloud-onboarding".split()
         # call DUT
         claim_and_provision_device.main(args)
         diap.claim_device.assert_called_once()
+        diap.ensure_nrfcloud_provisioning_rule.assert_called_once_with("NOTAKEY", 16842753)
 
 # TODO: test with local CA

tests/test_device_credentials_installer.py

@@ -51,7 +51,7 @@ class TestDeviceCredentialsInstaller:
     def test_minimal_case(self, ser, select_device):
         with TemporaryDirectory() as tmp_dir:
             csv_file = os.path.join(tmp_dir, 'onboard.csv')
-            args = f"--port /not/a/real/device --ca {TEST_CA_FILE} --ca-key {TEST_CA_KEY_FILE} --csv {csv_file} --term CRLF --sectag 52".split()
+            args = f"--port /not/a/real/device --cmd-type at --ca {TEST_CA_FILE} --ca-key {TEST_CA_KEY_FILE} --csv {csv_file} --term CRLF --sectag 52".split()
             # call DUT
             device_credentials_installer.main(args)
             # check that the file was created

tests/test_gather_attestation_tokens.py

@@ -42,7 +42,7 @@ class TestGatherAttestationTokens:
     def test_minimal_case(self, ser, select_device):
         with TemporaryDirectory() as tmp_dir:
             csv_file = os.path.join(tmp_dir, 'tokens.csv')
-            args = f"--port /not/a/real/device --csv {csv_file}".split()
+            args = f"--port /not/a/real/device --cmd-type at --csv {csv_file}".split()
             # call DUT
             gather_attestation_tokens.main(args)
             # check that the file was created