ensure data for si matches on macro requests

Fixed failing ValidationExceptionTest
Moved MacroRequest.json to test specific folder
Moved resource files to test specific folder
Cleaned up comments from UserParamsValidationTest
Refactored modelInfoValidation method
Removed unused constants from ValidationException
Removed unused ValidationException
ADded overrideExistingMessage boolean
Added test for missing modelType in userParams service object
Fixed failing JUnit tests in MsoRequestTest
Started fixing failing JUnit tests
Began adding validation and tests for userParams modelInfo
Began adding validation for instanceName

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

16 files changed, 79 insertions, 47 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/AssignCloudConfigVnf.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/AssignCloudConfigVnf.json
index 9e571e6e37..9d575695c5 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/AssignCloudConfigVnf.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/AssignCloudConfigVnf.json
@@ -34,9 +34,11 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "testModelName", 
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
-              "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" 
+              "modelType": "service", 
+		      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+		      "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", 
+		      "modelName": "testModelName", 
+		      "modelVersion": "10" 
             }, 
             "instanceParams": [], 
             "resources": { 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/Network.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/Network.json
index 26bb2172f8..a7d930f756 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/Network.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/Network.json
@@ -34,9 +34,11 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "MOW vMX BV 1 Service", 
-              "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b" 
+              "modelType": "service", 
+		      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+		      "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", 
+		      "modelName": "MOW vMX BV 1 Service", 
+		      "modelVersion": "10"
             }, 
             "instanceParams": [], 
             "resources": { 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkCloudConfig.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkCloudConfig.json
index 6b32f3ebe3..75e8fb5cd1 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkCloudConfig.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkCloudConfig.json
@@ -34,9 +34,11 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "MOW vMX BV 1 Service", 
-              "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b" 
+              "modelType": "service", 
+		      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+		      "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", 
+		      "modelName": "MOW vMX BV 1 Service", 
+		      "modelVersion": "10" 
             }, 
             "instanceParams": [], 
             "resources": { 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkModelCustomizationId.json
index 1aa6094513..baf620b668 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkModelCustomizationId.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkModelCustomizationId.json
@@ -34,9 +34,11 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "MOW vMX BV 1 Service",
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b", 
-              "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" 
+              "modelType": "service", 
+		      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+		      "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", 
+		      "modelName": "MOW vMX BV 1 Service", 
+		      "modelVersion": "10" 
             }, 
             "instanceParams": [], 
             "resources": { 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkModelVersionId.json
index 1fddf7970b..6c152855ee 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkModelVersionId.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/NetworkModelVersionId.json
@@ -34,9 +34,11 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "MOW vMX BV 1 Service",
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b", 
-              "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" 
+              "modelType": "service", 
+		      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+		      "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", 
+		      "modelName": "MOW vMX BV 1 Service", 
+		      "modelVersion": "10" 
             }, 
             "instanceParams": [], 
             "resources": { 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/ProductFamilyId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/ProductFamilyId.json
index f9a5ea9a01..3f93139587 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/ProductFamilyId.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/ProductFamilyId.json
@@ -34,9 +34,11 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "MOW vMX BV 1 Service", 
-              "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b" 
+              "modelType": "service", 
+		      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+		      "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", 
+		      "modelName": "MOW vMX BV 1 Service", 
+		      "modelVersion": "10" 
             }, 
             "instanceParams": [], 
             "resources": { 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsModelVersionId.json
index 8d3ed69863..f3592c2e05 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsModelVersionId.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsModelVersionId.json
@@ -34,8 +34,10 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "MOW vMX BV 1 Service", 
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0a"
+              "modelType": "service", 
+		      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+		      "modelName": "MOW vMX BV 1 Service", 
+		      "modelVersion": "10" 
             }, 
             "instanceParams": [], 
             "resources": { 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsPlatform.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsPlatform.json
index f05fdb06ba..0fbe1dadcc 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsPlatform.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsPlatform.json
@@ -34,9 +34,11 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "MOW vMX BV 1 Service", 
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b",
-              "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" 
+              "modelType": "service", 
+		      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+		      "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", 
+		      "modelName": "MOW vMX BV 1 Service", 
+		      "modelVersion": "10" 
             }, 
             "instanceParams": [], 
             "resources": { 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsPlatformName.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsPlatformName.json
index 4436baffe4..e94c5aad13 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsPlatformName.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsPlatformName.json
@@ -34,9 +34,11 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "MOW vMX BV 1 Service", 
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b",
-              "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" 
+              "modelType": "service", 
+		      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+		      "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", 
+		      "modelName": "MOW vMX BV 1 Service", 
+		      "modelVersion": "10" 
             }, 
             "instanceParams": [], 
             "resources": { 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsVnfModelInfo.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsVnfModelInfo.json
index e31523f99d..c19784f2fe 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsVnfModelInfo.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/UserParamsVnfModelInfo.json
@@ -34,9 +34,11 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "MOW vMX BV 1 Service", 
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b",
-              "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" 
+              "modelType": "service", 
+			  "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+			  "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", 
+			  "modelName": "MOW vMX BV 1 Service", 
+			  "modelVersion": "10" 
             }, 
             "instanceParams": [], 
             "resources": { 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelCustomizationId.json
index 0cf4928581..f315ff89a6 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelCustomizationId.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelCustomizationId.json
@@ -34,9 +34,11 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "MOW vMX BV 1 Service", 
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b",
-              "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" 
+              "modelType": "service", 
+		      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+		      "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", 
+		      "modelName": "MOW vMX BV 1 Service", 
+		      "modelVersion": "10" 
             }, 
             "instanceParams": [], 
             "resources": { 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelVersionId.json
index 5362b439dc..91e71839a2 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelVersionId.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModuleModelVersionId.json
@@ -34,9 +34,11 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "MOW vMX BV 1 Service", 
-              "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b" 
+              "modelType": "service", 
+		      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+		      "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", 
+		      "modelName": "MOW vMX BV 1 Service", 
+		      "modelVersion": "10"
             }, 
             "instanceParams": [], 
             "resources": { 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModules.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModules.json
index ad1c02e37b..fedaad42df 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModules.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModules.json
@@ -34,9 +34,11 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "MOW vMX BV 1 Service", 
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
-              "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" 
+              "modelType": "service", 
+		      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+		      "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", 
+		      "modelName": "MOW vMX BV 1 Service", 
+		      "modelVersion": "10" 
             }, 
             "instanceParams": [], 
             "resources": { 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModulesModelInfo.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModulesModelInfo.json
index 81904fe66a..612586c84f 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModulesModelInfo.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VfModulesModelInfo.json
@@ -34,9 +34,11 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "MOW vMX BV 1 Service", 
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b",
-              "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" 
+              "modelType": "service", 
+		      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+		      "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", 
+		      "modelName": "MOW vMX BV 1 Service", 
+		      "modelVersion": "10" 
             }, 
             "instanceParams": [], 
             "resources": { 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfModelCustomizationId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfModelCustomizationId.json
index 5b4097793c..8709619fb9 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfModelCustomizationId.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfModelCustomizationId.json
@@ -34,9 +34,11 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "MOW vMX BV 1 Service", 
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b",
-              "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a" 
+              "modelType": "service", 
+		      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+		      "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", 
+		      "modelName": "MOW vMX BV 1 Service", 
+		      "modelVersion": "10" 
             }, 
             "instanceParams": [], 
             "resources": { 
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfModelVersionId.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfModelVersionId.json
index b52be1f4c2..9c650ad439 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfModelVersionId.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/MsoRequestTest/RequestParameters/VnfModelVersionId.json
@@ -34,9 +34,11 @@
         { 
           "service": { 
             "modelInfo": { 
-              "modelName": "MOW vMX BV 1 Service", 
-              "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
-              "modelCustomizationId": "3c40d244-808e-42ca-b09a-256d83d19d0b" 
+              "modelType": "service", 
+		      "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b", 
+		      "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a", 
+		      "modelName": "MOW vMX BV 1 Service", 
+		      "modelVersion": "10" 
             }, 
             "instanceParams": [], 
             "resources": {