From 67bad64d2c84ff56f020b17e97daf2d35278289a Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Mon, 21 Oct 2019 14:18:40 -0400 Subject: [PATCH] Call method to insert slashes in CAAS-Ingress URL Change-Id: I125aa3e3184a095d863fba08798b2d32dd47fc07 Signed-off-by: Lott, Christopher (cl778h) --- docs/release-notes.rst | 1 + .../oransc/ric/portal/dashboard/k8sapi/SimpleKubernetesClient.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 3f9f86e8..3eaf7ddd 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -32,6 +32,7 @@ Version 1.2.4, 21 Oct 2019 * Align page titles to top left,decrease font size * Update EPSDK-FW to version 2.6 * Make constructor robust to missing caasingress.insecure property +* Repair bug that omitted slashes in CAAS-Ingress URL builder Version 1.2.3, 4 Oct 2019 ------------------------- diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/k8sapi/SimpleKubernetesClient.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/k8sapi/SimpleKubernetesClient.java index e81549d5..bcfae626 100644 --- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/k8sapi/SimpleKubernetesClient.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/k8sapi/SimpleKubernetesClient.java @@ -45,8 +45,9 @@ public class SimpleKubernetesClient { public String listPods(String namespace) { logger.debug("listPods for namespace {}", namespace); - String podsUrl = new DefaultUriBuilderFactory(k8sUrl.trim()).builder().path("v1").path("namespaces") - .path(namespace.trim()).path("pods").build().normalize().toString(); + String podsUrl = new DefaultUriBuilderFactory(k8sUrl.trim()).builder().pathSegment("v1") + .pathSegment("namespaces").pathSegment(namespace.trim()).pathSegment("pods").build().normalize() + .toString(); RestTemplate rt = new RestTemplate(); ResponseEntity podsResponse = rt.getForEntity(podsUrl, String.class); return podsResponse.getBody(); -- 2.16.6