Handled the 403 forbidden error in GetAggregateByUUID and getNetworkInterfaces apis

Author: sandeeplocharla

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java

@@ -309,6 +309,9 @@ public boolean connect(boolean validateAggregatesForVolumeCreation) {
             String msg = "Authentication failed: Invalid credentials. Please verify the username and password.";
             logger.error(msg, e);
             throw new CloudRuntimeException(msg, e);
+        } catch (FeignException.Forbidden e) {
+            logger.error(e.getMessage());
+            throw new CloudRuntimeException(e.getMessage());
         } catch (Exception e) {
             logger.error("Failed to connect to ONTAP cluster: " + e.getMessage(), e);
             throw new CloudRuntimeException("Failed to connect to ONTAP cluster: " + e.getMessage(), e);
@@ -382,10 +385,16 @@ public Aggregate chooseAggregate(Long size) {
         Aggregate aggrChosen = null;
         for (Aggregate aggr : aggregates) {
             logger.debug("Found aggregate: " + aggr.getName() + " with UUID: " + aggr.getUuid());
-            Aggregate aggrResp = aggregateFeignClient.getAggregateByUUID(authHeader, aggr.getUuid(),
-                    Map.of(OntapStorageConstants.FIELDS, OntapStorageConstants.AGGREGATE_NODE
-                            + OntapStorageConstants.COMMA + OntapStorageConstants.AGGREGATE_SPACE
-                            + OntapStorageConstants.COMMA + OntapStorageConstants.STATE));
+            Aggregate aggrResp;
+            try {
+                aggrResp = aggregateFeignClient.getAggregateByUUID(authHeader, aggr.getUuid(),
+                        Map.of(OntapStorageConstants.FIELDS, OntapStorageConstants.AGGREGATE_NODE
+                                + OntapStorageConstants.COMMA + OntapStorageConstants.AGGREGATE_SPACE
+                                + OntapStorageConstants.COMMA + OntapStorageConstants.STATE));
+            } catch (FeignException.Forbidden e) {
+                logger.error(e.getMessage());
+                throw new CloudRuntimeException(e.getMessage());
+            }
 
             if (aggrResp == null) {
                 logger.warn("Aggregate details response is null for aggregate " + aggr.getName() + ". Skipping.");
@@ -766,6 +775,9 @@ public Map<String, String> getNetworkInterface(Aggregate aggregate) {
             return networkInterfaceResult(ip, warning);
         } catch (CloudRuntimeException e) {
             throw e;
+        } catch (FeignException.Forbidden e) {
+            logger.error(e.getMessage());
+            throw new CloudRuntimeException(e.getMessage());
         } catch (Exception e) {
             logger.error("Exception while retrieving network interfaces: ", e);
             throw new CloudRuntimeException("Failed to retrieve network interfaces: " + e.getMessage());

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/service/StorageStrategyTest.java

@@ -556,6 +556,20 @@ public void testConnect_invalidCredentials() {
                 "Expected the message to prompt verifying username/password but got: " + ex.getMessage());
     }
 
+    @Test
+    public void testConnect_forbidden() {
+        setupSuccessfulConnect();
+        Map<String, Collection<String>> emptyHeaders = Collections.emptyMap();
+        Request dummyReq = Request.create(Request.HttpMethod.GET, "http://test", emptyHeaders, (byte[]) null, (Charset) null);
+        FeignException.Forbidden forbidden = new FeignException.Forbidden("Forbidden", dummyReq, null);
+        when(aggregateFeignClient.getAggregateByUUID(anyString(), eq("aggr-uuid-1"), anyMap()))
+                .thenThrow(forbidden);
+
+        CloudRuntimeException ex = assertThrows(CloudRuntimeException.class, () -> storageStrategy.connect());
+        assertEquals("Forbidden", ex.getMessage());
+        assertNull(ex.getCause());
+    }
+
     // ========== chooseAggregate() Tests ==========
 
     @Test
@@ -649,6 +663,23 @@ public void testChooseAggregate_missingNode() {
         assertTrue(ex.getMessage().contains("does not have a node name"));
     }
 
+    @Test
+    public void testChooseAggregate_forbidden() {
+        setupSuccessfulConnect();
+        storageStrategy.connect();
+
+        Map<String, Collection<String>> emptyHeaders = Collections.emptyMap();
+        Request dummyReq = Request.create(Request.HttpMethod.GET, "http://test", emptyHeaders, (byte[]) null, (Charset) null);
+        FeignException.Forbidden forbidden = new FeignException.Forbidden("Forbidden", dummyReq, null);
+        when(aggregateFeignClient.getAggregateByUUID(anyString(), eq("aggr-uuid-1"), anyMap()))
+                .thenThrow(forbidden);
+
+        CloudRuntimeException ex = assertThrows(CloudRuntimeException.class,
+                () -> storageStrategy.chooseAggregate(5000000000L));
+        assertEquals("Forbidden", ex.getMessage());
+        assertNull(ex.getCause());
+    }
+
     // ========== createStorageVolume() Tests ==========
 
     @Test
@@ -1129,6 +1160,22 @@ public void testGetNetworkInterface_feignException() {
         assertTrue(ex.getMessage().contains("Failed to retrieve network interfaces"));
     }
 
+    @Test
+    public void testGetNetworkInterface_forbidden() {
+        Aggregate aggregate = buildAggregate("aggr1", "aggr-uuid-1", 10000000000.0, "node-a");
+
+        Map<String, Collection<String>> emptyHeaders = Collections.emptyMap();
+        Request dummyReq = Request.create(Request.HttpMethod.GET, "http://test", emptyHeaders, (byte[]) null, (Charset) null);
+        FeignException.Forbidden forbidden = new FeignException.Forbidden("Forbidden", dummyReq, null);
+        when(networkFeignClient.getNetworkIpInterfaces(anyString(), anyMap()))
+                .thenThrow(forbidden);
+
+        CloudRuntimeException ex = assertThrows(CloudRuntimeException.class,
+                () -> storageStrategy.getNetworkInterface(aggregate));
+        assertEquals("Forbidden", ex.getMessage());
+        assertNull(ex.getCause());
+    }
+
     // ========== getNetworkInterface() Node-Affinity Tests ==========
 
     /**