From c72d565bb58226b20625b2bce5f0019046bee649 Mon Sep 17 00:00:00 2001
From: "Sonsino, Ofir (os0695)" <os0695@intl.att.com>
Date: Tue, 10 Jul 2018 14:20:54 +0300
Subject: Merge 1806 code of vid-common

Change-Id: I75d52abed4a24dfe3827d79edc4a2938726aa87a
Issue-ID: VID-208
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
---
 .../src/main/resources/json/mso/asyncRequestStatus | 54 ----------------------
 .../src/main/resources/json/mso/modelInfo          | 11 +----
 vid-app-common/src/main/resources/json/mso/request | 23 +--------
 3 files changed, 3 insertions(+), 85 deletions(-)
 delete mode 100755 vid-app-common/src/main/resources/json/mso/asyncRequestStatus

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

diff --git a/vid-app-common/src/main/resources/json/mso/asyncRequestStatus b/vid-app-common/src/main/resources/json/mso/asyncRequestStatus
deleted file mode 100755
index 23d2c2882..000000000
--- a/vid-app-common/src/main/resources/json/mso/asyncRequestStatus
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "request structure",
-    "properties": {
-        "correlator": {
-            "description": "Optional correlation Id originally provided with the request in requestInfo",
-            "type": "string"
-        },
-        "finishTime": {
-            "description": "Date and time the request was finished in GMT with the following sample format: Wed, 15 Oct 2014 13:01:52 GMT",
-            "type": "string"
-        },
-        "instanceIds": {},
-        "requestId": {
-            "description": "UUID for the request generated by the instantiation service",
-            "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}$",
-            "type": "string"
-        },
-        "requestScope": {
-            "description": "short description of the entity being operated on",
-            "enum": [
-                "network",
-                "service",
-                "vfModule",
-                "vnf",
-                "volumeGroup"
-            ],
-            "type": "string"
-        },
-        "requestStatus": {},
-        "requestType": {
-            "description": "short description of the action being performed on the requestScope",
-            "enum": [
-                "createInstance",
-                "deleteInstance",
-                "replaceInstance",
-                "updateInstance"
-            ],
-            "type": "string"
-        },
-        "startTime": {
-            "description": "Date and time the request was created in GMT with the following sample format: Wed, 15 Oct 2014 13:01:52 GMT",
-            "type": "string"
-        }
-    },
-    "required": [
-        "requestId",
-        "requestScope",
-        "requestStatus",
-        "requestType",
-        "startTime"
-    ],
-    "type": "object"
-}
diff --git a/vid-app-common/src/main/resources/json/mso/modelInfo b/vid-app-common/src/main/resources/json/mso/modelInfo
index d368e3532..56d268ce9 100755
--- a/vid-app-common/src/main/resources/json/mso/modelInfo
+++ b/vid-app-common/src/main/resources/json/mso/modelInfo
@@ -31,16 +31,7 @@
 		},
 		"modelType": {
 			"description": "short description of the entity being operated on",
-			"type": "string",
-			"enum": [
-			    "pnf",
-				"network",
-				"service",
-				"vfModule",
-				"vnf",
-				"volumeGroup",
-				"configuration"
-			]
+			"type": "string"
 		},
 		"modelVersion": {
 			"description": "the version of the model as defined in SDC--not authoritative",
diff --git a/vid-app-common/src/main/resources/json/mso/request b/vid-app-common/src/main/resources/json/mso/request
index 95720bf91..61f10400e 100755
--- a/vid-app-common/src/main/resources/json/mso/request
+++ b/vid-app-common/src/main/resources/json/mso/request
@@ -16,31 +16,12 @@
 		},
 		"requestScope": {
 			"description": "short description of the entity being operated on",
-			"type": "string",
-			"enum": [
-				"network",
-				"service",
-				"vfModule",
-				"vnf",
-				"volumeGroup",
-				"unknown",
-				"configuration"
-			]
+			"type": "string"
 		},
 		"requestStatus": {},
 		"requestType": {
 			"description": "short description of the action being performed on the requestScope",
-			"type": "string",
-			"enum": [
-				"createInstance",
-				"deleteInstance",
-				"replaceInstance",
-				"updateInstance",
-				"activateInstance",
-				"deactivateInstance",
-				"unknown",
-				"not provided"
-			]
+			"type": "string"
 		},
 		"startTime": {
 			"description": "Date and time the request was created in GMT with the following sample format: Wed, 15 Oct 2014 13:01:52 GMT",
-- 
cgit 1.2.3-korg