1 files changed, 147 insertions, 120 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Subnet.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Subnet.java
index 7277438102..8b01246067 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Subnet.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Subnet.java
@@ -23,151 +23,178 @@ package org.onap.so.bpmn.servicedecomposition.bbobjects;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.onap.so.db.catalog.beans.OrchestrationStatus;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import org.onap.so.bpmn.servicedecomposition.ShallowCopy;
-
 import javax.persistence.Id;
 
 @JsonRootName("subnet")
-public class Subnet implements Serializable, ShallowCopy<Subnet>{
+public class Subnet implements Serializable, ShallowCopy<Subnet> {
 
-	private static final long serialVersionUID = -6789344717555598319L;
+    private static final long serialVersionUID = -6789344717555598319L;
 
-	@Id
-	@JsonProperty("subnet-id")
+    @Id
+    @JsonProperty("subnet-id")
     private String subnetId;
-	@JsonProperty("subnet-name")
+    @JsonProperty("subnet-name")
     private String subnetName;
-	@JsonProperty("neutron-subnet-id")
+    @JsonProperty("neutron-subnet-id")
     private String neutronSubnetId;
-	@JsonProperty("gateway-address")
+    @JsonProperty("gateway-address")
     private String gatewayAddress;
-	@JsonProperty("network-start-address")
+    @JsonProperty("network-start-address")
     private String networkStartAddress;
-	@JsonProperty("cidr-mask")
+    @JsonProperty("cidr-mask")
     private String cidrMask;
-	@JsonProperty("ip-version")
+    @JsonProperty("ip-version")
     private String ipVersion;
-	@JsonProperty("orchestration-status")
+    @JsonProperty("orchestration-status")
     private OrchestrationStatus orchestrationStatus;
-	@JsonProperty("dhcp-enabled")
+    @JsonProperty("dhcp-enabled")
     private Boolean dhcpEnabled;
-	@JsonProperty("dhcp-start")
+    @JsonProperty("dhcp-start")
     private String dhcpStart;
-	@JsonProperty("dhcp-end")
+    @JsonProperty("dhcp-end")
     private String dhcpEnd;
-	@JsonProperty("subnet-role")
+    @JsonProperty("subnet-role")
     private String subnetRole;
-	@JsonProperty("ip-assignment-direction")
+    @JsonProperty("ip-assignment-direction")
     private String ipAssignmentDirection;
-	@JsonProperty("subnet-sequence")
+    @JsonProperty("subnet-sequence")
     private Integer subnetSequence;
-	@JsonProperty("host-routes")
+    @JsonProperty("host-routes")
     private List<HostRoute> hostRoutes = new ArrayList<>();
 
-	public String getSubnetId() {
-		return subnetId;
-	}
-	public void setSubnetId(String subnetId) {
-		this.subnetId = subnetId;
-	}
-	public String getSubnetName() {
-		return subnetName;
-	}
-	public void setSubnetName(String subnetName) {
-		this.subnetName = subnetName;
-	}
-	public String getNeutronSubnetId() {
-		return neutronSubnetId;
-	}
-	public void setNeutronSubnetId(String neutronSubnetId) {
-		this.neutronSubnetId = neutronSubnetId;
-	}
-	public String getGatewayAddress() {
-		return gatewayAddress;
-	}
-	public void setGatewayAddress(String gatewayAddress) {
-		this.gatewayAddress = gatewayAddress;
-	}
-	public String getNetworkStartAddress() {
-		return networkStartAddress;
-	}
-	public void setNetworkStartAddress(String networkStartAddress) {
-		this.networkStartAddress = networkStartAddress;
-	}
-	public String getCidrMask() {
-		return cidrMask;
-	}
-	public void setCidrMask(String cidrMask) {
-		this.cidrMask = cidrMask;
-	}
-	public String getIpVersion() {
-		return ipVersion;
-	}
-	public void setIpVersion(String ipVersion) {
-		this.ipVersion = ipVersion;
-	}
-	public OrchestrationStatus getOrchestrationStatus() {
-		return orchestrationStatus;
-	}
-	public void setOrchestrationStatus(OrchestrationStatus orchestrationStatus) {
-		this.orchestrationStatus = orchestrationStatus;
-	}
-	public Boolean isDhcpEnabled() {
-		return dhcpEnabled;
-	}
-	public void setDhcpEnabled(Boolean dhcpEnabled) {
-		this.dhcpEnabled = dhcpEnabled;
-	}
-	public String getDhcpStart() {
-		return dhcpStart;
-	}
-	public void setDhcpStart(String dhcpStart) {
-		this.dhcpStart = dhcpStart;
-	}
-	public String getDhcpEnd() {
-		return dhcpEnd;
-	}
-	public void setDhcpEnd(String dhcpEnd) {
-		this.dhcpEnd = dhcpEnd;
-	}
-	public String getSubnetRole() {
-		return subnetRole;
-	}
-	public void setSubnetRole(String subnetRole) {
-		this.subnetRole = subnetRole;
-	}
-	public String getIpAssignmentDirection() {
-		return ipAssignmentDirection;
-	}
-	public void setIpAssignmentDirection(String ipAssignmentDirection) {
-		this.ipAssignmentDirection = ipAssignmentDirection;
-	}
-	public Integer getSubnetSequence() {
-		return subnetSequence;
-	}
-	public void setSubnetSequence(Integer subnetSequence) {
-		this.subnetSequence = subnetSequence;
-	}
-	public List<HostRoute> getHostRoutes() {
-		return hostRoutes;
-	}
-	@Override
-	public boolean equals(final Object other) {
-		if (!(other instanceof Subnet)) {
-			return false;
-		}
-		Subnet castOther = (Subnet) other;
-		return new EqualsBuilder().append(subnetId, castOther.subnetId).isEquals();
-	}
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(subnetId).toHashCode();
-	}
+    public String getSubnetId() {
+        return subnetId;
+    }
+
+    public void setSubnetId(String subnetId) {
+        this.subnetId = subnetId;
+    }
+
+    public String getSubnetName() {
+        return subnetName;
+    }
+
+    public void setSubnetName(String subnetName) {
+        this.subnetName = subnetName;
+    }
+
+    public String getNeutronSubnetId() {
+        return neutronSubnetId;
+    }
+
+    public void setNeutronSubnetId(String neutronSubnetId) {
+        this.neutronSubnetId = neutronSubnetId;
+    }
+
+    public String getGatewayAddress() {
+        return gatewayAddress;
+    }
+
+    public void setGatewayAddress(String gatewayAddress) {
+        this.gatewayAddress = gatewayAddress;
+    }
+
+    public String getNetworkStartAddress() {
+        return networkStartAddress;
+    }
+
+    public void setNetworkStartAddress(String networkStartAddress) {
+        this.networkStartAddress = networkStartAddress;
+    }
+
+    public String getCidrMask() {
+        return cidrMask;
+    }
+
+    public void setCidrMask(String cidrMask) {
+        this.cidrMask = cidrMask;
+    }
+
+    public String getIpVersion() {
+        return ipVersion;
+    }
+
+    public void setIpVersion(String ipVersion) {
+        this.ipVersion = ipVersion;
+    }
+
+    public OrchestrationStatus getOrchestrationStatus() {
+        return orchestrationStatus;
+    }
+
+    public void setOrchestrationStatus(OrchestrationStatus orchestrationStatus) {
+        this.orchestrationStatus = orchestrationStatus;
+    }
+
+    public Boolean isDhcpEnabled() {
+        return dhcpEnabled;
+    }
+
+    public void setDhcpEnabled(Boolean dhcpEnabled) {
+        this.dhcpEnabled = dhcpEnabled;
+    }
+
+    public String getDhcpStart() {
+        return dhcpStart;
+    }
+
+    public void setDhcpStart(String dhcpStart) {
+        this.dhcpStart = dhcpStart;
+    }
+
+    public String getDhcpEnd() {
+        return dhcpEnd;
+    }
+
+    public void setDhcpEnd(String dhcpEnd) {
+        this.dhcpEnd = dhcpEnd;
+    }
+
+    public String getSubnetRole() {
+        return subnetRole;
+    }
+
+    public void setSubnetRole(String subnetRole) {
+        this.subnetRole = subnetRole;
+    }
+
+    public String getIpAssignmentDirection() {
+        return ipAssignmentDirection;
+    }
+
+    public void setIpAssignmentDirection(String ipAssignmentDirection) {
+        this.ipAssignmentDirection = ipAssignmentDirection;
+    }
+
+    public Integer getSubnetSequence() {
+        return subnetSequence;
+    }
+
+    public void setSubnetSequence(Integer subnetSequence) {
+        this.subnetSequence = subnetSequence;
+    }
+
+    public List<HostRoute> getHostRoutes() {
+        return hostRoutes;
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (!(other instanceof Subnet)) {
+            return false;
+        }
+        Subnet castOther = (Subnet) other;
+        return new EqualsBuilder().append(subnetId, castOther.subnetId).isEquals();
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(subnetId).toHashCode();
+    }
 }