From: Modaboina, Kusumakumari (km583p) <km583p@us.att.com>
Date: Tue, 11 Sep 2018 14:10:51 +0000 (-0400)
Subject: bugfix to allow reboot even VM is at error state
X-Git-Tag: 1.4.0~26
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=appc.git;a=commitdiff_plain;h=ff0b8a6ac4b566e05538b8ee1c33a92b8eced98c

bugfix to allow reboot even VM is at error state

Issue-ID: APPC-1198
Change-Id: I12cb5b2807a026b7bc55f16109fbca852b2b41fb
Signed-off-by: Modaboina, Kusumakumari (km583p) <km583p@us.att.com>
---

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RebootServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RebootServer.java
index c08e584de..a0f09b56b 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RebootServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RebootServer.java
@@ -141,16 +141,11 @@ public class RebootServer extends ProviderServerOperation {
         boolean status = false;
         long endTime = System.currentTimeMillis() + (timeout * MILLI_SECONDS);
         while (rc.attempt()) {
-            if (server.getStatus() != null && server.getStatus().equals(Server.Status.ERROR)) {
-                msg = "Device status " + Server.Status.ERROR + " cannot proceed further";
-                throw new RequestFailedException("Waiting for State Change", msg, HttpStatus.CONFLICT_409, server);
-            } else {
                 server.waitForStateChange(pollInterval, timeout, desiredStates);
                 if ((server.getStatus().equals(Server.Status.RUNNING)) || (server.getStatus().equals(Server.Status.READY))) {
                     status = true;
                 }
                 logger.info(server.getStatus() + " status ");
-            }
             if (status) {
                 logger.info("Done Trying " + rc.getAttempts() + " attempts");
                 break;