Accommodate WAN Networking

checked and evaluated naming policy only if infra bonding.
Updated workflowAction to include vrf configuration for vpn-binding in
resourceIds list.
added in linked resource to service proxy cust
committing the asdc controller classpath change
added some unit tests for vrf validation and updated bbinput setup test
update config resource cust foreign key mapping
Moved mockbean for AssignVrfConfiguration task class into BaseBpmnTest.
added in a check to see if list is empty before access
added unit tests for bbinput setup for vrf config
Update AssignFlows enum with correct AssignVrfConfiguration flow name

Change-Id: Ibf14e36505638b19c1366ecebfce560c02e69e44
Issue-ID: SO-1975
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

6 files changed, 50 insertions, 8 deletions

diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest1SP.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest1SP.json
index 27463350ab..31e6fd5f53 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest1SP.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest1SP.json
@@ -32,7 +32,7 @@
         "modelVersion" : "testProxyModelVersion1",
         "modelInvariantId" : "testProxyModelInvariantUuid1"
       },
-      "requiredCandidates" : [ {
+      "filteringAttributes" : [ {
         "identifierType" : "cloudRegionId",
         "identifiers" : [ "testCloudRegionId" ],
         "cloudOwner" : "att"
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/aaiNetworkWrapper.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/aaiNetworkWrapper.json
new file mode 100644
index 0000000000..aaa2c4ba35
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/aaiNetworkWrapper.json
@@ -0,0 +1,42 @@
+{
+	"networkId": "0384d743-f69b-4cc8-9aa8-c3ae66662c44",
+	"networkName": "Dev_Bindings_1802_020118",
+	"networkType": "CONTRAIL30_BASIC",
+	"networkRole": "GN_EVPN_direct",
+	"networkTechnology": "contrail",
+	"neutronNetworkId": "1112b912-0e00-4d6d-9392-014e106399ee",
+	"isBoundToVpn": true,
+	"serviceId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+	"networkRoleInstance": 0,
+	"resourceVersion": "1517496965485",
+	"orchestrationStatus": "Active",
+	"heatStackId": "Dev_Bindings_1802_020118/06c2445f-1ca1-4ad8-be08-454c4de443bb",
+	"contrailNetworkFqdn": "default-domain:ECOMP_MSO_DND:Dev_Bindings_1802_020118",
+	"physicalNetworkName": "tbd",
+	"isProviderNetwork": false,
+	"isSharedNetwork": true,
+	"isExternalNetwork": false,
+	"relationshipList": {
+		"relationship": [
+			{
+				"relatedTo": "vpn-binding",
+				"relatedLink": "/aai/v11/network/vpn-bindings/vpn-binding/9a7b327d9-287aa00-82c4b0-100001",
+				"relationshipData": [
+					{
+						"relationshipKey": "vpn-binding.vpn-id",
+						"relationshipValue": "9a7b327d9-287aa00-82c4b0-100001"
+					}
+				],
+				"relatedToProperty": [
+					{
+						"propertyKey": "vpn-binding.vpn-name",
+						"propertyValue": "MSO_VPN_TEST"
+					},
+					{
+						"propertyKey": "vpn-binding.vpn-type"
+					}
+				]
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/CreateNetworkCollection.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/CreateNetworkCollection.json
index 579075f502..692ecfdf75 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/CreateNetworkCollection.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/CreateNetworkCollection.json
@@ -4,7 +4,7 @@
 			"modelType": "service",
 			"modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b",
 			"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
-			"modelName": "MOW AVPN vMX BV vPE 1 Service",
+			"modelName": "Sample Service Model",
 			"modelVersion": "10"
 		},
 		"cloudConfiguration": {
@@ -35,7 +35,7 @@
 				{
 					"service": {
 						"modelInfo": {
-							"modelName": "MOW AVPN vMX BV vPE 1 Service",
+							"modelName": "Sample Service Model",
 							"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a"
 						},
 						"instanceParams": [],
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroActivateDeleteUnassign.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroActivateDeleteUnassign.json
index 26838024da..5753f69d3f 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroActivateDeleteUnassign.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroActivateDeleteUnassign.json
@@ -4,7 +4,7 @@
 			"modelType": "service",
 			"modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b",
 			"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
-			"modelName": "MOW AVPN vMX BV vPE 1 Service",
+			"modelName": "Sample Service Model",
 			"modelVersion": "10.0"
 		},
 		"cloudConfiguration": {
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssign.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssign.json
index ddb118ea49..39e87f19f1 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssign.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssign.json
@@ -4,7 +4,7 @@
 			"modelType": "service",
 			"modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b",
 			"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
-			"modelName": "MOW AVPN vMX BV vPE 1 Service",
+			"modelName": "Sample Service Model",
 			"modelVersion": "10.0"
 		},
 		"cloudConfiguration": {
@@ -34,7 +34,7 @@
 					"service": {
 						"modelInfo": {
 							"modelType": "service",
-							"modelName": "MOW AVPN vMX BV vPE 1 Service",
+							"modelName": "Sample Service Model",
 							"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a"
 						},
 						"instanceParams": [],
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssignNoCloud.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssignNoCloud.json
index 51caddd48a..b86a2a28f6 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssignNoCloud.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/Macro/ServiceMacroAssignNoCloud.json
@@ -4,7 +4,7 @@
 			"modelType": "service",
 			"modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b",
 			"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
-			"modelName": "MOW AVPN vMX BV vPE 1 Service",
+			"modelName": "Sample Service Model",
 			"modelVersion": "10.0"
 		},
 		"owningEntity": {
@@ -31,7 +31,7 @@
 					"service": {
 						"modelInfo": {
 							"modelType": "service",
-							"modelName": "MOW AVPN vMX BV vPE 1 Service",
+							"modelName": "Sample Service Model",
 							"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a"
 						},
 						"instanceParams": [],