diff options
author | 2020-05-17 19:03:51 +0000 | |
---|---|---|
committer | 2020-05-17 19:03:51 +0000 | |
commit | 8cd1be656b7354beac76d4095131ea38a58bd7f4 (patch) | |
tree | d68f8c8d4ad5234988fedbb7b2a831db296f5410 /components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts | |
parent | f1bbbab22a4d5817e5f0ca449f0f548311ef2d34 (diff) |
update vlb cds instantiation and scale out package
Issue-ID: CCSDK-2376
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I307ed09b73487e8c830eadf26b477601b0a0d6f4
Diffstat (limited to 'components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts')
4 files changed, 263 insertions, 54 deletions
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 new file mode 100644 index 000000000..fe660f590 --- /dev/null +++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/ConfigDeploy.kt @@ -0,0 +1,126 @@ +/*
+ * Copyright © 2019 IBM, Bell Canada, Orange
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts
+
+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
+import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
+import org.slf4j.LoggerFactory
+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() {
+
+ private val log = LoggerFactory.getLogger(ConfigDeploy::class.java)!!
+
+ override fun getName(): String {
+ return "Check"
+ }
+
+ override suspend fun processNB(executionRequest: ExecutionServiceInput) {
+ log.info("executing script")
+ 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 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"
+ val restTemplate = RestTemplate()
+ val mapOfHeaders = hashMapOf<String, String>()
+ mapOfHeaders.put("Accept", "application/json")
+ mapOfHeaders.put("Content-Type", "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)
+ try {
+ val result: BlueprintWebClientService.WebClientResponse<String> = 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<String> = basicAuthRestClientService.exchangeResource(HttpMethod.GET.name, "", "")
+ print(resultOfGet)
+ }
+ catch (e: Exception) {
+ log.info("Caught exception trying to connect to vLB!!")
+ throw BluePrintProcessorException("${e.message}")
+ }
+ }
+
+ override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {
+ log.info("Executing Recovery")
+ bluePrintRuntimeService.getBluePrintError().addError("${runtimeException.message}")
+ }
+}
+
+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?
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+ return true
+ }
+
+ 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 new file mode 100644 index 000000000..b09a432f7 --- /dev/null +++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/HealthCheck.kt @@ -0,0 +1,136 @@ +package org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts
+
+/*
+ * Copyright © 2019 IBM, Bell Canada, Orange
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * 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
+import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
+import org.slf4j.LoggerFactory
+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() {
+
+ private val log = LoggerFactory.getLogger(HealthCheck::class.java)!!
+
+ override fun getName(): String {
+ return "HealthCheck"
+ }
+
+ override suspend fun processNB(executionRequest: ExecutionServiceInput) {
+ log.info("executing script")
+ 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 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)
+ 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<String, String>()
+ mapOfHeaders.put("Accept", "application/json")
+ mapOfHeaders.put("Content-Type", "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)
+ try {
+ val result: BlueprintWebClientService.WebClientResponse<String> = 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)
+ 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<String> = basicAuthRestClientService.exchangeResource(HttpMethod.GET.name, "", "")
+ //print(resultOfGet)
+ }
+ catch (e: Exception) {
+ log.info("Caught exception trying to connect to vLB!!")
+ throw BluePrintProcessorException("${e.message}")
+ }
+ }
+
+ override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {
+ log.info("Executing Recovery")
+ bluePrintRuntimeService.getBluePrintError().addError("${runtimeException.message}")
+ }
+}
+
+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?
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+ return true
+ }
+
+ 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/README.md b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/README.md new file mode 100644 index 000000000..29b7978e0 --- /dev/null +++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/README.md @@ -0,0 +1 @@ +kotlin Folder
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py deleted file mode 100644 index 388c63ffb..000000000 --- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (c) 2019 Bell Canada.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import netconf_constant
-from common import ResolutionHelper
-from time import sleep
-from netconfclient import NetconfClient
-from org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor import \
- NetconfComponentFunction
-
-
-class ConfigDeploy(NetconfComponentFunction):
-
- def process(self, execution_request):
- log = globals()[netconf_constant.SERVICE_LOG]
- print(globals())
-# print("Waiting 4 minutes until NETCONF server is UP on vLB ...")
-# sleep (240)
- nc = NetconfClient(log, self, "netconf-connection")
- rr = ResolutionHelper(self)
-
- # Get meshed template from DB
- resolution_key = self.getDynamicProperties("resolution-key").asText()
- payloadHostname = rr.retrieve_resolved_template_from_database(resolution_key, "baseconfig")
- payloadInterface = rr.retrieve_resolved_template_from_database(resolution_key, "incremental-config")
-
- nc.connect()
- nc.lock()
- #if not response.isSuccess():
- # og.error(response.errorMessage)
- nc.discard_change()
- nc.edit_config(message_content=payloadInterface, edit_default_peration="merge")
- nc.edit_config(message_content=payloadHostname, edit_default_peration="merge")
- #nc.validate()
- nc.commit()
- nc.get_config() #nc.commit(confirmed = True, confirm_timeout=15)
- nc.unlock()
- nc.disconnect()
-
- def recover(self, runtime_exception, execution_request):
- log.error("Exception in the script {}", runtime_exception)
- print self.addError(runtime_exception.cause.message)
- return None
\ No newline at end of file |