aboutsummaryrefslogtreecommitdiffstats
path: root/heat
diff options
context:
space:
mode:
authorMichal Chabiera <michal.chabiera@orange.com>2021-09-21 10:16:15 +0200
committerMichal Chabiera <michal.chabiera@orange.com>2021-09-21 10:16:15 +0200
commit129d553d323653461d14f248cb9e8b6f266eb5e3 (patch)
tree2c6f13143c847c10538ec615fb172acf6b51fed7 /heat
parenta4faf95fb18ca579132bb2d4db9631ccedab46f9 (diff)
vFW CNF CDS Change Blueprint to BluePrint
Kotlin scripts don't comile after modification in CDS. Some Blueprint have to be changed into BluePrint Issue-ID: INT-1960 Signed-off-by: Michal Chabiera <michal.chabiera@orange.com> Change-Id: Iffeb76249651d2fd0a987d5b6f9ad9bd4c04632a
Diffstat (limited to 'heat')
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json6
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/CollectorScript.kt4
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/ConfigDeploySetup.kt4
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/K8sHealthCheck.kt6
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/SimpleStatusCheck.kt10
5 files changed, 15 insertions, 15 deletions
diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
index 22f5749b..86396d0a 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
@@ -498,7 +498,7 @@
"script-type": "kotlin",
"script-class-reference": "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.SimpleStatusCheck",
"instance-dependencies": [
- "blueprintPropertiesService"
+ "bluePrintPropertiesService"
],
"dynamic-properties": "*simple-status-properties"
}
@@ -517,7 +517,7 @@
"script-type": "kotlin",
"script-class-reference": "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.SimpleErrorCheck",
"instance-dependencies": [
- "blueprintPropertiesService"
+ "bluePrintPropertiesService"
],
"dynamic-properties": "*simple-status-properties"
}
@@ -536,7 +536,7 @@
"script-type": "kotlin",
"script-class-reference": "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.K8sHealthCheck",
"instance-dependencies": [
- "blueprintPropertiesService"
+ "bluePrintPropertiesService"
],
"dynamic-properties": "*simple-status-properties"
}
diff --git a/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/CollectorScript.kt b/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/CollectorScript.kt
index a9de1972..4e545bcb 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/CollectorScript.kt
+++ b/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/CollectorScript.kt
@@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.JsonNode
import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput
import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.AbstractScriptComponentFunction
import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.ComponentScriptExecutor
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintProcessorException
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
import org.onap.ccsdk.cds.controllerblueprints.core.asJsonNode
import org.onap.ccsdk.cds.controllerblueprints.core.logger
@@ -42,7 +42,7 @@ open class CollectorScript : AbstractScriptComponentFunction() {
return try {
bluePrintRuntimeService.getNodeTemplateAttributeValue(nodeTemplateName,
ComponentScriptExecutor.ATTRIBUTE_RESPONSE_DATA)
- } catch (exception: BlueprintProcessorException) { null }
+ } catch (exception: BluePrintProcessorException) { null }
}
override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {
diff --git a/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/ConfigDeploySetup.kt b/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/ConfigDeploySetup.kt
index 78254a85..b4821560 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/ConfigDeploySetup.kt
+++ b/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/ConfigDeploySetup.kt
@@ -23,7 +23,7 @@ import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.definition.template.
import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.definition.template.K8sConfigValueComponent
import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.processor.ResourceAssignmentProcessor
import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.utils.ResourceAssignmentUtils
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintProcessorException
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceAssignment
import org.slf4j.LoggerFactory
@@ -84,7 +84,7 @@ open class ConfigDeploySetup() : ResourceAssignmentProcessor() {
log.error(e.message, e)
ResourceAssignmentUtils.setResourceDataValue(executionRequest, raRuntimeService, "ERROR")
- throw BlueprintProcessorException("Failed in template key ($executionRequest) assignments, cause: ${e.message}", e)
+ throw BluePrintProcessorException("Failed in template key ($executionRequest) assignments, cause: ${e.message}", e)
}
}
diff --git a/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/K8sHealthCheck.kt b/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/K8sHealthCheck.kt
index 68d83e03..dd87c6f5 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/K8sHealthCheck.kt
+++ b/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/K8sHealthCheck.kt
@@ -19,7 +19,7 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.joinAll
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
-import org.onap.ccsdk.cds.blueprintsprocessor.core.BlueprintPropertiesService
+import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintPropertiesService
import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput
import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.K8sConnectionPluginConfiguration
import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.instance.K8sPluginInstanceApi
@@ -37,7 +37,7 @@ open class K8sHealthCheck : AbstractScriptComponentFunction() {
}
private fun initPluginApi(): K8sPluginInstanceApi {
- val bluePrintPropertiesService: BlueprintPropertiesService = this.functionDependencyInstanceAsType("blueprintPropertiesService")!!
+ val bluePrintPropertiesService: BluePrintPropertiesService = this.functionDependencyInstanceAsType("bluePrintPropertiesService")!!
val k8sConfiguration = K8sConnectionPluginConfiguration(bluePrintPropertiesService)
return K8sPluginInstanceApi(k8sConfiguration)
@@ -120,6 +120,6 @@ open class K8sHealthCheck : AbstractScriptComponentFunction() {
override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {
log.info("Executing Recovery")
- bluePrintRuntimeService.getBlueprintError().addError("${runtimeException.message}", getName())
+ bluePrintRuntimeService.getBluePrintError().addError("${runtimeException.message}", getName())
}
}
diff --git a/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/SimpleStatusCheck.kt b/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/SimpleStatusCheck.kt
index e2d10534..c0671133 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/SimpleStatusCheck.kt
+++ b/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/SimpleStatusCheck.kt
@@ -17,13 +17,13 @@
package org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts
import com.fasterxml.jackson.databind.node.ObjectNode
-import org.onap.ccsdk.cds.blueprintsprocessor.core.BlueprintPropertiesService
+import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintPropertiesService
import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput
import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.K8sConnectionPluginConfiguration
import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.instance.K8sPluginInstanceApi
import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.instance.K8sRbInstanceStatus
import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.AbstractScriptComponentFunction
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintException
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintException
import org.slf4j.LoggerFactory
open class SimpleStatusCheck : AbstractScriptComponentFunction() {
@@ -39,8 +39,8 @@ open class SimpleStatusCheck : AbstractScriptComponentFunction() {
val configValueSetup: ObjectNode = getDynamicProperties("config-deploy-setup") as ObjectNode
- val bluePrintPropertiesService: BlueprintPropertiesService =
- this.functionDependencyInstanceAsType("blueprintPropertiesService")
+ val bluePrintPropertiesService: BluePrintPropertiesService =
+ this.functionDependencyInstanceAsType("bluePrintPropertiesService")
val k8sConfiguration = K8sConnectionPluginConfiguration(bluePrintPropertiesService)
@@ -78,7 +78,7 @@ open class SimpleStatusCheck : AbstractScriptComponentFunction() {
if (continueCheck) {
checkCount--
if (checkCount == 0)
- throw BlueprintException("Pods State verification failed")
+ throw BluePrintException("Pods State verification failed")
Thread.sleep(10000L)
} else
checkCount = 0