aboutsummaryrefslogtreecommitdiffstats
path: root/appc-adapters
diff options
context:
space:
mode:
Diffstat (limited to 'appc-adapters')
-rw-r--r--appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/DettachVolumeServer.java7
-rw-r--r--appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/LookupServer.java2
2 files changed, 4 insertions, 5 deletions
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/DettachVolumeServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/DettachVolumeServer.java
index 606df1ed3..a7f3c9dc1 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/DettachVolumeServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/DettachVolumeServer.java
@@ -177,7 +177,7 @@ public class DettachVolumeServer extends ProviderServerOperation {
if (map != null && !(map.isEmpty())) {
Iterator<Entry<String, String>> it = map.entrySet().iterator();
while (it.hasNext()) {
- Map.Entry volumes = (Map.Entry) it.next();
+ Map.Entry<String, String> volumes = it.next();
logger.info("volumes available in before detach");
logger.info("device" + volumes.getKey() + "volume" + volumes.getValue());
if (volumes.getValue().equals(volumeId)) {
@@ -190,7 +190,7 @@ public class DettachVolumeServer extends ProviderServerOperation {
}
protected boolean validateDetach(RequestContext rc, ComputeService ser, String vm, String volumeId)
- throws RequestFailedException, ZoneException {
+ throws ZoneException {
boolean flag = false;
String msg = null;
config.setProperty(Constants.PROPERTY_RETRY_DELAY, "10");
@@ -201,7 +201,7 @@ public class DettachVolumeServer extends ProviderServerOperation {
Iterator<Entry<String, String>> it = map.entrySet().iterator();
logger.info("volumes available after detach ");
while (it.hasNext()) {
- Map.Entry volumes = (Map.Entry) it.next();
+ Map.Entry<String, String> volumes = it.next();
logger.info(" devices " + volumes.getKey() + " volumes" + volumes.getValue());
if (volumes.getValue().equals(volumeId)) {
logger.info("Device" + volumes.getKey() + "Volume" + volumes.getValue());
@@ -215,7 +215,6 @@ public class DettachVolumeServer extends ProviderServerOperation {
if (flag) {
rc.delay();
} else {
- flag = false;
break;
}
} else {
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/LookupServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/LookupServer.java
index daa8b2622..f42028892 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/LookupServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/LookupServer.java
@@ -51,7 +51,7 @@ import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME;
public class LookupServer extends ProviderServerOperation {
- private static final EELFLogger logger = EELFManager.getInstance().getLogger(EvacuateServer.class);
+ private static final EELFLogger logger = EELFManager.getInstance().getLogger(LookupServer.class);
private static final Configuration configuration = ConfigurationFactory.getConfiguration();
private static final String SERVERFOUND = "serverFound";