diff options
3 files changed, 6 insertions, 2 deletions
diff --git a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang index a9c5cd65..d94dd8af 100644 --- a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang +++ b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang @@ -1977,7 +1977,7 @@ module GENERIC-RESOURCE-API { }
grouping connection-attachment-topology {
- container brg-topology {
+ container connection-attachment-topology {
uses allotted-resource-identifiers;
uses onap-model-information;
uses connection-attachment-assignments;
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 |