diff options
| author |   Marcus Williams <marcus.williams@intel.com> | 2017-09-15 07:28:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-09-15 07:28:07 +0000 |
| commit | b160cde643a1f943be154e76d0e0fcf8eaad1f91 (patch) | |
| tree | 13a9591a3fc568cd6194352744a59d3628b9f4c7 | |
| parent | 307e6ec457ac5ff9ee1ea8ca048a91b55536a958 (diff) | |
| parent | 329e3595d6a08cc31cdc532282b98aec3a9f98fa (diff) | |
Merge "Set RequestId as MDC in SDNC"
| -rw-r--r-- | vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/vnfapiProvider.java | 15 |
1 files changed, 15 insertions, 0 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 9893235a..60d7e886 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 @@ -139,6 +139,7 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.MDC; import com.google.common.base.Optional; import com.google.common.util.concurrent.CheckedFuture; @@ -1002,6 +1003,11 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL } } + //Save the requestId into MDC + private void setRequestIdAsMDC(String requestId){ + MDC.put("RequestId", requestId); + } + //1610 vnf-instance-topology-operation @Override public Future<RpcResult<VnfInstanceTopologyOperationOutput>> vnfInstanceTopologyOperation( @@ -1050,6 +1056,7 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL if (input.getSdncRequestHeader() != null) { responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId()); + setRequestIdAsMDC(input.getSdncRequestHeader().getSvcRequestId()); } // Get vnf-instance-preload-data @@ -1280,6 +1287,7 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL if (input.getSdncRequestHeader() != null) { responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId()); + setRequestIdAsMDC(input.getSdncRequestHeader().getSvcRequestId()); } // Get vf-module-preload-data @@ -1534,6 +1542,7 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL if (input.getSdncRequestHeader() != null) { responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId()); + setRequestIdAsMDC(input.getSdncRequestHeader().getSvcRequestId()); } PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder(); @@ -1768,6 +1777,7 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL if (input.getSdncRequestHeader() != null) { responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId()); + setRequestIdAsMDC(input.getSdncRequestHeader().getSvcRequestId()); } PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder(); @@ -1931,6 +1941,7 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL if (input.getSdncRequestHeader() != null) { responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId()); + setRequestIdAsMDC(input.getSdncRequestHeader().getSvcRequestId()); } PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder(); @@ -2125,6 +2136,7 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL if (input.getSdncRequestHeader() != null) { responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId()); + setRequestIdAsMDC(input.getSdncRequestHeader().getSvcRequestId()); } VnfInstancePreloadDataBuilder vnfInstancePreloadDataBuilder = new VnfInstancePreloadDataBuilder(); @@ -2320,6 +2332,7 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL if (input.getSdncRequestHeader() != null) { responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId()); + setRequestIdAsMDC(input.getSdncRequestHeader().getSvcRequestId()); } VfModulePreloadDataBuilder vfModulePreloadDataBuilder = new VfModulePreloadDataBuilder(); @@ -2510,6 +2523,7 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL if (input.getSdncRequestHeader() != null) { responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId()); + setRequestIdAsMDC(input.getSdncRequestHeader().getSvcRequestId()); } PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder(); @@ -2647,4 +2661,5 @@ public class vnfapiProvider implements AutoCloseable, VNFAPIService, DataChangeL RpcResultBuilder.<PreloadNetworkTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build(); return Futures.immediateFuture(rpcResult); } + } |