From d7cc059bfce52da57e8cc12e17280641878bce19 Mon Sep 17 00:00:00 2001 From: PatrikBuhr Date: Mon, 14 Dec 2020 13:33:06 +0100 Subject: Removing host from genernated doc Change-Id: If25daa12d270a43928f583d3a5cbc2258bb426d9 Issue-ID: CCSDK-2966 Signed-off-by: PatrikBuhr --- a1-policy-management/api/pms-api.json | 9 +++--- a1-policy-management/api/pms-api.yaml | 10 +++---- .../configuration/ApplicationConfig.java | 35 ++++++++++++---------- .../controllers/v2/ApplicationTest.java | 4 ++- 4 files changed, 32 insertions(+), 26 deletions(-) diff --git a/a1-policy-management/api/pms-api.json b/a1-policy-management/api/pms-api.json index b1bea446..173d8df1 100644 --- a/a1-policy-management/api/pms-api.json +++ b/a1-policy-management/api/pms-api.json @@ -427,7 +427,7 @@ "summary": "Query Near-RT RIC information", "deprecated": false, "produces": ["*/*"], - "operationId": "getRicsUsingGET_1", + "operationId": "getRicsUsingGET", "responses": { "200": { "schema": { @@ -511,7 +511,7 @@ "deprecated": false, "produces": ["application/json"], "description": "The call returns all Near-RT RICs that supports a given policy type identity", - "operationId": "getRicsUsingGET", + "operationId": "getRicsUsingGET_1", "responses": { "200": { "schema": {"$ref": "#/definitions/ric_info_list_v2"}, @@ -778,7 +778,7 @@ "summary": "Returns the name of a RIC managing one Mananged Element", "deprecated": false, "produces": ["*/*"], - "operationId": "getRicUsingGET_1", + "operationId": "getRicUsingGET", "responses": { "200": { "schema": {"type": "string"}, @@ -876,7 +876,7 @@ "deprecated": false, "produces": ["application/json"], "description": "Either a Near-RT RIC identity or a Mananged Element identity can be specified.
The intention with Mananged Element identity is the ID used in O1 for accessing the traffical element (such as the ID of CU).", - "operationId": "getRicUsingGET", + "operationId": "getRicUsingGET_1", "responses": { "200": { "schema": {"$ref": "#/definitions/ric_info_v2"}, @@ -1068,7 +1068,6 @@ } } }, - "host": "localhost:46233", "definitions": { "error_information": { "description": "Problem as defined in https://tools.ietf.org/html/rfc7807", diff --git a/a1-policy-management/api/pms-api.yaml b/a1-policy-management/api/pms-api.yaml index 665c9b65..8f2a040d 100644 --- a/a1-policy-management/api/pms-api.yaml +++ b/a1-policy-management/api/pms-api.yaml @@ -14,7 +14,7 @@ info: x-audience: external-partner x-api-id: 60f9a0e7-343f-43bf-9194-d8d65688d465 servers: -- url: //localhost:46233/ +- url: / tags: - name: A1 Policy Management Version 1.0 description: Policy Controller @@ -529,7 +529,7 @@ paths: tags: - A1 Policy Management Version 1.0 summary: Query Near-RT RIC information - operationId: getRicsUsingGET_1 + operationId: getRicsUsingGET parameters: - name: policyType in: query @@ -633,7 +633,7 @@ paths: summary: Query Near-RT RIC information description: The call returns all Near-RT RICs that supports a given policy type identity - operationId: getRicsUsingGET + operationId: getRicsUsingGET_1 parameters: - name: policytype_id in: query @@ -947,7 +947,7 @@ paths: tags: - A1 Policy Management Version 1.0 summary: Returns the name of a RIC managing one Mananged Element - operationId: getRicUsingGET_1 + operationId: getRicUsingGET parameters: - name: managedElementId in: query @@ -1077,7 +1077,7 @@ paths: description: Either a Near-RT RIC identity or a Mananged Element identity can be specified.
The intention with Mananged Element identity is the ID used in O1 for accessing the traffical element (such as the ID of CU). - operationId: getRicUsingGET + operationId: getRicUsingGET_1 parameters: - name: managed_element_id in: query diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/ApplicationConfig.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/ApplicationConfig.java index ab3e89ef..6449e48b 100644 --- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/ApplicationConfig.java +++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/ApplicationConfig.java @@ -81,26 +81,31 @@ public class ApplicationConfig { private Map controllerConfigs = new HashMap<>(); + private WebClientConfig webClientConfig = null; + public synchronized Collection getRicConfigs() { return this.ricConfigs.values(); } public WebClientConfig getWebClientConfig() { - HttpProxyConfig httpProxyConfig = ImmutableHttpProxyConfig.builder() // - .httpProxyHost(this.httpProxyHost) // - .httpProxyPort(this.httpProxyPort) // - .build(); - - return ImmutableWebClientConfig.builder() // - .keyStoreType(this.sslKeyStoreType) // - .keyStorePassword(this.sslKeyStorePassword) // - .keyStore(this.sslKeyStore) // - .keyPassword(this.sslKeyPassword) // - .isTrustStoreUsed(this.sslTrustStoreUsed) // - .trustStore(this.sslTrustStore) // - .trustStorePassword(this.sslTrustStorePassword) // - .httpProxyConfig(httpProxyConfig) // - .build(); + if (this.webClientConfig == null) { + HttpProxyConfig httpProxyConfig = ImmutableHttpProxyConfig.builder() // + .httpProxyHost(this.httpProxyHost) // + .httpProxyPort(this.httpProxyPort) // + .build(); + + this.webClientConfig = ImmutableWebClientConfig.builder() // + .keyStoreType(this.sslKeyStoreType) // + .keyStorePassword(this.sslKeyStorePassword) // + .keyStore(this.sslKeyStore) // + .keyPassword(this.sslKeyPassword) // + .isTrustStoreUsed(this.sslTrustStoreUsed) // + .trustStore(this.sslTrustStore) // + .trustStorePassword(this.sslTrustStorePassword) // + .httpProxyConfig(httpProxyConfig) // + .build(); + } + return this.webClientConfig; } public synchronized ControllerConfig getControllerConfig(String name) throws ServiceException { diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java index 2170b3c1..5edee150 100644 --- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java +++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java @@ -217,7 +217,9 @@ class ApplicationTest { String url = "https://localhost:" + this.port + "/v2/api-docs"; ResponseEntity resp = restClient("", false).getForEntity(url).block(); assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.OK); - String indented = (new JSONObject(resp.getBody())).toString(4); + JSONObject jsonObj = new JSONObject(resp.getBody()); + jsonObj.remove("host"); + String indented = (jsonObj).toString(4); String docDir = "api/"; Files.createDirectories(Paths.get(docDir)); try (PrintStream out = new PrintStream(new FileOutputStream(docDir + "pms-api.json"))) { -- cgit 1.2.3-korg