diff options
Diffstat (limited to 'adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack')
2 files changed, 26 insertions, 51 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(); } } |