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>
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ActivateOperationEnvironment.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ActivateOperationEnvironment.json
new file mode 100644
index 0000000..0acd26d
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ActivateOperationEnvironment.json
@@ -0,0 +1,33 @@
+{

+	"requestDetails": {

+		"requestInfo": {

+			"resourceType": "operationalEnvironment",

+			"instanceName": "myVnfOpEnv",

+			"source": "VID",

+			"requestorId": "az2017"

+		},

+		"relatedInstanceList": [

+			{

+				"relatedInstance": {

+					"resourceType": "operationalEnvironment",

+					"instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",

+					"instanceName": "name"

+				}

+			}

+		],

+		"requestParameters": {

+			"operationalEnvironmentType": "VNF",

+			"workloadContext": "VNF_E2E-IST",

+			"manifest": {

+				"serviceModelList": [{

+					"serviceModelVersionId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",

+					"recoveryAction": "abort"

+				},

+				{

+					"serviceModelVersionId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",

+					"recoveryAction": "retry"

+				}]

+			}	

+		}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ActivateOperationEnvironmentInvalid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ActivateOperationEnvironmentInvalid.json
new file mode 100644
index 0000000..60d5d91
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ActivateOperationEnvironmentInvalid.json
@@ -0,0 +1,23 @@
+{

+	"requestDetails": {

+		"requestInfo": {

+			"resourceType": "operationalEnvironment",

+			"instanceName": "myVnfOpEnv",

+			"source": "VID",

+			"requestorId": "az2017"

+		},

+		"relatedInstanceList": [

+			{

+				"relatedInstance": {

+					"resourceType": "operationalEnvironment",

+					"instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",

+					"instanceName": "name"

+				}

+			}

+		],

+		"requestParameters": {

+			"operationalEnvironmentType": "VNF",

+			"workloadContext": "VNF_E2E-IST"

+		}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ApplyUpdatedConfig.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ApplyUpdatedConfig.json
new file mode 100644
index 0000000..bf43fa3
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ApplyUpdatedConfig.json
@@ -0,0 +1,11 @@
+{

+   "requestDetails": {

+      "requestInfo": {

+         "source": "VID",

+         "requestorId": "az2016"

+      },

+      "requestParameters": {

+        "payload": "{\"request-parameters\":{\"host-ip-address\":\"10.10.10.10\"},\"configuration-parameters\":{\"name1\":\"value1\",\"name2\":\"value2\"}}"

+      }

+   }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/CloudConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/CloudConfiguration.json
new file mode 100644
index 0000000..96316d8
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/CloudConfiguration.json
@@ -0,0 +1,39 @@
+{

+  "requestDetails": {

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ConfigurationModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ConfigurationModelVersionId.json
new file mode 100644
index 0000000..9a15751
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ConfigurationModelVersionId.json
@@ -0,0 +1,43 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "configuration", 

+      "modelVersion": "2.0", 

+      "modelVersionId": ""

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/DeactivateOperationEnvironment.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/DeactivateOperationEnvironment.json
new file mode 100644
index 0000000..f3c3535
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/DeactivateOperationEnvironment.json
@@ -0,0 +1,12 @@
+{

+	"requestDetails": {

+		"requestInfo": {

+			"resourceType": "operationalEnvironment",

+			"source": "VID",

+			"requestorId": "az2017"

+		},

+		"requestParameters": {

+			"operationalEnvironmentType": "VNF"

+		}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/DeactivateOperationEnvironmentInvalid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/DeactivateOperationEnvironmentInvalid.json
new file mode 100644
index 0000000..998f565
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/DeactivateOperationEnvironmentInvalid.json
@@ -0,0 +1,12 @@
+{

+	"requestDetails": {

+		"requestInfo": {

+			"resourceType": "operationalEnvironment",

+			"source": "VID",

+			"requestorId": "az2017"

+		},

+		"requestParameters": {

+			"operationalEnvironmentType": "ECOMP"

+		}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ECOMPOperationEnvironmentCreate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ECOMPOperationEnvironmentCreate.json
new file mode 100644
index 0000000..f158900
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ECOMPOperationEnvironmentCreate.json
@@ -0,0 +1,15 @@
+{

+	"requestDetails": {

+		"requestInfo": {

+    		"resourceType": "operationalEnvironment",

+			"instanceName": "myOpEnv",

+			"source": "VID",

+			"requestorId": "az2017"

+		},

+		"requestParameters": {

+			"operationalEnvironmentType": "ECOMP",

+			"tenantContext": "Test",

+			"workloadContext": "ECOMP_E2E-IST"

+		}

+  	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyCloudConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyCloudConfiguration.json
new file mode 100644
index 0000000..cac9cd7
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyCloudConfiguration.json
@@ -0,0 +1,37 @@
+{

+  "requestDetails": {

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyGlobalSubscriberId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyGlobalSubscriberId.json
new file mode 100644
index 0000000..9f2c8b7
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyGlobalSubscriberId.json
@@ -0,0 +1,42 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyInstanceName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyInstanceName.json
new file mode 100644
index 0000000..ad8140c
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyInstanceName.json
@@ -0,0 +1,43 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyLcpCloudConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyLcpCloudConfiguration.json
new file mode 100644
index 0000000..324f545
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyLcpCloudConfiguration.json
@@ -0,0 +1,41 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": { 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r",  

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyLineOfBusiness.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyLineOfBusiness.json
new file mode 100644
index 0000000..8c8ffab
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyLineOfBusiness.json
@@ -0,0 +1,46 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": ""

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyOwningEntityId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyOwningEntityId.json
new file mode 100644
index 0000000..eb1c720
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyOwningEntityId.json
@@ -0,0 +1,41 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyOwningEntityName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyOwningEntityName.json
new file mode 100644
index 0000000..6525364
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyOwningEntityName.json
@@ -0,0 +1,42 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+		"owningEntityId": "oeName"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyPlatform.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyPlatform.json
new file mode 100644
index 0000000..2827475
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyPlatform.json
@@ -0,0 +1,46 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+			"platformName": ""

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyProject.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyProject.json
new file mode 100644
index 0000000..bdef263
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyProject.json
@@ -0,0 +1,43 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": ""

+	},

+	"owningEntity": {

+      "owningEntityId": "oeId", 

+      "owningEntityName": "oeName"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyRequestorId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyRequestorId.json
new file mode 100644
index 0000000..eb771a2
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyRequestorId.json
@@ -0,0 +1,41 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptySource.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptySource.json
new file mode 100644
index 0000000..c944b07
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptySource.json
@@ -0,0 +1,35 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r",  

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptySubscriberInfo.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptySubscriberInfo.json
new file mode 100644
index 0000000..a013034
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptySubscriberInfo.json
@@ -0,0 +1,32 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptySubscriptionServiceType.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptySubscriptionServiceType.json
new file mode 100644
index 0000000..47bd161
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptySubscriptionServiceType.json
@@ -0,0 +1,41 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r",  

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyTenantId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyTenantId.json
new file mode 100644
index 0000000..492bc10
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/EmptyTenantId.json
@@ -0,0 +1,41 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": { 

+      "lcpCloudRegionId": "mtn6"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r",  

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdate.json
new file mode 100644
index 0000000..1e2ae20
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdate.json
@@ -0,0 +1,15 @@
+{

+   "requestDetails": {

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1",

+          "tenantId": "88a6ca3ee0394ade9403f075db23167e"

+      },

+      "requestInfo": {

+          "source": "VID",

+          "requestorId": "az2016"

+      },

+      "requestParameters": {

+   		 "payload": "{\"existing-software-version\": \"3.1\", \"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"

+      }

+   }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdateCloudConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdateCloudConfiguration.json
new file mode 100644
index 0000000..f86b66e
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdateCloudConfiguration.json
@@ -0,0 +1,38 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",

+			"modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",

+			"modelName": "vSAMP10a",

+			"modelVersion": "1.0",

+			"modelCustomizationName": "vSAMP10a 1",

+			"modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"

+		},

+		"requestInfo": {

+			"instanceName": "MSO_Dev_1802_VNF_10-9-1",

+			"productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",

+			"source": "VID",

+			"suppressRollback": false,

+			"requestorId": "md5621"

+		},

+		"relatedInstanceList": [

+		{

+			"relatedInstance": {

+			"instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",

+			"modelInfo": {

+				"modelType": "service",

+				"modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",

+				"modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",

+				"modelName": "MSOTADevInfra_vSAMP10a_Service",

+				"modelVersion": "1.0"

+			}

+		}

+	}

+	],

+		"requestParameters": {

+			"autoBuildVfModules": false,

+			"payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"

+		}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdateCloudRegionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdateCloudRegionId.json
new file mode 100644
index 0000000..bb76d74
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdateCloudRegionId.json
@@ -0,0 +1,41 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",

+			"modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",

+			"modelName": "vSAMP10a",

+			"modelVersion": "1.0",

+			"modelCustomizationName": "vSAMP10a 1",

+			"modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"

+		},

+		"cloudConfiguration": {

+			"tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+		},

+		"requestInfo": {

+			"instanceName": "MSO_Dev_1802_VNF_10-9-1",

+			"productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",

+			"source": "VID",

+			"suppressRollback": false,

+			"requestorId": "md5621"

+		},

+		"relatedInstanceList": [

+		{

+			"relatedInstance": {

+			"instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",

+			"modelInfo": {

+				"modelType": "service",

+				"modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",

+				"modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",

+				"modelName": "MSOTADevInfra_vSAMP10a_Service",

+				"modelVersion": "1.0"

+			}

+		}

+	}

+	],

+		"requestParameters": {

+			"autoBuildVfModules": false,

+			"payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"

+		}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdateTenantId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdateTenantId.json
new file mode 100644
index 0000000..da3ba3f
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/InPlaceSoftwareUpdateTenantId.json
@@ -0,0 +1,41 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",

+			"modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",

+			"modelName": "vSAMP10a",

+			"modelVersion": "1.0",

+			"modelCustomizationName": "vSAMP10a 1",

+			"modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mtn6"

+		},

+		"requestInfo": {

+			"instanceName": "MSO_Dev_1802_VNF_10-9-1",

+			"productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",

+			"source": "VID",

+			"suppressRollback": false,

+			"requestorId": "md5621"

+		},

+		"relatedInstanceList": [

+		{

+			"relatedInstance": {

+			"instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",

+			"modelInfo": {

+				"modelType": "service",

+				"modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",

+				"modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",

+				"modelName": "MSOTADevInfra_vSAMP10a_Service",

+				"modelVersion": "1.0"

+			}

+		}

+	}

+	],

+		"requestParameters": {

+			"autoBuildVfModules": false,

+			"payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"

+		}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InvalidInstanceName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/InvalidInstanceName.json
new file mode 100644
index 0000000..69b4866
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/InvalidInstanceName.json
@@ -0,0 +1,44 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false,

+      "instanceName" : "test*"

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/InvalidModelInvariantId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/InvalidModelInvariantId.json
new file mode 100644
index 0000000..7a7708e
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/InvalidModelInvariantId.json
@@ -0,0 +1,43 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "test*", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/LineOfBusiness.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/LineOfBusiness.json
new file mode 100644
index 0000000..84ce00c
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/LineOfBusiness.json
@@ -0,0 +1,43 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationId.json
new file mode 100644
index 0000000..37dd5b0
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationId.json
@@ -0,0 +1,37 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vfModule", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationIdPreload.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationIdPreload.json
new file mode 100644
index 0000000..f5457b1
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationIdPreload.json
@@ -0,0 +1,38 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vfModule", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "test",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": true,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationIdUsingPreload.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationIdUsingPreload.json
new file mode 100644
index 0000000..471f980
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelCustomizationIdUsingPreload.json
@@ -0,0 +1,44 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vnf", 

+      "modelVersion": "2.0", 

+      "modelCustomizationName": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "usePreload": false,

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInfoNull.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInfoNull.json
new file mode 100644
index 0000000..e8a2f85
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInfoNull.json
@@ -0,0 +1,37 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "requestInfo": {

+      "instanceName" : "testV2aLaCarteFlag",

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantId.json
new file mode 100644
index 0000000..c8b6741
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantId.json
@@ -0,0 +1,41 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": { 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "configuration", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdConfiguration.json
new file mode 100644
index 0000000..b068614
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdConfiguration.json
@@ -0,0 +1,41 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {  

+      "modelName": "SDNW Service 1710", 

+      "modelType": "configuration", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdConfigurationDelete.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdConfigurationDelete.json
new file mode 100644
index 0000000..b068614
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdConfigurationDelete.json
@@ -0,0 +1,41 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {  

+      "modelName": "SDNW Service 1710", 

+      "modelType": "configuration", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdFormat.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdFormat.json
new file mode 100644
index 0000000..e290764
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdFormat.json
@@ -0,0 +1,43 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "test", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdService.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdService.json
new file mode 100644
index 0000000..309222f
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdService.json
@@ -0,0 +1,41 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": { 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdServiceCreate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdServiceCreate.json
new file mode 100644
index 0000000..1628057
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdServiceCreate.json
@@ -0,0 +1,42 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {  

+      "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdVnf.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdVnf.json
new file mode 100644
index 0000000..d5dab07
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelInvariantIdVnf.json
@@ -0,0 +1,41 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {  

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vnf", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelNameVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelNameVersionId.json
new file mode 100644
index 0000000..931ac31
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelNameVersionId.json
@@ -0,0 +1,37 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelTypeNull.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelTypeNull.json
new file mode 100644
index 0000000..e4d16cd
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelTypeNull.json
@@ -0,0 +1,42 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersion.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersion.json
new file mode 100644
index 0000000..3cbcafa
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersion.json
@@ -0,0 +1,43 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionId.json
new file mode 100644
index 0000000..d02de4c
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionId.json
@@ -0,0 +1,43 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": ""

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionIdCreate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionIdCreate.json
new file mode 100644
index 0000000..b6b8457
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionIdCreate.json
@@ -0,0 +1,43 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": ""

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionIdTest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionIdTest.json
new file mode 100644
index 0000000..7665d1d
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionIdTest.json
@@ -0,0 +1,43 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vnf", 

+      "modelVersion": "2.0", 

+      "modelVersionId": ""

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionNetwork.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionNetwork.json
new file mode 100644
index 0000000..56396ea
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionNetwork.json
@@ -0,0 +1,42 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "network", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionService.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionService.json
new file mode 100644
index 0000000..bfe4c14
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionService.json
@@ -0,0 +1,42 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionVfModule.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionVfModule.json
new file mode 100644
index 0000000..d669769
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ModelVersionVfModule.json
@@ -0,0 +1,42 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vfModule", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/NetworkModelName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/NetworkModelName.json
new file mode 100644
index 0000000..dec16a4
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/NetworkModelName.json
@@ -0,0 +1,43 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "", 

+      "modelType": "network", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/NetworkProductFamilyId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/NetworkProductFamilyId.json
new file mode 100644
index 0000000..5943319
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/NetworkProductFamilyId.json
@@ -0,0 +1,44 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "network", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",

+      "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/NetworkType.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/NetworkType.json
new file mode 100644
index 0000000..4ea0b65
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/NetworkType.json
@@ -0,0 +1,43 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "TestNetworkType", 

+      "modelType": "network", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "oeId",

+      "owningEntityName": "oeName"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OwningEntity.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OwningEntity.json
new file mode 100644
index 0000000..81ec46a
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OwningEntity.json
@@ -0,0 +1,39 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/Payload.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/Payload.json
new file mode 100644
index 0000000..1d96d82
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/Payload.json
@@ -0,0 +1,41 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",

+			"modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",

+			"modelName": "vSAMP10a",

+			"modelVersion": "1.0",

+			"modelCustomizationName": "vSAMP10a 1",

+			"modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mtn6",

+			"tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+		},

+		"requestInfo": {

+			"instanceName": "MSO_Dev_1802_VNF_10-9-1",

+			"productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",

+			"source": "VID",

+			"suppressRollback": false,

+			"requestorId": "md5621"

+		},

+		"relatedInstanceList": [

+		{

+			"relatedInstance": {

+			"instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",

+			"modelInfo": {

+				"modelType": "service",

+				"modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",

+				"modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",

+				"modelName": "MSOTADevInfra_vSAMP10a_Service",

+				"modelVersion": "1.0"

+			}

+		}

+	}

+	],

+		"requestParameters": {

+			"autoBuildVfModules": false

+		}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/Platform.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/Platform.json
new file mode 100644
index 0000000..85d13d0
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/Platform.json
@@ -0,0 +1,43 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusiness.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusiness.json
new file mode 100644
index 0000000..75f3891
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusiness.json
@@ -0,0 +1,46 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusiness2.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusiness2.json
new file mode 100644
index 0000000..84ce00c
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusiness2.json
@@ -0,0 +1,43 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusinessInvalid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusinessInvalid.json
new file mode 100644
index 0000000..85d13d0
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusinessInvalid.json
@@ -0,0 +1,43 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusinessInvalid2.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusinessInvalid2.json
new file mode 100644
index 0000000..84ce00c
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformAndLineOfBusinessInvalid2.json
@@ -0,0 +1,43 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformTest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformTest.json
new file mode 100644
index 0000000..f63a8aa
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/PlatformTest.json
@@ -0,0 +1,44 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "instanceName" : "testV2aLaCarteFlag",

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/Project.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/Project.json
new file mode 100644
index 0000000..4f2fb98
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/Project.json
@@ -0,0 +1,40 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+	"owningEntity": {

+      "owningEntityId": "oeId", 

+      "owningEntityName": "oeName"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntity.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntity.json
new file mode 100644
index 0000000..ad80a16
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntity.json
@@ -0,0 +1,43 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "oeId", 

+      "owningEntityName": "oeName"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntity2.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntity2.json
new file mode 100644
index 0000000..4f2fb98
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntity2.json
@@ -0,0 +1,40 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+	"owningEntity": {

+      "owningEntityId": "oeId", 

+      "owningEntityName": "oeName"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntityInvalid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntityInvalid.json
new file mode 100644
index 0000000..81ec46a
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntityInvalid.json
@@ -0,0 +1,39 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntityInvalid2.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntityInvalid2.json
new file mode 100644
index 0000000..4f2fb98
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ProjectAndOwningEntityInvalid2.json
@@ -0,0 +1,40 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+	"owningEntity": {

+      "owningEntityId": "oeId", 

+      "owningEntityName": "oeName"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstances.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstances.json
new file mode 100644
index 0000000..13f6a98
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstances.json
@@ -0,0 +1,33 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",

+			"modelCustomizationName": "test"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesId.json
new file mode 100644
index 0000000..ee8bd91
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesId.json
@@ -0,0 +1,46 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "", 

+               "modelInfo": {   

+               	  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesIdFormat.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesIdFormat.json
new file mode 100644
index 0000000..7a1e126
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesIdFormat.json
@@ -0,0 +1,46 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "test id", 

+               "modelInfo": {   

+               	  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesInstanceDirection.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesInstanceDirection.json
new file mode 100644
index 0000000..75f3891
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesInstanceDirection.json
@@ -0,0 +1,46 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesInstanceId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesInstanceId.json
new file mode 100644
index 0000000..75539a7
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesInstanceId.json
@@ -0,0 +1,47 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",

+			"modelCustomizationName": "test"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff001", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelCustomizationId.json
new file mode 100644
index 0000000..efeb22c
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelCustomizationId.json
@@ -0,0 +1,48 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",

+			"modelCustomizationName": "test"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"autoBuildVfModules": false,

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelInfo.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelInfo.json
new file mode 100644
index 0000000..0543aa9
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelInfo.json
@@ -0,0 +1,39 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000"

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelInvariantId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelInvariantId.json
new file mode 100644
index 0000000..06baff7
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelInvariantId.json
@@ -0,0 +1,46 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelInvariantIdFormat.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelInvariantIdFormat.json
new file mode 100644
index 0000000..73156d0
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelInvariantIdFormat.json
@@ -0,0 +1,46 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "a test",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelName.json
new file mode 100644
index 0000000..20c0d83
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelName.json
@@ -0,0 +1,46 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+               	  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelType.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelType.json
new file mode 100644
index 0000000..ff9f558
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelType.json
@@ -0,0 +1,45 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelVersion.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelVersion.json
new file mode 100644
index 0000000..d711102
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelVersion.json
@@ -0,0 +1,46 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+               	  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": ""

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelVersionId.json
new file mode 100644
index 0000000..e0d2948
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesModelVersionId.json
@@ -0,0 +1,46 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesNameFormat.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesNameFormat.json
new file mode 100644
index 0000000..206f325
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesNameFormat.json
@@ -0,0 +1,47 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "instanceName": "format test",

+               "modelInfo": {   

+               	  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesServiceInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesServiceInstance.json
new file mode 100644
index 0000000..e1b5f21
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesServiceInstance.json
@@ -0,0 +1,48 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "volumeGroup",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",

+			"modelCustomizationName": "test"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "volumeGroup",

+                  "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationName": "test"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesServiceInstanceId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesServiceInstanceId.json
new file mode 100644
index 0000000..2be90cc
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesServiceInstanceId.json
@@ -0,0 +1,48 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",

+			"modelCustomizationName": "test"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff001", 

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationName": "test"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesSetInstances.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesSetInstances.json
new file mode 100644
index 0000000..4513bf1
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesSetInstances.json
@@ -0,0 +1,48 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "volumeGroup",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",

+			"modelCustomizationName": "test"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationName": "test"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesVfModule.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesVfModule.json
new file mode 100644
index 0000000..d59daaa
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesVfModule.json
@@ -0,0 +1,33 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vfModule",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",

+			"modelCustomizationName": "test"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesVnfInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesVnfInstance.json
new file mode 100644
index 0000000..542f4e7
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesVnfInstance.json
@@ -0,0 +1,48 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "volumeGroup",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",

+			"modelCustomizationName": "test"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationName": "test"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesVnfInstanceId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesVnfInstanceId.json
new file mode 100644
index 0000000..2be90cc
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RelatedInstancesVnfInstanceId.json
@@ -0,0 +1,48 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",

+			"modelCustomizationName": "test"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff001", 

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationName": "test"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestInfo.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestInfo.json
new file mode 100644
index 0000000..37c1263
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestInfo.json
@@ -0,0 +1,35 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",

+			"modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",

+			"modelName": "vSAMP10a",

+			"modelVersion": "1.0",

+			"modelCustomizationName": "vSAMP10a 1",

+			"modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mtn6",

+			"tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+		},

+		"relatedInstanceList": [

+		{

+			"relatedInstance": {

+			"instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",

+			"modelInfo": {

+				"modelType": "service",

+				"modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",

+				"modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",

+				"modelName": "MSOTADevInfra_vSAMP10a_Service",

+				"modelVersion": "1.0"

+			}

+		}

+	}

+	],

+		"requestParameters": {

+			"autoBuildVfModules": false,

+			"payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"

+		}

+	}

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestInfoNull.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestInfoNull.json
new file mode 100644
index 0000000..d1127c6
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestInfoNull.json
@@ -0,0 +1,37 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParameters.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParameters.json
new file mode 100644
index 0000000..e877dd1
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParameters.json
@@ -0,0 +1,38 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",

+			"modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",

+			"modelName": "vSAMP10a",

+			"modelVersion": "1.0",

+			"modelCustomizationName": "vSAMP10a 1",

+			"modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mtn6",

+			"tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+		},

+		"requestInfo": {

+			"instanceName": "MSO_Dev_1802_VNF_10-9-1",

+			"productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",

+			"source": "VID",

+			"suppressRollback": false,

+			"requestorId": "md5621"

+		},

+		"relatedInstanceList": [

+		{

+			"relatedInstance": {

+			"instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",

+			"modelInfo": {

+				"modelType": "service",

+				"modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",

+				"modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",

+				"modelName": "MSOTADevInfra_vSAMP10a_Service",

+				"modelVersion": "1.0"

+			}

+		}

+		}

+		]

+	}

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersALaCarteNull.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersALaCarteNull.json
new file mode 100644
index 0000000..178016d
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersALaCarteNull.json
@@ -0,0 +1,36 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersALaCarteTrue.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersALaCarteTrue.json
new file mode 100644
index 0000000..931ac31
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersALaCarteTrue.json
@@ -0,0 +1,37 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersNull.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersNull.json
new file mode 100644
index 0000000..e70de00
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestParametersNull.json
@@ -0,0 +1,21 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestorId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestorId.json
new file mode 100644
index 0000000..cc5936b
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/RequestorId.json
@@ -0,0 +1,41 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",

+			"modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",

+			"modelName": "vSAMP10a",

+			"modelVersion": "1.0",

+			"modelCustomizationName": "vSAMP10a 1",

+			"modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mtn6",

+			"tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+		},

+		"requestInfo": {

+			"instanceName": "MSO_Dev_1802_VNF_10-9-1",

+			"productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",

+			"source": "VID",

+			"suppressRollback": false

+		},

+		"relatedInstanceList": [

+		{

+			"relatedInstance": {

+			"instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",

+			"modelInfo": {

+				"modelType": "service",

+				"modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",

+				"modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",

+				"modelName": "MSOTADevInfra_vSAMP10a_Service",

+				"modelVersion": "1.0"

+			}

+		}

+	}

+	],

+		"requestParameters": {

+			"autoBuildVfModules": false,

+			"payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"

+		}

+	}

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInPlaceSoftwareUpdate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInPlaceSoftwareUpdate.json
new file mode 100644
index 0000000..1d6b9f5
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInPlaceSoftwareUpdate.json
@@ -0,0 +1,42 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "service",

+			"modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",

+			"modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",

+			"modelName": "vSAMP10a",

+			"modelVersion": "1.0",

+			"modelCustomizationName": "vSAMP10a 1",

+			"modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mtn6",

+			"tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+		},

+		"requestInfo": {

+			"instanceName": "MSO_Dev_1802_VNF_10-9-1",

+			"productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",

+			"source": "VID",

+			"suppressRollback": false,

+			"requestorId": "md5621"

+		},

+		"relatedInstanceList": [

+		{

+			"relatedInstance": {

+			"instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",

+			"modelInfo": {

+				"modelType": "service",

+				"modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",

+				"modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",

+				"modelName": "MSOTADevInfra_vSAMP10a_Service",

+				"modelVersion": "1.0"

+			}

+		}

+	}

+	],

+		"requestParameters": {

+			"autoBuildVfModules": false,

+			"payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"

+		}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceModelNameEmptyOnActivate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceModelNameEmptyOnActivate.json
new file mode 100644
index 0000000..06605ed
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceModelNameEmptyOnActivate.json
@@ -0,0 +1,38 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",  

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelCustomizationName":"",

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "test",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceModelNameEmptyOnDelete.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceModelNameEmptyOnDelete.json
new file mode 100644
index 0000000..06605ed
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceModelNameEmptyOnDelete.json
@@ -0,0 +1,38 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",  

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelCustomizationName":"",

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "test",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceNoRelatedInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceNoRelatedInstance.json
new file mode 100644
index 0000000..e5fec3a
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceNoRelatedInstance.json
@@ -0,0 +1,23 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "service",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelName": "test",

+         "modelVersion": "test",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1",

+          "tenantId": "test"

+      },

+      "requestInfo": {

+        	"source": "VID",

+			"requestorId": "az2016"

+      },

+      "requestParameters": {

+          "aLaCarte": "true"

+      }

+  }

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceProductFamilyId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceProductFamilyId.json
new file mode 100644
index 0000000..733ce1d
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceProductFamilyId.json
@@ -0,0 +1,44 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",

+      "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceProductFamilyIdFlag.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceProductFamilyIdFlag.json
new file mode 100644
index 0000000..4c4905a
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceProductFamilyIdFlag.json
@@ -0,0 +1,72 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "volumeGroup", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",

+      "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         },

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",

+				"instanceDirection": "source",

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+               }

+            }

+         }

+         ],

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceProductFamilyIdUpdate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceProductFamilyIdUpdate.json
new file mode 100644
index 0000000..733ce1d
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceProductFamilyIdUpdate.json
@@ -0,0 +1,44 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",

+      "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/Source.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/Source.json
new file mode 100644
index 0000000..9f7c420
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/Source.json
@@ -0,0 +1,41 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",

+			"modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",

+			"modelName": "vSAMP10a",

+			"modelVersion": "1.0",

+			"modelCustomizationName": "vSAMP10a 1",

+			"modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mtn6",

+			"tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+		},

+		"requestInfo": {

+			"instanceName": "MSO_Dev_1802_VNF_10-9-1",

+			"productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",

+			"suppressRollback": false,

+			"requestorId": "md5621"

+		},

+		"relatedInstanceList": [

+		{

+			"relatedInstance": {

+			"instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",

+			"modelInfo": {

+				"modelType": "service",

+				"modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",

+				"modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",

+				"modelName": "MSOTADevInfra_vSAMP10a_Service",

+				"modelVersion": "1.0"

+			}

+		}

+	}

+	],

+		"requestParameters": {

+			"autoBuildVfModules": false,

+			"payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"

+		}

+	}

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/UserParams.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/UserParams.json
new file mode 100644
index 0000000..d0613fc
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/UserParams.json
@@ -0,0 +1,58 @@
+{

+	"requestDetails": {

+		"modelInfo":{ 

+			"modelType": "vfModule", 

+			"modelName": "vSAMP10aDEV::base::module-0", 

+			"modelVersionId": "20c4431c-246d-11e7-93ae-92361f002671", 

+			"modelInvariantId": "78ca26d0-246d-11e7-93ae-92361f002671", 

+			"modelVersion": "2", 

+			"modelCustomizationId": "cb82ffd8-252a-11e7-93ae-92361f002671" 

+		},

+		"cloudConfiguration":{ 

+			"lcpCloudRegionId": "mtn6", 

+			"tenantId": "0422ffb57ba042c0800a29dc85ca70f8"

+		},

+		"requestInfo":{ 

+			"instanceName": "MSO-DEV-VF-1802-it3-pwt3-vSAMP10a-base-1002-RoutePrefixes", 

+			"source": "VID", 

+			"suppressRollback": false, 

+			"requestorId": "bs7527" 

+		},

+	"relatedInstanceList": [{

+		"relatedInstance": {

+			"instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",

+			"modelInfo":{ 

+				"modelType": "service", 

+				"modelName": "MSOTADevInfra_vSAMP10a_Service", 

+				"modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671", 

+				"modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671", 

+				"modelVersion": "1.0" 

+			}

+	

+		}

+	},{

+		"relatedInstance": {

+			"instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",

+			"modelInfo":{ 

+				"modelType": "vnf", 

+				"modelName": "vSAMP10a", 

+				"modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671", 

+				"modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671", 

+				"modelVersion": "1.0", 

+				"modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671", 

+				"modelCustomizationName": "vSAMP10a 1" 

+			}

+		}

+	}],

+	"requestParameters": {

+		"usePreload": true,

+		"userParams": [{

+		"name": "vlc_sctp_b_route_prefixes",

+		"value": [

+			{ "interface_route_table_routes_route_prefix": "107.239.41.163/32" },

+			{ "interface_route_table_routes_route_prefix": "107.239.41.164/32" },

+			{ "interface_route_table_routes_route_prefix": "107.239.41.165/32" }

+		]}

+	]}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VNFOperationEnvironmentCreate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VNFOperationEnvironmentCreate.json
new file mode 100644
index 0000000..f8585bc
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VNFOperationEnvironmentCreate.json
@@ -0,0 +1,24 @@
+{

+	"requestDetails": {

+		"requestInfo": {

+			"resourceType": "operationalEnvironment",

+			"instanceName": "myVnfOpEnv",

+			"source": "VID",

+			"requestorId": "az2017"

+		},

+		"relatedInstanceList": [

+			{

+				"relatedInstance": {

+					"resourceType": "operationalEnvironment",

+					"instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",

+					"instanceName": "name"

+				}

+			}

+		],

+		"requestParameters": {

+			"operationalEnvironmentType": "VNF",

+			"tenantContext": "Test",

+			"workloadContext": "VNF_E2E-IST"

+		}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VNFOperationEnvironmentCreateInvalid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VNFOperationEnvironmentCreateInvalid.json
new file mode 100644
index 0000000..c61c095
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VNFOperationEnvironmentCreateInvalid.json
@@ -0,0 +1,15 @@
+{

+	"requestDetails": {

+		"requestInfo": {

+			"resourceType": "operationalEnvironment",

+			"instanceName": "myVnfOpEnv",

+			"source": "VID",

+			"requestorId": "az2017"

+		},

+		"requestParameters": {

+			"operationalEnvironmentType": "VNF",

+			"tenantContext": "Test",

+			"workloadContext": "VNF_E2E-IST"

+		}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ValidModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ValidModelCustomizationId.json
new file mode 100644
index 0000000..90abd64
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ValidModelCustomizationId.json
@@ -0,0 +1,66 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "test", 

+      "modelType": "vfModule", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7",

+      "modelNameVersionId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    },

+     "relatedInstanceList": [

+     {

+        "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         },

+		 {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationId": "test",

+      			  "modelNameVersionId": "test"

+               }

+            }

+         }

+         ],

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ValidModelCustomizationIdService.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ValidModelCustomizationIdService.json
new file mode 100644
index 0000000..7b9a1ba
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ValidModelCustomizationIdService.json
@@ -0,0 +1,66 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "test", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7",

+      "modelNameVersionId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    },

+     "relatedInstanceList": [

+     {

+        "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         },

+		 {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationId": "test",

+      			  "modelNameVersionId": "test"

+               }

+            }

+         }

+         ],

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelName.json
new file mode 100644
index 0000000..b1c423f
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelName.json
@@ -0,0 +1,38 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "", 

+      "modelType": "vfModule", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "test",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmpty.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmpty.json
new file mode 100644
index 0000000..f25a759
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmpty.json
@@ -0,0 +1,38 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",  

+      "modelType": "vfModule", 

+      "modelVersion": "2.0", 

+      "modelCustomizationName":"",

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "test",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmptyOnDelete.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmptyOnDelete.json
new file mode 100644
index 0000000..f25a759
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmptyOnDelete.json
@@ -0,0 +1,38 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",  

+      "modelType": "vfModule", 

+      "modelVersion": "2.0", 

+      "modelCustomizationName":"",

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "test",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmptyOnUpdate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmptyOnUpdate.json
new file mode 100644
index 0000000..0bfa74f
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleModelNameEmptyOnUpdate.json
@@ -0,0 +1,37 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",  

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelCustomizationName":"",

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleRelatedInstancesService.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleRelatedInstancesService.json
new file mode 100644
index 0000000..a1cab5a
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleRelatedInstancesService.json
@@ -0,0 +1,48 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vfModule",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",

+			"modelCustomizationName": "test"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+           "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "volumeGroup",

+                  "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP13",

+                  "modelVersion": "1.0",

+                  "modelCustomizationName": "test"

+				}

+			}

+		}

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleRelatedInstancesVnf.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleRelatedInstancesVnf.json
new file mode 100644
index 0000000..71d9e1e
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleRelatedInstancesVnf.json
@@ -0,0 +1,48 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vfModule",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",

+			"modelCustomizationName": "test"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationName": "test"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleVnfInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleVnfInstance.json
new file mode 100644
index 0000000..a650c7d
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VfModuleVnfInstance.json
@@ -0,0 +1,48 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vfModule",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",

+			"modelCustomizationName": "test"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff001", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationName": "test"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfActivate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfActivate.json
new file mode 100644
index 0000000..b79a4e7
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfActivate.json
@@ -0,0 +1,41 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelCustomizationName":"",

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "test",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "subscriptionServiceType": "test",

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "cascadeDelete": false,

+      "rebuildVolumeGroups": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationId.json
new file mode 100644
index 0000000..17ee433
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationId.json
@@ -0,0 +1,37 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vnf", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdEmpty.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdEmpty.json
new file mode 100644
index 0000000..2d11862
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdEmpty.json
@@ -0,0 +1,65 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vnf", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7",

+      "modelNameVersionId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7",

+      "modelCustomizationName": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         },

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+          }

+        ],

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdPreload.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdPreload.json
new file mode 100644
index 0000000..221740c
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdPreload.json
@@ -0,0 +1,36 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vnf", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": true,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdValid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdValid.json
new file mode 100644
index 0000000..2d11862
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationIdValid.json
@@ -0,0 +1,65 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vnf", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7",

+      "modelNameVersionId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7",

+      "modelCustomizationName": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         },

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+          }

+        ],

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationName.json
new file mode 100644
index 0000000..d7cef6a
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationName.json
@@ -0,0 +1,39 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vnf", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",

+      "modelCustomizationName": "", 

+      "modelCustomizationId": "test",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationNameNull.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationNameNull.json
new file mode 100644
index 0000000..9f6fad1
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationNameNull.json
@@ -0,0 +1,38 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vnf", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationNotValid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationNotValid.json
new file mode 100644
index 0000000..3503ee8
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationNotValid.json
@@ -0,0 +1,39 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vnf", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "test",

+      "modelCustomizationName": "test",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationTest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationTest.json
new file mode 100644
index 0000000..80ff413
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelCustomizationTest.json
@@ -0,0 +1,39 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vnf", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",

+      "modelCustomizationName": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",

+      "modelNameVersionId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelName.json
new file mode 100644
index 0000000..b3f5ee9
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfModelName.json
@@ -0,0 +1,39 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vnf", 

+      "modelVersion": "2.0", 

+      "modelCustomizationName":"",

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "test",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfProductFamilyId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfProductFamilyId.json
new file mode 100644
index 0000000..d47b475
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfProductFamilyId.json
@@ -0,0 +1,44 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vnf", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb",

+      "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfRelatedInstancesInstanceDirection.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfRelatedInstancesInstanceDirection.json
new file mode 100644
index 0000000..9570528
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfRelatedInstancesInstanceDirection.json
@@ -0,0 +1,50 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelName": "CONTRAIL30_BASIC",

+         "modelVersion": "1.0",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+		    "instanceName":"port_mirror_config_12345",

+        	"source": "VID",

+			"requestorId": "az2016"

+      },

+      "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         },

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+               }

+            }

+         }

+      ],

+      "requestParameters": {

+	      "userParams": []

+      }

+	}

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfRelatedInstancesService.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfRelatedInstancesService.json
new file mode 100644
index 0000000..26dae2b
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfRelatedInstancesService.json
@@ -0,0 +1,48 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",

+			"modelCustomizationName": "test"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+           "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "volumeGroup",

+                  "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP13",

+                  "modelVersion": "1.0",

+                  "modelCustomizationName": "test"

+				}

+			}

+		}

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfRequestParameters.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfRequestParameters.json
new file mode 100644
index 0000000..43c72c5
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VnfRequestParameters.json
@@ -0,0 +1,40 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "vnf", 

+      "modelVersion": "2.0", 

+      "modelCustomizationName":"",

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "test",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "cascadeDelete": false,

+      "rebuildVolumeGroups": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/VolumeGroupRelatedInstances.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VolumeGroupRelatedInstances.json
new file mode 100644
index 0000000..f5aa7f4
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/VolumeGroupRelatedInstances.json
@@ -0,0 +1,61 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "volumeGroup",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4",

+			"modelCustomizationName": "test"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationName": "test"

+               }

+            }

+          },

+          {

+           "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff001", 

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP13",

+                  "modelVersion": "1.0",

+                  "modelCustomizationName": "test"

+				}

+			}

+		}

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/PlatformAndLineOfBusiness.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/PlatformAndLineOfBusiness.json
new file mode 100644
index 0000000..75f3891
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/PlatformAndLineOfBusiness.json
@@ -0,0 +1,46 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+			"modelName": "vSAMP12..base..module-0",

+			"modelVersion": "1",

+			"modelCustomizationId": "facf4d08-2f6d-4d32-889c-b495c06a5be4"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mdt1",

+			"tenantId": "88a6ca3ee0394ade9403f075db23167e"

+		},

+		"requestInfo": {

+			"instanceName": "VNFTEST-7",

+			"source": "VID",

+			"suppressRollback": true,

+			"requestorId": "bp896r",

+			"productFamilyId": "FamilyID"

+		},

+		"relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+        ],

+		"requestParameters": {

+			"userParams": []

+		},

+		"platform": {

+    		"platformName": "platformName"

+    	},

+    	"lineOfBusiness": {

+    		"lineOfBusinessName": "lobName"

+    	}

+	}

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/mockGetAAIOperEnvIdResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/mockGetAAIOperEnvIdResponse.json
new file mode 100644
index 0000000..defe3ac
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/mockGetAAIOperEnvIdResponse.json
@@ -0,0 +1,10 @@
+{

+	"operational-environment-id": "testASDCDistributionId",

+	"operational-environment-name": "testASDCDistributionIName",

+	"operational-environment-type": "VNF",

+	"operational-environment-status": "ACTIVE",

+	"tenant-context": "Test",

+	"workload-context": "PVT",

+	"resource-version": "1505228226913",

+	"relationship-list": []	

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/operationalEnvironment.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/operationalEnvironment.json
new file mode 100644
index 0000000..8e33d21
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/operationalEnvironment.json
@@ -0,0 +1,9 @@
+{
+	"operational-environment-id": "testASDCDistributionId",
+	"operational-environment-name": "testASDCDistributionIName",
+	"operational-environment-type": "VNF",
+	"operational-environment-status": "ACTIVE",
+	"tenant-context": "Test",
+	"workload-context": "PVT",
+	"resource-version": "1505228226913"
+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/operationalEnvironmentInvalid.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/operationalEnvironmentInvalid.json
new file mode 100644
index 0000000..5fc454b
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/aai/operationalEnvironmentInvalid.json
@@ -0,0 +1,9 @@
+{

+	"operational-environment-id": "EMOE-001",

+	"operational-environment-name": "Test Managing ECOMP Environment",

+	"operational-environment-type": "ECOMP",

+	"operational-environment-status": "SUCCESS",

+	"tenant-context": "Test",

+	"workload-context": "PVT",

+	"resource-version": "1505228226913"

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/createVnfOperationalEnvironmentRequest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/createVnfOperationalEnvironmentRequest.json
new file mode 100644
index 0000000..8785efe
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/createVnfOperationalEnvironmentRequest.json
@@ -0,0 +1,25 @@
+{
+	"operationalEnvironmentId": "test-vnf-oper-env-000111",
+	"requestDetails": {
+		"requestInfo": {
+			"resourceType": "operationalEnvironment",
+			"instanceName": "myVnfOpEnv",
+			"source": "VID",
+			"requestorId": "az2017"
+		},
+		"relatedInstanceList": [
+			{
+				"relatedInstance": {
+					"resourceType": "operationalEnvironment",
+					"instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
+					"instanceName": "name"
+				}
+			}
+		],
+		"requestParameters": {
+			"operationalEnvironmentType": "VNF",
+			"tenantContext": "Test",
+			"workloadContext": "VNF_E2E-IST"
+		}
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/ecompOperationalEnvironment.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/ecompOperationalEnvironment.json
new file mode 100644
index 0000000..c2350d3
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/ecompOperationalEnvironment.json
@@ -0,0 +1,9 @@
+{
+	"operational-environment-id": "EMOE-001",
+	"operational-environment-name": "Test Managing ECOMP Environment",
+	"operational-environment-type": "ECOMP",
+	"operational-environment-status": "ACTIVE",
+	"tenant-context": "Test",
+	"workload-context": "PVT",
+	"resource-version": "1505228226913"
+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/endpoints.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/endpoints.json
new file mode 100644
index 0000000..2094754
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/vnfoperenv/endpoints.json
@@ -0,0 +1,145 @@
+{
+   "serviceEndPointList": [
+      {
+         "name": "dummy.pod.ns.dummy-pod3",
+         "version": {
+            "major": 1,
+            "minor": 0,
+            "patch": "0"
+         },
+         "hostAddress": "135.144.120.218",
+         "listenPort": "32004",
+         "latitude": "37.7022",
+         "longitude": "121.9358",
+         "registrationTime": "2017-07-18T15:39:17.367+0000",
+         "expirationTime": "9999-10-09T15:39:17.368+0000",
+         "contextPath": "/",
+         "routeOffer": "DEFAULT",
+         "statusInfo": {
+            "status": "RUNNING"
+         },
+         "eventStatusInfo": {
+            "status": "RUNNING"
+         },
+         "validatorStatusInfo": {
+            "status": "RUNNING"
+         },
+         "operationalInfo": {
+            "createdBy": "edge",
+            "updatedBy": "edge",
+            "createdTimestamp": "2017-07-18T15:39:17.367+0000",
+            "updatedTimestamp": "2017-07-18T15:39:17.367+0000"
+         },
+         "protocol": "dummypod-port",
+         "properties": [
+            {
+               "name": "Environment",
+               "value": "DEV"
+            },
+            {
+               "name": "Kubernetes Namespace",
+               "value": "dummy-pod-ns"
+            },
+            {
+               "name": "cpfrun_cluster_name",
+               "value": "CI-PDK1-TFINIT-CJ9125401"
+            }
+         ],
+         "disableType": []
+      },
+      {
+         "name": "dummy.pod.ns.dummy-pod3",
+         "version": {
+            "major": 1,
+            "minor": 0,
+            "patch": "0"
+         },
+         "hostAddress": "135.144.120.22",
+         "listenPort": "32004",
+         "latitude": "1.0",
+         "longitude": "1.0",
+         "registrationTime": "2017-07-18T15:39:17.816+0000",
+         "expirationTime": "9999-10-09T15:39:17.817+0000",
+         "contextPath": "/",
+         "routeOffer": "DEFAULT",
+         "statusInfo": {
+            "status": "RUNNING"
+         },
+         "eventStatusInfo": {
+            "status": "RUNNING"
+         },
+         "validatorStatusInfo": {
+            "status": "RUNNING"
+         },
+         "operationalInfo": {
+            "createdBy": "edge",
+            "updatedBy": "edge",
+            "createdTimestamp": "2017-07-18T15:39:17.816+0000",
+            "updatedTimestamp": "2017-07-18T15:39:17.816+0000"
+         },
+         "protocol": "dummypod-port",
+         "properties": [
+            {
+               "name": "Environment",
+               "value": "DEV"
+            },
+            {
+               "name": "Kubernetes Namespace",
+               "value": "dummy-pod-ns"
+            },
+            {
+               "name": "cpfrun_cluster_name",
+               "value": "CI-PDK1-TFINIT-CJ9125401"
+            }
+         ],
+         "disableType": []
+      },
+      {
+         "name": "dummy.pod.ns.dummy-pod1",
+         "version": {
+            "major": 1,
+            "minor": 0,
+            "patch": "0"
+         },
+         "hostAddress": "135.144.120.218",
+         "listenPort": "32002",
+         "latitude": "1.0",
+         "longitude": "1.0",
+         "registrationTime": "2017-07-18T15:39:14.443+0000",
+         "expirationTime": "9999-10-09T15:39:14.453+0000",
+         "contextPath": "/",
+         "routeOffer": "DEFAULT",
+         "statusInfo": {
+            "status": "RUNNING"
+         },
+         "eventStatusInfo": {
+            "status": "RUNNING"
+         },
+         "validatorStatusInfo": {
+            "status": "RUNNING"
+         },
+         "operationalInfo": {
+            "createdBy": "edge",
+            "updatedBy": "edge",
+            "createdTimestamp": "2017-07-18T15:39:14.443+0000",
+            "updatedTimestamp": "2017-07-18T15:39:14.443+0000"
+         },
+         "protocol": "dummypod-port",
+         "properties": [
+            {
+               "name": "Environment",
+               "value": "DEV"
+            },
+            {
+               "name": "Kubernetes Namespace",
+               "value": "dummy-pod-ns"
+            },
+            {
+               "name": "cpfrun_cluster_name",
+               "value": "CI-PDK1-TFINIT-CJ9125401"
+            }
+         ],
+         "disableType": []
+      }
+   ]
+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/mso.apihandler-infra.properties b/mso-api-handlers/mso-api-handler-infra/src/test/resources/mso.apihandler-infra.properties
new file mode 100644
index 0000000..6aefe15
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/mso.apihandler-infra.properties
@@ -0,0 +1,37 @@
+# This is a chef generated properties file!  Manual updates will be overridden next chef-client run, ensure desired changes are in mso-config chef cookbook or chef env file.
+bpelURL=http://mtanjv9mobp01-eth1-0.aic.cip.att.com:8080/
+bpelAuth=786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1
+camundaURL=http://mtanjv9mobp01-eth1-0.aic.cip.att.com:8080/
+camundaAuth=F8E9452B55DDE4CCE77547B0E748105C54CF5EF1351B4E2CBAABF2981EFE776D
+
+# controls what actions the infra API (APIH) allows sent in on REST request
+vnf.v1.ApiAllowableActions=
+vnf.v2.ApiAllowableActions=DELETE_VF_MODULE,UPDATE_VF_MODULE
+vnf.v3.ApiAllowableActions=CREATE_VF_MODULE,DELETE_VF_MODULE,UPDATE_VF_MODULE
+network.v1.ApiAllowableActions=DELETE,UPDATE
+network.v2.ApiAllowableActions=DELETE,UPDATE
+network.v3.ApiAllowableActions=CREATE,DELETE,UPDATE
+volume.v1.ApiAllowableActions=
+volume.v2.ApiAllowableActions=DELETE_VF_MODULE_VOL,UPDATE_VF_MODULE_VOL
+volume.v3.ApiAllowableActions=CREATE_VF_MODULE_VOL,DELETE_VF_MODULE_VOL,UPDATE_VF_MODULE_VOL
+mso.infra.default.alacarte.orchestrationUri=/mso/async/services/ALaCarteOrchestrator
+mso.infra.default.alacarte.recipeTimeout=180
+
+# Added these properties for Dmaap client for Tenant Isolation
+so.operational-environment.dmaap.username=m97898@mso.ecomp.att.com
+so.operational-environment.dmaap.password=VjR5NDcxSzA=
+so.operational-environment.dmaap.host=https://dcae-mrtr-ftl3.ecomp.cci.att.com:3905
+so.operational-environment.publisher.topic=com.att.ecomp.mso.operationalEnvironmentEvent
+
+# tenant isolation 
+asdc.activate.instanceid=test
+asdc.activate.userid=cs0008
+mso.asdc.client.auth=F3473596C526938329DF877495B494DC374D1C4198ED3AD305EA3ADCBBDA1862
+mso.msoKey=07a7159d3bf51a0e53be7a8f89699be7
+mso.tenant.isolation.retry.count=3
+asdc.endpoint=http://localhost:28090
+aai.auth=757A94191D685FD2092AC1490730A4FC
+aai.endpoint=http://localhost:28090
+grm.endpoint=http://localhost:28090
+grm.username=gmruser
+grm.password=cGFzc3dvcmQ=
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/org/openecomp/mso/client/asdc/create-ecompoe/ecomp-openv-request.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/org/openecomp/mso/client/asdc/create-ecompoe/ecomp-openv-request.json
new file mode 100644
index 0000000..a73302e
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/org/openecomp/mso/client/asdc/create-ecompoe/ecomp-openv-request.json
@@ -0,0 +1,8 @@
+{
+		"operationalEnvironmentId": "28122015552391",
+		"operationalEnvironmentName": "OpEnv-name",
+		"operationalEnvironmentType": "VNF",
+		"tenantContext": "Test",
+		"workloadContext": "VNF_E2E-IST",
+		"action": "Create"
+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2AutoBuildVfModulesFalse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2AutoBuildVfModulesFalse.json
new file mode 100644
index 0000000..ad8140c
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2AutoBuildVfModulesFalse.json
@@ -0,0 +1,43 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2AutoBuildVfModulesTrue.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2AutoBuildVfModulesTrue.json
new file mode 100644
index 0000000..aeb4375
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2AutoBuildVfModulesTrue.json
@@ -0,0 +1,43 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2ModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2ModelVersionId.json
new file mode 100644
index 0000000..aa3835c
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2ModelVersionId.json
@@ -0,0 +1,43 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "configuration", 

+      "modelVersion": "2.0", 

+      "modelVersionId": ""

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2VfModuleModelNameEmptyOnDelete.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2VfModuleModelNameEmptyOnDelete.json
new file mode 100644
index 0000000..f25a759
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2VfModuleModelNameEmptyOnDelete.json
@@ -0,0 +1,38 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21",  

+      "modelType": "vfModule", 

+      "modelVersion": "2.0", 

+      "modelCustomizationName":"",

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb", 

+      "modelCustomizationId": "test",

+      "modelNameVersionId": "test"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : true,

+      "autoBuildVfModules": false, 

+      "usePreload": false,

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    }

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2requestParametersALaCarteFalse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2requestParametersALaCarteFalse.json
new file mode 100644
index 0000000..f63a8aa
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v2requestParametersALaCarteFalse.json
@@ -0,0 +1,44 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {

+      "modelInvariantId": "1710f6e8-1c29-4990-9aea-e943a2ec3d21", 

+      "modelName": "SDNW Service 1710", 

+      "modelType": "service", 

+      "modelVersion": "2.0", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "instanceName" : "testV2aLaCarteFlag",

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": false, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ActivatePortMirrorBadData.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ActivatePortMirrorBadData.json
new file mode 100644
index 0000000..bbd9ac8
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ActivatePortMirrorBadData.json
@@ -0,0 +1,34 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+           "source": "VID",

+	   "requestorId": "az2016"

+      },

+      "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+         

+      ],

+      "requestParameters": {

+	   "userParams": []

+	}

+  }

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ActivatePortMirrorConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ActivatePortMirrorConfiguration.json
new file mode 100644
index 0000000..2fa9327
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ActivatePortMirrorConfiguration.json
@@ -0,0 +1,35 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+           "source": "VID",

+	   "requestorId": "az2016"

+      },

+      "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+         

+      ],

+      "requestParameters": {

+	   "userParams": []

+	}

+  }

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ActivatePortMirrorNoRelatedInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ActivatePortMirrorNoRelatedInstance.json
new file mode 100644
index 0000000..1c39843
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ActivatePortMirrorNoRelatedInstance.json
@@ -0,0 +1,20 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+           "source": "VID",

+	   "requestorId": "az2016"

+      },

+      "requestParameters": {

+	   "userParams": []

+	}

+  }

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5DeactivatePortMirrorBadData.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5DeactivatePortMirrorBadData.json
new file mode 100644
index 0000000..aaa3069
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5DeactivatePortMirrorBadData.json
@@ -0,0 +1,34 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+           "source": "VID",

+	   "requestorId": "az2016"

+      },

+      "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+         

+      ],

+      "requestParameters": {

+	   "userParams": []

+	}

+  }

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5DeactivatePortMirrorConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5DeactivatePortMirrorConfiguration.json
new file mode 100644
index 0000000..2fa9327
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5DeactivatePortMirrorConfiguration.json
@@ -0,0 +1,35 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+           "source": "VID",

+	   "requestorId": "az2016"

+      },

+      "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+         

+      ],

+      "requestParameters": {

+	   "userParams": []

+	}

+  }

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5DeactivatePortMirrorNoRelatedInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5DeactivatePortMirrorNoRelatedInstance.json
new file mode 100644
index 0000000..1c39843
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5DeactivatePortMirrorNoRelatedInstance.json
@@ -0,0 +1,20 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+           "source": "VID",

+	   "requestorId": "az2016"

+      },

+      "requestParameters": {

+	   "userParams": []

+	}

+  }

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorConfiguration.json
new file mode 100644
index 0000000..da0b7b7
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorConfiguration.json
@@ -0,0 +1,40 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+        	"source": "VID",

+			"requestorId": "az2016"

+      },

+      "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         },

+		 {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",

+               "instanceDirection": "source",

+               "modelInfo": {   

+                  "modelType": "connectionPoint"

+               }

+            }

+         }

+      ]

+  }

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorNoConnectionPoint.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorNoConnectionPoint.json
new file mode 100644
index 0000000..2e37674
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorNoConnectionPoint.json
@@ -0,0 +1,31 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+        	"source": "VID",

+			"requestorId": "az2016"

+      },

+      "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         }

+      ]

+  }

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorNoRelatedInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorNoRelatedInstance.json
new file mode 100644
index 0000000..c676cd6
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorNoRelatedInstance.json
@@ -0,0 +1,17 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+        	"source": "VID",

+			"requestorId": "az2016"

+      }

+  }

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorService.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorService.json
new file mode 100644
index 0000000..1ee5e86
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5EnablePortMirrorService.json
@@ -0,0 +1,41 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "vnf",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1",

+          "tenantId": "88a6ca3ee0394ade9403f075db23167e"

+      },

+      "requestInfo": {

+        	"source": "VID",

+			"requestorId": "az2016"

+      },

+      "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         },

+		 {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000",

+               "instanceDirection": "source",

+               "modelInfo": {   

+                  "modelType": "connectionPoint"

+               }

+            }

+         }

+      ]

+  }

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ModelInvariantIdDisablePort.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ModelInvariantIdDisablePort.json
new file mode 100644
index 0000000..f8f983a
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ModelInvariantIdDisablePort.json
@@ -0,0 +1,41 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {  

+      "modelName": "SDNW Service 1710", 

+      "modelType": "network", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ModelInvariantIdNetwork.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ModelInvariantIdNetwork.json
new file mode 100644
index 0000000..f8f983a
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5ModelInvariantIdNetwork.json
@@ -0,0 +1,41 @@
+{

+  "requestDetails": {

+    "cloudConfiguration": {

+      "lcpCloudRegionId": "mtn6", 

+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+    }, 

+    "modelInfo": {  

+      "modelName": "SDNW Service 1710", 

+      "modelType": "network", 

+      "modelVersionId": "1710966e-097c-4d63-afda-e0d3bb7015fb"

+    }, 

+    "requestInfo": {

+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 

+      "requestorId": "bp896r", 

+      "source": "VID", 

+      "suppressRollback": false

+    }, 

+    "requestParameters": {

+      "aLaCarte" : false,

+      "autoBuildVfModules": true, 

+      "subscriptionServiceType": "MSO-dev-service-type", 

+      "userParams": [

+        {

+          "name": "aic_zone", 

+          "value": "mtn6"

+        }

+      ]

+    }, 

+    "subscriberInfo": {

+      "globalSubscriberId": "MSO_1610_dev", 

+      "subscriberName": "MSO_1610_dev"

+    },

+    "project": {

+		"projectName": "projectName"

+	},

+	"owningEntity": {

+      "owningEntityId": "randomStrings", 

+      "owningEntityName": "randomStrings"

+	}

+  }

+}
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateConfiguration.json
new file mode 100644
index 0000000..ae01252
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateConfiguration.json
@@ -0,0 +1,65 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelName": "CONTRAIL30_BASIC",

+         "modelVersion": "1.0",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+		    "instanceName":"port_mirror_config_12345",

+        	"source": "VID",

+			"requestorId": "az2016"

+      },

+      "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         },

+         {

+            "relatedInstance": {

+               "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e",

+				"instanceDirection": "source",

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+               }

+            }

+         },

+         {

+            "relatedInstance": {

+               "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e", 

+			   "instanceDirection": "destination",

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+               }

+            }

+         }

+      ],

+      "requestParameters": {

+	      "userParams": []

+      }

+	}

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateConfigurationBad.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateConfigurationBad.json
new file mode 100644
index 0000000..f046932
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateConfigurationBad.json
@@ -0,0 +1,64 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelName": "CONTRAIL30_BASIC",

+         "modelVersion": "1.0"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+		    "instanceName":"port_mirror_config_12345",

+        	"source": "VID",

+			"requestorId": "az2016"

+      },

+      "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         },

+         {

+            "relatedInstance": {

+               "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e",

+				"instanceDirection": "source",

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+               }

+            }

+         },

+         {

+            "relatedInstance": {

+               "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e", 

+			   "instanceDirection": "destination",

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+               }

+            }

+         }

+      ],

+      "requestParameters": {

+	      "userParams": []

+      }

+	}

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateNoDestinationRelatedInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateNoDestinationRelatedInstance.json
new file mode 100644
index 0000000..85a2017
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateNoDestinationRelatedInstance.json
@@ -0,0 +1,51 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelName": "CONTRAIL30_BASIC",

+         "modelVersion": "1.0",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+		    "instanceName":"port_mirror_config_12345",

+        	"source": "VID",

+			"requestorId": "az2016"

+      },

+      "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         },

+         {

+            "relatedInstance": {

+               "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e",

+				"instanceDirection": "source",

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+               }

+            }

+          }

+      ],

+      "requestParameters": {

+	      "userParams": []

+      }

+	}

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateNoRelatedInstances.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateNoRelatedInstances.json
new file mode 100644
index 0000000..51f4a08
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateNoRelatedInstances.json
@@ -0,0 +1,23 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelName": "CONTRAIL30_BASIC",

+         "modelVersion": "1.0",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+		    "instanceName":"port_mirror_config_12345",

+        	"source": "VID",

+			"requestorId": "az2016"

+      },

+      "requestParameters": {

+	      "userParams": []

+      }

+	}

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateNoSourceRelatedInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateNoSourceRelatedInstance.json
new file mode 100644
index 0000000..fc934b2
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v5PortMirrorCreateNoSourceRelatedInstance.json
@@ -0,0 +1,51 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelName": "CONTRAIL30_BASIC",

+         "modelVersion": "1.0",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+		    "instanceName":"port_mirror_config_12345",

+        	"source": "VID",

+			"requestorId": "az2016"

+      },

+      "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         },

+         {

+            "relatedInstance": {

+               "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e", 

+			   "instanceDirection": "destination",

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+               }

+            }

+         }

+      ],

+      "requestParameters": {

+	      "userParams": []

+      }

+	}

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6AddRelationships.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6AddRelationships.json
new file mode 100644
index 0000000..4b1c47f
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6AddRelationships.json
@@ -0,0 +1,52 @@
+{
+  "requestDetails": {
+      "modelInfo": {
+         "modelType": "service",
+         "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+         "modelName": "Test",
+         "modelVersion": "1.0"
+      },
+      "requestInfo": {
+          "source": "VID",
+          "requestorId": "az2016"
+      },
+      "relatedInstanceList": [
+         {
+            "relatedInstance": {
+               "instanceName": "cisco", 
+               "modelInfo": {
+                  "modelType": "pnf"
+               }
+            }
+         },
+         {
+            "relatedInstance": {
+               "instanceName": "APCON",
+               "modelInfo": {
+                  "modelType": "pnf"
+               }
+            }
+         },
+         {
+            "relatedInstance": {
+               "instanceName": "G10",
+               "modelInfo": {
+                  "modelType": "pnf"
+               }
+            }
+         },
+ {
+            "relatedInstance": {
+               "instanceName": "G10",
+               "modelInfo": {
+                  "modelType": "pnf"
+               }
+            }
+         }
+      ],   
+      "requestParameters": {
+          "aLaCarte": true
+      }
+   }
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6AddRelationshipsBadData.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6AddRelationshipsBadData.json
new file mode 100644
index 0000000..fbaaafa
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6AddRelationshipsBadData.json
@@ -0,0 +1,51 @@
+{
+  "requestDetails": {
+      "modelInfo": {
+         "modelType": "service",
+         "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+         "modelName": "Test",
+         "modelVersion": "1.0"
+      },
+      "requestInfo": {
+          "source": "VID",
+          "requestorId": "az2016"
+      },
+      "relatedInstanceList": [
+         {
+            "relatedInstance": {
+               "modelInfo": {
+                  "modelType": "pnf"
+               }
+            }
+         },
+         {
+            "relatedInstance": {
+               "instanceName": "APCON",
+               "modelInfo": {
+                  "modelType": "pnf"
+               }
+            }
+         },
+         {
+            "relatedInstance": {
+               "instanceName": "G10",
+               "modelInfo": {
+                  "modelType": "pnf"
+               }
+            }
+         },
+ {
+            "relatedInstance": {
+               "instanceName": "G10",
+               "modelInfo": {
+                  "modelType": "pnf"
+               }
+            }
+         }
+      ],   
+      "requestParameters": {
+          "aLaCarte": true
+      }
+   }
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6PortMirrorCreateConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6PortMirrorCreateConfiguration.json
new file mode 100644
index 0000000..2df5b22
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6PortMirrorCreateConfiguration.json
@@ -0,0 +1,66 @@
+{

+  "requestDetails": {

+      "modelInfo": {

+         "modelType": "configuration",

+         "modelInvariantId": "2a0bc52d-f32b-4849-b6d8-9bb4b0e3220a",

+         "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3ff",

+         "modelName": "CONTRAIL30_BASIC",

+         "modelVersion": "1.0",

+         "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+      },

+      "cloudConfiguration": {

+          "lcpCloudRegionId": "mdt1"

+      },

+      "requestInfo": {

+		    "instanceName":"port_mirror_config_12345",

+        	"source": "VID",

+			"requestorId": "az2016"

+      },

+      "relatedInstanceList": [

+         {

+            "relatedInstance": {

+               "instanceId": "ff305d54-75b4-431b-adb2-eb6b9e5ff000", 

+               "modelInfo": {   

+                  "modelType": "service",

+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0"

+               }

+            }

+         },

+         {

+            "relatedInstance": {

+               "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e",

+				"instanceDirection": "source",

+               "modelInfo": {   

+                  "modelType": "vnf",

+                  "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+               }

+            }

+         },

+         {

+            "relatedInstance": {

+               "instanceId": "aca51b0a-710d-4155-bc7c-7cef19d9a94e", 

+               "instanceName": "vSAMP12",

+			   "instanceDirection": "destination",

+               "modelInfo": {   

+                  "modelType": "pnf",

+                  "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",

+                  "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",

+                  "modelName": "vSAMP12",

+                  "modelVersion": "1.0",

+                  "modelCustomizationId": "b0ed83ec-b7b4-4c70-91c2-63feeaf8609b"

+               }

+            }

+         }

+      ],

+      "requestParameters": {

+	      "userParams": []

+      }

+	}

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6VnfDeleteInstance.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6VnfDeleteInstance.json
new file mode 100644
index 0000000..13c9386
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/v6VnfDeleteInstance.json
@@ -0,0 +1,42 @@
+{

+	"requestDetails": {

+		"modelInfo": {

+			"modelType": "vnf",

+			"modelInvariantId": "2fff5b20-214b-11e7-93ae-92361f002671",

+			"modelVersionId": "ff2ae348-214a-11e7-93ae-92361f002671",

+			"modelName": "vSAMP10a",

+			"modelVersion": "1.0",

+			"modelCustomizationName": "vSAMP10a 1",

+			"modelCustomizationId": "68dc9a92-214c-11e7-93ae-92361f002671"

+		},

+		"cloudConfiguration": {

+			"lcpCloudRegionId": "mtn6",

+			"tenantId": "19123c2924c648eb8e42a3c1f14b7682"

+		},

+		"requestInfo": {

+			"instanceName": "MSO_Dev_1802_VNF_10-9-1",

+			"productFamilyId": "06f76284-8710-11e6-ae22-56b6b6499611",

+			"source": "VID",

+			"suppressRollback": false,

+			"requestorId": "md5621"

+		},

+		"relatedInstanceList": [

+		{

+			"relatedInstance": {

+			"instanceId": "c44dd5dc-849b-4691-b3c4-111c33140389",

+			"modelInfo": {

+				"modelType": "service",

+				"modelInvariantId": "9647dfc4-2083-11e7-93ae-92361f002671",

+				"modelVersionId": "5df8b6de-2083-11e7-93ae-92361f002671",

+				"modelName": "MSOTADevInfra_vSAMP10a_Service",

+				"modelVersion": "1.0"

+			}

+		}

+	}

+	],

+		"requestParameters": {

+			"autoBuildVfModules": false,

+			"payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"

+		}

+	}

+}
\ No newline at end of file