diff options
| author |   Jim Hahn <jrh3@att.com> | 2017-11-15 18:25:57 -0500 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2017-11-15 18:25:57 -0500 |
| commit | 98d48a4b34f07ac40fddd2254b78b9ea84f88fa3 (patch) | |
| tree | 344557a6163b55e072eef8892f986f9d10b5fbe4 /bpmn/MSOInfrastructureBPMN/src/main | |
| parent | 0900a8bed342b8667052367fe5e24f369f357bb1 (diff) | |
Modified create-vcpe to filter out "bad" VNFs
Modified create-vcpe to delete the BRG and TXC items from the
service VNF list contained within the service decomposition
structure.
Change-Id: I7624a93b422fa172a2079f70d66a2604ee2229b0
Issue-Id: SO-344
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src/main')
| -rw-r--r-- | bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy index 703ea8be6d..dd6d4514bc 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy @@ -343,6 +343,9 @@ public class CreateVcpeResCustService extends AbstractServiceTaskProcessor { // VNFs
List<VnfResource> vnfList = serviceDecomposition.getServiceVnfs()
+ filterVnfs(vnfList)
+ serviceDecomposition.setServiceVnfs(vnfList)
+
execution.setVariable("vnfList", vnfList)
execution.setVariable("vnfListString", vnfList.toString())
@@ -372,6 +375,24 @@ public class CreateVcpeResCustService extends AbstractServiceTaskProcessor { exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)
}
}
+
+ private void filterVnfs(List<VnfResource> vnfList) {
+ if(vnfList == null) {
+ return
+ }
+
+ // remove BRG & TXC from VNF list
+
+ Iterator<VnfResource> it = vnfList.iterator()
+ while(it.hasNext()) {
+ VnfResource vr = it.next()
+
+ String role = vr.getNfRole()
+ if(role == "BRG" || role == "TunnelXConn") {
+ it.remove()
+ }
+ }
+ }
public void prepareCreateAllottedResourceTXC(Execution execution) {
|