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>

8 files changed, 156 insertions, 7 deletions

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"

         },

diff --git a/vid-app-common/src/main/resources/mso_complete_manual_task.json b/vid-app-common/src/main/resources/mso_complete_manual_task.json
new file mode 100644
index 000000000..625c9d9d0
--- /dev/null
+++ b/vid-app-common/src/main/resources/mso_complete_manual_task.json
@@ -0,0 +1,5 @@
+{
+  "taskRequestReference": {
+     "taskId": "daf4dd84-b77a-42da-a051-3239b7a9392c"
+      }
+}
diff --git a/vid-app-common/src/main/resources/mso_create_instance_response.json b/vid-app-common/src/main/resources/mso_create_instance_response.json
new file mode 100644
index 000000000..19763bc9a
--- /dev/null
+++ b/vid-app-common/src/main/resources/mso_create_instance_response.json
@@ -0,0 +1,6 @@
+{
+  "requestReferences": {
+    "instanceId": "ba00de9b-3c3e-4b0a-a1ad-0c5489e711fb",
+    "requestId": "311cc766-b673-4a50-b9c5-471f68914586"
+  }
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/mso_get_manual_task_by_request_id.json b/vid-app-common/src/main/resources/mso_get_manual_task_by_request_id.json
new file mode 100644
index 000000000..004280bce
--- /dev/null
+++ b/vid-app-common/src/main/resources/mso_get_manual_task_by_request_id.json
@@ -0,0 +1,23 @@
+{  
+   "taskList":[  
+      {  
+         "taskId":"daf4dd84-b77a-42da-a051-3239b7a9392c",
+         "type":"fallout",
+         "nfRole":"vSCP",
+         "subscriptionServiceType":"Mobility",
+         "originalRequestId":"za1234d1-5a33-55df-13ab-12abad84e335",
+         "originalRequestorId":"ss835w",
+         "errorSource":"A&AI",
+         "errorCode":"404",
+         "errorMessage":"Failed in A&AI 404",
+         "buildingBlockName":"DoCreateVfModule",
+         "buildingBlockStep":"invokeA&AI:getTenant",
+         "validResponses":[  
+            "rollback",
+            "abort",
+            "skip",
+            "retry"
+         ]
+      }
+   ]
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/mso_get_orchestration_requests.json b/vid-app-common/src/main/resources/mso_get_orchestration_requests.json
new file mode 100644
index 000000000..430ebc498
--- /dev/null
+++ b/vid-app-common/src/main/resources/mso_get_orchestration_requests.json
@@ -0,0 +1,88 @@
+{  
+   "requestList":[  
+      {  
+         "request":{  
+            "requestId":"25272f7e-74c6-4afc-966a-4587f2c30bae",
+            "startTime":"Mon, 31 Jul 2017 23:25:30 GMT",
+            "requestScope":"vnf",
+            "requestType":"updateInstance",
+            "requestDetails":null,
+            "instanceReferences":{  
+               "serviceInstanceId":null,
+               "serviceInstanceName":null,
+               "vnfInstanceId":null,
+               "vnfInstanceName":null,
+               "vfModuleInstanceId":null,
+               "vfModuleInstanceName":null,
+               "volumeGroupInstanceId":null,
+               "volumeGroupInstanceName":null,
+               "networkInstanceId":null,
+               "networkInstanceName":null,
+               "requestorId":"md5621"
+            },
+            "requestStatus":{  
+               "requestState":"IN_PROGRESS",
+               "statusMessage":null,
+               "percentProgress":20,
+               "finishTime":null
+            }
+         }
+      },
+      {  
+         "request":{  
+            "requestId":"25272f7e-74c6-4afc-966a-4587f2c30bae",
+            "startTime":"Mon, 31 Jul 2017 23:25:30 GMT",
+            "requestScope":"service",
+            "requestType":"createInstance",
+            "requestDetails":null,
+            "instanceReferences":{  
+               "serviceInstanceId":null,
+               "serviceInstanceName":null,
+               "vnfInstanceId":null,
+               "vnfInstanceName":null,
+               "vfModuleInstanceId":null,
+               "vfModuleInstanceName":null,
+               "volumeGroupInstanceId":null,
+               "volumeGroupInstanceName":null,
+               "networkInstanceId":null,
+               "networkInstanceName":null,
+               "requestorId":"md5621"
+            },
+            "requestStatus":{  
+               "requestState":"IN_PROGRESS",
+               "statusMessage":null,
+               "percentProgress":20,
+               "finishTime":null
+            }
+         }
+      },
+      {  
+         "request":{  
+            "requestId":"9d6819e1-76e6-4e28-ad08-367632f41c7e",
+            "startTime":"Fri, 20 May 2016 19:07:57 GMT",
+            "requestScope":"vnf",
+            "requestType":"replaceInstance",
+            "requestDetails":null,
+            "instanceReferences":{  
+               "serviceInstanceId":null,
+               "serviceInstanceName":null,
+               "vnfInstanceId":null,
+               "vnfInstanceName":null,
+               "vfModuleInstanceId":null,
+               "vfModuleInstanceName":null,
+               "volumeGroupInstanceId":null,
+               "volumeGroupInstanceName":null,
+               "networkInstanceId":null,
+               "networkInstanceName":null,
+               "requestorId":null
+            },
+            "requestStatus":{  
+               "requestState":"FAILED",
+               "statusMessage":"Service request FAILED schema validation. No valid format for volume request is specified",
+               "percentProgress":100,
+               "finishTime":"Fri, 20 May 2016 19:07:57 GMT"
+            }
+         }
+      }
+   ]
+}
\ No newline at end of file