Add pnfUrl field

* Due to changes in the aai client configuration json old parameters:
   aaiHost, aaiProtocol, aaiPort, aaiBasePath, aaiPnfPath will be
   replaced by pnfUrl

Change-Id: I709445015ae8528777db3052ffa4431eb90a226e
Issue-ID: DCAEGEN2-1398
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>

diff --git a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/config/AaiClientConfiguration.java b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/config/AaiClientConfiguration.java
index 3a6dbc4..fad3cb6 100644 (file)
--- a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/config/AaiClientConfiguration.java
+++ b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/config/AaiClientConfiguration.java
@@ -34,12 +34,23 @@ public abstract class AaiClientConfiguration implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @Value.Parameter
+    public abstract String pnfUrl();
+
+    /**
+        Due to changes in the aai client configuration json old parameters:
+        aaiHost, aaiProtocol, aaiPort, aaiBasePath, aaiPnfPath
+        will be replaced by pnfUrl
+    */
+    @Deprecated
     @Value.Parameter
     public abstract String aaiHost();
 
+    @Deprecated
     @Value.Parameter
     public abstract Integer aaiPort();
 
+    @Deprecated
     @Value.Parameter
     public abstract String aaiProtocol();
 
@@ -52,9 +63,11 @@ public abstract class AaiClientConfiguration implements Serializable {
     @Value.Parameter
     public abstract Boolean aaiIgnoreSslCertificateErrors();
 
+    @Deprecated
     @Value.Parameter
     public abstract String aaiBasePath();
 
+    @Deprecated
     @Value.Parameter
     public abstract String aaiPnfPath();
 

diff --git a/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/AaiClientConfigurations.java b/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/AaiClientConfigurations.java
index ce8c07f..f93bfd6 100644 (file)
--- a/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/AaiClientConfigurations.java
+++ b/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/AaiClientConfigurations.java
@@ -43,6 +43,7 @@ public final class AaiClientConfigurations {
 
     private static AaiClientConfiguration validConfiguration(Map<String, String> headers, boolean secure) {
         return new ImmutableAaiClientConfiguration.Builder()
+                .pnfUrl("some-url")
                 .aaiHost("sample-host")
                 .aaiUserName("sample-username")
                 .aaiUserPassword("sample-password")