From 831c386f368e6751dd482b5f5047fc34c4f5d951 Mon Sep 17 00:00:00 2001
From: Sandeep Shah <sandeeplinux1068@gmail.com>
Date: Tue, 12 Nov 2019 10:16:43 -0600
Subject: [PATCH] Inclusion of A1 adapter in SDNR meta karaf feature

The feature to be included after successful merge of A1
adapter feature JAR files and updated POM file in CCSDK
distribution. Also included additional payload logs in
provider code

Issue-ID: CCSDK-1895
Signed-off-by: SandeepLinux <Sandeep.Shah@ibm.com>
Change-Id: I4818d5330cb670ae54166c470126d29c39c7b573
---
 .../northbound/a1Adapter/A1AdapterProvider.java    | 88 ++++++++++++++++++++++
 .../ccsdk-features-sdnr-northbound-all/pom.xml     |  7 ++
 2 files changed, 95 insertions(+)

diff --git a/sdnr/northbound/a1Adapter/provider/src/main/java/org/onap/ccsdk/features/sdnr/northbound/a1Adapter/A1AdapterProvider.java b/sdnr/northbound/a1Adapter/provider/src/main/java/org/onap/ccsdk/features/sdnr/northbound/a1Adapter/A1AdapterProvider.java
index cb4fa903d..5e06118f9 100644
--- a/sdnr/northbound/a1Adapter/provider/src/main/java/org/onap/ccsdk/features/sdnr/northbound/a1Adapter/A1AdapterProvider.java
+++ b/sdnr/northbound/a1Adapter/provider/src/main/java/org/onap/ccsdk/features/sdnr/northbound/a1Adapter/A1AdapterProvider.java
@@ -124,6 +124,14 @@ public ListenableFuture<RpcResult<GetNearRTRICsOutput>> getNearRTRICs(
   GetNearRTRICsInputBuilder inputBuilder = new GetNearRTRICsInputBuilder(input);
   MdsalHelper.toProperties(parms, inputBuilder.build());
 
+  LOG.info("Printing SLI parameters to be passed");
+
+  // iterate properties file to get key-value pairs
+    for (String key : parms.stringPropertyNames()) {
+      String value = parms.getProperty(key);
+      LOG.info("The SLI parameter in " + key + " is: " + value);
+    }
+
   // Call SLI sync method
   try
   {
@@ -194,6 +202,14 @@ public ListenableFuture<RpcResult<GetNearRTRICsOutput>> getNearRTRICs(
 		GetHealthCheckInputBuilder inputBuilder = new GetHealthCheckInputBuilder(input);
 		MdsalHelper.toProperties(parms, inputBuilder.build());
 
+    LOG.info("Printing SLI parameters to be passed");
+
+    // iterate properties file to get key-value pairs
+			for (String key : parms.stringPropertyNames()) {
+				String value = parms.getProperty(key);
+				LOG.info("The SLI parameter in " + key + " is: " + value);
+			}
+
 		// Call SLI sync method
 		try
 		{
@@ -264,6 +280,14 @@ public ListenableFuture<RpcResult<GetPolicyTypesOutput>> getPolicyTypes(
   GetPolicyTypesInputBuilder inputBuilder = new GetPolicyTypesInputBuilder(input);
   MdsalHelper.toProperties(parms, inputBuilder.build());
 
+  LOG.info("Printing SLI parameters to be passed");
+
+  // iterate properties file to get key-value pairs
+    for (String key : parms.stringPropertyNames()) {
+      String value = parms.getProperty(key);
+      LOG.info("The SLI parameter in " + key + " is: " + value);
+    }
+
   // Call SLI sync method
   try
   {
@@ -334,6 +358,14 @@ public ListenableFuture<RpcResult<CreatePolicyTypeOutput>> createPolicyType(
   CreatePolicyTypeInputBuilder inputBuilder = new CreatePolicyTypeInputBuilder(input);
   MdsalHelper.toProperties(parms, inputBuilder.build());
 
+  LOG.info("Printing SLI parameters to be passed");
+
+  // iterate properties file to get key-value pairs
+    for (String key : parms.stringPropertyNames()) {
+      String value = parms.getProperty(key);
+      LOG.info("The SLI parameter in " + key + " is: " + value);
+    }
+
   // Call SLI sync method
   try
   {
@@ -404,6 +436,14 @@ public ListenableFuture<RpcResult<GetPolicyTypeOutput>> getPolicyType(
   GetPolicyTypeInputBuilder inputBuilder = new GetPolicyTypeInputBuilder(input);
   MdsalHelper.toProperties(parms, inputBuilder.build());
 
+  LOG.info("Printing SLI parameters to be passed");
+
+  // iterate properties file to get key-value pairs
+    for (String key : parms.stringPropertyNames()) {
+      String value = parms.getProperty(key);
+      LOG.info("The SLI parameter in " + key + " is: " + value);
+    }
+
   // Call SLI sync method
   try
   {
@@ -474,6 +514,14 @@ public ListenableFuture<RpcResult<DeletePolicyTypeOutput>> deletePolicyType(
   DeletePolicyTypeInputBuilder inputBuilder = new DeletePolicyTypeInputBuilder(input);
   MdsalHelper.toProperties(parms, inputBuilder.build());
 
+  LOG.info("Printing SLI parameters to be passed");
+
+  // iterate properties file to get key-value pairs
+    for (String key : parms.stringPropertyNames()) {
+      String value = parms.getProperty(key);
+      LOG.info("The SLI parameter in " + key + " is: " + value);
+    }
+
   // Call SLI sync method
   try
   {
@@ -544,6 +592,14 @@ public ListenableFuture<RpcResult<GetPolicyInstancesOutput>> getPolicyInstances(
   GetPolicyInstancesInputBuilder inputBuilder = new GetPolicyInstancesInputBuilder(input);
   MdsalHelper.toProperties(parms, inputBuilder.build());
 
+  LOG.info("Printing SLI parameters to be passed");
+
+  // iterate properties file to get key-value pairs
+    for (String key : parms.stringPropertyNames()) {
+      String value = parms.getProperty(key);
+      LOG.info("The SLI parameter in " + key + " is: " + value);
+    }
+
   // Call SLI sync method
   try
   {
@@ -615,6 +671,14 @@ public ListenableFuture<RpcResult<CreatePolicyInstanceOutput>> createPolicyInsta
   CreatePolicyInstanceInputBuilder inputBuilder = new CreatePolicyInstanceInputBuilder(input);
   MdsalHelper.toProperties(parms, inputBuilder.build());
 
+  LOG.info("Printing SLI parameters to be passed");
+
+  // iterate properties file to get key-value pairs
+    for (String key : parms.stringPropertyNames()) {
+      String value = parms.getProperty(key);
+      LOG.info("The SLI parameter in " + key + " is: " + value);
+    }
+
   // Call SLI sync method
   try
   {
@@ -687,6 +751,14 @@ public ListenableFuture<RpcResult<GetPolicyInstanceOutput>> getPolicyInstance(
   GetPolicyInstanceInputBuilder inputBuilder = new GetPolicyInstanceInputBuilder(input);
   MdsalHelper.toProperties(parms, inputBuilder.build());
 
+  LOG.info("Printing SLI parameters to be passed");
+
+  // iterate properties file to get key-value pairs
+    for (String key : parms.stringPropertyNames()) {
+      String value = parms.getProperty(key);
+      LOG.info("The SLI parameter in " + key + " is: " + value);
+    }
+
   // Call SLI sync method
   try
   {
@@ -759,6 +831,14 @@ public ListenableFuture<RpcResult<DeletePolicyInstanceOutput>> deletePolicyInsta
   DeletePolicyInstanceInputBuilder inputBuilder = new DeletePolicyInstanceInputBuilder(input);
   MdsalHelper.toProperties(parms, inputBuilder.build());
 
+  LOG.info("Printing SLI parameters to be passed");
+
+  // iterate properties file to get key-value pairs
+    for (String key : parms.stringPropertyNames()) {
+      String value = parms.getProperty(key);
+      LOG.info("The SLI parameter in " + key + " is: " + value);
+    }
+
   // Call SLI sync method
   try
   {
@@ -831,6 +911,14 @@ public ListenableFuture<RpcResult<GetStatusOutput>> getStatus(
   GetStatusInputBuilder inputBuilder = new GetStatusInputBuilder(input);
   MdsalHelper.toProperties(parms, inputBuilder.build());
 
+  LOG.info("Printing SLI parameters to be passed");
+
+  // iterate properties file to get key-value pairs
+    for (String key : parms.stringPropertyNames()) {
+      String value = parms.getProperty(key);
+      LOG.info("The SLI parameter in " + key + " is: " + value);
+    }
+
   // Call SLI sync method
   try
   {
diff --git a/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml b/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml
index 8cd681b0f..1d8298e98 100644
--- a/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml
+++ b/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml
@@ -43,5 +43,12 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>sdnr-a1Adapter</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
   </dependencies>
 </project>
-- 
2.16.6