[Asterisk-code-review] tests/hep: Add different types of UUID (testsuite[master])

[Matt Jordan]

Matt Jordan has uploaded a new change for review.

  https://gerrit.asterisk.org/2813

Change subject: tests/hep: Add different types of UUID
......................................................................

tests/hep: Add different types of UUID

This patch updates several of the HEP tests to use either a uuid_type of
'channel' or 'call-id'. The expected output has been updated with the
changes in packets.

ASTERISK-25352

Change-Id: Ib9724be04960d811a7bff4ea712cd8f02104ffb3
---
M tests/hep/pjsip-auth/configs/ast1/hep.conf
M tests/hep/pjsip-ipv6/configs/ast1/hep.conf
M tests/hep/pjsip-ipv6/test-config.yaml
M tests/hep/pjsip/test-config.yaml
M tests/hep/rtcp-receiver/configs/ast1/hep.conf
M tests/hep/rtcp-receiver/configs/ast2/hep.conf
6 files changed, 12 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/13/2813/1

diff --git a/tests/hep/pjsip-auth/configs/ast1/hep.conf b/tests/hep/pjsip-auth/configs/ast1/hep.conf
index 8ea8bd3..4f8e3eb 100644
--- a/tests/hep/pjsip-auth/configs/ast1/hep.conf
+++ b/tests/hep/pjsip-auth/configs/ast1/hep.conf
@@ -3,3 +3,4 @@
 capture_address = 127.0.0.1:9999
 capture_id = 12345
 capture_password = foobar
+uuid_type = channel
diff --git a/tests/hep/pjsip-ipv6/configs/ast1/hep.conf b/tests/hep/pjsip-ipv6/configs/ast1/hep.conf
index a160c49..f1e845f 100644
--- a/tests/hep/pjsip-ipv6/configs/ast1/hep.conf
+++ b/tests/hep/pjsip-ipv6/configs/ast1/hep.conf
@@ -2,3 +2,4 @@
 enabled = yes
 capture_address = 127.0.0.1:9999
 capture_id = 12345
+uuid_type = call-id
diff --git a/tests/hep/pjsip-ipv6/test-config.yaml b/tests/hep/pjsip-ipv6/test-config.yaml
index 89aa7e2..eb08139 100644
--- a/tests/hep/pjsip-ipv6/test-config.yaml
+++ b/tests/hep/pjsip-ipv6/test-config.yaml
@@ -81,7 +81,7 @@
                     - 'Content-Length:  0'
         -
             ip_family: 10
-            uuid: 'PJSIP/alice-ipv6-udp-.*'
+            uuid: '(.*?)@[::1]'
             src_addr: '[::1]'
             src_port: 5060
             dst_addr: '[::1]'
@@ -119,7 +119,7 @@
                     - 'a=sendrecv'
         -
             ip_family: 10
-            uuid: 'PJSIP/alice-ipv6-udp-.*'
+            uuid: '(.*?)@[::1]'
             src_addr: '[::1]'
             src_port: 5067
             dst_addr: '[::1]'
@@ -150,7 +150,7 @@
                     - 'a=rtpmap:0 PCMU/8000'
         -
             ip_family: 10
-            uuid: 'PJSIP/alice-ipv6-udp-.*'
+            uuid: '(.*?)@[::1]'
             src_addr: '[::1]'
             src_port: 5067
             dst_addr: '[::1]'
@@ -173,7 +173,7 @@
                     - 'Content-Length: 0'
         -
             ip_family: 10
-            uuid: 'PJSIP/alice-ipv6-udp-.*'
+            uuid: '(.*?)@[::1]'
             src_addr: '[::1]'
             src_port: 5060
             dst_addr: '[::1]'
diff --git a/tests/hep/pjsip/test-config.yaml b/tests/hep/pjsip/test-config.yaml
index d77fe8f..659e221 100644
--- a/tests/hep/pjsip/test-config.yaml
+++ b/tests/hep/pjsip/test-config.yaml
@@ -80,7 +80,7 @@
                     - 'Content-Length:  0'
         -
             ip_family: 2
-            uuid: 'PJSIP/alice-ipv4-udp-.*'
+            uuid: '(.*?)@127.0.0.1'
             src_addr: '127.0.0.1'
             src_port: 5060
             dst_addr: '127.0.0.1'
@@ -118,7 +118,7 @@
                     - 'a=sendrecv'
         -
             ip_family: 2
-            uuid: 'PJSIP/alice-ipv4-udp-.*'
+            uuid: '(.*?)@127.0.0.1'
             src_addr: '127.0.0.1'
             src_port: 5067
             dst_addr: '127.0.0.1'
@@ -149,7 +149,7 @@
                     - 'a=rtpmap:0 PCMU/8000'
         -
             ip_family: 2
-            uuid: 'PJSIP/alice-ipv4-udp-.*'
+            uuid: '(.*?)@127.0.0.1'
             src_addr: '127.0.0.1'
             src_port: 5067
             dst_addr: '127.0.0.1'
@@ -172,7 +172,7 @@
                     - 'Content-Length: 0'
         -
             ip_family: 2
-            uuid: 'PJSIP/alice-ipv4-udp-.*'
+            uuid: '(.*?)@127.0.0.1'
             src_addr: '127.0.0.1'
             src_port: 5060
             dst_addr: '127.0.0.1'
diff --git a/tests/hep/rtcp-receiver/configs/ast1/hep.conf b/tests/hep/rtcp-receiver/configs/ast1/hep.conf
index 8118f73..5c5b653 100644
--- a/tests/hep/rtcp-receiver/configs/ast1/hep.conf
+++ b/tests/hep/rtcp-receiver/configs/ast1/hep.conf
@@ -2,3 +2,4 @@
 enabled = yes
 capture_address = 127.0.0.1:9998
 capture_id = 1
+uuid_type = channel
diff --git a/tests/hep/rtcp-receiver/configs/ast2/hep.conf b/tests/hep/rtcp-receiver/configs/ast2/hep.conf
index 2e4954d..56a4997 100644
--- a/tests/hep/rtcp-receiver/configs/ast2/hep.conf
+++ b/tests/hep/rtcp-receiver/configs/ast2/hep.conf
@@ -2,3 +2,4 @@
 enabled = yes
 capture_address = 127.0.0.1:9999
 capture_id = 2
+uuid_type = channel

-- 
To view, visit https://gerrit.asterisk.org/2813
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9724be04960d811a7bff4ea712cd8f02104ffb3
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan <mjordan at digium.com>