diff options
Diffstat (limited to 'components/model-catalog')
19 files changed, 102 insertions, 102 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 8b08494f1..38d843acd 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 } @@ -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}") + bluePrintRuntimeService.getBlueprintError().addError("${runtimeException.message}") } fun modifyTemplate(configmapName: String, typOfVfmodule: String): String { @@ -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 5bee36238..2673b3cd4 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 @@ -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}") + bluePrintRuntimeService.getBlueprintError().addError("${runtimeException.message}") } inner class K8sApi( @@ -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 cd555b49a..db5ab31ce 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 737fb4234..e53b73eb0 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,13 +81,13 @@ 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}")
}
}
override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {
log.info("Executing Recovery")
- bluePrintRuntimeService.getBluePrintError().addError("${runtimeException.message}")
+ bluePrintRuntimeService.getBlueprintError().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 0441a1d13..606e76e84 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,13 +83,13 @@ 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}")
}
}
override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {
log.info("Executing Recovery")
- bluePrintRuntimeService.getBluePrintError().addError("${runtimeException.message}")
+ bluePrintRuntimeService.getBlueprintError().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 d6f7e766b..07168ce76 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,13 +81,13 @@ 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}")
}
}
override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {
log.info("Executing Recovery")
- bluePrintRuntimeService.getBluePrintError().addError("${runtimeException.message}")
+ bluePrintRuntimeService.getBlueprintError().addError("${runtimeException.message}")
}
}
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/SampleRAProcessor.py b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/SampleRAProcessor.py index 30b9ff951..d3d97f1c3 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/SampleRAProcessor.py +++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/SampleRAProcessor.py @@ -15,7 +15,7 @@ class SampleRAProcessor(AbstractRAProcessor): value = self.resolve_values_script(execution_request, self.value_to_resolve) self.set_resource_data_value(execution_request, value) else: - raise BluePrintProcessorException("Error on resource assignment. Message = " + self.error_message) + raise BlueprintProcessorException("Error on resource assignment. Message = " + self.error_message) return None def recover(self, runtime_exception, execution_request): diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/cba/capability/cli/CapabilityCliDefinitions.kt b/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/cba/capability/cli/CapabilityCliDefinitions.kt index d09244868..ca3068762 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/cba/capability/cli/CapabilityCliDefinitions.kt +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/cba/capability/cli/CapabilityCliDefinitions.kt @@ -20,7 +20,7 @@ import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.nodeTemplateCom import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.nodeTypeComponentScriptExecutor import org.onap.ccsdk.cds.blueprintsprocessor.ssh.relationshipTemplateSshClient import org.onap.ccsdk.cds.blueprintsprocessor.ssh.relationshipTypeConnectsToSshClient -import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants +import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants import org.onap.ccsdk.cds.controllerblueprints.core.data.ServiceTemplate import org.onap.ccsdk.cds.controllerblueprints.core.dsl.artifactTypeTemplateVelocity import org.onap.ccsdk.cds.controllerblueprints.core.dsl.getAttribute @@ -28,9 +28,9 @@ import org.onap.ccsdk.cds.controllerblueprints.core.dsl.getInput import org.onap.ccsdk.cds.controllerblueprints.core.dsl.nodeTypeComponent import org.onap.ccsdk.cds.controllerblueprints.core.dsl.relationshipTypeConnectsTo import org.onap.ccsdk.cds.controllerblueprints.core.dsl.serviceTemplate -import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.AbstractBluePrintDefinitions +import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.AbstractBlueprintDefinitions -class CapabilityCliDefinitions : AbstractBluePrintDefinitions() { +class CapabilityCliDefinitions : AbstractBlueprintDefinitions() { override fun serviceTemplate(): ServiceTemplate { return defaultServiceTemplate() @@ -64,7 +64,7 @@ fun CapabilityCliDefinitions.defaultServiceTemplate() = nodeTemplateComponentScriptExecutor(id = "check", description = "") { definedOperation(description = "") { inputs { - type(BluePrintConstants.SCRIPT_KOTLIN) + type(BlueprintConstants.SCRIPT_KOTLIN) scriptClassReference(Check::class) } outputs { diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/cba/capability/cli/Check.kt b/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/cba/capability/cli/Check.kt index e29055634..c3cd53f61 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/cba/capability/cli/Check.kt +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_cli/Scripts/kotlin/cba/capability/cli/Check.kt @@ -19,10 +19,10 @@ package cba.capability.cli 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.ssh.sshClientService -import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException +import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintProcessorException import org.onap.ccsdk.cds.controllerblueprints.core.asJsonString 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 open class Check : AbstractScriptComponentFunction() { @@ -36,7 +36,7 @@ open class Check : AbstractScriptComponentFunction() { log.info("Executing process : ${executionRequest.payload}") val data = requestPayloadActionProperty("data")?.first() - ?: throw BluePrintProcessorException("Failed to load payload data properties.") + ?: throw BlueprintProcessorException("Failed to load payload data properties.") log.info("Data : ${data.asJsonString()}") @@ -50,7 +50,7 @@ open class Check : AbstractScriptComponentFunction() { log.info("Device Info :$deviceInformation") // Get the Client Service - val sshClientService = BluePrintDependencyService.sshClientService(deviceInformation) + val sshClientService = BlueprintDependencyService.sshClientService(deviceInformation) log.info("Client service is ready") } diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts index a471349ef..54347108b 100755 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts @@ -16,8 +16,8 @@ import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.processor.* import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.CapabilityResourceSource -import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException -import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintScriptsService +import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintProcessorException +import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BlueprintScriptsService import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceAssignment import org.onap.ccsdk.cds.controllerblueprints.core.asJsonPrimitive diff --git a/components/model-catalog/blueprint-model/test-blueprint/resource-audit/Scripts/kotlin/cba/resource/audit/DeviceResourceDefinitions.kt b/components/model-catalog/blueprint-model/test-blueprint/resource-audit/Scripts/kotlin/cba/resource/audit/DeviceResourceDefinitions.kt index ee99b04f9..c0306e411 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/resource-audit/Scripts/kotlin/cba/resource/audit/DeviceResourceDefinitions.kt +++ b/components/model-catalog/blueprint-model/test-blueprint/resource-audit/Scripts/kotlin/cba/resource/audit/DeviceResourceDefinitions.kt @@ -17,21 +17,21 @@ package cba.resource.audit import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.resourceDefinitions -import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants -import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintTypes +import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants +import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintTypes const val SOURCE_SDNO = "SDN-O" const val SOURCE_SDNC = "SDNC" const val SOURCE_AAI = "AAI" -val deviceResourceDefinitions = BluePrintTypes.resourceDefinitions { +val deviceResourceDefinitions = BlueprintTypes.resourceDefinitions { // Port Speed Definitions resourceDefinition(name = "port-speed", description = "Port Speed") { property(type = "string", required = true) sources { sourceCapability(id = SOURCE_SDNO, description = "SDN-O Source") { definedProperties { - type(BluePrintConstants.SCRIPT_KOTLIN) + type(BlueprintConstants.SCRIPT_KOTLIN) scriptClassReference("cba.resource.audit.processor.PortSpeedRAProcessor") keyDependencies(arrayListOf("device-id")) } diff --git a/components/model-catalog/blueprint-model/test-blueprint/resource-audit/Scripts/kotlin/cba/resource/audit/ResourceAuditDefinitions.kt b/components/model-catalog/blueprint-model/test-blueprint/resource-audit/Scripts/kotlin/cba/resource/audit/ResourceAuditDefinitions.kt index 4e66a05c4..cb617b909 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/resource-audit/Scripts/kotlin/cba/resource/audit/ResourceAuditDefinitions.kt +++ b/components/model-catalog/blueprint-model/test-blueprint/resource-audit/Scripts/kotlin/cba/resource/audit/ResourceAuditDefinitions.kt @@ -19,16 +19,16 @@ package cba.resource.audit import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.ComponentScriptExecutor import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.nodeTemplateComponentScriptExecutor import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.nodeTypeComponentScriptExecutor -import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants -import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintTypes +import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants +import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintTypes import org.onap.ccsdk.cds.controllerblueprints.core.data.ServiceTemplate import org.onap.ccsdk.cds.controllerblueprints.core.dsl.getAttribute import org.onap.ccsdk.cds.controllerblueprints.core.dsl.getNodeTemplateAttribute import org.onap.ccsdk.cds.controllerblueprints.core.dsl.nodeTypeComponent import org.onap.ccsdk.cds.controllerblueprints.core.dsl.serviceTemplate -import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.AbstractBluePrintDefinitions +import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.AbstractBlueprintDefinitions -class ResourceAuditDefinitions : AbstractBluePrintDefinitions() { +class ResourceAuditDefinitions : AbstractBlueprintDefinitions() { override fun serviceTemplate(): ServiceTemplate { return defaultServiceTemplate() @@ -47,13 +47,13 @@ fun ResourceAuditDefinitions.defaultServiceTemplate() = workflow(id = "config-collect", description = "Collect the configuration for Device") { inputs { - property(id = "device-id", type = BluePrintConstants.DATA_TYPE_STRING, required = true, description = "") - property(id = "sources", type = BluePrintConstants.DATA_TYPE_LIST, required = true, description = "") { - entrySchema(BluePrintConstants.DATA_TYPE_STRING) + property(id = "device-id", type = BlueprintConstants.DATA_TYPE_STRING, required = true, description = "") + property(id = "sources", type = BlueprintConstants.DATA_TYPE_LIST, required = true, description = "") { + entrySchema(BlueprintConstants.DATA_TYPE_STRING) } } outputs { - property(id = "response-data", required = true, type = BluePrintConstants.DATA_TYPE_STRING, description = "") { + property(id = "response-data", required = true, type = BlueprintConstants.DATA_TYPE_STRING, description = "") { value( getNodeTemplateAttribute( nodeTemplateId = "config-collector", @@ -61,21 +61,21 @@ fun ResourceAuditDefinitions.defaultServiceTemplate() = ) ) } - property(id = "status", required = true, type = BluePrintConstants.DATA_TYPE_STRING, description = "") { - value(BluePrintConstants.STATUS_SUCCESS) + property(id = "status", required = true, type = BlueprintConstants.DATA_TYPE_STRING, description = "") { + value(BlueprintConstants.STATUS_SUCCESS) } } step(id = "config-collector", target = "config-collector", description = "Collect the Configuration") } - val configCollectorComponent = BluePrintTypes.nodeTemplateComponentScriptExecutor( + val configCollectorComponent = BlueprintTypes.nodeTemplateComponentScriptExecutor( id = "config-collector", description = "Config collector component" ) { definedOperation(description = "Config Collector Operation") { inputs { - type(BluePrintConstants.SCRIPT_KOTLIN) + type(BlueprintConstants.SCRIPT_KOTLIN) scriptClassReference("cba.resource.audit.functions.ConfigCollector") } outputs { @@ -87,6 +87,6 @@ fun ResourceAuditDefinitions.defaultServiceTemplate() = nodeTemplate(configCollectorComponent) } - nodeType(BluePrintTypes.nodeTypeComponent()) - nodeType(BluePrintTypes.nodeTypeComponentScriptExecutor()) + nodeType(BlueprintTypes.nodeTypeComponent()) + nodeType(BlueprintTypes.nodeTypeComponentScriptExecutor()) } diff --git a/components/model-catalog/blueprint-model/test-blueprint/resource-audit/Scripts/kotlin/cba/resource/audit/functions/ConfigCollector.kt b/components/model-catalog/blueprint-model/test-blueprint/resource-audit/Scripts/kotlin/cba/resource/audit/functions/ConfigCollector.kt index 7ae27dacc..a6dbef6a0 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/resource-audit/Scripts/kotlin/cba/resource/audit/functions/ConfigCollector.kt +++ b/components/model-catalog/blueprint-model/test-blueprint/resource-audit/Scripts/kotlin/cba/resource/audit/functions/ConfigCollector.kt @@ -20,7 +20,7 @@ import cba.resource.audit.deviceResourceDefinitions 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.BluePrintConstants +import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants import org.onap.ccsdk.cds.controllerblueprints.core.asJsonPrimitive import org.onap.ccsdk.cds.controllerblueprints.core.jsonAsJsonType import org.onap.ccsdk.cds.controllerblueprints.core.logger @@ -43,7 +43,7 @@ class ConfigCollector : AbstractScriptComponentFunction() { } // Set the Attributes - setAttribute(ComponentScriptExecutor.ATTRIBUTE_STATUS, BluePrintConstants.STATUS_SUCCESS.asJsonPrimitive()) + setAttribute(ComponentScriptExecutor.ATTRIBUTE_STATUS, BlueprintConstants.STATUS_SUCCESS.asJsonPrimitive()) setAttribute( ComponentScriptExecutor.ATTRIBUTE_RESPONSE_DATA, """{ 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 154792873..78ab34e9e 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 e238c3e25..96345f0d3 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") } } } diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Scripts/kotlin/RestconfConfigDeploy.kt b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Scripts/kotlin/RestconfConfigDeploy.kt index 264f4f725..2ba527ac1 100644 --- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Scripts/kotlin/RestconfConfigDeploy.kt +++ b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/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 class RestconfConfigDeploy : AbstractScriptComponentFunction() { @@ -68,7 +68,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/proto-definition/proto/BluePrintCommon.proto b/components/model-catalog/proto-definition/proto/BlueprintCommon.proto index ce90929dc..ce90929dc 100644 --- a/components/model-catalog/proto-definition/proto/BluePrintCommon.proto +++ b/components/model-catalog/proto-definition/proto/BlueprintCommon.proto diff --git a/components/model-catalog/proto-definition/proto/BluePrintManagement.proto b/components/model-catalog/proto-definition/proto/BlueprintManagement.proto index a363e8ade..3b6d43f3e 100644 --- a/components/model-catalog/proto-definition/proto/BluePrintManagement.proto +++ b/components/model-catalog/proto-definition/proto/BlueprintManagement.proto @@ -1,10 +1,10 @@ syntax = "proto3"; import "google/protobuf/struct.proto"; -import "BluePrintCommon.proto"; +import "BlueprintCommon.proto"; option java_multiple_files = true; package org.onap.ccsdk.cds.controllerblueprints.management.api; -message BluePrintUploadInput { +message BlueprintUploadInput { org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; FileChunk fileChunk = 2; org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 3; @@ -12,28 +12,28 @@ message BluePrintUploadInput { google.protobuf.Struct properties = 4; } -message BluePrintDownloadInput { +message BlueprintDownloadInput { org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; // Extra optional dynamic properties used to download. google.protobuf.Struct properties = 3; } -message BluePrintRemoveInput { +message BlueprintRemoveInput { org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; // Extra optional dynamic properties used to remove. google.protobuf.Struct properties = 3; } -message BluePrintBootstrapInput { +message BlueprintBootstrapInput { org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; bool loadCBA = 2; bool loadModelType = 3; bool loadResourceDictionary = 4; } -message BluePrintManagementOutput { +message BlueprintManagementOutput { org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; // Optional file chunk sent back to the client for Enrich and Download this is mandatory. FileChunk fileChunk = 2; @@ -45,7 +45,7 @@ message BluePrintManagementOutput { message FileChunk { bytes chunk = 1; } -// Values used in BluePrintDownloadInput/actionIdentifiers/action +// Values used in BlueprintDownloadInput/actionIdentifiers/action enum DownloadAction { // Default is SEARCH the cba and download the cba SEARCH = 0; @@ -68,9 +68,9 @@ enum RemoveAction { DEFAULT = 0; } -service BluePrintManagementService { - rpc downloadBlueprint (BluePrintDownloadInput) returns (BluePrintManagementOutput); - rpc uploadBlueprint (BluePrintUploadInput) returns (BluePrintManagementOutput); - rpc removeBlueprint (BluePrintRemoveInput) returns (BluePrintManagementOutput); - rpc bootstrapBlueprint (BluePrintBootstrapInput) returns (BluePrintManagementOutput); +service BlueprintManagementService { + rpc downloadBlueprint (BlueprintDownloadInput) returns (BlueprintManagementOutput); + rpc uploadBlueprint (BlueprintUploadInput) returns (BlueprintManagementOutput); + rpc removeBlueprint (BlueprintRemoveInput) returns (BlueprintManagementOutput); + rpc bootstrapBlueprint (BlueprintBootstrapInput) returns (BlueprintManagementOutput); } diff --git a/components/model-catalog/proto-definition/proto/BluePrintProcessing.proto b/components/model-catalog/proto-definition/proto/BlueprintProcessing.proto index 9622287ab..3e8bfd8c4 100644 --- a/components/model-catalog/proto-definition/proto/BluePrintProcessing.proto +++ b/components/model-catalog/proto-definition/proto/BlueprintProcessing.proto @@ -1,6 +1,6 @@ syntax = "proto3"; import "google/protobuf/struct.proto"; -import "BluePrintCommon.proto"; +import "BlueprintCommon.proto"; option java_multiple_files = true; package org.onap.ccsdk.cds.controllerblueprints.processing.api; @@ -19,6 +19,6 @@ message ExecutionServiceOutput { } -service BluePrintProcessingService { +service BlueprintProcessingService { rpc process (stream ExecutionServiceInput) returns (stream ExecutionServiceOutput); } |