[border-agent] use dynamic port (#191)

openthread · Apr 21, 2021 · e6cf6bb · e6cf6bb
1 parent 26702ff
commit e6cf6bb
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 10 deletions.
diff --git a/tests/integration/common.sh b/tests/integration/common.sh
@@ -225,6 +225,12 @@ form_network() {
     sudo "${OT_CTL}" state
 }
 
+petition_commissioner() {
+    local ba_port
+    ba_port="$(sudo "${OT_CTL}" ba port | grep -o '[0-9]\+')"
+    send_command_to_commissioner "start :: ${ba_port}"
+}
+
 start_border_agent_mdns_service() {
     ## See etc/avahi/services/border-agent.service
     ## for the service registration.

diff --git a/tests/integration/test_announce_begin.sh b/tests/integration/test_announce_begin.sh
@@ -34,7 +34,8 @@ test_announce_begin() {
     form_network "${PSKC}"
 
     start_commissioner "${NON_CCM_CONFIG}"
-    send_command_to_commissioner "start :: 49191"
+
+    petition_commissioner
     send_command_to_commissioner "active"
     send_command_to_commissioner "announce 0xffffffff 2 32 ff02::2"
     stop_commissioner

diff --git a/tests/integration/test_cli.sh b/tests/integration/test_cli.sh
@@ -35,7 +35,7 @@ test_network_sync()
     form_network "${PSKC}"
 
     start_commissioner "${NON_CCM_CONFIG}"
-    send_command_to_commissioner "start :: 49191"
+    petition_commissioner
     send_command_to_commissioner "network sync"
     stop_commissioner
 
@@ -48,7 +48,7 @@ test_get_commissioner_dataset()
     form_network "${PSKC}"
 
     start_commissioner "${NON_CCM_CONFIG}"
-    send_command_to_commissioner "start :: 49191"
+    petition_commissioner
     send_command_to_commissioner "commdataset get"
     stop_commissioner
 

diff --git a/tests/integration/test_energy_scan.sh b/tests/integration/test_energy_scan.sh
@@ -34,7 +34,7 @@ test_energy_scan() {
     form_network "${PSKC}"
 
     start_commissioner "${NON_CCM_CONFIG}"
-    send_command_to_commissioner "start :: 49191"
+    petition_commissioner
     send_command_to_commissioner "active"
     send_command_to_commissioner "energy scan 0xffffffff 2 10 30 ff02::2"
     sleep 1

diff --git a/tests/integration/test_joining.sh b/tests/integration/test_joining.sh
@@ -34,7 +34,7 @@ test_joining() {
     form_network "${PSKC}"
 
     start_commissioner "${NON_CCM_CONFIG}"
-    send_command_to_commissioner "start :: 49191"
+    petition_commissioner
     send_command_to_commissioner "active"
 
     ## enable all MeshCoP joiners
@@ -52,7 +52,7 @@ test_joining_fail() {
     form_network "${PSKC}"
 
     start_commissioner "${NON_CCM_CONFIG}"
-    send_command_to_commissioner "start :: 49191"
+    petition_commissioner
     send_command_to_commissioner "active"
 
     ## meshcop joiners not enabled, it should fail.

diff --git a/tests/integration/test_operational_dataset.sh b/tests/integration/test_operational_dataset.sh
@@ -34,7 +34,7 @@ test_active_dataset_set_network_name() {
     form_network "${PSKC}"
 
     start_commissioner "${NON_CCM_CONFIG}"
-    send_command_to_commissioner "start :: 49191"
+    petition_commissioner
     send_command_to_commissioner "active"
     send_command_to_commissioner "opdataset set networkname test-network"
 
@@ -50,7 +50,7 @@ test_pending_dataset_set_channel() {
     form_network "${PSKC}"
 
     start_commissioner "${NON_CCM_CONFIG}"
-    send_command_to_commissioner "start :: 49191"
+    petition_commissioner
     send_command_to_commissioner "active"
     send_command_to_commissioner "opdataset set channel 0 17 60"
 

diff --git a/tests/integration/test_pan_id_query.sh b/tests/integration/test_pan_id_query.sh
@@ -34,7 +34,7 @@ test_pan_id_query() {
     form_network "${PSKC}"
 
     start_commissioner "${NON_CCM_CONFIG}"
-    send_command_to_commissioner "start :: 49191"
+    petition_commissioner
     send_command_to_commissioner "active"
     send_command_to_commissioner "panid query 0xffffffff 0xaabb ff02::2"
     sleep 1

diff --git a/tests/integration/test_petition.sh b/tests/integration/test_petition.sh
@@ -34,7 +34,7 @@ test_petition() {
     form_network "${PSKC}"
 
     start_commissioner "${NON_CCM_CONFIG}"
-    send_command_to_commissioner "start :: 49191"
+    petition_commissioner
     send_command_to_commissioner "active"
     stop_commissioner