Revert "Renaming Files having BluePrint to have Blueprint"

The renaming in CCSDK-3098 caused breaking changes to the grpc api and
compile issues for kotlin scripts.

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

2 files changed, 10 insertions, 10 deletions

diff --git a/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Scripts/kotlin/RestconfConfigDeploy.kt b/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Scripts/kotlin/RestconfConfigDeploy.kt
index d422b7d67..7f60436f8 100644
--- a/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Scripts/kotlin/RestconfConfigDeploy.kt
+++ b/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Scripts/kotlin/RestconfConfigDeploy.kt
@@ -27,7 +27,7 @@ import org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor.restco
 import org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor.restconfDeviceConfig
 import org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor.restconfClientService
 import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.AbstractScriptComponentFunction
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintProcessorException
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
 import org.onap.ccsdk.cds.controllerblueprints.core.logger
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BlueprintWebClientService.WebClientResponse
@@ -79,7 +79,7 @@ class RestconfConfigDeploy : AbstractScriptComponentFunction() {
                 // Un mount device
                 restconfUnMountDevice(webclientService, deviceID)
             }
-        } catch (bpe: BlueprintProcessorException) {
+        } catch (bpe: BluePrintProcessorException) {
             log.error("Error looking up server identifier ", bpe)
         }
     }
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Scripts/kotlin/RestconfSoftwareUpgrade.kt b/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Scripts/kotlin/RestconfSoftwareUpgrade.kt
index f2335c138..487e763a6 100644
--- a/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Scripts/kotlin/RestconfSoftwareUpgrade.kt
+++ b/components/model-catalog/blueprint-model/uat-blueprints/PNF_CDS_RESTCONF/Scripts/kotlin/RestconfSoftwareUpgrade.kt
@@ -28,10 +28,10 @@ import org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor.restco
 import org.onap.ccsdk.cds.blueprintsprocessor.rest.restClientService
 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.BlueprintException
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintRetryException
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintException
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintRetryException
 import org.onap.ccsdk.cds.controllerblueprints.core.logger
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BlueprintDependencyService
+import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintDependencyService
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
 
 class RestconfSoftwareUpgrade : AbstractScriptComponentFunction() {
@@ -77,12 +77,12 @@ class RestconfSoftwareUpgrade : AbstractScriptComponentFunction() {
         ) {
             return SoftwareUpgradeModel(
                 getDynamicProperties("resolution-key").asText(),
-                BlueprintDependencyService.restClientService(RESTCONF_SERVER_IDENTIFIER),
+                BluePrintDependencyService.restClientService(RESTCONF_SERVER_IDENTIFIER),
                 properties.get("pnf-id").textValue(), properties.get("target-software-version").textValue(),
                 Action.getEnumFromActionName(executionRequest.actionIdentifiers.actionName)
             )
         } else {
-            throw BlueprintException("Invalid parameters sent to CDS. Request parameters pnf-id or target-software-version missing")
+            throw BluePrintException("Invalid parameters sent to CDS. Request parameters pnf-id or target-software-version missing")
         }
     }
 
@@ -140,7 +140,7 @@ class RestconfSoftwareUpgrade : AbstractScriptComponentFunction() {
             // Poll PNF for Activate action's progress
             checkExecution(model)
         } else {
-            throw BlueprintRetryException("Software Download not completed for device(${model.deviceId}) to activate sw version: ${model.targetSwVersion}")
+            throw BluePrintRetryException("Software Download not completed for device(${model.deviceId}) to activate sw version: ${model.targetSwVersion}")
         }
     }
 
@@ -170,7 +170,7 @@ class RestconfSoftwareUpgrade : AbstractScriptComponentFunction() {
                 log.info("${model.action.name} is complete")
                 result.body
             } else {
-                throw BlueprintRetryException("Waiting for device(${model.deviceId}) to activate sw version ${model.targetSwVersion}")
+                throw BluePrintRetryException("Waiting for device(${model.deviceId}) to activate sw version ${model.targetSwVersion}")
             }
         }
         model.client.retry<String>(10, 0, 1000, checkExecutionBlock)
@@ -210,7 +210,7 @@ enum class Action(val actionName: String, val completionStatus: String) {
             for (value in values()) {
                 if (value.actionName == name) return value
             }
-            throw BlueprintException("Invalid Action sent to CDS")
+            throw BluePrintException("Invalid Action sent to CDS")
         }
     }
 }