review changes

Author: sureshanaparti

framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java

@@ -401,7 +401,8 @@ protected T valueInGlobalOrAvailableParentScope(Scope scope, Long id) {
     }
 
     /**
-     * Use {@link ConfigKey#valueInScope(Scope, Long)} instead.
+     * @deprecated
+     * Still used by some external code, but use {@link ConfigKey#valueInScope(Scope, Long)} instead.
      */
     public T valueInDomain(Long domainId) {
         return valueInScope(Scope.Domain, domainId);

plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManagerImpl.java

@@ -439,9 +439,9 @@ public boolean isHostSdcConnected(String sdcId, DataStore dataStore, int waitTim
         }
         boolean isConnected = isHostSdcConnected(sdcId, poolId);
         if (isConnected) {
-            logger.debug("Final attempt succeeded the SDC {} of the pool {} to connect", sdcId, dataStore);
+            logger.debug("Final attempt to connect the SDC {} of the pool {} succeeded", sdcId, dataStore);
         } else {
-            logger.debug("Final attempt failed the SDC {} of the pool {} to connect", sdcId, dataStore);
+            logger.debug("Final attempt to connect the SDC {} of the pool {} failed", sdcId, dataStore);
         }
         return isConnected;
     }

plugins/storage/volume/scaleio/src/test/java/org/apache/cloudstack/storage/datastore/client/ScaleIOGatewayClientImplTest.java

@@ -125,9 +125,6 @@ public void testClientAuthFailure() throws Exception {
                         .withBody("")));
 
         client.listStoragePools();
-
-        wireMockRule.verify(getRequestedFor(urlEqualTo("/api/login"))
-                .withBasicAuth(new BasicCredentials(username, password)));
     }
 
     @Test(expected = ServerApiException.class)
@@ -142,9 +139,6 @@ public void testRequestTimeout() {
                         .withBody("")));
 
         client.listStoragePools();
-
-        wireMockRule.verify(getRequestedFor(urlEqualTo("/api/login"))
-                .withBasicAuth(new BasicCredentials(username, password)));
     }
 
     @Test