From 1ba64a4a45f26e8bdb58e866e540aa58f32e2e52 Mon Sep 17 00:00:00 2001
From: Ofir Sonsino <os0695@att.com>
Date: Wed, 20 Sep 2017 14:08:19 +0300
Subject: Change management and PNF support

Issue-ID: VID-44, VID-48, VID-49, VID-50, VID-51, VID-52
Change-Id: I83e940aad2e4e294a0927b546c4c08ca8e539a65
Signed-off-by: Ofir Sonsino <os0695@att.com>
---
 vid-app-common/src/main/resources/json/mso/modelInfo     | 13 +++++++++++--
 vid-app-common/src/main/resources/json/mso/request       | 10 ++++++++--
 vid-app-common/src/main/resources/json/mso/requestInfo   |  8 ++++++++
 vid-app-common/src/main/resources/json/mso/requestStatus | 10 +++++++---
 4 files changed, 34 insertions(+), 7 deletions(-)

(limited to 'vid-app-common/src/main/resources/json')

diff --git a/vid-app-common/src/main/resources/json/mso/modelInfo b/vid-app-common/src/main/resources/json/mso/modelInfo
index 2504d517b..dcb31128d 100755
--- a/vid-app-common/src/main/resources/json/mso/modelInfo
+++ b/vid-app-common/src/main/resources/json/mso/modelInfo
@@ -7,11 +7,19 @@
 			"description": "reference to the customized set of parameters associated with a model in a given service context",
 			"type": "string"
 		},
+		"modelCustomizationId": {
+			"description": "reference to the customized set of parameters associated with a model in a given service context",
+			"type": "string"
+		},
 		"modelInvariantId": {
 			"description": "Invariant UUID for the model name, irrespective of the version, as defined in SDC--authoritative",
 			"type": "string",
 			"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
 		},
+        "modelVersionId": {
+                "description": "Version id for version",
+                "type": "string"
+            },
 		"modelName": {
 			"description": "name of the model as defined in SDC--not authoritative",
 			"type": "string"
@@ -29,12 +37,13 @@
 				"service",
 				"vfModule",
 				"vnf",
-				"volumeGroup"
+				"volumeGroup",
+				"configuration"
 			]
 		},
 		"modelVersion": {
 			"description": "the version of the model as defined in SDC--not authoritative",
-			"type": "number"
+			"type": "string"
 		}
 	},
 	"required": ["modelType"]
diff --git a/vid-app-common/src/main/resources/json/mso/request b/vid-app-common/src/main/resources/json/mso/request
index 3aaadbfbc..95720bf91 100755
--- a/vid-app-common/src/main/resources/json/mso/request
+++ b/vid-app-common/src/main/resources/json/mso/request
@@ -22,7 +22,9 @@
 				"service",
 				"vfModule",
 				"vnf",
-				"volumeGroup"
+				"volumeGroup",
+				"unknown",
+				"configuration"
 			]
 		},
 		"requestStatus": {},
@@ -33,7 +35,11 @@
 				"createInstance",
 				"deleteInstance",
 				"replaceInstance",
-				"updateInstance"
+				"updateInstance",
+				"activateInstance",
+				"deactivateInstance",
+				"unknown",
+				"not provided"
 			]
 		},
 		"startTime": {
diff --git a/vid-app-common/src/main/resources/json/mso/requestInfo b/vid-app-common/src/main/resources/json/mso/requestInfo
index 56db42fce..5fcf74c7c 100755
--- a/vid-app-common/src/main/resources/json/mso/requestInfo
+++ b/vid-app-common/src/main/resources/json/mso/requestInfo
@@ -37,6 +37,14 @@
 		"suppressRollback": {
 			"description": "true or false boolean indicating whether rollbacks should be suppressed on failures",
 			"type": "boolean"
+		},
+		"responseValue": {
+			"description": "Is the user selected value based on the validResponses list provided to complete the manual task",
+			"type": "string"
+		},
+		"requestorId": {
+			"description": "The id of the person who initiated the completion request",
+			"type": "string"
 		}
 	},
 
diff --git a/vid-app-common/src/main/resources/json/mso/requestStatus b/vid-app-common/src/main/resources/json/mso/requestStatus
index 9eacb6bb1..11b285636 100755
--- a/vid-app-common/src/main/resources/json/mso/requestStatus
+++ b/vid-app-common/src/main/resources/json/mso/requestStatus
@@ -9,9 +9,13 @@
         "requestState": {
             "description": "short description of the instantiation state",
             "enum": [
-                "complete",
-                "failed",
-                "inProgress"
+                "COMPLETE",
+                "FAILED",
+                "IN_PROGRESS",
+                "PENDING",
+                "UNLOCKED",
+                "COMPLETED",
+                ""
             ],
             "type": "string"
         },
-- 
cgit 1.2.3-korg