aboutsummaryrefslogtreecommitdiffstats
path: root/rest-services/aai-client/src
diff options
context:
space:
mode:
authorpwielebs <piotr.wielebski@nokia.com>2019-04-05 10:57:29 +0200
committerpwielebs <piotr.wielebski@nokia.com>2019-04-05 10:58:09 +0200
commit54da6f19e26724bf7695618e8db635ce4e1ff8e1 (patch)
treed8c4cdf74bd5aa1bfce6b55c663056fb45201643 /rest-services/aai-client/src
parentb216682dc03e696ce75231135fe72dec6ce4e166 (diff)
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>
Diffstat (limited to 'rest-services/aai-client/src')
-rw-r--r--rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/config/AaiClientConfiguration.java13
-rw-r--r--rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/AaiClientConfigurations.java1
2 files changed, 14 insertions, 0 deletions
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 3a6dbc46..fad3cb60 100644
--- 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
@@ -35,11 +35,22 @@ 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 ce8c07f6..f93bfd67 100644
--- 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")