Merge pull request #27 from kaincenteno/more-stuff

adds ethernetMacAddress to Attributes

Author: kaincenteno

pyaxm/client.py

@@ -141,29 +141,21 @@ def get_device_server_assignment(self, device_id: str) -> OrgDeviceAssignedServe
         return response.data
 
     @ensure_valid_token
-    def assign_unassign_device_to_mdm_server(
-        self, device_ids: List[str], server_id: str, action: str
-    ) -> OrgDeviceActivity:
-        """
-        Assign or unassign one or more devices to/from an MDM server.
-
-        :param device_ids: List of device IDs.
-        :param server_id: The ID of the MDM server.
-        :param action: 'assign' or 'unassign'.
-        :return: The completed OrgDeviceActivity.
-        """
-        unassign_response = self.abm.assign_unassign_device_to_mdm_server(
-            device_ids, server_id, action, self.access_token.value
-        )
-
-        # use the ID to check the status until it is complete
-        # Waits before the first check to prevent rate limitting
+    def _wait_for_device_activity_completion(self, activity_id: str) -> OrgDeviceActivity:
         time.sleep(10)
-        activity_response = self.abm.get_device_activity(unassign_response.data.id, self.access_token.value)
+        activity_response = self.abm.get_device_activity(activity_id, self.access_token.value)
         retry = 0
         while activity_response.data.attributes.status == 'IN_PROGRESS' and retry < 5:
             time.sleep(10 * retry)
             retry += 1
-            activity_response = self.abm.get_device_activity(unassign_response.data.id, self.access_token.value)
-
+            activity_response = self.abm.get_device_activity(activity_id, self.access_token.value)
         return activity_response.data
+
+    @ensure_valid_token
+    def assign_unassign_device_to_mdm_server(
+        self, device_ids: List[str], server_id: str, action: str
+    ) -> OrgDeviceActivity:
+        response = self.abm.assign_unassign_device_to_mdm_server(
+            device_ids, server_id, action, self.access_token.value
+        )
+        return self._wait_for_device_activity_completion(response.data.id)

pyaxm/models.py

@@ -38,8 +38,9 @@ class Attributes(BaseModel):
         eid: Optional[str] = None
         imei: Optional[List[str]] = None
         meid: Optional[List[str]] = None
-        wifiMacAddress: Optional[str] = None
-        bluetoothMacAddress: Optional[str] = None
+        wifiMacAddress: Optional[str] = None # Documentation says it's a list, but it's a string
+        bluetoothMacAddress: Optional[str] = None # Documentation says it's a list, but it's a string
+        ethernetMacAddress: Optional[List[str]] = None
         orderDateTime: Optional[AwareDatetime] = None
         orderNumber: Optional[str] = None
         partNumber: Optional[str] = None