Fixed for E2E tests

Author: teetak01

TESTS/README.md

@@ -17,8 +17,31 @@ There are two different test sets:
 pip install icetea mbed-cloud-sdk
 ```
 
+## Basic usage for Mbed OS (serial dependency)
+
+These Mbed OS specific tests use the serial console to read the `device_id` automatically from console output.
+
+1. Define environmental variable `MBED_CLOUD_SDK_API_KEY` with your [API key](https://cloud.mbed.com/docs/current/integrate-web-app/api-keys.html) as the value. Alternatively add your API key to `TESTS/pelion.tc_cfg`.
+1. Verify with `mbed ls` that the device is connected via serial and mounted.
+
+### Running the test suite
+
+To run the test suite, use the following command:
+
+```
+icetea --suite basic_os_tests.json --suitedir TESTS/ --tcdir ./TESTS/ --tc_cfg TESTS/pelion.tc_cfg --reset
+```
+
+If you have prepared a manifest (see below the instructions for `device_update` testcase), you can run the full suite with:
+
+```
+icetea --suite full_os_tests.json --suitedir TESTS/ --tcdir ./TESTS/ --tc_cfg TESTS/pelion.tc_cfg --reset
+```
+
 ## Basic usage
 
+These generic tests do not depend on console.
+
 1. Register your device to Device Management. For examples, see the [tutorials](https://cloud.mbed.com/docs/current/connecting/device-management-client-tutorials.html).
 1. Enter your [device_id](https://cloud.mbed.com/docs/current/connecting/device-identity.html) to `TESTS/pelion.tc_cfg`.
 1. Enter your [API key](https://cloud.mbed.com/docs/current/integrate-web-app/api-keys.html) to `TESTS/pelion.tc_cfg`.
@@ -50,6 +73,7 @@ icetea --tc basic_get --tcdir ./TESTS/ --tc_cfg TESTS/pelion.tc_cfg
 | Test name        | Main functions                             | Notes                                 |
 | ---------------- | ------------------------------------------ | --------------------------------------|
 | `register`       | Verify that the device is registered.      |                                       |
+| `register_and_read_id` | Verify that the device is registered. | Uses serial to read the `device_id`. Mbed OS only. |
 | `get`            | Verify that the device responds to GET.    | Uses OMA resource `/3/0/0`            |
 | `put`            | Verify that the device responds to PUT.    | Uses custom resource `/3201/0/5853`   |
 | `post`           | Verify that the device responds to POST.   | Uses custom resource `/3201/0/5850`   |

TESTS/full_os_tests.json

@@ -0,0 +1,11 @@
+{
+    "testcases": [
+        {"name" : "register_and_read_id"},
+        {"name" : "get"},
+        {"name" : "put"},
+        {"name" : "post"},
+        {"name" : "observation"},
+        {"name" : "device_update"},
+        {"name" : "deregister"}
+    ]
+}

TESTS/pelion_helper.py

@@ -51,12 +51,13 @@ def __init__(self, **kwargs):
 
     def setup(self):
         # Check if API key is in environmental vars
-        if os.environ['MBED_CLOUD_SDK_API_KEY']:
+        if 'MBED_CLOUD_SDK_API_KEY' in os.environ:
             api_key = (os.environ[str('MBED_CLOUD_SDK_API_KEY')])
-            print("Reading api-key from environtment %", api_key)
         else:
             api_key = self.config.get("api_key")
-            print("Reading api-key from config %", api_key)
+
+        if not api_key.startswith('ak_'):
+            raise TestStepFail("No API key in MBED_CLOUD_SDK_API_KEY or in pelion.tc_cfg")
 
         self.device_id = self.config.get("device_id")
         host = self.config.get("host")
@@ -66,7 +67,7 @@ def setup(self):
         self.device_api = DeviceDirectoryAPI(self.test_config)
 
         # Additional parameters for handling REST requests without SDK
-        self.rest_headers = {'Authorization': 'Bearer ' + self.config.get("api_key")}
+        self.rest_headers = {'Authorization': 'Bearer ' + api_key}
         self.rest_address = self.config.get("host")
 
         # Init delay due to internal usage of PULL notification in SDK. Notications might be lost between

TESTS/register_and_read_id.py

@@ -61,11 +61,11 @@ def case(self):
                     pass
 
         # Get the endpoint from the logs
-        print(self.duts[0].traces)
+        self.logger.info("Reading device ID from console.")
         dev_id_raw = ""
         dev_id_raw = list(filter(lambda x: "Device ID" in x, self.duts[0].traces))
         device_id = dev_id_raw[0].split()[2]
-        print("Writing Device ID % to pelion.tc_cfg", device_id)
+        self.logger.info("Writing Device ID %s to pelion.tc_cfg", device_id)
         # Store the Device ID to pelion.tc_cfg
         with open("TESTS/pelion.tc_cfg") as stream:
             data = json.load(stream)