34 add setters validators

EosLib/packet/data_header.py

@@ -8,7 +8,6 @@
 
 
 class DataHeader:
-
     data_header_struct_format_string = "!" \
                                        "B" \
                                        "B" \
@@ -50,17 +49,19 @@ def validate_data_header(self):
 
         :return: True if valid
         """
-        if not isinstance(self.sender, int) or not 0 <= self.sender <= 255 or self.sender == \
-                definitions.Device.NO_DEVICE:
+
+        if not isinstance(self.sender, int) or self.sender == definitions.Device.NO_DEVICE or\
+        not self.sender in definitions.Device:
             raise DataHeaderFormatError("Invalid Sender")
 
-        if not isinstance(self.data_type, int) or not 0 <= self.data_type <= 255:
+        if not isinstance(self.data_type, int) or not self.data_type in definitions.Type:
             raise DataHeaderFormatError("Invalid Type")
 
-        if not isinstance(self.priority, int) or not 0 <= self.priority <= 255:
+        if not isinstance(self.priority, int) or not self.priority in definitions.Priority:
             raise DataHeaderFormatError("Invalid Priority")
 
-        if not isinstance(self.destination, int) or not 0 <= self.destination <= 255:
+
+        if not isinstance(self.destination, int) or not self.destination in definitions.Device:
             raise DataHeaderFormatError("Invalid Destination")
 
         if not isinstance(self.generate_time, datetime):

EosLib/packet/definitions.py

@@ -1,8 +1,18 @@
-from enum import IntEnum, unique
+from enum import IntEnum, unique, EnumMeta
+
+
+class EnumMetaClass(EnumMeta):
+    def __contains__(cls, item):
+        try:
+            cls(item)
+        except ValueError:
+            return False
+        else:
+            return True
 
 
 @unique
-class Type(IntEnum):
+class Type(IntEnum, metaclass=EnumMetaClass):
     NO_TYPE = 0
     TELEMETRY = 1
     WARNING = 2
@@ -12,7 +22,7 @@ class Type(IntEnum):
 
 
 @unique
-class Priority(IntEnum):
+class Priority(IntEnum, metaclass=EnumMetaClass):
     NO_TRANSMIT = 0
     URGENT = 11
     TELEMETRY = 9
@@ -23,7 +33,7 @@ class Priority(IntEnum):
 
 
 @unique
-class Device(IntEnum):
+class Device(IntEnum, metaclass=EnumMetaClass):
     NO_DEVICE = 0
     PRESSURE = 1
     PARTICULATES = 2

EosLib/packet/packet.py

@@ -22,6 +22,7 @@ def __init__(self, body: bytes, data_header: DataHeader, transmit_header: Transm
         self.body = body  # type: bytes
         self.data_header = data_header  # type: DataHeader
         self.transmit_header = transmit_header  # type: TransmitHeader
+        self.validate_packet() # checks if packet is valid
 
     def __eq__(self, other):
         """ Compares two packets for value equality
@@ -129,6 +130,70 @@ def encode_to_string(self):
             data_header=self.data_header.encode_to_string(),
             body=self.body.decode())
 
+    def set_data_header(self, new_data_header: DataHeader):
+        """ Setter that sets new data header
+
+        :return: boolean True set is successful
+        """
+        if new_data_header is not None:
+            if new_data_header.validate_data_header():
+                self.data_header = new_data_header
+
+        return True
+
+    def set_transmit_header(self, new_transmit_header: TransmitHeader):
+        """ Setter that sets new transmit header
+
+        :return: boolean True set is successful
+        """
+        if new_transmit_header.validate_transmit_header():
+            self.transmit_header = new_transmit_header
+
+        return True
+
+    def set_body(self, new_body: bytes):
+        """ Setter that sets new body
+
+        :return: boolean True set is successful
+        """
+        if new_body is not None and len(new_body) == 0:
+            self.body = new_body
+
+    @staticmethod
+    def check_data_header(data_header: DataHeader):
+        """ Takes a packet data header and checks to see if it is valid
+
+        :return: boolean True if valid
+        """
+        if data_header is None:
+            raise PacketFormatError("All packets must have a data header")
+        else:
+            data_header.validate_data_header()
+
+        return True
+
+    @staticmethod
+    def check_transmit_header(transmit_header: TransmitHeader):
+        """ Takes a packet transmit header and checks to see if it is valid
+
+        :return: boolean True if valid
+        """
+        if transmit_header is not None:
+            transmit_header.validate_transmit_header()
+
+        return True
+
+    @staticmethod
+    def check_body(body: bytes):
+        """ Takes a packet body and checks to see if it is valid
+
+        :return: boolean True if valid
+        """
+        if body is None or len(body) == 0 or not isinstance(body, bytes):
+            raise PacketFormatError("All packets must have a body")
+
+        return True
+
     @staticmethod
     def decode(packet_bytes: bytes):
         """Takes a bytes object and decodes it into a Packet object.