diff options
3 files changed, 103 insertions, 4 deletions
diff --git a/asdc-controller/src/test/resources/resource-examples/vFW/service-Vfw.csar b/asdc-controller/src/test/resources/resource-examples/vFW/service-Vfw.csar Binary files differindex fe0b9f3131..260ff86916 100644 --- a/asdc-controller/src/test/resources/resource-examples/vFW/service-Vfw.csar +++ b/asdc-controller/src/test/resources/resource-examples/vFW/service-Vfw.csar diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java index 0df25be714..8aab4ec818 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java @@ -151,13 +151,13 @@ public class ResourceRequestBuilder { Map<String, String> resourceInputData = getResourceInputStr(serviceVnfCust, resourceCustomizationUuid); // find match in network resource - if (resourceInputData != null && resourceInputData.isEmpty()) { + if (resourceInputData.isEmpty()) { List<Map<String, Object>> serviceNetworkCust = (List<Map<String, Object>>) serviceResources.get("serviceNetworks"); resourceInputData = getResourceInputStr(serviceNetworkCust, resourceCustomizationUuid); // find match in AR resource - if (resourceInputData == null) { + if (resourceInputData.isEmpty()) { List<Map<String, Object>> serviceArCust = (List<Map<String, Object>>) serviceResources.get("serviceAllottedResources"); resourceInputData = getResourceInputStr(serviceArCust, resourceCustomizationUuid); @@ -166,7 +166,7 @@ public class ResourceRequestBuilder { String resourceInputStr = null; ResourceLevel resourceLevel = null; - if (resourceInputData != null) { + if (!resourceInputData.isEmpty()) { resourceInputStr = resourceInputData.get("resourceInput"); resourceLevel = ResourceLevel.valueOf(resourceInputData.get("nodeType")); } @@ -200,7 +200,7 @@ public class ResourceRequestBuilder { return resourceInputMap; } } - return null; + return new HashMap<>(); } // this method combines resource input with service input diff --git a/vnfm-simulator/vnfm-service/src/test/java/org/onap/svnfm/simulator/services/InstantiateOperatorProgressorTest.java b/vnfm-simulator/vnfm-service/src/test/java/org/onap/svnfm/simulator/services/InstantiateOperatorProgressorTest.java new file mode 100644 index 0000000000..ea6c6ef71a --- /dev/null +++ b/vnfm-simulator/vnfm-service/src/test/java/org/onap/svnfm/simulator/services/InstantiateOperatorProgressorTest.java @@ -0,0 +1,99 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2019 Nokia. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.svnfm.simulator.services; + +import static org.assertj.core.api.Assertions.assertThat; +import java.util.ArrayList; +import java.util.List; +import org.junit.Before; +import org.junit.Test; +import org.onap.so.adapters.vnfmadapter.extclients.vnfm.grant.model.GrantsAddResources; +import org.onap.so.adapters.vnfmadapter.extclients.vnfm.model.LccnSubscriptionRequest; +import org.onap.svnfm.simulator.config.ApplicationConfig; +import org.onap.svnfm.simulator.model.VnfOperation; +import org.onap.svnfm.simulator.model.Vnfds; +import org.onap.svnfm.simulator.model.Vnfds.Vnfc; +import org.onap.svnfm.simulator.model.Vnfds.Vnfd; + +public class InstantiateOperatorProgressorTest { + + private static final String VNF_ID = "vnfTestId"; + private static final String CALLBACK_URI = "/lcn/uritest"; + private static final String VNFC_TYPE = "COMPUTE"; + private static final String RESOURCE_TEMPLATE_ID = "resTempIdTest"; + private static final String VDU_ID = "vduIdTest"; + + private InstantiateOperationProgressor testedObject; + + @Before + public void setup() { + testedObject = new InstantiateOperationProgressor(new VnfOperation(), new SvnfmService(), null, + new ApplicationConfig(), createVnfds(), createSubscriptionService()); + } + + @Test + public void getAddResources_vnfIdFound() { + List<GrantsAddResources> result = testedObject.getAddResources(VNF_ID); + assertThat(result).hasSize(1); + GrantsAddResources grantsAddResourceResult = result.get(0); + assertThat(grantsAddResourceResult.getType()).hasToString(VNFC_TYPE); + assertThat(grantsAddResourceResult.getResourceTemplateId()).isEqualTo(RESOURCE_TEMPLATE_ID); + assertThat(grantsAddResourceResult.getVduId()).isEqualTo(VDU_ID); + } + + @Test + public void getAddResources_vnfIdNotFound() { + List<GrantsAddResources> result = testedObject.getAddResources("otherVnfId"); + assertThat(result).isEmpty(); + } + + private Vnfds createVnfds() { + Vnfd vnfd = new Vnfd(); + vnfd.setVnfdId(VNF_ID); + List<Vnfc> vnfcList = new ArrayList<>(); + vnfcList.add(createVnfc()); + vnfd.setVnfcList(vnfcList); + + List<Vnfd> vnfdList = new ArrayList<>(); + vnfdList.add(vnfd); + + Vnfds vnfds = new Vnfds(); + vnfds.setVnfdList(vnfdList); + return vnfds; + } + + private Vnfc createVnfc() { + Vnfc vnfc = new Vnfc(); + vnfc.setType(VNFC_TYPE); + vnfc.setResourceTemplateId(RESOURCE_TEMPLATE_ID); + vnfc.setVduId(VDU_ID); + return vnfc; + } + + private SubscriptionService createSubscriptionService() { + SubscriptionService subscriptionService = new SubscriptionService(); + LccnSubscriptionRequest lccnSubscriptionRequest = new LccnSubscriptionRequest(); + lccnSubscriptionRequest.setCallbackUri(CALLBACK_URI); + subscriptionService.registerSubscription(lccnSubscriptionRequest); + return subscriptionService; + } + +} |