summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--INFO.yaml8
-rwxr-xr-xepsdk-app-onap/src/main/resources/catalog.json174
-rwxr-xr-xepsdk-app-onap/src/main/resources/sampleTosca.csarbin6337 -> 0 bytes
-rw-r--r--vid-app-common/src/main/resources/catalog.json174
-rw-r--r--vid-app-common/src/test/resources/sampleTosca.csarbin6177 -> 0 bytes
-rw-r--r--vid-ext-services-simulator/src/main/resources/download_files/service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zipbin24661 -> 24734 bytes
6 files changed, 8 insertions, 348 deletions
diff --git a/INFO.yaml b/INFO.yaml
index b6217507b..a784a2f8b 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -47,6 +47,11 @@ committers:
company: 'ATT'
id: 'os0695'
timezone: 'Israel/Lod'
+ - name: 'Eylon Malin'
+ email: 'eylon.malin@intl.att.com'
+ company: 'ATT'
+ id: 'eylonmalin'
+ timezone: 'Israel/Lod'
tsc:
approval: 'https://lists.onap.org/pipermail/onap-tsc'
changes:
@@ -59,3 +64,6 @@ tsc:
- type: 'Removal'
name: 'Daniel Rose'
link: 'https://lists.onap.org/g/onap-tsc/message/4251'
+ - type: 'Addition'
+ name: 'Eylon Malin'
+ link: 'https://lists.onap.org/g/onap-tsc/topic/62892813#5725'
diff --git a/epsdk-app-onap/src/main/resources/catalog.json b/epsdk-app-onap/src/main/resources/catalog.json
deleted file mode 100755
index e5fb52136..000000000
--- a/epsdk-app-onap/src/main/resources/catalog.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
- "services": {
- "0346aa9f-57b7-458a-9681-daf5b19d52b0": {
- "uuid": "0346aa9f-57b7-458a-9681-daf5b19d52b0",
- "name": "The Worst Service",
- "version": "1.0",
- "toscaModelURL": "sampleTosca.csar",
- "category": "Bad Services",
- "lifecycleState": "NOT_CERTIFIED_CHECKOUT",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "distributionStatus": "DISTRIBUTION_REJECTED",
- "artifacts": [],
- "resources": []
- },
- "1346aa9f-57b7-458a-9681-daf5b19d52b1": {
- "uuid": "1346aa9f-57b7-458a-9681-daf5b19d52b1",
- "name": "The Worst Service",
- "version": "1.1",
- "toscaModelURL": "sampleTosca.csar",
- "category": "Bad Services",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "distributionStatus": "DISTRIBUTED",
- "artifacts": [],
- "resources": []
- },
- "3346aa9f-57b7-458a-9681-daf5b19d52b3": {
- "uuid": "3346aa9f-57b7-458a-9681-daf5b19d52b3",
- "name": "Bland Service",
- "version": "1.9",
- "toscaModelURL": "sampleTosca.csar",
- "category": "Neutral Services",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "distributionStatus": "DISTRIBUTION_NOT_APPROVED",
- "artifacts": [],
- "resources": []
- },
- "2346aa9f-57b7-458a-9681-daf5b19d52b2": {
- "uuid": "2346aa9f-57b7-458a-9681-daf5b19d52b2",
- "name": "The Best Service",
- "version": "1.3",
- "toscaModelURL": "sampleTosca.csar",
- "category": "Good Services",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "distributionStatus": "DISTRIBUTION_APPROVED",
- "artifacts": [
- {
- "artifactUUID": "0cf78c81-1246-45e7-a190-eaa309ee5680",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1",
- },
- {
- "artifactUUID": "1cf78c81-1246-45e7-a190-eaa309ee5681",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1",
- },
- {
- "artifactUUID": "2cf78c81-1246-45e7-a190-eaa309ee5682",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1",
- }
- ],
- "resources": []
- }
- },
- "resources": {
- "2f92b5b0-10ff-4cf4-9531-88546fe88a42": {
- "uuid": "2f92b5b0-10ff-4cf4-9531-88546fe88a42",
- "invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d",
- "name": "The Worst Resource",
- "version": "0.1",
- "toscaModelURL": "sampleTosca.csar",
- "toscaModel": "http://www.openecomp.org/",
- "toscaResourceName": "The Worst Resource (TOSCA)",
- "category": "Bad Resources",
- "subCategory": "Really Bad Resources",
- "resourceType": "VF",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "artifacts": [
- {
- "artifactUUID": "0cf78c81-1246-45e7-a190-eaa309ee5680",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1",
- },
- {
- "artifactUUID": "1cf78c81-1246-45e7-a190-eaa309ee5681",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1",
- },
- {
- "artifactUUID": "2cf78c81-1246-45e7-a190-eaa309ee5682",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1",
- }
- ]
- },
- "0f92b5b0-10ff-4cf4-9531-88546fe88a40": {
- "uuid": "0f92b5b0-10ff-4cf4-9531-88546fe88a40",
- "invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d",
- "name": "The Worst Resource",
- "version": "0.1",
- "toscaModelURL": "sampleTosca.csar",
- "toscaModel": "http://www.openecomp.org/",
- "toscaResourceName": "The Worst Resource (TOSCA)",
- "category": "Bad Resources",
- "subCategory": "Really Bad Resources",
- "resourceType": "VF",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "artifacts": []
- },
- "1f92b5b0-10ff-4cf4-9531-88546fe88a41": {
- "uuid": "1f92b5b0-10ff-4cf4-9531-88546fe88a41",
- "invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d",
- "name": "The Worst Resource",
- "version": "0.1",
- "toscaModelURL": "sampleTosca.csar",
- "toscaModel": "http://www.openecomp.org/",
- "toscaResourceName": "The Worst Resource (TOSCA)",
- "category": "Bad Resources",
- "subCategory": "Really Bad Resources",
- "resourceType": "VF",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "artifacts": []
- }
- }
-} \ No newline at end of file
diff --git a/epsdk-app-onap/src/main/resources/sampleTosca.csar b/epsdk-app-onap/src/main/resources/sampleTosca.csar
deleted file mode 100755
index 7532f5874..000000000
--- a/epsdk-app-onap/src/main/resources/sampleTosca.csar
+++ /dev/null
Binary files differ
diff --git a/vid-app-common/src/main/resources/catalog.json b/vid-app-common/src/main/resources/catalog.json
deleted file mode 100644
index 20c7d5769..000000000
--- a/vid-app-common/src/main/resources/catalog.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
- "services": {
- "0346aa9f-57b7-458a-9681-daf5b19d52b0": {
- "uuid": "0346aa9f-57b7-458a-9681-daf5b19d52b0",
- "name": "The Worst Service",
- "version": "1.0",
- "toscaModelURL": "sampleTosca.csar",
- "category": "Bad Services",
- "lifecycleState": "NOT_CERTIFIED_CHECKOUT",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "distributionStatus": "DISTRIBUTION_REJECTED",
- "artifacts": [],
- "resources": []
- },
- "1346aa9f-57b7-458a-9681-daf5b19d52b1": {
- "uuid": "1346aa9f-57b7-458a-9681-daf5b19d52b1",
- "name": "The Worst Service",
- "version": "1.1",
- "toscaModelURL": "sampleTosca.csar",
- "category": "Bad Services",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "distributionStatus": "DISTRIBUTED",
- "artifacts": [],
- "resources": []
- },
- "3346aa9f-57b7-458a-9681-daf5b19d52b3": {
- "uuid": "3346aa9f-57b7-458a-9681-daf5b19d52b3",
- "name": "Bland Service",
- "version": "1.9",
- "toscaModelURL": "sampleTosca.csar",
- "category": "Neutral Services",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "distributionStatus": "DISTRIBUTION_NOT_APPROVED",
- "artifacts": [],
- "resources": []
- },
- "2346aa9f-57b7-458a-9681-daf5b19d52b2": {
- "uuid": "2346aa9f-57b7-458a-9681-daf5b19d52b2",
- "name": "The Best Service",
- "version": "1.3",
- "toscaModelURL": "sampleTosca.csar",
- "category": "Good Services",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "distributionStatus": "DISTRIBUTION_APPROVED",
- "artifacts": [
- {
- "artifactUUID": "0cf78c81-1246-45e7-a190-eaa309ee5680",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1"
- },
- {
- "artifactUUID": "1cf78c81-1246-45e7-a190-eaa309ee5681",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1"
- },
- {
- "artifactUUID": "2cf78c81-1246-45e7-a190-eaa309ee5682",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1"
- }
- ],
- "resources": []
- }
- },
- "resources": {
- "2f92b5b0-10ff-4cf4-9531-88546fe88a42": {
- "uuid": "2f92b5b0-10ff-4cf4-9531-88546fe88a42",
- "invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d",
- "name": "The Worst Resource",
- "version": "0.1",
- "toscaModelURL": "sampleTosca.csar",
- "toscaModel": "http://www.openecomp.org/",
- "toscaResourceName": "The Worst Resource (TOSCA)",
- "category": "Bad Resources",
- "subCategory": "Really Bad Resources",
- "resourceType": "VF",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "artifacts": [
- {
- "artifactUUID": "0cf78c81-1246-45e7-a190-eaa309ee5680",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1"
- },
- {
- "artifactUUID": "1cf78c81-1246-45e7-a190-eaa309ee5681",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1"
- },
- {
- "artifactUUID": "2cf78c81-1246-45e7-a190-eaa309ee5682",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1"
- }
- ]
- },
- "0f92b5b0-10ff-4cf4-9531-88546fe88a40": {
- "uuid": "0f92b5b0-10ff-4cf4-9531-88546fe88a40",
- "invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d",
- "name": "The Worst Resource",
- "version": "0.1",
- "toscaModelURL": "sampleTosca.csar",
- "toscaModel": "http://www.openecomp.org/",
- "toscaResourceName": "The Worst Resource (TOSCA)",
- "category": "Bad Resources",
- "subCategory": "Really Bad Resources",
- "resourceType": "VF",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "artifacts": []
- },
- "1f92b5b0-10ff-4cf4-9531-88546fe88a41": {
- "uuid": "1f92b5b0-10ff-4cf4-9531-88546fe88a41",
- "invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d",
- "name": "The Worst Resource",
- "version": "0.1",
- "toscaModelURL": "sampleTosca.csar",
- "toscaModel": "http://www.openecomp.org/",
- "toscaResourceName": "The Worst Resource (TOSCA)",
- "category": "Bad Resources",
- "subCategory": "Really Bad Resources",
- "resourceType": "VF",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "artifacts": []
- }
- }
-} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/sampleTosca.csar b/vid-app-common/src/test/resources/sampleTosca.csar
deleted file mode 100644
index d9c469a15..000000000
--- a/vid-app-common/src/test/resources/sampleTosca.csar
+++ /dev/null
Binary files differ
diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip
index 9853ac801..cd578ab85 100644
--- a/vid-ext-services-simulator/src/main/resources/download_files/service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip
+++ b/vid-ext-services-simulator/src/main/resources/download_files/service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip
Binary files differ