Formatting

AMWA-TV · May 2, 2024 · dc9608a · dc9608a
1 parent 089a2b0
commit dc9608a
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 360 deletions.
diff --git a/nmostesting/IS14Utils.py b/nmostesting/IS14Utils.py
@@ -17,115 +17,115 @@
 
 from . import TestHelper
 
-CONFIGURATION_API_KEY = 'configuration'
+CONFIGURATION_API_KEY = "configuration"
 
 
 class IS14Utils(MS05Utils):
     def __init__(self, apis):
         MS05Utils.__init__(self, apis, CONFIGURATION_API_KEY)
-        self.configuration_url = apis[CONFIGURATION_API_KEY]['url']
+        self.configuration_url = apis[CONFIGURATION_API_KEY]["url"]
 
     def _format_property_id(self, property_id):
-        return str(property_id['level']) + 'p' + str(property_id['index'])
+        return f"{str(property_id["level"])}p{str(property_id["index"])}"
 
     def _format_method_id(self, method_id):
-        return str(method_id['level']) + 'm' + str(method_id['index'])
+        return f"{str(method_id["level"])}m{str(method_id["index"])}"
 
     def _format_role_path(self, role_path):
-        return '.'.join(r for r in role_path)
+        return ".".join(r for r in role_path)
 
     def _create_role_path_base(self, role_path):
         formatted_role_path = self._format_role_path(role_path)
-        return '{}rolePaths/{}'.format(self.configuration_url,
-                                       formatted_role_path)
+        return f"{self.configuration_url}rolePaths/{formatted_role_path}"
 
     def _create_property_value_endpoint(self, role_path, property_id):
         formatted_property_id = self._format_property_id(property_id)
-        return self._create_role_path_base(role_path) + '/properties/{}/value'.format(formatted_property_id)
+        return f"{self._create_role_path_base(role_path)}/properties/{formatted_property_id}/value"
 
     def _create_methods_endpoint(self, role_path, method_id):
         formatted_method_id = self._format_method_id(method_id)
-        return self._create_role_path_base(role_path) + '/methods/{}'.format(formatted_method_id)
+        return f"{self._create_role_path_base(role_path)}/methods/{formatted_method_id}"
 
     def _do_request(self, test, method, url, **kwargs):
         valid, r = TestHelper.do_request(method, url, **kwargs)
 
         if not valid:
-            raise NMOSTestException(test.FAIL("{} for {} :{}".format(r, method, url)))
+            raise NMOSTestException(test.FAIL(f"{r} for {method}: {url}"))
         if r.status_code < 200 or r.status_code > 299:
-            raise NMOSTestException(test.FAIL("Unexpected status code: {} for {} :{}".format(r.status_code,
-                                                                                            method,
-                                                                                            url))) 
+            raise NMOSTestException(test.FAIL(f"Unexpected status code: {r.status_code} for {method}: {url}"))
         try:
             self.validate_reference_datatype_schema(test, r.json(), "NcMethodResult", f"{method} :{url} ")
-
             return r.json()
         except ValueError as e:
-            raise NMOSTestException(test.FAIL("Error: {} for {} :{}".format(e.args[0], method, url)))
-    
+            raise NMOSTestException(test.FAIL(f"Error: {e.args[0]} for {method}: {url}"))
+
     # Overridden functions
     def get_property(self, test, property_id, role_path, **kwargs):
         """Get value of property from object. Raises NMOSTestException on error"""
         property_value_endpoint = self._create_property_value_endpoint(role_path, property_id)
-        return self._do_request(test, 'GET', property_value_endpoint)
+        return self._do_request(test, "GET", property_value_endpoint)
 
     def get_property_value(self, test, property_id, role_path, **kwargs):
         """Get value of property from object. Raises NMOSTestException on error"""
-        return self.get_property(test, property_id, role_path=role_path)['value']
+        return self.get_property(test, property_id, role_path=role_path)["value"]
 
     def set_property(self, test, property_id, argument, role_path, **kwargs):
         """Get value of property from object. Raises NMOSTestException on error"""
         property_value_endpoint = self._create_property_value_endpoint(role_path, property_id)
-        return self._do_request(test, 'SET', property_value_endpoint, data={'value': argument})
+        return self._do_request(test, "SET", property_value_endpoint, data={"value": argument})
 
     def get_sequence_item(self, test, property_id, index, role_path, **kwargs):
         """Get value from sequence property. Raises NMOSTestException on error"""
         methods_endpoint = self._create_methods_endpoint(role_path, NcObjectMethods.GET_SEQUENCE_ITEM.value)
-        return self._do_request(test, 'PATCH', methods_endpoint, data={'argument': {'id': property_id, 'index': index}})
+        return self._do_request(test, "PATCH", methods_endpoint, data={"argument": {"id": property_id, "index": index}})
 
     def get_sequence_item_value(self, test, property_id, index, role_path, **kwargs):
-        return self.get_sequence_item(test, property, index, role_path, **kwargs)['value']
+        return self.get_sequence_item(test, property, index, role_path, **kwargs)["value"]
 
     def get_sequence_length(self, test, property_id, role_path, **kwargs):
         """Get sequence length. Raises NMOSTestException on error"""
         methods_endpoint = self._create_methods_endpoint(role_path, NcObjectMethods.GET_SEQUENCE_LENGTH.value)
-        return self._do_request(test, 'PATCH', methods_endpoint, data={'argument': {'id': property_id}})
+        return self._do_request(test, "PATCH", methods_endpoint, data={"argument": {"id": property_id}})
 
     def get_member_descriptors(self, test, recurse, role_path, **kwargs):
         """Get BlockMemberDescritors for this block. Raises NMOSTestException on error"""
         methods_endpoint = self._create_methods_endpoint(role_path, NcBlockMethods.GET_MEMBERS_DESCRIPTOR.value)
-        return self._do_request(test, 'PATCH', methods_endpoint, data={'argument': {'recurse': recurse}})
+        return self._do_request(test, "PATCH", methods_endpoint, data={"argument": {"recurse": recurse}})
 
     def find_members_by_path(self, test, path, role_path, **kwargs):
         """Query members based on role path. Raises NMOSTestException on error"""
         methods_endpoint = self._create_methods_endpoint(role_path, NcBlockMethods.FIND_MEMBERS_BY_PATH.value)
-        return self._do_request(test, 'PATCH', methods_endpoint, data={'argument': {'path': path}})
+        return self._do_request(test, "PATCH", methods_endpoint, data={"argument": {"path": path}})
 
     def find_members_by_role(self, test, role, case_sensitive, match_whole_string, recurse, role_path, **kwargs):
         """Query members based on role. Raises NMOSTestException on error"""
         methods_endpoint = self._create_methods_endpoint(role_path, NcBlockMethods.FIND_MEMBERS_BY_ROLE.value)
-        return self._do_request(test, 'PATCH', methods_endpoint, data={'argument': {'role': role,
-                                                                                    'caseSensitive': case_sensitive,
-                                                                                    'matchWholeString': match_whole_string,
-                                                                                    'recurse': recurse}})
+        return self._do_request(test, "PATCH", methods_endpoint,
+                                data={"argument": {"role": role,
+                                                   "caseSensitive": case_sensitive,
+                                                   "matchWholeString": match_whole_string,
+                                                   "recurse": recurse}})
 
     def find_members_by_class_id(self, test, class_id, include_derived, recurse, role_path, **kwargs):
         """Query members based on class id. Raises NMOSTestException on error"""
         methods_endpoint = self._create_methods_endpoint(role_path, NcBlockMethods.FIND_MEMBERS_BY_CLASS_ID.value)
-        return self._do_request(test, 'PATCH', methods_endpoint, data={'argument': {'classId': class_id,
-                                                                                    'includeDerived': include_derived,
-                                                                                    'recurse': recurse}})
+        return self._do_request(test, "PATCH", methods_endpoint,
+                                data={"argument": {"classId": class_id,
+                                                   "includeDerived": include_derived,
+                                                   "recurse": recurse}})
 
     def get_control_class(self, test, class_id, include_inherited, role_path, **kwargs):
         """Query Class Manager for control class. Raises NMOSTestException on error"""
         methods_endpoint = self._create_methods_endpoint(role_path, NcClassManagerMethods.GET_CONTROL_CLASS.value)
-        return self._do_request(test, 'PATCH', methods_endpoint, data={'argument': {'classId': class_id,
-                                                                                    'includeInherited': include_inherited}})
-
+        return self._do_request(test, "PATCH", methods_endpoint,
+                                data={"argument": {"classId": class_id,
+                                                   "includeInherited": include_inherited}})
+
     def get_datatype(self, test, name, include_inherited, role_path, **kwargs):
         """Query Class Manager for datatype. Raises NMOSTestException on error"""
         methods_endpoint = self._create_methods_endpoint(role_path, NcClassManagerMethods.GET_DATATYPE.value)
-        return self._do_request(test, 'PATCH', methods_endpoint, data={'argument': {'name': name,
-                                                                                    'includeInherited': include_inherited}})
+        return self._do_request(test, "PATCH", methods_endpoint,
+                                data={"argument": {"name": name,
+                                                   "includeInherited": include_inherited}})
 
     # end of overridden functions
diff --git a/nmostesting/MS05Utils.py b/nmostesting/MS05Utils.py
@@ -84,11 +84,11 @@ def find_members_by_class_id(self, test, class_id, include_derived, recurse, **k
     def get_control_class(self, test, class_id, include_inherited, **kwargs):
         """Query Class Manager for control class. Raises NMOSTestException on error"""
         pass
-    
+
     def get_datatype(self, test, name, include_inherited, **kwargs):
         """Query Class Manager for datatype. Raises NMOSTestException on error"""
         pass
-    
+
     # End of overridden functions
 
     def query_device_model(self, test):