From: Modaboina, Kusumakumari (km583p) Date: Fri, 22 Jun 2018 17:20:12 +0000 (-0400) Subject: add support for new openstack rebootaction VM levl X-Git-Tag: 1.4.0~197 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=appc.git;a=commitdiff_plain;h=ef6d9c762700f44f0daf5d1e1fdc4a98dff4181d add support for new openstack rebootaction VM levl Issue-ID: APPC-922 Change-Id: I84941d8a5882b422d4e8365c82b8aaaf4618fa57 Signed-off-by: Modaboina, Kusumakumari (km583p) --- diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/ProviderAdapter.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/ProviderAdapter.java index 1eebe5023..fc2892f67 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/ProviderAdapter.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/ProviderAdapter.java @@ -265,5 +265,5 @@ public interface ProviderAdapter extends SvcLogicJavaPlugin { * @throws APPCException If the server cannot be restarted for some reason */ Image createSnapshot(Map params, SvcLogicContext ctx) throws APPCException; - + Server rebootServer(Map params, SvcLogicContext context) throws APPCException; } diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderAdapterImpl.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderAdapterImpl.java index 36191dd5a..851ec1a3f 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderAdapterImpl.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderAdapterImpl.java @@ -328,4 +328,14 @@ public class ProviderAdapterImpl implements ProviderAdapter { op.setDefaultUser(DEFAULT_USER); return (Server) op.doOperation(params, ctx); } + @Override + public Server rebootServer(Map params, SvcLogicContext context) throws APPCException { + IProviderOperation op = factory.getOperationObject(Operation.REBOOT_SERVICE); + op.setProviderCache(this.providerCache); + op.setDefaultPassword(DEFAULT_PASS); + op.setDefaultUser(DEFAULT_USER); + op.setDefaultDomain(DEFAULT_DOMAIN); + return (Server) op.doOperation(params, context); + } + } diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java index 6b9b03956..77dcc20ca 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/api/ProviderOperationFactory.java @@ -110,6 +110,9 @@ public class ProviderOperationFactory { case DETACHVOLUME_SERVICE: opObject = new DettachVolumeServer(); break; + case REBOOT_SERVICE: + opObject = new RebootServer(); + break; default: throw new APPCException("Unsupported provider operation."); } diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/enums/Operation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/enums/Operation.java index 6f3897136..29b4febfd 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/enums/Operation.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/enums/Operation.java @@ -115,4 +115,10 @@ public enum Operation { return "dettachVolume"; } }, + REBOOT_SERVICE { + @Override + public String toString(){ + return "rebootServer"; + } + }, } 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 new file mode 100644 index 000000000..c08e584de --- /dev/null +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RebootServer.java @@ -0,0 +1,180 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP : APPC + * ================================================================================ + * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Copyright (C) 2017 Amdocs + * ============================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END========================================================= + */ +package org.onap.appc.adapter.iaas.provider.operation.impl; + +import static org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation.REBOOT_SERVICE; +import static org.onap.appc.adapter.utils.Constants.ADAPTER_NAME; + +import java.util.Map; +import java.util.concurrent.TimeoutException; + +import org.onap.appc.configuration.Configuration; +import org.glassfish.grizzly.http.util.HttpStatus; +import org.onap.appc.Constants; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.onap.appc.adapter.iaas.impl.IdentityURL; +import org.onap.appc.adapter.iaas.impl.RequestContext; +import org.onap.appc.adapter.iaas.impl.RequestFailedException; +import org.onap.appc.adapter.iaas.impl.VMURL; +import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation; +import org.onap.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import com.att.cdp.exceptions.ResourceNotFoundException; +import com.att.cdp.exceptions.StateException; +import com.att.cdp.zones.ComputeService; +import com.att.cdp.zones.Context; +import com.att.cdp.zones.model.ModelObject; +import com.att.cdp.zones.model.Server; +import com.att.eelf.configuration.EELFLogger; +import com.att.eelf.configuration.EELFManager; +import com.att.eelf.i18n.EELFResourceManager; + +public class RebootServer extends ProviderServerOperation { + private final EELFLogger logger = EELFManager.getInstance().getLogger(RebootServer.class); + private static final Configuration config = ConfigurationFactory.getConfiguration(); + private static final Integer NO_OF_ATTEMPTS=30; + private static final Integer RETRY_INTERVAL=10; + private static final int MILLI_SECONDS=1000; + + @Override + protected ModelObject executeProviderOperation(Map params, SvcLogicContext context) + throws APPCException { + setMDC(Operation.REBOOT_SERVICE.toString(), "App-C IaaS Adapter:rebootServer", ADAPTER_NAME); + // logOperation(Msg.REBOOT_SERVER, params, context); + return rebootServer(params, context); + } + + private Server rebootServer(Map params, SvcLogicContext ctx) throws APPCException { + Server server = null; + RequestContext requestContext = new RequestContext(ctx); + requestContext.isAlive(); + String appName = configuration.getProperty(Constants.PROPERTY_APPLICATION_NAME); + String vmUrl = params.get(ProviderAdapter.PROPERTY_INSTANCE_URL); + String rebooType = params.get(ProviderAdapter.REBOOT_TYPE); + String tenantName = "Unknown"; + if (rebooType.isEmpty() ) { + rebooType = "SOFT"; + } + logger.info("reboot type" + rebooType); + try { + VMURL vm = VMURL.parseURL(vmUrl); + Context context; + // to be used also in case of exception + if (validateVM(requestContext, appName, vmUrl, vm)) { + return null; + } + IdentityURL ident = IdentityURL.parseURL(params.get(ProviderAdapter.PROPERTY_IDENTITY_URL)); + String identStr = (ident == null) ? null : ident.toString(); + context = getContext(requestContext, vmUrl, identStr); + if (context != null) { + tenantName = context.getTenantName();// this variable also is + // used in case of exception + requestContext.reset(); + server = lookupServer(requestContext, context, vm.getServerId()); + logger.debug(Msg.SERVER_FOUND, vmUrl, context.getTenantName(), server.getStatus().toString()); + Context contx = server.getContext(); + ComputeService service = contx.getComputeService(); + logger.info("performing reboot action for " + server.getId() + " rebootype " + rebooType); + service.rebootServer(server.getId(), rebooType); + if (waitForServerStatusChange(requestContext, server, vmUrl, Server.Status.RUNNING)) { + ctx.setAttribute("REBOOT_STATUS", "SUCCESS"); + doSuccess(requestContext); + } else { + ctx.setAttribute("REBOOT_STATUS", "FAILURE"); + } + context.close(); + } else { + ctx.setAttribute("REBOOT_STATUS", "FAILURE"); + } + + } catch (ResourceNotFoundException | StateException ex) { + String msg = EELFResourceManager.format(Msg.SERVER_OPERATION_EXCEPTION, ex, ex.getClass().getSimpleName(), + REBOOT_SERVICE.toString(), vmUrl, tenantName); + logger.info(ex.getMessage()); + ctx.setAttribute("REBOOT_STATUS", "FAILURE"); + if (ex instanceof ResourceNotFoundException) { + doFailure(requestContext, HttpStatus.NOT_FOUND_404, ex.getMessage()); + } else { + doFailure(requestContext, HttpStatus.CONFLICT_409, ex.getMessage()); + } + } catch (Exception ex) { + String msg = EELFResourceManager.format(Msg.SERVER_OPERATION_EXCEPTION, ex, ex.getClass().getSimpleName(), + REBOOT_SERVICE.toString(), vmUrl, tenantName); + logger.info(ex.getMessage()); + ctx.setAttribute("REBOOT_STATUS", "FAILURE"); + doFailure(requestContext, HttpStatus.INTERNAL_SERVER_ERROR_500, ex.getMessage()); + } + return server; + } + + private boolean waitForServerStatusChange(RequestContext rc, Server server, String vmUrl, + Server.Status... desiredStates) throws Exception { + int pollInterval = RETRY_INTERVAL.intValue(); + int timeout = configuration.getIntegerProperty(Constants.PROPERTY_SERVER_STATE_CHANGE_TIMEOUT); + config.setProperty(Constants.PROPERTY_RETRY_DELAY, RETRY_INTERVAL.toString()); + config.setProperty(Constants.PROPERTY_RETRY_LIMIT, NO_OF_ATTEMPTS.toString()); + Context context = server.getContext(); + String msg; + 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; + } else { + rc.delay(); + } + } + + if (rc.isFailed()) { + msg = EELFResourceManager.format(Msg.CONNECTION_FAILED, vmUrl); + logger.info("waitForStateChange Failed"); + logger.error(msg); + throw new RequestFailedException("Waiting for State Change", msg, HttpStatus.BAD_GATEWAY_502, server); + } + if ((rc.getAttempts() == NO_OF_ATTEMPTS) && (!status)) { + + msg = EELFResourceManager.format(Msg.CONNECTION_FAILED_RETRY, Long.toString(rc.getRetryDelay()), + Integer.toString(rc.getAttempts()), Integer.toString(rc.getRetryLimit())); + logger.error(msg); + throw new TimeoutException(msg); + } + + rc.reset(); + logger.info("Reboot server status flag --> " + status); + return status; + } +} diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestRebootServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestRebootServer.java new file mode 100644 index 000000000..33ce7c2cc --- /dev/null +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/test/java/org/onap/appc/adapter/iaas/provider/operation/impl/TestRebootServer.java @@ -0,0 +1,51 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP : APPC + * ================================================================================ + * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Copyright (C) 2017 Amdocs + * ============================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END========================================================= + */ +package org.onap.appc.adapter.iaas.provider.operation.impl; + +import static org.mockito.Mockito.inOrder; +import org.onap.appc.adapter.iaas.ProviderAdapter; +import org.junit.Assert; +import org.junit.Test; +import org.mockito.InOrder; +import org.onap.appc.exceptions.APPCException; +import com.att.cdp.exceptions.ZoneException; +import com.att.cdp.zones.model.Server; +import com.att.cdp.zones.model.Server.Status; +import static org.junit.Assert.assertEquals; + +public class TestRebootServer { + + @Test + public void should_returnNullAsServer() throws ZoneException,APPCException { + MockGenerator mg = new MockGenerator(Status.SUSPENDED); + Server server = mg.getServer(); + RebootServer rbs = new RebootServer(); + mg.getParams().put(ProviderAdapter.PROPERTY_INSTANCE_URL, "url1"); + mg.getParams().put(ProviderAdapter.REBOOT_TYPE, ""); + mg.getParams().put("REBOOT_STATUS", "SUCCESS"); + rbs.setProviderCache(mg.getProviderCacheMap()); + rbs.executeProviderOperation(mg.getParams(), mg.getSvcLogicContext()); + assertEquals("SUCCESS", mg.getParams().get("REBOOT_STATUS")); + } + +} diff --git a/pom.xml b/pom.xml index b512f5542..c1480fe52 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ limitations under the License. - 1.1.25.6-oss + 1.1.25.8-oss 1.1.5 1.0.0 1.0.0