Merge from ECOMP's repository

Main Features
--------------

-  Async-Instantiation jobs mechanism major update; still WIP (package
   `org.onap.vid.job`)

-  New features in View/Edit: Activate fabric configuration; show
   related networks; soft delete

-  Support AAI service-tree traversal (`AAIServiceTree`)

-  In-memory cache for SDC models and certain A&AI queries
   (`CacheProviderWithLoadingCache`)

-  Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
   models

-  Resolve Cloud-Owner values for MSO

-  Pass X-ONAP headers to MSO

Infrastructure
--------------
-  Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
-  Surefire invokes both TestNG and JUnit tests
-  Support Kotlin source files
-  AaiController2 which handles errors in a "Spring manner"
-  Inline generated-sources and remove jsonschema2pojo

Quality
--------
-  Cumulative bug fixes (A&AI API, UI timeouts, and many more)
-  Many Sonar issues cleaned-up
-  Some unused classes removed
-  Minor changes in vid-automation project, allowing some API
   verification to run

Hard Merges
------------
-  HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
-  Moved `package org.onap.vid.controllers` to `controller`, without
   plural -- just to keep semantic sync with ECOMP.

Reference commit in ECOMP: 3d1141625

Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>

20 files changed, 654 insertions, 31 deletions

diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_deletion_request.json b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_deletion_request.json
new file mode 100644
index 000000000..55a57e195
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_deletion_request.json
@@ -0,0 +1,19 @@
+{
+	"requestDetails": {
+		"modelInfo": {
+			"modelType": "service",
+			"modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b",
+			"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
+			"modelName": "MOW AVPN vMX BV vPE 1 Service",
+			"modelVersion": "10.0"
+		},
+		"requestInfo": {
+			"source": "VID",
+			"requestorId": "az2016"
+		},
+		"requestParameters": {
+			"testApi": "VNF_API",
+			"aLaCarte": true
+		}
+	}
+}
\ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request.json b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request.json
new file mode 100644
index 000000000..955685268
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request.json
@@ -0,0 +1,34 @@
+{
+	"requestDetails": {
+		"modelInfo": {
+			"modelType": "service",
+			"modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b",
+			"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
+			"modelName": "MOW AVPN vMX BV vPE 1 Service",
+			"modelVersion": "10.0"
+		},
+		"owningEntity": {
+			"owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489",
+			"owningEntityName": "PACKET CORE"
+		},
+		"project": {
+			"projectName": "{some project name}"
+		},
+		"subscriberInfo": {
+			"globalSubscriberId": "{some subscriber id}"
+		},
+		"requestInfo": {
+			"instanceName": "vPE_Service",
+			"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+			"source": "VID",
+			"suppressRollback": true,
+			"requestorId": "az2016"
+		},
+		"requestParameters": {
+			"testApi": "VNF_API",
+			"subscriptionServiceType": "VMX",
+			"aLaCarte": true,
+			"userParams": []
+		}
+	}
+}
\ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request_naming_false.json b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request_naming_false.json
new file mode 100644
index 000000000..be697ed88
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request_naming_false.json
@@ -0,0 +1,32 @@
+{
+  "requestDetails": {
+    "modelInfo": {
+      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b",
+      "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
+      "modelName": "MOW AVPN vMX BV vPE 1 Service",
+      "modelType": "service",
+      "modelVersion": "10.0"
+    },
+    "owningEntity": {
+      "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489",
+      "owningEntityName": "PACKET CORE"
+    },
+    "subscriberInfo": {
+      "globalSubscriberId": "{some subscriber id}"
+    },
+    "project": {
+      "projectName": "{some project name}"
+    },
+    "requestInfo": {
+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+      "source": "VID",
+      "suppressRollback": false,
+      "requestorId": "az2016"
+    },
+    "requestParameters": {
+      "subscriptionServiceType": "VMX",
+      "aLaCarte": true,
+      "userParams": []
+    }
+  }
+}
\ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request.json b/vid-app-common/src/test/resources/payload_jsons/bulk_macro_service_request.json
index 27a4abbdb..917900c22 100644
--- a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request.json
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_macro_service_request.json
@@ -15,6 +15,7 @@
 			"projectName": "{some project name}"
 		},
 		"subscriberInfo": {
+			"subscriberName" : "{some subscriber name}",
 			"globalSubscriberId": "{some subscriber id}"
 		},
 		"requestInfo": {
@@ -50,6 +51,7 @@
 							},
 							"cloudConfiguration": {
 								"lcpCloudRegionId": "mdt1",
+								"cloudOwner": "att-aic",
 								"tenantId": "88a6ca3ee0394ade9403f075db23167e"
 							},
 							"platform": {
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json
index 59e546774..55765a86b 100644
--- a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json
@@ -48,6 +48,7 @@
 							},
 							"cloudConfiguration": {
 								"lcpCloudRegionId": "mdt1",
+								"cloudOwner": "att-aic",
 								"tenantId": "88a6ca3ee0394ade9403f075db23167e"
 							},
 							"platform": {
@@ -57,9 +58,14 @@
 								"lineOfBusinessName": "lineOfBusinessName"
 							},
 							"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-							"instanceParams": [],
+							"instanceParams": [{
+                              "vmx_int_net_len": "24",
+                              "availability_zone_0": "mtpocdv-kvm-az01",
+                              "vre_a_volume_size_0": "100"
+							}],
 							"vfModules": [{
                               "modelInfo": {
+                                "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_base_vPE_BV..module-0",
                                 "modelType": "vfModule",
                                 "modelName": "201673MowAvpnVpeBvL..AVPN_base_vPE_BV..module-0",
                                 "modelVersionId": "4c75f813-fa91-45a4-89d0-790ff5f1ae79",
@@ -71,6 +77,7 @@
                             },
                               {
                                 "modelInfo": {
+                                  "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
                                   "modelType": "vfModule",
                                   "modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
                                   "modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json
index d1af5ab1a..fdc81511c 100644
--- a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json
@@ -48,6 +48,7 @@
 							},
 							"cloudConfiguration": {
 								"lcpCloudRegionId": "mdt1",
+								"cloudOwner": "att-aic",
 								"tenantId": "88a6ca3ee0394ade9403f075db23167e"
 							},
 							"platform": {
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json
index 314c3bb7e..643c1043a 100644
--- a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json
@@ -18,7 +18,7 @@
 			"globalSubscriberId": "{some subscriber id}"
 		},
 		"requestInfo": {
-			"instanceName": "vPE_Service_{SERVICE_UNIQENESS}",
+			"instanceName": "vPE_Service{SERVICE_UNIQENESS}",
 			"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
 			"source": "VID",
 			"suppressRollback": true,
@@ -34,7 +34,7 @@
 						"modelName": "MOW AVPN vMX BV vPE 1 Service",
 						"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a"
 					},
-					"instanceName": "vPE_Service_{SERVICE_UNIQENESS}",
+					"instanceName": "vPE_Service{SERVICE_UNIQENESS}",
 					"instanceParams": [{
 						"instanceParams_test1": "some text",
 						"instanceParams_test2": "another text"
@@ -50,6 +50,7 @@
 							},
 							"cloudConfiguration": {
 								"lcpCloudRegionId": "mdt1",
+								"cloudOwner": "att-aic",
 								"tenantId": "88a6ca3ee0394ade9403f075db23167e"
 							},
 							"platform": {
@@ -59,29 +60,35 @@
 								"lineOfBusinessName": "lineOfBusinessName"
 							},
 							"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-							"instanceName": "vmxnjr001_{VNF_UNIQENESS}",
-							"instanceParams": [],
+							"instanceName": "vmxnjr001{VNF_UNIQENESS}",
+							"instanceParams": [{
+                              "vmx_int_net_len": "24",
+                              "availability_zone_0": "mtpocdv-kvm-az01",
+                              "vre_a_volume_size_0": "100"
+                            }],
 							"vfModules": [{
                               "modelInfo": {
+                                "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_base_vPE_BV..module-0",
                                 "modelType": "vfModule",
                                 "modelName": "201673MowAvpnVpeBvL..AVPN_base_vPE_BV..module-0",
                                 "modelVersionId": "4c75f813-fa91-45a4-89d0-790ff5f1ae79",
                                 "modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f"
                               },
-                              "instanceName": "vmxnjr001_AVPN_base_vPE_BV_base_{VF_MODULE_UNIQENESS}",
+                              "instanceName": "vmxnjr001_AVPN_base_vPE_BV_base{VF_MODULE_UNIQENESS}",
                               "instanceParams": [{
                                 "vmx_int_net_len": "24"
                               }]
                             },
                               {
                                 "modelInfo": {
+                                  "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
                                   "modelType": "vfModule",
                                   "modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
                                   "modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
                                   "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8"
                                 },
-                                "instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion_{VF_MODULE_2_UNIQENESS}",
-                                "volumeGroupInstanceName" : "myVgName_{VG_UNIQUENESS}",
+                                "instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion{VF_MODULE_2_UNIQENESS}",
+                                "volumeGroupInstanceName" : "myVgName{VG_UNIQUENESS}",
                                 "instanceParams": [{
                                   "availability_zone_0": "mtpocdv-kvm-az01",
                                   "vre_a_volume_size_0": "100"
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request.json b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request.json
new file mode 100644
index 000000000..d7b6d8629
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request.json
@@ -0,0 +1,48 @@
+ {
+   "requestDetails": {
+     "modelInfo": {
+       "modelType": "vnf",
+       "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+       "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+       "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+       "modelVersion": "10.0",
+       "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+       "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+     },
+     "cloudConfiguration": {
+       "lcpCloudRegionId": "mdt1",
+       "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+       "cloudOwner" : "att-aic"
+     },
+     "requestInfo": {
+       "instanceName": "vmxnjr001_001",
+       "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+       "source": "VID",
+       "suppressRollback": true,
+       "requestorId": "pa0916"
+     },
+     "platform": {
+       "platformName": "platformName"
+     },
+     "lineOfBusiness": {
+       "lineOfBusinessName": "lineOfBusinessName"
+     },
+       "relatedInstanceList": [
+          {
+             "relatedInstance": {
+                "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+                "modelInfo": {
+                   "modelType": "service",
+                   "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+                   "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+                   "modelName": "sriov",
+                   "modelVersion": "1.0"
+                }
+             }
+          }
+       ],
+       "requestParameters": {
+             "userParams": []
+       }
+   }
+ }
\ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_cloud_owner.json b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_cloud_owner.json
new file mode 100644
index 000000000..00f224e9e
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_cloud_owner.json
@@ -0,0 +1,47 @@
+ {
+   "requestDetails": {
+     "modelInfo": {
+       "modelType": "vnf",
+       "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+       "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+       "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+       "modelVersion": "10.0",
+       "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+       "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+     },
+     "cloudConfiguration": {
+       "lcpCloudRegionId": "mdt1",
+       "tenantId": "88a6ca3ee0394ade9403f075db23167e"
+     },
+     "requestInfo": {
+       "instanceName": "vmxnjr001_001",
+       "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+       "source": "VID",
+       "suppressRollback": true,
+       "requestorId": "pa0916"
+     },
+     "platform": {
+       "platformName": "platformName"
+     },
+     "lineOfBusiness": {
+       "lineOfBusinessName": "lineOfBusinessName"
+     },
+       "relatedInstanceList": [
+          {
+             "relatedInstance": {
+                "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+                "modelInfo": {
+                   "modelType": "service",
+                   "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+                   "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+                   "modelName": "sriov",
+                   "modelVersion": "1.0"
+                }
+             }
+          }
+       ],
+       "requestParameters": {
+             "userParams": []
+       }
+   }
+ }
\ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_instance_name.json b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_instance_name.json
new file mode 100644
index 000000000..9921de59b
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_instance_name.json
@@ -0,0 +1,47 @@
+{
+  "requestDetails": {
+    "modelInfo": {
+      "modelType": "vnf",
+      "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+      "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+      "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+      "modelVersion": "10.0",
+      "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+      "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+    },
+    "cloudConfiguration": {
+      "lcpCloudRegionId": "mdt1",
+      "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+      "cloudOwner": "att-aic"
+    },
+    "requestInfo": {
+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+      "source": "VID",
+      "suppressRollback": true,
+      "requestorId": "pa0916"
+    },
+    "platform": {
+      "platformName": "platformName"
+    },
+    "lineOfBusiness": {
+      "lineOfBusinessName": "lineOfBusinessName"
+    },
+    "relatedInstanceList": [
+      {
+        "relatedInstance": {
+          "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+          "modelInfo": {
+            "modelType": "service",
+            "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+            "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+            "modelName": "sriov",
+            "modelVersion": "1.0"
+          }
+        }
+      }
+    ],
+    "requestParameters": {
+      "userParams": []
+    }
+  }
+}
\ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/instance_group_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/instance_group_instantiation_request.json
new file mode 100644
index 000000000..7072d3213
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/instance_group_instantiation_request.json
@@ -0,0 +1,36 @@
+ {
+   "requestDetails": {
+     "modelInfo": {
+       "modelType": "instanceGroup",
+       "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+       "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+       "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+       "modelVersion": "10.0",
+       "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+       "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+     },
+     "requestInfo": {
+       "instanceName": "VNF_GROUP_NAME_001",
+       "source": "VID",
+       "suppressRollback": true,
+       "requestorId": "az2018"
+     },
+     "relatedInstanceList": [
+        {
+           "relatedInstance": {
+              "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+              "modelInfo": {
+                 "modelType": "service",
+                 "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+                 "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+                 "modelName": "sriov",
+                 "modelVersion": "1.0"
+              }
+           }
+        }
+     ],
+     "requestParameters": {
+           "userParams": []
+     }
+   }
+ }
\ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request.json
new file mode 100644
index 000000000..5a722ac4c
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request.json
@@ -0,0 +1,48 @@
+ {
+   "requestDetails": {
+     "modelInfo": {
+       "modelType": "network",
+       "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+       "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+       "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+       "modelVersion": "10.0",
+       "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+       "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+     },
+     "cloudConfiguration": {
+       "lcpCloudRegionId": "mdt1",
+       "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+       "cloudOwner" : "att-aic"
+     },
+     "requestInfo": {
+       "instanceName": "vmxnjr001_001",
+       "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+       "source": "VID",
+       "suppressRollback": true,
+       "requestorId": "pa0916"
+     },
+     "platform": {
+       "platformName": "platformName"
+     },
+     "lineOfBusiness": {
+       "lineOfBusinessName": "lineOfBusinessName"
+     },
+       "relatedInstanceList": [
+          {
+             "relatedInstance": {
+                "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+                "modelInfo": {
+                   "modelType": "service",
+                   "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+                   "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+                   "modelName": "sriov",
+                   "modelVersion": "1.0"
+                }
+             }
+          }
+       ],
+       "requestParameters": {
+             "userParams": []
+       }
+   }
+ }
\ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request_without_instance_name.json b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request_without_instance_name.json
new file mode 100644
index 000000000..db55736c4
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request_without_instance_name.json
@@ -0,0 +1,47 @@
+ {
+   "requestDetails": {
+     "modelInfo": {
+       "modelType": "network",
+       "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+       "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+       "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+       "modelVersion": "10.0",
+       "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+       "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+     },
+     "cloudConfiguration": {
+       "lcpCloudRegionId": "mdt1",
+       "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+       "cloudOwner" : "att-aic"
+     },
+     "requestInfo": {
+       "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+       "source": "VID",
+       "suppressRollback": true,
+       "requestorId": "pa0916"
+     },
+     "platform": {
+       "platformName": "platformName"
+     },
+     "lineOfBusiness": {
+       "lineOfBusinessName": "lineOfBusinessName"
+     },
+       "relatedInstanceList": [
+          {
+             "relatedInstance": {
+                "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+                "modelInfo": {
+                   "modelType": "service",
+                   "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+                   "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+                   "modelName": "sriov",
+                   "modelVersion": "1.0"
+                }
+             }
+          }
+       ],
+       "requestParameters": {
+             "userParams": []
+       }
+   }
+ }
\ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayload.json b/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayload.json
index c509c6247..b846d50c3 100644
--- a/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayload.json
+++ b/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayload.json
@@ -10,8 +10,7 @@
             "modelInvariantId": "c9817f08-07b2-458b-a02f-cd5407ee7a7b",
             "modelVersionId": "0e0bb964-e687-4439-9a9e-de9cd1ff5367",
             "modelName": "ws-service",
-            "modelVersion": "1.0",
-            "additionalProperties": {}
+            "modelVersion": "1.0"
           }
         }
       },
@@ -25,16 +24,14 @@
             "modelName": "ws-sp",
             "modelVersion": "1.0",
             "modelCustomizationName": "ws-sp 0",
-            "modelCustomizationId": "5815868c-35f8-4c5a-b899-e6eb49f52986",
-            "additionalProperties": {}
+            "modelCustomizationId": "5815868c-35f8-4c5a-b899-e6eb49f52986"
           }
         }
       }
     ],
     "cloudConfiguration": {
       "lcpCloudRegionId": "RegionOne",
-      "tenantId": "1e097c6713e74fd7ac8e4295e605ee1e",
-      "additionalProperties": {}
+      "tenantId": "1e097c6713e74fd7ac8e4295e605ee1e"
     },
     "modelInfo": {
       "modelCustomizationName": "WsSp..base_ws..module-0",
@@ -44,18 +41,15 @@
       "modelName": "WsSp..base_ws..module-0",
       "modelNameVersionId": null,
       "modelType": "vfModule",
-      "modelVersion": "1",
-      "additionalProperties": {}
+      "modelVersion": "1"
     },
     "requestInfo": {
       "instanceName": "ws-test-0310-8_NaN",
       "source": "VID",
       "suppressRollback": false,
-      "requestorId": "demo",
-      "additionalProperties": {}
+      "requestorId": "demo"
     },
     "requestParameters": {
-      "additionalProperties": {}
     },
     "configurationParameters": [
       {
@@ -63,5 +57,4 @@
         "xtz-123": "$.vnf-topology.vnf-resource-assignments.availability-zones.availability-zone[0]"
       }
     ]
-  }
 }
\ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json b/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json
index ddbebac95..d46db77fd 100644
--- a/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json
+++ b/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json
@@ -9,8 +9,7 @@
             "modelInvariantId": "c9817f08-07b2-458b-a02f-cd5407ee7a7b",
             "modelVersionId": "0e0bb964-e687-4439-9a9e-de9cd1ff5367",
             "modelName": "ws-service",
-            "modelVersion": "1.0",
-            "additionalProperties": {}
+            "modelVersion": "1.0"
           }
         }
       },
@@ -24,16 +23,14 @@
             "modelName": "ws-sp",
             "modelVersion": "1.0",
             "modelCustomizationName": "ws-sp 0",
-            "modelCustomizationId": "5815868c-35f8-4c5a-b899-e6eb49f52986",
-            "additionalProperties": {}
+            "modelCustomizationId": "5815868c-35f8-4c5a-b899-e6eb49f52986"
           }
         }
       }
     ],
     "cloudConfiguration": {
       "lcpCloudRegionId": "RegionOne",
-      "tenantId": "1e097c6713e74fd7ac8e4295e605ee1e",
-      "additionalProperties": {}
+      "tenantId": "1e097c6713e74fd7ac8e4295e605ee1e"
     },
     "modelInfo": {
       "modelCustomizationName": "WsSp..base_ws..module-0",
@@ -43,18 +40,15 @@
       "modelName": "WsSp..base_ws..module-0",
       "modelNameVersionId": null,
       "modelType": "vfModule",
-      "modelVersion": "1",
-      "additionalProperties": {}
+      "modelVersion": "1"
     },
     "requestInfo": {
       "instanceName": "ws-test-0310-8_NaN",
       "source": "VID",
       "suppressRollback": false,
-      "requestorId": "demo",
-      "additionalProperties": {}
+      "requestorId": "demo"
     },
     "requestParameters": {
-      "additionalProperties": {}
     },
     "configurationParameters": [
       {
diff --git a/vid-app-common/src/test/resources/payload_jsons/vfModuleDeactivateAndCloudDelete.json b/vid-app-common/src/test/resources/payload_jsons/vfModuleDeactivateAndCloudDelete.json
new file mode 100644
index 000000000..d86ad1966
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/vfModuleDeactivateAndCloudDelete.json
@@ -0,0 +1,17 @@
+{
+  "modelInfo": {
+    "modelType": "vfModule"
+  },
+  "cloudConfiguration": {
+    "lcpCloudRegionId": "mdt1",
+    "tenantId": "88a6ca3ee0394ade9403f075db23167e"
+  },
+  "requestInfo": {
+    "source": "VID",
+    "requestorId": "az2016"
+  },
+  "requestParameters" : {
+    "testApi" : "GR_API",
+    "userParams": []
+  }
+}
\ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request.json
new file mode 100644
index 000000000..92f837faf
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request.json
@@ -0,0 +1,69 @@
+{
+  "requestDetails": {
+    "modelInfo": {
+      "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+      "modelType": "vfModule",
+      "modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+      "modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+      "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8",
+      "modelInvariantId": "22222222-f63c-463e-ba94-286933b895f9",
+      "modelVersion": "10.0"
+    },
+    "cloudConfiguration": {
+      "lcpCloudRegionId": "mdt1",
+      "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+      "cloudOwner" : "att-aic"
+    },
+    "requestInfo": {
+      "instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion",
+      "source": "VID",
+      "suppressRollback": true,
+      "requestorId": "pa0916"
+    },
+    "relatedInstanceList": [
+      {
+        "relatedInstance": {
+          "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+          "modelInfo": {
+            "modelType": "service",
+            "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+            "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+            "modelName": "sriov",
+            "modelVersion": "1.0"
+          }
+        }
+      },
+      {
+        "relatedInstance": {
+          "instanceId": "bb3514e3-5a33-55df-13ab-12abad84e7bb",
+          "modelInfo": {
+            "modelType": "vnf",
+            "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+            "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+            "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+            "modelVersion": "10.0",
+            "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+            "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+          }
+        }
+      },
+      {
+        "relatedInstance": {
+          "instanceId": "cc3514e3-5a33-55df-13ab-12abad84e7cc",
+          "instanceName": "myVgName",
+          "modelInfo": {
+            "modelType": "volumeGroup"
+          }
+        }
+      }
+    ],
+    "requestParameters": {
+      "usePreload": true,
+      "userParams": [{
+        "vre_a_volume_size_0" : "100",
+        "vmx_int_net_len" : "24",
+        "availability_zone_0": "mtpocdv-kvm-az01"
+      }]
+    }
+  }
+}
diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_instance_name.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_instance_name.json
new file mode 100644
index 000000000..82df5b90a
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_instance_name.json
@@ -0,0 +1,59 @@
+{
+  "requestDetails": {
+    "modelInfo": {
+      "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+      "modelType": "vfModule",
+      "modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+      "modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+      "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8",
+      "modelInvariantId": "22222222-f63c-463e-ba94-286933b895f9",
+      "modelVersion": "10.0"
+    },
+    "cloudConfiguration": {
+      "lcpCloudRegionId": "mdt1",
+      "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+      "cloudOwner" : "att-aic"
+    },
+    "requestInfo": {
+      "source": "VID",
+      "suppressRollback": true,
+      "requestorId": "pa0916"
+    },
+    "relatedInstanceList": [
+      {
+        "relatedInstance": {
+          "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+          "modelInfo": {
+            "modelType": "service",
+            "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+            "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+            "modelName": "sriov",
+            "modelVersion": "1.0"
+          }
+        }
+      },
+      {
+        "relatedInstance": {
+          "instanceId": "bb3514e3-5a33-55df-13ab-12abad84e7bb",
+          "modelInfo": {
+            "modelType": "vnf",
+            "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+            "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+            "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+            "modelVersion": "10.0",
+            "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+            "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+          }
+        }
+      }
+    ],
+    "requestParameters": {
+      "usePreload": true,
+      "userParams": [{
+        "vre_a_volume_size_0" : "100",
+        "vmx_int_net_len" : "24",
+        "availability_zone_0": "mtpocdv-kvm-az01"
+      }]
+    }
+  }
+}
\ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_volume_group.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_volume_group.json
new file mode 100644
index 000000000..cfa4c2652
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_volume_group.json
@@ -0,0 +1,60 @@
+{
+  "requestDetails": {
+    "modelInfo": {
+      "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+      "modelType": "vfModule",
+      "modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+      "modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+      "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8",
+      "modelInvariantId": "22222222-f63c-463e-ba94-286933b895f9",
+      "modelVersion": "10.0"
+    },
+    "cloudConfiguration": {
+      "lcpCloudRegionId": "mdt1",
+      "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+      "cloudOwner" : "att-aic"
+    },
+    "requestInfo": {
+      "instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion",
+      "source": "VID",
+      "suppressRollback": true,
+      "requestorId": "pa0916"
+    },
+    "relatedInstanceList": [
+      {
+        "relatedInstance": {
+          "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+          "modelInfo": {
+            "modelType": "service",
+            "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+            "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+            "modelName": "sriov",
+            "modelVersion": "1.0"
+          }
+        }
+      },
+      {
+        "relatedInstance": {
+          "instanceId": "bb3514e3-5a33-55df-13ab-12abad84e7bb",
+          "modelInfo": {
+            "modelType": "vnf",
+            "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+            "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+            "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+            "modelVersion": "10.0",
+            "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+            "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+          }
+        }
+      }
+    ],
+    "requestParameters": {
+      "usePreload": true,
+      "userParams": [{
+        "vre_a_volume_size_0" : "100",
+        "vmx_int_net_len" : "24",
+        "availability_zone_0": "mtpocdv-kvm-az01"
+      }]
+    }
+  }
+}
\ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/volumegroup_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/volumegroup_instantiation_request.json
new file mode 100644
index 000000000..02d2d1e14
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/volumegroup_instantiation_request.json
@@ -0,0 +1,56 @@
+{
+  "requestDetails": {
+    "modelInfo": {
+      "modelType": "volumeGroup",
+      "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+      "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
+      "modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+      "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8",
+      "modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+      "modelVersion": "1"
+    },
+    "cloudConfiguration": {
+      "lcpCloudRegionId": "mdt1",
+      "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+      "cloudOwner" : "att-aic"
+    },
+    "requestInfo": {
+      "instanceName": "myVgName",
+      "source": "VID",
+      "requestorId": "az2016",
+      "suppressRollback": true
+    },
+    "relatedInstanceList": [
+      {
+        "relatedInstance": {
+          "instanceId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+          "modelInfo": {
+            "modelType": "service",
+            "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+            "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+            "modelName": "sriov",
+            "modelVersion": "1.0"
+          }
+        }
+      },
+      {
+        "relatedInstance": {
+          "instanceId": "vnfInstanceId",
+          "modelInfo": {
+            "modelType": "vnf",
+            "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+            "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+            "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+            "modelVersion": "10.0",
+            "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+            "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+          }
+        }
+      }
+    ],
+    "requestParameters" : {
+      "userParams" : [ ],
+      "usePreload" : true
+    }
+  }
+}