pyxecm 0.0.17__py3-none-any.whl → 0.0.19__py3-none-any.whl

pyxecm/otds.py

@@ -33,6 +33,12 @@ getLicensesForResource : Get list of licenses for a resource
 deleteLicenseFromResource : Delete a license from a resource
 assignUserToLicense : Assign an OTDS user to a product license (feature) in OTDS.
 assignPartitionToLicense: Assign an OTDS user partition to a license (feature) in OTDS.
+getLicensedObjects: Return the licensed objects (users, groups, partitions) an OTDS for a
+                    license + license feature associated with an OTDS resource (like "cs").
+isUserLicensed: Check if a user is licensed for a license and license feature associated
+                with a particular OTDS resource.
+isPartitionLicensed: Check if a user partition is licensed for a license and license feature
+                     associated with a particular OTDS resource.
 
 addPartition : Add an OTDS partition
 getPartition : Get a partition with a specific name
@@ -405,10 +411,11 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add product license -> {} for product -> {}; error -> {}".format(
+                    "Failed to add product license -> {} for product -> {}; error -> {} ({})".format(
                         path_to_license_file,
                         product_description,
                         response.text,
+                        response.status_code,
                     )
                 )
                 return None
@@ -454,8 +461,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to get license for resource -> {}; error -> {}".format(
-                        resource_id, response.text
+                    "Failed to get license for resource -> {}; error -> {} ({})".format(
+                        resource_id, response.text, response.status_code
                     )
                 )
                 return None
@@ -494,8 +501,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to delete license -> {} for resource -> {}; error -> {}".format(
-                        license_id, resource_id, response.text
+                    "Failed to delete license -> {} for resource -> {}; error -> {} ({})".format(
+                        license_id, resource_id, response.text, response.status_code
                     )
                 )
                 return False
@@ -584,10 +591,11 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add license feature -> {} associated with resource -> {} for user -> {}; status code -> {}".format(
+                    "Failed to add license feature -> {} associated with resource -> {} to user -> {}; error -> {} ({})".format(
                         license_feature,
                         resource_id,
                         user_id,
+                        response.text,
                         response.status_code,
                     )
                 )
@@ -616,7 +624,26 @@ class OTDS:
         """
 
         licenses = self.getLicensesForResource(resource_id)
+        if not licenses:
+            logger.error(
+                "Resource with ID -> {} does not exist or has no licenses".format(
+                    resource_id
+                )
+            )
+            return False
 
+        # licenses have this format:
+        # {
+        #   '_oTLicenseType': 'NON-PRODUCTION',
+        #   '_oTLicenseResource': '7382094f-a434-4714-9696-82864b6803da',
+        #   '_oTLicenseResourceName': 'cs',
+        #   '_oTLicenseProduct': 'EXTENDED_ECM',
+        #   'name': 'EXTENDED_ECM¹7382094f-a434-4714-9696-82864b6803da',
+        #   'location': 'cn=EXTENDED_ECM¹7382094f-a434-4714-9696-82864b6803da,ou=Licenses,dc=identity,dc=opentext,dc=net',
+        #   'id': 'cn=EXTENDED_ECM¹7382094f-a434-4714-9696-82864b6803da,ou=Licenses,dc=identity,dc=opentext,dc=net',
+        #   'description': 'CS license',
+        #   'values': [{...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, ...]
+        # }
         for lic in licenses:
             if lic["_oTLicenseProduct"] == license_name:
                 license_location = lic["id"]
@@ -642,7 +669,11 @@ class OTDS:
 
         logger.info(
             "Assign license feature -> {} of license -> {} associated with resource -> {} to partition -> {}; calling -> {}".format(
-                license_feature, license_location, resource_id, partition_name, request_url
+                license_feature,
+                license_location,
+                resource_id,
+                partition_name,
+                request_url,
             )
         )
 
@@ -668,10 +699,11 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add license feature -> {} associated with resource -> {} for partition -> {}; status code -> {}".format(
+                    "Failed to add license feature -> {} associated with resource -> {} to partition -> {}; error -> {} ({})".format(
                         license_feature,
                         resource_id,
                         partition_name,
+                        response.text,
                         response.status_code,
                     )
                 )
@@ -679,6 +711,246 @@ class OTDS:
 
     # end method definition
 
+    def getLicensedObjects(
+        self,
+        resource_id: str,
+        license_feature: str,
+        license_name: str,
+    ):
+        """Return the licensed objects (users, groups, partitions) in OTDS for a license + license feature
+           associated with an OTDS resource (like "cs").
+
+        Args:
+            resource_id (string): OTDS resource ID (this is ID not the resource name!)
+            license_feature (string): name of the license feature, e.g. "X2" or "ADDON_ENGINEERING"
+            license_name (string): name of the license to assign, e.g. "EXTENDED_ECM" or "INTELLGENT_VIEWIMG"
+        Returns:
+            dict: data structure of licensed objects
+
+            Example return value:
+            {
+                'status': 0,
+                'displayString': 'Success',
+                'exceptions': None,
+                'retValue': 0,
+                'listGroupsResults': {'groups': [...], 'actualPageSize': 0, 'nextPageCookie': None, 'requestedPageSize': 250},
+                'listUsersResults': {'users': [...], 'actualPageSize': 53, 'nextPageCookie': None, 'requestedPageSize': 250},
+                'listUserPartitionResult': {'_userPartitions': [...], 'warningMessage': None, 'actualPageSize': 0, 'nextPageCookie': None, 'requestedPageSize': 250},
+                'version': 1
+            }
+        """
+
+        licenses = self.getLicensesForResource(resource_id)
+        if not licenses:
+            logger.error(
+                "Resource with ID -> {} does not exist or has no licenses".format(
+                    resource_id
+                )
+            )
+            return False
+
+        # licenses have this format:
+        # {
+        #   '_oTLicenseType': 'NON-PRODUCTION',
+        #   '_oTLicenseResource': '7382094f-a434-4714-9696-82864b6803da',
+        #   '_oTLicenseResourceName': 'cs',
+        #   '_oTLicenseProduct': 'EXTENDED_ECM',
+        #   'name': 'EXTENDED_ECM¹7382094f-a434-4714-9696-82864b6803da',
+        #   'location': 'cn=EXTENDED_ECM¹7382094f-a434-4714-9696-82864b6803da,ou=Licenses,dc=identity,dc=opentext,dc=net',
+        #   'id': 'cn=EXTENDED_ECM¹7382094f-a434-4714-9696-82864b6803da,ou=Licenses,dc=identity,dc=opentext,dc=net',
+        #   'description': 'CS license',
+        #   'values': [{...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, ...]
+        # }
+        for lic in licenses:
+            if lic["_oTLicenseProduct"] == license_name:
+                license_location = lic["location"]
+
+        try:
+            license_location
+        except UnboundLocalError:
+            logger.error(
+                "Cannot find license -> {} for resource -> {}".format(
+                    license_name, resource_id
+                )
+            )
+            return False
+
+        request_url = (
+            self.licenseUrl()
+            + "/object/"
+            + license_location
+            + "?counter="
+            + license_feature
+        )
+
+        logger.info(
+            "Get licensed objects for license -> {} and license feature -> {} associated with resource -> {}; calling -> {}".format(
+                license_name,
+                license_feature,
+                resource_id,
+                request_url,
+            )
+        )
+
+        retries = 0
+        while True:
+            response = requests.get(
+                request_url,
+                headers=requestHeaders,
+                cookies=self.cookie(),
+            )
+            if response.ok:
+                return self.parseRequestResponse(response)
+            # Check if Session has expired - then re-authenticate and try once more
+            elif response.status_code == 401 and retries == 0:
+                logger.warning("Session has expired - try to re-authenticate...")
+                self.authenticate(True)
+                retries += 1
+            else:
+                logger.error(
+                    "Failed to get licensed objects for license -> {} and license feature -> {} associated with resource -> {}; error -> {} ({})".format(
+                        license_name,
+                        license_feature,
+                        resource_id,
+                        response.text,
+                        response.status_code,
+                    )
+                )
+                return None
+
+    # end method definition
+
+    def isUserLicensed(self, user_name: str, resource_id: str, license_feature: str, license_name: str) -> bool:
+        """Check if a user is licensed for a license and license feature associated with a particular OTDS resource.
+
+        Args:
+            user_name (str): login name of the OTDS user
+            resource_id (string): OTDS resource ID (this is ID not the resource name!)
+            license_feature (string): name of the license feature, e.g. "X2" or "ADDON_ENGINEERING"
+            license_name (string): name of the license to assign, e.g. "EXTENDED_ECM" or "INTELLGENT_VIEWIMG"
+
+        Returns:
+            bool: True if the user is licensed and False otherwise
+        """
+
+        response = self.getLicensedObjects(
+            resource_id=resource_id,
+            license_feature=license_feature,
+            license_name=license_name,
+        )
+
+        if not response or not response["listUsersResults"]:
+            return False
+
+        users = response["listUsersResults"]["users"]
+
+        if not users:
+            return False
+
+        user = next(
+            (
+                item
+                for item in users
+                if item["name"] == user_name
+            ),
+            None,
+        )
+
+        if user:
+            return True
+        
+        return False
+
+    # end method definition
+
+    def isGroupLicensed(self, group_name: str, resource_id: str, license_feature: str, license_name: str) -> bool:
+        """Check if a group is licensed for a license and license feature associated with a particular OTDS resource.
+
+        Args:
+            group_name (str): name of the OTDS user group
+            resource_id (string): OTDS resource ID (this is ID not the resource name!)
+            license_feature (string): name of the license feature, e.g. "X2" or "ADDON_ENGINEERING"
+            license_name (string): name of the license to assign, e.g. "EXTENDED_ECM" or "INTELLGENT_VIEWIMG"
+
+        Returns:
+            bool: True if the group is licensed and False otherwise
+        """
+
+        response = self.getLicensedObjects(
+            resource_id=resource_id,
+            license_feature=license_feature,
+            license_name=license_name,
+        )
+
+        if not response or not response["listGroupsResults"]:
+            return False
+
+        groups = response["listGroupsResults"]["groups"]
+
+        if not groups:
+            return False
+
+        group = next(
+            (
+                item
+                for item in groups
+                if item["name"] == group_name
+            ),
+            None,
+        )
+
+        if group:
+            return True
+        
+        return False
+
+    # end method definition
+
+    def isPartitionLicensed(
+        self, partition_name: str, resource_id: str, license_feature: str, license_name: str
+    ):
+        """Check if a user is licensed for a license and license feature associated with a particular OTDS resource.
+
+        Args:
+            partition_name (str): name of the OTDS user partition, e.g. "Content Server Members"
+            resource_id (string): OTDS resource ID (this is ID not the resource name!)
+            license_feature (string): name of the license feature, e.g. "X2" or "ADDON_ENGINEERING"
+            license_name (string): name of the license to assign, e.g. "EXTENDED_ECM" or "INTELLGENT_VIEWIMG"
+
+        Returns:
+            bool: True if the partition is licensed and False otherwise
+        """
+
+        response = self.getLicensedObjects(
+            resource_id=resource_id,
+            license_feature=license_feature,
+            license_name=license_name,
+        )
+
+        if not response or not response["listUserPartitionResult"]:
+            return False
+
+        partitions = response["listUserPartitionResult"]["_userPartitions"]
+
+        if not partitions:
+            return False
+
+        partition = next(
+            (
+                item
+                for item in partitions
+                if item["name"] == partition_name
+            ),
+            None,
+        )
+
+        if partition:
+            return True
+        
+        return False
+
+    # end method definition
+
     def addPartition(self, name: str, description: str) -> dict:
         """Add a new user partition to OTDS
 
@@ -715,8 +987,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add user partition -> {}; error -> {}".format(
-                        name, response.text
+                    "Failed to add user partition -> {}; error -> {} ({})".format(
+                        name, response.text, response.status_code
                     )
                 )
                 return None
@@ -754,8 +1026,8 @@ class OTDS:
             else:
                 if show_error:
                     logger.error(
-                        "Failed to get partition -> {}; warning -> {}".format(
-                            name, response.text
+                        "Failed to get partition -> {}; warning -> {} ({})".format(
+                            name, response.text, response.status_code
                         )
                     )
                 return None
@@ -821,7 +1093,9 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add user -> {}; error -> {}".format(name, response.text)
+                    "Failed to add user -> {}; error -> {} ({})".format(
+                        name, response.text, response.status_code
+                    )
                 )
                 return None
 
@@ -859,8 +1133,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to get user -> {}; error -> {}".format(
-                        user_id, response.text
+                    "Failed to get user -> {}; error -> {} ({})".format(
+                        user_id, response.text, response.status_code
                     )
                 )
                 return None
@@ -911,8 +1185,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to update user -> {}; error -> {}".format(
-                        user_id, response.text
+                    "Failed to update user -> {}; error -> {} ({})".format(
+                        user_id, response.text, response.status_code
                     )
                 )
                 return None
@@ -951,8 +1225,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to delete user -> {}; error -> {}".format(
-                        user_id, response.text
+                    "Failed to delete user -> {}; error -> {} ({})".format(
+                        user_id, response.text, response.status_code
                     )
                 )
                 return False
@@ -996,8 +1270,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to reset password for user -> {}; error -> {}".format(
-                        user_id, response.text
+                    "Failed to reset password for user -> {}; error -> {} ({})".format(
+                        user_id, response.text, response.status_code
                     )
                 )
                 return False
@@ -1047,7 +1321,9 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add group -> {}; error -> {}".format(name, response.text)
+                    "Failed to add group -> {}; error -> {} ({})".format(
+                        name, response.text, response.status_code
+                    )
                 )
                 return None
 
@@ -1096,8 +1372,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to get group -> {}; error -> {}".format(
-                        group, response.text
+                    "Failed to get group -> {}; error -> {} ({})".format(
+                        group, response.text, response.status_code
                     )
                 )
                 return None
@@ -1141,8 +1417,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add user -> {} to group -> {}; error -> {}".format(
-                        user, group, response.text
+                    "Failed to add user -> {} to group -> {}; error -> {} ({})".format(
+                        user, group, response.text, response.status_code
                     )
                 )
                 return False
@@ -1187,8 +1463,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add group -> {} to parent group -> {}; error -> {}".format(
-                        group, parent_group, response.text
+                    "Failed to add group -> {} to parent group -> {}; error -> {} ({})".format(
+                        group, parent_group, response.text, response.status_code
                     )
                 )
                 return False
@@ -1249,8 +1525,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add resource -> {}; error -> {}".format(
-                        name, response.text
+                    "Failed to add resource -> {}; error -> {} ({})".format(
+                        name, response.text, response.status_code
                     )
                 )
                 return None
@@ -1300,7 +1576,9 @@ class OTDS:
 
     # end method definition
 
-    def updateResource(self, name: str, resource: object, show_error: bool = True) -> dict:
+    def updateResource(
+        self, name: str, resource: object, show_error: bool = True
+    ) -> dict:
         """Update an existing OTDS resource
 
         Args:
@@ -1379,8 +1657,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to activate resource -> {}; error -> {}".format(
-                        resource_id, response.text
+                    "Failed to activate resource -> {}; error -> {} ({})".format(
+                        resource_id, response.text, response.status_code
                     )
                 )
                 return None
@@ -1413,7 +1691,9 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to retrieve access roles; error -> {}".format(response.text)
+                    "Failed to retrieve access roles; error -> {} ({})".format(
+                        response.text, response.status_code
+                    )
                 )
                 return None
 
@@ -1448,8 +1728,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to retrieve access role -> {}; error -> {}".format(
-                        name, response.text
+                    "Failed to retrieve access role -> {}; error -> {} ({})".format(
+                        name, response.text, response.status_code
                     )
                 )
                 return None
@@ -1501,15 +1781,17 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add partition -> {} to access role -> {}; error -> {}".format(
-                        partition, access_role, response.text
+                    "Failed to add partition -> {} to access role -> {}; error -> {} ({})".format(
+                        partition, access_role, response.text, response.status_code
                     )
                 )
                 return False
 
     # end method definition
 
-    def addUserToAccessRole(self, access_role: str, user_id: str, location: str = "") -> bool:
+    def addUserToAccessRole(
+        self, access_role: str, user_id: str, location: str = ""
+    ) -> bool:
         """Add an OTDS user to an OTDS access role
 
         Args:
@@ -1574,15 +1856,17 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add user -> {} to access role -> {}; error -> {}".format(
-                        user_id, access_role, response.text
+                    "Failed to add user -> {} to access role -> {}; error -> {} ({})".format(
+                        user_id, access_role, response.text, response.status_code
                     )
                 )
                 return False
 
     # end method definition
 
-    def addGroupToAccessRole(self, access_role: str, group: str, location: str = "") -> bool:
+    def addGroupToAccessRole(
+        self, access_role: str, group: str, location: str = ""
+    ) -> bool:
         """Add an OTDS group to an OTDS access role
 
         Args:
@@ -1646,8 +1930,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add group -> {} to access role -> {}; error -> {}".format(
-                        group, access_role, response.text
+                    "Failed to add group -> {} to access role -> {}; error -> {} ({})".format(
+                        group, access_role, response.text, response.status_code
                     )
                 )
                 return False
@@ -1703,8 +1987,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to update access role -> {}; error -> {}".format(
-                        name, response.text
+                    "Failed to update access role -> {}; error -> {} ({})".format(
+                        name, response.text, response.status_code
                     )
                 )
                 return None
@@ -1760,8 +2044,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add system attribute -> {} with value -> {}; error -> {}".format(
-                        name, value, response.text
+                    "Failed to add system attribute -> {} with value -> {}; error -> {} ({})".format(
+                        name, value, response.text, response.status_code
                     )
                 )
                 return None
@@ -1795,8 +2079,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to retrieve trusted sites; error -> {}".format(
-                        response.text
+                    "Failed to retrieve trusted sites; error -> {} ({})".format(
+                        response.text, response.status_code
                     )
                 )
                 return None
@@ -1837,12 +2121,12 @@ class OTDS:
         )
         if not response.ok:
             logger.error(
-                "Failed to add trusted site -> {}; error -> {}".format(
-                    trusted_site, response.text
+                "Failed to add trusted site -> {}; error -> {} ({})".format(
+                    trusted_site, response.text, response.status_code
                 )
             )
             return None
-        return response # don't parse it!
+        return response  # don't parse it!
 
     # end method definition
 
@@ -1921,7 +2205,11 @@ class OTDS:
             cookies=self.cookie(),
         )
         if not response.ok:
-            logger.error("Failed to enable audit; error -> {}".format(response.text))
+            logger.error(
+                "Failed to enable audit; error -> {} ({})".format(
+                    response.text, response.status_code
+                )
+            )
         return response
 
     # end method definition
@@ -1993,8 +2281,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add OAuth client -> {}; error -> {}".format(
-                        client_id, response.text
+                    "Failed to add OAuth client -> {}; error -> {} ({})".format(
+                        client_id, response.text, response.status_code
                     )
                 )
                 return None
@@ -2032,8 +2320,8 @@ class OTDS:
             else:
                 if show_error:
                     logger.error(
-                        "Failed to get oauth client -> {}; error -> {}".format(
-                            client_id, response.text
+                        "Failed to get oauth client -> {}; error -> {} ({})".format(
+                            client_id, response.text, response.status_code
                         )
                     )
                 return None
@@ -2068,8 +2356,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to update OAuth client -> {}; error -> {}".format(
-                        client_id, response.text
+                    "Failed to update OAuth client -> {}; error -> {} ({})".format(
+                        client_id, response.text, response.status_code
                     )
                 )
                 return None
@@ -2108,8 +2396,11 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to retrieve role -> {}; url -> {} : error -> {}".format(
-                        access_role_name, accessRolesUrl, response.text
+                    "Failed to retrieve role -> {}; url -> {} : error -> {} ({})".format(
+                        access_role_name,
+                        accessRolesUrl,
+                        response.text,
+                        response.status_code,
                     )
                 )
                 return None
@@ -2138,8 +2429,8 @@ class OTDS:
             oauthClientLocation = response_dict["location"]
         else:
             logger.error(
-                "Failed to get partition info for OAuthClients; url -> {} : error -> {}".format(
-                    oauthPartitionsUrl, partitionsResponse.text
+                "Failed to get partition info for OAuthClients; url -> {} : error -> {} ({})".format(
+                    oauthPartitionsUrl, partitionsResponse.text, response.status_code
                 )
             )
             return None
@@ -2328,8 +2619,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add SAML auth handler -> {}; error -> {}".format(
-                        name, response.text
+                    "Failed to add SAML auth handler -> {}; error -> {} ({})".format(
+                        name, response.text, response.status_code
                     )
                 )
                 return None
@@ -2425,8 +2716,8 @@ class OTDS:
         )
         if not response.ok:
             logger.error(
-                "Failed to add SAP auth handler -> {}; error -> {}".format(
-                    name, response.text
+                "Failed to add SAP auth handler -> {}; error -> {} ({})".format(
+                    name, response.text, response.status_code
                 )
             )
             return None
@@ -2522,8 +2813,8 @@ class OTDS:
         )
         if not response.ok:
             logger.error(
-                "Failed to upload certificate file -> {} for SAP auth handler -> {}; error -> {}".format(
-                    certificate_file, name, response.text
+                "Failed to upload certificate file -> {} for SAP auth handler -> {}; error -> {} ({})".format(
+                    certificate_file, name, response.text, response.status_code
                 )
             )
             return None
@@ -2927,8 +3218,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to add OAuth auth handler -> {}; error -> {}".format(
-                        name, response.text
+                    "Failed to add OAuth auth handler -> {}; error -> {} ({})".format(
+                        name, response.text, response.status_code
                     )
                 )
                 return None
@@ -2947,8 +3238,8 @@ class OTDS:
         resource = self.getResource(resource_name)
         if not resource:
             logger.error(
-                "Resource -> {} not found - cannot consolidate; error -> {}".format(
-                    resource_name
+                "Resource -> {} not found - cannot consolidate; error -> {} ({})".format(
+                    resource_name, response.text, response.status_code
                 )
             )
             return False
@@ -2989,7 +3280,11 @@ class OTDS:
                 self.authenticate(True)
                 retries += 1
             else:
-                logger.error("Failed to consolidate; error -> {}".format(response.text))
+                logger.error(
+                    "Failed to consolidate; error -> {} ({})".format(
+                        response.text, response.status_code
+                    )
+                )
                 return False
 
     # end method definition
@@ -3094,8 +3389,8 @@ class OTDS:
                 retries += 1
             else:
                 logger.error(
-                    "Failed to set impersonation for OAuth Client -> {}; error -> {}".format(
-                        client_id, response.text
+                    "Failed to set impersonation for OAuth Client -> {}; error -> {} ({})".format(
+                        client_id, response.text, response.status_code
                     )
                 )
                 return False