You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2019/10/02 07:25:20 UTC

[mynewt-nimble] branch master updated: host/pts: upgrade test instructions

This is an automated email from the ASF dual-hosted git repository.

janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git


The following commit(s) were added to refs/heads/master by this push:
     new 2307c1f  host/pts: upgrade test instructions
2307c1f is described below

commit 2307c1f5a58f00c724b9f999df81e83ad2b0b36a
Author: Agata Ponitka <ag...@codecoup.pl>
AuthorDate: Wed Oct 2 08:45:16 2019 +0200

    host/pts: upgrade test instructions
    
    Upgrade instructions and results test cases in pts.
---
 nimble/host/pts/pts-gap.txt  | 689 ++++++++++++++++++---------------------
 nimble/host/pts/pts-gatt.txt | 756 +++++++++++++++++++++----------------------
 2 files changed, 681 insertions(+), 764 deletions(-)

diff --git a/nimble/host/pts/pts-gap.txt b/nimble/host/pts/pts-gap.txt
index e7770e3..29ed244 100644
--- a/nimble/host/pts/pts-gap.txt
+++ b/nimble/host/pts/pts-gap.txt
@@ -1,7 +1,7 @@
 PTS test results for GAP
 
-PTS version: 7.0
-Tested: 18-Jul-2017
+PTS version: 7.5.0
+Tested: 27-Sept-2019
 
 Results:
 PASS	test passed
@@ -12,417 +12,356 @@ N/A	test is disabled due to PICS setup
 -------------------------------------------------------------------------------
 Test Name		Result	Notes
 -------------------------------------------------------------------------------
-TC_MOD_NDIS_BV_01_C	N/A
-TC_MOD_LDIS_BV_01_C	N/A
-TC_MOD_LDIS_BV_02_C	N/A
-TC_MOD_LDIS_BV_03_C	N/A
-TC_MOD_GDIS_BV_01_C	N/A
-TC_MOD_GDIS_BV_02_C	N/A
-TC_MOD_NCON_BV_01_C	N/A
-TC_MOD_CON_BV_01_C	N/A
--------------------------------------------------------------------------------
 
-TC_BROB_BCST_BV_01_C	PASS	b adv conn=non
-TC_BROB_BCST_BV_02_C	PASS	b adv conn=non
-TC_BROB_BCST_BV_03_C	PASS	b set irk=<IRK> e.g: 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:11
+GAP/BROB/BCST/BV-01-C	PASS	advertise-configure legacy=1 connectable=0 scannable=0
+GAP/BROB/BCST/BV-02-C	PASS	advertise-configure legacy=1 connectable=0 scannable=0
+
+GAP/BROB/BCST/BV-03-C	PASS	set irk=<IRK> e.g: 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:11
 				Note: in PTS IXIT please set:
 				TSPX_iut_device_IRK_for_resolvable_privacy_address_generation_procedure=11000000000000000000000000000000
-				b set adv_data flags=4
-				b adv conn=non disc=non own_addr_type=rpa_pub
-TC_BROB_BCST_BV_04_C	PASS
-				TSPX_advertising_data=07086E696D626C65
-				set-adv-data name=nimble
-                set addr_type=random addr=01:3e:56:f7:46:21
-				advertise conn=non own_addr_type=random
-TC_BROB_BCST_BV_05_C	PASS
-				TSPX_advertising_data=07086E696D626C65
-				TSPX_iut_device_IRK_for_resolvable_privacy_address_generation_procedure=11000000000000000000000000000000
-				set-adv-data name=nimble
-				set irk=00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:11
-				advertise conn=non own_addr_type=rpa_pub
-TC_BROB_OBSV_BV_01_C	PASS	b scan passive
-TC_BROB_OBSV_BV_02_C	PASS	b scan
-TC_BROB_OBSV_BV_03_C	N/A
-TC_BROB_OBSV_BV_04_C	N/A
-TC_BROB_OBSV_BV_05_C	N/A
-TC_BROB_OBSV_BV_06_C	N/A
+				set advertise-set-adv-data name=<name> flags=4
+				advertise-configure connectable=0 scannable=0 own_addr_type=rpa_pub
+GAP/BROB/BCST/BV-04-C	PASS    TSPX_advertising_data=07086E696D626C65
+				advertise-set-adv-data name=nimble
+				set addr_type=random addr=01:3e:56:f7:46:21
+				advertise-configure connectable=0 scannable=0 own_addr_type=random
+GAP/BROB/BCST/BV-05-C	N/A
+GAP/BROB/OBSV/BV-01-C	PASS	scan passive
+GAP/BROB/OBSV/BV-02-C	PASS	scan
+GAP/BROB/OBSV/BV-03-C	PASS	scan
+GAP/BROB/OBSV/BV-04-C	PASS	connect peer_addr=<addr>
+				security-set-data bonding=1
+				security-pair conn=<handle>
+				<OK>
+				<OK>
+GAP/BROB/OBSV/BV-05-C	PASS	scan own_addr_type=rpa_pub
+GAP/BROB/OBSV/BV-06-C	PASS	scan own_addr_type=rpa_pub
 -------------------------------------------------------------------------------
 
-TC_DISC_NONM_BV_01_C	PASS	b adv conn=non disc=non
-TC_DISC_NONM_BV_02_C	PASS	b adv conn=und disc=non
-TC_DISC_LIMM_BV_01_C	N/A
-TC_DISC_LIMM_BV_02_C	N/A
-TC_DISC_LIMM_BV_03_C	PASS	b set adv_data flags=5
-				b adv conn=non disc=ltd
-TC_DISC_LIMM_BV_04_C	PASS	b set adv_data flags=5
-				b adv conn=und disc=ltd
-TC_DISC_GENM_BV_01_C	N/A
-TC_DISC_GENM_BV_02_C	N/A
-TC_DISC_GENM_BV_03_C	PASS	b set adv_data flags=6
-				b adv conn=non disc=gen
-TC_DISC_GENM_BV_04_C	PASS	b set adv_data flags=6
-				b adv conn=und disc=gen
-TC_DISC_LIMP_BV_01_C	PASS	b scan ltd=1 nodups=1
-TC_DISC_LIMP_BV_02_C	PASS	b scan ltd=1 nodups=1
-TC_DISC_LIMP_BV_03_C	PASS	b scan ltd=1 nodups=1
-TC_DISC_LIMP_BV_04_C	PASS	b scan ltd=1 nodups=1
-TC_DISC_LIMP_BV_05_C	PASS	b scan ltd=1 nodups=1
-TC_DISC_GENP_BV_01_C	PASS	b scan nodups=1
-TC_DISC_GENP_BV_02_C	PASS	b scan nodups=1
-TC_DISC_GENP_BV_03_C	PASS    b scan nodups=1
-				verify that PTS has note: "Non discoverable mode"
-TC_DISC_GENP_BV_04_C	PASS	b scan nodups=1
-				verify that PTS has note: "Non discoverable mode"
-TC_DISC_GENP_BV_05_C	PASS	b scan nodups=1
-				verify that advertising event has: "Connection directed advertising event"
-TC_DISC_RPA_BV_01_C	N/A
+GAP/DISC/NONM/BV-01-C	PASS	advertise-configure connectable=0 legacy=1 adverdise=non
+GAP/DISC/NONM/BV-02-C	PASS	advertise-configure connectable=0
+
+GAP/DISC/LIMM/BV-01-C	N/A
+GAP/DISC/LIMM/BV-02-C	N/A
+GAP/DISC/LIMM/BV-03-C	PASS	advertise-configure legacy=1 connectable=0
+				advertise-set-adv-data flags=5
+				advertise-start duration= e.g.3000
+GAP/DISC/LIMM/BV-04-C	PASS	advertise-configure legacy=1 connectable=0
+				advertise-set-adv-data flags=5
+				advertising-start duration=<e.g.3000>
+GAP/DISC/GENM/BV-01-C	N/A
+GAP/DISC/GENM/BV-02-C	N/A
+GAP/DISC/GENM/BV-03-C	PASS	advertise-configure legacy=1 connectable=0
+				advertise-set-adv-data flags=6
+				advertise-start
+GAP/DISC/GENM/BV-04-C	PASS	advertise-configure legacy=1 connectable=0
+				advertise-set-adv-data flags=6
+				advertising-start
+
+GAP/DISC/LIMP/BV-01-C	PASS	scan limited=1 nodups=1
+GAP/DISC/LIMP/BV-02-C	PASS	scan limited=1 nodups=1
+GAP/DISC/LIMP/BV-03-C	PASS	scan limited=1 nodups=1
+GAP/DISC/LIMP/BV-04-C	PASS	scan limited=1 nodups=1
+GAP/DISC/LIMP/BV-05-C	PASS	scan limited=1 nodups=1
+
+GAP/DISC/GENP/BV-01-C	PASS	scan nodups=1
+GAP/DISC/GENP/BV-02-C	PASS	scan nodups=1
+GAP/DISC/GENP/BV-03-C	PASS	scan nodups=1
+				<OK>
+GAP/DISC/GENP/BV-04-C	PASS	scan nodups=1
+				<OK>
+GAP/DISC/GENP/BV-05-C	PASS	scan nodups=1
+
+GAP/DISC/RPA/BV-01-C	N/A		scan nodups=1
 -------------------------------------------------------------------------------
 
-TC_IDLE_GIN_BV_01_C	N/A
-TC_IDLE_LIN_BV_01_C	N/A
-TC_IDLE_NAMP_BV_01_C	PASS	<answer NO to role question>
-				b adv
-				b disc svc conn=<handle>
-				b show chr
+GAP/IDLE/GIN/BV-01-C	N/A
+GAP/IDLE/GIN/BV-02-C	N/A
+GAP/IDLE/NAMP/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertising-start
+				gatt-discover-full conn=<handle>
+				gatt-show
 				<check start end handle for 0x1800>
-				b read conn=<handle> uuid=0x2a00 start=<start> end=<end>
-				b term conn=<handle>
-TC_IDLE_NAMP_BV_02_C	PASS	<answer NO to role question>
-				b adv
+				gatt-read conn=<handle> uuid=0x2a00 start=<start> end=<end>
+				disconnect conn=<handle>
+GAP/IDLE/NAMP/BV-02-C	PASS	<answer NO to role question>
+				advertise-configure connectable=1 legacy=1
+				advertising-start
+GAP/IDLE/DED/BV-01-C	N/A
+GAP/IDLE/DED/BV-02-C	N/A
 -------------------------------------------------------------------------------
 
-TC_CONN_NCON_BV_01_C	PASS	b adv conn=non
-TC_CONN_NCON_BV_02_C	PASS	b set adv_data flags=6
-				b adv conn=non disc=gen
-TC_CONN_NCON_BV_03_C	PASS	b set adv_data flags=5
-				b adv conn=non disc=ltd
-TC_CONN_DCON_BV_01_C	PASS	b adv conn=dir peer_addr_type=public peer_addr=<addr>
-TC_CONN_DCON_BV_02_C	N/A
-TC_CONN_DCON_BV_03_C	N/A
-TC_CONN_UCON_BV_01_C	PASS	b adv conn=und disc=non
-TC_CONN_UCON_BV_02_C	PASS	b adv conn=und disc=gen
-TC_CONN_UCON_BV_03_C	PASS	b adv conn=und disc=ltd
-TC_CONN_UCON_BV_04_C	N/A
-TC_CONN_UCON_BV_05_C	N/A
-TC_CONN_UCON_BV_06_C	PASS	b set adv_data flags=6
-				b set sm_data bonding=1 our_key_dist=7 their_key_dist=7
-				b set irk=<IRK> e.g: 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:11
-				Note: in PTS IXIT please set:
-				TSPX_iut_device_IRK=11000000000000000000000000000000
-				TSPX_iut_private_address_interval=5000
-				set BLE_RPA_TIMEOUT: 5 in syscfg.yml
-				b adv own_addr_type=rpa_pub
-                <wait for 5 seconds>
-				b adv own_addr_type=rpa_pub
-TC_CONN_ACEP_BV_01_C	PASS	b wl addr=<addr> addr_type=public
-				b conn addr_type=wl
-				b term conn=<handle>
-TC_CONN_ACEP_BV_02_C	PASS
-				set addr_type=random addr=<NRPA> e.g: 01:3e:56:f7:46:21
-				white-list addr=<PTS-ADDR> addr_type=public
+GAP/CONN/NCON/BV-01-C	PASS	advertise-configure connectable=0 legacy=1
+				advertising-start
+GAP/CONN/NCON/BV-02-C	PASS	advertise-configure connectable=0 legacy=1
+				advertise-set-adv-data flags=6
+				advertise-start
+GAP/CONN/NCON/BV-03-C	PASS	advertise-configure connectable=0 legacy=1
+				advertise-set-adv-data flags=5
+				advertise-start
+
+GAP/CONN/DCON/BV-01-C	PASS	advertise-configure connectable=0 directed=1 peer_addr=<addr>
+				advertise-start
+GAP/CONN/DCON/BV-02-C	N/A
+GAP/CONN/DCON/BV-03-C	N/A
+
+GAP/CONN/UCON/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=4
+				advertise-start
+GAP/CONN/UCON/BV-02_C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=5
+				advertise-start
+GAP/CONN/UCON/BV-03_C	PASS	adbertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+GAP/CONN/UCON/BV-04_C	N/A
+GAP/CONN/UCON/BV-05_C	N/A
+GAP/CONN/UCON/BV-06_C	N/A
+
+GAP/CONN/ACEP/BV-01-C	PASS	white-list addr_type=public addr=<addr>
 				connect
-				Note: Discover Reconnect Address Characteristic and use value handle
-				gatt-write conn=1 attr=7 value=21:46:f7:56:3e:01
+				disconnect conn=<handle>
+GAP/CONN/ACEP/BV-02-C	N/A
+
+GAP/CONN/GCEP/BV-01-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+GAP/CONN/GCEP/BV-02-C	PASS	connect peer_addr=<addr>
+GAP/CONN/GCEP/BV-03-C	PASS	set irk=<irk>
+				connect peer_addr=<addr> own_addr_type=rpa_pub
+				security-set-data bonding=1 our_key_dist=7 their_key_dist=7
+				security-pair conn=<handle>
+				connect peer_addr=<addr>
 				disconnect conn=1
-				white-list addr=01:3e:56:f7:46:21 addr_type=random
-				connect own_addr_type=random
-TC_CONN_ACEP_BV_03_C	INCONC
-				PTS 7.3.0 requires IUT to be able to add PTS's Identity
-				to resolv list without pairing
-TC_CONN_ACEP_BV_04_C	INCONC
-				PTS 7.3.0 requires IUT to be able to add PTS's Identity
-				to resolv list without pairing
-TC_CONN_GCEP_BV_01_C	PASS	b conn peer_addr=<addr>
-				b term conn=<handle>
-TC_CONN_GCEP_BV_02_C	PASS	b conn peer_addr=<addr>
-				b term conn=<handle>
-TC_CONN_GCEP_BV_03_C	N/A
-TC_CONN_GCEP_BV_04_C	N/A
-TC_CONN_GCEP_BV_05_C	INCONC
-				PTS 7.3.0 requires IUT to be able to add PTS's Identity
-				to resolv list without pairing
-TC_CONN_GCEP_BV_06_C	INCONC
-				PTS 7.3.0 requires IUT to be able to add PTS's Identity
-				to resolv list without pairing
-TC_CONN_SCEP_BV_01_C	PASS	b wl addr=<addr> addr_type=public
-				b conn addr_type=wl
-				b term conn=<handle>
-TC_CONN_SCEP_BV_02_C	N/A
-TC_CONN_SCEP_BV_03_C	INCONC
-				PTS 7.3.0 requires IUT to be able to add PTS's Identity
-				to resolv list without pairing
-TC_CONN_DCEP_BV_01_C	PASS	b conn peer_addr=<addr>
-				b term conn=<handle>
-TC_CONN_DCEP_BV_02_C	N/A
-TC_CONN_DCEP_BV_03_C	PASS	b conn peer_addr=<addr>
-				b term conn=<handle>
-TC_CONN_DCEP_BV_04_C	N/A
-TC_CONN_DCEP_BV_05_C	INCONC
-				PTS 7.3.0 requires IUT to be able to add PTS's Identity
-				to resolv list without pairing
-TC_CONN_DCEP_BV_06_C	INCONC
-				PTS 7.3.0 requires IUT to be able to add PTS's Identity
-				to resolv list without pairing
-TC_CONN_CPUP_BV_01_C	PASS	b adv
-				b l2cap update conn=<handle>
-TC_CONN_CPUP_BV_02_C	PASS	b adv
-				b l2cap update conn=<handle>
-TC_CONN_CPUP_BV_03_C	PASS	b adv
-				b l2cap update conn=<handle>
-TC_CONN_CPUP_BV_04_C	PASS	b conn peer_addr=<addr>
-				b term conn=<handle>
-TC_CONN_CPUP_BV_05_C	PASS	b conn peer_addr=<addr>
-				b term conn=<handle>
-TC_CONN_TERM_BV_01_C	PASS	<answer NO to role question>
-				b adv conn=und disc=non
-				b term conn=1
-TC_CONN_PRDA_BV_01_C	PASS	b set adv_data flags=6
-				b set sm_data bonding=1 our_key_dist=7 their_key_dist=7
-				b set irk=<IRK> e.g: 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:11
-				Note: in PTS IXIT please set:
-					TSPX_uit_device_IRK=11000000000000000000000000000000
-				b adv
-				b term conn=<handle>
-				b adv own_addr_type=rpa_pub
-				b term conn=<handle>
-				b adv own_addr_type=rpa_pub
-				b term conn=<handle>
-TC_CONN_PRDA_BV_02_C	N/A
--------------------------------------------------------------------------------
+GAP/CONN/GCEP/BV-04-C	N/A
+GAP/CONN/SCEP/BV-01-C	PASS	white-list addr_type=public addr=<addr>
+				connect
+				disconnect conn=<handle>
+GAP/CONN/SCEP/BV-02-C	INC
+GAP/CONN/DCEP/BV-01-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+GAP/CONN/DCEP/BV-02-C	INC
+GAP/CONN/DCEP/BV-03-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+GAP/CONN/DCEP/BV-04-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
 
-TC_BOND_NBON_BV_01_C	PASS	b set sm_data bonding=0
-				b conn peer_addr=<addr>
+GAP/CONN/CPUP/BV-01-C	PASS	advertise-start
+				conn-update-params conn=<handle>
+GAP/CONN/CPUP/BV-02-C	PASS	advertise-start
+				conn-update-params conn=<handle>
+GAP/CONN/CPUP/BV-03-C	PASS	advertise-start
+				conn-update-params conn=<handle>
+GAP/CONN/CPUP/BV-04-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+GAP/CONN/CPUP/BV-05-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+GAP/CONN/CPUP/BV-06-C	PASS	conect peer_addr=<addr>
+				conn-update-params conn=<handle> eg.latency=20
+				disconnect conn=<handle>
+GAP/CONN/CPUP/BV-08-C	PASS	advertise-configure legacy=1 connectable=1
+				advertise-set-data name=<name>
+				advertise-start
+
+GAP/CONN/TERM/BV-01-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+GAP/CONN/PRDA/BV-01-C	N/A
+GAP/CONN/PRDA/BV-02-C	N/A
+-------------------------------------------------------------------------------
+GAP/BOND/NBON/BV-01-C	PASS	security-set-data bonding=0
+				connect peer_addr=<addr>
 				<ok>
-				b conn peer_addr=<addr>
+				connect peer_addr=<addr>
 				<ok>
-TC_BOND_NBON_BV_02_C	PASS	b conn peer_addr=<addr>
-				b sec pair conn=<handle>
+GAP/BOND/NBON/BV-02-C	PASS	security-set-data bonding=0
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
 				<ok>
-				b conn peer_addr=<addr>
-				b sec pair conn=<handle>
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
 				<ok>
-TC_BOND_NBON_BV_03_C	PASS	b adv conn=und
+GAP/BOND/NBON/BV-03-C	PASS	security-set-data bonding=0
+				advertise-configure legacy=1 connectable=1
+				advertise-set-data name=<name>
+				advertise-start
+				<ok>
+
+GAP/BOND/BON/BV-01-C	PASS	security-set-data bonding=1 sc=1 our_key_dist=7 their_key_dist=7
+				advertise-configure legacy=1 connectable=1
+				advertise-start
+				security-start conn=<handle>
 				<ok>
-TC_BOND_BON_BV_01_C	PASS	b set sm_data bonding=1
-				b adv
-				b sec start conn=<handle>
-                <ok>
-				b adv
+				advertise-start
 				<ok>
-TC_BOND_BON_BV_02_C	PASS	b set sm_data bonding=1
-				b conn peer_addr=<addr>
-				b sec pair conn=<handle>
-                <ok>
-				b conn peer_addr=<addr>
-				b sec pair conn=<handle>
-                <ok>
-TC_BOND_BON_BV_03_C	PASS	b set sm_data bonding=1 our_key_dist=7 their_key_dist=7
-				b adv
+GAP/BOND/BON/BV-02-C	PASS	security-set-data bonding=1
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
 				<ok>
-				b adv
+				connect peer_addr=<addr>
+				seccurity-pair conn=<handle>
 				<ok>
-TC_BOND_BON_BV_04_C	PASS	b set sm_data bonding=1
-				b conn peer_addr=<addr>
-				b term conn=<handle>
-				b conn peer_addr=<addr>
-				b sec pair conn=<handle>
-				b term conn=<handle>
+GAP/BOND/BON/BV-03-C	PASS	security-set-sm-data bonding=1 our_key_dist=7 their_key_dist=7
+				advertise-configure legacy=1 connectable=1
+				advertise-start
+				<ok>
+				advertise-start
+				<ok>
+GAP/BOND/BON/BV-04-C	PASS	security-set-data bonding=1
+				connect-peer_addr=<addr>
+				disconnect conn=<handle>
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=<handle>
 -------------------------------------------------------------------------------
 
-TC_SEC_AUT_BV_11_C	PASS	b set sm_data io_capabilities=1
-				b adv
+GAP/SEC/AUT/BV-11-C	PASS	security-set-data io_capabilities=1 sc=1
+				advertise-configure legacy=1 connectable=1
+				advertising-start
 				Note: in PTS enter handle for characteristics
-				      value which requires encryption for read
-				b passkey conn=<handle> action=3 key=123456
+				      value which requires encryption for read (gatt-show-local)
+				auth-passkey conn=<handle> action=3 key=123456
 				Note: enter '123456' passkey in PTS
-TC_SEC_AUT_BV_12_C	PASS	b set sm_data io_capabilities=1
-				b conn peer_addr=<addr>
-				b disc svc conn=<handle>
+GAP/SEC/AUT/BV-12-C	PASS	security-set-data io_capabilities=1 bonding=1 mitm_flag=1 sc=1 our_key_dist=7 their_key_dist=7
+				connect peer_addr=<addr>
+				gatt-show-local
 				Note: in PTS enter handle for characteristics
 				      value which requires encryption for read
-TC_SEC_AUT_BV_13_C	PASS	Note: in PTS confirm that IUT supports GATT Server
-				b set sm_data mitm_flag=1
-				b set sm_data io_capabilities=1
-				b conn peer_addr=<addr>
-				b disc svc conn=<handle>
+				auth-passkey conn=<handle> action=3 key=123456
+				Note: enter '123456' passkey in PTS
+GAP/SEC/AUT/BV-13-C	PASS	Note: in PTS confirm that IUT supports GATT Server
+				security-set-data io_capabilities=1 bonding=1 mitm_flag=1 sc=1 our_key_dist=7 their_key_dist=7
+				connect peer_addr=<addr>
+				gatt-show-local
 				Note: in PTS enter handle for characteristics
-				      value which requires authenticated
-				      pairing for read
-				b passkey conn=<handle> action=3 key=123456
+				      value which requires authenticated pairing for read
+				auth-passkey conn=<handle> action=3 key=123456
 				Note: enter '123456' passkey in PTS
-TC_SEC_AUT_BV_14_C	PASS	b set sm_data io_capabilities=1
-				b adv
+GAP/SEC/AUT/BV-14-C	PASS	security-set-data io_capabilities=1
+				advertise-configure legacy=1 connectable=1
+				advertise-start
+				gatt-show-local
 				Note: in PTS enter handle for characteristics
-				      value which requires authenticated
-				      pairing for read
-				b passkey conn=<handle> action=3 key=123456
+				      value which requires authenticated pairing for read
+				auth-passkey conn=<handle> action=3 key=123456
 				Note: enter '123456' passkey in PTS
-				Note: enter handle for characteristics value which
-				      requires authentication
-TC_SEC_AUT_BV_15_C	N/A
-TC_SEC_AUT_BV_16_C	N/A
-TC_SEC_AUT_BV_17_C	PASS	b conn peer_addr=<addr>
-				b disc full conn=<handle>
-				b read conn=<handle> attr=<val_handle>
-				b set sm_data bonding=1
-				b sec pair conn=<handle>
-                b term conn=1
-TC_SEC_AUT_BV_18_C	PASS	b adv
-				b disc full conn=<handle>
-				b read conn=<handle> attr=<val_handle>
-				b sec start conn=<handle>
-				b read conn=<handle> attr=<val_handle>
-TC_SEC_AUT_BV_19_C	PASS	b conn peer_addr=<addr>
-				b sec pair conn=<handle>
-				<ok>
-				b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle>
-				b sec pair conn=<handle>
-				b read conn=<handle> attr=<val_handle>
-				b term conn=<handle>
-TC_SEC_AUT_BV_20_C	PASS	b adv
-				<ok>
-				b adv
-				b read conn=<handle> attr=<val_handle>
-				b set sm_data bonding=1
-				b sec start conn=<handle>
-				b read conn=<handle> attr=<val_handle>
-TC_SEC_AUT_BV_21_C	PASS	b set sm_data bonding=1
-				b set sm_data our_key_dist=1
-				b set sm_data their_key_dist=1
-				b conn peer_addr=<addr>
-				b sec pair conn=<handle>
-				<ok>
-				b conn peer_addr=<addr>
-				b sec start conn=<handle>
-				b term conn=<handle>
-TC_SEC_AUT_BV_22_C	PASS	b set sm_data bonding=1
-				b set sm_data our_key_dist=1
-				b set sm_data their_key_dist=1
-				b adv
-				<ok>
-				b adv
-				b sec start conn=1
-				<ok>
-TC_SEC_AUT_BV_23_C	PASS	b set sm_data bonding=1
-				b set sm_data our_key_dist=1
-				b set sm_data their_key_dist=1
-				b adv
-				b adv
+GAP/SEC/AUT/BV-15-C	N/A	security-set-data bonding=1 io_capabilities=4 mitm_flag=1 sc=1 our_key_dist=7 their_key_dist=7
+				advertise-configure legacy=1 connectable=1
+				advertise-start
+				auth-passkey conn=<handle> action=2 key=<key>
+				advertise-start
+				gatt-show-local
 				Note: in PTS enter handle for characteristics
-				      value which requires encryption for read
-TC_SEC_AUT_BV_24_C	PASS	b set sm_data bonding=1
-				b set sm_data our_key_dist=1
-				b set sm_data their_key_dist=1
-				b conn peer_addr=<addr>
-				b term conn=<handle>
-				b conn peer_addr=<addr>
+				      value which requires authenticated pairing for read
+GAP/SEC/AUT/BV-16-C	N/A	security-set-data io_capabilities=1 bonding=1 mitm_flag=1 sc=1 our_key_dist=7 their_key_dist=7
+				connect peer_addr=<addr>
+				auth-passkey conn=<handle> action=3 key=123456
+				Note: enter '123456' passkey in PTS
+				connect peer_addr=<addr>
+				gatt-show-local
 				Note: in PTS enter handle for characteristics
-				      value which requires encryption for read
-TC_SEC_CSIGN_BV_01_C	N/A
-TC_SEC_CSIGN_BV_02_C	N/A
-TC_SEC_CSIGN_BI_01_C	N/A
-TC_SEC_CSIGN_BI_02_C	N/A
-TC_SEC_CSIGN_BI_03_C	N/A
-TC_SEC_CSIGN_BI_04_C	N/A
--------------------------------------------------------------------------------
+				      value which requires authenticated pairing for read
+GAP/SEC/AUT/BV-17-C	N/A
+GAP/SEC/AUT/BV-18-C	N/A
+GAP/SEC/AUT/BV-19-C	N/A
+GAP/SEC/AUT/BV-20-C	N/A
+GAP/SEC/AUT/BV-21-C	N/A
+GAP/SEC/AUT/BV-22-C	N/A
+GAP/SEC/AUT/BV-23-C	N/A
+GAP/SEC/AUT/BV-24-C	N/A
 
-TC_PRIV_CONN_BV_01_C	N/A
-TC_PRIV_CONN_BV_02_C	N/A
-TC_PRIV_CONN_BV_03_C	N/A
-TC_PRIV_CONN_BV_04_C	N/A
-TC_PRIV_CONN_BV_05_C	N/A
-TC_PRIV_CONN_BV_06_C	N/A
-TC_PRIV_CONN_BV_07_C	N/A
-TC_PRIV_CONN_BV_08_C	N/A
-TC_PRIV_CONN_BV_09_C	N/A
-TC_PRIV_CONN_BV_10_C	PASS
-				b set adv_data flags=6
-				b set sm_data io_capabilities=1 mitm_flag=1
-				b set sm_data bonding=1 our_key_dist=7 their_key_dist=7
-				b set irk=<IRK> e.g: 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:11
-				Note: in PTS IXIT please set:
-					TSPX_uit_device_IRK=11000000000000000000000000000000
-				TSPX_iut_private_address_interval=5000
-				set BLE_RPA_TIMEOUT: 5 in syscfg.yml
-				b adv
-				b passkey conn=<handle> action=3 key=123456
-				Note: enter '123456' passkey in PTS
-				b term conn=<handle>
-				b adv own_addr_type=rpa_pub
-                <wait for 5 seconds>
-				b adv own_addr_type=rpa_pub
-				b term conn=<handle>
-TC_PRIV_CONN_BV_11_C	N/A
+GAP/SEC/CSIGN/BV-01-C	N/A
+GAP/SEC/CSIGN/BV-02-C	N/A
+
+GAP/SEC/CSIGN/BI-01-C	N/A
+GAP/SEC/CSIGN/BI-02-C	N/A
+GAP/SEC/CSIGN/BI-03-C	N/A
+GAP/SEC/CSIGN/BI-04-C	N/A
 -------------------------------------------------------------------------------
 
-TC_ADV_BV_01_C		PASS	b set adv_data uuid16=0x1802
-				b adv
-                                b adv stop
-TC_ADV_BV_02_C		PASS	b set adv_data name=nimble
-				b adv
-                                b adv stop
-TC_ADV_BV_03_C		PASS	b set adv_data flags=6
-				b adv
-                                b adv stop
-TC_ADV_BV_04_C		PASS	b set adv_data mfg_data=ff:ff
-				b adv
-                                b adv stop
-TC_ADV_BV_05_C		PASS	b set adv_data tx_pwr_lvl=10
-				b adv
-                                b adv stop
-TC_ADV_BV_08_C		PASS	b set adv_data slave_itvl_range=00:00:ff:ff
-				b adv
-                                b adv stop
-TC_ADV_BV_09_C		N/A
-TC_ADV_BV_10_C		PASS	b set adv_data svc_data_uuid16=18:02:ff:ff
-				b adv
-                                b adv stop
-TC_ADV_BV_11_C		PASS	b set adv_data appearance=12
-				b adv
-                                b adv stop
-TC_ADV_BV_12_C		PASS	b set adv_data public_tgt_addr=<addr>
-				b adv
-                                b adv stop
-TC_ADV_BV_13_C		N/A
-TC_ADV_BV_14_C		PASS	b set adv_data adv_itvl=2
-				b adv
-                                b adv stop
-TC_ADV_BV_15_C		N/A
-TC_ADV_BV_16_C		N/A
-TC_ADV_BV_17_C		PASS
- 				TSPX_URI=<bytes>
- 				set-adv-data uri=<bytes>
- 				advertise
+GAP/PRIV/CONN/BV-01-C	N/A
+GAP/PRIV/CONN/BV-02-C	N/A
+GAP/PRIV/CONN/BV-03-C	N/A
+GAP/PRIV/CONN/BV-04-C	INC
+GAP/PRIV/CONN/BV-05-C	N/A
+GAP/PRIV/CONN/BV-06-C	N/A
+GAP/PRIV/CONN/BV-07-C	N/A
+GAP/PRIV/CONN/BV-08-C	N/A
+GAP/PRIV/CONN/BV-09-C	N/A
+GAP/PRIV/CONN/BV-10-C	N/A
+GAP/PRIV/CONN/BV-11-C	N/A
 -------------------------------------------------------------------------------
 
-TC_GAT_BV_01_C		PASS	<answer NO to role question>
-				b adv
-TC_GAT_BV_02_C		N/A
-TC_GAT_BV_03_C		N/A
-TC_GAT_BV_04_C		N/A
-TC_GAT_BV_05_C		N/A
-TC_GAT_BV_06_C		N/A
-TC_GAT_BV_07_C		N/A
-TC_GAT_BV_08_C		N/A
+GAP/ADV/BV-01-C		PASS	advertise-set-adv_data uuid16=0x1802
+				advertise-start
+				advertise-stop
+GAP/ADV/BV-02-C		PASS	advertise-set-adv_data name=<name>
+				advertise-start
+				advertise-stop
+GAP/ADV/BV-03-C		PASS	advertise-set-adv_data flags=6
+				advertise-start
+				advertise-stop
+GAP/ADV/BV-04-C		PASS	advertise-set-adv_data mfg_data=ff:ff
+				advertise-start
+				advertise-stop
+GAP/ADV/BV-05-C		PASS	advertise-set-adv_data tx_pwr_lvl=10
+				advertise-start
+				advertise-stop
+GAP/ADV/BV-08-C		N/A
+GAP/ADV/BV-09-C		N/A
+GAP/ADV/BV-10-C		PASS	advetrise-set-adv_data service_data_uuid16=18:02:ff:ff
+				advertise-start
+				advertise-stop
+GAP/ADV/BV-11-C		PASS	advertise-set -dv_data appearance=12
+				advertise-start
+				advertise-stop
+GAP/ADV/BV-12-C		N/A
+GAP/ADV/BV-13-C		N/A
+GAP/ADV/BV-14-C		N/A
+GAP/ADV/BV-15-C		N/A
+GAP/ADV/BV-16-C		N/A
+GAP/ADV/BV-17-C		PASS	In PTS: TSPX_URI=<bytes>
+				set-adv-data uri=<bytes>
+				advertise-start
+				advertise-stop
 -------------------------------------------------------------------------------
 
-TC_DM_NCON_BV_01_C	N/A
-TC_DM_CON_BV_01_C	N/A
-TC_DM_NBON_BV_01_C	N/A
-TC_DM_BON_BV_01_C	N/A
-TC_DM_GIN_BV_01_C	N/A
-TC_DM_LIN_BV_01_C	N/A
-TC_DM_NAD_BV_01_C	N/A
-TC_DM_NAD_BV_02_C	N/A
-TC_DM_LEP_BV_01_C	N/A	PTS Errata 15174
-TC_DM_LEP_BV_02_C	N/A
-TC_DM_LEP_BV_04_C	N/A
-TC_DM_LEP_BV_05_C	N/A
-TC_DM_LEP_BV_06_C	N/A
-TC_DM_LEP_BV_07_C	N/A
-TC_DM_LEP_BV_08_C	N/A
-TC_DM_LEP_BV_09_C	N/A
-TC_DM_LEP_BV_10_C	N/A
-TC_DM_LEP_BV_11_C	N/A
+GAP/GAT/BV-01-C		PASS	<if NO>
+				advertising-start
+				<if YES>
+				connect peer_addr=<addr>
+GAP/GAT/BV-02-C		N/A
+GAP/GAT/BV-03-C		N/A
+GAP/GAT/BV-04-C		PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GAP/GAT/BV-05-C		N/A
+GAP/GAT/BV-06-C		N/A
+GAP/GAT/BV-07-C		N/A
+GAP/GAT/BV-08-C		N/A
+----------------------------------------------------------------------------
+
+GAP/DM/NCON/BV-01-C	N/A
+GAP/DM/CON/BV-01-C	N/A
+GAP/DM/NBON/BV-01-C	N/A
+GAP/DM/BON/BV-01-C	N/A
+GAP/DM/GIN/BV-01-C	N/A
+GAP/DM/LIN/BV-01-C	N/A
+GAP/DM/NAD/BV-01-C	N/A
+GAP/DM/NAD/BV-02-C	N/A
+GAP/DM/LEP/BV-01-C	N/A
+GAP/DM/LEP/BV-02-C	N/A
+GAP/DM/LEP/BV-04-C	N/A
+GAP/DM/LEP/BV-05-C	N/A
+GAP/DM/LEP/BV-06-C	N/A
+GAP/DM/LEP/BV-07-C	N/A
+GAP/DM/LEP/BV-08-C	N/A
+GAP/DM/LEP/BV-09-C	N/A
+GAP/DM/LEP/BV-10-C	N/A
+GAP/DM/LEP/BV-11-C	N/A
 -------------------------------------------------------------------------------
+
+GAP/MOD/NDIS/BV-01-C	N/A
+GAP/MOD/LDIS/BV-01-C	N/A
+GAP/MOD/LDIS/BV-02-C	N/A
+GAP/MOD/LDIS/BV-03-C	N/A
+GAP/MOD/GDIS/BV-01-C	N/A
+GAP/MOD/GDIS/BV-02-C	N/A
+GAP/MOD/NCON/BV-01-C	N/A
+GAP/MOD/CON/BV-01-C	N/A
\ No newline at end of file
diff --git a/nimble/host/pts/pts-gatt.txt b/nimble/host/pts/pts-gatt.txt
index c8713e6..74c0a2e 100644
--- a/nimble/host/pts/pts-gatt.txt
+++ b/nimble/host/pts/pts-gatt.txt
@@ -1,7 +1,7 @@
 PTS test results for GATT
 
-PTS version: 7.0
-Tested: 18-Jul-2017
+PTS version: 7.5.0
+Tested: 27-Sept-2019
 
 Results:
 PASS	test passed
@@ -12,349 +12,245 @@ N/A	test is disabled due to PICS setup
 -------------------------------------------------------------------------------
 Test Name		Result	Notes
 -------------------------------------------------------------------------------
-GATT/CL/GAC/BV-01-C	PASS	b conn peer_addr=<addr>
-				b mtu conn=<handle>
-				b write conn=<handle> long=1 attr=<val_handle> value=<xx:...>
-				b term conn=<handle>
+GATT/CL/GAC/BV-01-C	PASS	connect peer_addr=<addr>
+				gatt-exchanche-mtu conn=<handle>
+				gatt-write conn=<handle> long=1 attr=<val_handle> value=<xx:...>
+				disconnect conn=<handle>
 -------------------------------------------------------------------------------
 
-GATT/CL/GAD/BV-01-C	PASS	b conn peer_addr=<addr>
-				b disc svc conn=<handle>
-				b show chr
+GATT/CL/GAD/BV-01-C	PASS	connect peer_addr=<addr>
+				gatt-discover-service conn=<handle>
+				gatt-show
 				<answer YES>
-				b term conn=<handle>
+				disconnect conn=<handle>
 				<repeat>
-GATT/CL/GAD/BV-02-C	PASS	b conn peer_addr=<addr>
-				b disc svc conn=<handle> uuid=<uuid>
-				b show chr
+GATT/CL/GAD/BV-02-C	PASS	connect peer_addr=<addr>
+				gatt-discover-service conn=<handle> uuid=<uuid>
+				gatt-show
 				<answer YES>
-				b term conn=<handle>
+				disconnect conn=<handle>
 				<repeat>
-GATT/CL/GAD/BV-03-C	PASS	b conn peer_addr=<addr>
-				b find inc_svcs conn=<handle> start=1 end=0xffff
+GATT/CL/GAD/BV-03-C	PASS	connect peer_addr=<addr>
+				gatt-find-included-services conn=<handle> start=1 end=0xffff
 				<answer YES>
-				b term conn=<handle>
+				disconnect conn=<handle>
 				<repeat>
-GATT/CL/GAD/BV-04-C	PASS	b conn peer_addr=<addr>
-				b disc svc conn=<handle> uuid=<uuid>
-				b disc chr conn=<handle> start=<start hdl> end=<end hdl>
-				b show chr
+GATT/CL/GAD/BV-04-C	PASS	connect peer_addr=<addr>
+				gatt-discover-service conn=<handle> uuid=<uuid>
+				gatt-discover-characteristic conn=<handle> start=<start hdl> end=<end hdl>
+				gatt-show
 				<answer YES>
-				b term conn=<handle>
+				disconnect conn=<handle>
 				<repeat>
-GATT/CL/GAD/BV-05-C	PASS	b conn peer_addr=<addr>
-				b disc svc conn=<handle>
-				b disc chr conn=<handle> uuid=<uuid> start=<start hdl> end=<end hdl>
-				b show chr
+GATT/CL/GAD/BV-05-C	PASS	connect peer_addr=<addr>
+				gatt-discover-service conn=<handle>
+				gatt-discover-characteristic conn=<handle> uuid=<uuid> start=<start hdl> end=<end hdl>
+				gatt-show
 				<answer YES>
-				b term conn=<handle>
+				disconnect conn=<handle>
 				<repeat>
-GATT/CL/GAD/BV-06-C	PASS	b conn peer_addr=<addr>
-				b disc svc conn=<handle>
-				b disc chr conn=<handle> start=<start-hdl> end=<end-hdl>
-				b disc dsc conn=<handle> start=<start-hdl> end=<end-hdl>
+GATT/CL/GAD/BV-06-C	PASS	connect peer_addr=<addr>
+				gatt-discover-service conn=<handle>
+				gatt-discover-characteristic conn=<handle> start=<start-hdl> end=<end-hdl>
+				gatt-discover-descriptor conn=<handle> start=<start-hdl> end=<end-hdl>
 				<answer YES>
-				b term conn=<handle>
+				disconnect conn=<handle>
 				<repeat>
 GATT/CL/GAD/BV-07-C	N/A
 GATT/CL/GAD/BV-08-C	N/A
 -------------------------------------------------------------------------------
 
-GATT/CL/GAR/BV-01-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle>
+GATT/CL/GAR/BV-01-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle>
 				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-01-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-01-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle>
 				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-02-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-02-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle>
 				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-03-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle>
-				b term conn=<handle>
-				<answer YES>
-GATT/CL/GAR/BI-04-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle>
-				b term conn=<handle>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-03-C	N/A
+
+GATT/CL/GAR/BI-04-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle>
+				disconnect conn=<handle>
 				<answer YES>
-GATT/CL/GAR/BI-05-C	PASS    b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle>
+GATT/CL/GAR/BI-05-C	PASS    connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle>
 				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BV-03-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> uuid=<uuid> start=1 end=0xffff
+				disconnect conn=<handle>
+GATT/CL/GAR/BV-03-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> uuid=<uuid> start=1 end=0xffff
 				<answer YES>
 				<repeat>
-				b term conn=<handle>
-GATT/CL/GAR/BI-06-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> uuid=<uuid> start=<start hdl> end=<end hdl>
-				b term conn=<handle>
-				<answer YES>
-GATT/CL/GAR/BI-07-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> uuid=<uuid> start=<start hdl> end=<end hdl>
-				b term conn=<handle>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-06-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> uuid=<uuid> start=<start hdl> end=<end hdl>
+				disconnect conn=<handle>
 				<answer YES>
-GATT/CL/GAR/BI-09-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> uuid=<uuid> start=<start hdl> end=<end hdl>
+GATT/CL/GAR/BI-07-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> uuid=<uuid> start=<start hdl> end=<end hdl>
+				disconnect conn=<handle>
 				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-10-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> uuid=<uuid> start=<start hdl> end=<end hdl>
-				b term conn=<handle>
+GATT/CL/GAR/BI-09-C	N/A
+GATT/CL/GAR/BI-10-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> uuid=<uuid> start=<start hdl> end=<end hdl>
+				disconnect conn=<handle>
 				<answer YES>
-GATT/CL/GAR/BI-11-C	PASS    b conn perr_addr=<addr>
-				b read conn=<handle> start=<start_hdl> end=<end_hdl>
-				b term conn=<handle>
+GATT/CL/GAR/BI-11-C	PASS    connect perr_addr=<addr>
+				gatt-read conn=<handle> start=<start_hdl> end=<end_hdl>
+				disconnect conn=<handle>
 				<answer YES>
-GATT/CL/GAR/BV-04-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> long=1 attr=<val_handle>
+GATT/CL/GAR/BV-04-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle>
 				<answer YES>
 				<repeat>
-				b term conn=<handle>
-GATT/CL/GAR/BI-12-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> long=1 attr=<val_handle>
-				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-13-C	PASS	b conn_peer_addr=<addr>
-				b read conn=<handle> long=1 attr=<val_handle> offset=<offset>
-				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-14-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> long=1 attr=<val_handle>
-				b term conn=<handle>
-				<answer YES>
-GATT/CL/GAR/BI-15-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> long=1 attr=<val_handle>
-				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-16-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> long=1 attr=<val_handle>
-				b term conn=<handle>
-				<answer YES>
-GATT/CL/GAR/BI-17-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> long=1 attr=<val_handle>
-				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BV-05-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle1> attr=<val_handle2>
-				b term conn=<handle>
-GATT/CL/GAR/BI-18-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle1> attr=<val_handle2>
-				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-19-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle1> attr=<val_handle2>
-				b term conn=<handle>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-12-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle>
 				<answer YES>
-GATT/CL/GAR/BI-20-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle1> attr=<val_handle2>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-13-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle> offset=<offset>
 				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-21-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle1> attr=<val_handle2>
-				b term conn=<handle>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-14-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle>
+				disconnect conn=<handle>
 				<answer YES>
-GATT/CL/GAR/BI-22-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle1> attr=<val_handle2>
-				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BV-06-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle>
-				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-23-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle>
-				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-24-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle>
-				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-25-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle>
+GATT/CL/GAR/BI-15-C	N/A
+
+GATT/CL/GAR/BI-16-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle>
+				disconnect conn=<handle>
+				<answer YES>
+GATT/CL/GAR/BI-17-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle>
+				<answer YES>
+				disconnect conn=<handle>
+GATT/CL/GAR/BV-05-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle1> attr=<val_handle2>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-18-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle1> attr=<val_handle2>
+				<answer YES>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-19-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle1> attr=<val_handle2>
+				disconnect conn=<handle>
+				<answer YES>
+GATT/CL/GAR/BI-20-C	N/A
+
+GATT/CL/GAR/BI-21-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle1> attr=<val_handle2>
+				disconnect conn=<handle>
 				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-26-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle>
-				b term conn=<handle>
+GATT/CL/GAR/BI-22-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle1> attr=<val_handle2>
 				<answer YES>
-GATT/CL/GAR/BI-27-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle>
+				disconnect conn=<handle>
+GATT/CL/GAR/BV-06-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle>
 				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BV-07-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> long=1 attr=<val_handle>
+				disconnect conn=<handle>
+GATT/CL/GAR/BV-07-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle>
 				<answer YES>
 				<repeat>
-				b term conn=<handle>
-GATT/CL/GAR/BI-28-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> long=1 attr=<val_handle>
-				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-29-C	PASS	b conn_peer_addr=<addr>
-				b read conn=<handle> long=1 attr=<val_handle> offset=<offset>
-				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-30-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> long=1 attr=<val_handle>
-				b term conn=<handle>
-				<answer YES>
-GATT/CL/GAR/BI-31-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> long=1 attr=<val_handle>
-				<answer YES>
-				b term conn=<handle>
-GATT/CL/GAR/BI-32-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> long=1 attr=<val_handle>
-				b term conn=<handle>
-				<answer YES>
-GATT/CL/GAR/BI-33-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> long=1 attr=<val_handle>
-				<answer YES>
-				b term conn=<handle>
+				disconnect conn=<handle>
 GATT/CL/GAR/BI-34-C	N/A
-GATT/CL/GAR/BI-35-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> long=1 attr=<val_handle>
+GATT/CL/GAR/BI-35-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle>
 				<answer YES>
-				b term conn=<handle>
+				disconnect conn=<handle>
 -------------------------------------------------------------------------------
 
-GATT/CL/GAW/BV-01-C	PASS	b conn peer_addr=<addr>
-				b write no_rsp=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
+GATT/CL/GAW/BV-01-C	PASS	connect peer_addr=<addr>
+				gatt-write no_rsp=1 conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
 GATT/CL/GAW/BV-02-C	N/A
-GATT/CL/GAW/BV-03-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-02-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-03-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-04-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-05-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-06-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BV-05-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-07-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-08-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-09-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val> offset=<offset>
-				b term conn=1
-GATT/CL/GAW/BI-11-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-12-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-13-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BV-06-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-14-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-15-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-17-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-18-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-19-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BV-08-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-20-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-21-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-22-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-23-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-24-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BV-09-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-25-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-26-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-27-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val> offset=<offset>
-				b term conn=1
-GATT/CL/GAW/BI-29-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-30-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-31-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=aa
-				b term conn=<handle>
-GATT/CL/GAW/BI-32-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val> attr=<val_handle> value=<val>
-GATT/CL/GAW/BI-33-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-34-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-35-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
-GATT/CL/GAW/BI-36-C	PASS	b conn peer_addr=<addr>
-				b write long=1 conn=<handle> attr=<val_handle> value=<val>
-				b term conn=<handle>
+
+GATT/CL/GAW/BV-03-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-02-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-03-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-04-C	N/A
+
+GATT/CL/GAW/BI-05-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-06-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BV-05-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-07-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+				disocnnect conn=<handle>
+GATT/CL/GAW/BI-08-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+				diconnect conn=<handle>
+GATT/CL/GAW/BI-09-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val> offset=<offset>
+				diconnect conn=1
+GATT/CL/GAW/BI-11-C	N/A
+
+GATT/CL/GAW/BI-12-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-13-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+				diconnect conn=<handle>
+GATT/CL/GAW/BV-06-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+
+GAAT/CL/GAW/BV-08-C	PASS	connect peer_addr=<addr>
+				gat-write conn=<handle> attr=<val_handle> value=<val>
+
+GATT/CL/GAW/BV-09-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+
+GATT/CL/GAW/BI-32-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-33-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-34-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+
 -------------------------------------------------------------------------------
 
-GATT/CL/GAN/BV-01-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=01:00
+GATT/CL/GAN/BV-01-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=01:00
 				Note: verify that the notification was received
-				b term conn=<handle>
+				disconnect conn=<handle>
 -------------------------------------------------------------------------------
 
-GATT/CL/GAI/BV-01-C	PASS	b adv
-                                b chrup attr=<val_handle>
+GATT/CL/GAI/BV-01-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=01:00
+				Note: verify that the notification was received
+				disconnect conn=<handle>
 -------------------------------------------------------------------------------
 
-GATT/CL/GAS/BV-01-C	PASS	b conn peer_addr=<addr>
-				b term conn=<handle>
+GATT/CL/GAS/BV-01-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
 -------------------------------------------------------------------------------
 
-GATT/CL/GAT/BV-01-C	PASS	b conn peer_addr=<addr>
-				b read conn=<handle> attr=<val_handle>
-GATT/CL/GAT/BV-02-C	PASS	b conn peer_addr=<addr>
-				b write conn=<handle> attr=<val_handle> value=<val>
+GATT/CL/GAT/BV-01-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle>
+GATT/CL/GAT/BV-02-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val>
 -------------------------------------------------------------------------------
 
 GATT/CL/GPA/BV-01-C	N/A
@@ -369,153 +265,225 @@ GATT/CL/GPA/BV-11-C	N/A
 GATT/CL/GPA/BV-12-C	N/A
 -------------------------------------------------------------------------------
 
-GATT/SR/GAC/BV-01-C	PASS	b set mtu=25
-				b adv
-				b adv
+GATT/SR/GAC/BV-01-C	PASS	set mtu=25
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+				advertise-start
 -------------------------------------------------------------------------------
 
-GATT/SR/GAD/BV-01-C	PASS	b adv
-GATT/SR/GAD/BV-02-C	PASS	b adv
-GATT/SR/GAD/BV-03-C	PASS	b adv
-GATT/SR/GAD/BV-04-C	PASS	b adv
+GATT/SR/GAD/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				gatt-show-local
+				<YES>
+GATT/SR/GAD/BV-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				gatt-show-local
+				<YES>
+GATT/SR/GAD/BV-03-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				gatt-show-local
+				<YES>
+GATT/SR/GAD/BV-04-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<confirm handles range for services>
-GATT/SR/GAD/BV-05-C	PASS	b adv
-GATT/SR/GAD/BV-06-C	PASS	b adv
+GATT/SR/GAD/BV-05-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAD/BV-06-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 GATT/SR/GAD/BV-07-C	N/A
 GATT/SR/GAD/BV-08-C	N/A
 -------------------------------------------------------------------------------
 
-GATT/SR/GAR/BV-01-C	PASS	b adv
-GATT/SR/GAR/BI-01-C	PASS	b adv
-GATT/SR/GAR/BI-02-C	PASS	b adv
+GATT/SR/GAR/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter ffff>
 GATT/SR/GAR/BI-03-C	N/A
-GATT/SR/GAR/BI-04-C	PASS	b adv
-GATT/SR/GAR/BI-05-C	PASS	b adv
-GATT/SR/GAR/BV-03-C	PASS	b adv
-GATT/SR/GAR/BI-06-C	PASS	b adv
+GATT/SR/GAR/BI-04-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-05-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BV-03-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-06-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				gatt-show-local
 				<enter uuid without READ flag>
 				<enter value handle>
-GATT/SR/GAR/BI-07-C	PASS	b adv
+GATT/SR/GAR/BI-07-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter ffff>
-GATT/SR/GAR/BI-08-C	PASS	b adv
+GATT/SR/GAR/BI-08-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 GATT/SR/GAR/BI-09-C	N/A
-GATT/SR/GAR/BI-10-C	PASS	b adv
-				<enter characteristic with READ|READ_AUTH flags>
-GATT/SR/GAR/BI-11-C	PASS	b adv
+GATT/SR/GAR/BI-10-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-11-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter characteristic wit READ|READ_ENC flags>
-GATT/SR/GAR/BV-04-C	PASS	b adv
-GATT/SR/GAR/BI-12-C	PASS	b adv
+GATT/SR/GAR/BV-04-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-12-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter long value handle without READ flag>
-GATT/SR/GAR/BI-13-C	PASS	b adv
-GATT/SR/GAR/BI-14-C	PASS	b adv
+GATT/SR/GAR/BI-13-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-14-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter ffff>
 GATT/SR/GAR/BI-15-C	N/A
-GATT/SR/GAR/BI-16-C	PASS	b adv
-GATT/SR/GAR/BI-17-C	PASS	b adv
-GATT/SR/GAR/BV-05-C	PASS	b adv
-GATT/SR/GAR/BI-18-C	PASS	b adv
+GATT/SR/GAR/BI-16-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-17-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BV-05-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-18-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter value handle without READ flag>
-GATT/SR/GAR/BI-19-C	PASS	b adv
+GATT/SR/GAR/BI-19-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter ffff>
 GATT/SR/GAR/BI-20-C	N/A
-GATT/SR/GAR/BI-21-C	PASS	b adv
-GATT/SR/GAR/BI-22-C	PASS	b adv
-GATT/SR/GAR/BV-06-C	PASS	b adv
-GATT/SR/GAR/BI-23-C	PASS	b adv
-				<enter value handle without READ flag>
-GATT/SR/GAR/BI-24-C	PASS	b adv
-				<enter ffff>
+GATT/SR/GAR/BI-21-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-22-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-startt
+GATT/SR/GAR/BV-06-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-23-C	N/A
+GATT/SR/GAR/BI-24-C	N/A
 GATT/SR/GAR/BI-25-C	N/A
-GATT/SR/GAR/BI-26-C	PASS	b adv
-GATT/SR/GAR/BI-27-C	PASS	b adv
-GATT/SR/GAR/BV-07-C	PASS	b adv
-GATT/SR/GAR/BV-08-C	PASS	b adv
-GATT/SR/GAR/BI-28-C	PASS	b adv
-				<enter desc value handle without READ flag>
-GATT/SR/GAR/BI-29-C	PASS	b adv
-GATT/SR/GAR/BI-30-C	PASS	b adv
-				<enter ffff>
+GATT/SR/GAR/BI-26-C	N/A
+GATT/SR/GAR/BI-27-C	N/A
+GATT/SR/GAR/BV-07-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BV-08-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-28-C	N/A
+GATT/SR/GAR/BI-29-C	N/A
+GATT/SR/GAR/BI-30-C	N/A
 GATT/SR/GAR/BI-31-C	N/A
-GATT/SR/GAR/BI-32-C	PASS	b adv
-GATT/SR/GAR/BI-33-C	PASS	b adv
+GATT/SR/GAR/BI-32-C	N/A
+GATT/SR/GAR/BI-33-C	N/A
 GATT/SR/GAR/BI-34-C	N/A
 GATT/SR/GAR/BI-35-C	N/A
 -------------------------------------------------------------------------------
 
-GATT/SR/GAW/BV-01-C	PASS	b adv
+GATT/SR/GAW/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 GATT/SR/GAW/BV-02-C	N/A
 GATT/SR/GAW/BI-01-C	N/A
-GATT/SR/GAW/BV-03-C	PASS	b adv
-GATT/SR/GAW/BI-02-C	PASS	b adv
+GATT/SR/GAW/BV-03-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter ffff>
-GATT/SR/GAW/BI-03-C	PASS	b adv
+GATT/SR/GAW/BI-03-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 GATT/SR/GAW/BI-04-C	N/A
-GATT/SR/GAW/BI-05-C	PASS	b adv
-GATT/SR/GAW/BI-06-C	PASS	b adv
-GATT/SR/GAW/BV-05-C	PASS	b adv
-GATT/SR/GAW/BI-07-C	PASS	b adv
+GATT/SR/GAW/BI-05-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-06-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BV-05-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-07-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter ffff>
-GATT/SR/GAW/BI-08-C	PASS	b adv
+GATT/SR/GAW/BI-08-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter long value handle without WRITE flag>
-GATT/SR/GAW/BI-09-C	PASS	b adv
+GATT/SR/GAW/BI-09-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 GATT/SR/GAW/BI-11-C	N/A
-GATT/SR/GAW/BI-12-C	PASS	b adv
-GATT/SR/GAW/BI-13-C	PASS	b adv
-GATT/SR/GAW/BV-06-C	PASS	b adv
-GATT/SR/GAW/BV-10-C	PASS	b adv
-GATT/SR/GAW/BI-14-C	PASS	b adv
+GATT/SR/GAW/BI-12-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-13-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BV-06-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BV-10-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-14-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter ffff>
-GATT/SR/GAW/BI-15-C	PASS	b adv
+GATT/SR/GAW/BI-15-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter value handle without WRITE flag>
 GATT/SR/GAW/BI-17-C	N/A
-GATT/SR/GAW/BI-18-C	PASS	b adv
-GATT/SR/GAW/BI-19-C	PASS	b adv
-GATT/SR/GAW/BV-11-C	PASS	b adv
-GATT/SR/GAW/BV-07-C	PASS	b adv
-GATT/SR/GAW/BV-08-C	INCONC	b adv   Errata 15358
-GATT/SR/GAW/BI-20-C	PASS	b adv
+GATT/SR/GAW/BI-18-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-19-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BV-11-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BV-07-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BV-08-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-20-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter ffff>
-GATT/SR/GAW/BI-21-C	PASS	b adv
+GATT/SR/GAW/BI-21-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter dsc value handle without WRITE flag>
 GATT/SR/GAW/BI-22-C	N/A
-GATT/SR/GAW/BI-23-C	PASS	b adv
-GATT/SR/GAW/BI-24-C	PASS	b adv
-GATT/SR/GAW/BV-09-C	PASS	b adv
-GATT/SR/GAW/BI-25-C	PASS	b adv
+GATT/SR/GAW/BI-23-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-24-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BV-09-C	PASS	advertise-configure connectable=1 legacy=1q
+				advertise-start
+GATT/SR/GAW/BI-25-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter ffff>
-GATT/SR/GAW/BI-26-C	PASS	b adv
+GATT/SR/GAW/BI-26-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 				<enter dsc value handle without WRITE flag>
-GATT/SR/GAW/BI-27-C	PASS	b adv
+GATT/SR/GAW/BI-27-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
 GATT/SR/GAW/BI-29-C	N/A
-GATT/SR/GAW/BI-30-C	PASS	b adv
-GATT/SR/GAW/BI-31-C	PASS	b adv
-GATT/SR/GAW/BI-32-C	PASS	b adv
-GATT/SR/GAW/BI-33-C	PASS	b adv
-GATT/SR/GAW/BI-34-C	PASS	b adv
-GATT/SR/GAW/BI-35-C	PASS	b adv
--------------------------------------------------------------------------------
+GATT/SR/GAW/BI-30-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-31-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-32-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-33-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-34-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-35-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+------------------------------------------------------------------------------
 
-GATT/SR/GAN/BV-01-C	PASS	b adv
-				b chrup attr=<val_handle>
--------------------------------------------------------------------------------
+GATT/SR/GAN/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				gatt-notify attr=<val_handle>
+------------------------------------------------------------------------------
 
-GATT/SR/GAI/BV-01-C	PASS	b adv
-				b write conn=<handle> value=02:00 attr=<val_handle>
+GATT/SR/GAI/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				gatt-notify attr=<val_handle>
 -------------------------------------------------------------------------------
 
 GATT/SR/GAS/BV-01-C	PASS	Note: set TSPX_security_enabled to TRUE
-				b set sm_data bonding=1 our_key_dist=7 their_key_dist=7
-				b adv
+				security-set-data bonding=1 our_key_dist=7 their_key_dist=7
+				advertise-configure connectable=1 legacy=1
+				advertise-start
 				<click OK>
-				b svcchg start=1 end=0xffff
-				b adv
-				b sec start conn=<handle>
+				gatt-service-changed start=1 end=0xffff
+				advertise-start
+				security-start conn=<handle>
 -------------------------------------------------------------------------------
 
-GATT/SR/GAT/BV-01-C	PASS	b adv
-				b chrup attr=<val_handle>
--------------------------------------------------------------------------------
+GATT/SR/GAT/BV-01-C	PASS	advertise-start
+				gatt-notify attr=0x0008
+------------------------------------------------------------------------------
 
 GATT/SR/GPA/BV-01-C	N/A
 GATT/SR/GPA/BV-02-C	N/A
@@ -528,3 +496,13 @@ GATT/SR/GPA/BV-08-C	N/A
 GATT/SR/GPA/BV-11-C	N/A
 GATT/SR/GPA/BV-12-C	N/A
 -------------------------------------------------------------------------------
+
+GATT/SR/UNS/BI-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/UNS/BI-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+
+--------------------------------------------------------------------------------
+
+GATT/SR/GPM/BV-01-C	N/A
+