From e18ecde40cf3f48fcfef1f8853135ee00755a594 Mon Sep 17 00:00:00 2001 From: "waqas.ikram" Date: Thu, 22 Oct 2020 10:33:50 +0100 Subject: Changing ETSI folder dir per SDC-3244 requirement Change-Id: I69b5f72add73868626acf0c0951da12e4e29607a Issue-ID: SO-3327 Signed-off-by: waqas.ikram --- .../processor/EtsiResourcePackageProcessor.java | 2 +- .../SdcNotificationWithSol004PackageTest.java | 2 +- .../VENDOR_LICENSE/vendor-license-model.xml | 1 + .../ETSI_PACKAGE/VF_LICENSE/vf-license-model.xml | 1 + .../resource-examples/vgw/ETSI_PACKAGE/vgw6.csar | Bin 0 -> 43363 bytes .../VENDOR_LICENSE/vendor-license-model.xml | 1 - .../VF_LICENSE/vf-license-model.xml | 1 - .../vgw/ONBOARDED_PACKAGE/vgw6.csar | Bin 43363 -> 0 bytes .../vgw/SDC_RESOURCE_CSAR/vgw_sdc_resource.csar | Bin 117852 -> 117441 bytes .../vgw/dmaap-notification-message.json | 4 ++-- .../vgw/service-Vgwservicev1-csar.csar | Bin 122078 -> 121635 bytes 11 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VENDOR_LICENSE/vendor-license-model.xml create mode 100644 asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VF_LICENSE/vf-license-model.xml create 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/ONBOARDED_PACKAGE/VENDOR_LICENSE/vendor-license-model.xml delete mode 100644 asdc-controller/src/test/resources/resource-examples/vgw/ONBOARDED_PACKAGE/VF_LICENSE/vf-license-model.xml delete mode 100644 asdc-controller/src/test/resources/resource-examples/vgw/ONBOARDED_PACKAGE/vgw6.csar (limited to 'asdc-controller') diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/etsi/pkg/processor/EtsiResourcePackageProcessor.java b/asdc-controller/src/main/java/org/onap/so/asdc/etsi/pkg/processor/EtsiResourcePackageProcessor.java index bb7197b7a4..4205de3cab 100644 --- a/asdc-controller/src/main/java/org/onap/so/asdc/etsi/pkg/processor/EtsiResourcePackageProcessor.java +++ b/asdc-controller/src/main/java/org/onap/so/asdc/etsi/pkg/processor/EtsiResourcePackageProcessor.java @@ -44,7 +44,7 @@ import com.google.common.collect.ImmutableSet; public class EtsiResourcePackageProcessor { private final static Logger LOGGER = LoggerFactory.getLogger(EtsiResourcePackageProcessor.class); - private static final String ONBOARDED_PACKAGE_DIR_PATH = "Artifacts/Deployment/ONBOARDED_PACKAGE"; + private static final String ONBOARDED_PACKAGE_DIR_PATH = "Artifacts/Deployment/ETSI_PACKAGE"; private final SdcResourceProvider sdcResourceProvider; private final EtsiCatalogServiceProvider catalogServiceProvider; private static final int SLEEP_TIME_IN_SECONDS = 5; diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/client/SdcNotificationWithSol004PackageTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/client/SdcNotificationWithSol004PackageTest.java index cb5bd0f51a..2e8da35f3e 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/client/SdcNotificationWithSol004PackageTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/client/SdcNotificationWithSol004PackageTest.java @@ -345,7 +345,7 @@ public class SdcNotificationWithSol004PackageTest extends BaseTest { * Mock the AAI using wireshark. */ private void initMockAaiServer(final String serviceUuid, final String serviceInvariantUuid) { - final String modelEndpoint = "/aai/v19/service-design-and-creation/models/model/" + serviceInvariantUuid + final String modelEndpoint = "/aai/v21/service-design-and-creation/models/model/" + serviceInvariantUuid + "/model-vers/model-ver/" + serviceUuid + "?depth=0"; wireMockServer.stubFor(post(urlEqualTo(modelEndpoint)).willReturn(ok())); 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 new file mode 100644 index 0000000000..6499a58fab --- /dev/null +++ b/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VENDOR_LICENSE/vendor-license-model.xml @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000000..581a3acb7f --- /dev/null +++ b/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VF_LICENSE/vf-license-model.xml @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000000..56dbb2bce0 Binary files /dev/null and b/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/vgw6.csar differ diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/ONBOARDED_PACKAGE/VENDOR_LICENSE/vendor-license-model.xml b/asdc-controller/src/test/resources/resource-examples/vgw/ONBOARDED_PACKAGE/VENDOR_LICENSE/vendor-license-model.xml deleted file mode 100644 index 6499a58fab..0000000000 --- a/asdc-controller/src/test/resources/resource-examples/vgw/ONBOARDED_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/ONBOARDED_PACKAGE/VF_LICENSE/vf-license-model.xml b/asdc-controller/src/test/resources/resource-examples/vgw/ONBOARDED_PACKAGE/VF_LICENSE/vf-license-model.xml deleted file mode 100644 index 581a3acb7f..0000000000 --- a/asdc-controller/src/test/resources/resource-examples/vgw/ONBOARDED_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/ONBOARDED_PACKAGE/vgw6.csar b/asdc-controller/src/test/resources/resource-examples/vgw/ONBOARDED_PACKAGE/vgw6.csar deleted file mode 100644 index 56dbb2bce0..0000000000 Binary files a/asdc-controller/src/test/resources/resource-examples/vgw/ONBOARDED_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 index 7ddfb6ef51..9eb240d9a7 100644 Binary files a/asdc-controller/src/test/resources/resource-examples/vgw/SDC_RESOURCE_CSAR/vgw_sdc_resource.csar and b/asdc-controller/src/test/resources/resource-examples/vgw/SDC_RESOURCE_CSAR/vgw_sdc_resource.csar differ 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 index d936cd1144..8c42c9c3e9 100644 --- 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 @@ -29,8 +29,8 @@ }, { "artifactName": "vgw6.csar", - "artifactType": "ONBOARDED_PACKAGE", - "artifactURL": "/ONBOARDED_PACKAGE/vgw6.csar", + "artifactType": "ETSI_PACKAGE", + "artifactURL": "/ETSI_PACKAGE/vgw6.csar", "artifactChecksum": "NjdmNGU3ZDlkODQ0YTUzMTU5NjZmOThiYjMxNTJiNGI\u003d", "artifactDescription": "Artifact created from csar", "artifactTimeout": 120, 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 index 51a9e19466..eaed092b00 100644 Binary files a/asdc-controller/src/test/resources/resource-examples/vgw/service-Vgwservicev1-csar.csar and b/asdc-controller/src/test/resources/resource-examples/vgw/service-Vgwservicev1-csar.csar differ -- cgit 1.2.3-korg