From 1072867dfac0df993cbd3e44bcc11a5cac7465fd Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Tue, 22 Sep 2020 12:16:46 -0400 Subject: Enabling Code Formatter Code Formatter was turned off due to java 11 migation Issue-ID: CCSDK-2852 Signed-off-by: Singal, Kapil (ks220y) Change-Id: I3d02ed3cc7a93d7551fe25356512cfe8db1517d8 --- .../vLB/Scripts/kotlin/ConfigDeploy.kt | 38 +++++++++------ .../vLB/Scripts/kotlin/HealthCheck.kt | 54 +++++++++++----------- 2 files changed, 50 insertions(+), 42 deletions(-) (limited to 'components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts') diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/ConfigDeploy.kt b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/ConfigDeploy.kt index fe660f590..61cde0521 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/ConfigDeploy.kt +++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/ConfigDeploy.kt @@ -20,7 +20,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.storedContentFromResolvedArtifactNB import org.onap.ccsdk.cds.blueprintsprocessor.rest.BasicAuthRestClientProperties -import org.onap.ccsdk.cds.blueprintsprocessor.rest.RestClientProperties import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BasicAuthRestClientService import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BlueprintWebClientService import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.AbstractScriptComponentFunction @@ -30,8 +29,6 @@ import org.springframework.http.HttpMethod import org.springframework.web.client.RestTemplate import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonProperty -import org.apache.http.client.ClientProtocolException -import java.io.IOException import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException open class ConfigDeploy : AbstractScriptComponentFunction() { @@ -53,14 +50,14 @@ open class ConfigDeploy : AbstractScriptComponentFunction() { val payloadObject = JacksonUtils.jsonNode(payload) as ObjectNode val vdns_ip: String = payloadObject.get("vdns-instance")[0].get("ip-addr").asText() - val blueprintContext = bluePrintRuntimeService.bluePrintContext() val requirement = blueprintContext.nodeTemplateRequirement(nodeTemplateName, "restconf-connection") val capabilityProperties = bluePrintRuntimeService.resolveNodeTemplateCapabilityProperties(requirement.node!!, requirement.capability!!) val netconfDeviceInfo = JacksonUtils.getInstanceFromMap(capabilityProperties, NetconfDeviceInfo::class.java) log.info("Waiting for 2 minutes until vLB intializes ...") - //Thread.sleep(120000) - val uri = "http://${netconfDeviceInfo.ipAddress}:8183/restconf/config/vlb-business-vnf-onap-plugin:vlb-business-vnf-onap-plugin/vdns-instances/vdns-instance/$vdns_ip" + // Thread.sleep(120000) + val uri = + "http://${netconfDeviceInfo.ipAddress}:8183/restconf/config/vlb-business-vnf-onap-plugin:vlb-business-vnf-onap-plugin/vdns-instances/vdns-instance/$vdns_ip" val restTemplate = RestTemplate() val mapOfHeaders = hashMapOf() mapOfHeaders.put("Accept", "application/json") @@ -71,16 +68,18 @@ open class ConfigDeploy : AbstractScriptComponentFunction() { basicAuthRestClientProperties.username = "admin" basicAuthRestClientProperties.password = "admin" basicAuthRestClientProperties.url = uri - basicAuthRestClientProperties.additionalHeaders =mapOfHeaders - val basicAuthRestClientService: BasicAuthRestClientService= BasicAuthRestClientService(basicAuthRestClientProperties) + basicAuthRestClientProperties.additionalHeaders = mapOfHeaders + val basicAuthRestClientService: BasicAuthRestClientService = BasicAuthRestClientService(basicAuthRestClientProperties) try { - val result: BlueprintWebClientService.WebClientResponse = basicAuthRestClientService.exchangeResource(HttpMethod.PUT.name, "", payload) + val result: BlueprintWebClientService.WebClientResponse = + basicAuthRestClientService.exchangeResource(HttpMethod.PUT.name, "", payload) print(result) - basicAuthRestClientProperties.url = "http://${netconfDeviceInfo.ipAddress}:8183/restconf/config/vlb-business-vnf-onap-plugin:vlb-business-vnf-onap-plugin/vdns-instances" - val resultOfGet: BlueprintWebClientService.WebClientResponse = basicAuthRestClientService.exchangeResource(HttpMethod.GET.name, "", "") + basicAuthRestClientProperties.url = + "http://${netconfDeviceInfo.ipAddress}:8183/restconf/config/vlb-business-vnf-onap-plugin:vlb-business-vnf-onap-plugin/vdns-instances" + val resultOfGet: BlueprintWebClientService.WebClientResponse = + basicAuthRestClientService.exchangeResource(HttpMethod.GET.name, "", "") print(resultOfGet) - } - catch (e: Exception) { + } catch (e: Exception) { log.info("Caught exception trying to connect to vLB!!") throw BluePrintProcessorException("${e.message}") } @@ -93,27 +92,36 @@ open class ConfigDeploy : AbstractScriptComponentFunction() { } class NetconfDeviceInfo { + @get:JsonProperty("login-account") var username: String? = null + @get:JsonProperty("login-key") var password: String? = null + @get:JsonProperty("target-ip-address") var ipAddress: String? = null + @get:JsonProperty("port-number") var port: Int = 0 + @get:JsonProperty("connection-time-out") var connectTimeout: Long = 5 + @get:JsonIgnore var source: String? = null + @get:JsonIgnore var replyTimeout: Int = 5 + @get:JsonIgnore var idleTimeout: Int = 99999 override fun toString(): String { return "$ipAddress:$port" } - //TODO: should this be a data class instead? Is anything using the JSON serdes? + + // TODO: should this be a data class instead? Is anything using the JSON serdes? override fun equals(other: Any?): Boolean { if (this === other) return true if (javaClass != other?.javaClass) return false @@ -123,4 +131,4 @@ class NetconfDeviceInfo { override fun hashCode(): Int { return javaClass.hashCode() } -} \ No newline at end of file +} diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/HealthCheck.kt b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/HealthCheck.kt index b09a432f7..04993cdae 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/HealthCheck.kt +++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/HealthCheck.kt @@ -16,12 +16,9 @@ package org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts * limitations under the License. */ - import com.fasterxml.jackson.databind.node.ObjectNode import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput -import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.storedContentFromResolvedArtifactNB import org.onap.ccsdk.cds.blueprintsprocessor.rest.BasicAuthRestClientProperties -import org.onap.ccsdk.cds.blueprintsprocessor.rest.RestClientProperties import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BasicAuthRestClientService import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BlueprintWebClientService import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.AbstractScriptComponentFunction @@ -31,10 +28,6 @@ import org.springframework.http.HttpMethod import org.springframework.web.client.RestTemplate import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonProperty -import org.apache.http.client.ClientProtocolException -import org.onap.ccsdk.cds.blueprintsprocessor.core.utils.PayloadUtils -import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.ComponentRemoteScriptExecutor -import java.io.IOException import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException open class HealthCheck : AbstractScriptComponentFunction() { @@ -50,47 +43,45 @@ open class HealthCheck : AbstractScriptComponentFunction() { val resolution_key = getDynamicProperties("resolution-key").asText() log.info("resolution_key: $resolution_key") - //val payload = storedContentFromResolvedArtifactNB(resolution_key, "baseconfig") - //log.info("configuration: $payload") - - //val payloadObject = JacksonUtils.jsonNode(payload) as ObjectNode - //val vdns_ip: String = payloadObject.get("vdns-instance")[0].get("ip-addr").asText() + // val payload = storedContentFromResolvedArtifactNB(resolution_key, "baseconfig") + // log.info("configuration: $payload") + // val payloadObject = JacksonUtils.jsonNode(payload) as ObjectNode + // val vdns_ip: String = payloadObject.get("vdns-instance")[0].get("ip-addr").asText() val blueprintContext = bluePrintRuntimeService.bluePrintContext() val requirement = blueprintContext.nodeTemplateRequirement(nodeTemplateName, "restconf-connection") val capabilityProperties = bluePrintRuntimeService.resolveNodeTemplateCapabilityProperties(requirement.node!!, requirement.capability!!) val netconfDeviceInfo = JacksonUtils.getInstanceFromMap(capabilityProperties, NetconfDeviceInfo2::class.java) - //log.info("Waiting for 2 minutes until vLB intializes ...") - //Thread.sleep(120000) + // log.info("Waiting for 2 minutes until vLB intializes ...") + // Thread.sleep(120000) val uri = "http://${netconfDeviceInfo.ipAddress}:8183/restconf/operational/health-vnf-onap-plugin:health-vnf-onap-plugin-state/health-check" val restTemplate = RestTemplate() val mapOfHeaders = hashMapOf() mapOfHeaders.put("Accept", "application/json") mapOfHeaders.put("Content-Type", "application/json") - //mapOfHeaders.put("cache-control", " no-cache") - //mapOfHeaders.put("Accept", "application/json") + // mapOfHeaders.put("cache-control", " no-cache") + // mapOfHeaders.put("Accept", "application/json") val basicAuthRestClientProperties: BasicAuthRestClientProperties = BasicAuthRestClientProperties() basicAuthRestClientProperties.username = "admin" basicAuthRestClientProperties.password = "admin" basicAuthRestClientProperties.url = uri - basicAuthRestClientProperties.additionalHeaders =mapOfHeaders - val basicAuthRestClientService: BasicAuthRestClientService= BasicAuthRestClientService(basicAuthRestClientProperties) + basicAuthRestClientProperties.additionalHeaders = mapOfHeaders + val basicAuthRestClientService: BasicAuthRestClientService = BasicAuthRestClientService(basicAuthRestClientProperties) try { val result: BlueprintWebClientService.WebClientResponse = basicAuthRestClientService.exchangeResource(HttpMethod.GET.name, "", "") log.info(result.body) val resultJson = JacksonUtils.jsonNode(result.body) as ObjectNode val health: String = resultJson.get("health-check").get("state").asText() - super.setAttribute("response-data", resultJson) + super.setAttribute("response-data", resultJson) if (health != "healthy") { throw Exception("VNF is not healty!!") } - - //basicAuthRestClientProperties.url = //"http://${netconfDeviceInfo.ipAddress}:8183/restconf/config/vlb-business-vnf-onap-plugin:vlb-business-vnf-onap-plugin/vdns-instances" - //val resultOfGet: BlueprintWebClientService.WebClientResponse = basicAuthRestClientService.exchangeResource(HttpMethod.GET.name, "", "") - //print(resultOfGet) - } - catch (e: Exception) { + + // basicAuthRestClientProperties.url = //"http://${netconfDeviceInfo.ipAddress}:8183/restconf/config/vlb-business-vnf-onap-plugin:vlb-business-vnf-onap-plugin/vdns-instances" + // val resultOfGet: BlueprintWebClientService.WebClientResponse = basicAuthRestClientService.exchangeResource(HttpMethod.GET.name, "", "") + // print(resultOfGet) + } catch (e: Exception) { log.info("Caught exception trying to connect to vLB!!") throw BluePrintProcessorException("${e.message}") } @@ -103,27 +94,36 @@ open class HealthCheck : AbstractScriptComponentFunction() { } class NetconfDeviceInfo2 { + @get:JsonProperty("login-account") var username: String? = null + @get:JsonProperty("login-key") var password: String? = null + @get:JsonProperty("target-ip-address") var ipAddress: String? = null + @get:JsonProperty("port-number") var port: Int = 0 + @get:JsonProperty("connection-time-out") var connectTimeout: Long = 5 + @get:JsonIgnore var source: String? = null + @get:JsonIgnore var replyTimeout: Int = 5 + @get:JsonIgnore var idleTimeout: Int = 99999 override fun toString(): String { return "$ipAddress:$port" } - //TODO: should this be a data class instead? Is anything using the JSON serdes? + + // TODO: should this be a data class instead? Is anything using the JSON serdes? override fun equals(other: Any?): Boolean { if (this === other) return true if (javaClass != other?.javaClass) return false @@ -133,4 +133,4 @@ class NetconfDeviceInfo2 { override fun hashCode(): Int { return javaClass.hashCode() } -} \ No newline at end of file +} -- cgit 1.2.3-korg