K8sPlugin: support UAT functionality

[ccsdk/cds.git] / ms / blueprintsprocessor / functions / k8s-connection-plugin / src / main / kotlin / org / onap / ccsdk / cds / blueprintsprocessor / functions / k8s / query / K8sPluginQueryApi.kt

diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sPluginQueryApi.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sPluginQueryApi.kt
index 170f295..227ed67 100644 (file)
--- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sPluginQueryApi.kt
+++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sPluginQueryApi.kt
@@ -1,6 +1,7 @@
-package org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.query;
+package org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.query
 
 import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.K8sConnectionPluginConfiguration
+import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.query.K8sQueryRestClient.Companion.getK8sQueryRestClient
 import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BlueprintWebClientService
 import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
@@ -8,25 +9,25 @@ import org.slf4j.LoggerFactory
 import org.springframework.http.HttpMethod.GET
 
 public class K8sPluginQueryApi(
-        private val k8sConfiguration: K8sConnectionPluginConfiguration
+    private val k8sConfiguration: K8sConnectionPluginConfiguration
 ) {
     private val log = LoggerFactory.getLogger(K8sPluginQueryApi::class.java)!!
 
     fun queryK8sResources(
-            cloudRegion: String,
-            kind: String,
-            apiVersion: String,
-            name: String? = null,
-            namespace: String? = null,
-            labels: Map<String, String>? = null
+        cloudRegion: String,
+        kind: String,
+        apiVersion: String,
+        name: String? = null,
+        namespace: String? = null,
+        labels: Map<String, String>? = null
     ): K8sResourceStatus? {
-        val rbQueryService = K8sQueryRestClient(k8sConfiguration)
+        val rbQueryService = getK8sQueryRestClient(k8sConfiguration)
         try {
             var path: String = "?CloudRegion=$cloudRegion&ApiVersion=$apiVersion&Kind=$kind"
             if (name != null)
                 path = path.plus("&Name=$name")
             if (namespace != null)
-                path = path.plus("&Namespace=$name")
+                path = path.plus("&Namespace=$namespace")
             if (labels != null && labels.isNotEmpty()) {
                 path = path.plus("&Labels=")
                 for ((name, value) in labels)
@@ -34,14 +35,14 @@ public class K8sPluginQueryApi(
                 path = path.trimEnd(',')
             }
             val result: BlueprintWebClientService.WebClientResponse<String> = rbQueryService.exchangeResource(
-                    GET.name,
-                    path,
-                    ""
+                GET.name,
+                path,
+                ""
             )
             log.debug(result.toString())
             return if (result.status in 200..299) {
                 val parsedObject: K8sResourceStatus? = JacksonUtils.readValue(
-                        result.body, K8sResourceStatus::class.java
+                    result.body, K8sResourceStatus::class.java
                 )
                 parsedObject
             } else if (result.status == 500 && result.body.contains("Error finding master table"))