Containerization feature of SO

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

39 files changed, 1704 insertions, 0 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ConfigurationModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ConfigurationModelVersionId.json
new file mode 100644
index 0000000000..6506a33dc7
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/InvalidModelInvariantId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/InvalidModelInvariantId.json
new file mode 100644
index 0000000000..9bee294b0e
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/InvalidModelInvariantId.json
@@ -0,0 +1,44 @@
+{
+  "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": {
+      "instanceName": "test",
+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 
+      "requestorId": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelCustomization.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelCustomization.json
new file mode 100644
index 0000000000..9a983609aa
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelCustomization.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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelCustomizationId.json
new file mode 100644
index 0000000000..8b327fbb9b
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelCustomizationIdUsingPreload.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelCustomizationIdUsingPreload.json
new file mode 100644
index 0000000000..5d1b6b4747
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelCustomizationName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelCustomizationName.json
new file mode 100644
index 0000000000..74dc205d1e
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelCustomizationName.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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelInfoNull.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInfoNull.json
new file mode 100644
index 0000000000..bbc8b7f9ef
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInfoNull.json
@@ -0,0 +1,37 @@
+{
+  "requestDetails": {
+    "cloudConfiguration": {
+      "lcpCloudRegionId": "mtn6", 
+      "tenantId": "19123c2924c648eb8e42a3c1f14b7682"
+    }, 
+    "requestInfo": {
+      "instanceName" : "testV2aLaCarteFlag",
+      "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", 
+      "requestorId": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelInvariantId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInvariantId.json
new file mode 100644
index 0000000000..b974f3c9d6
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelInvariantIdConfiguration.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInvariantIdConfiguration.json
new file mode 100644
index 0000000000..d42cc7e456
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelInvariantIdConfigurationDelete.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInvariantIdConfigurationDelete.json
new file mode 100644
index 0000000000..d42cc7e456
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelInvariantIdService.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInvariantIdService.json
new file mode 100644
index 0000000000..edaf25bc3a
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelInvariantIdVnf.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelInvariantIdVnf.json
new file mode 100644
index 0000000000..a7076c34dd
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelNameVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelNameVersionId.json
new file mode 100644
index 0000000000..7b46671afe
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelTypeNull.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelTypeNull.json
new file mode 100644
index 0000000000..6203060537
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionId.json
new file mode 100644
index 0000000000..35300c221f
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelVersionIdCreate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionIdCreate.json
new file mode 100644
index 0000000000..2a57dc9306
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelVersionNetwork.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionNetwork.json
new file mode 100644
index 0000000000..06eb779a84
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelVersionService.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionService.json
new file mode 100644
index 0000000000..767dc4f78c
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelVersionServiceCreate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionServiceCreate.json
new file mode 100644
index 0000000000..f0eef84b95
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionServiceCreate.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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ModelVersionVfModule.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ModelVersionVfModule.json
new file mode 100644
index 0000000000..94ef050cfb
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ServiceModelNameEmptyOnActivate.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ServiceModelNameEmptyOnActivate.json
new file mode 100644
index 0000000000..7c33e25145
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ServiceModelNameEmptyOnDelete.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ServiceModelNameEmptyOnDelete.json
new file mode 100644
index 0000000000..7c33e25145
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ValidModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ValidModelCustomizationId.json
new file mode 100644
index 0000000000..bca68504cb
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/ValidModelCustomizationIdService.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/ValidModelCustomizationIdService.json
new file mode 100644
index 0000000000..06ea217607
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/VfModuleModelName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VfModuleModelName.json
new file mode 100644
index 0000000000..839c58a5af
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/VnfModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VnfModelCustomizationId.json
new file mode 100644
index 0000000000..3ed83a4642
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/VnfModelCustomizationIdEmpty.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VnfModelCustomizationIdEmpty.json
new file mode 100644
index 0000000000..a2d25594c0
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/VnfModelCustomizationIdPreload.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VnfModelCustomizationIdPreload.json
new file mode 100644
index 0000000000..f6206f49ba
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/VnfModelCustomizationNameNull.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VnfModelCustomizationNameNull.json
new file mode 100644
index 0000000000..985ad376d8
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/VnfModelCustomizationTest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/VnfModelCustomizationTest.json
new file mode 100644
index 0000000000..a8a4021694
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/v2ModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v2ModelVersionId.json
new file mode 100644
index 0000000000..7863e67a5d
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/v3UpdateNetworkBad.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v3UpdateNetworkBad.json
new file mode 100644
index 0000000000..5feffd2f24
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v3UpdateNetworkBad.json
@@ -0,0 +1,38 @@
+{
+  "requestDetails": {
+      "modelInfo": {
+          "modelType": "network",
+          "modelName": "CONTRAIL30_BASIC",
+          "modelCustomizationName": "CONTRAIL30_BASIC 1"
+      },
+      "cloudConfiguration": {
+          "lcpCloudRegionId": "mdt1",
+          "tenantId": "8b1df54faa3b49078e3416e21370a3ba"
+      },
+      "requestInfo": {
+          "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+          "source": "VID",
+          "suppressRollback": true,
+          "requestorId": "xxxxxx"
+      },
+      "relatedInstanceList": [
+         {
+            "relatedInstance": {
+               "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc",
+               "modelInfo": {   
+                  "modelType": "service",
+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+                  "modelName": "{parent service model name}",
+                  "modelVersion": "1.0"
+               }
+            }
+         }
+
+      ],
+      "requestParameters": {
+          "userParams": []
+
+      }
+  }
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v4CreateVfModuleMissingModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v4CreateVfModuleMissingModelCustomizationId.json
new file mode 100644
index 0000000000..c5539ac083
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v4CreateVfModuleMissingModelCustomizationId.json
@@ -0,0 +1,61 @@
+{
+  "requestDetails": {
+      "modelInfo": {
+          "modelType": "vfModule",
+          "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
+          "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
+          "modelName": "Test",
+          "modelVersion": "1"
+      },
+      "cloudConfiguration": {
+          "lcpCloudRegionId": "mdt1",
+          "tenantId": "88a6ca3ee0394ade9403f075db23167e"
+      },
+      "requestInfo": {
+          "instanceName": "MSOTEST103a-vSAMP12_base_module-0",
+          "source": "VID",
+          "suppressRollback": true,
+          "requestorId": "xxxxxx"
+      },
+      "relatedInstanceList": [
+         {
+            "relatedInstance": {
+               "instanceId": "17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c",
+               "instanceName": "MSOTESTVOL103a-vSAMP12_base_module-0_vol",
+               "modelInfo": {   
+                  "modelType": "volumeGroup"
+               }
+            }
+         },
+         {
+            "relatedInstance": {
+               "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc",
+               "modelInfo": {   
+                  "modelType": "service",
+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+                  "modelName": "Test",
+                  "modelVersion": "1.0"
+               }
+            }
+         },
+         {
+            "relatedInstance": {
+               "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc",
+               "modelInfo": {
+                  "modelType": "vnf",
+                  "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
+                  "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
+                  "modelName": "vSAMP12",
+                  "modelVersion": "1.0",
+		     	  "modelCustomizationName": "vSAMP12 1"
+               }
+            }
+         }
+      ],
+      "requestParameters": {
+          "usePreload": false,
+          "userParams": []
+      }
+  }
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v4CreateVfModuleNoCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v4CreateVfModuleNoCustomizationId.json
new file mode 100644
index 0000000000..1ca749f66f
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v4CreateVfModuleNoCustomizationId.json
@@ -0,0 +1,61 @@
+{
+  "requestDetails": {
+      "modelInfo": {
+          "modelType": "vfModule",
+          "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
+          "modelVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
+          "modelName": "Test",
+          "modelVersion": "1"
+      },
+      "cloudConfiguration": {
+          "lcpCloudRegionId": "mdt1",
+          "tenantId": "88a6ca3ee0394ade9403f075db23167e"
+      },
+      "requestInfo": {
+          "instanceName": "MSOTEST103a-vSAMP12_base_module-0",
+          "source": "VID",
+          "suppressRollback": true,
+          "requestorId": "xxxxxx"
+      },
+      "relatedInstanceList": [
+         {
+            "relatedInstance": {
+               "instanceId": "17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c",
+               "instanceName": "MSOTESTVOL103a-vSAMP12_base_module-0_vol",
+               "modelInfo": {   
+                  "modelType": "volumeGroup"
+               }
+            }
+         },
+         {
+            "relatedInstance": {
+               "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc",
+               "modelInfo": {   
+                  "modelType": "service",
+                  "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+                  "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+                  "modelName": "Test",
+                  "modelVersion": "1.0"
+               }
+            }
+         },
+         {
+            "relatedInstance": {
+               "instanceId": "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc",
+               "modelInfo": {
+                  "modelType": "vnf",
+                  "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
+                  "modelVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
+                  "modelName": "vSAMP12",
+                  "modelVersion": "1.0",
+		     "modelCustomizationName": "vSAMP12 1"
+               }
+            }
+         }
+      ],
+      "requestParameters": {
+          "usePreload": true,
+          "userParams": []
+      }
+  }
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5ActivateModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5ActivateModelVersionId.json
new file mode 100644
index 0000000000..9b78da9be9
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5ActivateModelVersionId.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": "xxxxxx"
+      },
+      "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/MsoRequestTest/ModelInfo/v5CreateConfigurationModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5CreateConfigurationModelCustomizationId.json
new file mode 100644
index 0000000000..2e8e0dbebc
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5CreateConfigurationModelCustomizationId.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": "xxxxxx"
+      },
+      "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/MsoRequestTest/ModelInfo/v5DeactivateModelInvariantId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5DeactivateModelInvariantId.json
new file mode 100644
index 0000000000..4b80bb1e8f
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5DeactivateModelInvariantId.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": "xxxxxx"
+      },
+      "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/MsoRequestTest/ModelInfo/v5ModelInvariantIdDisablePort.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5ModelInvariantIdDisablePort.json
new file mode 100644
index 0000000000..6e1883edab
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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/MsoRequestTest/ModelInfo/v5ModelInvariantIdNetwork.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/v5ModelInvariantIdNetwork.json
new file mode 100644
index 0000000000..6e1883edab
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/ModelInfo/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": "xxxxxx", 
+      "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