From 7a36cbec39121e1a447e88f3c1e872c0188dba1c Mon Sep 17 00:00:00 2001 From: "waqas.ikram" Date: Mon, 18 Jan 2021 13:37:59 +0000 Subject: Removing ETSI Catalog Manager trigger from ONAP SO for package distribution Change-Id: I75bcd4c7d1924cc9a4dc16e72e53e92138a9f28e Issue-ID: SO-3220 Signed-off-by: waqas.ikram --- .../src/test/resources/application-test.yaml | 6 +- .../VENDOR_LICENSE/vendor-license-model.xml | 1 - .../ETSI_PACKAGE/VF_LICENSE/vf-license-model.xml | 1 - .../resource-examples/vgw/ETSI_PACKAGE/vgw6.csar | Bin 43363 -> 0 bytes .../vgw/SDC_RESOURCE_CSAR/vgw_sdc_resource.csar | Bin 117441 -> 0 bytes .../vgw/VENDOR_LICENSE/vendor-license-model.xml | 1 - .../vgw/VF_LICENSE/vf-license-model.xml | 1 - .../vgw/dmaap-notification-message.json | 66 --------------------- ...-onboading-job-status-error-package-exists.json | 20 ------- ...catalog-package-onboading-job-status-error.json | 20 ------- ...og-package-onboading-job-status-successful.json | 27 --------- .../vgw/service-Vgwservicev1-csar.csar | Bin 121635 -> 0 bytes 12 files changed, 1 insertion(+), 142 deletions(-) delete mode 100644 asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VENDOR_LICENSE/vendor-license-model.xml delete mode 100644 asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VF_LICENSE/vf-license-model.xml delete mode 100644 asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/vgw6.csar delete mode 100644 asdc-controller/src/test/resources/resource-examples/vgw/SDC_RESOURCE_CSAR/vgw_sdc_resource.csar delete mode 100644 asdc-controller/src/test/resources/resource-examples/vgw/VENDOR_LICENSE/vendor-license-model.xml delete mode 100644 asdc-controller/src/test/resources/resource-examples/vgw/VF_LICENSE/vf-license-model.xml delete mode 100644 asdc-controller/src/test/resources/resource-examples/vgw/dmaap-notification-message.json delete mode 100644 asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error-package-exists.json delete mode 100644 asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error.json delete mode 100644 asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-successful.json delete mode 100644 asdc-controller/src/test/resources/resource-examples/vgw/service-Vgwservicev1-csar.csar (limited to 'asdc-controller/src/test/resources') diff --git a/asdc-controller/src/test/resources/application-test.yaml b/asdc-controller/src/test/resources/application-test.yaml index 60cd2d9f2a..31ec987152 100644 --- a/asdc-controller/src/test/resources/application-test.yaml +++ b/asdc-controller/src/test/resources/application-test.yaml @@ -105,8 +105,4 @@ mso: sdc: endpoint: http://localhost:${wiremock.server.port} - -etsi-catalog-manager: - endpoint: http://localhost:${wiremock.server.port}/api/catalog/v1 - rest: - timeoutInSeconds: 5 + \ No newline at end of file diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VENDOR_LICENSE/vendor-license-model.xml b/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VENDOR_LICENSE/vendor-license-model.xml deleted file mode 100644 index 6499a58fab..0000000000 --- a/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VENDOR_LICENSE/vendor-license-model.xml +++ /dev/null @@ -1 +0,0 @@ -VLMd6dea4a3db6b415ba50f17cb3311d04604B01ABDE6CA4A9FBA75ACC023C6FEDA1.0EP23451.0LKGUnique55ddeb1a87be4fbb95a9bd74b4d745ca81117C9B092C4C70AFF76833373CE7F4Absolute23456789 \ No newline at end of file diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VF_LICENSE/vf-license-model.xml b/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VF_LICENSE/vf-license-model.xml deleted file mode 100644 index 581a3acb7f..0000000000 --- a/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VF_LICENSE/vf-license-model.xml +++ /dev/null @@ -1 +0,0 @@ -VLMfa87b9536b704787981357393f36b3fcEPd6dea4a3db6b415ba50f17cb3311d04604B01ABDE6CA4A9FBA75ACC023C6FEDA23451.0LKGUnique55ddeb1a87be4fbb95a9bd74b4d745ca81117C9B092C4C70AFF76833373CE7F4Absolute234567891.0FG2218d90f94944a94952be83354847631234594 \ No newline at end of file diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/vgw6.csar b/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/vgw6.csar deleted file mode 100644 index 56dbb2bce0..0000000000 Binary files a/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/vgw6.csar and /dev/null differ diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/SDC_RESOURCE_CSAR/vgw_sdc_resource.csar b/asdc-controller/src/test/resources/resource-examples/vgw/SDC_RESOURCE_CSAR/vgw_sdc_resource.csar deleted file mode 100644 index 9eb240d9a7..0000000000 Binary files a/asdc-controller/src/test/resources/resource-examples/vgw/SDC_RESOURCE_CSAR/vgw_sdc_resource.csar and /dev/null differ diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/VENDOR_LICENSE/vendor-license-model.xml b/asdc-controller/src/test/resources/resource-examples/vgw/VENDOR_LICENSE/vendor-license-model.xml deleted file mode 100644 index 6499a58fab..0000000000 --- a/asdc-controller/src/test/resources/resource-examples/vgw/VENDOR_LICENSE/vendor-license-model.xml +++ /dev/null @@ -1 +0,0 @@ -VLMd6dea4a3db6b415ba50f17cb3311d04604B01ABDE6CA4A9FBA75ACC023C6FEDA1.0EP23451.0LKGUnique55ddeb1a87be4fbb95a9bd74b4d745ca81117C9B092C4C70AFF76833373CE7F4Absolute23456789 \ No newline at end of file diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/VF_LICENSE/vf-license-model.xml b/asdc-controller/src/test/resources/resource-examples/vgw/VF_LICENSE/vf-license-model.xml deleted file mode 100644 index 581a3acb7f..0000000000 --- a/asdc-controller/src/test/resources/resource-examples/vgw/VF_LICENSE/vf-license-model.xml +++ /dev/null @@ -1 +0,0 @@ -VLMfa87b9536b704787981357393f36b3fcEPd6dea4a3db6b415ba50f17cb3311d04604B01ABDE6CA4A9FBA75ACC023C6FEDA23451.0LKGUnique55ddeb1a87be4fbb95a9bd74b4d745ca81117C9B092C4C70AFF76833373CE7F4Absolute234567891.0FG2218d90f94944a94952be83354847631234594 \ No newline at end of file diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/dmaap-notification-message.json b/asdc-controller/src/test/resources/resource-examples/vgw/dmaap-notification-message.json deleted file mode 100644 index 8c42c9c3e9..0000000000 --- a/asdc-controller/src/test/resources/resource-examples/vgw/dmaap-notification-message.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "distributionID": "35f20eb9-238a-4cc2-96dc-0a08f71bc209", - "serviceName": "VgwServiceV1", - "serviceVersion": "1.0", - "serviceUUID": "e051ff77-fb79-451c-8457-1cbf94e4db8f", - "serviceDescription": "Test VGW Service", - "serviceInvariantUUID": "c2ce924f-0aa1-4777-9b42-c0fec006a883", - "resources": [ - { - "resourceInstanceName": "VgwVspV1 0", - "resourceName": "VgwVspV1", - "resourceVersion": "1.0", - "resourceType": "VF", - "resourceUUID": "655aa939-d589-4333-8cc6-8fcb15db858a", - "resourceInvariantUUID": "c53a0c91-35f6-40ff-bcda-f75030cfaf2d", - "resourceCustomizationUUID": "db1673e1-351a-4d04-8e2f-84b2b4c52cc7", - "category": "Generic", - "subcategory": "Network Service", - "artifacts": [ - { - "artifactName": "vf-license-model.xml", - "artifactType": "VF_LICENSE", - "artifactURL": "/VF_LICENSE/vf-license-model.xml", - "artifactChecksum": "NjMwZDc0YzhiNDRlZDAyYjIxMmFlM2M0MWRkZjFmNDA\u003d", - "artifactDescription": "VF license file", - "artifactTimeout": 120, - "artifactUUID": "8dda263d-90bb-4b3d-b8e0-0048222dc658", - "artifactVersion": "1" - }, - { - "artifactName": "vgw6.csar", - "artifactType": "ETSI_PACKAGE", - "artifactURL": "/ETSI_PACKAGE/vgw6.csar", - "artifactChecksum": "NjdmNGU3ZDlkODQ0YTUzMTU5NjZmOThiYjMxNTJiNGI\u003d", - "artifactDescription": "Artifact created from csar", - "artifactTimeout": 120, - "artifactUUID": "9e9930b8-898e-4b8b-999e-66c43e1611f4", - "artifactVersion": "1" - }, - { - "artifactName": "vendor-license-model.xml", - "artifactType": "VENDOR_LICENSE", - "artifactURL": "/VENDOR_LICENSE/vendor-license-model.xml", - "artifactChecksum": "NGNmNzU4MDhjN2FjMTJkNWIxMjNkZDZhOWQyYzU0ZjA\u003d", - "artifactDescription": " Vendor license file", - "artifactTimeout": 120, - "artifactUUID": "b3f7a4cf-6a35-4f66-b800-cd4a9a0e9719", - "artifactVersion": "1" - } - ] - } - ], - "serviceArtifacts": [ - { - "artifactName": "service-Vgwservicev1-csar.csar", - "artifactType": "TOSCA_CSAR", - "artifactURL": "/service-Vgwservicev1-csar.csar", - "artifactChecksum": "MzcxNTMwMDhmNGY0MjRkMjFkNzk1MDNjOTVhNjQzMmE\u003d", - "artifactDescription": "TOSCA definition package of the asset", - "artifactTimeout": 0, - "artifactUUID": "0cc70c6e-6ddc-4ecc-8052-d9f1433c14b8", - "artifactVersion": "1" - } - ], - "workloadContext": "Production" -} diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error-package-exists.json b/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error-package-exists.json deleted file mode 100644 index 8dc07b9613..0000000000 --- a/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error-package-exists.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "jobId": "57c13120-0a03-4d2e-837a-7c41d61e4a30", - "responseDescriptor": - { - "status": "error", - "progress": "255", - "statusDescription": "VNF package() already exists.", - "errorCode": "1", - "responseId": "2", - "responseHistoryList": [ - { - "status": "processing", - "progress": "5", - "statusDescription": "Start CSAR(8f0b72e1-b6d6-42b6-a808-c60b17f04d7a) distribute.", - "errorCode": "0", - "responseId": "1" - } - ] - } -} diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error.json b/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error.json deleted file mode 100644 index 13f346fb7a..0000000000 --- a/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "jobId": "57c13120-0a03-4d2e-837a-7c41d61e4a30", - "responseDescriptor": - { - "status": "error", - "progress": "255", - "statusDescription": "Failed to query artifacts(resources) from sdc.", - "errorCode": "0", - "responseId": "2", - "responseHistoryList": [ - { - "status": "processing", - "progress": "5", - "statusDescription": "Start CSAR(8f0b72e1-b6d6-42b6-a808-c60b17f04d7a) distribute.", - "errorCode": "0", - "responseId": "1" - } - ] - } -} diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-successful.json b/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-successful.json deleted file mode 100644 index b5dc1fe4f2..0000000000 --- a/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-successful.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "jobId": "57c13120-0a03-4d2e-837a-7c41d61e4a30", - "responseDescriptor": - { - "status": "finished", - "progress": "100", - "statusDescription": "CSAR(8f0b72e1-b6d6-42b6-a808-c60b17f04d7a) distribute successfully.", - "errorCode": "0", - "responseId": "3", - "responseHistoryList": [ - { - "status": "processing", - "progress": "30", - "statusDescription": "Save CSAR(8f0b72e1-b6d6-42b6-a808-c60b17f04d7a) to database.", - "errorCode": "0", - "responseId": "2" - }, - { - "status": "processing", - "progress": "5", - "statusDescription": "Start CSAR(8f0b72e1-b6d6-42b6-a808-c60b17f04d7a) distribute.", - "errorCode": "0", - "responseId": "1" - } - ] - } -} diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/service-Vgwservicev1-csar.csar b/asdc-controller/src/test/resources/resource-examples/vgw/service-Vgwservicev1-csar.csar deleted file mode 100644 index eaed092b00..0000000000 Binary files a/asdc-controller/src/test/resources/resource-examples/vgw/service-Vgwservicev1-csar.csar and /dev/null differ -- cgit 1.2.3-korg