diff options
author | Marcus G K Williams <marcus.williams@intel.com> | 2017-11-14 13:31:01 -0800 |
---|---|---|
committer | Marcus G K Williams <marcus.williams@intel.com> | 2017-11-14 14:18:39 -0800 |
commit | cf7b1f410a2776c4323e995863559982d54895fe (patch) | |
tree | d4ba18698f0f15ec7c73d1dd6a17d8a1737cb203 /vnfapi/provider/src/main | |
parent | 9c6a1f08827e2183e5410c82f0fb2941b83918db (diff) |
Fix preload-network-topology-operation err msgs
Issue-Id: SDNC-145
Change-Id: Ibf4fe3101b278ad3dee7632863eb10f4b4c88e48
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
Diffstat (limited to 'vnfapi/provider/src/main')
-rw-r--r-- | vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java b/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java index 28daac27..e8a9e716 100644 --- a/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java +++ b/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java @@ -1800,9 +1800,9 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL || input.getVnfTopologyInformation().getVnfTopologyIdentifier() == null || input.getVnfTopologyInformation().getVnfTopologyIdentifier().getVnfName() == null || input.getVnfTopologyInformation().getVnfTopologyIdentifier().getVnfType() == null) { - log.debug("exiting " + SVC_OPERATION + " because of invalid input, null or empty vnf-name and vnf-type"); + log.debug("exiting " + SVC_OPERATION + " because of invalid input, null or empty vnf-name or vnf-type"); responseBuilder.setResponseCode("403"); - responseBuilder.setResponseMessage("invalid input, null or empty vnf-name and vnf-type"); + responseBuilder.setResponseMessage("invalid input, null or empty vnf-name or vnf-type"); responseBuilder.setAckFinalIndicator("Y"); RpcResult<PreloadVnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<PreloadVnfTopologyOperationOutput>status(true).withResult(responseBuilder.build()) @@ -1997,9 +1997,9 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL || input.getVnfInstanceTopologyInformation().getVnfInstanceIdentifiers().getVnfInstanceName() == null || input.getVnfInstanceTopologyInformation().getVnfInstanceIdentifiers().getVnfModelId() == null) { log.debug("exiting " + SVC_OPERATION - + " because of invalid input, null or empty vnf-instance-name and vnf-model-id"); + + " because of invalid input, null or empty vnf-instance-name or vnf-model-id"); responseBuilder.setResponseCode("403"); - responseBuilder.setResponseMessage("invalid input, null or empty vnf-instance-name and vnf-model-id"); + responseBuilder.setResponseMessage("invalid input, null or empty vnf-instance-name or vnf-model-id"); responseBuilder.setAckFinalIndicator("Y"); RpcResult<PreloadVnfInstanceTopologyOperationOutput> rpcResult = RpcResultBuilder.<PreloadVnfInstanceTopologyOperationOutput>status(true) @@ -2199,9 +2199,9 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL || input.getVfModuleTopologyInformation().getVfModuleIdentifiers().getVfModuleName() == null || input.getVfModuleTopologyInformation().getVfModuleIdentifiers().getVfModuleModelId() == null) { log.debug("exiting " + SVC_OPERATION - + " because of invalid input, null or empty vnf-instance-name and vnf-model-id"); + + " because of invalid input, null or empty vf-module-name or vf-module-model-id"); responseBuilder.setResponseCode("403"); - responseBuilder.setResponseMessage("invalid input, null or empty vnf-instance-name and vnf-model-id"); + responseBuilder.setResponseMessage("invalid input, null or empty vf-module-name or vf-module-model-id"); responseBuilder.setAckFinalIndicator("Y"); RpcResult<PreloadVfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder.<PreloadVfModuleTopologyOperationOutput>status(true) @@ -2397,9 +2397,10 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL || input.getNetworkTopologyInformation().getNetworkTopologyIdentifier() == null || input.getNetworkTopologyInformation().getNetworkTopologyIdentifier().getNetworkName() == null || input.getNetworkTopologyInformation().getNetworkTopologyIdentifier().getNetworkType() == null) { - log.debug("exiting " + SVC_OPERATION + " because of invalid input, null or empty vnf-name and vnf-type"); + log.debug("exiting " + SVC_OPERATION + " because of invalid input, null or" + + " empty network-name or network-type"); responseBuilder.setResponseCode("403"); - responseBuilder.setResponseMessage("input, null or empty vnf-name and vnf-type"); + responseBuilder.setResponseMessage("input, null or empty network-name or network-type"); responseBuilder.setAckFinalIndicator("Y"); RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder.<PreloadNetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()) |