From 9549ae4c126522798e30b07daa71408fed46d78b Mon Sep 17 00:00:00 2001
From: He Yin Ling <heyinling@espressif.com>
Date: Tue, 2 Apr 2019 10:00:12 +0800
Subject: [PATCH] test: sync integration test cases

---
 .gitlab-ci.yml                                |    6 +
 .../integration_test/INIT_COND_SSC.yml        |  309 +++--
 .../idf_test/integration_test/KnownIssues     |  142 +--
 .../integration_test/TC_IT_BTSTK_GAP.yml      |  317 ++++--
 .../integration_test/TC_IT_BTSTK_GATT.yml     |   35 +-
 .../integration_test/TC_IT_BTSTK_MISC.yml     |    2 +-
 .../integration_test/TC_IT_BTSTK_SMP.yml      |  227 ++--
 .../integration_test/TC_IT_MESH_COMM.yml      |   21 +
 .../integration_test/TC_IT_MESH_EST.yml       |  140 +--
 .../integration_test/TC_IT_SYS_MISC.yml       |   14 +-
 .../integration_test/TC_IT_SYS_NVS.yml        |   27 +-
 .../integration_test/TC_IT_TCPIP_DNS.yml      |    2 +-
 .../integration_test/TC_IT_TCPIP_ICMP.yml     |    2 +-
 .../integration_test/TC_IT_TCPIP_IGMP.yml     | 1010 +++++++++++++++--
 .../integration_test/TC_IT_TCPIP_TCP.yml      |  118 +-
 .../integration_test/TC_IT_TCPIP_UDP.yml      |   60 +-
 .../integration_test/TC_IT_WIFI_CONN.yml      |  269 ++++-
 .../integration_test/TC_IT_WIFI_MODE.yml      |  133 +++
 .../integration_test/TC_IT_WIFI_SCAN.yml      |   72 +-
 .../integration_test/TEST_ENV_SSC.yml         |   24 +-
 20 files changed, 2194 insertions(+), 736 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 302efef57..68813391d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2136,6 +2136,12 @@ IT_006_07:
     - ESP32_IDF
     - SSC_T1_6
 
+IT_006_08:
+  <<: *test_template
+  tags:
+    - ESP32_IDF
+    - SSC_T1_6
+
 IT_007_01:
   <<: *test_template
   tags:
diff --git a/components/idf_test/integration_test/INIT_COND_SSC.yml b/components/idf_test/integration_test/INIT_COND_SSC.yml
index abdd492f2..61c86b28e 100644
--- a/components/idf_test/integration_test/INIT_COND_SSC.yml
+++ b/components/idf_test/integration_test/INIT_COND_SSC.yml
@@ -17,8 +17,7 @@
 initial condition:
 - tag: APM1
   <<: *SSC_INIT_COND
-  initial condition detail: AP mode, DHCP on, will autogen a TC with initial condition
-    APSTA1
+  initial condition detail: (SSC) DUT set to SoftAP mode and config SoftAP, enable DHCP server
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -54,8 +53,7 @@ initial condition:
     - - R SSC1 C +SAP:OK
 - tag: APM2
   <<: *SSC_INIT_COND
-  initial condition detail: AP mode, PC join AP, DHCP on, will autogen a TC with initial
-    condition APSTA2
+  initial condition detail: (SSC) DUT set to SoftAP mode, PC Wi-Fi NIC connected with SoftAP
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -99,8 +97,7 @@ initial condition:
     - - R PC_COM NC ERROR C +WIFICONN:OK
 - tag: APO1
   <<: *SSC_INIT_COND
-  initial condition detail: AP mode, will NOT autogen a TC with initial condition
-    APSTA1
+  initial condition detail: (SSC) DUT set to SoftAP mode and config SoftAP, enable DHCP server
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -136,8 +133,7 @@ initial condition:
     - - R SSC1 C +SAP:OK
 - tag: APO2
   <<: *SSC_INIT_COND
-  initial condition detail: AP mode, will NOT autogen a TC with initial condition
-    APSTA2
+  initial condition detail: (SSC) DUT set to SoftAP mode, PC Wi-Fi NIC connected with SoftAP
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -179,51 +175,9 @@ initial condition:
   - - WIFI <pc_wifi_nic> CONN <target_ssid> <target_password> <pc_ip_wifi> <target_auth>
       <target_encryption>
     - - R PC_COM NC ERROR C +WIFICONN:OK
-- <<: *SSC_INIT_COND
-  check cmd set:
-  - ''
-  - *dut1_start_wifi
-  - - SSC SSC1 upgrade -Q -t 1
-    - - R SSC1 C BIN_ID,0
-  - - SSC SSC1 upgrade -Q -t 2 -b 0
-    - - R SSC1 C BIN_INFO,0
-  - - SSC SSC1 op -S -o 2
-    - - R SSC1 C +MODE:OK
-  force restore cmd set:
-  - ''
-  - - SSC SSC1 upgrade -R -r 1 -s <ota_bin_size>
-    - - R SSC1 NC ERROR C !!!ready!!!
-  - - SSC SSC1 op -S -o 1
-    - - R SSC1 C +MODE:OK
-  - - SSC SSC1 dhcp -S -o 1
-    - - R SSC1 C +DHCP
-  - - SSC SSC1 sta -C -s <ap_ssid> -p <ap_password>
-    - - R SSC1 RE "\+JAP:CONNECTED,%%s"%%(<ap_ssid>)
-  - - SOC SOC1 ULISTEN <test_tcp_port1> <pc_ip>
-    - - R SOC_COM L OK
-  - - SOC SOC1 SETOPT REPLY BIN
-    - - R SOC_COM C OK
-  - - SSC SSC1 upgrade -I -b 0 -f 0
-    - - P SSC1 C +UPGRADE:OK
-  - - SSC SSC1 upgrade -U -i <pc_ip> -p <test_tcp_port1> -u <ota_bin>
-    - - P SSC1 C +UPGRADE:SUCCEED
-  - - SSC SSC1 upgrade -R -b 0
-    - - R SSC1 C !!!ready!!!
-  - - SSC SSC1 op -S -o 2
-    - - R SSC1 C +MODE:OK
-  initial condition detail: AP only mode, running BIN0 (located on flash id 0)
-  restore cmd set:
-  - ''
-  - - SSC SSC1 upgrade -Q -t 2 -b 0
-    - - R SSC1 C BIN_INFO,0
-  - - SSC SSC1 upgrade -R -b 0
-    - - R SSC1 C !!!ready!!!
-  - - SSC SSC1 op -S -o 2
-    - - R SSC1 C +MODE:OK
-  tag: APOBIN0
 - tag: APSTA1
   <<: *SSC_INIT_COND
-  initial condition detail: testing ap on sta + ap mode (autogen by APM1)
+  initial condition detail: (SSC) DUT set to STA+SoftAP mode, config SoftAP and enable DHCP server
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -259,7 +213,7 @@ initial condition:
     - - R SSC1 C +SAP:OK
 - tag: APSTA2
   <<: *SSC_INIT_COND
-  initial condition detail: testing ap on sta + ap mode,  PC join AP (autogen by APM2)
+  initial condition detail: (SSC) DUT set to STA+SoftAP mode, PC Wi-Fi NIC connected with SoftAP
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -303,7 +257,7 @@ initial condition:
     - - R PC_COM NC ERROR C +WIFICONN:OK
 - tag: APWIFISTO
   <<: *SSC_INIT_COND
-  initial condition detail: AP mode, wifi will stop with initial condition APWIFISTO
+  initial condition detail: (SSC) DUT set to SoftAP mode, stop Wi-Fi
   check cmd set:
   - ''
   - - SSC SSC1 op -Q
@@ -338,8 +292,7 @@ initial condition:
     - - R SSC1 C +MODE:OK
 - tag: BLE_CONN2
   <<: *SSC_INIT_COND
-  initial condition detail: 2 DUT which BLE is enabled, DUT1 connected with DUT2,
-    DUT2 created GATT service 0xA000
+  initial condition detail: (SSC) enable BLE one 2 DUTs, GATT service 0xA000 started on DUT2, DUT1 connected with DUT2
   check cmd set:
   - ''
   - - ASSERT
@@ -416,8 +369,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: BLE_CONN3
   <<: *SSC_INIT_COND
-  initial condition detail: 2 DUT which BLE is enabled, DUT1 connected with DUT2,
-    DUT2 created GATT service 0xA002
+  initial condition detail: (SSC) enable BLE on 2 DUTs, GATT service 0xA002 started on DUT2, DUT1 connected with DUT2
   check cmd set:
   - ''
   - - ASSERT
@@ -494,8 +446,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: BLE_CONN4
   <<: *SSC_INIT_COND
-  initial condition detail: 2 DUT which BLE is enabled, create both GATTC and GATTS
-    app on DUT1 and DUT2. DUT1 connected with DUT2. use GATT service A002.
+  initial condition detail: (SSC) enable BLE and create both GATTC and GATTS app on DUT1 and DUT2. DUT1 connected with DUT2. use GATT service A002.
   check cmd set:
   - ''
   - - ASSERT
@@ -576,8 +527,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: BLE_CONN5
   <<: *SSC_INIT_COND
-  initial condition detail: 5 DUT which BLE is enabled, DUT1 connected with DUT2-5
-    as master, DUT2-5 created GATT service 0xA002
+  initial condition detail: (SSC) enable BLE on 5 DUTs, DUT1 connected with DUT2-5 as master, DUT2-5 use GATT service 0xA002
   check cmd set:
   - ''
   - - ASSERT
@@ -654,8 +604,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: BLE_CONN6
   <<: *SSC_INIT_COND
-  initial condition detail: 5 DUT which BLE is enabled, DUT1 is slave, connected by
-    DUT2-5, DUT1 created GATT service 0xA002
+  initial condition detail: (SSC) enable BLE on 5 DUTs, DUT1 is slave, connected by DUT2-5, DUT1 use GATT service 0xA002
   check cmd set:
   - ''
   - - ASSERT
@@ -685,7 +634,7 @@ initial condition:
     - - R SSC[1-5] C +BLE:OK
   - - SSC SSC1 gatts -S -z load -p 0xA2
     - - R SSC1 C +GATTS:StartService,OK,A002
-  - - LOOP 4 2 "[2,3,4,5]" "[2,3,4,5]"
+  - - LOOP 4 3 "[2,3,4,5]" "[2,3,4,5]"
     - ''
   - - SSC SSC1 bleadv -D -z start
     - - P SSC1 C +BLEADV:Start,OK
@@ -732,8 +681,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: BLE_CONN7
   <<: *SSC_INIT_COND
-  initial condition detail: 5 DUT which BLE is enabled, DUT1 connected with DUT2-3
-    as master, connected with DUT4-5 as slave, GATTS created service 0xA002
+  initial condition detail: (SSC) BLE is enable on 5 DUTs, DUT1 connected with DUT2-3 as master, connected with DUT4-5 as slave, use service 0xA002 on GATTS
   check cmd set:
   - ''
   - - ASSERT
@@ -820,8 +768,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: BLE_CONN_SMP
   <<: *SSC_INIT_COND
-  initial condition detail: 2 DUT which BLE is enabled, DUT1 connected with DUT2,
-    DUT2 created GATT service 0xA000,DUT2 and DUT1 pairing
+  initial condition detail: (SSC) enable BLE on 2 DUTs, DUT1 connected and paired with DUT2, DUT2 created GATT service 0xA000
   check cmd set:
   - ''
   - - ASSERT
@@ -918,7 +865,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: BLE_DEINIT1
   <<: *SSC_INIT_COND
-  initial condition detail: 1 DUT which BLE is not enabled
+  initial condition detail: (SSC) DUT deinit BT host
   check cmd set:
   - ''
   - - SSC SSC1 bt -Q
@@ -943,7 +890,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: BTC_DEINIT1
   <<: *SSC_INIT_COND
-  initial condition detail: 1 DUT which BLE is not enabled
+  initial condition detail: (SSC) DUT deinit BT controller
   check cmd set:
   - ''
   - - SSC SSC1 reboot
@@ -988,7 +935,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: BLE_INIT1
   <<: *SSC_INIT_COND
-  initial condition detail: 1 DUT which BLE is enabled, no active connection
+  initial condition detail: (SSC) enable BLE on DUT
   check cmd set:
   - ''
   - - SSC SSC1 bt -Q
@@ -1036,8 +983,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: BLE_INIT2
   <<: *SSC_INIT_COND
-  initial condition detail: 2 DUT which BLE is enabled, no active connection, DUT2
-    load service 0xA0 and start adv
+  initial condition detail: (SSC) enable BLE on 2 DUTs, no active connection, DUT2 load service 0xA0 and start adv
   check cmd set:
   - ''
   - - SSC SSC[1-2] bt -Q
@@ -1086,8 +1032,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: BLE_INIT3
   <<: *SSC_INIT_COND
-  initial condition detail: 2 DUT which BLE is enabled, no active connection, DUT2
-    load service 0xA2 and start adv
+  initial condition detail: (SSC) enable BLE on 2 DUTs, no active connection, DUT2 load service 0xA002 and start adv
   check cmd set:
   - ''
   - - SSC SSC[1-2] bt -Q
@@ -1132,7 +1077,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: BLE_INIT5
   <<: *SSC_INIT_COND
-  initial condition detail: 5 DUT which BLE is enabled, no active connection
+  initial condition detail: (SSC) enable BLE on 5 DUTs, no active connection
   check cmd set:
   - ''
   - - SSC SSC[1-5] bt -Q
@@ -1178,9 +1123,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: BLE_INIT_SMP
   <<: *SSC_INIT_COND
-  initial condition detail: 2 DUT which BLE is enabled, no active connection, DUT2
-    create GATT service 0xA002, DUT2 start adv, SMP enabled on both DUT and DUT1 load
-    default initiator param, DUT2 load default responder param
+  initial condition detail: (SSC) enable BLE on 2 DUTs, no active connection, create GATT service 0xA002 on DUT2, DUT2 start adv, DUT1 load default initiator param, DUT2 load default responder param
   check cmd set:
   - ''
   - - ASSERT
@@ -1252,9 +1195,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: BLE_INIT_SMP5
   <<: *SSC_INIT_COND
-  initial condition detail: 5 DUT which BLE is enabled, no active connection, DUT5
-    create GATT service 0xA000, DUT5 start adv, SMP enabled on both DUT and DUT5 load
-    default initiator param, DUT5 load default responder param
+  initial condition detail: (SSC) enable BLE on 5 DUTs, no active connection, create GATT service 0xA000 on DUT2-5, DUT2-5 start adv, DUT1 load default initiator param, DUT2-5 load default responder param
   check cmd set:
   - ''
   - - ASSERT
@@ -1315,8 +1256,10 @@ initial condition:
     - - R SSC[2-5] C +BLEADV:SetAdv,OK
   - - SSC SSC[2-5] bleadv -D -z start
     - - R SSC[2-5] C +BLEADV:OK
-  - - SSC SSC[1-5] blesmp -L -c [1,0]
-    - - R SSC[1-5] C +BLESMP:OK
+  - - SSC SSC1 blesmp -L -c 1
+    - - R SSC1 C +BLESMP:OK
+  - - SSC SSC[2-5] blesmp -L -c 0
+    - - R SSC[2-5] C +BLESMP:OK
   # do wifi disconnect, to prevent wifi reconnect cause bad BLE performance
   - - SSC SSC[1-5] sta -D
     - []
@@ -1326,7 +1269,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: NOW1
   <<: *SSC_INIT_COND
-  initial condition detail: one target in AP mode and espnow is de-initialized
+  initial condition detail: (SSC) DUT1 in AP mode and espnow is de-initialized
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -1360,7 +1303,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: NOW2
   <<: *SSC_INIT_COND
-  initial condition detail: multiple (<dev_num>) targets in AP mode, espnow is initialized
+  initial condition detail: (SSC) multiple (<dev_num>) DUTs in AP mode, espnow is initialized
     with self role slave
   check cmd set:
   - ''
@@ -1415,7 +1358,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: None
   <<: *SSC_INIT_COND
-  initial condition detail: none
+  initial condition detail: (SSC) do nothing
   check cmd set:
   - ''
   - - DELAY 0.1
@@ -1434,7 +1377,7 @@ initial condition:
     - - dummy
 - tag: PAIR1
   <<: *SSC_INIT_COND
-  initial condition detail: one target and simple is de-inited
+  initial condition detail: (SSC) DUT1 and simple is de-inited
   check cmd set:
   - ''
   - - SSC SSC1 sp -D
@@ -1453,7 +1396,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: PAIR2
   <<: *SSC_INIT_COND
-  initial condition detail: target1 in AP mode, target2 in STA mode, two targets de-init
+  initial condition detail: (SSC) DUT1 in SoftAP mode, DUT2 in STA mode, two DUTs deinit simple pair
     and init simple pair
   check cmd set:
   - ''
@@ -1501,7 +1444,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: PAIR3
   <<: *SSC_INIT_COND
-  initial condition detail: target1 and target2 in STA+AP mode, two targets de-init
+  initial condition detail: (SSC) DUT1 and DUT2 set to STA+SoftAP mode, two DUTs deinit simple pair
     and init simple pair
   check cmd set:
   - ''
@@ -1545,7 +1488,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: STAAP1
   <<: *SSC_INIT_COND
-  initial condition detail: testing sta on sta + ap mode, quit AP (autogen by STAM1)
+  initial condition detail: (SSC) DUT set to STA+SoftAP mode, disconnected from AP, enable DHCP client
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -1581,8 +1524,7 @@ initial condition:
     - - R SSC1 C +MAC:STA,OK
 - tag: STAAP2
   <<: *SSC_INIT_COND
-  initial condition detail: testing sta on sta + ap mode,  join AP, DHCP on (autogen
-    by STAM2)
+  initial condition detail: (SSC) DUT set to STA+SoftAP mode, connected with AP
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -1618,8 +1560,7 @@ initial condition:
     - - R SSC1 RE "\+JAP:CONNECTED,%%s"%%(<ap_ssid>)
 - tag: STAM1
   <<: *SSC_INIT_COND
-  initial condition detail: sta mode, quit AP, DHCP on, will autogen a TC with initial
-    condition STAAP1
+  initial condition detail: (SSC) DUT set to STA mode, disconnected from AP, enable DHCP client
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -1655,8 +1596,7 @@ initial condition:
     - - R SSC1 C +MAC:STA,OK
 - tag: STAM2
   <<: *SSC_INIT_COND
-  initial condition detail: sta mode, join AP, DHCP on, will autogen a TC with initial
-    condition STAAP2
+  initial condition detail: (SSC) DUT set to STA mode, connected with AP
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -1692,8 +1632,7 @@ initial condition:
     - - R SSC1 RE "\+JAP:CONNECTED,%%s"%%(<ap_ssid>)
 - tag: STAO1
   <<: *SSC_INIT_COND
-  initial condition detail: sta mode, quit AP, will NOT autogen a TC with initial
-    condition STAAP1
+  initial condition detail: (SSC) DUT set to STA mode, disconnected from AP, enable DHCP client
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -1729,8 +1668,7 @@ initial condition:
     - - R SSC1 C +MAC:STA,OK
 - tag: STAO2
   <<: *SSC_INIT_COND
-  initial condition detail: sta mode, join AP, DHCP on, will NOT autogen a TC with
-    initial condition STAAP2
+  initial condition detail: (SSC) DUT set to STA mode, connected with AP
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -1764,44 +1702,9 @@ initial condition:
     - - R SSC1 C +MAC:STA,OK
   - - SSC SSC1 sta -C -s <ap_ssid> -p <ap_password>
     - - R SSC1 RE "\+JAP:CONNECTED,%%s"%%(<ap_ssid>)
-- tag: STAWIFISTO
-  <<: *SSC_INIT_COND
-  initial condition detail: STA mode,  wifi will stop with initial condition STAWIFISTO
-  check cmd set:
-  - ''
-  - - SSC SSC1 op -Q
-    - - R SSC1 C +CURMODE:1
-  - - SSC SSC1 op -W -a init
-    - - R SSC1 C +MODE:OK
-  - - SSC SSC1 op -W -a start
-    - - R SSC1 C +MODE:OK
-  - - SSC SSC1 op -W -a stop
-    - - R SSC1 C +MODE:OK
-  restore cmd set:
-  - ''
-  - - SSC SSC1 op -S -o 1
-    - - R SSC1 C +MODE:OK
-  - - SSC SSC1 op -W -a init
-    - - R SSC1 C +MODE:OK
-  - - SSC SSC1 op -W -a start
-    - - R SSC1 C +MODE:OK
-  - - SSC SSC1 op -W -a stop
-    - - R SSC1 C +MODE:OK
-  force restore cmd set:
-  - ''
-  - - SSC SSC1 reboot
-    - - R SSC1 C !!!ready!!!
-  - - SSC SSC1 op -S -o 1
-    - - R SSC1 C +MODE:OK
-  - - SSC SSC1 op -W -a init
-    - - R SSC1 C +MODE:OK
-  - - SSC SSC1 op -W -a start
-    - - R SSC1 C +MODE:OK
-  - - SSC SSC1 op -W -a stop
-    - - R SSC1 C +MODE:OK
 - tag: T1_ETH
   <<: *SSC_INIT_COND
-  initial condition detail: ethernet is enabled and got IP from AP
+  initial condition detail: (SSC) ethernet is enabled and got IP from AP
   check cmd set:
   - ''
   - - SSC SSC1 eth -N
@@ -1832,8 +1735,7 @@ initial condition:
     - - R SSC1 C +ETHIP:192.168
 - tag: T2O_1
   <<: *SSC_INIT_COND
-  initial condition detail: same as T2_1 but will NOT autogen a TC with initial condition
-    T2_2
+  initial condition detail: (SSC) DUT1 set to SoftAP mode, DUT2 set to STA mode, enable DHCP
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -1895,8 +1797,7 @@ initial condition:
     - - R SSC2 C +MAC:STA,OK
 - tag: T2_1
   <<: *SSC_INIT_COND
-  initial condition detail: target 1 as SoftAP, target 2 as STA, will autogen a TC
-    with initial condition T2_2
+  initial condition detail: (SSC) DUT1 set to SoftAP mode, DUT2 set to STA mode, enable DHCP
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -1958,7 +1859,7 @@ initial condition:
     - - R SSC2 C +MAC:STA,OK
 - tag: T2_2
   <<: *SSC_INIT_COND
-  initial condition detail: target 1 as AP+STA, target 2 as AP+STA (autogen)
+  initial condition detail: (SSC) DUT1 and DUT2 set to STA+SoftAP mode, enable DHCP
   check cmd set:
   - ''
   - *dut1_start_wifi
@@ -2018,12 +1919,60 @@ initial condition:
     - - R SSC1 C +MAC:AP,OK
   - - SSC SSC2 mac -S -o 1 -m <target2_mac>
     - - R SSC2 C +MAC:STA,OK
+- tag: T3_1
+  <<: *SSC_INIT_COND
+  initial condition detail: (SSC) DUT1 set to STA+SoftAP mode, DUT2 and DUT3 set to STA mode
+  check cmd set:
+  - ''
+  - - SSC SSC1 op -Q
+    - - R SSC1 C +CURMODE:3
+  - - SSC SSC[2-3] op -Q
+    - - R SSC[2-3] C +CURMODE:1
+  - - SSC SSC[1-3] sta -D
+    - - 'R SSC[1-3] C +QAP:'
+  - - SSC SSC1 dhcp -S -o 2
+    - - R SSC1 C +DHCP
+  - - SSC SSC[2-3] dhcp -Q -o 1
+    - - R SSC[2-3] C +DHCP:STA,STARTED
+  - - SSC SSC1 mac -Q -o 2
+    - - R SSC1 P <target_ap_mac>
+  - - SSC SSC2 mac -Q -o 1
+    - - R SSC2 P <target2_mac>
+  - - SSC SSC3 mac -Q -o 1
+    - - R SSC3 P <target3_mac>
+  restore cmd set:
+  - ''
+  - - SSC SSC[1-3] op -S -o [3,1,1]
+    - - R SSC[1-3] C +MODE:OK
+  - - SSC SSC[1-3] sta -D
+    - - 'R SSC[1-3] C +QAP:'
+  - - SSC SSC[1-3] dhcp -S -o [2,1,1]
+    - - R SSC[1-3] C +DHCP
+  - - SSC SSC1 mac -S -o 2 -m <target_ap_mac>
+    - - R SSC1 C +MAC:AP,OK
+  - - SSC SSC2 mac -S -o 1 -m <target2_mac>
+    - - R SSC2 C +MAC:STA,OK
+  - - SSC SSC3 mac -S -o 1 -m <target3_mac>
+    - - R SSC3 C +MAC:STA,OK
+  force restore cmd set:
+  - ''
+  - - SSC SSC[1-3] reboot
+    - - R SSC[1-3] C !!!ready!!!
+  - - SSC SSC[1-3] op -S -o [3,1,1]
+    - - R SSC[1-3] C +MODE:OK
+  - - SSC SSC[1-3] sta -D
+    - - 'R SSC[1-3] C +QAP:'
+  - - SSC SSC[1-3] dhcp -S -o [2,1,1]
+    - - R SSC[1-3] C +DHCP
+  - - SSC SSC1 mac -S -o 2 -m <target_ap_mac>
+    - - R SSC1 C +MAC:AP,OK
+  - - SSC SSC2 mac -S -o 1 -m <target2_mac>
+    - - R SSC2 C +MAC:STA,OK
+  - - SSC SSC3 mac -S -o 1 -m <target3_mac>
+    - - R SSC3 C +MAC:STA,OK
 - tag: T3_PHY1
   <<: *SSC_INIT_COND
-  initial condition detail: |-
-    1. target 1 and target 2 set to AP+STA mode, target 3 set to STA mode
-    2. all interface of target 2,3 set to 11n ht40
-    3. config softAP of target 1 and target 2
+  initial condition detail: (SSC) DUT1-2 set to STA+SoftAP mode, DUT3 set to STA mode. All interface of DUT2-3 set to 11n ht40. Set DUT1-2 SoftAP config.
   check cmd set:
   - ''
   - - SSC SSC[1-3] op -Q
@@ -2054,8 +2003,7 @@ initial condition:
     - - R SSC1 A <heap_size>:(\d+)
 - tag: WIFIBTSTOP
   <<: *SSC_INIT_COND
-  initial condition detail: bt controller and host will be disabled and deinit with
-    initial condition wifibtstop
+  initial condition detail: (SSC) deinit Wi-Fi and BT host/controller
   check cmd set:
   - ''
   - - SSC SSC1 op -Q
@@ -2120,7 +2068,7 @@ initial condition:
     - - 'R SSC1 C +BT:'
 - tag: WIFISTO
   <<: *SSC_INIT_COND
-  initial condition detail: wifi will stop with initial condition WIFISTO
+  initial condition detail: (SSC) DUT in STA mode, stop Wi-Fi
   check cmd set:
   - ''
   - - SSC SSC1 op -W -a init
@@ -2149,7 +2097,7 @@ initial condition:
     - - R SSC1 C +MODE:OK
 - tag: BLE_INIT_REBOOT2
   <<: *SSC_INIT_COND
-  initial condition detail: 2 DUT should reboot at first and BLE is enabled, no active connection
+  initial condition detail: (SSC) reboot and enable BLE on DUT1 and DUT2
   check cmd set:
   - ''
   - - SSC SSC[1-2] reboot
@@ -2188,44 +2136,49 @@ initial condition:
     - - R SSC[1-2] C +BLE:OK
   - - SSC SSC1 ram
     - - R SSC1 A <heap_size>:(\d+)
-- tag: T3_1
+- tag: T3_2
   <<: *SSC_INIT_COND
-  initial condition detail: target 1 as SoftAP + STA, target 2 as SoftAP, target 3 as STA
-      with initial condition T2_2
+  initial condition detail: (SSC) DUT set to STA+SoftAP mode, DUT2 set to SoftAP mode, DUT3 set to STA mode
   check cmd set:
   - ''
-  - *dut1_start_wifi
-  - - SSC SSC1 op -Q
-    - - R SSC1 C +CURMODE:3
-  - - SSC SSC2 op -Q
-    - - R SSC2 C +CURMODE:2
-  - - SSC SSC3 op -Q
-    - - R SSC3 C +CURMODE:1
+  - - SSC SSC[1,2,3] op -Q
+    - - R SSC[1,2,3] C +CURMODE:[3,2,1]
   - - SSC SSC3 sta -D
     - - 'R SSC3 C +QAP:'
   restore cmd set:
   - ''
-  - - SSC SSC1 op -S -o 3
-    - - R SSC1 C +MODE:OK
-  - - SSC SSC2 op -S -o 2
-    - - R SSC2 C +MODE:OK
-  - - SSC SSC3 op -S -o 1
-    - - R SSC3 C +MODE:OK
+  - - SSC SSC[1,2,3] op -S -o [3,2,1]
+    - - R SSC[1,2,3] C +MODE:OK
   - - SSC SSC3 sta -D
     - - 'R SSC3 C +QAP:'
   force restore cmd set:
   - ''
-  - - SSC SSC1 reboot
-    - - R SSC1 C !!!ready!!!
-  - - SSC SSC2 reboot
-    - - R SSC2 C !!!ready!!!
-  - - SSC SSC3 reboot
-    - - R SSC3 C !!!ready!!!
-  - - SSC SSC1 op -S -o 3
-    - - R SSC1 C +MODE:OK
-  - - SSC SSC2 op -S -o 2
-    - - R SSC2 C +MODE:OK
-  - - SSC SSC3 op -S -o 1
-    - - R SSC3 C +MODE:OK
+  - - SSC SSC[1,2,3] reboot
+    - - R SSC[1,2,3] C !!!ready!!!
+  - - SSC SSC[1,2,3] op -S -o [3,2,1]
+    - - R SSC[1,2,3] C +MODE:OK
   - - SSC SSC3 sta -D
     - - 'R SSC3 C +QAP:'
+- tag: T3_3
+  <<: *SSC_INIT_COND
+  initial condition detail: (SSC) DUT1 set to SoftAp mode, DUT2-3 set to STA mode
+  check cmd set:
+  - ''
+  - - SSC SSC[1,2,3] op -Q
+    - - R SSC[1,2,3] C +CURMODE:[2,1,1]
+  - - SSC SSC[2,3] sta -D
+    - - 'R SSC[2,3] C +QAP:'
+  restore cmd set:
+  - ''
+  - - SSC SSC[1,2,3] op -S -o [2,1,1]
+    - - R SSC[1,2,3] C +MODE:OK
+  - - SSC SSC[2,3] sta -D
+    - - 'R SSC[2,3] C +QAP:'
+  force restore cmd set:
+  - ''
+  - - SSC SSC[1,2,3] reboot
+    - - R SSC[1,2,3] C !!!ready!!!
+  - - SSC SSC[1,2,3] op -S -o [2,1,1]
+    - - R SSC[1,2,3] C +MODE:OK
+  - - SSC SSC[2,3] sta -D
+    - - 'R SSC[2,3] C +QAP:'
diff --git a/components/idf_test/integration_test/KnownIssues b/components/idf_test/integration_test/KnownIssues
index 6749b9471..f61c722ae 100644
--- a/components/idf_test/integration_test/KnownIssues
+++ b/components/idf_test/integration_test/KnownIssues
@@ -2,88 +2,100 @@
 # NOT SUPPORT
 
 # ICMP send Ping not supported
-TCPIP_ICMP_0101
-TCPIP_ICMP_0101_01
+ESP32.TCPIP_ICMP_0101
+ESP32.TCPIP_ICMP_0101_01
 
 # Bug or not stable cases
 
 # Wifi scan issue
-WIFI_SCAN_0303
-WIFI_SCAN_0303_01
-WIFI_CONN_0302
-WIFI_CONN_0302_01
-WIFI_CONN_0101
-WIFI_CONN_0101_01
-WIFI_CONN_0102
-WIFI_CONN_0103
-WIFI_CONN_0103_01
-WIFI_SCAN_0101
-WIFI_SCAN_0101_01
-WIFI_SCAN_0102
-WIFI_SCAN_0102_01
-WIFI_SCAN_0103
-WIFI_SCAN_0103_01
-WIFI_SCAN_0104
-WIFI_SCAN_0104_01
-WIFI_MODE_0102
-WIFI_MODE_0103
-WIFI_ADDR_0102
-WIFI_ADDR_0102_01
+ESP32.WIFI_SCAN_0303
+ESP32.WIFI_SCAN_0303_01
+ESP32.WIFI_CONN_0302
+ESP32.WIFI_CONN_0302_01
+ESP32.WIFI_CONN_0101
+ESP32.WIFI_CONN_0101_01
+ESP32.WIFI_CONN_0102
+ESP32.WIFI_CONN_0103
+ESP32.WIFI_CONN_0103_01
+ESP32.WIFI_SCAN_0101
+ESP32.WIFI_SCAN_0101_01
+ESP32.WIFI_SCAN_0102
+ESP32.WIFI_SCAN_0102_01
+ESP32.WIFI_SCAN_0103
+ESP32.WIFI_SCAN_0103_01
+ESP32.WIFI_SCAN_0104
+ESP32.WIFI_SCAN_0104_01
+ESP32.WIFI_MODE_0102
+ESP32.WIFI_MODE_0103
+ESP32.WIFI_ADDR_0102
+ESP32.WIFI_ADDR_0102_01
 
 # IGMP
-TCPIP_IGMP_0201
-TCPIP_IGMP_0201_01
-TCPIP_IGMP_0202
-TCPIP_IGMP_0202_01
-TCPIP_IGMP_0204
-TCPIP_IGMP_0204_01
+ESP32.TCPIP_IGMP_0201
+ESP32.TCPIP_IGMP_0201_01
+ESP32.TCPIP_IGMP_0202
+ESP32.TCPIP_IGMP_0202_01
+ESP32.TCPIP_IGMP_0204
+ESP32.TCPIP_IGMP_0204_01
+ESP32.TCPIP_IGMP_0301
+ESP32.TCPIP_IGMP_0301_01
+ESP32.TCPIP_IGMP_0303
+ESP32.TCPIP_IGMP_0303_01
+ESP32.TCPIP_IGMP_0402
+ESP32.TCPIP_IGMP_0402_01
+ESP32.TCPIP_IGMP_0406
+ESP32.TCPIP_IGMP_0406_01
 
 # TCP
-TCPIP_TCP_0401_01_02
+ESP32.TCPIP_TCP_0401_01_02
 
 # UDP
-TCPIP_UDP_0103
-TCPIP_UDP_0103_01
-TCPIP_UDP_0103_02
-TCPIP_UDP_0103_01_02
+ESP32.TCPIP_UDP_0103
+ESP32.TCPIP_UDP_0103_01
+ESP32.TCPIP_UDP_0103_02
+ESP32.TCPIP_UDP_0103_01_02
 
 # BLE
 
 # BT heap size issue
-BTSTK_MISC_0301
+ESP32.BTSTK_MISC_0301
 
 # SMP
-BTSTK_SMP_05001
-BTSTK_SMP_05002
-BTSTK_SMP_05003
-BTSTK_SMP_06004
+ESP32.BTSTK_SMP_05001
+ESP32.BTSTK_SMP_05002
+ESP32.BTSTK_SMP_05003
+ESP32.BTSTK_SMP_06004
+ESP32.BTSTK_SMP_07007
+ESP32.BTSTK_SMP_07006
 
 # multi connect
-BTSTK_GAP_10001
-BTSTK_GAP_10002
-BTSTK_GAP_10003
-BTSTK_GAP_10004
-BTSTK_GAP_11001
-BTSTK_GAP_11002
-BTSTK_GAP_12001
-BTSTK_GAP_12002
-BTSTK_GATT_30001
-BTSTK_GATT_30002
-BTSTK_GATT_30003
-BTSTK_GATT_31001
-BTSTK_GATT_31002
-BTSTK_GATT_31003
-BTSTK_GATT_32001
-BTSTK_GATT_32002
-BTSTK_GATT_32003
-BTSTK_GATT_32004
-BTSTK_GATT_33001
-BTSTK_GATT_33002
-BTSTK_GATT_33003
-BTSTK_GATT_34001
-BTSTK_GATT_34002
-BTSTK_GATT_34003
+ESP32.BTSTK_GAP_04002
+ESP32.BTSTK_GAP_04003
+ESP32.BTSTK_GAP_10001
+ESP32.BTSTK_GAP_10002
+ESP32.BTSTK_GAP_10003
+ESP32.BTSTK_GAP_10004
+ESP32.BTSTK_GAP_11001
+ESP32.BTSTK_GAP_11002
+ESP32.BTSTK_GAP_12001
+ESP32.BTSTK_GAP_12002
+ESP32.BTSTK_GATT_30001
+ESP32.BTSTK_GATT_30002
+ESP32.BTSTK_GATT_30003
+ESP32.BTSTK_GATT_31001
+ESP32.BTSTK_GATT_31002
+ESP32.BTSTK_GATT_31003
+ESP32.BTSTK_GATT_32001
+ESP32.BTSTK_GATT_32002
+ESP32.BTSTK_GATT_32003
+ESP32.BTSTK_GATT_32004
+ESP32.BTSTK_GATT_33001
+ESP32.BTSTK_GATT_33002
+ESP32.BTSTK_GATT_33003
+ESP32.BTSTK_GATT_34001
+ESP32.BTSTK_GATT_34002
+ESP32.BTSTK_GATT_34003
 
 # GATT read multiple
-BTSTK_GATT_27002
-BTSTK_GATT_27003
+ESP32.BTSTK_GATT_27002
+ESP32.BTSTK_GATT_27003
diff --git a/components/idf_test/integration_test/TC_IT_BTSTK_GAP.yml b/components/idf_test/integration_test/TC_IT_BTSTK_GAP.yml
index dbef90c39..32477c963 100644
--- a/components/idf_test/integration_test/TC_IT_BTSTK_GAP.yml
+++ b/components/idf_test/integration_test/TC_IT_BTSTK_GAP.yml
@@ -858,6 +858,7 @@ test cases:
     - ["R SSC1 C +BLE:GattcConnect,OK", "R SSC2 C +BLE:GattsConnect"]
 - ID: BTSTK_GAP_03010
   <<: *GAP_CASE
+  CI ready: "No"  # can't restore to use public address after set to use private address
   test point 2: BLE GAP set advertise param
   summary: ble adv with privacy address and RPA_RANDOM
   initial condition: BLE_INIT_SMP
@@ -881,6 +882,7 @@ test cases:
     - ["R SSC1 NP <dut2_bt_mac> C Complete"]
 - ID: BTSTK_GAP_03011
   <<: *GAP_CASE
+  CI ready: "No"  # can't restore to use public address after set to use private address
   test point 2: BLE GAP set advertise param
   summary: ble set adv owner address type as RPA_RANDOM
   initial condition: BLE_INIT_SMP
@@ -930,6 +932,25 @@ test cases:
     - ["R SSC1 P <dut2_bt_mac> C Complete"]
   - - "SSC SSC1 bleconn -C -p 0x10 -a <dut2_bt_mac>"
     - ["R SSC1 C +BLE:GattcConnect,OK", "R SSC2 C +BLE:GattsConnect"]
+- ID: BTSTK_GAP_03012
+  <<: *GAP_CASE
+  test point 2: BLE GAP set advertise param
+  summary: set ble adv peer_address_type as RPA_PUBLIC and RPA_RANDOM
+  initial condition: BLE_INIT_SMP
+  steps: |
+    1. DUT1 set peer address and peer address type RPA_PUBLIC
+    2. DUT1 set peer address and peer address type RPA_RANDOM
+  expected result: |
+    1. succeed
+    2. succeed
+  cmd set:
+  - ""
+  - - "SSC SSC1 bleadv -D -z stop"
+    - ["R SSC1 C +BLEADV:Stop,OK"]
+  - - "SSC SSC1 bleadv -D -z start -b <dut2_bt_mac> -y 2"
+    - ["R SSC1 C +BLEADV:Start,ERROR"]
+  - - "SSC SSC1 bleadv -D -z start -b <dut2_bt_mac> -y 3"
+    - ["R SSC1 C +BLEADV:Start,ERROR"]
 - ID: BTSTK_GAP_04001
   <<: *GAP_CASE
   test point 2: BLE GAP set scan param
@@ -1017,13 +1038,13 @@ test cases:
   - - "SSC SSC2 bleadv -D -z start"
     - ["R SSC2 C +BLEADV:OK"]
   - *dut1_stop_adv
-  - - "SSC SSC1 blescan -L -c 0 -s 1 -i 0x0004 -w 0x0004"
+  - - "SSC SSC1 blescan -L -c 0 -s 1 -i 0x0004 -w 0x0003"
     - ["R SSC1 C +BLESCAN:SetScanParam,OK"]
   - - "SSC SSC1 blescan -L -c 0 -s 1 -i 0x4000 -w 0x4000"
     - ["R SSC1 C +BLESCAN:SetScanParam,OK"]
   - - "SSC SSC1 blescan -L -c 0 -s 1 -i 0x0003 -w 0x0003"
     - ["R SSC1 C +BLESCAN:SetScanParam,ERROR"]
-  - - "SSC SSC1 blescan -L -c 0 -s 1 -i 0x4001 -i 0x4001"
+  - - "SSC SSC1 blescan -L -c 0 -s 1 -i 0x4001 -w 0x4001"
     - ["R SSC1 C +BLESCAN:SetScanParam,ERROR"]
 - ID: BTSTK_GAP_04004
   <<: *GAP_CASE
@@ -1043,7 +1064,7 @@ test cases:
   test environment: SSC_T1_4
   cmd set:
   - ""
-  - - "SSC SSC1 blescan -L -c 0 -w 0x0004 -i 0x0004"
+  - - "SSC SSC1 blescan -L -c 0 -w 0x0004 -i 0x004"
     - ["R SSC1 C +BLESCAN:SetScanParam,OK"]
   - - "SSC SSC1 blescan -L -c 0 -w 0x4000 -i 0x4000"
     - ["R SSC1 C +BLESCAN:SetScanParam,OK"]
@@ -2768,126 +2789,6 @@ test cases:
   - - LOOP 4 1 "[2,3,4,5]"
   - - "SSC SSC{%d} bleconn -D -z all"
     - ["P SSC1 C Disconnect"]
-- ID: BTSTK_GAP_40001
-  <<: *GAP_CASE
-  auto test: 'No'
-  test point 2: test if BLE work after switch off some sub modules
-  summary: GAP only test
-  steps: |
-    1. download GAP only SSC bin on both DUT
-    2. DUT1 set ascii device name
-    3. stop advertising
-    4. config scan response and start advertising
-    5. DUT2 do active scan
-  expected result: |
-    1. succeed
-    2. succeed
-    3. succeed
-    4. succeed
-    5. device name in scan result
-  initial condition: None
-  version: v1 (2017-05-19)
-  cmd set:
-  - ""
-  - - "SSC SSC[1-2] reboot"
-    - ['R SSC[1-2] C !!!ready!!!']
-  - - "SSC SSC[1-2] ble -R"
-    - ["R SSC[1-2] C +BLE:OK"]
-  - *set_default_ble_name
-  - *set_default_adv_data
-  - *dut2_stop_adv
-  - - "SSC SSC2 blescan -L -c 0"
-    - ["R SSC2 C +BLESCAN:SetScanParam,OK"]
-  - - "SSC SSC2 blescan -D -z start -t 3"
-    - ["R SSC2 P <dut1_ble_name>"]
-- ID: BTSTK_GAP_50001
-  <<: *GAP_CASE
-  category: Performance
-  test point 1: performance + stress
-  test point 2: BLE GAP performance test
-  summary: BLE Connect and disconnect performance test
-  steps: |
-    1. DUT1 disconnect with DUT2
-    2. DUT2 start advertising
-    3. DUT1 connect to DUT2
-    4. do service discovery
-    5. loop step 1-4
-    6. check connection fail ratio and average conn time
-  expected result: |
-    1. succeed
-    2. succeed
-    3. succeed
-    4. succeed
-    5. succeed
-    6. meet pass standard
-  initial condition: BLE_INIT2
-  execution time: 6
-  version: v1 (2017-05-19)
-  CI ready: 'No'
-  cmd set:
-  - "BLEStress/BLEConnPerformance"
-  - - "test_time = 420"
-    - ""
-  - - "average_conn_time = 3"
-    - ""
-  - - "fail_ratio = 0.01"
-    - ""
-  - - "fail_timeout = 10"
-    - ""
-- ID: BTSTK_GAP_50004
-  <<: *GAP_CASE
-  category: Performance
-  test point 1: performance + stress
-  test point 2: BLE GAP performance test
-  summary: BLE Connect and disconnect correct performance test
-  steps: |
-    1. DUT1 disconnect with DUT2
-    2. DUT2 start advertising
-    3. DUT1 connect to DUT2
-    4. loop step 1-4 1000 times
-    5. reboot
-    6. loop step 1-5
-  expected result: |
-    1. succeed
-    2. succeed
-    3. succeed
-    4. succeed
-    5. succeed
-    6. meet pass standard
-  initial condition: BLE_INIT2
-  execution time: 6
-  version: v1 (2017-05-19)
-  CI ready: 'No'
-  cmd set:
-  - "BLEStress/BLEConnCorPerformance"
-  - - "test_time = 100"
-    - ""
-  - - "reboot_time = 1000"
-    - ""
-  - - "average_conn_time = 3"
-    - ""
-  - - "fail_ratio = 0.01"
-    - ""
-  - - "fail_timeout = 10"
-    - ""
-- ID: BTSTK_GAP_51001
-  <<: *GAP_CASE
-  category: Performance
-  test point 1: performance + stress
-  test point 2: BLE GAP performance test
-  summary: BLE adv and scan forever
-  steps: |
-    1. DUT1 do adv
-    2. DUT2 do scan
-  expected result: |
-    1. succeed
-    2. succeed
-  initial condition: BLE_INIT2
-  execution time: 10
-  cmd set:
-  - "BLEStress/BLEAdvScanPerformance"
-  - - "test_time = 600"
-    - ""
 - ID: BTSTK_GAP_13001
   <<: *GAP_CASE
   test point 2: BLE GAP param packet data length test
@@ -3070,7 +2971,7 @@ test cases:
 - ID: BTSTK_GAP_14008
   <<: *GAP_CASE
   test point 2: BLE set random address test
-  summary: BLE set random address as resolvable private address and reconnect after disconnect
+  summary: BLE pairing and set random address as resolvable private address, reconnect after disconnect
   steps: |
     1. SSC2 set AuthReqMode and IOCAP,set RspKey as Enc and IRK
     2. pairing
@@ -3113,7 +3014,7 @@ test cases:
 - ID: BTSTK_GAP_14009
   <<: *GAP_CASE
   test point 2: BLE set random address test
-  summary: BLE set random address as resolvable private address and reconnect after reboot
+  summary: BLE pairing and set random address as resolvable private address, reconnect after reboot
   steps: |
     1. SSC2 set AuthReqMode and IOCAP,set RspKey as Enc and IRK
     2. pairing
@@ -3253,3 +3154,169 @@ test cases:
     - ['P SSC1 C +BLE:GetWhiteList,OK,0']
   - - "SSC SSC1 ble -W -a c0:9b:0e:36:6d:7c -z add"
     - ['P SSC1 C +BLE:AddWhiteList,Fail']
+- ID: BTSTK_GAP_16001
+  <<: *GAP_CASE
+  test point 2: BLE low power test
+  summary: test adv current and adv interval 32-32
+  category: Performance
+  steps: |
+   1. DUT2 start adv
+   2. test DUT2 current
+  expected result: |
+   1. succeed
+   2. succeed
+  cmd set:
+  - "BLEFunction/BLELowPower"
+  - - op_test = "start_adv"
+    - ''
+- ID: BTSTK_GAP_16002
+  <<: *GAP_CASE
+  test point 2: BLE low power test
+  summary: test scan current and scan window/interval 04
+  category: Performance
+  steps: |
+   1. DUT2 start scan
+   2. test DUT2 current
+  expected result: |
+   1. succeed
+   2. succeed
+  cmd set:
+  - "BLEFunction/BLELowPower"
+  - - op_test = "start_scan"
+    - ""
+- ID: BTSTK_GAP_16003
+  <<: *GAP_CASE
+  test point 2: BLE low power test
+  summary: test connect current and interval 6-6
+  category: Performance
+  steps: |
+   1. DUT1 connect to DUT2
+   2. test DUT2 current
+  expected result: |
+   1. succeed
+   2. succeed
+  cmd set:
+  - "BLEFunction/BLELowPower"
+  - - op_test = "do_connect"
+    - ""
+- ID: BTSTK_GAP_40001
+  <<: *GAP_CASE
+  auto test: 'No'
+  test point 2: test if BLE work after switch off some sub modules
+  summary: GAP only test
+  steps: |
+    1. download GAP only SSC bin on both DUT
+    2. DUT1 set ascii device name
+    3. stop advertising
+    4. config scan response and start advertising
+    5. DUT2 do active scan
+  expected result: |
+    1. succeed
+    2. succeed
+    3. succeed
+    4. succeed
+    5. device name in scan result
+  initial condition: None
+  version: v1 (2017-05-19)
+  cmd set:
+  - ""
+  - - "SSC SSC[1-2] reboot"
+    - ['R SSC[1-2] C !!!ready!!!']
+  - - "SSC SSC[1-2] ble -R"
+    - ["R SSC[1-2] C +BLE:OK"]
+  - *set_default_ble_name
+  - *set_default_adv_data
+  - *dut2_stop_adv
+  - - "SSC SSC2 blescan -L -c 0"
+    - ["R SSC2 C +BLESCAN:SetScanParam,OK"]
+  - - "SSC SSC2 blescan -D -z start -t 3"
+    - ["R SSC2 P <dut1_ble_name>"]
+- ID: BTSTK_GAP_50001
+  <<: *GAP_CASE
+  category: Performance
+  test point 1: performance + stress
+  test point 2: BLE GAP performance test
+  summary: BLE Connect and disconnect performance test
+  steps: |
+    1. DUT1 disconnect with DUT2
+    2. DUT2 start advertising
+    3. DUT1 connect to DUT2
+    4. do service discovery
+    5. loop step 1-4
+    6. check connection fail ratio and average conn time
+  expected result: |
+    1. succeed
+    2. succeed
+    3. succeed
+    4. succeed
+    5. succeed
+    6. meet pass standard
+  initial condition: BLE_INIT2
+  execution time: 6
+  version: v1 (2017-05-19)
+  CI ready: 'No'
+  cmd set:
+  - "BLEStress/BLEConnPerformance"
+  - - "test_time = 420"
+    - ""
+  - - "average_conn_time = 3"
+    - ""
+  - - "fail_ratio = 0.01"
+    - ""
+  - - "fail_timeout = 10"
+    - ""
+- ID: BTSTK_GAP_50004
+  <<: *GAP_CASE
+  category: Performance
+  test point 1: performance + stress
+  test point 2: BLE GAP performance test
+  summary: BLE Connect and disconnect correct performance test
+  steps: |
+    1. DUT1 disconnect with DUT2
+    2. DUT2 start advertising
+    3. DUT1 connect to DUT2
+    4. loop step 1-4 1000 times
+    5. reboot
+    6. loop step 1-5
+  expected result: |
+    1. succeed
+    2. succeed
+    3. succeed
+    4. succeed
+    5. succeed
+    6. meet pass standard
+  initial condition: BLE_INIT2
+  execution time: 6
+  version: v1 (2017-05-19)
+  CI ready: 'No'
+  cmd set:
+  - "BLEStress/BLEConnCorPerformance"
+  - - "test_time = 100"
+    - ""
+  - - "reboot_time = 1000"
+    - ""
+  - - "average_conn_time = 3"
+    - ""
+  - - "fail_ratio = 0.01"
+    - ""
+  - - "fail_timeout = 10"
+    - ""
+- ID: BTSTK_GAP_51001
+  <<: *GAP_CASE
+  Test App: SSC_BLE, SSC_PSRAM
+  category: Performance
+  test point 1: performance + stress
+  test point 2: BLE GAP performance test
+  summary: BLE adv and scan forever
+  steps: |
+    1. DUT1 do adv
+    2. DUT2 do scan
+  expected result: |
+    1. succeed
+    2. succeed
+  initial condition: BLE_INIT2
+  execution time: 10
+  cmd set:
+  - "BLEStress/BLEAdvScanPerformance"
+  - - "test_time = 600"
+    - ""
diff --git a/components/idf_test/integration_test/TC_IT_BTSTK_GATT.yml b/components/idf_test/integration_test/TC_IT_BTSTK_GATT.yml
index 9a0560e49..4a746d866 100644
--- a/components/idf_test/integration_test/TC_IT_BTSTK_GATT.yml
+++ b/components/idf_test/integration_test/TC_IT_BTSTK_GATT.yml
@@ -1815,9 +1815,9 @@ test cases:
   cmd set:
   - ""
   - *primary_service_discovery
-  - - "SSC SSC1 gattc -W -z char -s 0xA002 -c 0xC302 -p 0x10 -v -x01 -w 1"
+  - - "SSC SSC1 gattc -W -z char -s 0xA002 -c 0xC302 -p 0x10 -v 0x01 -w 1"
     - ["R SSC1 C +GATTC:Write,OK"]
-  - - "SSC SSC1 gattc -W -z char -s 0xA002 -c 0xC302 -p 0x10 -v -x01 -w 1"
+  - - "SSC SSC1 gattc -W -z char -s 0xA002 -c 0xC302 -p 0x10 -v 0x01 -w 1"
     - ["R SSC1 C +GATTC:Write,OK"]
 - ID: BTSTK_GATT_25015
   <<: *GATT_CASE
@@ -2045,6 +2045,23 @@ test cases:
   - - "SSC SSC1 gattc -R -z multiple -u 0xA00xC100#0xA00xC101#0xA00xC1000x29010xA00xC1070x2902"
     - ['R SSC1 C +GATTC:ReadOnce', 'R SSC1 C +GATTC:ReadMultiple,OK']
 - ID: BTSTK_GATT_27003
+  <<: *GATT_CASE
+  test point 2: BLE GATT read multiple
+  summary: GATT client read char and descriptor of table create service
+  steps: |
+    1. DUT1 do discover
+    2. GATT client read all char and descriptor
+  expected result: |
+    1. succeed
+    2. succeed
+  cmd set:
+  - ""
+  - - "SSC SSC2 gatts -S -z load -p 0xA2"
+    - ['R SSC2 C +GATTS:StartService,OK,A002']
+  - *primary_service_discovery
+  - - "SSC SSC1 gattc -R -z multiple -u 0xA20xC300#0xA20xC301#0xA20xC310#0xA20xC311#"
+    - ['R SSC1 C +GATTC:ReadOnce', 'R SSC1 C +GATTC:ReadMultiple,OK']
+- ID: BTSTK_GATT_27004
   <<: *GATT_CASE
   test point 2: BLE GATT read multiple
   summary: GATT client read char and descriptor of included service and table service
@@ -2848,6 +2865,7 @@ test cases:
     - ""
 - ID: BTSTK_GATT_50007
   <<: *GATT_CASE
+  Test App: SSC_BLE, SSC_PSRAM
   category: Performance
   test point 1: performance + stress
   test point 2: BLE GATT performance test
@@ -2871,9 +2889,9 @@ test cases:
     - ""
   - - gatt_op = "write"
     - ""
-  - - op_char = "0xC304"
+  - - op_char = "0xC317"
     - ""
-  - - op_len = 256
+  - - op_len = 490
     - ""
   - - master_duts = ["SSC1"]
     - ""
@@ -2904,9 +2922,9 @@ test cases:
     - ""
   - - gatt_op = "write"
     - ""
-  - - op_char = "0xC304"
+  - - op_char = "0xC317"
     - ""
-  - - op_len = 256
+  - - op_len = 490
     - ""
   - - master_duts = ["SSC2", "SSC3", "SSC4", "SSC5"]
     - ""
@@ -2939,7 +2957,7 @@ test cases:
     - ""
   - - op_char = "0xC305"
     - ""
-  - - op_len = 256
+  - - op_len = 490
     - ""
   - - master_duts = ["SSC1"]
     - ""
@@ -2972,13 +2990,14 @@ test cases:
     - ""
   - - op_char = "0xC305"
     - ""
-  - - op_len = 256
+  - - op_len = 490
     - ""
   - - master_duts = ["SSC2", "SSC3", "SSC4", "SSC5"]
     - ""
   - - slave_duts = ["SSC1"]
     - ""
 - ID: BTSTK_GATT_50011
+  Test App: SSC_BLE, SSC_PSRAM
   <<: *GATT_CASE
   category: Performance
   test point 1: performance + stress
diff --git a/components/idf_test/integration_test/TC_IT_BTSTK_MISC.yml b/components/idf_test/integration_test/TC_IT_BTSTK_MISC.yml
index 0df8c258e..33b4575ce 100644
--- a/components/idf_test/integration_test/TC_IT_BTSTK_MISC.yml
+++ b/components/idf_test/integration_test/TC_IT_BTSTK_MISC.yml
@@ -5,7 +5,7 @@
   category: Function
   test point 1: basic function
   initial condition: BLE_DEINIT1
-  test environment: SSC_T1_1
+  test environment: SSC_T1_4
   execution time: 0
   module: BT Stack
   sub module: Misc
diff --git a/components/idf_test/integration_test/TC_IT_BTSTK_SMP.yml b/components/idf_test/integration_test/TC_IT_BTSTK_SMP.yml
index c6c34923c..a563f9bd5 100644
--- a/components/idf_test/integration_test/TC_IT_BTSTK_SMP.yml
+++ b/components/idf_test/integration_test/TC_IT_BTSTK_SMP.yml
@@ -1771,7 +1771,7 @@ test cases:
   cmd set:
   - ""
   - *config_numberic_comparision
-  - - LOOP 2 6 "[1,0]"
+  - - LOOP 2 7 "[1,0]"
     - ""
   - *start_pair
   - - "SSC SSC1 blesmp -R -a 1 -r <dut2_bt_mac>"
@@ -2028,7 +2028,112 @@ test cases:
     - ['P SSC2 C +BLE:GattsDisconnect', 'P SSC1 C +BLE:GattcDisconnect,OK']
 - ID: BTSTK_SMP_07001
   <<: *SMP_CASE
-  test point 2: BLE SMP no bond test and reconnect
+  test point 2: BLE SMP no bond test and repairing
+  summary: BLE SMP just work pairing and reconnect
+  steps: |
+    1. DUT1 and DUT2 SMP with just work pair
+    2. DUT1 disconnect
+    3. DUT1 connect to DUT2
+    4. DUT2 send auth request
+  expected result: |
+    1. succeed
+    2. succeed
+    3. succeed
+    4. succeed
+  cmd set:
+  - ""
+  - *config_just_work
+  - - "SSC SSC1 bleconn -C -p 0x10 -a <dut2_bt_mac>"
+    - ['P SSC1 C +BLE:GattcConnect,OK', 'P SSC2 C +BLE:GattsConnect']
+  - - "SSC SSC1 blesmp -E -r <dut2_bt_mac> -z Enc"
+    - ['P SSC2 C +BLESMP:SecReq']
+  - - "SSC SSC2 blesmp -R -a 1 -r <dut1_bt_mac>"
+    - ['P SSC[1-2] C +BLESMP:AuthComplete,Success,0']
+  - *disconnect
+  - - "SSC SSC1 bleconn -C -p 0x10 -a <dut2_bt_mac>"
+    - ['P SSC1 C +BLE:GattcConnect,OK', 'P SSC2 C +BLE:GattsConnect']
+  - - "SSC SSC2 blesmp -E -r <dut1_bt_mac> -z Enc"
+    - ["P SSC1 C +BLESMP:SecReq"]
+  - - "SSC SSC1 blesmp -R -a 1 -r <dut2_bt_mac>"
+    - ['P SSC[1-2] C +BLESMP:AuthComplete,Success']
+- ID: BTSTK_SMP_07002
+  <<: *SMP_CASE
+  test point 2: BLE SMP no bond test and repairing
+  summary: BLE SMP just work pairing and reboot
+  steps: |
+    1. DUT1 and DUT2 SMP with just work pair
+    2. DUT1 reboot
+    3. DUT1 connect to DUT2
+    4. DUT2 send auth request
+  expected result: |
+    1. succeed
+    2. succeed
+    3. succeed
+    4. failed
+  cmd set:
+  - ""
+  - *config_just_work
+  - - "SSC SSC1 bleconn -C -p 0x10 -a <dut2_bt_mac>"
+    - ['P SSC1 C +BLE:GattcConnect,OK', 'P SSC2 C +BLE:GattsConnect']
+  - - "SSC SSC1 blesmp -E -r <dut2_bt_mac> -z Enc"
+    - ['P SSC2 C +BLESMP:SecReq']
+  - - "SSC SSC2 blesmp -R -a 1 -r <dut1_bt_mac>"
+    - ['P SSC[1-2] C +BLESMP:AuthComplete,Success,0']
+  - - "SSC SSC1 reboot"
+    - ['P SSC2 C +BLE:GattsDisconnect']
+  - - "SSC SSC1 ble -R"
+    - ['R SSC1 C +BLE:']
+  - - "SSC SSC2 bleadv -D -z start"
+    - ['R SSC2 C +BLEADV:OK']
+  - *slave_passkey_entry_pair
+- ID: BTSTK_SMP_07003
+  <<: *SMP_CASE
+  test point 2: BLE SMP no bond test and repairing
+  summary: BLE SMP slave passkey enter and reconnect
+  steps: |
+    1. DUT1 and DUT2 SMP with slave passkey enter
+    2. DUT1 reconnect
+    3. DUT1 connect to DUT2
+    4. DUT2 send auth request
+  expected result: |
+    1. succeed
+    2. succeed
+    3. succeed
+    4. succeed
+  cmd set:
+  - ""
+  - *config_slave_passkey_entry
+  - *slave_passkey_entry_pair
+  - *disconnect
+  - *slave_passkey_entry_pair
+- ID: BTSTK_SMP_07004
+  <<: *SMP_CASE
+  test point 2: BLE SMP no bond test and repairing
+  summary: BLE SMP slave passkey enter and reboot
+  steps: |
+    1. DUT1 and DUT2 SMP with slave passkey enter
+    2. DUT1 reboot
+    3. DUT1 connect to DUT2
+    4. DUT2 send auth request
+  expected result: |
+    1. succeed
+    2. succeed
+    3. succeed
+    4. failed
+  cmd set:
+  - ""
+  - *config_slave_passkey_entry
+  - *slave_passkey_entry_pair
+  - - "SSC SSC1 reboot"
+    - ['P SSC2 C +BLE:GattsDisconnect']
+  - - "SSC SSC1 ble -R"
+    - ['R SSC1 C +BLE:']
+  - - "SSC SSC2 bleadv -D -z start"
+    - ['R SSC2 C +BLEADV:OK']
+    - *slave_passkey_entry_pair
+- ID: BTSTK_SMP_07005
+  <<: *SMP_CASE
+  test point 2: BLE SMP no bond test and repairing
   summary: BLE SMP initiator with master passkey entry and reconnect
   steps: |
     1. DUT1 and DUT2 SMP with master passkey entry
@@ -2043,22 +2148,15 @@ test cases:
   cmd set:
   - ""
   - *config_master_passkey_entry
-  - - "SSC SSC1 bleconn -C -p 0x10 -a <dut2_bt_mac>"
-    - ['P SSC1 C +BLE:GattcConnect,OK', 'P SSC2 C +BLE:GattsConnect']
-  - - "SSC SSC1 blesmp -E -r <dut2_bt_mac> -z Enc"
-    - ['P SSC2 C +BLESMP:SecReq']
-  - - "SSC SSC2 blesmp -R -a 1 -r <dut1_bt_mac>"
-    - ['P SSC1 C +BLESMP:PassKeyReq', 'P SSC2 A <key>:BLESMP:PassKeyNotify,(\d+)']
-  - - "SSC SSC1 blesmp -K -r <dut2_bt_mac> -a 1 -k <key>"
-    - ['P SSC[1-2] C +BLESMP:AuthComplete,Success,0']
+  - *master_passkey_entry_pair
   - *disconnect
   - - "SSC SSC1 bleconn -C -p 0x10 -a <dut2_bt_mac>"
     - ['P SSC1 C +BLE:GattcConnect,OK', 'P SSC2 C +BLE:GattsConnect']
   - - "SSC SSC2 blesmp -E -r <dut1_bt_mac> -z Enc"
-    - ['P SSC[1-2] C +BLESMP:AuthComplete,Success']
-- ID: BTSTK_SMP_07002
+    - ['P SSC[1-2] C +BLESMP:AuthComplete,Success,0']
+- ID: BTSTK_SMP_07006
   <<: *SMP_CASE
-  test point 2: BLE SMP no bond test and reboot
+  test point 2: BLE SMP no bond test and repairing
   summary: BLE SMP initiator with master passkey entry and reboot
   steps: |
     1. DUT1 and DUT2 SMP bond with lagecy pairing
@@ -2073,35 +2171,17 @@ test cases:
   cmd set:
   - ""
   - *config_master_passkey_entry
-  - - "SSC SSC1 bleconn -C -p 0x10 -a <dut2_bt_mac>"
-    - ['P SSC1 C +BLE:GattcConnect,OK', 'P SSC2 C +BLE:GattsConnect']
-  - - "SSC SSC1 blesmp -E -r <dut2_bt_mac> -z Enc"
-    - ['P SSC2 C +BLESMP:SecReq']
-  - - "SSC SSC2 blesmp -R -a 1 -r <dut1_bt_mac>"
-    - ['P SSC1 C +BLESMP:PassKeyReq', 'P SSC2 A <key>:BLESMP:PassKeyNotify,(\d+)']
-  - - "SSC SSC1 blesmp -K -r <dut2_bt_mac> -a 1 -k <key>"
-    - ['P SSC[1-2] C +BLESMP:AuthComplete,Success,0']
-  - - "SSC SSC[1-2] reboot"
-    - ['P SSC[1-2] C !!!ready!!!']
-  - - "SSC SSC[1-2] ble -R"
-    - ['R SSC[1-2] C +BLE:']
-  - - "SSC SSC2 gatts -S -z load -p 0xA0"
-    - ['R SSC2 C +GATTS:StartService,OK,A000']
-  - - "SSC SSC2 bleadv -L -c 0 -t 3"
-    - ['R SSC2 C +BLEADV:SetAdv,OK']
+  - *master_passkey_entry_pair
+  - - "SSC SSC1 reboot"
+    - ['P SSC2 C +BLE:GattsDisconnect']
+  - - "SSC SSC1 ble -R"
+    - ['R SSC1 C +BLE:']
   - - "SSC SSC2 bleadv -D -z start"
     - ['R SSC2 C +BLEADV:OK']
-  - - "SSC SSC[1-2] blesmp -L -c [1,0]"
-    - ['R SSC[1-2] C +BLESMP:OK']
-  - - "SSC SSC1 bleconn -C -p 0x10 -a <dut2_bt_mac>"
-    - ['P SSC1 C +BLE:GattcConnect,OK', 'P SSC2 C +BLE:GattsConnect']
-  - - "SSC SSC2 blesmp -E -r <dut1_bt_mac> -z Enc"
-    - ['P SSC2 C +BLESMP:OK']
-  - - DELAY 10
-    - ['P SSC[1-2] C +BLESMP:AuthComplete,Fail']
-- ID: BTSTK_SMP_07003
+  - *numberic_comparision_pair
+- ID: BTSTK_SMP_07007
   <<: *SMP_CASE
-  test point 2: BLE SMP no bond test and reconnect
+  test point 2: BLE SMP no bond test and repairing
   summary: BLE SMP initiator numberic comparision and reconnect
   steps: |
     1. DUT1 and DUT2 SMP with numberic comparision
@@ -2116,23 +2196,16 @@ test cases:
   cmd set:
   - ""
   - *config_numberic_comparision
-  - - "SSC SSC1 bleconn -C -p 0x10 -a <dut2_bt_mac>"
-    - ['P SSC1 C +BLE:GattcConnect,OK', 'P SSC2 C +BLE:GattsConnect']
-  - - "SSC SSC1 blesmp -E -r <dut2_bt_mac> -z Enc"
-    - ['P SSC2 C +BLESMP:SecReq']
-  - - "SSC SSC2 blesmp -R -a 1 -r <dut1_bt_mac>"
-    - ['R SSC2 A <key>:BLESMP:NCReq,(\d+)', 'R SSC1 C NCReq P <key>']
-  - - "SSC SSC[1-2] blesmp -C -r <dut[2,1]_bt_mac> -a 1"
-    - ['P SSC[1-2] C +BLESMP:AuthComplete,Success,0']
+  - *numberic_comparision_pair
   - *disconnect
   - - "SSC SSC1 bleconn -C -p 0x10 -a <dut2_bt_mac>"
     - ['P SSC1 C +BLE:GattcConnect,OK', 'P SSC2 C +BLE:GattsConnect']
   - - "SSC SSC2 blesmp -E -r <dut1_bt_mac> -z Enc"
-    - ['P SSC[1-2] C +BLESMP:AuthComplete,Success']
-- ID: BTSTK_SMP_07004
+    - ['P SSC[1-2] C +BLESMP:AuthComplete,Success,0']
+- ID: BTSTK_SMP_07008
   <<: *SMP_CASE
-  test point 2: BLE SMP no bond test and reconnect
-  summary: BLE SMP initiator numberic comparision and reconnect
+  test point 2: BLE SMP no bond test and repairing
+  summary: BLE SMP initiator numberic comparision and reboot
   steps: |
     1. DUT1 and DUT2 SMP with numberic comparision
     2. DUT1 disconnect
@@ -2146,32 +2219,14 @@ test cases:
   cmd set:
   - ""
   - *config_numberic_comparision
-  - - "SSC SSC1 bleconn -C -p 0x10 -a <dut2_bt_mac>"
-    - ['P SSC1 C +BLE:GattcConnect,OK', 'P SSC2 C +BLE:GattsConnect']
-  - - "SSC SSC1 blesmp -E -r <dut2_bt_mac> -z Enc"
-    - ['P SSC2 C +BLESMP:SecReq']
-  - - "SSC SSC2 blesmp -R -a 1 -r <dut1_bt_mac>"
-    - ['R SSC2 A <key>:BLESMP:NCReq,(\d+)', 'R SSC1 C NCReq P <key>']
-  - - "SSC SSC[1-2] blesmp -C -r <dut[2,1]_bt_mac> -a 1"
-    - ['P SSC[1-2] C +BLESMP:AuthComplete,Success,0']
-  - - "SSC SSC[1-2] reboot"
-    - ['P SSC[1-2] C !!!ready!!!']
-  - - "SSC SSC[1-2] ble -R"
-    - ['R SSC[1-2] C +BLE:']
-  - - "SSC SSC2 gatts -S -z load -p 0xA0"
-    - ['R SSC2 C +GATTS:StartService,OK,A000']
-  - - "SSC SSC2 bleadv -L -c 0 -t 3"
-    - ['R SSC2 C +BLEADV:SetAdv,OK']
+  - *numberic_comparision_pair
+  - - "SSC SSC1 reboot"
+    - ['P SSC2 C +BLE:GattsDisconnect']
+  - - "SSC SSC1 ble -R"
+    - ['R SSC1 C +BLE:']
   - - "SSC SSC2 bleadv -D -z start"
     - ['R SSC2 C +BLEADV:OK']
-  - - "SSC SSC[1-2] blesmp -L -c [1,0]"
-    - ['R SSC[1-2] C +BLESMP:OK']
-  - - "SSC SSC1 bleconn -C -p 0x10 -a <dut2_bt_mac>"
-    - ['P SSC1 C +BLE:GattcConnect,OK', 'P SSC2 C +BLE:GattsConnect']
-  - - "SSC SSC2 blesmp -E -r <dut1_bt_mac> -z Enc"
-    - ['P SSC2 C +BLESMP:OK']
-  - - DELAY 10
-    - ['P SSC[1-2] C +BLESMP:AuthComplete,Fail']
+  - *numberic_comparision_pair
 - ID: BTSTK_SMP_08001
   <<: *SMP_CASE
   test point 2: BLE SMP bond item management test
@@ -2611,3 +2666,25 @@ test cases:
     - ""
   - - "fail_timeout = 10"
     - ""
+- ID: BTSTK_SMP_52001
+  <<: *SMP_CASE
+  category: Performance
+  test point 1: performance + stress
+  test point 2: BLE SMP performance test for bond
+  summary: BLE SMP bond, remove, get bondlist, rebond
+  steps: |
+    1. DUT1 bond 15 devices and get bond list
+    2. DUT1 bond 16th device and get bond list
+    3. rebond removed bond device and get bond list
+    4. remove all bond and get bond list
+    5. loop step 1 to step 4
+  expected result: |
+    1. succeed
+    2. succeed
+    3. succeed
+    4. succeed
+  execution time: 2
+  cmd set:
+  - "BLEStress/BLESMPBondPerformance"
+  - - test_time = 120
+    - ""
diff --git a/components/idf_test/integration_test/TC_IT_MESH_COMM.yml b/components/idf_test/integration_test/TC_IT_MESH_COMM.yml
index b7b64b0e1..ac5073516 100644
--- a/components/idf_test/integration_test/TC_IT_MESH_COMM.yml
+++ b/components/idf_test/integration_test/TC_IT_MESH_COMM.yml
@@ -629,6 +629,7 @@ test cases:
   test environment: SSC_T3_MESH1
   test point 1: basic function
   test point 2: ucast meshsend test
+  active: "No"
 - ID: MESH_COMM_0132
   <<: *MESH_COMM_CASE
   cmd set:
@@ -646,6 +647,7 @@ test cases:
   test environment: SSC_T12_MESH1
   test point 1: basic function
   test point 2: ucast meshsend test
+  active: "No"
 - ID: MESH_COMM_0133
   <<: *MESH_COMM_CASE
   cmd set:
@@ -663,6 +665,7 @@ test cases:
   test environment: SSC_T12_MESH1
   test point 1: basic function
   test point 2: ucast meshsend test
+  active: "No"
 - ID: MESH_COMM_0134
   <<: *MESH_COMM_CASE
   cmd set:
@@ -2770,6 +2773,7 @@ test cases:
   test point 2: ucast/mcast/bcast throughput and packetloss
 - ID: MESH_COMM_6101
   <<: *MESH_COMM_CASE
+  category: Performance
   cmd set:
   - MeshStress/MeshSendRecv
   - - test_time = 1
@@ -2798,6 +2802,7 @@ test cases:
   test point 2: ucast/mcast/bcast delaytime and packetloss
 - ID: MESH_COMM_6102
   <<: *MESH_COMM_CASE
+  category: Performance
   cmd set:
   - MeshStress/MeshSendRecv
   - - test_time = 1
@@ -2826,6 +2831,7 @@ test cases:
   test point 2: ucast/mcast/bcast delaytime and packetloss
 - ID: MESH_COMM_6103
   <<: *MESH_COMM_CASE
+  category: Performance
   cmd set:
   - MeshStress/MeshSendRecv
   - - test_time = 1
@@ -2852,3 +2858,18 @@ test cases:
   test environment: SSC_T50_MESH1
   test point 1: meshsend performance
   test point 2: ucast/mcast/bcast delaytime and packetloss
+- ID: MESH_COMM_6201
+  <<: *MESH_COMM_CASE
+  category: Performance
+  cmd set:
+  - MeshStress/MeshPing
+  execution time: 1
+  expected result:
+    1. succeed
+  steps:
+    1. calculate throughput and packet loss rate
+  summary: ping test, calculate round trip time on different leavels
+  CI ready: 'NO'
+  test environment: SSC_T50_MESH1
+  test point 1: meshsend performance
+  test point 2: ucast ping time
diff --git a/components/idf_test/integration_test/TC_IT_MESH_EST.yml b/components/idf_test/integration_test/TC_IT_MESH_EST.yml
index 0c2f011c5..5422ea7de 100644
--- a/components/idf_test/integration_test/TC_IT_MESH_EST.yml
+++ b/components/idf_test/integration_test/TC_IT_MESH_EST.yml
@@ -525,6 +525,7 @@ test cases:
   test point 2: mesh configuration test
   CI ready: 'No'
   auto test: 'No'
+  active: "No"
 - ID: MESH_EST_0115
   <<: *MESH_CASE
   cmd set:
@@ -932,6 +933,7 @@ test cases:
   test point 2: network establish test
   CI ready: 'No'
   auto test: 'No'
+  active: "No"
 - ID: MESH_EST_0213
   <<: *MESH_CASE
   cmd set:
@@ -1761,6 +1763,7 @@ test cases:
   test point 2: chain topology test
   CI ready: 'No'
   auto test: 'No'
+  active: "No"
 - ID: MESH_EST_0505 #TODO: support layer>127
   <<: *MESH_CASE
   cmd set:
@@ -2688,35 +2691,6 @@ test cases:
   test point 2: mesh init/config/start test
   CI ready: 'Yes'
   #TODO: if start twice will connected successfully
-- ID: MESH_EST_3003
-  <<: *MESH_CASE
-  cmd set:
-  - ''
-  - - SSC SSC1 mesh -I
-    - - P SSC1 C +MESH:INIT,OK
-  - - SSC SSC1 meshset -G -o 0 -m <mesh_id> -s <router_ssid> -p <router_password> -n
-      <wrong_channel> -b <router_bssid> -t <max_connect> -e <map_password> -i <ie_encrypt>
-    - - P SSC1 C +MESHSET:CFG,OK
-  - - SSC SSC1 mesh -T
-    - - P SSC1 C +MESH:START,OK
-  - - DELAY 10
-    - - P SSC1 C MESH_EVENT_NO_PARENT_FOUND
-  expected result: |-
-    1. succeed
-    2. succeed
-    3. succeed
-    4. succeed
-  steps: |-
-    1. mesh init
-    2. mesh config with wrong channel
-    3. mesh start
-    4. check parent not found
-  test environment: SSC_T1_MESH1
-  summary: mesh start with wrong router channel
-  test point 1: abnormal/special use
-  test point 2: mesh init/config/start test
-  CI ready: 'No'
-  #TODO: not work after v3.3
 - ID: MESH_EST_3004
   <<: *MESH_CASE
   cmd set:
@@ -2781,6 +2755,7 @@ test cases:
   test point 2: mesh init/config/start test
   CI ready: 'No'
   auto test: 'No'
+  active: "No"
 - ID: MESH_EST_3006
   <<: *MESH_CASE
   cmd set:
@@ -2814,6 +2789,7 @@ test cases:
   test point 2: mesh init/config/start test
   CI ready: 'No'
   auto test: 'No'
+  active: "No"
 - ID: MESH_EST_3007
   <<: *MESH_CASE
   cmd set:
@@ -2841,6 +2817,35 @@ test cases:
   test point 1: abnormal/special use
   test point 2: mesh init/config/start test
   CI ready: 'Yes'
+- ID: MESH_EST_3008
+  <<: *MESH_CASE
+  cmd set:
+  - ''
+  - - SSC SSC1 mesh -I
+    - - P SSC1 C +MESH:INIT,OK
+  - - SSC SSC1 meshset -G -o 0 -m <mesh_id> -s <router_ssid> -p <router_password> -n
+      <wrong_channel> -b <router_bssid> -t <max_connect> -e <map_password> -i <ie_encrypt>
+    - - P SSC1 C +MESHSET:CFG,OK
+  - - SSC SSC1 mesh -T
+    - - P SSC1 C +MESH:START,OK
+  - - DELAY 10
+    - - P SSC1 C MESH_EVENT_NO_PARENT_FOUND
+  expected result: |-
+    1. succeed
+    2. succeed
+    3. succeed
+    4. succeed
+  steps: |-
+    1. mesh init
+    2. mesh config with wrong channel
+    3. mesh start
+    4. check parent not found
+  test environment: SSC_T1_MESH1
+  summary: mesh start with wrong router channel
+  test point 1: abnormal/special use
+  test point 2: mesh init/config/start test
+  CI ready: 'No'
+  #TODO: not work after v3.3
 - ID: MESH_EST_3101
   <<: *MESH_CASE
   cmd set:
@@ -2865,6 +2870,7 @@ test cases:
   test point 2: use wifi api after mesh start
   CI ready: 'No'
   auto test: 'No'
+  active: "No"
 - ID: MESH_EST_3102
   <<: *MESH_CASE
   cmd set:
@@ -2887,6 +2893,7 @@ test cases:
   test point 2: use wifi api after mesh start
   CI ready: 'No'
   auto test: 'No'
+  active: "No"
 - ID: MESH_EST_3103
   <<: *MESH_CASE
   cmd set:
@@ -2918,6 +2925,7 @@ test cases:
   test point 2: use wifi api after mesh start
   CI ready: 'No'
   auto test: 'No'
+  active: "No"
 - ID: MESH_EST_3104
   <<: *MESH_CASE
   cmd set:
@@ -4508,23 +4516,6 @@ test cases:
   test point 1: stress
   test point 2: mesh network establish
   test environment: SSC_T50_MESH1
-- ID: MESH_EST_5002
-  <<: *MESH_CASE
-  category: Stress
-  cmd set:
-  - MeshStress/MeshEstablishTime
-  - *est_performance_cmd_set
-  - - 'allow_roots = False'
-    - ['']
-  execution time: 2.0
-  expected result: |-
-    1. check the time spent
-  steps: |-
-    1. enable all nodes establish
-  summary: stress test, start all nodes with allow_roots false
-  test point 1: stress
-  test point 2: mesh network establish
-  test environment: SSC_T50_MESH1
 - ID: MESH_EST_5003
   <<: *MESH_CASE
   category: Stress
@@ -4563,6 +4554,23 @@ test cases:
   test point 1: stress
   test point 2: mesh network establish
   test environment: SSC_T50_MESH1
+- ID: MESH_EST_5005
+  <<: *MESH_CASE
+  category: Stress
+  cmd set:
+  - MeshStress/MeshEstablishTime
+  - *est_performance_cmd_set
+  - - 'allow_roots = False'
+    - ['']
+  execution time: 2.0
+  expected result: |-
+    1. check the time spent
+  steps: |-
+    1. enable all nodes establish
+  summary: stress test, start all nodes with allow_roots false
+  test point 1: stress
+  test point 2: mesh network establish
+  test environment: SSC_T50_MESH1
 - ID: MESH_EST_5101
   <<: *MESH_CASE
   category: Stress
@@ -4635,26 +4643,6 @@ test cases:
   test point 1: stress
   test point 2: mesh network re-establish
   test environment: SSC_T50_MESH1
-- ID: MESH_EST_5103
-  <<: *MESH_CASE
-  category: Stress
-  cmd set:
-  - MeshStress/MeshEstablishTime
-  - *est_performance_cmd_set
-  - - 'destroy_nodes = "RANDOM(10)"'
-    - ['']
-  execution time: 2.0
-  expected result: |-
-    1. check the time spent
-    1. check the time spent
-  initial condition: MESH_DEINIT_STA
-  steps: |-
-    1. enable all nodes establish network
-    2. destroy random 10 nodes after network established
-  summary: stress test, destroy random 10 nodes after network established
-  test point 1: stress
-  test point 2: mesh network re-establish
-  test environment: SSC_T50_MESH1
 - ID: MESH_EST_5104
   <<: *MESH_CASE
   category: Stress
@@ -4720,3 +4708,23 @@ test cases:
   test point 1: stress
   test point 2: channel switch test
   test environment: SSC_T50_MESH1
+- ID: MESH_EST_5107
+  <<: *MESH_CASE
+  category: Stress
+  cmd set:
+  - MeshStress/MeshEstablishTime
+  - *est_performance_cmd_set
+  - - 'destroy_nodes = "RANDOM(10)"'
+    - ['']
+  execution time: 2.0
+  expected result: |-
+    1. check the time spent
+    1. check the time spent
+  initial condition: MESH_DEINIT_STA
+  steps: |-
+    1. enable all nodes establish network
+    2. destroy random 10 nodes after network established
+  summary: stress test, destroy random 10 nodes after network established
+  test point 1: stress
+  test point 2: mesh network re-establish
+  test environment: SSC_T50_MESH1
diff --git a/components/idf_test/integration_test/TC_IT_SYS_MISC.yml b/components/idf_test/integration_test/TC_IT_SYS_MISC.yml
index c0436a821..fe5437691 100644
--- a/components/idf_test/integration_test/TC_IT_SYS_MISC.yml
+++ b/components/idf_test/integration_test/TC_IT_SYS_MISC.yml
@@ -14,11 +14,13 @@ test cases:
   - - SSC SSC1 reboot
     - - R SSC1 C !!!ready!!!
   execution time: 0.0
-  expected result: 重启成功
+  expected result: |
+    1. reboot succeeded
   initial condition: None
   level: Integration
   module: System
-  steps: 系统重启
+  steps: |
+    1. sw reboot
   sub module: Misc
   summary: test reboot function
   test environment: SSC_T1_4
@@ -40,13 +42,13 @@ test cases:
   - - SSC SSC1 ram -H
     - - R SSC1 RE FREEHEAP:\d+\r\n
   execution time: 0.0
-  expected result: |2
-
-    可以查询到一个数值
+  expected result: |
+    1. get free heap size
   initial condition: None
   level: Integration
   module: System
-  steps: 查询空闲ram
+  steps: |
+    1. query current free heap size
   sub module: Misc
   summary: get heap size test
   test environment: SSC_T1_4
diff --git a/components/idf_test/integration_test/TC_IT_SYS_NVS.yml b/components/idf_test/integration_test/TC_IT_SYS_NVS.yml
index fd7db6d73..65718a13c 100644
--- a/components/idf_test/integration_test/TC_IT_SYS_NVS.yml
+++ b/components/idf_test/integration_test/TC_IT_SYS_NVS.yml
@@ -26,32 +26,7 @@ test cases:
     4. check if SoftAP config is correct
   sub module: NVS
   summary: use old NVS data WIFI function test
-  test environment: SSC_T1_1
+  test environment: SSC_T1_5
   test point 1: compatiable test
   test point 2: test if latest SDK work with pervious version of NVS data
   version: v1 (2017-06-01)
-- CI ready: 'No'
-  ID: SYS_NVS_5001
-  SDK: |-
-    8266_NonOS
-    8266_RTOS
-    ESP32_IDF
-  Test App: Reboot
-  auto test: 'Yes'
-  category: Stress
-  cmd set: ''
-  execution time: 12.0
-  expected result: 3.无异常发生
-  initial condition: None
-  level: Integration
-  module: System
-  steps: |-
-    1.target1、target2通过UART与PC相连接
-    2.target2的GPIO PIN脚通过排线与target1的电源相连接，target1与target2 GND通过排线连接
-    3.PC发送命令控制target2使GPIO不停的拉高拉低
-  sub module: NVS
-  summary: random reboot when access NVS
-  test environment: NVS_T1_1
-  test point 1: stress
-  test point 2: reboot when accessing NVS
-  version: v1 (2016-8-15)
diff --git a/components/idf_test/integration_test/TC_IT_TCPIP_DNS.yml b/components/idf_test/integration_test/TC_IT_TCPIP_DNS.yml
index f393c771d..b058cde4c 100644
--- a/components/idf_test/integration_test/TC_IT_TCPIP_DNS.yml
+++ b/components/idf_test/integration_test/TC_IT_TCPIP_DNS.yml
@@ -441,7 +441,7 @@ test cases:
     7.check SSC2 main dns server
   sub module: DNS
   summary: DNS softap DNS test
-  test environment: SSC_T2_1
+  test environment: SSC_T2_5
   test point 1: stress + function
   test point 2: DNS stress test
   version: v2 (2016-10-23)
diff --git a/components/idf_test/integration_test/TC_IT_TCPIP_ICMP.yml b/components/idf_test/integration_test/TC_IT_TCPIP_ICMP.yml
index fd84f57ea..f9ff5b99d 100644
--- a/components/idf_test/integration_test/TC_IT_TCPIP_ICMP.yml
+++ b/components/idf_test/integration_test/TC_IT_TCPIP_ICMP.yml
@@ -62,7 +62,7 @@ test cases:
     2. PC check if received ping reply
   sub module: ICMP
   summary: ping target and check for ping reply
-  test environment: SSC_T1_1
+  test environment: SSC_T1_6
   test point 1: stress
   test point 2: ICMP ping stress test
   version: v1 (2016-11-15)
diff --git a/components/idf_test/integration_test/TC_IT_TCPIP_IGMP.yml b/components/idf_test/integration_test/TC_IT_TCPIP_IGMP.yml
index 92eea199b..c0488d9d7 100644
--- a/components/idf_test/integration_test/TC_IT_TCPIP_IGMP.yml
+++ b/components/idf_test/integration_test/TC_IT_TCPIP_IGMP.yml
@@ -3,8 +3,6 @@ test cases:
   ID: TCPIP_IGMP_0101
   SDK: |-
     8266_NonOS
-    8266_RTOS
-    ESP32_IDF
   Test App: SSC
   allow fail: ''
   auto test: 'Yes'
@@ -26,17 +24,21 @@ test cases:
   execution time: 0.0
   expected result: |-
     1. success
-    2. failed
+    2. success
     3. failed
     4. failed
+    5. failed
+    6. failed
   initial condition: STAM2
   level: Integration
   module: TCPIP
   steps: |-
     1. join group with correct host addr and multicast addr
-    2. join group with correct host addr and wrong multicast addr
-    3. join group with wrong host addr and correct multicast addr
-    4. join group with wrong host addr and wrong multicast addr
+    2. leave group with correct host addr and multicast addr
+    3. join group with correct host addr and wrong multicast addr
+    4. join group with correct host addr and wrong multicast addr
+    5. join group with wrong host addr and correct multicast addr
+    6. join group with wrong host addr and wrong multicast addr
   sub module: IGMP
   summary: station IGMP join group address check
   test environment: SSC_T1_5
@@ -47,8 +49,6 @@ test cases:
   ID: TCPIP_IGMP_0102
   SDK: |-
     8266_NonOS
-    8266_RTOS
-    ESP32_IDF
   Test App: SSC
   allow fail: ''
   auto test: 'Yes'
@@ -91,8 +91,6 @@ test cases:
   ID: TCPIP_IGMP_0103
   SDK: |-
     8266_NonOS
-    8266_RTOS
-    ESP32_IDF
   Test App: SSC
   allow fail: ''
   auto test: 'Yes'
@@ -114,20 +112,24 @@ test cases:
   execution time: 0.0
   expected result: |-
     1. success
-    2. failed
+    2. success
     3. failed
     4. failed
+    5. failed
+    6. failed
   initial condition: APM2
   level: Integration
   module: TCPIP
   steps: |-
     1. join group with correct host addr and multicast addr
-    2. join group with correct host addr and wrong multicast addr
-    3. join group with wrong host addr and correct multicast addr
-    4. join group with wrong host addr and wrong multicast addr
+    2. leave group with correct host addr and multicast addr
+    3. join group with correct host addr and wrong multicast addr
+    4. join group with correct host addr and wrong multicast addr
+    5. join group with wrong host addr and correct multicast addr
+    6. join group with wrong host addr and wrong multicast addr
   sub module: IGMP
   summary: softAP IGMP join group address check
-  test environment: SSC_T1_8
+  test environment: SSC_T1_7
   test point 1: basic function
   test point 2: IGMP API parameter check
   version: v1 (2016-8-15)
@@ -135,8 +137,6 @@ test cases:
   ID: TCPIP_IGMP_0104
   SDK: |-
     8266_NonOS
-    8266_RTOS
-    ESP32_IDF
   Test App: SSC
   allow fail: ''
   auto test: 'Yes'
@@ -179,7 +179,6 @@ test cases:
   ID: TCPIP_IGMP_0201
   SDK: |-
     8266_NonOS
-    8266_RTOS
   Test App: SSC
   allow fail: ''
   auto test: 'Yes'
@@ -200,14 +199,18 @@ test cases:
   expected result: |-
     1. succeed
     2. succeed
-    3. able to recv packet
+    3. succeed
+    4. able to recv packet
+    5. succeed
   initial condition: STAM2
   level: Integration
   module: TCPIP
   steps: |-
     1. join group
     2. create UDP socket using multicast addr
-    3. PC send UDP packet to multicast addr
+    3. PC bind UDP
+    4. PC send UDP packet to multicast addr
+    5. leave group
   sub module: IGMP
   summary: station IGMP recv packets
   test environment: SSC_T1_6
@@ -218,7 +221,6 @@ test cases:
   ID: TCPIP_IGMP_0202
   SDK: |-
     8266_NonOS
-    8266_RTOS
   Test App: SSC
   allow fail: ''
   auto test: 'Yes'
@@ -227,8 +229,12 @@ test cases:
   - ''
   - - SSC SSC2 op -S -o 1
     - - R SSC2 C +MODE:OK
+  - - SSC SSC2 dhcp -S -o 1
+    - - R SSC2 C +DHCP
   - - SSC SSC2 sta -C -s <ap_ssid> -p <ap_password>
     - - R SSC2 C +JAP:CONNECTED
+  - - SSC SSC2 soc -T
+    - - R SSC2 C +CLOSEALL
   - - SSC SSC1 igmp -J -h <target_ip> -m 224.1.1.1
     - - R SSC1 C +IGMP:OK
   - - SSC SSC1 soc -B -t UDP -i 224.1.1.1 -p <test_udp_port1>
@@ -241,21 +247,29 @@ test cases:
     - - R SSC1 C +IGMP:OK
   execution time: 0.0
   expected result: |-
-    1. succeed
-    2. succeed
-    3. succeed
-    4. target1 recv multicast packet
+    1. OK
+    2. join AP
+    3. DUT2 close socket
+    4. OK
+    5. OK
+    6. OK
+    7. DUT1 recv multicast packet
+    8. OK
   initial condition: STAM2
   level: Integration
   module: TCPIP
   steps: |-
-    1. target2 set to sta mode and join AP
-    2. target1 join group and create UDP socket using multicast addr
-    3. target2 create UDP socket
-    4. target2 send to multicast addr
+    1. DUT2 set to sta mode
+    2. DUT2 enable DHCP and join AP
+    3. DUT2 close socket
+    4. DUT1 join group
+    5. DUT1 create UDP socket using multicast addr
+    6. DUT2 create UDP socket
+    7. DUT2 send to multicast addr
+    8. DUT1 leave group
   sub module: IGMP
   summary: station send multicast packets
-  test environment: SSC_T2_4
+  test environment: SSC_T2_3
   test point 1: basic function
   test point 2: IGMP send/recv test
   version: v1 (2016-8-15)
@@ -263,7 +277,6 @@ test cases:
   ID: TCPIP_IGMP_0203
   SDK: |-
     8266_NonOS
-    8266_RTOS
   Test App: SSC
   allow fail: ''
   auto test: 'Yes'
@@ -284,17 +297,21 @@ test cases:
   expected result: |-
     1. succeed
     2. succeed
-    3. able to recv packet
+    3. succeed
+    4. able to recv packet
+    5. OK
   initial condition: APM2
   level: Integration
   module: TCPIP
   steps: |-
     1. join group
     2. create UDP socket using multicast addr
-    3. PC send UDP packet to multicast addr
+    3. PC bind UDP
+    4. PC send UDP packet to multicast addr
+    5. leave group
   sub module: IGMP
   summary: softAP IGMP recv packets
-  test environment: SSC_T1_8
+  test environment: SSC_T1_7
   test point 1: basic function
   test point 2: IGMP send/recv test
   version: v1 (2016-8-15)
@@ -302,13 +319,14 @@ test cases:
   ID: TCPIP_IGMP_0204
   SDK: |-
     8266_NonOS
-    8266_RTOS
   Test App: SSC
   allow fail: ''
   auto test: 'Yes'
   category: Function
   cmd set:
   - ''
+  - - SSC SSC1 ap -S -s <target_ssid> -p <target_password> -t <target_auth_enum>
+    - - R SSC1 C +SAP:OK
   - - SSC SSC2 sta -C -s <target_ssid> -p <target_password>
     - - R SSC2 C +JAP:CONNECTED
   - - SSC SSC1 igmp -J -h <target_ap_ip> -m 224.1.1.1
@@ -324,26 +342,34 @@ test cases:
   execution time: 0.0
   expected result: |-
     1. succeed
-    2. succeed
+    2. join softap
     3. succeed
-    4. target1 recv multicast packet
+    4. succeed
+    5. succeed
+    6. DUT1 recv multicast packet
+    7. succeed
   initial condition: T2_1
   level: Integration
   module: TCPIP
   steps: |-
-    1. target2 join SoftAP
-    2. target1 join group and create UDP socket using multicast addr
-    3. target2 create UDP socket
-    4. target2 send to multicast addr
+    1. DUT1 set softap mode
+    2. DUT2 join SoftAP
+    3. DUT1 join group
+    4. DUT1 create UDP socket using multicast addr
+    5. DUT2 create UDP socket
+    6. DUT2 send to multicast addr
+    7. DUT1 leave group
   sub module: IGMP
   summary: softAP send multicast packets
-  test environment: SSC_T2_4
+  test environment: SSC_T2_5
   test point 1: basic function
   test point 2: IGMP send/recv test
   version: v1 (2016-8-15)
 - CI ready: 'Yes'
   ID: TCPIP_IGMP_0101
-  SDK: 'ESP32_IDF'
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
   Test App: SSC
   allow fail: ''
   auto test: 'Yes'
@@ -378,13 +404,15 @@ test cases:
     5. join group with wrong multicast addr
   sub module: IGMP
   summary: station IGMP join group address check
-  test environment: SSC_T1_6
+  test environment: SSC_T1_5
   test point 1: basic function
   test point 2: IGMP API parameter check
   version: v1 (2016-8-15)
 - CI ready: 'Yes'
   ID: TCPIP_IGMP_0102
-  SDK: 'ESP32_IDF'
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
   Test App: SSC
   allow fail: ''
   auto test: 'Yes'
@@ -429,7 +457,9 @@ test cases:
   version: v1 (2016-8-15)
 - CI ready: 'Yes'
   ID: TCPIP_IGMP_0103
-  SDK: 'ESP32_IDF'
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
   Test App: SSC
   allow fail: ''
   auto test: 'Yes'
@@ -464,13 +494,15 @@ test cases:
     5. join group with wrong multicast addr
   sub module: IGMP
   summary: softAP IGMP join group address check
-  test environment: SSC_T1_8
+  test environment: SSC_T1_7
   test point 1: basic function
   test point 2: IGMP API parameter check
   version: v1 (2016-8-15)
 - CI ready: 'Yes'
   ID: TCPIP_IGMP_0104
-  SDK: 'ESP32_IDF'
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
   Test App: SSC
   allow fail: ''
   auto test: 'Yes'
@@ -515,9 +547,11 @@ test cases:
   version: v1 (2016-8-15)
 - CI ready: 'Yes'
   ID: TCPIP_IGMP_0201
-  SDK: 'ESP32_IDF'
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
   Test App: SSC
-  allow fail: '1/5'
+  allow fail: '1/3'
   auto test: 'Yes'
   category: Function
   cmd set:
@@ -534,6 +568,7 @@ test cases:
     - - R SSC1 C +IGMP:OK
   - - SOC SOC1 SENDTO 1 <test_udp_port2> 224.1.1.1
     - - R SSC1 NC +RECVFROM
+      - - R SOC_COM L OK
   execution time: 0.0
   expected result: |
     1. OK
@@ -548,7 +583,7 @@ test cases:
   steps: |
     1. create UDP socket
     2. join group with correct multicast addr
-    3. PC上 SOC1 UDP 传输，bing <test_udp_port2> <pc_ip>
+    3. PC create UDP, bind <test_udp_port2> <pc_ip>
     4. PC send UDP packet to multicast addr
     5. leave group with correct multicast addr
     6. PC send UDP packet to multicast addr
@@ -560,15 +595,19 @@ test cases:
   version: v1 (2016-8-15)
 - CI ready: 'Yes'
   ID: TCPIP_IGMP_0202
-  SDK: 'ESP32_IDF'
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
   Test App: SSC
-  allow fail: '1/5'
+  allow fail: '1/3'
   auto test: 'Yes'
   category: Function
   cmd set:
   - ''
   - - SSC SSC2 op -S -o 1
     - - R SSC2 C +MODE:OK
+  - - SSC SSC2 dhcp -S -o 1
+    - - R SSC2 C +DHCP
   - - SSC SSC2 sta -C -s <ap_ssid> -p <ap_password>
     - - R SSC2 C +JAP:CONNECTED
   - - SSC SSC2 soc -T
@@ -585,12 +624,11 @@ test cases:
     - - R SSC1 C +IGMP:OK
   - - SSC SSC2 soc -S -s <sock2> -i 224.1.1.1 -p <test_udp_port1> -l 10
     - - R SSC1 NC +RECVFROM
-  - - SSC SSC2 soc -T -s <sock2>
-    - - R SSC2 RE CLOSE:\d+,OK
+      - - R SSC2 A <sock2>:\+SEND:(\d+),OK
   execution time: 0.0
   expected result: |
     1. OK
-    2. target2 connect succeed
+    2. DUT2 connect succeed
     3. CLOSEALL
     4. OK
     5. OK
@@ -598,32 +636,32 @@ test cases:
     7. able to recv packet
     8. OK
     9. not able to recv packet
-    10. OK
   initial condition: STAM2
   level: Integration
   module: TCPIP
   steps: |
-    1. target2 set to sta mode
-    2. target2 join AP
-    3. target2 close socket
-    4. target1 create UDP socket
-    5. target1 join group using multicast addr
-    6. target2 create UDP socket
-    7. target2 send to multicast addr
-    8. target1 leave group with correct multicast addr
-    9. target2 send to multicast addr
-    10. target2 close socket
+    1. DUT2 set to sta mode
+    2. DUT2 enable DHCP and join AP
+    3. DUT2 close socket
+    4. DUT1 create UDP socket
+    5. DUT1 join group using multicast addr
+    6. DUT2 create UDP socket
+    7. DUT2 send to multicast addr
+    8. DUT1 leave group with correct multicast addr
+    9. DUT2 send to multicast addr
   sub module: IGMP
   summary: station send multicast packets
-  test environment: SSC_T2_4
+  test environment: SSC_T2_3
   test point 1: basic function
   test point 2: IGMP send/recv test
   version: v1 (2016-8-15)
 - CI ready: 'Yes'
   ID: TCPIP_IGMP_0203
-  SDK: 'ESP32_IDF'
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
   Test App: SSC
-  allow fail: ''
+  allow fail: '1/3'
   auto test: 'Yes'
   category: Function
   cmd set:
@@ -640,6 +678,7 @@ test cases:
     - - R SSC1 C +IGMP:OK
   - - SOC SOC1 SENDTO 1 <test_udp_port1> 224.1.1.1
     - - R SSC1 NC +RECVFROM
+      - - R SOC_COM L OK
   execution time: 0.0
   expected result: |
     1. OK
@@ -654,25 +693,29 @@ test cases:
   steps: |
     1. create UDP socket
     2. join group using multicast addr
-    3. PC上 SOC1 UDP 传输，bing <test_udp_port1> <pc_ip_wifi>
+    3. PC create UDP, bind <test_udp_port1> <pc_ip_wifi>
     4. PC send UDP packet to multicast addr
     5. leave group with correct multicast addr
     6. PC send UDP packet to multicast addr
   sub module: IGMP
   summary: softAP IGMP recv packets
-  test environment: SSC_T1_8
+  test environment: SSC_T1_7
   test point 1: basic function
   test point 2: IGMP send/recv test
   version: v1 (2016-8-15)
 - CI ready: 'Yes'
   ID: TCPIP_IGMP_0204
-  SDK: 'ESP32_IDF'
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
   Test App: SSC
   allow fail: ''
   auto test: 'Yes'
   category: Function
   cmd set:
   - ''
+  - - SSC SSC1 ap -S -s <target_ssid> -p <target_password> -t <target_auth_enum>
+    - - R SSC1 C +SAP:OK
   - - SSC SSC2 sta -C -s <target_ssid> -p <target_password>
     - - R SSC2 C +JAP:CONNECTED
   - - SSC SSC1 soc -B -t UDP -p <test_udp_port1>
@@ -687,33 +730,820 @@ test cases:
     - - R SSC1 C +IGMP:OK
   - - SSC SSC2 soc -S -s <sock2> -i 224.1.1.1 -p <test_udp_port1> -l 10
     - - R SSC1 NC +RECVFROM
-  - - SSC SSC2 soc -T -s <sock2>
-    - - R SSC2 RE CLOSE:\d+,OK
+      - - R SSC2 A <sock2>:\+SEND:(\d+),OK
   execution time: 0.0
   expected result: |
-    1. target2 connect succeed
+    1. OK
+    2. DUT2 connect succeed
+    3. OK
+    4. OK
+    5. OK
+    6. DUT1 able to recv packet
+    7. OK
+    8. DUT1 not able to recv packet
+  initial condition: T2_1
+  level: Integration
+  module: TCPIP
+  steps: |
+    1. DUT1 set AP
+    2. DUT2 join Softap
+    3. DUT1 create UDP socket
+    4. DUT1 join group using multicast addr
+    5. DUT2 create UDP socket
+    6. DUT2 send to multicast addr
+    7. DUT1 leave group with correct multicast addr
+    8. DUT2 send to multicast addr
+  sub module: IGMP
+  summary: softAP send multicast packets
+  test environment: SSC_T2_5
+  test point 1: basic function
+  test point 2: IGMP send/recv test
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0301
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 soc -B -t UDPv6 -p <random_port>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -G -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -J -s <sock1> -m FE80::1
+    - - R SSC1 C +IGMP:ERROR
+  execution time: 0.0
+  expected result: |
+    1. OK
+    2. OK
+    3. OK
+    4. ERROR
+  initial condition: STAM2
+  level: Integration
+  module: TCPIP
+  steps: |
+    1. create UDP socket
+    2. join group with ipv6 multicast addr
+    3. leave group with ipv6 multicast addr
+    4. join group with wrong multicast addr
+  sub module: IGMP
+  summary: (IPv6)station IGMP join ipv6 group address check
+  test environment: SSC_T1_5
+  test point 1: basic function
+  test point 2: IGMP API parameter check
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0302
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 soc -B -t UDPv6 -p <random_port>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -G -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -B -t UDPv6 -p <test_udp_port1>
+    - - R SSC1 A <sock2>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock2> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -G -s <sock2> -m FF02::2
+    - - R SSC1 C +IGMP:ERROR
+  execution time: 0.0
+  expected result: |
+    1. OK
     2. OK
     3. OK
     4. OK
-    5. target1 able to recv packet
-    6. OK
-    7. target1 not able to recv packet
-    8. OK
+    5. OK
+    6. ERROR
+  initial condition: STAM2
+  level: Integration
+  module: TCPIP
+  steps: |
+    1. create UDP socket
+    2. join group with ipv6 multicast addr
+    3. leave group with ipv6 multicast addr
+    4. create UDP socket
+    5. join group with ipv6 multicast addr
+    6. leave group with wrong multicast addr
+  sub module: IGMP
+  summary: (IPv6)station IGMP leave ipv6 group address check
+  test environment: SSC_T1_5
+  test point 1: basic function
+  test point 2: IGMP API parameter check
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0303
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 soc -B -t UDPv6 -p <random_port>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -G -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -J -s <sock1> -m FE80::1
+    - - R SSC1 C +IGMP:ERROR
+  execution time: 0.0
+  expected result: |
+    1. OK
+    2. OK
+    3. OK
+    4. ERROR
+  initial condition: APM2
+  level: Integration
+  module: TCPIP
+  steps:  |
+    1. create UDP socket
+    2. join group with ipv6 multicast addr
+    3. leave group with ipv6 multicast addr
+    4. join group with wrong multicast addr
+  sub module: IGMP
+  summary: (IPv6)softAP IGMP join ipv6 group address check
+  test environment: SSC_T1_7
+  test point 1: basic function
+  test point 2: IGMP API parameter check
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0304
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 soc -B -t UDPv6 -p <random_port>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -G -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -B -t UDPv6 -p <test_udp_port1>
+    - - R SSC1 A <sock2>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock2> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -G -s <sock2> -m FF02::2
+    - - R SSC1 C +IGMP:ERROR
+  execution time: 0.0
+  expected result: |
+    1. OK
+    2. OK
+    3. OK
+    4. OK
+    5. OK
+    6. ERROR
   initial condition: APM2
   level: Integration
   module: TCPIP
   steps: |
-    1. target2 join AP
-    2. target1 create UDP socket
-    3. target1 join group using multicast addr
-    4. target2 create UDP socket
-    5. target2 send to multicast addr
-    6. target1 leave group with correct multicast addr
-    7. target2 send to multicast addr
-    8. target2 close socket
+    1. create UDP socket
+    2. join group with ipv6 multicast addr
+    3. leave group with ipv6 multicast addr
+    4. create UDP socket
+    5. join group with ipv6 multicast addr
+    6. leave group with wrong multicast addr
   sub module: IGMP
-  summary: softAP send multicast packets
-  test environment: SSC_T2_4
+  summary: (IPv6)softAP IGMP leave ipv6 group address check
+  test environment: SSC_T1_7
+  test point 1: basic function
+  test point 2: IGMP API parameter check
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0305
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 soc -B -t UDPv6 -p <random_port>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -G -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -J -s <sock1> -m 223.1.1.1
+    - - R SSC1 C +IGMP:ERROR
+  execution time: 0.0
+  expected result: |
+    1. OK
+    2. OK
+    3. OK
+    4. ERROR
+  initial condition: STAM2
+  level: Integration
+  module: TCPIP
+  steps: |
+    1. create UDP socket
+    2. join group with ipv4 multicast addr
+    3. leave group with ipv4 multicast addr
+    4. join group with wrong multicast addr
+  sub module: IGMP
+  summary: (IPv6)station IGMP join ipv4 group address check
+  test environment: SSC_T1_5
+  test point 1: basic function
+  test point 2: IGMP API parameter check
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0306
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 soc -B -t UDPv6 -p <random_port>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -G -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -B -t UDPv6 -p <test_udp_port1>
+    - - R SSC1 A <sock2>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock2> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -G -s <sock2> -m 224.1.1.2
+    - - R SSC1 C +IGMP:ERROR
+  execution time: 0.0
+  expected result: |
+    1. OK
+    2. OK
+    3. OK
+    4. OK
+    5. OK
+    6. ERROR
+  initial condition: STAM2
+  level: Integration
+  module: TCPIP
+  steps: |
+    1. create UDP socket
+    2. join group with ipv4 multicast addr
+    3. leave group with ipv4 multicast addr
+    4. create UDP socket
+    5. join group with ipv4 multicast addr
+    6. leave group with wrong multicast addr
+  sub module: IGMP
+  summary: (IPv6)station IGMP leave ipv4 group address check
+  test environment: SSC_T1_5
+  test point 1: basic function
+  test point 2: IGMP API parameter check
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0307
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 soc -B -t UDPv6 -p <random_port>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -G -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -J -s <sock1> -m 223.1.1.1
+    - - R SSC1 C +IGMP:ERROR
+  execution time: 0.0
+  expected result: |
+    1. OK
+    2. OK
+    3. OK
+    4. ERROR
+  initial condition: APM2
+  level: Integration
+  module: TCPIP
+  steps:  |
+    1. create UDP socket
+    2. join group with ipv4 multicast addr
+    3. leave group with ipv4 multicast addr
+    4. join group with wrong multicast addr
+  sub module: IGMP
+  summary: (IPv6)softAP IGMP join ipv4 group address check
+  test environment: SSC_T1_7
+  test point 1: basic function
+  test point 2: IGMP API parameter check
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0308
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 soc -B -t UDPv6 -p <random_port>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -G -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -B -t UDPv6 -p <test_udp_port1>
+    - - R SSC1 A <sock2>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock2> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC1 soc -G -s <sock2> -m 224.1.1.2
+    - - R SSC1 C +IGMP:ERROR
+  execution time: 0.0
+  expected result: |
+    1. OK
+    2. OK
+    3. OK
+    4. OK
+    5. OK
+    6. ERROR
+  initial condition: APM2
+  level: Integration
+  module: TCPIP
+  steps: |
+    1. create UDP socket
+    2. join group with ipv4 multicast addr
+    3. leave group with ipv4 multicast addr
+    4. create UDP socket
+    5. join group with ipv4 multicast addr
+    6. leave group with wrong multicast addr
+  sub module: IGMP
+  summary: (IPv6)softAP IGMP leave ipv4 group address check
+  test environment: SSC_T1_7
+  test point 1: basic function
+  test point 2: IGMP API parameter check
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0401
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: '1/3'
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 soc -B -t UDPv6 -p <random_port>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SOC SOC1 BIND_v6 <random_port> <pc_ip_v6>
+    - - R SOC_COM L OK
+  - - SOC SOC1 SENDTO 1 <random_port> FF02::1
+    - - R SSC1 SL <sock1>+1
+  - - SSC SSC1 soc -G -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SOC SOC1 SENDTO 1 <random_port> FF02::1
+    - - R SSC1 NC +RECVFROM
+      - - R SOC_COM L OK
+  execution time: 0.0
+  expected result: |
+    1. OK
+    2. OK
+    3. OK
+    4. able to recv packet
+    5. OK
+    6. not able to recv packet
+  initial condition: STAM2
+  level: Integration
+  module: TCPIP
+  steps: |
+    1. create UDP socket
+    2. join group with ipv6 multicast addr
+    3. PC create UDP, bind <random_port> <pc_ip_v6>
+    4. PC send UDP packet to ipv6 multicast addr
+    5. leave group with ipv6 multicast addr
+    6. PC send UDP packet to ipv6 multicast addr
+  sub module: IGMP
+  summary: (IPv6)station IGMP recv packets with ipv6 group address
+  test environment: SSC_T1_6
+  test point 1: basic function
+  test point 2: IGMP send/recv test
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0402
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: '1/3'
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC2 op -S -o 1
+    - - R SSC2 C +MODE:OK
+  - - SSC SSC2 dhcp -S -o 1
+    - - R SSC2 C +DHCP
+  - - SSC SSC2 sta -C -s <ap_ssid> -p <ap_password>
+    - - R SSC2 C +JAP:CONNECTED
+  - - SSC SSC2 soc -T
+    - - R SSC2 C +CLOSEALL
+  - - SSC SSC1 soc -B -t UDPv6 -p <test_udp_port2>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - DELAY 10
+    - - ''
+  - - SSC SSC2 soc -B -t UDPv6 -p <random_port>
+    - - R SSC2 A <sock2>:\+BIND:(\d+),OK
+  - - SSC SSC2 soc -S -s <sock2> -i FF02::1 -p <test_udp_port2> -l 100
+    - - R SSC1 SL <sock1>+1
+  - - SSC SSC1 soc -G -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC2 soc -S -s <sock2> -i FF02::1 -p <test_udp_port2> -l 100
+    - - R SSC1 NC +RECVFROM
+      - - R SSC2 A <sock2>:\+SEND:(\d+),OK
+  execution time: 0.0
+  expected result: |
+    1. OK
+    2. DUT2 connect succeed
+    3. DUT2 close socket
+    4. OK
+    5. OK
+    6. Delay done
+    7. OK
+    8. able to recv packet
+    9. OK
+    10. not able to recv packet
+  initial condition: STAM2
+  level: Integration
+  module: TCPIP
+  steps: |
+    1. DUT2 set to sta mode
+    2. DUT2 enable DHCP and join AP
+    3. DUT2 close socket
+    4. DUT1 create UDP socket
+    5. DUT1 join group using ipv6 multicast addr
+    6. Delay
+    7. DUT2 create UDP socket
+    8. DUT2 send to ipv6 multicast addr
+    9. DUT1 leave group with ipv6 multicast addr
+    10. DUT2 send to ipv6 multicast addr
+  sub module: IGMP
+  summary: (IPv6)station send multicast packets with ipv6 group address
+  test environment: SSC_T2_3
+  test point 1: basic function
+  test point 2: IGMP send/recv test
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0403
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: '1/3'
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 soc -B -t UDPv6 -p <random_port>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SOC SOC1 BIND_v6 <random_port> <pc_ip_wifi_v6>
+    - - R SOC_COM L OK
+  - - SOC SOC1 SENDTO 1 <random_port> FF02::1
+    - - R SSC1 SL <sock1>+1
+  - - SSC SSC1 soc -G -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SOC SOC1 SENDTO 1 <random_port> FF02::1
+    - - R SSC1 NC +RECVFROM
+      - - R SOC_COM L OK
+  execution time: 0.0
+  expected result: |
+    1. OK
+    2. OK
+    3. OK
+    4. able to recv packet
+    5. OK
+    6. not able to recv packet
+  initial condition: APM2
+  level: Integration
+  module: TCPIP
+  steps: |
+    1. create UDP socket
+    2. join group with ipv6 multicast addr
+    3. PC create UDP, bind <random_port> <pc_ip_wifi_v6>
+    4. PC send UDP packet to ipv6 multicast addr
+    5. leave group with ipv6 multicast addr
+    6. PC send UDP packet to ipv6 multicast addr
+  sub module: IGMP
+  summary: (IPv6)softAP IGMP recv packets with ipv6 group address
+  test environment: SSC_T1_7
+  test point 1: basic function
+  test point 2: IGMP send/recv test
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0404
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: '1/3'
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC2 op -S -o 1
+    - - R SSC2 C +MODE:OK
+  - - SSC SSC2 sta -C -s <target_ssid> -p <target_password>
+    - - R SSC2 C +JAP:CONNECTED
+  - - SSC SSC2 soc -T
+    - - R SSC2 C +CLOSEALL
+  - - DELAY 10
+    - - ''
+  - - SSC SSC1 soc -B -t UDPv6 -p <test_udp_port1>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC2 soc -B -t UDPv6 -p <random_port>
+    - - R SSC2 A <sock2>:\+BIND:(\d+),OK
+  - - SSC SSC2 soc -S -s <sock2> -i FF02::1 -p <test_udp_port1> -l 100
+    - - R SSC1 SL <sock1>+1
+  - - SSC SSC1 soc -G -s <sock1> -m FF02::1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC2 soc -S -s <sock2> -i FF02::1 -p <test_udp_port1> -l 100
+    - - R SSC1 SL NC +RECVFROM
+      - - R SSC2 A <sock2>:\+SEND:(\d+),OK
+  execution time: 0.0
+  expected result: |
+    1. OK
+    2. join AP
+    3. DUT2 close socket
+    4. DELAY
+    5. OK
+    6. OK
+    7. OK
+    8. able to recv packet
+    9. OK
+    10. not able to recv packet
+  initial condition: APM2
+  level: Integration
+  module: TCPIP
+  steps: |
+    1. DUT2 set station mode
+    2. DUT2 join AP
+    3. DUT2 close socket
+    4. DELAY
+    5. DUT1 create UDP socket
+    6. DUT1 join group using ipv6 multicast addr
+    7. DUT2 create UDP socket
+    8. DUT2 send to ipv6 multicast addr
+    9. DUT1 leave group with ipv6 multicast addr
+    10. DUT2 send to ipv6 multicast addr
+  sub module: IGMP
+  summary: (IPv6)softAP send multicast packets with ipv6 group address
+  test environment: SSC_T2_2
+  test point 1: basic function
+  test point 2: IGMP send/recv test
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0405
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: '1/3'
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 soc -B -t UDPv6 -p <random_port>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SOC SOC1 BIND <random_port> <pc_ip>
+    - - R SOC_COM L OK
+  - - SOC SOC1 SENDTO 1 <random_port> 224.1.1.1
+    - - R SSC1 SL <sock1>+1
+  - - SSC SSC1 soc -G -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SOC SOC1 SENDTO 1 <random_port> 224.1.1.1
+    - - R SSC1 NC +RECVFROM
+      - - R SOC_COM L OK
+  execution time: 0.0
+  expected result: |
+    1. OK
+    2. OK
+    3. OK
+    4. able to recv packet
+    5. OK
+    6. not able to recv packet
+  initial condition: STAM2
+  level: Integration
+  module: TCPIP
+  steps: |
+    1. create UDP socket
+    2. join group with ipv4 multicast addr
+    3. PC create UDP, bind <random_port> <pc_ip>
+    4. PC send UDP packet to ipv4 multicast addr
+    5. leave group with ipv4 multicast addr
+    6. PC send UDP packet to ipv4 multicast addr
+  sub module: IGMP
+  summary: (IPv6)station IGMP recv packets with ipv4 group address
+  test environment: SSC_T1_6
+  test point 1: basic function
+  test point 2: IGMP send/recv test
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0406
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: '1/3'
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC2 op -S -o 1
+    - - R SSC2 C +MODE:OK
+  - - SSC SSC2 dhcp -S -o 1
+    - - R SSC2 C +DHCP
+  - - SSC SSC2 sta -C -s <ap_ssid> -p <ap_password>
+    - - R SSC2 C +JAP:CONNECTED
+  - - SSC SSC2 soc -T
+    - - R SSC2 C +CLOSEALL
+  - - SSC SSC1 soc -B -t UDPv6 -p <test_udp_port1>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC2 soc -B -t UDP -p <random_port>
+    - - R SSC2 A <sock2>:\+BIND:(\d+),OK
+  - - SSC SSC2 soc -S -s <sock2> -i 224.1.1.1 -p <test_udp_port1> -l 100
+    - - R SSC1 SL <sock1>+1
+  - - SSC SSC1 soc -G -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC2 soc -S -s <sock2> -i 224.1.1.1 -p <test_udp_port1> -l 100
+    - - R SSC1 NC +RECVFROM
+      - - R SSC2 A <sock2>:\+SEND:(\d+),OK
+  execution time: 0.0
+  expected result: |
+    1. OK
+    2. DUT2 connect succeed
+    3. DUT2 close socket
+    4. OK
+    5. OK
+    6. OK
+    7. able to recv packet
+    8. OK
+    9. not able to recv packet
+  initial condition: STAM2
+  level: Integration
+  module: TCPIP
+  steps: |
+    1. DUT2 set to sta mode
+    2. DUT2 enable DHCP and join AP
+    3. DUT2 close socket
+    4. DUT1 create UDP socket
+    5. DUT1 join group using ipv4 multicast addr
+    6. DUT2 create UDP socket
+    7. DUT2 send to ipv4 multicast addr
+    8. DUT1 leave group with ipv4 multicast addr
+    9. DUT2 send to ipv4 multicast addr
+  sub module: IGMP
+  summary: (IPv6)station send multicast packets with ipv4 group address
+  test environment: SSC_T2_3
+  test point 1: basic function
+  test point 2: IGMP send/recv test
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0407
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: '1/3'
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 soc -B -t UDPv6 -p <random_port>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SOC SOC1 BIND <random_port> <pc_ip_wifi>
+    - - R SOC_COM L OK
+  - - SOC SOC1 SENDTO 1 <random_port> 224.1.1.1
+    - - R SSC1 SL <sock1>+1
+  - - SSC SSC1 soc -G -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SOC SOC1 SENDTO 1 <random_port> 224.1.1.1
+    - - R SSC1 NC +RECVFROM
+      - - R SOC_COM L OK
+  execution time: 0.0
+  expected result: |
+    1. OK
+    2. OK
+    3. OK
+    4. able to recv packet
+    5. OK
+    6. not able to recv packet
+  initial condition: APM2
+  level: Integration
+  module: TCPIP
+  steps: |
+    1. create UDP socket
+    2. join group with ipv4 multicast addr
+    3. PC create UDP, bind <random_port> <pc_ip_wifi>
+    4. PC send UDP packet to ipv4 multicast addr
+    5. leave group with ipv4 multicast addr
+    6. PC send UDP packet to ipv4 multicast addr
+  sub module: IGMP
+  summary: (IPv6)softAP IGMP recv packets with ipv4 group address
+  test environment: SSC_T1_7
+  test point 1: basic function
+  test point 2: IGMP send/recv test
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: TCPIP_IGMP_0408
+  SDK: |-
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: '1/3'
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC2 op -S -o 1
+    - - R SSC2 C +MODE:OK
+  - - SSC SSC2 sta -C -s <target_ssid> -p <target_password>
+    - - R SSC2 C +JAP:CONNECTED
+  - - SSC SSC2 soc -T
+    - - R SSC2 C +CLOSEALL
+  - - SSC SSC1 soc -B -t UDPv6 -p <test_udp_port1>
+    - - R SSC1 A <sock1>:\+BIND:(\d+),OK
+  - - SSC SSC1 soc -J -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC2 soc -B -t UDP -p <random_port>
+    - - R SSC2 A <sock2>:\+BIND:(\d+),OK
+  - - SSC SSC2 soc -S -s <sock2> -i 224.1.1.1 -p <test_udp_port1> -l 100
+    - - R SSC1 SL <sock1>+1
+  - - SSC SSC1 soc -G -s <sock1> -m 224.1.1.1
+    - - R SSC1 C +IGMP:OK
+  - - SSC SSC2 soc -S -s <sock2> -i 224.1.1.1 -p <test_udp_port1> -l 100
+    - - R SSC1 NC +RECVFROM
+      - - R SSC2 A <sock2>:\+SEND:(\d+),OK
+  execution time: 0.0
+  expected result: |
+    1. OK
+    2. DUT2 connect succeed
+    3. DUT2 close socket
+    4. OK
+    5. OK
+    6. OK
+    7. able to recv packet
+    8. OK
+    9. not able to recv packet
+  initial condition: APM2
+  level: Integration
+  module: TCPIP
+  steps: |
+    1. DUT2 set sta mode
+    2. DUT2 join AP
+    3. DUT2 close socket
+    4. DUT1 create UDP socket
+    5. DUT1 join group using ipv4 multicast addr
+    6. DUT2 create UDP socket
+    7. DUT2 send to ipv4 multicast addr
+    8. DUT1 leave group with ipv4 multicast addr
+    9. DUT2 send to ipv4 multicast addr
+  sub module: IGMP
+  summary: (IPv6)softAP send multicast packets with ipv4 group address
+  test environment: SSC_T2_2
   test point 1: basic function
   test point 2: IGMP send/recv test
   version: v1 (2016-8-15)
diff --git a/components/idf_test/integration_test/TC_IT_TCPIP_TCP.yml b/components/idf_test/integration_test/TC_IT_TCPIP_TCP.yml
index 6caeda062..cf9a77921 100644
--- a/components/idf_test/integration_test/TC_IT_TCPIP_TCP.yml
+++ b/components/idf_test/integration_test/TC_IT_TCPIP_TCP.yml
@@ -131,7 +131,7 @@ test cases:
   level: Integration
   module: TCPIP
   steps: |
-    1.PC上建立TCP 监听 test_tcp_port1
+    1. PC上建立TCP 监听 test_tcp_port1
     2.target1上创建TCP socket
     3.target1上使用步骤2创建的socket，去连接 PC的ip，test_tcp_port1
     4.PC与target1 创建好TCP 连接，有ACCEPT
@@ -3457,7 +3457,7 @@ test cases:
     8266_NonOS
     8266_RTOS
     ESP32_IDF
-  Test App: SSC
+  Test App: SSC, SSC_NonBlocking
   auto test: 'Yes'
   category: Stress
   cmd set:
@@ -3488,13 +3488,54 @@ test cases:
   test point 1: function + stress
   test point 2: TCP connect and disconnect test
   version: v2 (2016-11-15)
+- CI ready: 'Yes'
+  ID: TCPIP_TCP_5101
+  SDK: ESP32_IDF
+  Test App: SSC, SSC_NonBlocking, SSC_PSRAM
+  auto test: 'Yes'
+  category: Stable
+  cmd set:
+  - TCPStress/TCPAPNSTA
+  - - send_len = 1460
+    - - dummy
+  - - test_time = 720
+    - - ''
+  - - server_port = "<random_port>"
+    - - ''
+  - - server_echo = True
+    - - ''
+  - - sta_number = 4
+    - - ''
+  - - send_delay = 50
+    - - ''
+  - - ap_ip = "<target_ap_ip>"
+    - - ''
+  execution time: 12.0
+  expected result: |-
+    1. succeed
+    2. succeed
+    3. succeed
+    4. all TCP connection not disconnected
+  initial condition: None
+  level: Integration
+  module: TCPIP
+  steps: |-
+    1. all sta connect to softap
+    2. create tcp server on softap
+    3. all sta connect to softap tcp server
+    4. do bi-direction send on all tcp connections
+  sub module: TCP
+  summary: 1 AP 4 STA TCP stable test
+  test environment: SSC_T5_1
+  test point 1: stable
+  test point 2: TCP stable test
+  version: v2 (2016-11-15)
 - CI ready: 'Yes'
   ID: TCPIP_TCP_5101
   SDK: |-
     8266_NonOS
     8266_RTOS
-    ESP32_IDF
-  Test App: SSC
+  Test App: SSC, SSC_NonBlocking
   auto test: 'Yes'
   category: Stable
   cmd set:
@@ -3723,7 +3764,7 @@ test cases:
     2. PC send random length data to target
   sub module: TCP
   summary: send random length segment to target for Ethernet
-  test environment: ETH_T1_1
+  test environment: SSC_T1_Ethernet
   test point 1: stable
   test point 2: TCP stable test
   version: v2 (2016-11-15)
@@ -3766,13 +3807,46 @@ test cases:
   test point 1: stress
   test point 2: TCP stress test
   version: v2 (2016-11-15)
+- CI ready: 'Yes'
+  ID: TCPIP_TCP_5202
+  SDK: ESP32_IDF
+  Test App: SSC, SSC_NonBlocking, SSC_PSRAM
+  auto test: 'Yes'
+  category: Stress
+  cmd set:
+  - TCPStress/TCPDataValidation
+  - - test_time = 1440
+    - - dummy
+  - - tx_enable = True
+    - - ''
+  - - rx_enable = True
+    - - ''
+  - - conn_num = 1
+    - - ''
+  - - send_len = 1024
+    - - ''
+  execution time: 24.0
+  expected result: |-
+    1. succeed
+    2. verify reciveid data on target and PC succeed
+  initial condition: STAM2
+  level: Integration
+  module: TCPIP
+  steps: |-
+    1. create TCP connection
+    2. send specified pattern on both direction
+  sub module: TCP
+  summary: TCP send/recv data validation
+  test environment: SSC_T1_6
+  test point 1: stress
+  test point 2: TCP stress test
+  version: v2 (2016-11-15)
 - CI ready: 'Yes'
   ID: TCPIP_TCP_5202
   SDK: |-
     8266_NonOS
     8266_RTOS
-    ESP32_IDF
-  Test App: SSC
+  Test App: SSC, SSC_NonBlocking
   auto test: 'Yes'
   category: Stress
   cmd set:
@@ -3844,7 +3918,7 @@ test cases:
     8266_NonOS
     8266_RTOS
     ESP32_IDF
-  Test App: SSC
+  Test App: SSC_Ethernet
   auto test: 'Yes'
   category: Stress
   cmd set:
@@ -3871,7 +3945,7 @@ test cases:
     2. send specified pattern on both direction
   sub module: TCP
   summary: TCP send/recv data validation for Ethernet
-  test environment: ETH_T1_1
+  test environment: SSC_T1_Ethernet
   test point 1: stress
   test point 2: TCP stress test
   version: v2 (2016-11-15)
@@ -3881,7 +3955,7 @@ test cases:
     8266_NonOS
     8266_RTOS
     ESP32_IDF
-  Test App: SSC
+  Test App: SSC, SSC_NonBlocking
   auto test: 'Yes'
   category: Stress
   cmd set:
@@ -3892,7 +3966,7 @@ test cases:
     - - ''
   - - rx_enable = False
     - - ''
-  - - measure_period = 5
+  - - measure_period = 30
     - - ''
   execution time: 2.0
   expected result: |-
@@ -3919,7 +3993,7 @@ test cases:
     8266_NonOS
     8266_RTOS
     ESP32_IDF
-  Test App: SSC
+  Test App: SSC, SSC_NonBlocking
   auto test: 'Yes'
   category: Stress
   cmd set:
@@ -3930,7 +4004,7 @@ test cases:
     - - ''
   - - rx_enable = True
     - - ''
-  - - measure_period = 5
+  - - measure_period = 30
     - - ''
   execution time: 2.0
   expected result: |-
@@ -3957,7 +4031,7 @@ test cases:
     8266_NonOS
     8266_RTOS
     ESP32_IDF
-  Test App: SSC
+  Test App: SSC_Ethernet
   auto test: 'Yes'
   category: Stress
   cmd set:
@@ -3985,7 +4059,7 @@ test cases:
     Loop for step 1-2
   sub module: TCP
   summary: TCP throughput Tx for Ethernet
-  test environment: ETH_T1_1
+  test environment: SSC_T1_Ethernet
   test point 1: stress
   test point 2: TCP stress test
   version: v1 (2016-8-15)
@@ -3995,7 +4069,7 @@ test cases:
     8266_NonOS
     8266_RTOS
     ESP32_IDF
-  Test App: SSC
+  Test App: SSC_Ethernet
   auto test: 'Yes'
   category: Stress
   cmd set:
@@ -4023,7 +4097,7 @@ test cases:
     Loop for step 1-2
   sub module: TCP
   summary: TCP throughput Rx for Ethernet
-  test environment: ETH_T1_1
+  test environment: SSC_T1_Ethernet
   test point 1: stress
   test point 2: TCP stress test
   version: v1 (2016-8-15)
@@ -4033,7 +4107,7 @@ test cases:
     8266_NonOS
     8266_RTOS
     ESP32_IDF
-  Test App: SSC
+  Test App: SSC_Ethernet
   auto test: 'Yes'
   category: Stress
   cmd set:
@@ -4061,7 +4135,7 @@ test cases:
     Loop for step 1-3
   sub module: TCP
   summary: Eth random close while sending packets
-  test environment: ETH_T1_1
+  test environment: SSC_T1_Ethernet
   test point 1: stress
   test point 2: TCP stress test
   version: v1 (2016-8-15)
@@ -4149,7 +4223,7 @@ test cases:
     8266_NonOS
     8266_RTOS
     ESP32_IDF
-  Test App: SSC
+  Test App: SSC_Ethernet
   auto test: 'Yes'
   category: Stress
   cmd set:
@@ -4179,7 +4253,7 @@ test cases:
     4. ip query
   sub module: TCP
   summary: Eth get ip test
-  test environment: ETH_T1_1
+  test environment: SSC_T1_Ethernet
   test point 1: stress
   test point 2: TCP stress test
   version: v1 (2016-8-15)
@@ -4258,7 +4332,7 @@ test cases:
 - CI ready: 'Yes'
   ID: TCPIP_TCP_5803
   SDK: 'ESP32_IDF'
-  Test App: SSC
+  Test App: SSC, SSC_NonBlocking
   auto test: 'Yes'
   category: Stress
   cmd set:
diff --git a/components/idf_test/integration_test/TC_IT_TCPIP_UDP.yml b/components/idf_test/integration_test/TC_IT_TCPIP_UDP.yml
index 6f3c7f71b..9e14bb0c0 100644
--- a/components/idf_test/integration_test/TC_IT_TCPIP_UDP.yml
+++ b/components/idf_test/integration_test/TC_IT_TCPIP_UDP.yml
@@ -1325,7 +1325,7 @@ test cases:
     8266_NonOS
     8266_RTOS
     ESP32_IDF
-  Test App: SSC
+  Test App: SSC, SSC_NonBlocking, SSC_PSRAM
   auto test: 'Yes'
   category: Stress
   cmd set:
@@ -1469,13 +1469,49 @@ test cases:
   test point 1: Performance test
   test point 2: UDP stress test
   version: v1 (2016-10-18)
+- CI ready: 'No'
+  ID: TCPIP_UDP_5005
+  SDK: ESP32_IDF
+  Test App: SSC, SSC_NonBlocking, SSC_PSRAM
+  auto test: 'Yes'
+  category: Stress
+  cmd set:
+  - UDPStress/UDPMultiSTASendRecv
+  - - send_len = 1460
+    - - dummy
+  - - test_time = 300
+    - - ''
+  - - server_echo = True
+    - - ''
+  - - sta_number = 5
+    - - ''
+  - - send_delay = 500
+    - - ''
+  execution time: 5.0
+  expected result: |-
+    1. succeed
+    2. succeed
+    3. succeed
+  initial condition: None
+  level: Integration
+  module: TCPIP
+  steps: |-
+    1. 5 sta connect to softap
+    2. create udp socket on all sta
+    3. all sta do udp send/recv
+  sub module: UDP
+  summary: 1 SoftAP 5 STA, create UDP server on one STA, create UDP client on other
+    STA, do UDP send/recv
+  test environment: SSC_T6_1
+  test point 1: stress
+  test point 2: UDP stress test
+  version: v1 (2016-8-15)
 - CI ready: 'No'
   ID: TCPIP_UDP_5005
   SDK: |-
     8266_NonOS
     8266_RTOS
-    ESP32_IDF
-  Test App: SSC
+  Test App: SSC, SSC_NonBlocking
   auto test: 'Yes'
   category: Stress
   cmd set:
@@ -1546,7 +1582,7 @@ test cases:
     3. all sta do udp send/recv
   sub module: UDP
   summary: 1 SoftAP 2 STA, create multi UDP socket on STA, do UDP send/recv
-  test environment: SSC_T3_1
+  test environment: SSC_T3_2
   test point 1: stress
   test point 2: UDP stress test
   version: v1 (2016-8-15)
@@ -1636,7 +1672,7 @@ test cases:
     8266_NonOS
     8266_RTOS
     ESP32_IDF
-  Test App: SSC
+  Test App: SSC, SSC_NonBlocking
   auto test: 'Yes'
   category: Performance
   cmd set:
@@ -1674,7 +1710,7 @@ test cases:
     8266_NonOS
     8266_RTOS
     ESP32_IDF
-  Test App: SSC
+  Test App: SSC, SSC_NonBlocking
   auto test: 'Yes'
   category: Performance
   cmd set:
@@ -1712,7 +1748,7 @@ test cases:
     8266_NonOS
     8266_RTOS
     ESP32_IDF
-  Test App: SSC
+  Test App: SSC_Ethernet
   auto test: 'Yes'
   category: Stress
   cmd set:
@@ -1740,7 +1776,7 @@ test cases:
     Loop for step 1-2
   sub module: UDP
   summary: UDP throughput Tx for Ethernet
-  test environment: ETH_T1_1
+  test environment: SSC_T1_Ethernet
   test point 1: stress
   test point 2: UDP stress test
   version: v1 (2016-8-15)
@@ -1750,7 +1786,7 @@ test cases:
     8266_NonOS
     8266_RTOS
     ESP32_IDF
-  Test App: SSC
+  Test App: SSC_Ethernet
   auto test: 'Yes'
   category: Stress
   cmd set:
@@ -1778,7 +1814,7 @@ test cases:
     Loop for step 1-2
   sub module: UDP
   summary: UDP throughput Rx for Ethernet
-  test environment: ETH_T1_1
+  test environment: SSC_T1_Ethernet
   test point 1: stress
   test point 2: UDP stress test
   version: v1 (2016-8-15)
@@ -1788,7 +1824,7 @@ test cases:
     8266_NonOS
     8266_RTOS
     ESP32_IDF
-  Test App: SSC
+  Test App: SSC_Ethernet
   auto test: 'Yes'
   category: Stress
   cmd set:
@@ -1816,7 +1852,7 @@ test cases:
     3. DUT calculate the packet lose rate
   sub module: UDP
   summary: UDP loss rate on DUT Rx for Eth
-  test environment: ETH_T1_1
+  test environment: SSC_T1_Ethernet
   test point 1: Performance test
   test point 2: UDP stress test
   version: v1 (2016-10-18)
diff --git a/components/idf_test/integration_test/TC_IT_WIFI_CONN.yml b/components/idf_test/integration_test/TC_IT_WIFI_CONN.yml
index d122df1bd..f5cc01e92 100644
--- a/components/idf_test/integration_test/TC_IT_WIFI_CONN.yml
+++ b/components/idf_test/integration_test/TC_IT_WIFI_CONN.yml
@@ -196,6 +196,109 @@ test cases:
   test point 1: basic function
   test point 2: SAP/JAP with different config
   version: v1 (2016-8-15)
+- CI ready: 'No'
+  ID: WIFI_CONN_0105
+  SDK: |-
+    ESP32_IDF
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 ap -S -s <target_ssid> -t 0
+    - - R SSC1 C +SAP:OK
+  - - SSC SSC3 sta -D
+    - - R SSC3 C +QAP:OK
+  - - SSC SSC3 sta -C -s <target_ssid> -p <target_auth_enum>
+    - - R SSC3 NC +JAP:CONNECTED
+  - - SSC SSC2 ap -S -s <target_ssid> -p <target_password> -t <target_auth_enum>
+    - - R SSC2 C +SAP:OK
+      - R SSC3 C +JAP:CONNECTED
+  execution time: 0.0
+  expected result: |-
+    1. set mode suc
+    2. ok
+    3. connect fail
+    4. set ok and connect suc
+  initial condition: T3_2
+  level: Integration
+  module: WIFI MAC
+  steps: |-
+    1. set SSC1 STA+AP mode, SSC2 AP mode, SSC3 STA mode
+    2. config SSC1 as unencrypted ap
+    3. SSC3 connect SSC1 with password
+    4. config the same ssid for SSC2 and SSC1,the password is the same with SSC3 input
+  sub module: WIFI Connect
+  summary: STA connect open ap with password test
+  test environment: SSC_T3_1
+  test point 1: connect open ap with password
+  test point 2: WIFI Connection misc test
+  version: v1 (2016-10-23)
+- CI ready: 'Yes'
+  ID: WIFI_CONN_0106
+  SDK: |-
+    8266_NonOS
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 ap -S -s <ssid_32bytes> -p <target_password> -t <target_auth_enum>
+    - - R SSC1 C +SAP:OK
+  - - SSC SSC2 sta -C -s <ssid_32bytes> -p <target_password>
+    - - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<ssid_32bytes>)
+  execution time: 0.0
+  initial condition: T2_1
+  level: Integration
+  module: WIFI MAC
+  steps: |-
+    1. SSC1 set AP with 32 bytes SSID
+    2. SSC2 try to join SSC1 SoftAP
+  expected result: |-
+    1. succeeded
+    2. succeeded
+  sub module: WIFI Connect
+  summary: max length ssid test
+  test environment: SSC_T2_5
+  test point 1: basic function
+  test point 2: SAP/JAP with different config
+  version: v1 (2016-8-15)
+- CI ready: 'Yes'
+  ID: WIFI_CONN_0107
+  SDK: |-
+    8266_NonOS
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 ap -S -s <target_ssid> -p <target_password> -t <target_auth_enum>
+    - - R SSC1 C +SAP:OK
+  - - SSC SSC2 sta -C -s <target_ssid> -p <target_password> -b <target1_ap_mac>
+    - - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<target_ssid>)
+  execution time: 0.0
+  initial condition: T2_1
+  level: Integration
+  module: WIFI MAC
+  steps: |-
+    1. SSC1 set SoftAP
+    2. SSC2 connect to SoftAP with bssid
+  expected result: |-
+    1. succeeded
+    2. succeeded
+  sub module: WIFI Connect
+  summary: connect to AP with bssid
+  test environment: SSC_T2_5
+  test point 1: basic function
+  test point 2: SAP/JAP with different config
+  version: v1 (2016-8-15)
 - CI ready: 'Yes'
   ID: WIFI_CONN_0201
   SDK: |-
@@ -568,7 +671,7 @@ test cases:
     4. reset sta reconnect policy as auto reconnect
   sub module: WIFI Connect
   summary: reconnect policy interact with failed STA connect/reconnect
-  test environment: SSC_T1_1
+  test environment: SSC_T1_5
   test point 1: basic function
   test point 2: reconnect policy test
   version: v1 (2016-8-15)
@@ -693,7 +796,7 @@ test cases:
     2. sta connect to ap with wrong password
   sub module: WIFI Connect
   summary: check wifi status wrong password, no ap found
-  test environment: SSC_T1_1
+  test environment: SSC_T1_5
   test point 1: basic function
   test point 2: wifi connect status check
   version: v1 (2016-8-15)
@@ -779,7 +882,7 @@ test cases:
     8266_NonOS
     8266_RTOS
     ESP32_IDF
-  Test App: basic function
+  Test App: SSC
   allow fail: ''
   auto test: 'Yes'
   category: Function
@@ -803,7 +906,7 @@ test cases:
     2. connect to AP not exist
   sub module: WIFI Connect
   summary: test wifi disconnect reason REASON_ASSOC_LEAVE, REASON_NO_AP_FOUND
-  test environment: SSC_T1_1
+  test environment: SSC_T1_5
   test point 1: basic function
   test point 2: wifi disconnect reason test
   version: v1 (2016-8-15)
@@ -933,7 +1036,7 @@ test cases:
     4.利用脚本计算beacon delay时间
   sub module: WIFI Connect
   summary: beacon delay
-  test environment: SSC_T1_1
+  test environment: SSC_T1_4
   test point 1: basic function
   test point 2: beacon delay
   version: v1 (2016-8-15)
@@ -1620,6 +1723,89 @@ test cases:
   test point 1: basic function
   test point 2: WiFi deinit and stop
   version: v1 (2016-12-31)
+- CI ready: 'Yes'
+  ID: WIFI_CONN_1401
+  SDK: |-
+    8266_NonOS
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 ap -S -s <target_ssid> -p <target_password> -t 3
+    - - P SSC1 C +SAP:OK
+  - - SSC SSC2 sta -C -s <target_ssid> -p <target_password>
+    - - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<target_ssid>)
+  - - SSC SSC2 sta -C -s <random_string> -p <random_string>
+    - []
+  - - DELAY 10
+    - - P PC_COM C +DELAYDONE
+      - P SSC2 NC +JAP:CONNECTED
+  - - SSC SSC1 ap -S -s <random_string> -p <random_string> -t 3
+    - - P SSC1 C +SAP:OK
+      - P SSC2 C +JAP:CONNECTED
+  execution time: 0
+  steps: |
+    1. STA connect to SoftAP
+    2. STA connect to not existed AP
+    3. set SoftAP to config which STA connecting
+  expected result: |
+    1. succeeded
+    2. connect failed
+    3. STA can connect to SoftAP
+  initial condition: T2_1
+  level: Integration
+  module: WIFI MAC
+  sub module: WIFI Connect
+  summary: connect to AP not exist and reconnect to the same AP when it exists
+  test environment: SSC_T2_5
+  test point 1: abnormal/special use
+  test point 2: abnormal connect cases
+  version: v1 (2018-12-25)
+- CI ready: 'Yes'
+  ID: WIFI_CONN_1402
+  SDK: |-
+    8266_NonOS
+    8266_RTOS
+    ESP32_IDF
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - STRING <ssid_a> %%sAAA <random_string>
+    - - R PC_COM C OK
+  - - STRING <ssid_b> %%sBBB <random_string>
+    - - R PC_COM C OK
+  - - SSC SSC1 ap -S -s <ssid_a> -p <random_string> -t 3 -h 1
+    - - P SSC1 C +SAP:OK
+  - - SSC SSC2 sta -C -s <ssid_b> -p <random_string>
+    - []
+  - - DELAY 15
+    - - P PC_COM C +DELAYDONE
+      - P SSC2 NC +JAP:CONNECTED
+  execution time: 0
+  steps: |
+    1. create 2 ssid with same length
+    2. SoftAP set with ssid A and ssid hidden enabled
+    3. STA connect to ssid B
+  expected result: |
+    1. succeeded
+    2. succeeded
+    3. STA can't connect to SoftAP
+  initial condition: T2_1
+  level: Integration
+  module: WIFI MAC
+  sub module: WIFI Connect
+  summary: try to connect to hidden SSID AP with incorrect SSID
+  test environment: SSC_T2_5
+  test point 1: abnormal/special use
+  test point 2: abnormal connect cases
+  version: v1 (2018-12-25)
 - CI ready: 'No'
   ID: WIFI_CONN_5001
   SDK: |-
@@ -1659,7 +1845,7 @@ test cases:
     3. power off AP after JAP succeed, power on AP
     Loop step 1-3
   sub module: WIFI Connect
-  summary: 使用各种可能的 ssid+password+auth type 组合进行SAP和JAP；JAP过程中AP随机断电或更改设置；AP随机断电后重连
+  summary: Wi-Fi connect to AP stress test
   test environment: SSC_T2_JAP
   test point 1: function + performance + stress
   test point 2: JAP stress test
@@ -1829,7 +2015,7 @@ test cases:
     4. sta connect AP ,softap and AP should in different channel
   sub module: WIFI Connect
   summary: channel switch announcements verify
-  test environment: SSC_T1_1
+  test environment: SSC_T1_7
   test point 1: function + stress
   test point 2: channel switch announcements
   version: v2 (2016-11-15)
@@ -1861,7 +2047,7 @@ test cases:
     3. check connection status within 24 hours
   sub module: WIFI Connect
   summary: WiFi STA connection stable test
-  test environment: SSC_T1_1
+  test environment: SSC_T1_5
   test point 1: stress + function
   test point 2: connection keep alive stress test
   version: v2 (2016-10-23)
@@ -1898,7 +2084,7 @@ test cases:
     4. SSC connect ap
   sub module: WIFI Connect
   summary: Switch channel when sending WiFi packets
-  test environment: SSC_T1_1
+  test environment: SSC_T1_5
   test point 1: stress
   test point 2: connect ap
   version: v2 (2016-10-23)
@@ -2091,7 +2277,7 @@ test cases:
     2. SSC3 connect SSC1
     3. SSC2 random set ap channel
     4. SSC1 connect SSC2
-  initial condition: T3_1
+  initial condition: T3_2
   level: Integration
   module: WIFI MAC
   steps: |-
@@ -2105,3 +2291,66 @@ test cases:
   test point 1: AP switch channel dut Connection holder Test test point
   test point 2: WIFI Connection holder test
   version: v1 (2016-10-23)
+- CI ready: 'No'
+  ID: WIFI_CONN_0504
+  SDK: All
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 sta -C -s <ap_ssid>
+    - - R SSC1 C +JAP:DISCONNECTED
+  - - SSC SSC1 sta -C -s <random_string>
+    - - R SSC1 C +JAP:OK
+      - R SSC1 C +JAP:DISCONNECTED
+  execution time: 0.0
+  expected result: |-
+    1. connect fail and found disconnect envent
+    2. connect fail and found disconnect envent
+  initial condition: STAM1
+  level: Integration
+  module: WIFI MAC
+  steps: |
+    1. DUT connects to an encrypted ap but not enter password
+    2. DUT connects to a non-existent ap but not enter password
+  sub module: WIFI Connect
+  summary: connect to AP without password test
+  test environment: SSC_T1_6
+  test point 1: basic function
+  test point 2: reconnect policy test
+  version: v1 (2016-8-15)
+- CI ready: 'No'
+  ID: WIFI_CONN_9903
+  SDK: All
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Performance
+  cmd set:
+  - IOT/WifiJAPAfterReset
+  - test_count = 10
+  - connect_timeout = 15
+  execution time: 1
+  steps: |
+    1. set sta mode
+    2. disconnect sta
+    3. sta connect ap
+    4. sta reboot
+    5. sta reconnect to ap
+  expected result: |
+    1. set succeed
+    2. disconnect succeed
+    3. connect succeed
+    4. succeed
+    5. reconnect succeed
+  initial condition: STAM1
+  level: Integration
+  module: WIFI MAC
+  sub module: WIFI Connect
+  summary: STA reconnect to AP after reset compatibility test
+  test environment: SSC_T1_IOT1
+  test point 1: Compatibility Test test point
+  test point 2: WIFI compatibility test
+  version: v1 (2016-10-23)
diff --git a/components/idf_test/integration_test/TC_IT_WIFI_MODE.yml b/components/idf_test/integration_test/TC_IT_WIFI_MODE.yml
index 67a2abadc..4b7d8362f 100644
--- a/components/idf_test/integration_test/TC_IT_WIFI_MODE.yml
+++ b/components/idf_test/integration_test/TC_IT_WIFI_MODE.yml
@@ -133,3 +133,136 @@ test cases:
   test point 1: basic function
   test point 2: wifi mode fucntion
   version: v1 (2016-8-15)
+- CI ready: 'No'
+  ID: WIFI_MODE_0104
+  SDK: All
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 op -S -o 0
+    - - R SSC1 C +MODE:OK
+  - - SSC SSC1 op -Q
+    - - R SSC1 C +CURMODE:0
+      - R SSC1 C +MODE:OK
+  - - SSC SSC1 op -S -o 1
+    - - R SSC1 C +MODE:OK
+  - - SSC SSC1 op -Q
+    - - R SSC1 C +CURMODE:1
+      - R SSC1 C +MODE:OK
+  - - SSC SSC1 op -S -o 2
+    - - R SSC1 C +MODE:OK
+  - - SSC SSC1 op -Q
+    - - R SSC1 C +CURMODE:2
+      - R SSC1 C +MODE:OK
+  - - SSC SSC1 op -S -o 3
+    - - R SSC1 C +MODE:OK
+  - - SSC SSC1 op -Q
+    - - R SSC1 C +CURMODE:3
+      - R SSC1 C +MODE:OK
+  execution time: 0.0
+  expected result: |-
+    1. set mode suc
+    2. suc
+    3. set mode suc
+    4. suc
+    5. set mode suc
+    6. suc
+    7. set mode suc
+    8. suc
+  initial condition: None
+  level: Integration
+  module: WIFI MAC
+  steps: |-
+    1. set target1 to NULL mode
+    2. check target1 mode
+    3. set target1 to sta mode
+    4. check target1 mode
+    5. set target1 to soft ap mode
+    6. check target1 mode
+    7. set target1 to softap+sta mode
+    8. check target1 mode
+  sub module: WIFI Mode
+  summary: mode switch test
+  test environment: SSC_T1_6
+  test point 1: basic function
+  test point 2: wifi mode fucntion
+  version: v1 (2016-8-15)
+- CI ready: 'No'
+  ID: WIFI_MODE_0105
+  SDK: All
+  Test App: SSC
+  allow fail: ''
+  auto test: 'Yes'
+  category: Function
+  cmd set:
+  - ''
+  - - SSC SSC1 op -W -a stop
+    - - R SSC1 C +MODE:OK
+  - - SSC SSC1 op -S -o 0
+    - - R SSC1 C +MODE:OK
+  - - SSC SSC1 op -W -a start
+    - - R SSC1 C +MODE:OK
+  - - SSC SSC1 op -S -o 1
+    - - R SSC1 C +MODE:OK
+  - - SSC SSC1 sta -C -s <ap_ssid> -p <ap_password>
+    - - R SSC1 RE "\+JAP:CONNECTED,%%s"%%(<ap_ssid>)
+  - - SSC SSC1 sta -D
+    - - R SSC1 C +JAP:DISCONNECTED
+  - - SSC SSC1 op -S -o 0
+    - - R SSC1 C +MODE:OK
+  - - SSC SSC1 op -S -o 1
+    - - R SSC1 C +MODE:OK
+  - - SSC SSC1 sta -C -s <ap_ssid> -p <ap_password>
+    - - R SSC1 RE "\+JAP:CONNECTED,%%s"%%(<ap_ssid>)
+  - - SSC SSC1 sta -D
+    - - R SSC1 C +JAP:DISCONNECTED
+  - - SSC SSC1 op -W -a stop
+    - - R SSC1 C +MODE:OK
+  - - SSC SSC1 op -S -o 3
+    - - R SSC1 C +MODE:OK
+  - - SSC SSC1 op -W -a start
+    - - R SSC1 C +MODE:OK
+  - - SSC SSC1 sta -C -s <ap_ssid> -p <ap_password>
+    - - R SSC1 RE "\+JAP:CONNECTED,%%s"%%(<ap_ssid>)
+  - - SSC SSC1 sta -D
+    - - R SSC1 C +JAP:DISCONNECTED
+  - - SSC SSC1 op -S -o 1
+    - - R SSC1 C +MODE:OK
+  - - SSC SSC1 sta -C -s <ap_ssid> -p <ap_password>
+    - - R SSC1 RE "\+JAP:CONNECTED,%%s"%%(<ap_ssid>)
+  execution time: 0.0
+  expected result: |-
+    5. connect suc
+    9. connect suc
+    14. connect suc
+    17. connect suc
+  initial condition: None
+  level: Integration
+  module: WIFI MAC
+  steps: |-
+    1. target1 WiFi stop
+    2. set target1 to null mode
+    3. target1 WiFi start
+    4. set target1 to sta mode
+    5. target1 connect ap
+    6. target1 disconnect with ap
+    7. set target1 to null mode
+    8. set target1 to sta mode
+    9. target1 connect with ap
+    10. target disconnect with ap
+    11. target WiFi stop
+    12. set target1 to sta+softap mode
+    13. target1 WiFi start
+    14. target1 connect ap
+    15. target1 disconnect with ap
+    16. set target1 to sta mode
+    17. target connect ap
+  sub module: WIFI Mode
+  summary: wifi mode switch check test
+  test environment: SSC_T1_6
+  test point 1: wifi mode basic function
+  test point 2: wifi mode check fucntion
+  version: v1 (2016-8-15)
diff --git a/components/idf_test/integration_test/TC_IT_WIFI_SCAN.yml b/components/idf_test/integration_test/TC_IT_WIFI_SCAN.yml
index f6c1cd83a..0af6f0fb7 100644
--- a/components/idf_test/integration_test/TC_IT_WIFI_SCAN.yml
+++ b/components/idf_test/integration_test/TC_IT_WIFI_SCAN.yml
@@ -541,7 +541,7 @@ test cases:
   test point 1: interaction
   test point 2: Scan interact with other WiFi operation
   version: v1 (2015-8-15)
-- CI ready: 'Yes'
+- CI ready: 'No'  # current env don't have parameter ap_channel
   ID: WIFI_SCAN_0302
   SDK: ESP32_IDF
   Test App: SSC
@@ -671,6 +671,36 @@ test cases:
   test point 1: interaction
   test point 2: Scan interact with other WiFi operation
   version: v1 (2015-8-15)
+- CI ready: 'No'
+  ID: WIFI_SCAN_0401
+  SDK: ESP32_IDF
+  Test App: SSC
+  auto test: 'No'
+  category: Function
+  cmd set: ''
+  execution time: 0.3
+  expected result: |-
+    1. the routers are configured correctly
+    3. set suc
+    5. burn suc
+    6. set mode ok and SSC connected to the open security mode ap auto
+  initial condition: None
+  level: Integration
+  module: WIFI MAC
+  steps: |-
+    1. configure four router with the same ssid and one of them security mode is open
+    2. target1 connect PC by Uart.
+    3. set the ssid of the router in the manuconfig but not the password
+    4. save the setting and compile
+    5. burn bin files
+    6. set target1 to sta mode
+    7. loop 1,2,3,4 ten times
+  sub module: WIFI Scan
+  summary: connect open security ap
+  test environment: SSC_T1_SCANSPECIFIED
+  test point 1: function
+  test point 2: connect open security mode ap
+  version: v2 (2016-11-15)
 - CI ready: 'Yes'
   ID: WIFI_SCAN_5101
   SDK: |-
@@ -682,7 +712,7 @@ test cases:
   category: Stress
   cmd set:
   - WiFiStress/WifiSCANTime
-  - - test_time = 300
+  - - test_count = 10
     - - ''
   - - active_scan_max_time = 120
     - - ''
@@ -692,8 +722,10 @@ test cases:
     - - ''
   - - scan_mode_list = ["active_scan","passive_scan"]
     - - ''
-  execution time: 5.0
-  expected result: "1. succeed\n3. scan time less than 1.15 test time "
+  execution time: 0.5
+  expected result: |-
+    1. succeed
+    3. scan time meet expectations
   initial condition: None
   level: Integration
   module: WIFI MAC
@@ -703,7 +735,7 @@ test cases:
     3. start scan ap and check scan time
   sub module: WIFI Scan
   summary: test differnt scan mode scan time
-  test environment: SSC_T1_1
+  test environment: SSC_T1_6
   test point 1: stress
   test point 2: Sta active/passive scan stress test
   version: v2 (2017-05-10)
@@ -899,33 +931,3 @@ test cases:
   test point 1: function + stress
   test point 2: quick connect ap
   version: v2 (2016-11-15)
-- CI ready: 'No'
-  ID: WIFI_SCAN_5207
-  SDK: ESP32_IDF
-  Test App: SSC
-  auto test: 'No'
-  category: Stress
-  cmd set: ''
-  execution time: 0.3
-  expected result: |-
-    1. the routers are configured correctly
-    3. set suc
-    5. burn suc
-    6. set mode ok and SSC connected to the open security mode ap auto
-  initial condition: None
-  level: Integration
-  module: WIFI MAC
-  steps: |-
-    1. configure four router with the same ssid and one of them security mode is open
-    2. target1 connect PC by Uart.
-    3. set the ssid of the router in the manuconfig but not the password
-    4. save the setting and compile
-    5. burn bin files
-    6. set target1 to sta mode
-    7. loop 1,2,3,4 ten times
-  sub module: WIFI Scan
-  summary: connect open security ap
-  test environment: SSC_T1_SCANSPECIFIED
-  test point 1: function
-  test point 2: connect open security mode ap
-  version: v2 (2016-11-15)
diff --git a/components/idf_test/integration_test/TEST_ENV_SSC.yml b/components/idf_test/integration_test/TEST_ENV_SSC.yml
index c38164938..ef6dd02d2 100644
--- a/components/idf_test/integration_test/TEST_ENV_SSC.yml
+++ b/components/idf_test/integration_test/TEST_ENV_SSC.yml
@@ -4,14 +4,7 @@
   test script: EnvBase
 
 test environment:
-- tag: SSC_T1_1
-  <<: *TEST_ENV
-  Target Count: 1
-  test environment detail: |-
-    PC has 2 wired NIC connected to AP.
-    PC has 1 WiFi NIC.
-    1 SSC DUT connect with PC by UART.
-- tag: ETH_T1_1
+- tag: SSC_T1_Ethernet
   <<: *TEST_ENV
   Target Count: 1
   test environment detail: |-
@@ -223,13 +216,6 @@ test environment:
   test environment detail: |-
     1 SSC DUT connect with PC by UART.
     One WEP share key AP placed near SSC1.
-- tag: SSC_T2_1
-  <<: *TEST_ENV
-  Target Count: 2
-  test environment detail: |-
-    PC has 1 wired NIC connected to AP.
-    PC has 1 WiFi NIC.
-    2 SSC DUTs connect with PC by UART.
 - tag: SSC_T2_2
   <<: *TEST_ENV
   Target Count: 2
@@ -285,6 +271,14 @@ test environment:
     refer to figure.
     2 SSC DUT connect with PC by UART. Put DUT board to different Shield boxes.
     2 shield boxes are connected with programmable attenuator.
+- tag: SSC_T2_Sleep1
+  <<: *TEST_ENV
+  Special: Y
+  Target Count: 1
+  test environment detail: |
+    Multimeter connected with DUT1 to measure its current consumption.
+    DUT1 placed near DUT1.
+    AP placed near DUT1, PC connected with AP with wired NIC.
 - tag: SSC_T2_Sniffer
   <<: *TEST_ENV
   PC OS: 'linux'