aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java12
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2ENetworkInstance.bpmn4
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUnderlayVpnOperation.bpmn (renamed from bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUnderVpnOperation_java.bpmn)0
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java15
4 files changed, 16 insertions, 15 deletions
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java
index 73f37e3f53..bd20eb0bf1 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java
@@ -220,7 +220,7 @@ public class VfResourceInstaller implements IVfResourceInstaller {
String resourceType = vfResourceStructure.getResourceInstance().getResourceType();
String resourceCategory = vfResourceStructure.getResourceInstance().getCategory();
- if(resourceType.equals("VF")){
+ if("VF".equals(resourceType)){
if(resourceCategory.equalsIgnoreCase("Allotted Resource")){
VfResourceInstaller.createAllottedResourceCustomization(vfResourceStructure);
@@ -231,7 +231,7 @@ public class VfResourceInstaller implements IVfResourceInstaller {
}
}
- if(resourceType.equals("VL")){
+ if("VL".equals(resourceType)){
VfResourceInstaller.createNetworkResourceCustomization(vfResourceStructure);
catalogDB.saveNetworkResourceCustomization(vfResourceStructure.getCatalogNetworkResourceCustomization());
}
@@ -243,12 +243,12 @@ public class VfResourceInstaller implements IVfResourceInstaller {
catalogDB.saveService(vfResourceStructure.getCatalogService());
// Now that the service has been added we can populate the Service_to_AllottedResources table
- if(resourceType.equals("VF") && resourceCategory.equalsIgnoreCase("Allotted Resource")){
+ if("VF".equals(resourceType) && "Allotted Resource".equalsIgnoreCase(resourceCategory)){
catalogDB.saveServiceToAllottedResources(vfResourceStructure.getCatalogServiceToAllottedResources());
}
// Now that the service has been added we can populate the Service_to_Network table
- if(resourceType.equals("VL")){
+ if("VL".equals(resourceType)){
catalogDB.saveServiceToNetworks(vfResourceStructure.getCatalogServiceToNetworks());
}
@@ -667,7 +667,7 @@ public class VfResourceInstaller implements IVfResourceInstaller {
// heatTemplate.setAsdcResourceName(vfResourceStructure.getResourceInstance().getResourceName());
heatTemplate.setAsdcUuid(vfModuleArtifact.getArtifactInfo().getArtifactUUID());
- List<String> typeList = new ArrayList<String>();
+ List<String> typeList = new ArrayList<>();
typeList.add(ASDCConfiguration.HEAT_NESTED);
typeList.add(ASDCConfiguration.HEAT_ARTIFACT);
@@ -707,7 +707,7 @@ public class VfResourceInstaller implements IVfResourceInstaller {
// TODO Set the label
// heatEnvironment.setAsdcLabel("Label");
- List<String> typeList = new ArrayList<String>();
+ List<String> typeList = new ArrayList<>();
typeList.add(ASDCConfiguration.HEAT);
typeList.add(ASDCConfiguration.HEAT_VOL);
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2ENetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2ENetworkInstance.bpmn
index 9fad8dd398..758b98c218 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2ENetworkInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2ENetworkInstance.bpmn
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.7.2">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0">
<bpmn:process id="DoCreateE2ENetworkInstance" name="DoCreateE2ENetworkInstance" isExecutable="true">
<bpmn:startEvent id="StartEvent_1">
<bpmn:outgoing>SequenceFlow_1gomb9n</bpmn:outgoing>
@@ -18,7 +18,7 @@ dcsi.preProcessSDNCAssignRequest(execution)]]></bpmn:script>
def dcsi = new DoCreateE2EServiceInstance()
dcsi.postProcessSDNCAssign(execution)]]></bpmn:script>
</bpmn:scriptTask>
- <bpmn:callActivity id="CallActivity_0ao684p" name="Call SDNC Adapter Service Topology Assign" calledElement="sdncAdapter">
+ <bpmn:callActivity id="CallActivity_0ao684p" name="Call SDNC Adapter Service Topology Assign" calledElement="DoUnderlayVpnOperation">
<bpmn:extensionElements>
<camunda:in source="sdncAssignRequest" target="sdncAdapterWorkflowRequest" />
<camunda:in source="msoRequestId" target="mso-request-id" />
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUnderVpnOperation_java.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUnderlayVpnOperation.bpmn
index b8e79a2508..b8e79a2508 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUnderVpnOperation_java.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUnderlayVpnOperation.bpmn
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java
index e8b33bac4b..d4d0507f20 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java
@@ -44,9 +44,9 @@ public class ServiceMacroHolder implements Serializable {
super();
this.service = null;
this.vnfResources = new ArrayList<VnfResource>();
- this.networkResourceCustomizations = new ArrayList<NetworkResourceCustomization>();
- this.allottedResourceCustomizations = new ArrayList<AllottedResourceCustomization>();
- this.vnfResourceCustomizations = new ArrayList<VnfResourceCustomization>();
+ this.networkResourceCustomizations = new ArrayList<>();
+ this.allottedResourceCustomizations = new ArrayList<>();
+ this.vnfResourceCustomizations = new ArrayList<>();
}
public ServiceMacroHolder(Service service) {
this();
@@ -71,7 +71,7 @@ public class ServiceMacroHolder implements Serializable {
if (this.vnfResources != null) {
this.vnfResources.add(vr);
} else {
- this.vnfResources = new ArrayList<VnfResource>();
+ this.vnfResources = new ArrayList<>();
this.vnfResources.add(vr);
}
}
@@ -88,7 +88,7 @@ public class ServiceMacroHolder implements Serializable {
if (this.vnfResourceCustomizations != null) {
this.vnfResourceCustomizations.add(vrc);
} else {
- this.vnfResourceCustomizations = new ArrayList<VnfResourceCustomization>();
+ this.vnfResourceCustomizations = new ArrayList<>();
this.vnfResourceCustomizations.add(vrc);
}
}
@@ -104,7 +104,7 @@ public class ServiceMacroHolder implements Serializable {
if (this.networkResourceCustomizations != null) {
this.networkResourceCustomizations.add(nrc);
} else {
- this.networkResourceCustomizations = new ArrayList<NetworkResourceCustomization>();
+ this.networkResourceCustomizations = new ArrayList<>();
this.networkResourceCustomizations.add(nrc);
}
}
@@ -119,11 +119,12 @@ public class ServiceMacroHolder implements Serializable {
if (this.allottedResourceCustomizations != null) {
this.allottedResourceCustomizations.add(arc);
} else {
- this.allottedResourceCustomizations = new ArrayList<AllottedResourceCustomization>();
+ this.allottedResourceCustomizations = new ArrayList<>();
this.allottedResourceCustomizations.add(arc);
}
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("ServicePlus: ");