From daab14bd058de198c80b71d63e108fd788b7f5ee Mon Sep 17 00:00:00 2001 From: Jozsef Csongvai Date: Mon, 26 Jul 2021 12:00:59 -0400 Subject: 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 --- .../Scripts/kotlin/KotlinDayOneConfig.kt | 34 +++++++++++----------- .../Scripts/kotlin/KotlinK8sProfileUpload.kt | 28 +++++++++--------- .../Scripts/kotlin/KotlinK8sUpdateConfig.kt | 6 ++-- .../vLB/Scripts/kotlin/ConfigDeploy.kt | 4 +-- .../vLB/Scripts/kotlin/HealthCheck.kt | 4 +-- .../Scripts/kotlin/KotlinRestCall.kt | 4 +-- 6 files changed, 40 insertions(+), 40 deletions(-) (limited to 'components/model-catalog/blueprint-model/service-blueprint') 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 1080418ff..9e2b46398 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 @@ -38,9 +38,9 @@ import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BasicAuthRestClientSe import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BlueprintWebClientService import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.RestLoggerService 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.utils.ArchiveType -import org.onap.ccsdk.cds.controllerblueprints.core.utils.BlueprintArchiveUtils +import org.onap.ccsdk.cds.controllerblueprints.core.utils.BluePrintArchiveUtils import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.storedContentFromResolvedArtifactNB import org.slf4j.LoggerFactory @@ -158,13 +158,13 @@ open class DayOneConfig : AbstractScriptComponentFunction() { // Check if definition exists if (!api.hasDefinition()) { - throw BlueprintProcessorException("K8s Config Template ($vfModuleInvariantID/$vfModuleUUID) - $k8sConfigTemplateName not found ") + throw BluePrintProcessorException("K8s Config Template ($vfModuleInvariantID/$vfModuleUUID) - $k8sConfigTemplateName not found ") } log.info("Config Template name: $k8sConfigTemplateName") if (k8sRbProfileName.equals("")) { - throw BlueprintProcessorException("K8s rb profile name is empty! Either define profile name to use or choose default") + throw BluePrintProcessorException("K8s rb profile name is empty! Either define profile name to use or choose default") } var configTemplate = K8sConfigTemplate() @@ -192,7 +192,7 @@ open class DayOneConfig : AbstractScriptComponentFunction() { } catch (e: Exception) { log.info("Caught exception trying to get the vnf Details!!") - // throw BlueprintProcessorException("${e.message}") + // throw BluePrintProcessorException("${e.message}") } } @@ -206,7 +206,7 @@ open class DayOneConfig : AbstractScriptComponentFunction() { val profileFile = profileFilePath.toFile() if (!profileFile.exists()) - throw BlueprintProcessorException("K8s Profile template file $profileFilePath does not exists") + throw BluePrintProcessorException("K8s Profile template file $profileFilePath does not exists") return profileFilePath } @@ -239,11 +239,11 @@ open class DayOneConfig : AbstractScriptComponentFunction() { val templateFile = templateFilePath.toFile() if (!templateFile.exists()) - throw BlueprintProcessorException("K8s Profile template file ${templateFilePath} does not exists") + throw BluePrintProcessorException("K8s Profile template file ${templateFilePath} does not exists") log.info("Decompressing config template to ${destPath}") - val decompressedProfile: File = BlueprintArchiveUtils.deCompress(templateFilePath.toFile(), + val decompressedProfile: File = BluePrintArchiveUtils.deCompress(templateFilePath.toFile(), "${destPath}", ArchiveType.TarGz) log.info("${templateFilePath.toString()} decompression completed") @@ -280,13 +280,13 @@ open class DayOneConfig : AbstractScriptComponentFunction() { log.info("Reading config template file: ${templateFilePath}") if (!templateFile.exists()) - throw BlueprintProcessorException("config template file ${templateFilePath} does not exists") + throw BluePrintProcessorException("config template file ${templateFilePath} does not exists") val tempMainPath: File = createTempDir("config-template-", "") val tempConfigTemplatePath: File = createTempDir("conftemplate-", "", tempMainPath) log.info("Decompressing profile to ${tempConfigTemplatePath.toString()}") - val decompressedProfile2: File = BlueprintArchiveUtils.deCompress(templateFilePath.toFile(), + val decompressedProfile2: File = BluePrintArchiveUtils.deCompress(templateFilePath.toFile(), "${tempConfigTemplatePath.toString()}", ArchiveType.TarGz) log.info("${templateFilePath.toString()} decompression completed") @@ -300,9 +300,9 @@ open class DayOneConfig : AbstractScriptComponentFunction() { File(manifestFileName2).copyTo(File(destOverrideFile), true) - if (!BlueprintArchiveUtils.compress(decompressedProfile2, templateFilePath.toFile(), + if (!BluePrintArchiveUtils.compress(decompressedProfile2, templateFilePath.toFile(), ArchiveType.TarGz)) { - throw BlueprintProcessorException("Profile compression has failed") + throw BluePrintProcessorException("Profile compression has failed") } log.info("${templateFilePath.toString()} compression completed") @@ -348,7 +348,7 @@ open class DayOneConfig : AbstractScriptComponentFunction() { return "" } catch (e: Exception) { log.info("Caught exception trying to get k8s instance details") - throw BlueprintProcessorException("${e.message}") + throw BluePrintProcessorException("${e.message}") } } @@ -417,7 +417,7 @@ open class DayOneConfig : AbstractScriptComponentFunction() { return false } catch (e: Exception) { log.info("Caught exception trying to get k8s config trmplate definition") - throw BlueprintProcessorException("${e.message}") + throw BluePrintProcessorException("${e.message}") } } @@ -432,7 +432,7 @@ open class DayOneConfig : AbstractScriptComponentFunction() { return false } catch (e: Exception) { log.info("Caught exception trying to get k8s config trmplate definition") - throw BlueprintProcessorException("${e.message}") + throw BluePrintProcessorException("${e.message}") } } @@ -453,7 +453,7 @@ open class DayOneConfig : AbstractScriptComponentFunction() { } } catch (e: Exception) { log.info("Caught exception trying to create k8s config template ${profile.templateName} - updated") - // throw BlueprintProcessorException("${e.message}") + // throw BluePrintProcessorException("${e.message}") } } @@ -468,7 +468,7 @@ open class DayOneConfig : AbstractScriptComponentFunction() { } } catch (e: Exception) { log.info("Caught exception trying to upload k8s config template ${profile.templateName}") - throw BlueprintProcessorException("${e.message}") + throw BluePrintProcessorException("${e.message}") } } } 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 e69bdbeac..672c71074 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 @@ -38,9 +38,9 @@ import org.onap.ccsdk.cds.blueprintsprocessor.rest.BasicAuthRestClientProperties import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BlueprintWebClientService import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.RestLoggerService 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.utils.ArchiveType -import org.onap.ccsdk.cds.controllerblueprints.core.utils.BlueprintArchiveUtils +import org.onap.ccsdk.cds.controllerblueprints.core.utils.BluePrintArchiveUtils import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils import org.slf4j.LoggerFactory import org.springframework.http.HttpHeaders @@ -88,12 +88,12 @@ open class K8sProfileUpload : AbstractScriptComponentFunction() { val api = K8sApi(k8sApiUsername, k8sApiPassword, baseK8sApiUrl, vfModuleModelInvariantUuid, vfModuleModelUuid) if (!api.hasDefinition()) { - throw BlueprintProcessorException("K8s RB Definition ($vfModuleModelInvariantUuid/$vfModuleModelUuid) not found ") + throw BluePrintProcessorException("K8s RB Definition ($vfModuleModelInvariantUuid/$vfModuleModelUuid) not found ") } log.info("k8s-rb-profile-name: $k8sRbProfileName") if (k8sRbProfileName.equals("")) { - throw BlueprintProcessorException("K8s rb profile name is empty! Either define profile name to use or choose default") + throw BluePrintProcessorException("K8s rb profile name is empty! Either define profile name to use or choose default") } if (k8sRbProfileName.equals("default") and api.hasProfile(k8sRbProfileName)) { log.info("Using default profile - skipping upload") @@ -126,13 +126,13 @@ open class K8sProfileUpload : AbstractScriptComponentFunction() { val profileFile = profileFilePath.toFile() if (!profileFile.exists()) - throw BlueprintProcessorException("K8s Profile template file $profileFilePath does not exists") + throw BluePrintProcessorException("K8s Profile template file $profileFilePath does not exists") val tempMainPath: File = createTempDir("k8s-profile-", "") val tempProfilePath: File = createTempDir("$k8sRbProfileName-", "", tempMainPath) log.info("Decompressing profile to $tempProfilePath") - val decompressedProfile: File = BlueprintArchiveUtils.deCompress( + val decompressedProfile: File = BluePrintArchiveUtils.deCompress( profileFilePath.toFile(), "$tempProfilePath", ArchiveType.TarGz @@ -150,8 +150,8 @@ open class K8sProfileUpload : AbstractScriptComponentFunction() { File(tmpOverrideFile).copyTo(File(destOverrideFile), true) profileFilePath = Paths.get(tempMainPath.toString().plus(File.separator).plus("template-profile.tar.gz")) - if (!BlueprintArchiveUtils.compress(decompressedProfile, profileFilePath.toFile(), ArchiveType.TarGz)) { - throw BlueprintProcessorException("Profile compression has failed") + if (!BluePrintArchiveUtils.compress(decompressedProfile, profileFilePath.toFile(), ArchiveType.TarGz)) { + throw BluePrintProcessorException("Profile compression has failed") } log.info("$profileFilePath compression completed") return profileFilePath @@ -182,12 +182,12 @@ open class K8sProfileUpload : AbstractScriptComponentFunction() { val profileFile = profileFilePath.toFile() if (!profileFile.exists()) - throw BlueprintProcessorException("K8s Profile template file $profileFilePath does not exists") + throw BluePrintProcessorException("K8s Profile template file $profileFilePath does not exists") val success = File(destPath).mkdirs() log.info("Decompressing profile to $destPath") - val decompressedProfile: File = BlueprintArchiveUtils.deCompress( + val decompressedProfile: File = BluePrintArchiveUtils.deCompress( profileFilePath.toFile(), "$destPath", ArchiveType.TarGz @@ -312,7 +312,7 @@ open class K8sProfileUpload : AbstractScriptComponentFunction() { return false } catch (e: Exception) { log.info("Caught exception trying to get k8s rb definition") - throw BlueprintProcessorException("${e.message}") + throw BluePrintProcessorException("${e.message}") } } @@ -331,7 +331,7 @@ open class K8sProfileUpload : AbstractScriptComponentFunction() { } } catch (e: Exception) { log.info("Caught exception trying to get k8s rb profile") - throw BlueprintProcessorException("${e.message}") + throw BluePrintProcessorException("${e.message}") } } @@ -349,7 +349,7 @@ open class K8sProfileUpload : AbstractScriptComponentFunction() { } } catch (e: Exception) { log.info("Caught exception trying to create k8s rb profile ${profile.profileName}") - throw BlueprintProcessorException("${e.message}") + throw BluePrintProcessorException("${e.message}") } } @@ -364,7 +364,7 @@ open class K8sProfileUpload : AbstractScriptComponentFunction() { } } catch (e: Exception) { log.info("Caught exception trying to upload k8s rb profile ${profile.profileName}") - throw BlueprintProcessorException("${e.message}") + throw BluePrintProcessorException("${e.message}") } } } diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sUpdateConfig.kt b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sUpdateConfig.kt index db5ab31ce..cd555b49a 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sUpdateConfig.kt +++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Scripts/kotlin/KotlinK8sUpdateConfig.kt @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory import com.fasterxml.jackson.databind.node.ObjectNode import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BlueprintWebClientService -import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintProcessorException +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException import java.nio.file.Path import org.springframework.http.HttpMethod import org.onap.ccsdk.cds.blueprintsprocessor.rest.BasicAuthRestClientProperties @@ -150,7 +150,7 @@ open class KotlinK8sUpdateConfig : AbstractScriptComponentFunction() { } catch (e: Exception) { log.info("Caught exception trying to get the vnf Details!!") - throw BlueprintProcessorException("${e.message}") + throw BluePrintProcessorException("${e.message}") } } @@ -289,7 +289,7 @@ open class KotlinK8sUpdateConfig : AbstractScriptComponentFunction() { } } catch (e: Exception) { log.info("Caught exception trying to create or update configuration ") - throw BlueprintProcessorException("${e.message}") + throw BluePrintProcessorException("${e.message}") } } 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 bcbb47186..2a3f165f0 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 @@ -29,7 +29,7 @@ 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.onap.ccsdk.cds.controllerblueprints.core.BlueprintProcessorException +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException open class ConfigDeploy : AbstractScriptComponentFunction() { @@ -81,7 +81,7 @@ open class ConfigDeploy : AbstractScriptComponentFunction() { print(resultOfGet) } catch (e: Exception) { log.info("Caught exception trying to connect to vLB!!") - throw BlueprintProcessorException("${e.message}") + throw BluePrintProcessorException("${e.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 c34decca9..7cfebbf6a 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 @@ -28,7 +28,7 @@ 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.onap.ccsdk.cds.controllerblueprints.core.BlueprintProcessorException +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException open class HealthCheck : AbstractScriptComponentFunction() { @@ -83,7 +83,7 @@ open class HealthCheck : AbstractScriptComponentFunction() { // print(resultOfGet) } catch (e: Exception) { log.info("Caught exception trying to connect to vLB!!") - throw BlueprintProcessorException("${e.message}") + throw BluePrintProcessorException("${e.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 c7f4c9352..f84cdd442 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 @@ -29,7 +29,7 @@ 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.onap.ccsdk.cds.controllerblueprints.core.BlueprintProcessorException +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException open class ConfigDeploy : AbstractScriptComponentFunction() { @@ -81,7 +81,7 @@ open class ConfigDeploy : AbstractScriptComponentFunction() { print(resultOfGet) } catch (e: Exception) { log.info("Caught exception trying to connect to vLB!!") - throw BlueprintProcessorException("${e.message}") + throw BluePrintProcessorException("${e.message}") } } -- cgit 1.2.3-korg