[IS 12] Validate Get/Set/Add/Remove/Find methods

nmostesting/NMOSTesting.py

@@ -58,7 +58,7 @@
 from .mocks.Registry import NUM_REGISTRIES, REGISTRIES, REGISTRY_API
 from .mocks.System import NUM_SYSTEMS, SYSTEMS, SYSTEM_API
 from .mocks.Auth import AUTH_API, PRIMARY_AUTH, SECONDARY_AUTH
-from zeroconf_monkey import Zeroconf
+from zeroconf import Zeroconf
 
 # Make ANSI escape character sequences (for producing coloured terminal text) work under Windows
 try:

nmostesting/mocks/Auth.py

@@ -29,7 +29,7 @@
 from ..Config import PORT_BASE, KEYS_MOCKS, ENABLE_HTTPS, CERT_TRUST_ROOT_CA, JWKS_URI, REDIRECT_URI, SCOPE, CACHE_PATH
 from ..TestHelper import get_default_ip, get_mocks_hostname, load_resolved_schema, check_content_type
 from ..IS10Utils import IS10Utils
-from zeroconf_monkey import ServiceInfo
+from zeroconf import ServiceInfo
 from enum import Enum
 from werkzeug.serving import make_server
 from http import HTTPStatus

nmostesting/suites/IS0401Test.py

@@ -24,14 +24,18 @@
 from copy import deepcopy
 from collections import defaultdict
 from pathlib import Path
-from zeroconf_monkey import ServiceBrowser, ServiceInfo, Zeroconf
+from zeroconf import ServiceBrowser, ServiceInfo, Zeroconf
 
 from .. import Config as CONFIG
 from ..MdnsListener import MdnsListener
 from ..GenericTest import GenericTest, NMOSTestException, NMOS_WIKI_URL
 from ..IS04Utils import IS04Utils
 from ..TestHelper import get_default_ip, is_ip_address, load_resolved_schema, check_content_type
 
+# monkey patch zeroconf to allow us to advertise "_nmos-registration._tcp"
+from zeroconf import service_type_name
+service_type_name.__kwdefaults__['strict'] = False
+
 NODE_API_KEY = "node"
 RECEIVER_CAPS_KEY = "receiver-caps"
 CAPS_REGISTER_KEY = "caps-register"

nmostesting/suites/IS0402Test.py

@@ -22,7 +22,7 @@
 from time import sleep
 from jsonschema import ValidationError
 from urllib.parse import urlparse
-from zeroconf_monkey import ServiceBrowser, Zeroconf
+from zeroconf import ServiceBrowser, Zeroconf
 
 from .. import Config as CONFIG
 from ..MdnsListener import MdnsListener

nmostesting/suites/IS0403Test.py

@@ -15,7 +15,7 @@
 import time
 import socket
 
-from zeroconf_monkey import ServiceBrowser, Zeroconf
+from zeroconf import ServiceBrowser, Zeroconf
 from ..MdnsListener import MdnsListener
 from ..GenericTest import GenericTest, NMOS_WIKI_URL
 from ..IS04Utils import IS04Utils

nmostesting/suites/IS0902Test.py

@@ -14,7 +14,7 @@
 
 import time
 import socket
-from zeroconf_monkey import ServiceInfo, Zeroconf
+from zeroconf import ServiceInfo, Zeroconf
 
 from .. import Config as CONFIG
 from ..MdnsListener import MdnsListener

nmostesting/suites/IS1001Test.py

@@ -21,7 +21,7 @@
 
 from ..GenericTest import GenericTest, NMOSTestException, NMOSInitException
 from .. import Config as CONFIG
-from zeroconf_monkey import ServiceBrowser, Zeroconf
+from zeroconf import ServiceBrowser, Zeroconf
 from ..MdnsListener import MdnsListener
 from ..TestHelper import check_content_type
 

requirements.txt

@@ -1,7 +1,7 @@
 flask>=2.0.0
 wtforms
 jsonschema
-zeroconf-monkey>=1.0.0
+zeroconf>=0.32.0
 requests
 netifaces
 gitpython

utilities/dut-data-exporter/dutDataExporter.py

@@ -54,9 +54,9 @@ def url_port_number(url):
     response = requests.get(url)
     mac_addresses = response.json()["interfaces"]
     for address in mac_addresses:
-        if type(address["port_id"]) == str:
+        if isinstance(address["port_id"], str):
             address["port_id"] = address["port_id"].replace("-", ":")
-        if type(address["chassis_id"]) == str:
+        if isinstance(address["chassis_id"], str):
             address["chassis_id"] = address["chassis_id"].replace("-", ":")
     node_id = response.json()["id"]
     print("Host: {}".format(response.json()["description"]))