diff options
Diffstat (limited to 'adapters/mso-adapter-utils/src/main')
4 files changed, 66 insertions, 138 deletions
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/HeatStatus.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/HeatStatus.java index 8e223b7bcb..3e4ea27d5f 100644 --- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/HeatStatus.java +++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/HeatStatus.java @@ -20,7 +20,6 @@ package org.openecomp.mso.openstack.beans; - /* * Enum status values to mirror the Openstack Heat stack status values */ diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/NetworkInfo.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/NetworkInfo.java index 9f2c275670..2cda8f99e2 100644 --- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/NetworkInfo.java +++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/NetworkInfo.java @@ -20,8 +20,6 @@ package org.openecomp.mso.openstack.beans; - - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -35,7 +33,6 @@ import com.woorea.openstack.quantum.model.Segment; * * This bean is returned by all Network-specific adapter operations (create, query, delete) */ - public class NetworkInfo { // Set defaults for everything private String name = ""; @@ -44,7 +41,6 @@ public class NetworkInfo { private String provider = ""; private List<Integer> vlans = new ArrayList<>(); private List<String> subnets = new ArrayList<>(); - private String shared = ""; static Map<String,NetworkStatus> NetworkStatusMap; static { @@ -55,15 +51,6 @@ public class NetworkInfo { NetworkStatusMap.put("ERROR", NetworkStatus.ERROR); } - public NetworkInfo () { - } - - public NetworkInfo (String name, NetworkStatus status) { - this.name = name; - this.id = name; // Don't have an ID, so just use name - this.status = status; - } - /** * Capture the data from a Neutron Network object. * @@ -75,41 +62,35 @@ public class NetworkInfo { * * @param network */ - public NetworkInfo (Network network) - { - if (network == null) { - this.status = NetworkStatus.NOTFOUND; - return; + public NetworkInfo(Network network) { + if (network != null) { + initFieldsWithDataFromNetwork(network); + } else { + status = NetworkStatus.NOTFOUND; } + } - this.name = network.getName(); - this.id = network.getId(); + private void initFieldsWithDataFromNetwork(Network network){ + name = network.getName(); + id = network.getId(); - if (network.getStatus() == null) { - // Can this happen on a newly created network? - this.status = NetworkStatus.UNKNOWN; - } else if (NetworkStatusMap.containsKey(network.getStatus())) { - this.status = NetworkStatusMap.get(network.getStatus()); - } else { - this.status = NetworkStatus.UNKNOWN; + if (network.getStatus() != null && NetworkStatusMap.containsKey(network.getStatus())) { + status = NetworkStatusMap.get(network.getStatus()); } - if (network.getProviderPhysicalNetwork() != null) { - this.provider = network.getProviderPhysicalNetwork(); + provider = network.getProviderPhysicalNetwork(); if ("vlan".equals(network.getProviderNetworkType())) { - this.vlans.add(network.getProviderSegmentationId()); + vlans.add(network.getProviderSegmentationId()); } } else if (network.getSegments() != null && !network.getSegments().isEmpty()) { Segment s = network.getSegments().get(0); - this.provider = s.getProviderPhysicalNetwork(); + provider = s.getProviderPhysicalNetwork(); if ("vlan".equals(s.getProviderNetworkType())) { - for (Segment s1 : network.getSegments()) { - this.vlans.add(s1.getProviderSegmentationId()); - } + network.getSegments().forEach(segment -> vlans.add(segment.getProviderSegmentationId())); } } - this.subnets = network.getSubnets(); + subnets = network.getSubnets(); } public String getName() { @@ -156,22 +137,17 @@ public class NetworkInfo { return subnets; } - public void setSubnets (List<String> subnets) { - this.subnets = subnets; - } - - public String getShared() { - return shared; - } - - public void setShared(String shared) { - this.shared = shared; - } - @Override - public String toString () { - return "Network: name=" + name + ",id=" + id + ",status=" + status + - ",provider=" + provider + ",vlans=" + vlans + ",subnets=" + subnets + ",shared=" + shared; + public String toString() { + final StringBuilder sb = new StringBuilder("NetworkInfo{"); + sb.append("name='").append(name).append('\''); + sb.append(", id='").append(id).append('\''); + sb.append(", status=").append(status); + sb.append(", provider='").append(provider).append('\''); + sb.append(", vlans=").append(vlans); + sb.append(", subnets=").append(subnets); + sb.append('}'); + return sb.toString(); } } diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/StackInfo.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/StackInfo.java index 83e1484257..600985e310 100644 --- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/StackInfo.java +++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/StackInfo.java @@ -7,9 +7,9 @@ * 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. @@ -20,136 +20,89 @@ package org.openecomp.mso.openstack.beans; - -import java.util.Map; -import java.util.HashMap; - import com.woorea.openstack.heat.model.Stack; +import java.util.HashMap; +import java.util.Map; /* * This Java bean class relays Heat stack status information to ActiveVOS processes. - * + * * This bean is returned by all Heat-specific adapter operations (create, query, delete) */ - public class StackInfo { - // Set defaults for everything private String name = ""; private String canonicalName = ""; - private HeatStatus status = HeatStatus.UNKNOWN; - private String statusMessage = ""; - private Map<String,Object> outputs = new HashMap<String,Object>(); - private Map<String,Object> parameters = new HashMap<String,Object>(); - - static Map<String,HeatStatus> HeatStatusMap; - static { - HeatStatusMap = new HashMap<String,HeatStatus>(); - HeatStatusMap.put("CREATE_IN_PROGRESS", HeatStatus.BUILDING); - HeatStatusMap.put("CREATE_COMPLETE", HeatStatus.CREATED); - HeatStatusMap.put("CREATE_FAILED", HeatStatus.FAILED); - HeatStatusMap.put("DELETE_IN_PROGRESS", HeatStatus.DELETING); - HeatStatusMap.put("DELETE_COMPLETE", HeatStatus.NOTFOUND); - HeatStatusMap.put("DELETE_FAILED", HeatStatus.FAILED); - HeatStatusMap.put("UPDATE_IN_PROGRESS", HeatStatus.UPDATING); - HeatStatusMap.put("UPDATE_FAILED", HeatStatus.FAILED); - HeatStatusMap.put("UPDATE_COMPLETE", HeatStatus.UPDATED); - } + private HeatStatus status; + private Map<String, Object> outputs = new HashMap<>(); + private Map<String,Object> parameters = new HashMap<>(); + static private Map<String, HeatStatus> heatStatusMap; - public StackInfo () { + static { + heatStatusMap = new HashMap<>(); + heatStatusMap.put("CREATE_IN_PROGRESS", HeatStatus.BUILDING); + heatStatusMap.put("CREATE_COMPLETE", HeatStatus.CREATED); + heatStatusMap.put("CREATE_FAILED", HeatStatus.FAILED); + heatStatusMap.put("DELETE_IN_PROGRESS", HeatStatus.DELETING); + heatStatusMap.put("DELETE_COMPLETE", HeatStatus.NOTFOUND); + heatStatusMap.put("DELETE_FAILED", HeatStatus.FAILED); + heatStatusMap.put("UPDATE_IN_PROGRESS", HeatStatus.UPDATING); + heatStatusMap.put("UPDATE_FAILED", HeatStatus.FAILED); + heatStatusMap.put("UPDATE_COMPLETE", HeatStatus.UPDATED); } - - public StackInfo (String name, HeatStatus status, String statusMessage, Map<String,Object> outputs) { - this.name = name; - this.canonicalName = name; // Don't have an ID, so just use name - this.status = status; - if (statusMessage != null) this.statusMessage = statusMessage; - if (outputs != null) this.outputs = outputs; - } - public StackInfo (String name, HeatStatus status) { this.name = name; this.canonicalName = name; // Don't have an ID, so just use name this.status = status; } - + public StackInfo (Stack stack) { if (stack == null) { this.status = HeatStatus.NOTFOUND; return; } - this.name = stack.getStackName(); this.canonicalName = stack.getStackName() + "/" + stack.getId(); if (stack.getStackStatus() == null) { this.status = HeatStatus.INIT; - } else if (HeatStatusMap.containsKey(stack.getStackStatus())) { - this.status = HeatStatusMap.get(stack.getStackStatus()); + } else if (heatStatusMap.containsKey(stack.getStackStatus())) { + this.status = heatStatusMap.get(stack.getStackStatus()); } else { this.status = HeatStatus.UNKNOWN; } - - this.statusMessage = stack.getStackStatusReason(); - if (stack.getOutputs() != null) { - this.outputs = new HashMap<String,Object>(); - for (Stack.Output output : stack.getOutputs()) { - this.outputs.put(output.getOutputKey(), output.getOutputValue()); - } + this.outputs = new HashMap<>(); + stack.getOutputs().forEach(output -> outputs.put(output.getOutputKey(), output.getOutputValue())); } - + this.parameters = stack.getParameters(); } - + public String getName() { return name; } - + public void setName (String name) { this.name = name; } - + public String getCanonicalName() { return canonicalName; } - - public void setCanonicalName (String name) { - this.canonicalName = name; - } - + public HeatStatus getStatus() { return status; } - - public void setStatus (HeatStatus status) { - this.status = status; - } - - public String getStatusMessage() { - return statusMessage; - } - - public void setStatusMessage (String statusMessage) { - this.statusMessage = statusMessage; - } - - public Map<String,Object> getOutputs () { + + public Map<String, Object> getOutputs() { return outputs; } - - public void setOutputs (Map<String,Object> outputs) { - this.outputs = outputs; - } - + public Map<String,Object> getParameters () { return parameters; } - - public void setParameters (Map<String,Object> parameters) { - this.parameters = parameters; - } - + } diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java index 08ea84d85d..8f21cfb2a3 100644 --- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java +++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java @@ -648,7 +648,7 @@ public class MsoHeatUtils extends MsoCommonUtils { } catch (MsoTenantNotFound e) { // Tenant doesn't exist, so stack doesn't either LOGGER.debug ("Tenant with id " + tenantId + "not found.", e); - return new StackInfo (stackName, HeatStatus.NOTFOUND, null, null); + return new StackInfo (stackName, HeatStatus.NOTFOUND); } catch (MsoException me) { // Got an Openstack error. Propagate it LOGGER.error (MessageEnum.RA_CONNECTION_EXCEPTION, "OpenStack", "Openstack Exception on Token request: " + me, "Openstack", "", MsoLogger.ErrorCode.AvailabilityError, "Connection Exception"); @@ -662,7 +662,7 @@ public class MsoHeatUtils extends MsoCommonUtils { if (heatStack == null) { // Stack does not exist. Return a StackInfo with status NOTFOUND - StackInfo stackInfo = new StackInfo (stackName, HeatStatus.NOTFOUND, null, null); + StackInfo stackInfo = new StackInfo (stackName, HeatStatus.NOTFOUND); return stackInfo; } @@ -712,7 +712,7 @@ public class MsoHeatUtils extends MsoCommonUtils { } catch (MsoTenantNotFound e) { // Tenant doesn't exist, so stack doesn't either LOGGER.debug ("Tenant with id " + tenantId + "not found.", e); - return new StackInfo (stackName, HeatStatus.NOTFOUND, null, null); + return new StackInfo (stackName, HeatStatus.NOTFOUND); } catch (MsoException me) { // Got an Openstack error. Propagate it LOGGER.error (MessageEnum.RA_CONNECTION_EXCEPTION, "Openstack", "Openstack Exception on Token request: " + me, "Openstack", "", MsoLogger.ErrorCode.AvailabilityError, "Connection Exception"); @@ -724,7 +724,7 @@ public class MsoHeatUtils extends MsoCommonUtils { Stack heatStack = queryHeatStack (heatClient, stackName); if (heatStack == null || "DELETE_COMPLETE".equals (heatStack.getStackStatus ())) { // Not found. Return a StackInfo with status NOTFOUND - return new StackInfo (stackName, HeatStatus.NOTFOUND, null, null); + return new StackInfo (stackName, HeatStatus.NOTFOUND); } // Delete the stack. @@ -747,7 +747,7 @@ public class MsoHeatUtils extends MsoCommonUtils { } catch (OpenStackResponseException e) { if (e.getStatus () == 404) { // Not found. We are OK with this. Return a StackInfo with status NOTFOUND - return new StackInfo (stackName, HeatStatus.NOTFOUND, null, null); + return new StackInfo (stackName, HeatStatus.NOTFOUND); } else { // Convert the OpenStackResponseException to an MsoOpenstackException throw heatExceptionToMsoException (e, DELETE_STACK); @@ -813,7 +813,7 @@ public class MsoHeatUtils extends MsoCommonUtils { } // The stack is gone when this point is reached - return new StackInfo (stackName, HeatStatus.NOTFOUND, null, null); + return new StackInfo (stackName, HeatStatus.NOTFOUND); } // Return the current status (if not polling, the delete may still be in progress) |