Refactoring to enable on_failure for imperative workflow

BlueprintError needs to associate errors with the steps in which they occurred
in order for imperative workflow to handle on_failure properly.

Made stepName more accessible and corrected places where stepName was assigned to nodeTemplateName.

Issue-ID: CCSDK-3219
Change-Id: I7e5805745c63558cff6be533e1b99c32ad06c3db
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>

5 files changed, 5 insertions, 5 deletions

diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinDayOneConfig.kt b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinDayOneConfig.kt
index 38d843acd..1080418ff 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinDayOneConfig.kt
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinDayOneConfig.kt
@@ -221,7 +221,7 @@ open class DayOneConfig : AbstractScriptComponentFunction() {
     }
     override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {
         log.info("Executing Recovery")
-        bluePrintRuntimeService.getBlueprintError().addError("${runtimeException.message}")
+        addError("${runtimeException.message}")
     }
 
     fun modifyTemplate(configmapName: String, typOfVfmodule: String): String {
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sProfileUpload.kt b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sProfileUpload.kt
index 2673b3cd4..e69bdbeac 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sProfileUpload.kt
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sProfileUpload.kt
@@ -275,7 +275,7 @@ open class K8sProfileUpload : AbstractScriptComponentFunction() {
 
     override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {
         log.info("Executing Recovery")
-        bluePrintRuntimeService.getBlueprintError().addError("${runtimeException.message}")
+        addError("${runtimeException.message}")
     }
 
     inner class K8sApi(
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 e53b73eb0..bcbb47186 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
@@ -87,7 +87,7 @@ open class ConfigDeploy : AbstractScriptComponentFunction() {
 

     override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {

         log.info("Executing Recovery")

-        bluePrintRuntimeService.getBlueprintError().addError("${runtimeException.message}")

+        addError("${runtimeException.message}")

     }

 }

 

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 606e76e84..c34decca9 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
@@ -89,7 +89,7 @@ open class HealthCheck : AbstractScriptComponentFunction() {
 

     override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {

         log.info("Executing Recovery")

-        bluePrintRuntimeService.getBlueprintError().addError("${runtimeException.message}")

+        addError("${runtimeException.message}")

     }

 }

 

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Scripts/kotlin/KotlinRestCall.kt b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Scripts/kotlin/KotlinRestCall.kt
index 07168ce76..c7f4c9352 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Scripts/kotlin/KotlinRestCall.kt
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Scripts/kotlin/KotlinRestCall.kt
@@ -87,7 +87,7 @@ open class ConfigDeploy : AbstractScriptComponentFunction() {
 

     override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {

         log.info("Executing Recovery")

-        bluePrintRuntimeService.getBlueprintError().addError("${runtimeException.message}")

+        addError("${runtimeException.message}")

     }

 }