AT&T 1712 and 1802 release code

This is code from AT&T's 1712 and 1802 releases.

Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04
Issue-ID: SO-425
Signed-off-by: Rob Daugherty <rd472p@att.com>

5 files changed, 401 insertions, 13 deletions

diff --git a/bpmn/MSOCoreBPMN/src/test/resources/camunda.cfg.xml b/bpmn/MSOCoreBPMN/src/test/resources/camunda.cfg.xml
index 3fa222988c..bc218f0125 100644
--- a/bpmn/MSOCoreBPMN/src/test/resources/camunda.cfg.xml
+++ b/bpmn/MSOCoreBPMN/src/test/resources/camunda.cfg.xml
@@ -19,14 +19,6 @@
 
     <property name="history" value="full" />
 
-    <property name="customPostBPMNParseListeners">
-      <list>
-        <bean class="org.camunda.bpm.engine.impl.bpmn.parser.FoxFailedJobParseListener" />
-      </list>
-    </property>
-
-    <property name="failedJobCommandFactory" ref="foxFailedJobCommandFactory" />
-
     <!--<property name="idGenerator" ref="uuidGenerator" />-->
 
     <!-- engine plugins -->
@@ -46,8 +38,6 @@
   <!-- Needed until all subflows generate MSOWorkflowException events -->
   <bean id="workflowExceptionPlugin" class="org.openecomp.mso.bpmn.core.plugins.WorkflowExceptionPlugin" />
   
-  <bean id="foxFailedJobCommandFactory" class="org.camunda.bpm.engine.impl.jobexecutor.FoxFailedJobCommandFactory" />
-
   <!--<bean id="uuidGenerator" class="org.camunda.bpm.engine.impl.persistence.StrongUuidGenerator" />-->
 
   <!-- engine plugin beans -->
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SDNCServiceResponseExample.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SDNCServiceResponseExample.json
new file mode 100644
index 0000000000..aefdfa8685
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SDNCServiceResponseExample.json
@@ -0,0 +1,10 @@
+{
+	"SDNCServiceResponse": {
+		"responseCode": "200",
+		"ackFinalIndicator": "Y",
+		"params": {
+			"e2e-vpn-key": "my-key"
+		},
+		"sdncRequestId": "my-id"
+	}
+}
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json
new file mode 100644
index 0000000000..838bcd85a7
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/resources/json-examples/SNIROExample.json
@@ -0,0 +1,163 @@
+{
+	"solutionInfo": {
+		"licenseInfo": [
+			{
+				"resourceModuleName": "vHNF for DHV Test_1 0",
+				"serviceResourceId": "eb05bdec-e815-40cd-99dd-7175f462d2ba",
+				"licenseKeyGroupList": [],
+				"entitlementPoolList": [
+					"92718B2A0F91410B912F2A2C87AAA307",
+					"1EEF79979AD14EE498D31A7EF9DC9004"
+				]
+			}
+		],
+		"placementInfo": [
+			{
+				"assignmentInfo": [
+					{
+						"variableValue": "FRNKGE1A10",
+						"variableName": "aicClli"
+					},
+					{
+						"variableValue": "3.0",
+						"variableName": "aicVersion"
+					},
+					{
+						"variableValue": "att-aic",
+						"variableName": "cloudOwner"
+					}
+				],
+				"inventoryType": "cloud",
+				"resourceModuleName": "Primary IP_Mux_Demux updated_1 0",
+				"serviceResourceId": "7d3d786b-ce6d-4498-813e-3e3028aebea8",
+				"cloudRegionId": "fnkge1a",
+				"serviceInstanceId": ""
+			},
+			{
+				"assignmentInfo": [
+					{
+						"variableValue": "MDTWNJ2B12",
+						"variableName": "aicClli"
+					},
+					{
+						"variableValue": "vig20004vm002vig001",
+						"variableName": "vnfHostName"
+					},
+					{
+						"variableValue": "3.0",
+						"variableName": "aicVersion"
+					},
+					{
+						"variableValue": "att-aic",
+						"variableName": "cloudOwner"
+					},
+					{
+						"variableValue": "vig20004vm002vig001",
+						"variableName": "vnfHostName"
+					}
+				],
+				"inventoryType": "service",
+				"resourceModuleName": "Primary Tunnel_XConn for DHV Testing_1 0",
+				"serviceResourceId": "98fe07e7-4d9c-4f93-8138-18563c05a047",
+				"cloudRegionId": "mtrnj1b",
+				"serviceInstanceId": "519630c1-9b5c-45fb-8b84-3500ead7d77e"
+			},
+			{
+				"assignmentInfo": [
+					{
+						"variableValue": "FRNKGE1A10",
+						"variableName": "aicClli"
+					},
+					{
+						"variableValue": "3.0",
+						"variableName": "aicVersion"
+					},
+					{
+						"variableValue": "att-aic",
+						"variableName": "cloudOwner"
+					}
+				],
+				"inventoryType": "cloud",
+				"resourceModuleName": "Secondary Service_Admin for DHV Test_1 1",
+				"serviceResourceId": "9a1abd7e-5afc-4e85-8f27-251454452350",
+				"cloudRegionId": "fnkge1a",
+				"serviceInstanceId": ""
+			},
+			{
+				"assignmentInfo": [
+					{
+						"variableValue": "FRNKGE1B10",
+						"variableName": "aicClli"
+					},
+					{
+						"variableValue": "3.0",
+						"variableName": "aicVersion"
+					},
+					{
+						"variableValue": "att-aic",
+						"variableName": "cloudOwner"
+					}
+				],
+				"inventoryType": "cloud",
+				"resourceModuleName": "Primary Service_Admin for DHV Test_1 0",
+				"serviceResourceId": "11f557a2-72e3-4977-b2a3-5bf5d73e581c",
+				"cloudRegionId": "frkge1b",
+				"serviceInstanceId": ""
+			},
+			{
+				"assignmentInfo": [
+					{
+						"variableValue": "MDTWNJ2A22",
+						"variableName": "aicClli"
+					},
+					{
+						"variableValue": "vig20004vm001vig001",
+						"variableName": "vnfHostName"
+					},
+					{
+						"variableValue": "1.0",
+						"variableName": "aicVersion"
+					},
+					{
+						"variableValue": "att-aic",
+						"variableName": "cloudOwner"
+					},
+					{
+						"variableValue": "vig20004vm001vig001",
+						"variableName": "vnfHostName"
+					}
+				],
+				"inventoryType": "service",
+				"resourceModuleName": "Secondary Tunnel_XConn for DHV Testing_1 1",
+				"serviceResourceId": "73f1b218-a062-43de-82ae-98682ca78392",
+				"cloudRegionId": "mtrn2",
+				"serviceInstanceId": "7b594c13-6b72-41bd-893a-2656f5dbb87a"
+			},
+			{
+				"assignmentInfo": [
+					{
+						"variableValue": "FRNKGE1B10",
+						"variableName": "aicClli"
+					},
+					{
+						"variableValue": "3.0",
+						"variableName": "aicVersion"
+					},
+					{
+						"variableValue": "att-aic",
+						"variableName": "cloudOwner"
+					}
+				],
+				"inventoryType": "cloud",
+				"resourceModuleName": "Secondary IP_Mux_Demux updated_1 1",
+				"serviceResourceId": "20901d7f-4864-454b-99f1-5239fc353cfc",
+				"cloudRegionId": "frkge1b",
+				"serviceInstanceId": ""
+			}
+		]
+	},
+	"requestId": "90462920-208a-4e5e-bdf3-fcbe0454dde6",
+	"statusMessage": "",
+	"requestState": "done",
+	"transactionId": ""
+}
\ No newline at end of file
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/requestArray.json b/bpmn/MSOCoreBPMN/src/test/resources/requestArray.json
index 238128865b..97a6359345 100644
--- a/bpmn/MSOCoreBPMN/src/test/resources/requestArray.json
+++ b/bpmn/MSOCoreBPMN/src/test/resources/requestArray.json
@@ -7,10 +7,10 @@
     },
     "modelInfo": {
       "modelType": "service",
-      "modelId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-      "modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+      "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+      "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
       "modelName": "UCPE",
-      "modelVersion": 1
+      "modelVersion": "1"
     },
     "subscriberInfo": {
       "globalSubscriberId": "83031",
diff --git a/bpmn/MSOCoreBPMN/src/test/resources/requestSchema.json b/bpmn/MSOCoreBPMN/src/test/resources/requestSchema.json
new file mode 100644
index 0000000000..113528784b
--- /dev/null
+++ b/bpmn/MSOCoreBPMN/src/test/resources/requestSchema.json
@@ -0,0 +1,225 @@
+{
+   "$schema":"http://json-schema.org/draft-03/schema#",
+   "type":"object",
+   "properties":{
+      "requestDetails":{
+         "properties":{
+            "modelInfo":{
+               "type":"object",
+               "required":true,
+               "properties":{
+                  "modelCustomizationId":{
+                     "type":"string",
+                     "pattern":"^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
+                     "required":false
+                  },
+                  "modelCustomizationName":{
+                     "type":"string",
+                     "required":false
+                  },
+                  "modelInvariantId":{
+                     "type":"string",
+                     "pattern":"^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
+                     "required":true
+                  },
+                  "modelVersionId":{
+                     "type":"string",
+                     "pattern":"^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
+                     "required":true
+                  },
+                  "modelName":{
+                     "type":"string",
+                     "required":true
+                  },
+                  "modelType":{
+                     "type":"string",
+                     "enum":[
+                        "service"
+                     ],
+                     "required":true
+                  },
+                  "modelVersion":{
+                     "type":"string",
+                     "required":true
+                  }
+               }
+            },
+            "requestInfo":{
+               "type":"object",
+               "required":true,
+               "properties":{
+                  "billingAccountNumber":{
+                     "type":"string",
+                     "required":false
+                  },
+                  "callbackUrl":{
+                     "type":"string",
+                     "required":true
+                  },
+                  "correlator":{
+                     "type":"string",
+                     "required":false
+                  },
+                  "instanceName":{
+                     "type":"string",
+                     "required":true
+                  },
+                  "orderNumber":{
+                     "type":"string",
+                     "required":false
+                  },
+                  "orderVersion":{
+                     "type":"number",
+                     "required":false
+                  },
+                  "productFamilyId":{
+                     "type":"string",
+                     "required":false
+                  },
+                  "source":{
+                     "type":"string",
+                     "required":true
+                  },
+                  "suppressRollback":{
+                     "type":"boolean",
+                     "required":false
+                  }
+               }
+            },
+            "subscriberInfo":{
+               "type":"object",
+               "required":true,
+               "properties":{
+                  "globalSubscriberId":{
+                     "type":"string",
+                     "required":true
+                  },
+                  "subscriberCommonSiteId":{
+                     "type":"string",
+                     "required":false
+                  },
+                  "subscriberName":{
+                     "type":"string",
+                     "required":true
+                  }
+               }
+            },
+            "requestParameters":{
+               "type":"object",
+               "required":true,
+               "properties":{
+                  "ucpeInfo":{
+                     "type":"object",
+                     "required":true,
+                     "properties":{
+                        "internetTopology":{
+                           "type":"string",
+                           "enum":[
+                              "IVLAN",
+                              "LAN",
+                              "WAN"
+                           ],
+                           "required":true
+                        },
+                        "outOfBandManagementModem":{
+                           "type":"string",
+                           "required":false
+                        },
+                        "ucpeActivationCode":{
+                           "type":"string",
+                           "required":true
+                        },
+                        "ucpeAliasHostName":{
+                           "type":"string",
+                           "required":false
+                        },
+                        "ucpeHostName":{
+                           "type":"string",
+                           "required":true
+                        },
+                        "ucpePartNumber":{
+                           "type":"string",
+                           "required":true
+                        },
+                        "wanList":{
+                           "type":"array",
+                           "required":true,
+                           "items":{
+                              "type":"object",
+                              "required":true,
+                              "properties":{
+                                 "wanInfo":{
+                                    "type":"object",
+                                    "required":true,
+                                    "properties":{
+                                       "circuitId":{
+                                          "type":"string",
+                                          "required":false
+                                       },
+                                       "dualMode":{
+                                          "type":"string",
+                                          "enum":[
+                                             "Active",
+                                             "Standby"
+                                          ],
+                                          "required":false
+                                       },
+                                       "interfaceType":{
+                                          "type":"string",
+                                          "required":false
+                                       },
+                                       "mediaType":{
+                                          "type":"string",
+                                          "enum":[
+                                             "ELECTRICAL",
+                                             "MMF",
+                                             "SMF"
+                                          ],
+                                          "required":false
+                                       },
+                                       "transportManagementOption":{
+                                          "type":"string",
+                                          "required":false
+                                       },
+                                       "transportProviderName":{
+                                          "type":"string",
+                                          "required":false
+                                       },
+                                       "transportVendorTotalBandwidth":{
+                                          "type":"string",
+                                          "required":false
+                                       },
+                                       "wanPortNumber":{
+                                          "type":"string",
+                                          "enum":[
+                                             "WAN1",
+                                             "WAN2"
+                                          ],
+                                          "required":true
+                                       },
+                                       "wanType":{
+                                          "type":"string",
+                                          "enum":[
+                                             "3RDPARTYINTERNET",
+                                             "AVPN",
+                                             "AVPNIVLAN",
+                                             "GMIS",
+                                             "HSIA-E",
+                                             "MIS",
+                                             "PREMISESROUTER"
+                                          ],
+                                          "required":true
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+                        }
+                     }
+                  }
+               }
+            }
+         }
+      }
+   }
+}
\ No newline at end of file