From 20fb4b99fd78629f311ccae9363f9fa8cfe2270c Mon Sep 17 00:00:00 2001 From: Taka Date: Sat, 10 Feb 2018 22:17:44 -0500 Subject: refactor EvacuateServer for nesting try Change-Id: I4b114e6f2f41c755cf7e346a120e50441a1209dd Signed-off-by: Taka Issue-ID: APPC-598 --- .../provider/operation/impl/EvacuateServer.java | 241 +++++++++++---------- 1 file changed, 132 insertions(+), 109 deletions(-) diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java index 4e8c4db41..040d15693 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/EvacuateServer.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP : APPC * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Copyright (C) 2017 Amdocs * ============================================================================= @@ -104,25 +104,7 @@ public class EvacuateServer extends ProviderServerOperation { String msg; try { - while (rc.attempt()) { - try { - logger.debug("Calling CDP moveServer - server id = " + server.getId()); - service.moveServer(server.getId(), targetHost); - // Wait for completion, expecting the server to go to a non pending state - waitForStateChange(rc, server, Server.Status.READY, Server.Status.RUNNING, Server.Status.ERROR, - Server.Status.SUSPENDED, Server.Status.PAUSED); - break; - } catch (ContextConnectionException e) { - msg = EELFResourceManager.format(Msg.CONNECTION_FAILED_RETRY, provider.getName(), service.getURL(), - ctx.getTenant().getName(), ctx.getTenant().getId(), e.getMessage(), - Long.toString(rc.getRetryDelay()), Integer.toString(rc.getAttempts()), - Integer.toString(rc.getRetryLimit())); - logger.error(msg, e); - metricsLogger.error(msg, e); - rc.delay(); - } - } - + evacuateServerNested(rc,service,server,provider,targetHost); } catch (ZoneException e) { msg = EELFResourceManager.format(Msg.EVACUATE_SERVER_FAILED, server.getName(), server.getId(), e.getMessage()); @@ -140,7 +122,30 @@ public class EvacuateServer extends ProviderServerOperation { rc.reset(); } + private void evacuateServerNested(RequestContext rcCtx,ComputeService svc,Server server,Provider provider, String targetHost) + throws ZoneException, RequestFailedException { + String msg; + Context ctx = server.getContext(); + while (rcCtx.attempt()) { + try { + logger.debug("Calling CDP moveServer - server id = " + server.getId()); + svc.moveServer(server.getId(), targetHost); + // Wait for completion, expecting the server to go to a non pending state + waitForStateChange(rcCtx, server, Server.Status.READY, Server.Status.RUNNING, Server.Status.ERROR, + Server.Status.SUSPENDED, Server.Status.PAUSED); + break; + } catch (ContextConnectionException e) { + msg = EELFResourceManager.format(Msg.CONNECTION_FAILED_RETRY, provider.getName(), svc.getURL(), + ctx.getTenant().getName(), ctx.getTenant().getId(), e.getMessage(), + Long.toString(rcCtx.getRetryDelay()), Integer.toString(rcCtx.getAttempts()), + Integer.toString(rcCtx.getRetryLimit())); + logger.error(msg, e); + metricsLogger.error(msg, e); + rcCtx.delay(); + } + } + } /** * @see org.onap.appc.adapter.iaas.ProviderAdapter#evacuateServer(java.util.Map, * org.onap.ccsdk.sli.core.sli.SvcLogicContext) @@ -166,95 +171,8 @@ public class EvacuateServer extends ProviderServerOperation { return null; } - IdentityURL ident = IdentityURL.parseURL(params.get(ProviderAdapter.PROPERTY_IDENTITY_URL)); - String identStr = (ident == null) ? null : ident.toString(); + server = evacuateServerMapNestedFirst(params, server, rc, ctx, vm, vmUrl); - // retrieve the optional parameters - String rebuildVm = params.get(ProviderAdapter.PROPERTY_REBUILD_VM); - String targetHostId = params.get(ProviderAdapter.PROPERTY_TARGETHOST_ID); - - Context context; - String tenantName = "Unknown";//to be used also in case of exception - try { - context = getContext(rc, vmUrl, identStr); - if (context != null) { - tenantName = context.getTenantName();//this varaible also is used in case of exception - server = lookupServer(rc, context, vm.getServerId()); - logger.debug(Msg.SERVER_FOUND, vmUrl, tenantName, server.getStatus().toString()); - - // check target host status - checkHostStatus(server, targetHostId, context); - - // save hypervisor name before evacuate - String hypervisor = server.getHypervisor().getHostName(); - - evacuateServer(rc, server, targetHostId); - - server.refreshAll(); - String hypervisorAfterEvacuate = server.getHypervisor().getHostName(); - logger.debug("Hostname before evacuate: " + hypervisor + ", After evacuate: " + hypervisorAfterEvacuate); - - // check hypervisor host name after evacuate. If it is unchanged, the evacuate - // failed. - checkHypervisor(server, hypervisor, hypervisorAfterEvacuate); - - // check VM status after evacuate - checkStatus(server); - context.close(); - doSuccess(rc); - ctx.setAttribute(EVACUATE_STATUS, "SUCCESS"); - - // If a snapshot exists, do a rebuild to apply the latest snapshot to the evacuated server. - // This is the default behavior unless the optional parameter is set to FALSE. - if (rebuildVm == null || !"false".equalsIgnoreCase(rebuildVm)) { - List snapshots = server.getSnapshots(); - if (snapshots == null || snapshots.isEmpty()) { - logger.debug("No snapshots available - skipping rebuild after evacuate"); - } else if (paImpl != null) { - logger.debug("Executing a rebuild after evacuate"); - paImpl.rebuildServer(params, ctx); - // Check error code for rebuild errors. Evacuate had set it to 200 after - // a successful evacuate. Rebuild updates the error code. - String rebuildErrorCode = ctx.getAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_CODE); - if (rebuildErrorCode != null) { - try { - int errorCode = Integer.parseInt(rebuildErrorCode); - if (errorCode != HttpStatus.OK_200.getStatusCode()) { - logger.debug("Rebuild after evacuate failed - error code=" + errorCode - + ", message=" + ctx.getAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_MESSAGE)); - msg = EELFResourceManager.format(Msg.EVACUATE_SERVER_REBUILD_FAILED, - server.getName(), hypervisor, hypervisorAfterEvacuate, - ctx.getAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_MESSAGE)); - logger.error(msg); - metricsLogger.error(msg); - ctx.setAttribute(EVACUATE_STATUS, "ERROR"); - // update error message while keeping the error code the - // same as before - doFailure(rc, HttpStatus.getHttpStatus(errorCode), msg); - } - } catch (NumberFormatException e) { - // ignore - } - } - } - } - - } - } catch (ResourceNotFoundException e) { - msg = EELFResourceManager.format(Msg.SERVER_NOT_FOUND, e, vmUrl); - logger.error(msg); - metricsLogger.error(msg); - doFailure(rc, HttpStatus.NOT_FOUND_404, msg); - } catch (RequestFailedException e) { - logger.error("Request failed", e); - doFailure(rc, e.getStatus(), e.getMessage()); - } catch (IOException | ZoneException e1) { - msg = EELFResourceManager.format(Msg.SERVER_OPERATION_EXCEPTION, e1, e1.getClass().getSimpleName(), - Operation.EVACUATE_SERVICE.toString(), vmUrl, tenantName); - logger.error(msg, e1); - metricsLogger.error(msg, e1); - doFailure(rc, HttpStatus.INTERNAL_SERVER_ERROR_500, msg); - } } catch (RequestFailedException e) { msg = EELFResourceManager.format(Msg.EVACUATE_SERVER_FAILED, "n/a", "n/a", e.getMessage()); logger.error(msg, e); @@ -265,6 +183,111 @@ public class EvacuateServer extends ProviderServerOperation { return server; } + private Server evacuateServerMapNestedFirst(Map params, Server server, RequestContext rqstCtx, SvcLogicContext ctx, + VMURL vm, String vmUrl) + throws APPCException { + + String msg; + Context context; + + IdentityURL ident = IdentityURL.parseURL(params.get(ProviderAdapter.PROPERTY_IDENTITY_URL)); + String identStr = (ident == null) ? null : ident.toString(); + // retrieve the optional parameters + String rebuildVm = params.get(ProviderAdapter.PROPERTY_REBUILD_VM); + String targetHostId = params.get(ProviderAdapter.PROPERTY_TARGETHOST_ID); + String tenantName = "Unknown";//to be used also in case of exception + try { + context = getContext(rqstCtx, vmUrl, identStr); + if (context != null) { + tenantName = context.getTenantName();//this variable also is used in case of exception + server = lookupServer(rqstCtx, context, vm.getServerId()); + + logger.debug(Msg.SERVER_FOUND, vmUrl, tenantName, server.getStatus().toString()); + + // check target host status + checkHostStatus(server, targetHostId, context); + + // save hypervisor name before evacuate + String hypervisor = server.getHypervisor().getHostName(); + + evacuateServer(rqstCtx, server, targetHostId); + + server.refreshAll(); + String hypervisorAfterEvacuate = server.getHypervisor().getHostName(); + logger.debug("Hostname before evacuate: " + hypervisor + ", After evacuate: " + hypervisorAfterEvacuate); + + // check hypervisor host name after evacuate. If it is unchanged, the evacuate + // failed. + checkHypervisor(server, hypervisor, hypervisorAfterEvacuate); + + // check VM status after evacuate + checkStatus(server); + context.close(); + doSuccess(rqstCtx); + ctx.setAttribute(EVACUATE_STATUS, "SUCCESS"); + + // If a snapshot exists, do a rebuild to apply the latest snapshot to the evacuated server. + // This is the default behavior unless the optional parameter is set to FALSE. + if (rebuildVm == null || !"false".equalsIgnoreCase(rebuildVm)) { + List snapshots = server.getSnapshots(); + if (snapshots == null || snapshots.isEmpty()) { + logger.debug("No snapshots available - skipping rebuild after evacuate"); + } else if (paImpl != null) { + logger.debug("Executing a rebuild after evacuate"); + paImpl.rebuildServer(params, ctx); + // Check error code for rebuild errors. Evacuate had set it to 200 after + // a successful evacuate. Rebuild updates the error code. + evacuateServerMapNestedSecond(server, rqstCtx, ctx, hypervisor, hypervisorAfterEvacuate); + } + } + + } + } catch (ResourceNotFoundException e) { + msg = EELFResourceManager.format(Msg.SERVER_NOT_FOUND, e, vmUrl); + logger.error(msg); + metricsLogger.error(msg); + doFailure(rqstCtx, HttpStatus.NOT_FOUND_404, msg); + } catch (RequestFailedException e) { + logger.error("Request failed", e); + doFailure(rqstCtx, e.getStatus(), e.getMessage()); + } catch (IOException | ZoneException e1) { + msg = EELFResourceManager.format(Msg.SERVER_OPERATION_EXCEPTION, e1, e1.getClass().getSimpleName(), + Operation.EVACUATE_SERVICE.toString(), vmUrl, tenantName); + logger.error(msg, e1); + metricsLogger.error(msg, e1); + doFailure(rqstCtx, HttpStatus.INTERNAL_SERVER_ERROR_500, msg); + } + return server; + } + + private void evacuateServerMapNestedSecond(Server server,RequestContext rc, SvcLogicContext ctx, + String hypervisor,String hypervisorAfterEvacuate) { + + String msg; + String rebuildErrorCode = ctx.getAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_CODE); + + if (rebuildErrorCode != null) { + try { + int errorCode = Integer.parseInt(rebuildErrorCode); + if (errorCode != HttpStatus.OK_200.getStatusCode()) { + logger.debug("Rebuild after evacuate failed - error code=" + errorCode + + ", message=" + ctx.getAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_MESSAGE)); + msg = EELFResourceManager.format(Msg.EVACUATE_SERVER_REBUILD_FAILED, + server.getName(), hypervisor, hypervisorAfterEvacuate, + ctx.getAttribute(org.onap.appc.Constants.ATTRIBUTE_ERROR_MESSAGE)); + logger.error(msg); + metricsLogger.error(msg); + ctx.setAttribute(EVACUATE_STATUS, "ERROR"); + // update error message while keeping the error code the + // same as before + doFailure(rc, HttpStatus.getHttpStatus(errorCode), msg); + } + } catch (NumberFormatException e) { + // ignore + } + } + } + private void checkHostStatus(Server server, String targetHostId, Context context) throws ZoneException, RequestFailedException { if (isComputeNodeDown(context, targetHostId)) { @@ -372,4 +395,4 @@ public class EvacuateServer extends ProviderServerOperation { public void setProvideAdapterRef(ProviderAdapterImpl pai) { paImpl = pai; } -} \ No newline at end of file +} -- cgit 1.2.3-korg