Merge branch 'test/modify_mesh_ci_v3.1' into 'release/v3.1'

test: updat  mesh test cases for ci (backport v3.1)

See merge request idf/esp-idf!4649

.gitlab-ci.yml

@@ -1479,7 +1479,7 @@ IT_011_01:
   <<: *test_template
   tags:
     - ESP32_IDF
-    - SSC_T50_1
+    - SSC_T12_MESH1
 
 IT_012_01:
   <<: *test_template

components/idf_test/integration_test/INIT_COND_MESH.yml

@@ -2,181 +2,227 @@
   test script: InitCondMesh
   restore post cmd set:
   - ''
-  - - 'MSSC SSC[1-<node_num>] mesh -F -o 4 -a 1'
-    - ['P SSC[1-<node_num>] C +MESHFLAG:OK']
-  - - 'MSSC SSC[1-<node_num>] mesh -F -o 5 -a 1'
-    - ['P SSC[1-<node_num>] C +MESHFLAG:OK']
-  - - 'MSSC SSC[1-<node_num>] mesh -Q -o 1'
-    - ['P SSC[1-<node_num>] C MESH_NETWORK']
-  - - 'MSSC SSC[1-<node_num>] mesh -Q -o 3'
-    - ['P SSC[1-<node_num>] C +MESH_CONFIG:ALL']
   - - 'MSSC SSC[1-<node_num>] ram'
     - ['P SSC[1-<node_num>] C +FREEHEAP:']
+#  - - 'MSSC SSC[1-<node_num>] mesh -Q -o 1'
+#    - ['P SSC[1-<node_num>] C MESH_NETWORK']
 
-.mesh_get_device_mac: &mesh_get_device_mac
+.mesh_get_all_dut_mac: &mesh_get_all_dut_mac
   LIST_MERGE:
     - - 'MSSC SSC[1-<node_num>] mac'
       - ['R SSC[1-<node_num>] A <device_mac>:\+STAMAC:(.+)\r\n']
 
-.mesh_check_get_tree: &mesh_check_get_tree
+.mesh_check_tree_num: &mesh_check_tree_num
   LIST_MERGE:
-    - - 'MSSC SSC[1-<node_num>] mac'
-      - ['P SSC[1-<node_num>] A <device_mac>:\+STAMAC:(.+)\r\n']
     - - 'MSSC SSC[1-<node_num>] mesh -Q -o 2'
-      - ['P SSC[1-<node_num>] T <node_num>']
+      - ['P SSC[1-<node_num>] T topo']
     - - 'MESHTREE'
-      - ['P PC_COM RE "MESHTREE:%%s%20nodes"%%(<node_num>)']
+      - ['R PC_COM RE "MESHTREE:%%s"%%(<tree_node_num>)']
 
-.mesh_check_tree_stable: &mesh_check_tree_stable
+.mesh_tree_stably: &mesh_tree_stably
   LIST_MERGE:
-    - - 'DELAY 10'
+    - - 'SSC MNODE(0) mesh -Q -o 1 -t <stable_check_time>'
-      - ['']
+      - ['P MNODE(0) RE "MESH_NETWORK:1,%%s"%%(<node_num>)', 'P MNODE(0) C MESH_STABLE_CHECK:PASS']
-    - - 'SSC MNODE(0) mesh -Q -o 1 -t 10'
-      - ['R MNODE(0) C MESH_STABLE_CHECK:PASS']
 
-.reboot_all: &reboot_all
+.deinit_mesh: &deinit_mesh
   LIST_MERGE:
-    - - 'MSSC SSC[1-<node_num>] reboot'
+    - - 'MSSC SSC[1-<node_num>] mesh -I -o 1'
-      - ['P SSC[1-<node_num>] C !!!ready!!!']
+      - ['P SSC[1-<node_num>] C +MESH:DEINITED']
 
-.force_reboot: &force_reboot
+.mesh_force_reboot: &mesh_force_reboot
   LIST_MERGE:
-    - - 'FPOWERON SSC[1-<node_num>]'
-      - ['']
-    - - 'DELAY 1'
-      - ['']
     - - 'MSSC SSC[1-<node_num>] restore'
       - ['P SSC[1-<node_num>] C !!!ready!!!']
 
-.all_nodes_mesh_config: &all_nodes_mesh_config
+.mesh_config_all_duts: &mesh_config_all_duts
   LIST_MERGE:
-    - - 'MSSC SSC[1-<node_num>] mesh -I'
+    - - 'MSSC SSC[1-<node_num>] meshset -M -o 0 -t <map_auth_mode> -e <map_password> -l 10'
-      - ['P SSC[1-<node_num>] C +MESH:INITED']
+      - ['P SSC[1-<node_num>] C +MESHSET:MAP_AUTH,OK']
-    - - 'MSSC SSC[1-<node_num>] mesh -A -o 12 -t <duration_ms> -c <cnx_rssi> -l <select_rssi> -f <switch_rssi> -b <backoff_rssi>'
+    - - 'MSSC SSC[1-<node_num>] meshset -G -o 0 -m <mesh_id> -s <router_ssid> -p <router_password> -n
-      - ['P SSC[1-<node_num>] C +MESH_SET_PARENT_SWITCH:OK']
+        <router_channel> -b <router_bssid> -t <max_connect> -e <map_password> -i <ie_encrypt>'
-    - - 'MSSC SSC[1-<node_num>] mesh -A -o 14 -t <threshold_high> -c <threshold_medium> -l <threshold_low>'
+      - ['P SSC[1-<node_num>] C +MESHSET:CFG,OK']
-      - ['P SSC[1-<node_num>] C +MESH_RSSI_THRESHOLD:OK']
+    - - 'MSSC SSC[1-<node_num>] meshset -L -o 0 -l <max_layer>'
-    - - 'MSSC SSC[1-<node_num>] mesh -A -o 9 -t <auth_mode> -s <map_password>'
+      - ['P SSC[1-<node_num>] C +MESHSET:MLAYER,OK']
-      - ['P SSC[1-<node_num>] C +MESH_SET_AP_AUTH_MODE:OK']
+    - - 'MSSC SSC[1-<node_num>] meshset -W -o 0 -t <duration_ms> -n <cnx_rssi> -l <select_rssi> -i <switch_rssi> -k <backoff_rssi>'
-    - - 'MSSC SSC[1-<node_num>] mesh -P -g <mesh_id> -s <ap_ssid> -p <ap_password> -n <ap_channel> -m <max_connect> -y <max_layer>'
+      - ['P SSC[1-<node_num>] C +MESHSET:SWITCH,OK']
-      - ['P SSC[1-<node_num>] C +MESH:CONFIG,OK']
+    - - 'MSSC SSC[1-<node_num>] meshset -K -o 0 -i <allow_roots>'
+      - ['P SSC[1-<node_num>] C +MESHSET:ALLOW_ROOTS,OK']
+    - - 'MSSC SSC[1-<node_num>] meshset -J -o 0 -t <assoc_expire>'
+      - ['P SSC[1-<node_num>] C +MESHSET:ASSOC,OK']
 
-.root_do_connect: &root_do_connect
+.mesh_set_same_ssid_softap: &mesh_set_same_ssid_softap
   LIST_MERGE:
-    - - 'SOC SOC1 LISTEN <test_tcp_port1> <pc_ip>'
+    - - 'MSSC SSC[1-3] op -S -o 2'
-      - ['R SOC_COM L OK']
+      - ['P SSC[1-3] C +MODE:OK']
-    - - 'SSC MNODE(0) mesh -S -o 0 -i <pc_ip> -t <test_tcp_port1>'
+    - - 'MSSC SSC[1-3] ap -S -s <target_ssid> -p <target_password> -t <target_auth_enum> -n
-      - ['P MNODE(0) C +CONNECT,OK']
+        [<router_channel>,<router_channel>,<wrong_channel>]'
-      - ['P SOC1 C +ACCEPT']
+      - ['P SSC[1-3] C +SAP:OK']
-    - - 'SOC SOC1 MACCEPT GSOC1'
-      - ['R SOC_COM L OK']
 
 initial condition:
-- tag: ENABLED_1
+- tag: MESH_DEINIT_STA
   <<: *MESH_INIT_COND
-  initial condition detail: if mesh tree not exist, start one node first, then start others, after mesh network
+  initial condition detail: all DUTs with mesh not inited, station mode
-    established, root connect server
   check cmd set:
   - ''
-  - *mesh_check_get_tree
+  - - MSSC SSC[1-<node_num>] mesh -Q
-  - *mesh_check_tree_stable
+    - - P SSC[1-<node_num>] C MESH_STATE_NONE
-  - *root_do_connect
+  - - MSSC SSC[1-<node_num>] op -S -o 1
+    - - P SSC[1-<node_num>] C +MODE:OK
+  - *mesh_get_all_dut_mac
   restore cmd set:
   - ''
-  - *reboot_all
+  - - MSSC SSC[1-<node_num>] mesh -I -o 1
-  - *all_nodes_mesh_config
+    - - P SSC[1-<node_num>] C +MESH_DEINITED
-  - - SSC SSC1 mesh -T
+  - - MSSC SSC[1-<node_num>] op -S -o 1
-    - - P SSC1 C +MESH:START,OK
+    - - P SSC[1-<node_num>] C +MODE:OK
-  - - DELAY 10
+  - *mesh_get_all_dut_mac
-    - - P SSC1 C MESH_EVENT_CONNECTED
-  - - SSC SSC[2-<node_num>] mesh -T
-    - - P SSC[2-<node_num>] C +MESH:START,OK
-  - - DELAY <delay_time>
-    - - ''
-  - *mesh_check_get_tree
-  - *mesh_check_tree_stable
-  - *root_do_connect
   force restore cmd set:
   - ''
-  - *force_reboot
+#  - - MSSC SSC[1-<node_num>] reboot
-  - *all_nodes_mesh_config
+  - - FREBOOT SSC[1-<node_num>]
-  - - SSC SSC1 mesh -T
+    - - P SSC[1-<node_num>] C !!!ready!!!
-    - - P SSC1 C +MESH:START,OK
+  - *mesh_get_all_dut_mac
-  - - DELAY 10
+- tag: MESH_INIT1
-    - - P SSC1 C MESH_EVENT_CONNECTED
-  - - SSC SSC[2-<node_num>] mesh -T
-    - - P SSC[2-<node_num>] C +MESH:START,OK
-  - - DELAY <delay_time>
-    - - ''
-  - *mesh_check_get_tree
-  - *mesh_check_tree_stable
-  - *root_do_connect
-- tag: ENABLED_2
   <<: *MESH_INIT_COND
-  initial condition detail: if mesh tree not exist, start all nodes together
+  initial condition detail: DUTs with mesh network already established, router....
   check cmd set:
   - ''
-  - *mesh_check_get_tree
+  - *mesh_get_all_dut_mac
-  - *mesh_check_tree_stable
+  - - VALUE <tree_node_num> <node_num>
+    - - R PC_COM L OK
+  - *mesh_check_tree_num
+  - *mesh_tree_stably
+  - - MSSC SSC[1-<node_num>] mesh -Q -o 3
+    - - P SSC[1-<node_num>] RE "MID,%%s"%%(<mesh_id>)
+      - P SSC[1-<node_num>] RE "MROUTER,%%s"%%(<router_ssid>)
+      - P SSC[1-<node_num>] RE "SWITCH_PARENT,%%s"%%(<duration_ms>)
+      - P SSC[1-<node_num>] C NO_SPECIFIC_SETTINGS
   restore cmd set:
   - ''
-  - *reboot_all
+  - - MSSC SSC[1-<node_num>] mesh -I -o 1
-  - *all_nodes_mesh_config
+    - - P SSC[1-<node_num>] C MESH_DEINITED
+  - - MSSC SSC[1-<node_num>] op -S -o 1
+    - - P SSC[1-<node_num>] C +MODE:OK
+  - *mesh_get_all_dut_mac
+  - - MSSC SSC[1-<node_num>] mesh -I
+    - - P SSC[1-<node_num>] C +MESH:INIT,OK
+  - *mesh_config_all_duts
   - - MSSC SSC[1-<node_num>] mesh -T
     - - P SSC[1-<node_num>] C +MESH:START,OK
   - - DELAY <delay_time>
     - - ''
-  - *mesh_check_get_tree
+  - - VALUE <tree_node_num> <node_num>
-  - *mesh_check_tree_stable
+    - - R PC_COM L OK
+  - *mesh_check_tree_num
+  - *mesh_tree_stably
   force restore cmd set:
   - ''
-  - *force_reboot
+  - - MSSC SSC[1-<node_num>] reboot
-  - *all_nodes_mesh_config
+    - - P SSC[1-<node_num>] C !!!ready!!!
+  - *mesh_get_all_dut_mac
+  - - MSSC SSC[1-<node_num>] mesh -I
+    - - P SSC[1-<node_num>] C +MESH:INIT,OK
+  - *mesh_config_all_duts
   - - MSSC SSC[1-<node_num>] mesh -T
     - - P SSC[1-<node_num>] C +MESH:START,OK
   - - DELAY <delay_time>
     - - ''
-  - *mesh_check_get_tree
+  - - VALUE <tree_node_num> <node_num>
-  - *mesh_check_tree_stable
+    - - R PC_COM L OK
-- tag: ENABLED_3
+  - *mesh_check_tree_num
+  - *mesh_tree_stably
+- tag: MESH_INIT_SWITCH
   <<: *MESH_INIT_COND
-  initial condition detail: all mesh nodes configed but not started
+  initial condition detail: 3 duts in softAP mode with same ssid/password, all duts establish network
   check cmd set:
   - ''
+  - - SSC SSC[1-3] ap -Q
+    - - P SSC[1-3] RE "RE "APCONFIG:%%s"%%(<target_ssid>)
+  - - MSSC SSC[4-<node_num>] mac
+    - -  R SSC[4-<node_num>] A <device_mac>:\+STAMAC:(.+)\r\n
+  - - VALUE <tree_node_num> <node_num>-3
+    - - R PC_COM L OK
+  - - MSSC SSC[4-<node_num>] mesh -Q -o 2
+    - - P SSC[4-<node_num>] T topo
+  - - MESHTREE
+    - - R PC_COM RE "TREE_TOTAL_NODES:%%s"%%(<tree_node_num>)
+  - - MSSC SSC[4-<node_num>] mesh -Q -o 3
+      - P SSC[4-<node_num>] RE "MROUTER,%%s"%%(<target_ssid>)
+  - - DELAY 5
+    - - P PC_COM C +DELAYDONE
+      - P SSC[4-<node_num>] NC MESH_EVENT_DISCONNECTED
+  restore cmd set:
+  - ''
   - - ASSERT
     - - ''
-  restore cmd set:
-  - ''
-  - *reboot_all
-  - *all_nodes_mesh_config
-  - *mesh_get_device_mac
   force restore cmd set:
   - ''
-  - *force_reboot
+  - - MSSC SSC[1-<node_num>] reboot
-  - *all_nodes_mesh_config
+    - - P SSC[1-<node_num>] C !!!ready!!!
-  - *mesh_get_device_mac
+  - *mesh_get_all_dut_mac
-- tag: DISABLED_1
+  - *mesh_set_same_ssid_softap
+  - - MSSC SSC[4-<node_num>] mesh -I
+    - - P SSC[4-<node_num>] C +MESH:INIT,OK
+  - - MSSC SSC[4-<node_num>] meshset -M -o 0 -t <map_auth_mode> -e <map_password> -l 10
+    - - P SSC[4-<node_num>] C +MESHSET:MAP_AUTH,OK
+  - - MSSC SSC[4-<node_num>] meshset -G -o 0 -m <mesh_id> -s <target_ssid> -p <target_password> -n <try_channel> -h 1 -t
+      <max_connect> -e <map_password> -i <ie_encrypt>
+    - - P SSC[4-<node_num>] C +MESHSET:CFG,OK
+  - - MSSC SSC[4-<node_num>] meshset -L -o 0 -l <max_layer>
+    - - P SSC[4-<node_num>] C +MESHSET:MLAYER,OK
+  - - MSSC SSC[4-<node_num>] meshset -W -o 0 -t <duration_ms> -n <cnx_rssi> -l <select_rssi> -i <switch_rssi> -k <backoff_rssi>
+    - - P SSC[4-<node_num>] C +MESHSET:SWITCH,OK
+  - - MSSC SSC[4-<node_num>] meshset -K -o 0 -i <allow_roots>
+    - - P SSC[4-<node_num>] C +MESHSET:ALLOW_ROOTS,OK
+  - - MSSC SSC[4-<node_num>] mesh -T
+    - - P SSC[4-<node_num>] C +MESH:START,OK
+  - - DELAY <delay_time>
+    - - ''
+  - - VALUE <tree_node_num> <node_num>-3
+    - - R PC_COM L OK
+  - - MSSC SSC[4-<node_num>] mesh -Q -o 2
+    - - P SSC[4-<node_num>] T topo
+  - - MESHTREE
+    - - R PC_COM RE "TREE_TOTAL_NODES:%%s"%%(<tree_node_num>)
+  - - DELAY 10
+    - - P PC_COM C +DELAYDONE
+      - P SSC[4-<node_num>] NC MESH_EVENT_DISCONNECTED
+- tag: MESH_NO_ROUTER
   <<: *MESH_INIT_COND
-  initial condition detail: all mesh node in softap+sta mode, disable all mesh node
+  initial condition detail: DUTs with mesh network already established, router....
-  restore post cmd set:
-  - ''
   check cmd set:
   - ''
+  - *mesh_get_all_dut_mac
+  - - VALUE <tree_node_num> <node_num>
+    - - R PC_COM L OK
+  - *mesh_check_tree_num
+  - *mesh_tree_stably
+  - - MSSC SSC[1-<node_num>] mesh -Q -o 3
+    - - P SSC[1-<node_num>] RE "MID,%%s"%%(<mesh_id>)
+      - P SSC[1-<node_num>] C NO_ROUTER
+  restore cmd set:
+  - ''
   - - ASSERT
     - - ''
-  restore cmd set:
-  - ''
-  - *reboot_all
-  - - MSSC SSC[1-<node_num>] op -S -o 3
-    - - P SSC[1-<node_num>] C +MODE:OK
-  - - MSSC SSC[1-<node_num>] sta -D
-    - - P SSC[1-<node_num>] C +QAP:OK
-  - *mesh_get_device_mac
   force restore cmd set:
   - ''
-  - *force_reboot
+  - - ASSERT
-  - - MSSC SSC[1-<node_num>] op -S -o 3
+    - - ''
-    - - P SSC[1-<node_num>] C +MODE:OK
+- tag: MESH_STABLE
-  - - MSSC SSC[1-<node_num>] sta -D
+  <<: *MESH_INIT_COND
-    - - P SSC[1-<node_num>] C +QAP:OK
+  initial condition detail: DUTs with mesh network already established and stable, never restore
-  - *mesh_get_device_mac
+  check cmd set:
+  - ''
+  - *mesh_get_all_dut_mac
+  - - MSSC SSC[1-<node_num>] mesh -Q -o 2
+    - - P SSC[1-<node_num>] T topo
+  - - MESHTREE stable
+    - - P PC_COM RE "MESHTREE:%%s%20nodes"%%(<node_num>)
+  restore cmd set:
+  - ''
+  - - ASSERT
+    - - ''
+  force restore cmd set:
+  - ''
+  - - ASSERT
+    - - ''

components/idf_test/integration_test/TEST_ENV_SSC.yml

@@ -352,7 +352,7 @@ test environment:
     PC has 1 wired NIC connected to AP.
     PC has 1 WiFi NIC.
     37 SSC DUT connect with PC by UART.
-- tag: SSC_T50_1
+- tag: SSC_T12_MESH1
   <<: *TEST_ENV
   Special: Y
   Target Count: 50