Address licence discrepancy by removing some unneeded files

Issue-ID: VID-378

Change-Id: Ib897dbc414d8d4688ed5e9ed52b197051a9de9eb
Signed-off-by: Ittay Stern <ittay.stern@att.com>

diff --git a/epsdk-app-onap/src/main/resources/catalog.json b/epsdk-app-onap/src/main/resources/catalog.json
deleted file mode 100755 (executable)
index e5fb521..0000000
--- a/epsdk-app-onap/src/main/resources/catalog.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{\r
-       "services": {\r
-               "0346aa9f-57b7-458a-9681-daf5b19d52b0": {\r
-                       "uuid": "0346aa9f-57b7-458a-9681-daf5b19d52b0",\r
-                       "name": "The Worst Service",\r
-                       "version": "1.0",\r
-                       "toscaModelURL": "sampleTosca.csar",\r
-                       "category": "Bad Services",\r
-                       "lifecycleState": "NOT_CERTIFIED_CHECKOUT",\r
-                       "lastUpdaterUserId": "example@example.org",\r
-                       "lastUpdaterFullName": "Example User",\r
-                       "distributionStatus": "DISTRIBUTION_REJECTED",\r
-                       "artifacts": [],\r
-                       "resources": []\r
-               },\r
-               "1346aa9f-57b7-458a-9681-daf5b19d52b1": {\r
-                       "uuid": "1346aa9f-57b7-458a-9681-daf5b19d52b1",\r
-                       "name": "The Worst Service",\r
-                       "version": "1.1",\r
-                       "toscaModelURL": "sampleTosca.csar",\r
-                       "category": "Bad Services",\r
-                       "lifecycleState": "CERTIFIED",\r
-                       "lastUpdaterUserId": "example@example.org",\r
-                       "lastUpdaterFullName": "Example User",\r
-                       "distributionStatus": "DISTRIBUTED",\r
-                       "artifacts": [],\r
-                       "resources": []\r
-               },\r
-               "3346aa9f-57b7-458a-9681-daf5b19d52b3": {\r
-                       "uuid": "3346aa9f-57b7-458a-9681-daf5b19d52b3",\r
-                       "name": "Bland Service",\r
-                       "version": "1.9",\r
-                       "toscaModelURL": "sampleTosca.csar",\r
-                       "category": "Neutral Services",\r
-                       "lifecycleState": "CERTIFIED",\r
-                       "lastUpdaterUserId": "example@example.org",\r
-                       "lastUpdaterFullName": "Example User",\r
-                       "distributionStatus": "DISTRIBUTION_NOT_APPROVED",\r
-                       "artifacts": [],\r
-                       "resources": []\r
-               },\r
-               "2346aa9f-57b7-458a-9681-daf5b19d52b2": {\r
-                       "uuid": "2346aa9f-57b7-458a-9681-daf5b19d52b2",\r
-                       "name": "The Best Service",\r
-                       "version": "1.3",\r
-                       "toscaModelURL": "sampleTosca.csar",\r
-                       "category": "Good Services",\r
-                       "lifecycleState": "CERTIFIED",\r
-                       "lastUpdaterUserId": "example@example.org",\r
-                       "lastUpdaterFullName": "Example User",\r
-                       "distributionStatus": "DISTRIBUTION_APPROVED",\r
-                       "artifacts": [\r
-                                       {\r
-                                               "artifactUUID": "0cf78c81-1246-45e7-a190-eaa309ee5680",\r
-                                               "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",\r
-                                               "artifactName": "The Worst Artifact",\r
-                                               "artifactType": "HEAT",\r
-                                               "artifactDescription": "This is the worst artifact",\r
-                                               "artifactURL": "http://www.openecomp.org/",\r
-                                               "artifactTimeout": "60",\r
-                                               "artifactChecksum": "A worthy checksum",\r
-                                               "artifactVersion": "0.1",\r
-                                       },\r
-                                       {\r
-                                               "artifactUUID": "1cf78c81-1246-45e7-a190-eaa309ee5681",\r
-                                               "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",\r
-                                               "artifactName": "The Worst Artifact",\r
-                                               "artifactType": "HEAT",\r
-                                               "artifactDescription": "This is the worst artifact",\r
-                                               "artifactURL": "http://www.openecomp.org/",\r
-                                               "artifactTimeout": "60",\r
-                                               "artifactChecksum": "A worthy checksum",\r
-                                               "artifactVersion": "0.1",\r
-                                       },\r
-                                       {\r
-                                               "artifactUUID": "2cf78c81-1246-45e7-a190-eaa309ee5682",\r
-                                               "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",\r
-                                               "artifactName": "The Worst Artifact",\r
-                                               "artifactType": "HEAT",\r
-                                               "artifactDescription": "This is the worst artifact",\r
-                                               "artifactURL": "http://www.openecomp.org/",\r
-                                               "artifactTimeout": "60",\r
-                                               "artifactChecksum": "A worthy checksum",\r
-                                               "artifactVersion": "0.1",\r
-                                       }\r
-                       ],\r
-                       "resources": []\r
-               }\r
-       },\r
-       "resources": {\r
-               "2f92b5b0-10ff-4cf4-9531-88546fe88a42": {\r
-                       "uuid": "2f92b5b0-10ff-4cf4-9531-88546fe88a42",\r
-                       "invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d",\r
-                       "name": "The Worst Resource",\r
-                       "version": "0.1",\r
-                       "toscaModelURL": "sampleTosca.csar",\r
-                       "toscaModel": "http://www.openecomp.org/",\r
-                       "toscaResourceName": "The Worst Resource (TOSCA)",\r
-                       "category": "Bad Resources",\r
-                       "subCategory": "Really Bad Resources",\r
-                       "resourceType": "VF",\r
-                       "lifecycleState": "CERTIFIED",\r
-                       "lastUpdaterUserId": "example@example.org",\r
-                       "lastUpdaterFullName": "Example User",\r
-                       "artifacts": [\r
-                                       {\r
-                                               "artifactUUID": "0cf78c81-1246-45e7-a190-eaa309ee5680",\r
-                                               "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",\r
-                                               "artifactName": "The Worst Artifact",\r
-                                               "artifactType": "HEAT",\r
-                                               "artifactDescription": "This is the worst artifact",\r
-                                               "artifactURL": "http://www.openecomp.org/",\r
-                                               "artifactTimeout": "60",\r
-                                               "artifactChecksum": "A worthy checksum",\r
-                                               "artifactVersion": "0.1",\r
-                                       },\r
-                                       {\r
-                                               "artifactUUID": "1cf78c81-1246-45e7-a190-eaa309ee5681",\r
-                                               "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",\r
-                                               "artifactName": "The Worst Artifact",\r
-                                               "artifactType": "HEAT",\r
-                                               "artifactDescription": "This is the worst artifact",\r
-                                               "artifactURL": "http://www.openecomp.org/",\r
-                                               "artifactTimeout": "60",\r
-                                               "artifactChecksum": "A worthy checksum",\r
-                                               "artifactVersion": "0.1",\r
-                                       },\r
-                                       {\r
-                                               "artifactUUID": "2cf78c81-1246-45e7-a190-eaa309ee5682",\r
-                                               "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",\r
-                                               "artifactName": "The Worst Artifact",\r
-                                               "artifactType": "HEAT",\r
-                                               "artifactDescription": "This is the worst artifact",\r
-                                               "artifactURL": "http://www.openecomp.org/",\r
-                                               "artifactTimeout": "60",\r
-                                               "artifactChecksum": "A worthy checksum",\r
-                                               "artifactVersion": "0.1",\r
-                                       }\r
-                       ]\r
-               },\r
-               "0f92b5b0-10ff-4cf4-9531-88546fe88a40": {\r
-                       "uuid": "0f92b5b0-10ff-4cf4-9531-88546fe88a40",\r
-                       "invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d",\r
-                       "name": "The Worst Resource",\r
-                       "version": "0.1",\r
-                       "toscaModelURL": "sampleTosca.csar",\r
-                       "toscaModel": "http://www.openecomp.org/",\r
-                       "toscaResourceName": "The Worst Resource (TOSCA)",\r
-                       "category": "Bad Resources",\r
-                       "subCategory": "Really Bad Resources",\r
-                       "resourceType": "VF",\r
-                       "lifecycleState": "CERTIFIED",\r
-                       "lastUpdaterUserId": "example@example.org",\r
-                       "lastUpdaterFullName": "Example User",\r
-                       "artifacts": []\r
-               },\r
-               "1f92b5b0-10ff-4cf4-9531-88546fe88a41": {\r
-                       "uuid": "1f92b5b0-10ff-4cf4-9531-88546fe88a41",\r
-                       "invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d",\r
-                       "name": "The Worst Resource",\r
-                       "version": "0.1",\r
-                       "toscaModelURL": "sampleTosca.csar",\r
-                       "toscaModel": "http://www.openecomp.org/",\r
-                       "toscaResourceName": "The Worst Resource (TOSCA)",\r
-                       "category": "Bad Resources",\r
-                       "subCategory": "Really Bad Resources",\r
-                       "resourceType": "VF",\r
-                       "lifecycleState": "CERTIFIED",\r
-                       "lastUpdaterUserId": "example@example.org",\r
-                       "lastUpdaterFullName": "Example User",\r
-                       "artifacts": []\r
-               }\r
-       }\r
-}
\ 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 (executable)
index 7532f58..0000000
Binary files a/epsdk-app-onap/src/main/resources/sampleTosca.csar and /dev/null 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 (file)
index 20c7d57..0000000
--- 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 (file)
index d9c469a..0000000
Binary files a/vid-app-common/src/test/resources/sampleTosca.csar and /dev/null differ