From 4db2818f8af50fafc9aacac4f5c5d223aace9177 Mon Sep 17 00:00:00 2001 From: Cristian Recoseanu Date: Fri, 28 Nov 2025 10:37:08 +0000 Subject: [PATCH 1/6] Fix test_13 in relation to IS-07 senders/receivers --- nmostesting/IS05Utils.py | 8 ++++++++ nmostesting/suites/IS0502Test.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/nmostesting/IS05Utils.py b/nmostesting/IS05Utils.py index 540038f64..3bbc862fc 100644 --- a/nmostesting/IS05Utils.py +++ b/nmostesting/IS05Utils.py @@ -41,6 +41,14 @@ def get_valid_transports(self, api_version): valid_transports.append("urn:x-nmos:transport:websocket") valid_transports.append("urn:x-nmos:transport:mqtt") return valid_transports + + def get_valid_transports_with_transport_file(self, api_version): + """Identify the valid transport types which allow a transport file for a given version of IS-05""" + valid_transports = ["urn:x-nmos:transport:rtp", + "urn:x-nmos:transport:rtp.mcast", + "urn:x-nmos:transport:rtp.ucast", + "urn:x-nmos:transport:dash"] + return valid_transports def check_num_legs(self, url, res_type, uuid): """Checks the number of legs present on a given sender/receiver""" diff --git a/nmostesting/suites/IS0502Test.py b/nmostesting/suites/IS0502Test.py index 6ac820e90..628789dde 100644 --- a/nmostesting/suites/IS0502Test.py +++ b/nmostesting/suites/IS0502Test.py @@ -579,7 +579,7 @@ def test_13(self, test): return test.FAIL(result) try: - valid_transports = self.is05_utils.get_valid_transports(self.apis[CONN_API_KEY]["version"]) + valid_transports = self.is05_utils.get_valid_transports_with_transport_file(self.apis[CONN_API_KEY]["version"]) access_error = False From 63ff53596adb18513f0880649bcab66435568398 Mon Sep 17 00:00:00 2001 From: Cristian Recoseanu Date: Fri, 28 Nov 2025 10:45:59 +0000 Subject: [PATCH 2/6] Fix lint issues --- nmostesting/IS05Utils.py | 2 +- nmostesting/suites/IS0502Test.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nmostesting/IS05Utils.py b/nmostesting/IS05Utils.py index 3bbc862fc..3520c639e 100644 --- a/nmostesting/IS05Utils.py +++ b/nmostesting/IS05Utils.py @@ -41,7 +41,7 @@ def get_valid_transports(self, api_version): valid_transports.append("urn:x-nmos:transport:websocket") valid_transports.append("urn:x-nmos:transport:mqtt") return valid_transports - + def get_valid_transports_with_transport_file(self, api_version): """Identify the valid transport types which allow a transport file for a given version of IS-05""" valid_transports = ["urn:x-nmos:transport:rtp", diff --git a/nmostesting/suites/IS0502Test.py b/nmostesting/suites/IS0502Test.py index 628789dde..3aaa66284 100644 --- a/nmostesting/suites/IS0502Test.py +++ b/nmostesting/suites/IS0502Test.py @@ -579,7 +579,8 @@ def test_13(self, test): return test.FAIL(result) try: - valid_transports = self.is05_utils.get_valid_transports_with_transport_file(self.apis[CONN_API_KEY]["version"]) + valid_transports = self.is05_utils.get_valid_transports_with_transport_file( + self.apis[CONN_API_KEY]["version"]) access_error = False From f6bd8f44be3360c20213e8f49d9b6ceb61ef0850 Mon Sep 17 00:00:00 2001 From: Cristian Recoseanu Date: Fri, 5 Dec 2025 14:39:52 +0000 Subject: [PATCH 3/6] Combine get_valid_transports_with_transport_file with the existing get_valid_transports --- nmostesting/IS05Utils.py | 12 ++++-------- nmostesting/suites/IS0502Test.py | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/nmostesting/IS05Utils.py b/nmostesting/IS05Utils.py index 3520c639e..b627e24d1 100644 --- a/nmostesting/IS05Utils.py +++ b/nmostesting/IS05Utils.py @@ -31,7 +31,7 @@ class IS05Utils(NMOSUtils): def __init__(self, url): NMOSUtils.__init__(self, url) - def get_valid_transports(self, api_version): + def get_valid_transports(self, api_version, with_transport_file_support=True): """Identify the valid transport types for a given version of IS-05""" valid_transports = ["urn:x-nmos:transport:rtp", "urn:x-nmos:transport:rtp.mcast", @@ -40,14 +40,10 @@ def get_valid_transports(self, api_version): if self.compare_api_version(api_version, "v1.1") >= 0: valid_transports.append("urn:x-nmos:transport:websocket") valid_transports.append("urn:x-nmos:transport:mqtt") - return valid_transports - def get_valid_transports_with_transport_file(self, api_version): - """Identify the valid transport types which allow a transport file for a given version of IS-05""" - valid_transports = ["urn:x-nmos:transport:rtp", - "urn:x-nmos:transport:rtp.mcast", - "urn:x-nmos:transport:rtp.ucast", - "urn:x-nmos:transport:dash"] + if not with_transport_file_support: + valid_transports.remove("urn:x-nmos:transport:websocket") + valid_transports.remove("urn:x-nmos:transport:mqtt") return valid_transports def check_num_legs(self, url, res_type, uuid): diff --git a/nmostesting/suites/IS0502Test.py b/nmostesting/suites/IS0502Test.py index 3aaa66284..e6c222674 100644 --- a/nmostesting/suites/IS0502Test.py +++ b/nmostesting/suites/IS0502Test.py @@ -579,8 +579,8 @@ def test_13(self, test): return test.FAIL(result) try: - valid_transports = self.is05_utils.get_valid_transports_with_transport_file( - self.apis[CONN_API_KEY]["version"]) + valid_transports = self.is05_utils.get_valid_transports( + self.apis[CONN_API_KEY]["version"], with_transport_file_support=False) access_error = False From a1f87321617aa79a86fb2cc881e16d022b6354d5 Mon Sep 17 00:00:00 2001 From: cristian-recoseanu Date: Fri, 5 Dec 2025 15:50:53 +0000 Subject: [PATCH 4/6] Update nmostesting/IS05Utils.py Co-authored-by: jonathan-r-thorpe <64410119+jonathan-r-thorpe@users.noreply.github.com> --- nmostesting/IS05Utils.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nmostesting/IS05Utils.py b/nmostesting/IS05Utils.py index b627e24d1..d473f262c 100644 --- a/nmostesting/IS05Utils.py +++ b/nmostesting/IS05Utils.py @@ -37,13 +37,9 @@ def get_valid_transports(self, api_version, with_transport_file_support=True): "urn:x-nmos:transport:rtp.mcast", "urn:x-nmos:transport:rtp.ucast", "urn:x-nmos:transport:dash"] - if self.compare_api_version(api_version, "v1.1") >= 0: + if self.compare_api_version(api_version, "v1.1") >= 0 and not with_transport_file_support: valid_transports.append("urn:x-nmos:transport:websocket") valid_transports.append("urn:x-nmos:transport:mqtt") - - if not with_transport_file_support: - valid_transports.remove("urn:x-nmos:transport:websocket") - valid_transports.remove("urn:x-nmos:transport:mqtt") return valid_transports def check_num_legs(self, url, res_type, uuid): From d7681a613ee51070db4e722c5443c815a278e744 Mon Sep 17 00:00:00 2001 From: Cristian Recoseanu Date: Fri, 5 Dec 2025 15:56:50 +0000 Subject: [PATCH 5/6] Correct flag value --- nmostesting/suites/IS0502Test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nmostesting/suites/IS0502Test.py b/nmostesting/suites/IS0502Test.py index e6c222674..abcc5af15 100644 --- a/nmostesting/suites/IS0502Test.py +++ b/nmostesting/suites/IS0502Test.py @@ -580,7 +580,7 @@ def test_13(self, test): try: valid_transports = self.is05_utils.get_valid_transports( - self.apis[CONN_API_KEY]["version"], with_transport_file_support=False) + self.apis[CONN_API_KEY]["version"], with_transport_file_support=True) access_error = False From b98290e666e810e55e5923e617c4ddb49ee0643b Mon Sep 17 00:00:00 2001 From: Cristian Recoseanu Date: Fri, 5 Dec 2025 16:25:41 +0000 Subject: [PATCH 6/6] Rename argument to "include_transports_without_transport_file" --- nmostesting/IS05Utils.py | 4 ++-- nmostesting/suites/IS0502Test.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nmostesting/IS05Utils.py b/nmostesting/IS05Utils.py index d473f262c..32b3be6c2 100644 --- a/nmostesting/IS05Utils.py +++ b/nmostesting/IS05Utils.py @@ -31,13 +31,13 @@ class IS05Utils(NMOSUtils): def __init__(self, url): NMOSUtils.__init__(self, url) - def get_valid_transports(self, api_version, with_transport_file_support=True): + def get_valid_transports(self, api_version, include_transports_without_transport_file=True): """Identify the valid transport types for a given version of IS-05""" valid_transports = ["urn:x-nmos:transport:rtp", "urn:x-nmos:transport:rtp.mcast", "urn:x-nmos:transport:rtp.ucast", "urn:x-nmos:transport:dash"] - if self.compare_api_version(api_version, "v1.1") >= 0 and not with_transport_file_support: + if self.compare_api_version(api_version, "v1.1") >= 0 and include_transports_without_transport_file: valid_transports.append("urn:x-nmos:transport:websocket") valid_transports.append("urn:x-nmos:transport:mqtt") return valid_transports diff --git a/nmostesting/suites/IS0502Test.py b/nmostesting/suites/IS0502Test.py index abcc5af15..c21abd931 100644 --- a/nmostesting/suites/IS0502Test.py +++ b/nmostesting/suites/IS0502Test.py @@ -580,7 +580,7 @@ def test_13(self, test): try: valid_transports = self.is05_utils.get_valid_transports( - self.apis[CONN_API_KEY]["version"], with_transport_file_support=True) + self.apis[CONN_API_KEY]["version"], include_transports_without_transport_file=False) access_error = False