Refactoring names

fb_bus_connector_plugin/api/v1parser.py

@@ -137,16 +137,16 @@ def parse_message(  # pylint: disable=too-many-branches,too-many-return-statemen
                 client_id=client_id,
             )
 
-        if V1Validator.validate_get_device_state(payload=payload) and address is not None:
-            return self.parse_get_device_state(
+        if V1Validator.validate_read_device_state(payload=payload) and address is not None:
+            return self.parse_read_device_state(
                 payload=payload,
                 length=length,
                 address=address,
                 client_id=client_id,
             )
 
-        if V1Validator.validate_set_device_state(payload=payload) and address is not None:
-            return self.parse_set_device_state(
+        if V1Validator.validate_write_device_state(payload=payload) and address is not None:
+            return self.parse_write_device_state(
                 payload=payload,
                 length=length,
                 address=address,
@@ -169,8 +169,8 @@ def parse_message(  # pylint: disable=too-many-branches,too-many-return-statemen
                 client_id=client_id,
             )
 
-        if V1Validator.validate_pub_sub_broadcast(payload=payload) and address is not None:
-            return self.parse_pub_sub_broadcast(
+        if V1Validator.validate_pub_sub_broadcast_register_value(payload=payload) and address is not None:
+            return self.parse_pub_sub_broadcast_register_value(
                 payload=payload,
                 length=length,
                 address=address,
@@ -451,7 +451,7 @@ def parse_report_single_register_value(
 
     # -----------------------------------------------------------------------------
 
-    def parse_get_device_state(
+    def parse_read_device_state(
         self,
         payload: bytearray,
         length: int,
@@ -479,7 +479,7 @@ def parse_get_device_state(
 
     # -----------------------------------------------------------------------------
 
-    def parse_set_device_state(
+    def parse_write_device_state(
         self,
         payload: bytearray,
         length: int,
@@ -574,7 +574,7 @@ def parse_pub_sub_write_register_key(
     # -----------------------------------------------------------------------------
 
     @staticmethod
-    def parse_pub_sub_broadcast(
+    def parse_pub_sub_broadcast_register_value(
         payload: bytearray,
         length: int,
         address: int,

fb_bus_connector_plugin/api/v1validator.py

@@ -35,7 +35,34 @@ class V1Validator:
     @classmethod
     def validate(cls, payload: bytearray) -> bool:
         """Validate topic against sets of regular expressions"""
-        return True
+        if not cls.validate_version(payload=payload):
+            return False
+
+        if cls.validate_discover_device(payload=payload):
+            if (
+                cls.validate_pair_command_search_devices(payload=payload)
+                or cls.validate_pair_command_write_address(payload=payload)
+                or cls.validate_pair_command_provide_register_structure(payload=payload)
+                or cls.validate_pair_command_pairing_finished(payload=payload)
+            ):
+                return True
+
+        if (
+            cls.validate_read_single_register(payload=payload)
+            or cls.validate_read_multiple_registers(payload=payload)
+            or cls.validate_write_single_register(payload=payload)
+            or cls.validate_write_multiple_registers(payload=payload)
+            or cls.validate_report_single_register(payload=payload)
+            or cls.validate_read_device_state(payload=payload)
+            or cls.validate_write_device_state(payload=payload)
+            or cls.validate_report_device_state(payload=payload)
+            or cls.validate_pub_sub_write_register_key(payload=payload)
+            or cls.validate_pub_sub_broadcast_register_value(payload=payload)
+            or cls.validate_pong_response(payload=payload)
+        ):
+            return True
+
+        return False
 
     # -----------------------------------------------------------------------------
 
@@ -82,14 +109,14 @@ def validate_report_single_register(cls, payload: bytearray) -> bool:
     # -----------------------------------------------------------------------------
 
     @classmethod
-    def validate_get_device_state(cls, payload: bytearray) -> bool:
+    def validate_read_device_state(cls, payload: bytearray) -> bool:
         """Validate payload against get device state packet structure"""
         return Packet(int(payload[1])) == Packet.READ_STATE
 
     # -----------------------------------------------------------------------------
 
     @classmethod
-    def validate_set_device_state(cls, payload: bytearray) -> bool:
+    def validate_write_device_state(cls, payload: bytearray) -> bool:
         """Validate payload against set device state packet structure"""
         return Packet(int(payload[1])) == Packet.WRITE_STATE
 
@@ -110,7 +137,7 @@ def validate_pub_sub_write_register_key(cls, payload: bytearray) -> bool:
     # -----------------------------------------------------------------------------
 
     @classmethod
-    def validate_pub_sub_broadcast(cls, payload: bytearray) -> bool:
+    def validate_pub_sub_broadcast_register_value(cls, payload: bytearray) -> bool:
         """Validate payload against pub/sub broadcast packet structure"""
         return Packet(int(payload[1])) == Packet.PUB_SUB_BROADCAST_REGISTER_VALUE
 

fb_bus_connector_plugin/connector.py

@@ -196,4 +196,4 @@ def run(self) -> None:
 
             time.sleep(0.001)
 
-        self.__logger.info("FB BUS connector was closed")
+        self.__logger.info("Connector FB BUS was closed")