diff options
| author |   gaurav <gaurav.agrawal@huawei.com> | 2018-07-25 23:03:00 +0530 |
|---|---|---|
| committer | Gaurav Agrawal <gaurav.agrawal@huawei.com> | 2018-07-30 11:09:58 +0000 |
| commit | 8c4fa88671c47377c56a0e47fae5518b66defbaa (patch) | |
| tree | d75b92b0452dedd68bba02bdf4adf7eb6d4b050f /generic-resource-api/provider/src | |
| parent | 7bfcacb00d386d2a9bb68532f26f61b098d4e844 (diff) | |
Corrections for northbound
Changes includes:
1. Correcting connection-attachment topology container name.
2. Make the vnf-topology-operation implementation flexible to allow
SDNC generate vnf-id for assign/create operation rather then mandating
SO to provide it.
Change-Id: I8958a72a4ca2064b781d246e9329436848f578ad
Issue-ID: SDNC-384
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>
Diffstat (limited to 'generic-resource-api/provider/src')
2 files changed, 5 insertions, 1 deletions
diff --git a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java index 02217b54..89466008 100644 --- a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java +++ b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java @@ -807,6 +807,8 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC trySetSvcRequestId(input, responseBuilder); + /* Comment out mandatory check for vnf id for scenario wherein for assign/create request vnf-id is generated by + SDNC itself. if (hasInvalidVnfId(input)) { log.debug("exiting {} because of null or empty vnf-id", svcOperation); responseBuilder.setResponseCode("404"); @@ -818,6 +820,7 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC return Futures.immediateFuture(rpcResult); } + */ String vnfId = input.getVnfInformation().getVnfId(); ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder(); diff --git a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/VnfTopologyOperationRPCTest.java b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/VnfTopologyOperationRPCTest.java index 7e657dc3..3c7b6ff7 100644 --- a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/VnfTopologyOperationRPCTest.java +++ b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/VnfTopologyOperationRPCTest.java @@ -57,6 +57,7 @@ public class VnfTopologyOperationRPCTest extends GenericResourceApiProviderTest } + /* @Test public void should_fail_when_invalid_vnf_id() throws Exception { @@ -72,7 +73,7 @@ public class VnfTopologyOperationRPCTest extends GenericResourceApiProviderTest assertEquals("404", output.getResponseCode()); assertEquals("invalid input, null or empty vnf-id", output.getResponseMessage()); assertEquals("Y", output.getAckFinalIndicator()); - } + }*/ @Test |