Merge "Add space to 'Tunnel XConn'"

9 files changed, 25 insertions, 25 deletions

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
index 450ffd6d93..b249b58d48 100644
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
@@ -96,8 +96,8 @@ public class QueryAllottedResourceCustomization extends CatalogQuery {
 		    put(valueMap, "MODEL_CUSTOMIZATION_UUID", o.getModelCustomizationUuid());
 		    put(valueMap, "MODEL_INSTANCE_NAME",      o.getModelInstanceName());
 			    put(valueMap, "TOSCA_NODE_TYPE",      arNull ? null : o.getAllottedResource().getToscaNodeType());
-			    put(valueMap, "ALLOTTED_RESOURCE_TYPE",     arNull ? null : o.getAllottedResource().getSubcategory());
-			    put(valueMap, "ALLOTTED_RESOURCE_ROLE",     o.getTargetNetworkRole());
+			    put(valueMap, "ALLOTTED_RESOURCE_TYPE",     o.getNfType());
+			    put(valueMap, "ALLOTTED_RESOURCE_ROLE",     o.getNfRole());
 			    put(valueMap, "NF_TYPE",     o.getNfType());
 			    put(valueMap, "NF_ROLE",     o.getNfRole());
 			    put(valueMap, "NF_FUNCTION",     o.getNfFunction());
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 8844924bad..68f50e033c 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
@@ -442,7 +442,7 @@ public class CreateVcpeResCustService extends AbstractServiceTaskProcessor {
             VnfResource vr = it.next()
 
             String role = vr.getNfRole()
-            if (role == "BRG" || role == "TunnelXConn") {
+            if (role == "BRG" || role == "TunnelXConn" || role == "Tunnel XConn") {
                 it.remove()
             }
         }
@@ -476,7 +476,7 @@ public class CreateVcpeResCustService extends AbstractServiceTaskProcessor {
 
                     utils.log("DEBUG", " getting model info for AllottedResource # :" + allottedResource.toJsonStringNoRootName(), isDebugEnabled)
                     utils.log("DEBUG", " allottedResource.getAllottedResourceType() :" + allottedResource.getAllottedResourceType(), isDebugEnabled)
-                    if ("TunnelXConn".equalsIgnoreCase(allottedResource.getAllottedResourceType())) {
+                    if ("TunnelXConn".equalsIgnoreCase(allottedResource.getAllottedResourceType()) || "Tunnel XConn".equalsIgnoreCase(allottedResource.getAllottedResourceType())) {
                         //set create flag to true
                         execution.setVariable("createTXCAR", true)
                         ModelInfo allottedResourceModelInfo = allottedResource.getModelInfo()
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustService.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustService.groovy
index aa16d3b280..08edb88c61 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustService.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DeleteVcpeResCustService.groovy
@@ -242,8 +242,8 @@ public class DeleteVcpeResCustService extends AbstractServiceTaskProcessor {
 					

 					if(isBlank(type) || isBlank(id)) {

 						

-					} else if(type == "TunnelXConn") {

-						utils.log("DEBUG","TunnelXConn AR found", isDebugEnabled)

+					} else if(type == "TunnelXConn" || type == "Tunnel XConn") {

+						utils.log("DEBUG","Tunnel XConn AR found", isDebugEnabled)

 						TXC_found = true

 						TXC_id = id

 						

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy
index a735121002..a8401d7a02 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy
@@ -469,7 +469,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 		verify(mex).setVariable("createTXCAR", true)
 		verify(mex).setVariable("allottedResourceModelInfoTXC", "modelB")
 		verify(mex).setVariable("allottedResourceRoleTXC", "TXCr")
-		verify(mex).setVariable("allottedResourceTypeTXC", "TunnelXConn")
+		verify(mex).setVariable("allottedResourceTypeTXC", "Tunnel XConn")
 		verify(mex).setVariable("parentServiceInstanceIdTXC", "homeB")
 	}
 			
@@ -489,7 +489,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 		verify(mex, never()).setVariable("createTXCAR", true)
 		verify(mex, never()).setVariable("allottedResourceModelInfoTXC", "modelB")
 		verify(mex, never()).setVariable("allottedResourceRoleTXC", "TXCr")
-		verify(mex, never()).setVariable("allottedResourceTypeTXC", "TunnelXConn")
+		verify(mex, never()).setVariable("allottedResourceTypeTXC", "Tunnel XConn")
 		verify(mex, never()).setVariable("parentServiceInstanceIdTXC", "homeB")
 	}
 			
@@ -1087,7 +1087,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 	private ServiceDecomposition initFilterVnfs(ExecutionEntity mex) {
 		List<VnfResource> vnflst = new LinkedList<>()
 		vnflst.add(makeVnf("", "BRG"))
-		vnflst.add(makeVnf("2", "TunnelXConn"))
+		vnflst.add(makeVnf("2", "Tunnel XConn"))
 		vnflst.add(makeVnf("3", ""))
 		vnflst.add(makeVnf("4", "BRG"))
 		vnflst.add(makeVnf("5", "other"))
@@ -1149,7 +1149,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 		HomingSolution home = mock(HomingSolution.class)
 		
 		when(ar.toJsonStringNoRootName()).thenReturn("json"+id)
-		when(ar.getAllottedResourceType()).thenReturn("TunnelXConn")
+		when(ar.getAllottedResourceType()).thenReturn("Tunnel XConn")
 		when(ar.getModelInfo()).thenReturn(mod)
 		when(ar.getAllottedResourceRole()).thenReturn("TXCr")
 		when(ar.getHomingSolution()).thenReturn(home)
@@ -1186,7 +1186,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase {
 		vnflst.add(makeVnf("A", "BRG"))
 		vnflst.add(makeVnf("B", ""))
 		vnflst.add(makeVnf("C", ""))
-		vnflst.add(makeVnf("D", "TunnelXConn"))
+		vnflst.add(makeVnf("D", "Tunnel XConn"))
 		
 		when(mex.getVariable(DBGFLAG)).thenReturn("true")
 		when(mex.getVariable("createVcpeServiceRequest")).thenReturn(request)
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/arGetById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/arGetById.xml
index bb7f4c20fd..f2063442d6 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/arGetById.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/arGetById.xml
@@ -1,9 +1,9 @@
 <allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
    <id>ar-1</id>
    <orchestration-status>Active</orchestration-status>
-   <role>TunnelXConn</role>
-   <type>TunnelXConn</type>
-   <description>TunnelXConn</description>
+   <role>Tunnel XConn</role>
+   <type>Tunnel XConn</type>
+   <description>Tunnel XConn</description>
    <selflink/>
    <resource-version>1490627351232</resource-version>
    <relationship-list>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json
index 81fdcc76d0..e99dd9ccda 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/getCatalogServiceResourcesData.json
@@ -63,8 +63,8 @@
 				"modelInstanceName"      : "Pri_IP_MUX_Demux 1"
 			},
 			"toscaNodeType"              : null,
-			"allottedResourceType"              : "TunnelXConn",
-			"allottedResourceRole"              : "TunnelXConn",
+			"allottedResourceType"              : "Tunnel XConn",
+			"allottedResourceRole"              : "Tunnel XConn",
 			"providingServiceModelInvariantUuid"              : null,
 			"nfFunction"              : null,
 			"nfType"              : null,
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetTXCById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetTXCById.xml
index 65cee9f662..97992fc00b 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetTXCById.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DeleteVcpeResCustService/arGetTXCById.xml
@@ -1,9 +1,9 @@
 <allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
    <id>ar-txcA</id>
    <orchestration-status>Active</orchestration-status>
-   <role>TunnelXConn</role>
-   <type>TunnelXConn</type>
-   <description>TunnelXConn</description>
+   <role>Tunnel XConn</role>
+   <type>Tunnel XConn</type>
+   <description>Tunnel XConn</description>
    <selflink/>
    <resource-version>1490627351232</resource-version>
    <relationship-list>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml
index bb7f4c20fd..f2063442d6 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXCRollback/arGetById.xml
@@ -1,9 +1,9 @@
 <allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
    <id>ar-1</id>
    <orchestration-status>Active</orchestration-status>
-   <role>TunnelXConn</role>
-   <type>TunnelXConn</type>
-   <description>TunnelXConn</description>
+   <role>Tunnel XConn</role>
+   <type>Tunnel XConn</type>
+   <description>Tunnel XConn</description>
    <selflink/>
    <resource-version>1490627351232</resource-version>
    <relationship-list>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceTXC/arGetById.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceTXC/arGetById.xml
index bb7f4c20fd..f2063442d6 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceTXC/arGetById.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoDeleteAllottedResourceTXC/arGetById.xml
@@ -1,9 +1,9 @@
 <allotted-resource xmlns="http://org.openecomp.aai.inventory/v9">
    <id>ar-1</id>
    <orchestration-status>Active</orchestration-status>
-   <role>TunnelXConn</role>
-   <type>TunnelXConn</type>
-   <description>TunnelXConn</description>
+   <role>Tunnel XConn</role>
+   <type>Tunnel XConn</type>
+   <description>Tunnel XConn</description>
    <selflink/>
    <resource-version>1490627351232</resource-version>
    <relationship-list>