From c72d565bb58226b20625b2bce5f0019046bee649 Mon Sep 17 00:00:00 2001 From: "Sonsino, Ofir (os0695)" 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) --- vid-app-common/src/main/resources/adiod.zip | Bin 81197 -> 81489 bytes .../src/main/resources/csar317927061915233480.zip | Bin 63170 -> 63368 bytes .../src/main/resources/csar3933948645405128424.zip | Bin 103328 -> 104292 bytes .../src/main/resources/json/mso/asyncRequestStatus | 54 ------------------- .../src/main/resources/json/mso/modelInfo | 11 +--- vid-app-common/src/main/resources/json/mso/request | 23 +------- vid-app-common/src/main/resources/sdcservices.json | 58 ++++++++++++++++++++- .../src/main/resources/service-AmpPhSvc-csar.zip | Bin 68579 -> 68824 bytes .../resources/service-MsoExampleService-csar.zip | Bin 0 -> 30033 bytes .../service-ServicecontainerContainsPprobe.zip | Bin 0 -> 32759 bytes ...rvice-Servicecontainermultiplepprobes-csar.csar | Bin 31331 -> 0 bytes ...ervice-Servicecontainermultiplepprobes-csar.zip | Bin 0 -> 32750 bytes .../src/main/resources/service-VdbeSrv-csar.zip | Bin 0 -> 72231 bytes .../src/main/resources/service-vf-csar.zip | Bin 58108 -> 58693 bytes .../main/resources/service-vf-with-annotations.zip | Bin 0 -> 119155 bytes 15 files changed, 60 insertions(+), 86 deletions(-) delete mode 100755 vid-app-common/src/main/resources/json/mso/asyncRequestStatus create mode 100644 vid-app-common/src/main/resources/service-MsoExampleService-csar.zip create mode 100644 vid-app-common/src/main/resources/service-ServicecontainerContainsPprobe.zip delete mode 100644 vid-app-common/src/main/resources/service-Servicecontainermultiplepprobes-csar.csar create mode 100644 vid-app-common/src/main/resources/service-Servicecontainermultiplepprobes-csar.zip create mode 100644 vid-app-common/src/main/resources/service-VdbeSrv-csar.zip create mode 100644 vid-app-common/src/main/resources/service-vf-with-annotations.zip (limited to 'vid-app-common/src/main/resources') diff --git a/vid-app-common/src/main/resources/adiod.zip b/vid-app-common/src/main/resources/adiod.zip index a0fddbedc..415fa4833 100644 Binary files a/vid-app-common/src/main/resources/adiod.zip and b/vid-app-common/src/main/resources/adiod.zip differ diff --git a/vid-app-common/src/main/resources/csar317927061915233480.zip b/vid-app-common/src/main/resources/csar317927061915233480.zip index dbf0df179..36ac9f9bc 100644 Binary files a/vid-app-common/src/main/resources/csar317927061915233480.zip and b/vid-app-common/src/main/resources/csar317927061915233480.zip differ diff --git a/vid-app-common/src/main/resources/csar3933948645405128424.zip b/vid-app-common/src/main/resources/csar3933948645405128424.zip index 4601acb79..b92d5339f 100644 Binary files a/vid-app-common/src/main/resources/csar3933948645405128424.zip and b/vid-app-common/src/main/resources/csar3933948645405128424.zip differ 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", diff --git a/vid-app-common/src/main/resources/sdcservices.json b/vid-app-common/src/main/resources/sdcservices.json index 1d936f630..1d9d160e3 100644 --- a/vid-app-common/src/main/resources/sdcservices.json +++ b/vid-app-common/src/main/resources/sdcservices.json @@ -1,5 +1,47 @@ { "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", @@ -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 5b50f4d3f..6d5002c6c 100644 Binary files a/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip and b/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip differ 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 000000000..83131de5e Binary files /dev/null and b/vid-app-common/src/main/resources/service-MsoExampleService-csar.zip differ 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 000000000..fc74ba060 Binary files /dev/null and b/vid-app-common/src/main/resources/service-ServicecontainerContainsPprobe.zip differ diff --git a/vid-app-common/src/main/resources/service-Servicecontainermultiplepprobes-csar.csar b/vid-app-common/src/main/resources/service-Servicecontainermultiplepprobes-csar.csar deleted file mode 100644 index 81691fe1f..000000000 Binary files a/vid-app-common/src/main/resources/service-Servicecontainermultiplepprobes-csar.csar and /dev/null differ diff --git a/vid-app-common/src/main/resources/service-Servicecontainermultiplepprobes-csar.zip b/vid-app-common/src/main/resources/service-Servicecontainermultiplepprobes-csar.zip new file mode 100644 index 000000000..e0a533101 Binary files /dev/null and b/vid-app-common/src/main/resources/service-Servicecontainermultiplepprobes-csar.zip differ 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 000000000..3defd1e90 Binary files /dev/null and b/vid-app-common/src/main/resources/service-VdbeSrv-csar.zip differ 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 090c8efb4..f66d08464 100644 Binary files a/vid-app-common/src/main/resources/service-vf-csar.zip and b/vid-app-common/src/main/resources/service-vf-csar.zip differ 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 000000000..a742d60cb Binary files /dev/null and b/vid-app-common/src/main/resources/service-vf-with-annotations.zip differ -- cgit 1.2.3-korg