Add more request handling exceptions

Author: dharaneeshvrd

cli/network/virtual_network.py

@@ -28,38 +28,46 @@ def populate_payload(vlanid, vswitchid, vswitchname):
 '''
 
 def get_network_uuid(config, cookies, system_uuid):
-    uri = f"/rest/api/uom/ManagedSystem/{system_uuid}/VirtualNetwork/quick/All"
-    url = "https://" +  util.get_host_address(config) + uri
-    headers = {"x-api-key": util.get_session_key(config), "Content-Type": "application/vnd.ibm.powervm.uom+xml, type=VirtualNetwork"}
-    response = requests.get(url, headers=headers, cookies=cookies, verify=False)
-    if response.status_code != 200:
-        raise NetworkError(f"failed to list VLAN, error: {response.text}")
-    uuid = ""
-    network_name = util.get_vnetwork_name(config)
-    for nw in response.json():
-        if nw["NetworkName"] == network_name:
-            uuid = nw["UUID"]
-            break
+    try:
+        uri = f"/rest/api/uom/ManagedSystem/{system_uuid}/VirtualNetwork/quick/All"
+        url = "https://" +  util.get_host_address(config) + uri
+        headers = {"x-api-key": util.get_session_key(config), "Content-Type": "application/vnd.ibm.powervm.uom+xml, type=VirtualNetwork"}
+        response = requests.get(url, headers=headers, cookies=cookies, verify=False)
+        response.raise_for_status()
 
-    if "" == uuid:
-        raise NetworkError(f"no virtual network available with name '{network_name}'")
-    else:
-        logger.debug(f"Network UUID for the virtual network {network_name}: {uuid}")
+        uuid = ""
+        network_name = util.get_vnetwork_name(config)
+        for nw in response.json():
+            if nw["NetworkName"] == network_name:
+                uuid = nw["UUID"]
+                break
+
+        if "" == uuid:
+            raise NetworkError(f"no virtual network available with name '{network_name}'")
+        else:
+            logger.debug(f"Network UUID for the virtual network {network_name}: {uuid}")
+    except requests.exceptions.RequestException as e:
+        raise NetworkError(f"failed to list VLAN while making http request, error: {e}, response: {e.response.text}")
+    except Exception as e:
+        raise NetworkError(f"failed to list VLAN, error: {e}")
     return uuid
 
 def get_vlan_details(config, cookies, system_uuid):
-    nw_uuid = get_network_uuid(config, cookies, system_uuid)
-    uri = f"/rest/api/uom/ManagedSystem/{system_uuid}/VirtualNetwork/{nw_uuid}"
-    url = "https://" +  util.get_host_address(config) + uri
-    headers = {"x-api-key": util.get_session_key(config), "Content-Type": "application/vnd.ibm.powervm.uom+xml, type=VirtualNetwork"}
-    response = requests.get(url, headers=headers, cookies=cookies, verify=False)
-    if response.status_code != 200:
-        raise NetworkError(f"failed to get VLAN details, error: {response.text}")
-    
-    soup = BeautifulSoup(response.text, 'xml')
-    vlan_id = soup.find("NetworkVLANID")
-    vswitch_id = soup.find("VswitchID")
-
+    try:
+        nw_uuid = get_network_uuid(config, cookies, system_uuid)
+        uri = f"/rest/api/uom/ManagedSystem/{system_uuid}/VirtualNetwork/{nw_uuid}"
+        url = "https://" +  util.get_host_address(config) + uri
+        headers = {"x-api-key": util.get_session_key(config), "Content-Type": "application/vnd.ibm.powervm.uom+xml, type=VirtualNetwork"}
+        response = requests.get(url, headers=headers, cookies=cookies, verify=False)
+        response.raise_for_status()
+        
+        soup = BeautifulSoup(response.text, 'xml')
+        vlan_id = soup.find("NetworkVLANID")
+        vswitch_id = soup.find("VswitchID")
+    except requests.exceptions.RequestException as e:
+        raise NetworkError(f"failed to get VLAN details while making http request, error: {e}, response: {e.response.text}")
+    except Exception as e:
+        raise NetworkError(f"failed to get VLAN details, error: {e}")
     return vlan_id.text, vswitch_id.text
 
 def check_network_adapter(config, cookies, partition_uuid, vlan_id, vswitch_id):

cli/partition/activation.py

@@ -111,26 +111,37 @@ def shutdown_payload():
 """
 
 def get_lpar_profile_id(config, cookies, partition_uuid):
-    uri = f"/rest/api/uom/LogicalPartition/{partition_uuid}/LogicalPartitionProfile"
-    url =  "https://" +  util.get_host_address(config) + uri
-    headers = {"x-api-key": util.get_session_key(config), "Content-Type": "application/vnd.ibm.powervm.uom+xml; Type=LogicalPartitionProfile"}
-    response = requests.get(url, headers=headers, cookies=cookies, verify=False)
-    if response.status_code != 200:
-        raise PartitionError(f"failed to get LPAR profile ID, error: {response.text}")
-    soup = BeautifulSoup(response.text, 'xml')
-    entry_node = soup.find('entry')
-    lpar_profile_id = entry_node.find('id')
+    try:
+        uri = f"/rest/api/uom/LogicalPartition/{partition_uuid}/LogicalPartitionProfile"
+        url =  "https://" +  util.get_host_address(config) + uri
+        headers = {"x-api-key": util.get_session_key(config), "Content-Type": "application/vnd.ibm.powervm.uom+xml; Type=LogicalPartitionProfile"}
+        response = requests.get(url, headers=headers, cookies=cookies, verify=False)
+        response.raise_for_status()
+
+        soup = BeautifulSoup(response.text, 'xml')
+        entry_node = soup.find('entry')
+        lpar_profile_id = entry_node.find('id')
+    except requests.exceptions.RequestException as e:
+        raise PartitionError(f"ffailed to get LPAR profile ID while making http request, error: {e}, response: {e.response.text}")
+    except Exception as e:
+        raise PartitionError(f"failed to get LPAR profile ID, error: {e}")
     return lpar_profile_id.text
 
 def poll_job_status(config, cookies, job_id):
-    uri = f"/rest/api/uom/jobs/{job_id}"
-    url =  "https://" +  util.get_host_address(config) + uri
-    headers = {"x-api-key": util.get_session_key(config), "Content-Type": "application/vnd.ibm.powervm.web+xml; type=JobRequest"}
-    response = requests.get(url, headers=headers, cookies=cookies, verify=False)
-    if response.status_code != 200:
-        raise PartitionError(f"failed to get job completion, error: {response.text}")
-    soup = BeautifulSoup(response.text, 'xml')
-    status = soup.find("Status").text
+    try:
+        uri = f"/rest/api/uom/jobs/{job_id}"
+        url =  "https://" +  util.get_host_address(config) + uri
+        headers = {"x-api-key": util.get_session_key(config), "Content-Type": "application/vnd.ibm.powervm.web+xml; type=JobRequest"}
+        response = requests.get(url, headers=headers, cookies=cookies, verify=False)
+        response.raise_for_status()
+
+        soup = BeautifulSoup(response.text, 'xml')
+        status = soup.find("Status").text
+    except requests.exceptions.RequestException as e:
+        raise PartitionError(f"failed to get job completion while making http request, error: {e}, response: {e.response.text}")
+    except Exception as e:
+        raise PartitionError(f"failed to get job completion, error: {e}")
+
     if status == "COMPLETED_OK":
         return True
     else:
@@ -156,39 +167,48 @@ def check_job_status(config, cookies, response):
     return False
 
 def activate_partition(config, cookies, partition_uuid):
-    # Check partition state,don't activate if its in 'running' state
-    lpar_state = check_lpar_status(config, cookies, partition_uuid)
-    if lpar_state == "running":
-        logger.debug("Partition already in 'running' state, skipping activation")
-        return
-
-    uri = f"/rest/api/uom/LogicalPartition/{partition_uuid}/do/PowerOn"
-    url =  "https://" +  util.get_host_address(config) + uri
-    lpar_profile_id = get_lpar_profile_id(config, cookies, partition_uuid)
-    payload = populated_payload(lpar_profile_id)
-
-    headers = {"x-api-key": util.get_session_key(config), "Content-Type": CONTENT_TYPE}
-    response = requests.put(url, headers=headers, cookies=cookies, data=payload, verify=False)
-    if response.status_code != 200:
-        raise PartitionError(f"failed to activate partition, error: {response.text}")
-    # check job status for COMPLETED_OK
-    status = check_job_status(config, cookies, response.text)
-    if not status:
-        raise PartitionError(f"failed to activate partition, activate job returned false")
-    logger.debug("Partition activated successfully.")
+    try:
+        # Check partition state,don't activate if its in 'running' state
+        lpar_state = check_lpar_status(config, cookies, partition_uuid)
+        if lpar_state == "running":
+            logger.debug("Partition already in 'running' state, skipping activation")
+            return
+
+        uri = f"/rest/api/uom/LogicalPartition/{partition_uuid}/do/PowerOn"
+        url =  "https://" +  util.get_host_address(config) + uri
+        lpar_profile_id = get_lpar_profile_id(config, cookies, partition_uuid)
+        payload = populated_payload(lpar_profile_id)
+
+        headers = {"x-api-key": util.get_session_key(config), "Content-Type": CONTENT_TYPE}
+        response = requests.put(url, headers=headers, cookies=cookies, data=payload, verify=False)
+        response.raise_for_status()
+
+        # check job status for COMPLETED_OK
+        status = check_job_status(config, cookies, response.text)
+        if not status:
+            raise PartitionError(f"activate job returned false")
+        logger.debug("Partition activated successfully.")
+    except requests.exceptions.RequestException as e:
+        raise PartitionError(f"failed to activate partition while making http request, error: {e}, response: {e.response.text}")
+    except Exception as e:
+        raise PartitionError(f"failed to activate partition, error: {e}")
     return
 
 def check_lpar_status(config, cookies, partition_uuid):
-    uri = f"/rest/api/uom/LogicalPartition/{partition_uuid}"
-    url =  "https://" + util.get_host_address(config) + uri
-    headers = {"x-api-key": util.get_session_key(config)}
-    response = requests.get(url, headers=headers, cookies=cookies, verify=False)
-    if response.status_code != 200:
-        raise PartitionError(f'failed to get LPAR details for {partition_uuid}, error: {response.text}')
-    soup = BeautifulSoup(response.text, 'xml')
-    state = soup.find("PartitionState")
-    if state == None:
-        raise PartitionError(f"partition state of LPAR '{partition_uuid}' found to be None")
+    try:
+        uri = f"/rest/api/uom/LogicalPartition/{partition_uuid}"
+        url =  "https://" + util.get_host_address(config) + uri
+        headers = {"x-api-key": util.get_session_key(config)}
+        response = requests.get(url, headers=headers, cookies=cookies, verify=False)
+        response.raise_for_status()
+        soup = BeautifulSoup(response.text, 'xml')
+        state = soup.find("PartitionState")
+        if state == None:
+            raise PartitionError(f"partition state of LPAR '{partition_uuid}' found to be None")
+    except requests.exceptions.RequestException as e:
+        raise PartitionError(f"failed to get LPAR details for '{partition_uuid}' while making http request, error: {e}, response: {e.response.text}")
+    except Exception as e:
+        raise PartitionError(f"failed to get LPAR details for '{partition_uuid}', error: {e}")   
     return state.text
 
 def shutdown_partition(config, cookies, partition_uuid):

cli/partition/partition.py

@@ -125,15 +125,18 @@ def convert_gb_to_mb(value):
 
 
 def get_all_partitions(config, cookies, system_uuid):
-    uri = f"/rest/api/uom/ManagedSystem/{system_uuid}/LogicalPartition/quick/All"
-    url = "https://" + util.get_host_address(config) + uri
-    headers = {"x-api-key": util.get_session_key(config)}
-    response = requests.get(url, headers=headers,
-                            cookies=cookies, verify=False)
-    if response.status_code != 200:
-        raise PartitionError(
-            f"failed to get partition list, error: {response.text}")
-    return response.json()
+    try:
+        uri = f"/rest/api/uom/ManagedSystem/{system_uuid}/LogicalPartition/quick/All"
+        url = "https://" + util.get_host_address(config) + uri
+        headers = {"x-api-key": util.get_session_key(config)}
+        response = requests.get(url, headers=headers,
+                                cookies=cookies, verify=False)
+        response.raise_for_status()
+        return response.json()
+    except requests.exceptions.RequestException as e:
+        raise PartitionError(f"failed to get partition list, while making http request, error: {e}, response: {e.response.text}")
+    except Exception as e:
+        raise PartitionError(f"failed to get partition list, error: {e}")  
 
 
 # Checks if partition exists, returns exists and if partition is created by PIM
@@ -164,37 +167,43 @@ def check_partition_exists(config, cookies, system_uuid):
 
 
 def create_partition(config, cookies, system_uuid):
-    logger.debug(
-        f"Creating partition with name '{util.get_partition_name(config)}'")
-    uri = f"/rest/api/uom/ManagedSystem/{system_uuid}/LogicalPartition"
-    url = "https://" + util.get_host_address(config) + uri
-    payload = populate_payload(config)
-    headers = {"x-api-key": util.get_session_key(config),
-               "Content-Type": CONTENT_TYPE}
-    response = requests.put(url, headers=headers,
-                            data=payload, cookies=cookies, verify=False)
-    if response.status_code != 200:
-        raise PartitionError(
-            f"failed to create partition, error: {response.text}")
-
-    soup = BeautifulSoup(response.text, 'xml')
-    partition_uuid = soup.find("PartitionUUID")
-    return partition_uuid.text
+    try:
+        logger.debug(
+            f"Creating partition with name '{util.get_partition_name(config)}'")
+        uri = f"/rest/api/uom/ManagedSystem/{system_uuid}/LogicalPartition"
+        url = "https://" + util.get_host_address(config) + uri
+        payload = populate_payload(config)
+        headers = {"x-api-key": util.get_session_key(config),
+                "Content-Type": CONTENT_TYPE}
+        response = requests.put(url, headers=headers,
+                                data=payload, cookies=cookies, verify=False)
+        response.raise_for_status()
+
+        soup = BeautifulSoup(response.text, 'xml')
+        partition_uuid = soup.find("PartitionUUID")
+        return partition_uuid.text
+    except requests.exceptions.RequestException as e:
+        raise PartitionError(f"failed to create partition, while making http request, error: {e}, response: {e.response.text}")
+    except Exception as e:
+        raise PartitionError(f"failed to create partition, error: {e}")  
 
 
 def get_partition_details(config, cookies, system_uuid, partition_uuid):
-    uri = f"/rest/api/uom/ManagedSystem/{system_uuid}/LogicalPartition/{partition_uuid}"
-    url = "https://" + util.get_host_address(config) + uri
-    headers = {"x-api-key": util.get_session_key(config),
-               "Content-Type": "application/vnd.ibm.powervm.uom+xml; Type=LogicalPartition"}
-    response = requests.get(url, headers=headers,
-                            cookies=cookies, verify=False)
-    if response.status_code != 200:
-       raise PartitionError(
-            f"failed to get partition details, error: {response.text}")
-    soup = BeautifulSoup(response.text, 'xml')
-    lpar = str(soup.find('LogicalPartition'))
-    return lpar
+    try:
+        uri = f"/rest/api/uom/ManagedSystem/{system_uuid}/LogicalPartition/{partition_uuid}"
+        url = "https://" + util.get_host_address(config) + uri
+        headers = {"x-api-key": util.get_session_key(config),
+                "Content-Type": "application/vnd.ibm.powervm.uom+xml; Type=LogicalPartition"}
+        response = requests.get(url, headers=headers,
+                                cookies=cookies, verify=False)
+        response.raise_for_status()
+        soup = BeautifulSoup(response.text, 'xml')
+        lpar = str(soup.find('LogicalPartition'))
+        return lpar
+    except requests.exceptions.RequestException as e:
+        raise PartitionError(f"failed to get partition details, while making http request, error: {e}, response: {e.response.text}")
+    except Exception as e:
+        raise PartitionError(f"failed to get partition details, error: {e}")  
 
 
 def edit_lpar_compute(config, cookies, system_uuid, partition_uuid):
@@ -215,30 +224,33 @@ def edit_lpar_compute(config, cookies, system_uuid, partition_uuid):
                    "Content-Type": "application/vnd.ibm.powervm.uom+xml; Type=LogicalPartition"}
         response = requests.post(url, headers=headers, cookies=cookies, data=str(
             updated_lpar_payload), verify=False)
-        if response.status_code != 200:
-            raise PartitionError(
-                f"failed to edit lpar compute, error: {response.text}")
+        response.raise_for_status()
+    except requests.exceptions.RequestException as e:
+        raise PartitionError(f"failed to edit lpar compute, while making http request, error: {e}, response: {e.response.text}")
     except Exception as e:
-        raise e
+        raise Exception(f"failed to edit lpar compute, error: {e}")
     logger.debug(
         f"Compute for partition: {partition_uuid} is updated successfully")
     return
 
 
 def set_partition_boot_string(config, cookies, system_uuid, partition_uuid, partition_payload, boot_string):
-    uri = f"/rest/api/uom/ManagedSystem/{system_uuid}/LogicalPartition/{partition_uuid}"
-    url = "https://" + util.get_host_address(config) + uri
-    headers = {"x-api-key": util.get_session_key(config),
-               "Content-Type": "application/vnd.ibm.powervm.uom+xml; Type=LogicalPartition"}
-    payload = BeautifulSoup(partition_payload, 'xml')
-    pending_boot = payload.find("PendingBootString")
-    pending_boot.append(boot_string)
-
-    response = requests.post(url, headers=headers,
-                             cookies=cookies, data=str(payload), verify=False)
-    if response.status_code != 200:
-        raise PartitionError(
-            f"failed to update boot order for the partition: '{partition_uuid}', error: {response.text}")
+    try:
+        uri = f"/rest/api/uom/ManagedSystem/{system_uuid}/LogicalPartition/{partition_uuid}"
+        url = "https://" + util.get_host_address(config) + uri
+        headers = {"x-api-key": util.get_session_key(config),
+                "Content-Type": "application/vnd.ibm.powervm.uom+xml; Type=LogicalPartition"}
+        payload = BeautifulSoup(partition_payload, 'xml')
+        pending_boot = payload.find("PendingBootString")
+        pending_boot.append(boot_string)
+
+        response = requests.post(url, headers=headers,
+                                cookies=cookies, data=str(payload), verify=False)
+        response.raise_for_status()
+    except requests.exceptions.RequestException as e:
+        raise PartitionError(f"failed to update boot order for the partition: '{partition_uuid}' while making http request, error: {e}, response: {e.response.text}")
+    except Exception as e:
+        raise Exception(f"failed to update boot order for the partition: '{partition_uuid}', error: {e}")
     logger.debug(
         f"Updated the boot order for the partition: '{partition_uuid}'")
     return