diff --git a/nmostesting/Config.py b/nmostesting/Config.py index 792e33f0..1bd249ba 100644 --- a/nmostesting/Config.py +++ b/nmostesting/Config.py @@ -259,6 +259,17 @@ } } }, + "is-11": { + "repo": "is-11", + "versions": ["v1.0"], + "default_version": "v1.0", + "apis": { + "streamcompatibility": { + "name": "Stream Compatibility Management API", + "raml": "StreamCompatibilityManagementAPI.raml" + } + } + }, "bcp-003-01": { "repo": "nmos-secure-communication", "versions": ["v1.0"], @@ -275,6 +286,12 @@ } } }, + "bcp-005-01": { + "repo": "bcp-005-01", + "versions": ["v1.0"], + "default_version": "v1.0", + "apis": {} + }, "nmos-parameter-registers": { "repo": "nmos-parameter-registers", "versions": ["main"], diff --git a/nmostesting/NMOSTesting.py b/nmostesting/NMOSTesting.py index 41b87fc1..77f363bd 100644 --- a/nmostesting/NMOSTesting.py +++ b/nmostesting/NMOSTesting.py @@ -79,7 +79,10 @@ from .suites import IS0901Test from .suites import IS0902Test # from .suites import IS1001Test +from .suites import IS1101Test +from .suites import IS1102Test from .suites import BCP00301Test +from .suites import BCP0050101Test FLASK_APPS = [] @@ -316,6 +319,25 @@ # }], # "class": IS1001Test.IS1001Test # }, + "IS-11-01": { + "name": "IS-11 Stream Compatibility Management API", + "specs": [{ + "spec_key": "is-11", + "api_key": "streamcompatibility" + }], + "class": IS1101Test.IS1101Test + }, + "IS-11-02": { + "name": "IS-11 Interaction with IS-04", + "specs": [{ + "spec_key": "is-04", + "api_key": "node" + }, { + "spec_key": "is-11", + "api_key": "streamcompatibility" + }], + "class": IS1102Test.IS1102Test + }, "BCP-003-01": { "name": "BCP-003-01 Secure Communication", "specs": [{ @@ -324,6 +346,14 @@ }], "class": BCP00301Test.BCP00301Test }, + "BCP-005-01-01": { + "name": "BCP-005-01 EDID to Receiver Capabilities Mapping", + "specs": [{ + "spec_key": "is-04", + "api_key": "node" + }], + "class": BCP0050101Test.BCP0050101Test + }, } diff --git a/nmostesting/suites/BCP0050101Test.py b/nmostesting/suites/BCP0050101Test.py new file mode 100644 index 00000000..505f4a08 --- /dev/null +++ b/nmostesting/suites/BCP0050101Test.py @@ -0,0 +1,26 @@ +# Copyright (C) 2022 Advanced Media Workflow Association +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from ..GenericTest import GenericTest + +NODE_API_KEY = "node" + + +class BCP0050101Test(GenericTest): + """ + Runs Node Tests covering BCP-005-01 + """ + def __init__(self, apis): + GenericTest.__init__(self, apis) + self.node_url = self.apis[NODE_API_KEY]["url"] diff --git a/nmostesting/suites/IS1101Test.py b/nmostesting/suites/IS1101Test.py new file mode 100644 index 00000000..14277a0c --- /dev/null +++ b/nmostesting/suites/IS1101Test.py @@ -0,0 +1,26 @@ +# Copyright (C) 2022 Advanced Media Workflow Association +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from ..GenericTest import GenericTest + +COMPAT_API_KEY = "streamcompatibility" + + +class IS1101Test(GenericTest): + """ + Runs Node Tests covering IS-11 + """ + def __init__(self, apis): + GenericTest.__init__(self, apis) + self.compat_url = self.apis[COMPAT_API_KEY]["url"] diff --git a/nmostesting/suites/IS1102Test.py b/nmostesting/suites/IS1102Test.py new file mode 100644 index 00000000..e0919fe8 --- /dev/null +++ b/nmostesting/suites/IS1102Test.py @@ -0,0 +1,28 @@ +# Copyright (C) 2022 Advanced Media Workflow Association +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from ..GenericTest import GenericTest + +NODE_API_KEY = "node" +COMPAT_API_KEY = "streamcompatibility" + + +class IS1102Test(GenericTest): + """ + Runs Node Tests covering both IS-04 and IS-11 + """ + def __init__(self, apis): + GenericTest.__init__(self, apis,) + self.node_url = self.apis[NODE_API_KEY]["url"] + self.compat_url = self.apis[COMPAT_API_KEY]["url"]