Merge 1806 code of vid-common

Change-Id: I75d52abed4a24dfe3827d79edc4a2938726aa87a
Issue-ID: VID-208
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>

14 files changed, 60 insertions, 86 deletions

diff --git a/vid-app-common/src/main/resources/adiod.zip b/vid-app-common/src/main/resources/adiod.zip
index a0fddbed..415fa483 100644
--- a/vid-app-common/src/main/resources/adiod.zip
+++ b/vid-app-common/src/main/resources/adiod.zip
diff --git a/vid-app-common/src/main/resources/csar317927061915233480.zip b/vid-app-common/src/main/resources/csar317927061915233480.zip
index dbf0df17..36ac9f9b 100644
--- a/vid-app-common/src/main/resources/csar317927061915233480.zip
+++ b/vid-app-common/src/main/resources/csar317927061915233480.zip
diff --git a/vid-app-common/src/main/resources/csar3933948645405128424.zip b/vid-app-common/src/main/resources/csar3933948645405128424.zip
index 4601acb7..b92d5339 100644
--- a/vid-app-common/src/main/resources/csar3933948645405128424.zip
+++ b/vid-app-common/src/main/resources/csar3933948645405128424.zip
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 23d2c288..00000000
--- 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 d368e353..56d268ce 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 95720bf9..61f10400 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",

diff --git a/vid-app-common/src/main/resources/sdcservices.json b/vid-app-common/src/main/resources/sdcservices.json
index 1d936f63..1d9d160e 100644
--- a/vid-app-common/src/main/resources/sdcservices.json
+++ b/vid-app-common/src/main/resources/sdcservices.json
@@ -1,6 +1,48 @@
 {
   "services": [
     {
+      "uuid": "6bce7302-70bd-4057-b48e-8d5b99e686ca",
+      "invariantUUID": "9aa04749-c02c-432d-a90c-18caa361c833",
+      "name": "vDBE_srv",
+      "version": "1.0",
+      "toscaModelURL": "./service-VdbeSrv-csar.zip",
+      "category": "Mobility",
+      "lifecycleState": "CERTIFIED",
+      "lastUpdaterUserId": "rg276b",
+      "lastUpdaterFullName": null,
+      "distributionStatus": "DISTRIBUTED",
+      "artifacts": null,
+      "resources": null
+    },
+    {
+      "uuid": "76f27dfe-33e5-472f-8e0b-acf524adc4f0",
+      "invariantUUID": "c3618e16-bb5b-433a-a6e0-565ca79d8b65",
+      "name": "4-27_vMME_Service",
+      "version": "1.0",
+      "toscaModelURL": "./service-MsoExampleService-csar.zip",
+      "category": "Mobility",
+      "lifecycleState": "CERTIFIED",
+      "lastUpdaterUserId": "rg276b",
+      "lastUpdaterFullName": null,
+      "distributionStatus": "DISTRIBUTED",
+      "artifacts": null,
+      "resources": null
+    },
+    {
+      "uuid": "f4d84bb4-a416-4b4e-997e-0059973630b9",
+      "invariantUUID": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
+      "name": "ADIOD vMX vPE_BV Service 488",
+      "version": "1.0",
+      "toscaModelURL": "./service-vf-with-annotations.zip",
+      "category": "Mobility",
+      "lifecycleState": "CERTIFIED",
+      "lastUpdaterUserId": "rg276b",
+      "lastUpdaterFullName": null,
+      "distributionStatus": "DISTRIBUTED",
+      "artifacts": null,
+      "resources": null
+    },
+    {
       "uuid": "48a52540-8772-4368-9cdb-1f124ea5c931",
       "invariantUUID": "f430728a-4530-42be-a577-1206b9484cef",
       "name": "4-27_vMME_Service",
@@ -103,7 +145,7 @@
       "invariantUUID": "b7d923c9-6175-41f1-91ba-4565c4953408",
       "name": "Multiple pProbes",
       "version": "1.0",
-      "toscaModelURL": "./service-Servicecontainermultiplepprobes-csar.csar",
+      "toscaModelURL": "./service-Servicecontainermultiplepprobes-csar.zip",
       "category": "Mobility",
       "lifecycleState": "CERTIFIED",
       "lastUpdaterUserId": "rg276b",
@@ -111,6 +153,20 @@
       "distributionStatus": "DISTRIBUTED",
       "artifacts": null,
       "resources": null
+    },
+    {
+      "uuid": "ee6d61be-4841-4f98-8f23-5de9da845544",
+      "invariantUUID": "b7d923c9-6175-41f1-91ba-4565c4955555",
+      "name": "ServiceContainerMultiplepProbes2",
+      "version": "2.0",
+      "toscaModelURL": "./service-ServicecontainerContainsPprobe.zip",
+      "category": "Network L1-3",
+      "lifecycleState": "CERTIFIED",
+      "lastUpdaterUserId": "rg276b",
+      "lastUpdaterFullName": null,
+      "distributionStatus": "DISTRIBUTED",
+      "artifacts": null,
+      "resources": null
     }
   ]
 }
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip b/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip
index 5b50f4d3..6d5002c6 100644
--- a/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip
+++ b/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip
diff --git a/vid-app-common/src/main/resources/service-MsoExampleService-csar.zip b/vid-app-common/src/main/resources/service-MsoExampleService-csar.zip
new file mode 100644
index 00000000..83131de5
--- /dev/null
+++ b/vid-app-common/src/main/resources/service-MsoExampleService-csar.zip
diff --git a/vid-app-common/src/main/resources/service-ServicecontainerContainsPprobe.zip b/vid-app-common/src/main/resources/service-ServicecontainerContainsPprobe.zip
new file mode 100644
index 00000000..fc74ba06
--- /dev/null
+++ b/vid-app-common/src/main/resources/service-ServicecontainerContainsPprobe.zip
diff --git a/vid-app-common/src/main/resources/service-Servicecontainermultiplepprobes-csar.csar b/vid-app-common/src/main/resources/service-Servicecontainermultiplepprobes-csar.zip
index 81691fe1..e0a53310 100644
--- a/vid-app-common/src/main/resources/service-Servicecontainermultiplepprobes-csar.csar
+++ b/vid-app-common/src/main/resources/service-Servicecontainermultiplepprobes-csar.zip
diff --git a/vid-app-common/src/main/resources/service-VdbeSrv-csar.zip b/vid-app-common/src/main/resources/service-VdbeSrv-csar.zip
new file mode 100644
index 00000000..3defd1e9
--- /dev/null
+++ b/vid-app-common/src/main/resources/service-VdbeSrv-csar.zip
diff --git a/vid-app-common/src/main/resources/service-vf-csar.zip b/vid-app-common/src/main/resources/service-vf-csar.zip
index 090c8efb..f66d0846 100644
--- a/vid-app-common/src/main/resources/service-vf-csar.zip
+++ b/vid-app-common/src/main/resources/service-vf-csar.zip
diff --git a/vid-app-common/src/main/resources/service-vf-with-annotations.zip b/vid-app-common/src/main/resources/service-vf-with-annotations.zip
new file mode 100644
index 00000000..a742d60c
--- /dev/null
+++ b/vid-app-common/src/main/resources/service-vf-with-annotations.zip