Sync with v1.0.0

Arto Kinnunen · Arto Kinnunen · commit bf6b90431fd8 · 2018-11-26T15:03:39.000+02:00
Sync application and testcases with v1.0.0 of the master copy.
diff --git a/TEST_APPS/device/nanostack_mac_tester/source/mac_commands.cpp b/TEST_APPS/device/nanostack_mac_tester/source/mac_commands.cpp
@@ -477,6 +477,7 @@ void mac_data_confirm_handler(const mac_api_t *api, const mcps_data_conf_t *data
     if (data->status == expected_statuses.data_conf) {
         cmd_ready(CMDLINE_RETCODE_SUCCESS);
     } else {
+        cmd_printf("CMD failed, status: %hhu (%s)\n", data->status, mlme_status_string(data->status));
         cmd_ready(CMDLINE_RETCODE_FAIL);
     }
 }
@@ -501,12 +502,14 @@ void mac_data_indication_handler(const mac_api_t *api, const mcps_data_ind_t *da
     }
     if (data->msdu_ptr && expected_statuses.data_ind) {
         if (data->msduLength != expected_statuses.data_ind_len) {
+            cmd_printf("Bad recv length %d != %d!\n", data->msduLength, expected_statuses.data_ind_len);
             return;
         }
         if (strncmp((const char *)data->msdu_ptr, (const char *)expected_statuses.data_ind, expected_statuses.data_ind_len) == 0) {
             ++data_count;
+            cmd_printf("Data count %d\n", data_count);
         } else {
-            tr_warn("Received unexpected data!");
+            cmd_printf("Received unexpected data!\n");
         }
     }
 }
@@ -521,6 +524,7 @@ void mac_purge_confirm_handler(const mac_api_t *api, mcps_purge_conf_t *data)
     if (data->status == expected_statuses.purge_conf) {
         cmd_ready(CMDLINE_RETCODE_SUCCESS);
     } else {
+        cmd_printf("CMD failed, status: %hhu (%s)\n", data->status, mlme_status_string(data->status));
         cmd_ready(CMDLINE_RETCODE_FAIL);
     }
 }
@@ -547,6 +551,7 @@ void mac_mlme_confirm_handler(const mac_api_t *api, mlme_primitive id, const voi
             if (get_data->status == expected_statuses.get_conf) {
                 cmd_ready(CMDLINE_RETCODE_SUCCESS);
             } else {
+                cmd_printf("CMD failed, status: %hhu (%s)\n", get_data->status, mlme_status_string(get_data->status));
                 cmd_ready(CMDLINE_RETCODE_FAIL);
             }
             break;
@@ -585,6 +590,7 @@ void mac_mlme_confirm_handler(const mac_api_t *api, mlme_primitive id, const voi
             if (scan_data->status == expected_statuses.scan_conf || scan_data->status == MLME_LIMIT_REACHED) {
                 cmd_ready(CMDLINE_RETCODE_SUCCESS);
             } else {
+                cmd_printf("CMD failed, status: %hhu (%s)\n", scan_data->status, mlme_status_string(scan_data->status));
                 cmd_ready(CMDLINE_RETCODE_FAIL);
             }
             break;
@@ -599,24 +605,28 @@ void mac_mlme_confirm_handler(const mac_api_t *api, mlme_primitive id, const voi
             mlme_poll_conf_t *poll_data = (mlme_poll_conf_t *)data;
             cmd_printf("MLME-POLL.confirm\n");
             if (!silent_mode) {
-                cmd_printf("status:     %hhu (%s)\n", poll_data->status, mlme_status_string(poll_data->status));
-                cmd_printf("data_count  %u\n", data_count);
+                cmd_printf("status:          %hhu (%s)\n", poll_data->status, mlme_status_string(poll_data->status));
+                cmd_printf("expected status: %hhu (%s)\n", expected_statuses.poll_conf, mlme_status_string(expected_statuses.poll_conf));
+                cmd_printf("data_count       %u\n", data_count);
             }
             if (expected_statuses.poll_conf == MLME_SUCCESS) {
                 if (data_count == 1 && poll_data->status == MLME_SUCCESS) {
                     cmd_ready(CMDLINE_RETCODE_SUCCESS);
                 } else {
+                    cmd_printf("CMD failed, data_count = %u, status:%hhu\n", data_count, poll_data->status);
                     cmd_ready(CMDLINE_RETCODE_FAIL);
                 }
             } else if (expected_statuses.poll_conf == poll_data->status) {
                 cmd_ready(CMDLINE_RETCODE_SUCCESS);
             } else {
+                cmd_printf("CMD failed, data_count = %u, status:%hhu, expected ret:%hhu\n", data_count, poll_data->status, expected_statuses.poll_conf);
                 cmd_ready(CMDLINE_RETCODE_FAIL);
             }
             break;
         }
         default: {
             cmd_ready(CMDLINE_RETCODE_COMMAND_NOT_IMPLEMENTED);
+            cmd_printf("CMD failed, not implemented\n");
             break;
         }
     }
diff --git a/TEST_APPS/device/nanostack_mac_tester/source/mac_commands.h b/TEST_APPS/device/nanostack_mac_tester/source/mac_commands.h
@@ -28,7 +28,7 @@
 #include "mac_mcps.h"
 #include "mac_common_defines.h"
 #include "mac_filter_api.h"
-#include "util.h"
+#include "mac_tester_util.h"
 
 #define LOOKUP_DESCRIPTOR_TABLE_SIZE 2
 #define DEVICE_DESCRIPTOR_TABLE_SIZE 2
diff --git a/TEST_APPS/device/nanostack_mac_tester/source/mac_tester_util.cpp b/TEST_APPS/device/nanostack_mac_tester/source/mac_tester_util.cpp
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "util.h"
+#include "mac_tester_util.h"
 
 int string_to_bytes(const char *str, uint8_t *buf, int bytes)
 {
diff --git a/TEST_APPS/device/nanostack_mac_tester/source/mac_tester_util.h b/TEST_APPS/device/nanostack_mac_tester/source/mac_tester_util.h
diff --git a/TEST_APPS/testcases/nanostack_mac_tester/ED_scan.py b/TEST_APPS/testcases/nanostack_mac_tester/ED_scan.py
@@ -18,12 +18,13 @@
 import threading
 import os,sys
 from icetea_lib.bench import Bench
+from icetea_lib.TestStepError import TestStepFail
 
 class Testcase(Bench):
     def __init__(self):
         Bench.__init__(self, name = "ED_scan",
                         title = "ED scan test",
-                        status = "development",
+                        status = "released",
                         type = "smoke",
                         subtype = "",
                         execution = {
@@ -54,9 +55,6 @@ def __init__(self):
 
     def setUp(self):
         self.channel = 11
-        self.command("First", "addr --64-bit 01:02:03:00:00:00:00:01")
-        self.command("Second", "addr --64-bit 01:02:03:00:00:00:00:02")
-        self.command("Third", "addr --64-bit 01:02:03:00:00:00:00:03")
 
     def spam_channel(self, event):
         while not event.wait(0.1):
@@ -71,8 +69,16 @@ def mask_from_channel_list(self, channels):
             res = res | ( 1 << ch)
         return hex(res)
 
-    def case(self):
+    def do_test_iteration(self):
         self.lock_th = threading.Lock()
+        self.command("First", "mlme-reset")
+        self.command("Second", "mlme-reset")
+        self.command("Third", "mlme-reset")
+
+        self.command("First", "addr --64-bit 01:02:03:00:00:00:00:01")
+        self.command("Second", "addr --64-bit 01:02:03:00:00:00:00:02")
+        self.command("Third", "addr --64-bit 01:02:03:00:00:00:00:03")
+
         self.payload = "01234567890123456789012345678901234567890123456789"
 
         # Start PAN coordinator
@@ -105,10 +111,25 @@ def case(self):
             # Energy detection analysis
             self.command("Second", "analyze-ed --channel {} --above 100".format(self.channel))
 
+    def case(self):
+        # Try tests few times because of potential RF failures
+        loop = 0
+        while loop < 5:
+            try:
+                self.do_test_iteration()
+                break
+            except TestStepFail:
+                self.logger.info("Warning, iteration failed #"  + str(loop+1))
+                loop = loop + 1
+                self.delay(5)
+        else:
+             raise TestStepFail("Too many failed iterations!")
+
     def tearDown(self):
         self.command("First", "silent-mode off")
         self.command("Third", "silent-mode off")
         self.stop_event.set()
         self.th.join()
         del self.th
         self.reset_dut()
+
diff --git a/TEST_APPS/testcases/nanostack_mac_tester/address_read_and_write.py b/TEST_APPS/testcases/nanostack_mac_tester/address_read_and_write.py
@@ -17,12 +17,13 @@
 
 import os,sys
 from icetea_lib.bench import Bench
+from icetea_lib.TestStepError import TestStepFail
 
 class Testcase(Bench):
     def __init__(self):
         Bench.__init__(self, name = "address_read_and_write",
                         title = "MAC address and PAN id read/write test",
-                        status = "development",
+                        status = "released",
                         type = "smoke",
                         subtype = "",
                         execution = {
@@ -52,7 +53,8 @@ def __init__(self):
     def setUp(self):
         pass
 
-    def case(self):
+    def do_test_iteration(self):
+        self.command("First", "mlme-reset")
         self.command("First", "addr")
         self.command("First", "addr --64-bit 01:02:03:00:00:00:00:01")
         self.command("First", "addr --16-bit 0xABCD")
@@ -61,5 +63,20 @@ def case(self):
         self.command("First", "addr")
         self.verify_trace(1, "MAC64: 01:02:03:00:00:00:00:01")
 
+    def case(self):
+        # Try tests few times because of potential RF failures
+        loop = 0
+        while loop < 5:
+            try:
+                self.do_test_iteration()
+                break
+            except TestStepFail:
+                self.logger.info("Warning, iteration failed #"  + str(loop+1))
+                loop = loop + 1
+                self.delay(5)
+        else:
+             raise TestStepFail("Too many failed iterations!")
+
     def tearDown(self):
         self.reset_dut()
+
diff --git a/TEST_APPS/testcases/nanostack_mac_tester/create_and_join_PAN.py b/TEST_APPS/testcases/nanostack_mac_tester/create_and_join_PAN.py
@@ -17,12 +17,13 @@
 
 import os,sys
 from icetea_lib.bench import Bench
+from icetea_lib.TestStepError import TestStepFail
 
 class Testcase(Bench):
     def __init__(self):
         Bench.__init__(self, name = "create_and_join_PAN",
                         title = "Create a PAN and have a device join it",
-                        status = "development",
+                        status = "released",
                         type = "smoke",
                         subtype = "",
                         execution = {
@@ -60,12 +61,16 @@ def mask_from_channel_list(self, channels):
     def setUp(self):
         self.channel = 11
 
-    def case(self):
+    def do_test_iteration(self):
+        self.command("First", "mlme-reset")
+        self.command("Second", "mlme-reset")
+        self.command("Third", "mlme-reset")
+
         # Beacon payload
         self.command("First", "mlme-set --attr 0x45 --value_ascii mac-tester --value_size 10")
         # Beacon payload length
         self.command("First", "mlme-set --attr 0x46 --value_uint8 10 --value_size 1")
-        
+
         self.command("Second", "mlme-set --attr 0x45 --value_ascii second-mac-tester --value_size 17")
         self.command("Second", "mlme-set --attr 0x46 --value_uint8 17 --value_size 1")
 
@@ -84,5 +89,19 @@ def case(self):
         self.command("Third", "find-beacon --data mac-tester")
         self.command("Third", "find-beacon --data second-mac-tester")
 
+    def case(self):
+        # Try tests few times because of potential RF failures
+        loop = 0
+        while loop < 5:
+            try:
+                self.do_test_iteration()
+                break
+            except TestStepFail:
+                self.logger.info("Warning, iteration failed #"  + str(loop+1))
+                loop = loop + 1
+                self.delay(5)
+        else:
+             raise TestStepFail("Too many failed iterations!")
+
     def tearDown(self):
         self.reset_dut()
diff --git a/TEST_APPS/testcases/nanostack_mac_tester/send_data.py b/TEST_APPS/testcases/nanostack_mac_tester/send_data.py
@@ -17,12 +17,13 @@
 
 import os,sys
 from icetea_lib.bench import Bench
+from icetea_lib.TestStepError import TestStepFail
 
 class Testcase(Bench):
     def __init__(self):
         Bench.__init__(self, name = "send_data",
                         title = "Simple data transmission test",
-                        status = "development",
+                        status = "released",
                         type = "smoke",
                         subtype = "",
                         execution = {
@@ -52,10 +53,14 @@ def __init__(self):
 
     def setUp(self):
         self.channel = 11
+
+    def do_test_iteration(self):
+        self.command("First", "mlme-reset")
+        self.command("Second", "mlme-reset")
+
         self.command("First", "addr --64-bit 01:02:03:00:00:00:00:01")
         self.command("Second", "addr --64-bit 01:02:03:00:00:00:00:02")
 
-    def case(self):
         # Start PAN coordinator
         self.command("First", "start --pan_coordinator true --logical_channel {}".format(self.channel))
         # Start PAN beacon
@@ -65,5 +70,20 @@ def case(self):
         self.command("First", "data --dst_addr 01:02:03:00:00:00:00:02 --msdu_length 5 --msdu abcde")
         self.command("Second", "data --dst_addr 01:02:03:00:00:00:00:01 --msdu_length 5 --msdu 12345")
 
+    def case(self):
+        # Try tests few times because of potential RF failures
+        loop = 0
+        while loop < 5:
+            try:
+                self.do_test_iteration()
+                break
+            except TestStepFail:
+                self.logger.info("Warning, iteration failed #"  + str(loop+1))
+                loop = loop + 1
+                self.delay(5)
+        else:
+             raise TestStepFail("Too many failed iterations!")
+
     def tearDown(self):
         self.reset_dut()
+
diff --git a/TEST_APPS/testcases/nanostack_mac_tester/send_data_indirect.py b/TEST_APPS/testcases/nanostack_mac_tester/send_data_indirect.py
@@ -17,12 +17,13 @@
 
 import os,sys
 from icetea_lib.bench import Bench
+from icetea_lib.TestStepError import TestStepFail
 
 class Testcase(Bench):
     def __init__(self):
         Bench.__init__(self, name = "send_data_indirect",
                         title = "Indirect data transmission test",
-                        status = "development",
+                        status = "released",
                         type = "smoke",
                         subtype = "",
                         execution = {
@@ -53,11 +54,17 @@ def __init__(self):
 
     def setUp(self):
         self.channel = 11
+
+    def do_test_iteration(self):
+        self.channel = 11
+        self.command("First", "mlme-reset")
+        self.command("Second", "mlme-reset")
+        self.command("Third", "mlme-reset")
+
         self.command("First", "addr --64-bit 01:02:03:00:00:00:00:01")
         self.command("Second", "addr --64-bit 01:02:03:00:00:00:00:02")
         self.command("Third", "addr --64-bit 01:02:03:00:00:00:00:03")
 
-    def case(self):
         # Start PAN coordinator
         self.command("First", "start --pan_coordinator true --logical_channel {}".format(self.channel))
         # Start PAN beacon
@@ -107,5 +114,21 @@ def case(self):
         self.command("Third", "poll --coord_address 01:02:03:00:00:00:00:01")
         self.command("*", "silent-mode off")
 
+    def case(self):
+        # Try tests few times because of potential RF failures
+        loop = 0
+        while loop < 5:
+            try:
+                self.do_test_iteration()
+                break
+            except TestStepFail:
+                self.logger.info("Warning, iteration failed #"  + str(loop+1))
+                loop = loop + 1
+                self.delay(5)
+        else:
+             raise TestStepFail("Too many failed iterations!")
+
     def tearDown(self):
+        self.command("*", "silent-mode off")
         self.reset_dut()
+
diff --git a/TEST_APPS/testcases/nanostack_mac_tester/send_large_payloads.py b/TEST_APPS/testcases/nanostack_mac_tester/send_large_payloads.py

Original file line number	Diff line number	Diff line change
`@@ -477,6 +477,7 @@ void mac_data_confirm_handler(const mac_api_t api, const mcps_data_conf_t data`
`477`	`477`	`if (data->status == expected_statuses.data_conf) {`
`478`	`478`	`cmd_ready(CMDLINE_RETCODE_SUCCESS);`
`479`	`479`	`} else {`
	`480`	`+ cmd_printf("CMD failed, status: %hhu (%s)\n", data->status, mlme_status_string(data->status));`
`480`	`481`	`cmd_ready(CMDLINE_RETCODE_FAIL);`
`481`	`482`	`}`
`482`	`483`	`}`
`@@ -501,12 +502,14 @@ void mac_data_indication_handler(const mac_api_t api, const mcps_data_ind_t da`
`501`	`502`	`}`
`502`	`503`	`if (data->msdu_ptr && expected_statuses.data_ind) {`
`503`	`504`	`if (data->msduLength != expected_statuses.data_ind_len) {`
	`505`	`+ cmd_printf("Bad recv length %d != %d!\n", data->msduLength, expected_statuses.data_ind_len);`
`504`	`506`	`return;`
`505`	`507`	`}`
`506`	`508`	`if (strncmp((const char )data->msdu_ptr, (const char )expected_statuses.data_ind, expected_statuses.data_ind_len) == 0) {`
`507`	`509`	`++data_count;`
	`510`	`+ cmd_printf("Data count %d\n", data_count);`
`508`	`511`	`} else {`
`509`		`- tr_warn("Received unexpected data!");`
	`512`	`+ cmd_printf("Received unexpected data!\n");`
`510`	`513`	`}`
`511`	`514`	`}`
`512`	`515`	`}`
`@@ -521,6 +524,7 @@ void mac_purge_confirm_handler(const mac_api_t api, mcps_purge_conf_t data)`
`521`	`524`	`if (data->status == expected_statuses.purge_conf) {`
`522`	`525`	`cmd_ready(CMDLINE_RETCODE_SUCCESS);`
`523`	`526`	`} else {`
	`527`	`+ cmd_printf("CMD failed, status: %hhu (%s)\n", data->status, mlme_status_string(data->status));`
`524`	`528`	`cmd_ready(CMDLINE_RETCODE_FAIL);`
`525`	`529`	`}`
`526`	`530`	`}`
`@@ -547,6 +551,7 @@ void mac_mlme_confirm_handler(const mac_api_t *api, mlme_primitive id, const voi`
`547`	`551`	`if (get_data->status == expected_statuses.get_conf) {`
`548`	`552`	`cmd_ready(CMDLINE_RETCODE_SUCCESS);`
`549`	`553`	`} else {`
	`554`	`+ cmd_printf("CMD failed, status: %hhu (%s)\n", get_data->status, mlme_status_string(get_data->status));`
`550`	`555`	`cmd_ready(CMDLINE_RETCODE_FAIL);`
`551`	`556`	`}`
`552`	`557`	`break;`
`@@ -585,6 +590,7 @@ void mac_mlme_confirm_handler(const mac_api_t *api, mlme_primitive id, const voi`
`585`	`590`	`if (scan_data->status == expected_statuses.scan_conf \|\| scan_data->status == MLME_LIMIT_REACHED) {`
`586`	`591`	`cmd_ready(CMDLINE_RETCODE_SUCCESS);`
`587`	`592`	`} else {`
	`593`	`+ cmd_printf("CMD failed, status: %hhu (%s)\n", scan_data->status, mlme_status_string(scan_data->status));`
`588`	`594`	`cmd_ready(CMDLINE_RETCODE_FAIL);`
`589`	`595`	`}`
`590`	`596`	`break;`
`@@ -599,24 +605,28 @@ void mac_mlme_confirm_handler(const mac_api_t *api, mlme_primitive id, const voi`
`599`	`605`	`mlme_poll_conf_t poll_data = (mlme_poll_conf_t )data;`
`600`	`606`	`cmd_printf("MLME-POLL.confirm\n");`
`601`	`607`	`if (!silent_mode) {`
`602`		`- cmd_printf("status: %hhu (%s)\n", poll_data->status, mlme_status_string(poll_data->status));`
`603`		`- cmd_printf("data_count %u\n", data_count);`
	`608`	`+ cmd_printf("status: %hhu (%s)\n", poll_data->status, mlme_status_string(poll_data->status));`
	`609`	`+ cmd_printf("expected status: %hhu (%s)\n", expected_statuses.poll_conf, mlme_status_string(expected_statuses.poll_conf));`
	`610`	`+ cmd_printf("data_count %u\n", data_count);`
`604`	`611`	`}`
`605`	`612`	`if (expected_statuses.poll_conf == MLME_SUCCESS) {`
`606`	`613`	`if (data_count == 1 && poll_data->status == MLME_SUCCESS) {`
`607`	`614`	`cmd_ready(CMDLINE_RETCODE_SUCCESS);`
`608`	`615`	`} else {`
	`616`	`+ cmd_printf("CMD failed, data_count = %u, status:%hhu\n", data_count, poll_data->status);`
`609`	`617`	`cmd_ready(CMDLINE_RETCODE_FAIL);`
`610`	`618`	`}`
`611`	`619`	`} else if (expected_statuses.poll_conf == poll_data->status) {`
`612`	`620`	`cmd_ready(CMDLINE_RETCODE_SUCCESS);`
`613`	`621`	`} else {`
	`622`	`+ cmd_printf("CMD failed, data_count = %u, status:%hhu, expected ret:%hhu\n", data_count, poll_data->status, expected_statuses.poll_conf);`
`614`	`623`	`cmd_ready(CMDLINE_RETCODE_FAIL);`
`615`	`624`	`}`
`616`	`625`	`break;`
`617`	`626`	`}`
`618`	`627`	`default: {`
`619`	`628`	`cmd_ready(CMDLINE_RETCODE_COMMAND_NOT_IMPLEMENTED);`
	`629`	`+ cmd_printf("CMD failed, not implemented\n");`
`620`	`630`	`break;`
`621`	`631`	`}`
`622`	`632`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* See the License for the specific language governing permissions and`
`15`	`15`	`* limitations under the License.`
`16`	`16`	`*/`
`17`		`-#include "util.h"`
	`17`	`+#include "mac_tester_util.h"`
`18`	`18`
`19`	`19`	`int string_to_bytes(const char str, uint8_t buf, int bytes)`
`20`	`20`	`{`