AMWA-TV
diff --git a/‎README.md‎
Lines changed: 1 addition & 0 deletions b/‎README.md‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎docs/2.0. Usage.md‎
Lines changed: 1 addition & 0 deletions b/‎docs/2.0. Usage.md‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎docs/2.10 Usage - Invasive Device Model Testing.md‎
Lines changed: 24 additions & 0 deletions b/‎docs/2.10 Usage - Invasive Device Model Testing.md‎
Lines changed: 24 additions & 0 deletions
diff --git a/‎nmostesting/Config.py‎
Lines changed: 38 additions & 0 deletions b/‎nmostesting/Config.py‎
Lines changed: 38 additions & 0 deletions
diff --git a/‎nmostesting/ControllerTest.py‎
Lines changed: 15 additions & 11 deletions b/‎nmostesting/ControllerTest.py‎
Lines changed: 15 additions & 11 deletions
@@ -32,6 +32,7 @@ The following test suites are currently supported.
 | IS-09-01 | IS-09 System API | | (X) | | System Parameters Server |
 | IS-09-02 | IS-09 System API Discovery | X | | | |
 | IS-10-01 | IS-10 Authorization API | | | | Authorization Server |
+| IS-12-01 | IS 12 Control Protocol API | X | | | See [Invasive Device Model Testing](docs/2.10%20Usage%20-%20Invasive%20Device%20Model%20Testing.md) |
 | - | BCP-002-01 Natural Grouping | X | | | Included in IS-04 Node API suite |
 | - | BCP-002-02 Asset Distinguishing Information | X | | | Included in IS-04 Node API suite |
 | BCP-003-01 | BCP-003-01 Secure Communication | X | X | | See [Testing TLS](docs/2.2.%20Usage%20-%20Testing%20BCP-003-01%20TLS.md) |
 
@@ -44,6 +44,7 @@ The following pages provide information on additional instructions for testing s
 - [SDP Files](2.4.%20Usage%20-%20Testing%20of%20SDP%20Files.md)
 - [IS-07 MQTT](2.7.%20Usage%20-%20Testing%20IS-07%20MQTT.md)
 - [Controllers](2.8.%20Usage%20-%20Testing%20Controllers.md)
+- [Invasive Device Model Testing](2.10%20Usage%20-%20Invasive%20Device%20Model%20Testing.md)
 
 ## Non-interactive Testing
 
 
@@ -0,0 +1,24 @@
+# Invasive Device Model Testing
+
+## Running Invasive Device Model Tests
+
+Invasive tests are those that attempt to change the values of properties, and execute methods on the Device Model of a Node under Test (NuT).
+Non-invasive tests are limited to changing only the value of User Labels in the NuT's Device Model.
+
+By default, the `IS-12-01` test suite will __NOT__ execute invasive tests; these can be enabled by setting `MS05_INVASIVE_TESTING` to `True` in your `UserConfig.py` file as described in [Installation](1.0.%20Installation.md).
+
+## Running Interactive Invasive Tests
+
+When running invasive tests, the Testing Façade can be used by a user to interactively select which properties and methods of the NuT's Device Model are subject to invasive testing.
+
+Interactive mode is disabled by default, but can be enabled by setting `MS05_INTERACTIVE_TESTING` to `True` in your `UserConfig.py` file.
+
+Use the following command to launch the Testing Façade:
+
+```shell
+python3 nmos-testing-facade.py
+```
+
+By default the Testing Façade will run on localhost port 5001. This can be altered by adding `TESTING_FACADE_PORT` to your `UserConfig.py` file.
+
+In the NMOS Testing Tool, when running the `IS-12-01` test suite, provide the IP/hostname of the Testing Façade (e.g. localhost) and the port of the Testing Façade (use 5001 by default).
@@ -61,6 +61,13 @@
 # Number of seconds to wait before timing out Controller test. Set to None to disable timeout mechanism
 CONTROLLER_TESTING_TIMEOUT = 120
 
+# When True invasive MS-05 tests will be run as part of MS0501Test test suite
+MS05_INVASIVE_TESTING = False
+
+# Used when MS05_INVASIVE_TESTING is set to True.
+# When True invasive MS-05 tests will use the TestingFacade to allow user interaction
+MS05_INTERACTIVE_TESTING = False
+
 # Set a Query API hostname/IP and port for use when operating without DNS-SD
 QUERY_API_HOST = "127.0.0.1"
 QUERY_API_PORT = 80
@@ -280,6 +287,37 @@
             }
         }
     },
+    "is-12": {
+        "repo": "is-12",
+        "versions": ["v1.0"],
+        "default_version": "v1.0",
+        "apis": {
+            "ncp": {
+                "name": "Control Protocol"
+            },
+        }
+    },
+    "ms-05-02": {
+        "repo": "ms-05-02",
+        "versions": ["v1.0"],
+        "default_version": "v1.0",
+        "apis": {
+            "controlframework": {
+                "name": "Control Framework"
+            },
+        }
+    },
+    "nmos-control-feature-sets": {
+        "repo": "nmos-control-feature-sets",
+        "versions": ["main"],
+        "default_version": "main",
+        "apis": {
+            "featuresets": {
+                "name": "Control Feature Sets",
+                "repo_paths": ["identification", "monitoring"]
+            }
+        }
+    },
     "bcp-002-01": {
         "repo": "bcp-002-01",
         "versions": ["v1.0"],
 
@@ -76,16 +76,18 @@ class ControllerTest(GenericTest):
     """
     Testing initial set up of new test suite for controller testing
     """
-    def __init__(self, apis, registries, node, dns_server, disable_auto=True):
+    def __init__(self, apis, registries, node, dns_server, auths, disable_auto=True, **kwargs):
         # Remove the spec_path as there are no corresponding GitHub repos for Controller Tests
         apis[CONTROLLER_TEST_API_KEY].pop("spec_path", None)
         if CONFIG.ENABLE_HTTPS:
             # Comms with Testing Facade are http only
-            apis[CONTROLLER_TEST_API_KEY]["base_url"] \
-                = apis[CONTROLLER_TEST_API_KEY]["base_url"].replace("https", "http")
-            apis[CONTROLLER_TEST_API_KEY]["url"] = apis[CONTROLLER_TEST_API_KEY]["url"].replace("https", "http")
-        GenericTest.__init__(self, apis, disable_auto=disable_auto)
-        self.authorization = False
+            if apis[CONTROLLER_TEST_API_KEY]["base_url"] is not None:
+                apis[CONTROLLER_TEST_API_KEY]["base_url"] \
+                    = apis[CONTROLLER_TEST_API_KEY]["base_url"].replace("https", "http")
+            if apis[CONTROLLER_TEST_API_KEY]["url"] is not None:
+                apis[CONTROLLER_TEST_API_KEY]["url"] \
+                    = apis[CONTROLLER_TEST_API_KEY]["url"].replace("https", "http")
+        GenericTest.__init__(self, apis, auths=auths, disable_auto=disable_auto)
         self.primary_registry = registries[1]
         self.node = node
         self.dns_server = dns_server
@@ -156,11 +158,11 @@ def execute_tests(self, test_names):
         if len(test_names) == 1 and test_names[0] == "auto" and self.disable_auto:
             return
 
+        self.primary_registry.query_api_called = False
+
         self.pre_tests_message()
 
-        for test_name in test_names:
-            self.primary_registry.query_api_called = False
-            self.execute_test(test_name)
+        super().execute_tests(test_names)
 
         self.post_tests_message()
 
@@ -242,9 +244,11 @@ def _wait_for_testing_facade(self, question_id, test_type):
 
         return answer_response
 
-    def _invoke_testing_facade(self, question, answers, test_type, multipart_test=None, metadata=None):
+    def _invoke_testing_facade(self, question, answers, test_type,
+                               multipart_test=None, metadata=None, test_method_name=None):
         # Get the name of the calling test method to use as an identifier
-        test_method_name = inspect.currentframe().f_back.f_code.co_name
+        test_method_name = test_method_name if test_method_name \
+            else inspect.currentframe().f_back.f_code.co_name
 
         json_out = self._send_testing_facade_questions(
             test_method_name, question, answers, test_type, multipart_test, metadata)