diff options
| author |   pwielebs <piotr.wielebski@nokia.com> | 2019-05-27 11:20:22 +0200 |
|---|---|---|
| committer | pwielebs <piotr.wielebski@nokia.com> | 2019-05-27 13:44:00 +0200 |
| commit | 6ef3cb626cdf753b15cf91b88bf8304b7ea7a812 (patch) | |
| tree | 64437810b708ee1b63337c5c59ddb3eecb31b588 /rest-services/aai-client/src/test | |
| parent | 2668ca2fd0029fe0946f8148882f93c3bfaab466 (diff) | |
Refactor of AAI model
Unused fields removed from AAI model in SDK
Change-Id: Ie46c98edd2ccbcff146b210c715f472d15e26bef
Issue-ID: DCAEGEN2-1533
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
Diffstat (limited to 'rest-services/aai-client/src/test')
2 files changed, 1 insertions, 11 deletions
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 f93bfd67..d56348c8 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 @@ -44,7 +44,6 @@ 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") .aaiIgnoreSslCertificateErrors(false) @@ -54,10 +53,6 @@ public final class AaiClientConfigurations { .keyStorePasswordPath("/server.pass") .enableAaiCertAuth(secure) .aaiHeaders(headers) - .aaiProtocol("sample-protocol") - .aaiPort(8080) - .aaiBasePath("sample-base-path") - .aaiPnfPath("sample-pnf-path") .aaiServiceInstancePath("sample-instance-path") .build(); } diff --git a/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/AbstractHttpClientTest.java b/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/AbstractHttpClientTest.java index 7a8d39d1..097c5d3a 100644 --- a/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/AbstractHttpClientTest.java +++ b/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/AbstractHttpClientTest.java @@ -37,11 +37,6 @@ public class AbstractHttpClientTest { protected String constructAaiUri(AaiClientConfiguration configuration, String pnfName) { - return new URI.URIBuilder() - .scheme(configuration.aaiProtocol()) - .host(configuration.aaiHost()) - .port(configuration.aaiPort()) - .path(configuration.aaiBasePath() + configuration.aaiPnfPath() + "/" + pnfName) - .build().toString(); + return new URI.URIBuilder().path(configuration.pnfUrl() + "/" + pnfName).build().toString(); } } |