aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN
diff options
context:
space:
mode:
Diffstat (limited to 'bpmn/MSOCommonBPMN')
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/CtagAssignment.java6
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/GenericVnf.java24
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/L3Network.java30
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LInterface.java16
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LagInterface.java4
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/PhysicalLink.java12
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Subnet.java6
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VfModule.java4
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vlan.java10
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VolumeGroup.java4
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/BuildingBlock.java6
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java12
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/OrchestrationContext.java6
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/SolutionInfo.java18
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoCollection.java6
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java8
-rw-r--r--bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/BBPojoTest.java7
-rw-r--r--bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java2
-rw-r--r--bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java6
-rw-r--r--bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json2
-rw-r--r--bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoCollection.json3
-rw-r--r--bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VolumeGroup.json1
22 files changed, 95 insertions, 98 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/CtagAssignment.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/CtagAssignment.java
index 937c79be1d..978f1e9324 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/CtagAssignment.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/CtagAssignment.java
@@ -37,13 +37,13 @@ public class CtagAssignment implements Serializable, ShallowCopy<CtagAssignment>
@Id
@JsonProperty("vlan-id-inner")
- private long vlanIdInner;
+ private Long vlanIdInner;
- public long getVlanIdInner() {
+ public Long getVlanIdInner() {
return vlanIdInner;
}
- public void setVlanIdInner(long vlanIdInner) {
+ public void setVlanIdInner(Long vlanIdInner) {
this.vlanIdInner = vlanIdInner;
}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/GenericVnf.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/GenericVnf.java
index 218763a006..17bd4f545b 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/GenericVnf.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/GenericVnf.java
@@ -62,7 +62,7 @@ public class GenericVnf implements Serializable, ShallowCopy<GenericVnf> {
@JsonProperty("platform")
private Platform platform;
@JsonProperty("cascaded")
- private boolean cascaded;
+ private Boolean cascaded;
@JsonProperty("cloud-params")
private Map<String, String> cloudParams = new HashMap<>();
@JsonProperty("cloud-context")
@@ -104,9 +104,9 @@ public class GenericVnf implements Serializable, ShallowCopy<GenericVnf> {
@JsonProperty("vdisk-units")
private String vdiskUnits;
@JsonProperty("in-maint")
- private boolean inMaint;
+ private Boolean inMaint;
@JsonProperty("is-closed-loop-disabled")
- private boolean isClosedLoopDisabled;
+ private Boolean isClosedLoopDisabled;
@JsonProperty("summary-status")
private String summaryStatus;
@JsonProperty("encrypted-access-flag")
@@ -138,7 +138,7 @@ public class GenericVnf implements Serializable, ShallowCopy<GenericVnf> {
@JsonProperty("instance-groups")
private List<InstanceGroup> instanceGroups = new ArrayList<InstanceGroup>();
@JsonProperty("call-homing")
- private boolean callHoming;
+ private Boolean callHoming;
public List<InstanceGroup> getInstanceGroups() {
@@ -309,19 +309,19 @@ public class GenericVnf implements Serializable, ShallowCopy<GenericVnf> {
this.vdiskUnits = vdiskUnits;
}
- public boolean isInMaint() {
+ public Boolean isInMaint() {
return inMaint;
}
- public void setInMaint(boolean inMaint) {
+ public void setInMaint(Boolean inMaint) {
this.inMaint = inMaint;
}
- public boolean isClosedLoopDisabled() {
+ public Boolean isIsClosedLoopDisabled() {
return isClosedLoopDisabled;
}
- public void setClosedLoopDisabled(boolean isClosedLoopDisabled) {
+ public void setClosedLoopDisabled(Boolean isClosedLoopDisabled) {
this.isClosedLoopDisabled = isClosedLoopDisabled;
}
@@ -453,11 +453,11 @@ public class GenericVnf implements Serializable, ShallowCopy<GenericVnf> {
this.platform = platform;
}
- public boolean isCascaded() {
+ public Boolean isCascaded() {
return cascaded;
}
- public void setCascaded(boolean cascaded) {
+ public void setCascaded(Boolean cascaded) {
this.cascaded = cascaded;
}
@@ -485,11 +485,11 @@ public class GenericVnf implements Serializable, ShallowCopy<GenericVnf> {
this.cloudRegion = cloudRegion;
}
- public boolean isCallHoming() {
+ public Boolean isCallHoming() {
return callHoming;
}
- public void setCallHoming(boolean callHoming) {
+ public void setCallHoming(Boolean callHoming) {
this.callHoming = callHoming;
}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/L3Network.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/L3Network.java
index 51cd998073..5f43ba076a 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/L3Network.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/L3Network.java
@@ -46,7 +46,7 @@ public class L3Network implements Serializable, ShallowCopy<L3Network> {
@JsonProperty("network-id")
private String networkId;
@JsonProperty("cascaded")
- private boolean cascaded;
+ private Boolean cascaded;
@JsonProperty("cloud-params")
private Map<String, String> cloudParams = new HashMap<>();
@JsonProperty("network-name")
@@ -60,7 +60,7 @@ public class L3Network implements Serializable, ShallowCopy<L3Network> {
@JsonProperty("network-role")
private String networkRole;
@JsonProperty("is-bound-to-vpn")
- private boolean isBoundToVpn;
+ private Boolean isBoundToVpn;
@JsonProperty("service-id")
private String serviceId;
@JsonProperty("network-role-instance")
@@ -82,11 +82,11 @@ public class L3Network implements Serializable, ShallowCopy<L3Network> {
@JsonProperty("physical-network-name")
private String physicalNetworkName;
@JsonProperty("is-provider-network")
- private boolean isProviderNetwork;
+ private Boolean isProviderNetwork;
@JsonProperty("is-shared-network")
- private boolean isSharedNetwork;
+ private Boolean isSharedNetwork;
@JsonProperty("is-external-network")
- private boolean isExternalNetwork;
+ private Boolean isExternalNetwork;
@JsonProperty("self-link")
private String selflink;
@JsonProperty("operational-status")
@@ -142,10 +142,10 @@ public class L3Network implements Serializable, ShallowCopy<L3Network> {
public void setNetworkRole(String networkRole) {
this.networkRole = networkRole;
}
- public boolean isBoundToVpn() {
+ public Boolean isIsBoundToVpn() {
return isBoundToVpn;
}
- public void setIsBoundToVpn(boolean isBoundToVpn) {
+ public void setIsBoundToVpn(Boolean isBoundToVpn) {
this.isBoundToVpn = isBoundToVpn;
}
public String getServiceId() {
@@ -202,22 +202,22 @@ public class L3Network implements Serializable, ShallowCopy<L3Network> {
public void setPhysicalNetworkName(String physicalNetworkName) {
this.physicalNetworkName = physicalNetworkName;
}
- public boolean isProviderNetwork() {
+ public Boolean isIsProviderNetwork() {
return isProviderNetwork;
}
- public void setIsProviderNetwork(boolean isProviderNetwork) {
+ public void setIsProviderNetwork(Boolean isProviderNetwork) {
this.isProviderNetwork = isProviderNetwork;
}
- public boolean isSharedNetwork() {
+ public Boolean isIsSharedNetwork() {
return isSharedNetwork;
}
- public void setIsSharedNetwork(boolean isSharedNetwork) {
+ public void setIsSharedNetwork(Boolean isSharedNetwork) {
this.isSharedNetwork = isSharedNetwork;
}
- public boolean isExternalNetwork() {
+ public Boolean isIsExternalNetwork() {
return isExternalNetwork;
}
- public void setIsExternalNetwork(boolean isExternalNetwork) {
+ public void setIsExternalNetwork(Boolean isExternalNetwork) {
this.isExternalNetwork = isExternalNetwork;
}
public String getSelflink() {
@@ -242,10 +242,10 @@ public class L3Network implements Serializable, ShallowCopy<L3Network> {
public List<SegmentationAssignment> getSegmentationAssignments() {
return segmentationAssignments;
}
- public boolean isCascaded() {
+ public Boolean isCascaded() {
return cascaded;
}
- public void setIsCascaded(boolean cascaded) {
+ public void setIsCascaded(Boolean cascaded) {
this.cascaded = cascaded;
}
public Map<String, String> getCloudParams() {
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LInterface.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LInterface.java
index 4bba39ee62..f102c15062 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LInterface.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LInterface.java
@@ -57,13 +57,13 @@ public class LInterface implements Serializable, ShallowCopy<LInterface>{
@JsonProperty("interface-description")
private String interfaceDescription;
@JsonProperty("is-port-mirrored")
- private boolean isPortMirrored;
+ private Boolean isPortMirrored;
@JsonProperty("in-maint")
- private boolean inMaint;
+ private Boolean inMaint;
@JsonProperty("prov-status")
private String provStatus;
@JsonProperty("is-ip-unnumbered")
- private boolean isIpUnnumbered;
+ private Boolean isIpUnnumbered;
@JsonProperty("allowed-address-pairs")
private String allowedAddressPairs;
@JsonProperty("vlans")
@@ -131,13 +131,13 @@ public class LInterface implements Serializable, ShallowCopy<LInterface>{
public void setInterfaceDescription(String interfaceDescription) {
this.interfaceDescription = interfaceDescription;
}
- public boolean isPortMirrored() {
+ public Boolean isIsPortMirrored() {
return isPortMirrored;
}
- public void setPortMirrored(boolean isPortMirrored) {
+ public void setPortMirrored(Boolean isPortMirrored) {
this.isPortMirrored = isPortMirrored;
}
- public boolean isInMaint() {
+ public Boolean isInMaint() {
return inMaint;
}
public void setInMaint(boolean inMaint) {
@@ -149,10 +149,10 @@ public class LInterface implements Serializable, ShallowCopy<LInterface>{
public void setProvStatus(String provStatus) {
this.provStatus = provStatus;
}
- public boolean isIpUnnumbered() {
+ public Boolean isIsIpUnnumbered() {
return isIpUnnumbered;
}
- public void setIpUnnumbered(boolean isIpUnnumbered) {
+ public void setIpUnnumbered(Boolean isIpUnnumbered) {
this.isIpUnnumbered = isIpUnnumbered;
}
public String getAllowedAddressPairs() {
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LagInterface.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LagInterface.java
index 8a3248e92c..f69f4628fa 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LagInterface.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LagInterface.java
@@ -53,7 +53,7 @@ public class LagInterface implements Serializable, ShallowCopy<LagInterface>{
@JsonProperty("prov-status")
private String provStatus;
@JsonProperty("in-maint")
- private boolean inMaint;
+ private Boolean inMaint;
@JsonProperty("l-interfaces")
private List<LInterface> lInterfaces = new ArrayList<>();
@@ -99,7 +99,7 @@ public class LagInterface implements Serializable, ShallowCopy<LagInterface>{
public void setProvStatus(String provStatus) {
this.provStatus = provStatus;
}
- public boolean isInMaint() {
+ public Boolean isInMaint() {
return inMaint;
}
public void setInMaint(boolean inMaint) {
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/PhysicalLink.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/PhysicalLink.java
index 4f54139386..742a541352 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/PhysicalLink.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/PhysicalLink.java
@@ -48,9 +48,9 @@ public class PhysicalLink implements Serializable, ShallowCopy<PhysicalLink> {
@JsonProperty("management-option")
private String managementOption;
@JsonProperty("bandwidth-up")
- private int bandwidthUp;
+ private Integer bandwidthUp;
@JsonProperty("bandwidth-down")
- private int bandwidthDown;
+ private Integer bandwidthDown;
@JsonProperty("bandwidth-units")
private String bandwidthUnits;
@JsonProperty("wan-port")
@@ -99,19 +99,19 @@ public class PhysicalLink implements Serializable, ShallowCopy<PhysicalLink> {
this.managementOption = managementOption;
}
- public int getBandwidthUp(){
+ public Integer getBandwidthUp(){
return bandwidthUp;
}
- public void setBandwidthUp(int bandwidthUp){
+ public void setBandwidthUp(Integer bandwidthUp){
this.bandwidthUp = bandwidthUp;
}
- public int getBandwidthDown(){
+ public Integer getBandwidthDown(){
return bandwidthDown;
}
- public void setBandwidthDown(int bandwidthDown){
+ public void setBandwidthDown(Integer bandwidthDown){
this.bandwidthDown = bandwidthDown;
}
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 cb23f3a3b9..7277438102 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
@@ -57,7 +57,7 @@ public class Subnet implements Serializable, ShallowCopy<Subnet>{
@JsonProperty("orchestration-status")
private OrchestrationStatus orchestrationStatus;
@JsonProperty("dhcp-enabled")
- private boolean dhcpEnabled;
+ private Boolean dhcpEnabled;
@JsonProperty("dhcp-start")
private String dhcpStart;
@JsonProperty("dhcp-end")
@@ -119,10 +119,10 @@ public class Subnet implements Serializable, ShallowCopy<Subnet>{
public void setOrchestrationStatus(OrchestrationStatus orchestrationStatus) {
this.orchestrationStatus = orchestrationStatus;
}
- public boolean isDhcpEnabled() {
+ public Boolean isDhcpEnabled() {
return dhcpEnabled;
}
- public void setDhcpEnabled(boolean dhcpEnabled) {
+ public void setDhcpEnabled(Boolean dhcpEnabled) {
this.dhcpEnabled = dhcpEnabled;
}
public String getDhcpStart() {
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VfModule.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VfModule.java
index fba78d7a87..469bc991b4 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VfModule.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VfModule.java
@@ -50,7 +50,7 @@ public class VfModule implements Serializable, ShallowCopy<VfModule> {
@JsonProperty("cloud-params")
private Map<String, String> cloudParams = new HashMap<>();
@JsonProperty("cascaded")
- private boolean cascaded;
+ private Boolean cascaded;
@JsonProperty("heat-stack-id")
private String heatStackId;
@JsonProperty("contrail-service-instance-fqdn")
@@ -116,7 +116,7 @@ public class VfModule implements Serializable, ShallowCopy<VfModule> {
public void setCloudParams(Map<String, String> cloudParams) {
this.cloudParams = cloudParams;
}
- public boolean isCascaded() {
+ public Boolean isCascaded() {
return cascaded;
}
public void setCascaded(boolean cascaded) {
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vlan.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vlan.java
index 65eeedc44c..a0788d4b0d 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vlan.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vlan.java
@@ -59,11 +59,11 @@ public class Vlan implements Serializable, ShallowCopy<Vlan>{
@JsonProperty("orchestration-status")
private OrchestrationStatus orchestrationStatus;
@JsonProperty("in-maint")
- private boolean inMaint;
+ private Boolean inMaint;
@JsonProperty("prov-status")
private String provStatus;
@JsonProperty("is-ip-unnumbered")
- private boolean isIpUnnumbered;
+ private Boolean isIpUnnumbered;
@JsonProperty("l3-interface-ipv4-address-list")
private List<L3InterfaceIpv4AddressList> l3InterfaceIpv4AddressList = new ArrayList<L3InterfaceIpv4AddressList>();
@JsonProperty("l3-interface-ipv6-address-list")
@@ -123,7 +123,7 @@ public class Vlan implements Serializable, ShallowCopy<Vlan>{
public void setOrchestrationStatus(OrchestrationStatus orchestrationStatus) {
this.orchestrationStatus = orchestrationStatus;
}
- public boolean isInMaint() {
+ public Boolean isInMaint() {
return inMaint;
}
public void setInMaint(boolean inMaint) {
@@ -135,10 +135,10 @@ public class Vlan implements Serializable, ShallowCopy<Vlan>{
public void setProvStatus(String provStatus) {
this.provStatus = provStatus;
}
- public boolean isIpUnnumbered() {
+ public Boolean isIsIpUnnumbered() {
return isIpUnnumbered;
}
- public void setIpUnnumbered(boolean isIpUnnumbered) {
+ public void setIpUnnumbered(Boolean isIpUnnumbered) {
this.isIpUnnumbered = isIpUnnumbered;
}
public List<L3InterfaceIpv4AddressList> getL3InterfaceIpv4AddressList() {
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VolumeGroup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VolumeGroup.java
index 565a151077..99a643a129 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VolumeGroup.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VolumeGroup.java
@@ -52,7 +52,7 @@ public class VolumeGroup implements Serializable, ShallowCopy<VolumeGroup> {
@JsonProperty("cloud-params")
private Map<String, String> cloudParams = new HashMap<>();
@JsonProperty("cascaded")
- private boolean cascaded;
+ private Boolean cascaded;
@JsonProperty("heat-stack-id")
private String heatStackId;
@JsonProperty("model-info-vf-module")
@@ -100,7 +100,7 @@ public class VolumeGroup implements Serializable, ShallowCopy<VolumeGroup> {
public void setCloudParams(Map<String, String> cloudParams) {
this.cloudParams = cloudParams;
}
- public boolean isCascaded() {
+ public Boolean isCascaded() {
return cascaded;
}
public void setCascaded(boolean cascaded) {
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/BuildingBlock.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/BuildingBlock.java
index 38f974168e..7b11e9f68e 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/BuildingBlock.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/BuildingBlock.java
@@ -37,7 +37,7 @@ public class BuildingBlock implements Serializable{
@JsonProperty("key")
private String key;
@JsonProperty("is-virtual-link")
- private boolean isVirtualLink;
+ private Boolean isVirtualLink;
@JsonProperty("virtual-link-key")
private String virtualLinkKey;
@@ -59,10 +59,10 @@ public class BuildingBlock implements Serializable{
public void setKey(String key) {
this.key = key;
}
- public boolean getIsVirtualLink() {
+ public Boolean getIsVirtualLink() {
return isVirtualLink;
}
- public void setIsVirtualLink(boolean isVirtualLink) {
+ public void setIsVirtualLink(Boolean isVirtualLink) {
this.isVirtualLink = isVirtualLink;
}
public String getVirtualLinkKey() {
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java
index 36a24bd1e1..0d04b5e7a1 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ExecuteBuildingBlock.java
@@ -35,8 +35,8 @@ public class ExecuteBuildingBlock implements Serializable{
private String resourceId;
private String requestAction;
private String vnfType;
- private boolean aLaCarte;
- private boolean homing;
+ private Boolean aLaCarte;
+ private Boolean homing;
private WorkflowResourceIds workflowResourceIds;
private RequestDetails requestDetails;
@@ -70,10 +70,10 @@ public class ExecuteBuildingBlock implements Serializable{
public void setRequestAction(String requestAction) {
this.requestAction = requestAction;
}
- public boolean isaLaCarte() {
+ public Boolean isaLaCarte() {
return aLaCarte;
}
- public void setaLaCarte(boolean aLaCarte) {
+ public void setaLaCarte(Boolean aLaCarte) {
this.aLaCarte = aLaCarte;
}
public String getVnfType() {
@@ -82,10 +82,10 @@ public class ExecuteBuildingBlock implements Serializable{
public void setVnfType(String vnfType) {
this.vnfType = vnfType;
}
- public boolean isHoming() {
+ public Boolean isHoming() {
return homing;
}
- public void setHoming(boolean homing) {
+ public void setHoming(Boolean homing) {
this.homing = homing;
}
public WorkflowResourceIds getWorkflowResourceIds() {
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/OrchestrationContext.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/OrchestrationContext.java
index d594c73638..8f1262f70e 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/OrchestrationContext.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/OrchestrationContext.java
@@ -32,13 +32,13 @@ public class OrchestrationContext implements Serializable {
private static final long serialVersionUID = 6843015923244810369L;
@JsonProperty("is-rollback-enabled")
- private boolean isRollbackEnabled;
+ private Boolean isRollbackEnabled;
- public boolean getIsRollbackEnabled() {
+ public Boolean getIsRollbackEnabled() {
return this.isRollbackEnabled;
}
- public void setIsRollbackEnabled(boolean isRollbackEnabled) {
+ public void setIsRollbackEnabled(Boolean isRollbackEnabled) {
this.isRollbackEnabled = isRollbackEnabled;
}
}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/SolutionInfo.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/SolutionInfo.java
index 17e42b4396..3c8f0e933f 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/SolutionInfo.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/homingobjects/SolutionInfo.java
@@ -33,28 +33,28 @@ public class SolutionInfo implements Serializable {
private static final long serialVersionUID = 6903399488466840832L;
@JsonProperty("solution-id") //identifies which solution
- private int solutionId;
+ private Integer solutionId;
@JsonProperty("homed")
- private boolean homed;
+ private Boolean homed;
@JsonProperty("is-rehome")
- private boolean isRehome;
+ private Boolean isRehome;
@JsonProperty("targeted-cloud")
private CloudRegion targetedCloudRegion;
- public boolean isHomed() {
+ public Boolean isHomed() {
return homed;
}
- public void setHomed(boolean homed) {
+ public void setHomed(Boolean homed) {
this.homed = homed;
}
- public boolean isRehome() {
+ public Boolean isRehome() {
return isRehome;
}
- public void setRehome(boolean isRehome) {
+ public void setRehome(Boolean isRehome) {
this.isRehome = isRehome;
}
@@ -63,7 +63,7 @@ public class SolutionInfo implements Serializable {
* given resource or resource pair.
* i.e. 1, 2, 3....
*/
- public int getSolutionId() {
+ public Integer getSolutionId() {
return solutionId;
}
@@ -72,7 +72,7 @@ public class SolutionInfo implements Serializable {
* given resource or resource pair.
* i.e. 1, 2, 3....
*/
- public void setSolutionId(int solutionId) {
+ public void setSolutionId(Integer solutionId) {
this.solutionId = solutionId;
}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoCollection.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoCollection.java
index 349010781d..cb6fabde30 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoCollection.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/modelinfo/ModelInfoCollection.java
@@ -43,7 +43,7 @@ public class ModelInfoCollection implements Serializable {
@JsonProperty("description")
private String description;
@JsonProperty("quantity")
- private int quantity;
+ private Integer quantity;
public String getModelCustomizationUUID() {
return modelCustomizationUUID;
@@ -87,10 +87,10 @@ public class ModelInfoCollection implements Serializable {
public void setDescription(String description) {
this.description = description;
}
- public int getQuantity() {
+ public Integer getQuantity() {
return quantity;
}
- public void setQuantity(int quantity) {
+ public void setQuantity(Integer quantity) {
this.quantity = quantity;
}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
index 67fb6a6f37..e8e1982911 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
@@ -141,8 +141,8 @@ public class BBInputSetup implements JavaDelegate {
String resourceId = executeBB.getResourceId();
String requestAction = executeBB.getRequestAction();
String vnfType = executeBB.getVnfType();
- boolean aLaCarte = executeBB.isaLaCarte();
- boolean homing = executeBB.isHoming();
+ boolean aLaCarte = Boolean.TRUE.equals(executeBB.isaLaCarte());
+ boolean homing = Boolean.TRUE.equals(executeBB.isHoming());
Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
outputBB = this.getGBB(executeBB, lookupKeyMap, requestAction, aLaCarte, resourceId, vnfType);
ObjectMapper mapper = new ObjectMapper();
@@ -707,7 +707,7 @@ public class BBInputSetup implements JavaDelegate {
}
}
ServiceInstance serviceInstance = this.getALaCarteServiceInstance(service, requestDetails, customer,
- project, owningEntity, lookupKeyMap, resourceId, executeBB.isaLaCarte(),
+ project, owningEntity, lookupKeyMap, resourceId, Boolean.TRUE.equals(executeBB.isaLaCarte()),
executeBB.getBuildingBlock().getBpmnFlowName());
return this.populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance, executeBB, requestAction, customer);
} else {
@@ -879,7 +879,7 @@ public class BBInputSetup implements JavaDelegate {
if (bbName.contains(NETWORK) && !bbName.contains(NETWORK_COLLECTION)) {
String networkId = lookupKeyMap.get(ResourceKey.NETWORK_ID);
ModelInfo networkModelInfo = new ModelInfo();
- if(!executeBB.getBuildingBlock().getIsVirtualLink()) {
+ if(!Boolean.TRUE.equals(executeBB.getBuildingBlock().getIsVirtualLink())) {
NetworkResourceCustomization networkCust = getNetworkCustomizationByKey(key, service);
if (networkCust != null) {
networkModelInfo.setModelCustomizationUuid(networkCust.getModelCustomizationUUID());
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/BBPojoTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/BBPojoTest.java
index 801314b2ae..eac6c0a8b7 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/BBPojoTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/BBPojoTest.java
@@ -21,7 +21,6 @@
package org.onap.so.bpmn.servicedecomposition;
import org.junit.Test;
-import org.onap.so.BaseTest;
import com.openpojo.reflection.PojoClass;
import com.openpojo.reflection.PojoClassFilter;
@@ -30,12 +29,13 @@ import com.openpojo.reflection.filters.FilterPackageInfo;
import com.openpojo.validation.Validator;
import com.openpojo.validation.ValidatorBuilder;
import com.openpojo.validation.rule.impl.GetterMustExistRule;
+import com.openpojo.validation.rule.impl.NoPrimitivesRule;
import com.openpojo.validation.rule.impl.SerializableMustHaveSerialVersionUIDRule;
import com.openpojo.validation.test.impl.GetterTester;
import com.openpojo.validation.test.impl.SetterTester;
-public class BBPojoTest extends BaseTest{
+public class BBPojoTest {
private PojoClassFilter filterTestClasses = new FilterTestClasses();
@Test
@@ -52,6 +52,7 @@ public class BBPojoTest extends BaseTest{
.with(new GetterMustExistRule())
.with(new SetterTester())
.with(new GetterTester())
+ .with(new NoPrimitivesRule())
.with(new SerializableMustHaveSerialVersionUIDRule())
.build();
validator.validate(pojoPackage, new FilterPackageInfo(), filterTestClasses, new FilterNonConcrete());
@@ -62,4 +63,4 @@ public class BBPojoTest extends BaseTest{
return !pojoClass.getSourcePath().contains("/test-classes/");
}
}
-} \ No newline at end of file
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
index 0abbb2dbe2..c18dcf5cfa 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
@@ -79,7 +79,7 @@ import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
public class BBInputSetupMapperLayerTest {
- @InjectMocks
+
BBInputSetupMapperLayer bbInputSetupMapperLayer = new BBInputSetupMapperLayer();
ObjectMapper mapper = new ObjectMapper();
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
index a821d69754..489163b23a 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
@@ -425,7 +425,7 @@ public class BBInputSetupTest {
doReturn(customer).when(SPY_bbInputSetup).getCustomerAndServiceSubscription(requestDetails, resourceId);
doReturn(serviceInstance).when(SPY_bbInputSetup).getALaCarteServiceInstance(service, requestDetails, customer,
- project, owningEntity, lookupKeyMap, resourceId, executeBB.isaLaCarte(),
+ project, owningEntity, lookupKeyMap, resourceId, Boolean.TRUE.equals(executeBB.isaLaCarte()),
executeBB.getBuildingBlock().getBpmnFlowName());
doReturn(expected).when(SPY_bbInputSetup).populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance,
executeBB, requestAction, customer);
@@ -475,7 +475,7 @@ public class BBInputSetupTest {
doReturn(customer).when(SPY_bbInputSetup).getCustomerAndServiceSubscription(requestDetails, resourceId);
doReturn(serviceSubscription).when(SPY_bbInputSetup).getServiceSubscription(requestDetails, customer);
doReturn(serviceInstance).when(SPY_bbInputSetup).getALaCarteServiceInstance(service, requestDetails, customer,
- project, owningEntity, lookupKeyMap, resourceId, executeBB.isaLaCarte(),
+ project, owningEntity, lookupKeyMap, resourceId, Boolean.TRUE.equals(executeBB.isaLaCarte()),
executeBB.getBuildingBlock().getBpmnFlowName());
doReturn(expected).when(SPY_bbInputSetup).populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance,
executeBB, requestAction,customer);
@@ -518,7 +518,7 @@ public class BBInputSetupTest {
doReturn(customer).when(SPY_bbInputSetup).getCustomerAndServiceSubscription(requestDetails, resourceId);
doReturn(serviceSubscription).when(SPY_bbInputSetup).getServiceSubscription(requestDetails, customer);
doReturn(serviceInstance).when(SPY_bbInputSetup).getALaCarteServiceInstance(service, requestDetails, customer,
- null, null, lookupKeyMap, resourceId, executeBB.isaLaCarte(),
+ null, null, lookupKeyMap, resourceId, Boolean.TRUE.equals(executeBB.isaLaCarte()),
executeBB.getBuildingBlock().getBpmnFlowName());
doReturn(expected).when(SPY_bbInputSetup).populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance,
executeBB, requestAction,customer);
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json
index e4c8a8f59b..cd9cf06029 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json
@@ -8,7 +8,6 @@
"vf-module-id":"vfModuleId",
"vf-module-name":"vfModuleName",
"orchestration-status":"PRECREATED",
- "cascaded":false,
"heat-stack-id":"heatStackId",
"contrail-service-instance-fqdn":"contrailServiceInstanceFqdn",
"module-index":1,"selflink":"selflink",
@@ -19,7 +18,6 @@
"volume-groups":[],
"line-of-business":null,
"platform":null,
- "cascaded":false,
"cloud-params":{},
"cloud-context":null,
"solution":null,
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoCollection.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoCollection.json
index a7e2ade10b..c6c5c790a8 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoCollection.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoCollection.json
@@ -5,6 +5,5 @@
"collection-function":"function",
"collection-role":"role",
"collection-type":"type",
- "description":"description",
- "quantity":0
+ "description":"description"
} \ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VolumeGroup.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VolumeGroup.json
index f807276773..bcc565dc75 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VolumeGroup.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VolumeGroup.json
@@ -4,6 +4,5 @@
"vnf-type":"vnfType",
"orchestration-status":"PRECREATED",
"cloud-params":{},
- "cascaded":false,
"heat-stack-id":"heatStackId"
}