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 +- .../Scripts/python/SampleRAProcessor.py | 2 +- .../cba/capability/cli/CapabilityCliDefinitions.kt | 8 +-- .../Scripts/kotlin/cba/capability/cli/Check.kt | 8 +-- .../kotlin/ResourceAssignmentProcessor.cba.kts | 4 +- .../resource/audit/DeviceResourceDefinitions.kt | 8 +-- .../cba/resource/audit/ResourceAuditDefinitions.kt | 28 ++++---- .../resource/audit/functions/ConfigCollector.kt | 4 +- .../Scripts/kotlin/RestconfConfigDeploy.kt | 4 +- .../Scripts/kotlin/RestconfSoftwareUpgrade.kt | 16 ++--- .../Scripts/kotlin/CollectorScript.kt | 4 +- .../Scripts/kotlin/TestScript.kt | 8 +-- .../Scripts/kotlin/RestconfConfigDeploy.kt | 4 +- .../proto-definition/proto/BluePrintCommon.proto | 41 ++++++++++++ .../proto/BluePrintManagement.proto | 76 ++++++++++++++++++++++ .../proto/BluePrintProcessing.proto | 24 +++++++ .../proto-definition/proto/BlueprintCommon.proto | 41 ------------ .../proto/BlueprintManagement.proto | 76 ---------------------- .../proto/BlueprintProcessing.proto | 24 ------- .../ccsdk_blueprints/abstract_ra_processor.py | 6 +- .../ccsdk_blueprints/blueprint_runtime_service.py | 2 +- 26 files changed, 234 insertions(+), 234 deletions(-) create mode 100644 components/model-catalog/proto-definition/proto/BluePrintCommon.proto create mode 100644 components/model-catalog/proto-definition/proto/BluePrintManagement.proto create mode 100644 components/model-catalog/proto-definition/proto/BluePrintProcessing.proto delete mode 100644 components/model-catalog/proto-definition/proto/BlueprintCommon.proto delete mode 100644 components/model-catalog/proto-definition/proto/BlueprintManagement.proto delete mode 100644 components/model-catalog/proto-definition/proto/BlueprintProcessing.proto (limited to 'components') 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}") } } 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 d3d97f1c3..30b9ff951 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 ca3068762..d09244868 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 c3cd53f61..e29055634 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 54347108b..a471349ef 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 c0306e411..ee99b04f9 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 cb617b909..4e66a05c4 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 a6dbef6a0..7ae27dacc 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 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(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/imperative_workflow/Scripts/kotlin/CollectorScript.kt b/components/model-catalog/blueprint-model/uat-blueprints/imperative_workflow/Scripts/kotlin/CollectorScript.kt index 28ce1494e..904237b79 100644 --- a/components/model-catalog/blueprint-model/uat-blueprints/imperative_workflow/Scripts/kotlin/CollectorScript.kt +++ b/components/model-catalog/blueprint-model/uat-blueprints/imperative_workflow/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/components/model-catalog/blueprint-model/uat-blueprints/imperative_workflow/Scripts/kotlin/TestScript.kt b/components/model-catalog/blueprint-model/uat-blueprints/imperative_workflow/Scripts/kotlin/TestScript.kt index af3ebffb1..e5546751f 100644 --- a/components/model-catalog/blueprint-model/uat-blueprints/imperative_workflow/Scripts/kotlin/TestScript.kt +++ b/components/model-catalog/blueprint-model/uat-blueprints/imperative_workflow/Scripts/kotlin/TestScript.kt @@ -19,8 +19,8 @@ package cba.cds.uat 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.controllerblueprints.core.BlueprintException -import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintProcessorException +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintException +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException import org.onap.ccsdk.cds.controllerblueprints.core.asJsonPrimitive import org.onap.ccsdk.cds.controllerblueprints.core.logger @@ -41,14 +41,14 @@ open class TestScript : AbstractScriptComponentFunction() { setAttribute("response-data", if (shouldFail) FAILED else SUCCEEDED) if (shouldFail) { - throw BlueprintException("Step failed: ${this.stepName}") + throw BluePrintException("Step failed: ${this.stepName}") } } fun inputValue(name: String): JsonNode? { return try { return bluePrintRuntimeService.getInputValue(name) - } catch (e: BlueprintProcessorException) { null } + } catch (e: BluePrintProcessorException) { null } } override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) { 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 039685575..cc965a7b3 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 new file mode 100644 index 000000000..ce90929dc --- /dev/null +++ b/components/model-catalog/proto-definition/proto/BluePrintCommon.proto @@ -0,0 +1,41 @@ +syntax = "proto3"; +option java_multiple_files = true; +package org.onap.ccsdk.cds.controllerblueprints.common.api; + +message CommonHeader { + string timestamp = 1; + string originatorId = 23; + string requestId = 3; + string subRequestId = 4; + Flag flag = 5; +} + +message Flag { + bool isForce = 1; + int32 ttl = 2; +} + +message ActionIdentifiers { + string blueprintName = 1; + string blueprintVersion = 2; + string actionName = 3; + string mode = 4; +} + +message Status { + int32 code = 1; + // present only if message is failure + string errorMessage = 2; + // This will be success or failure + string message = 3; + EventType eventType = 4; + string timestamp = 5; +} + +enum EventType { + EVENT_COMPONENT_FAILURE = 0; + EVENT_COMPONENT_PROCESSING = 1; + EVENT_COMPONENT_NOTIFICATION = 2; + EVENT_COMPONENT_EXECUTED = 3; + EVENT_COMPONENT_TRACE = 4; +} \ No newline at end of file diff --git a/components/model-catalog/proto-definition/proto/BluePrintManagement.proto b/components/model-catalog/proto-definition/proto/BluePrintManagement.proto new file mode 100644 index 000000000..a363e8ade --- /dev/null +++ b/components/model-catalog/proto-definition/proto/BluePrintManagement.proto @@ -0,0 +1,76 @@ +syntax = "proto3"; +import "google/protobuf/struct.proto"; +import "BluePrintCommon.proto"; +option java_multiple_files = true; +package org.onap.ccsdk.cds.controllerblueprints.management.api; + +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; + // Extra optional dynamic properties used during upload. + google.protobuf.Struct properties = 4; +} + +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 { + 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 { + org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; + bool loadCBA = 2; + bool loadModelType = 3; + bool loadResourceDictionary = 4; +} + +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; + org.onap.ccsdk.cds.controllerblueprints.common.api.Status status = 3; + // Extra optional dynamic properties. + google.protobuf.Struct properties = 4; +} + +message FileChunk { + bytes chunk = 1; +} +// Values used in BluePrintDownloadInput/actionIdentifiers/action +enum DownloadAction { + // Default is SEARCH the cba and download the cba + SEARCH = 0; + // Download the starter cba with corresponding property options + STARTER = 1; + // clone cba with corresponding property options + CLONE = 2; +} + +enum UploadAction { + // Default is DRAFT + DRAFT = 0; + ENRICH = 1; + VALIDATE = 2; + PUBLISH = 3; +} + +enum RemoveAction { + // Delete CBA from database, deploy path and clean cache. + DEFAULT = 0; +} + +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 new file mode 100644 index 000000000..9622287ab --- /dev/null +++ b/components/model-catalog/proto-definition/proto/BluePrintProcessing.proto @@ -0,0 +1,24 @@ +syntax = "proto3"; +import "google/protobuf/struct.proto"; +import "BluePrintCommon.proto"; +option java_multiple_files = true; +package org.onap.ccsdk.cds.controllerblueprints.processing.api; + + +message ExecutionServiceInput { + org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; + org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; + google.protobuf.Struct payload = 3; +} + +message ExecutionServiceOutput { + org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; + org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; + org.onap.ccsdk.cds.controllerblueprints.common.api.Status status = 3; + google.protobuf.Struct payload = 4; +} + + +service BluePrintProcessingService { + rpc process (stream ExecutionServiceInput) returns (stream ExecutionServiceOutput); +} diff --git a/components/model-catalog/proto-definition/proto/BlueprintCommon.proto b/components/model-catalog/proto-definition/proto/BlueprintCommon.proto deleted file mode 100644 index ce90929dc..000000000 --- a/components/model-catalog/proto-definition/proto/BlueprintCommon.proto +++ /dev/null @@ -1,41 +0,0 @@ -syntax = "proto3"; -option java_multiple_files = true; -package org.onap.ccsdk.cds.controllerblueprints.common.api; - -message CommonHeader { - string timestamp = 1; - string originatorId = 23; - string requestId = 3; - string subRequestId = 4; - Flag flag = 5; -} - -message Flag { - bool isForce = 1; - int32 ttl = 2; -} - -message ActionIdentifiers { - string blueprintName = 1; - string blueprintVersion = 2; - string actionName = 3; - string mode = 4; -} - -message Status { - int32 code = 1; - // present only if message is failure - string errorMessage = 2; - // This will be success or failure - string message = 3; - EventType eventType = 4; - string timestamp = 5; -} - -enum EventType { - EVENT_COMPONENT_FAILURE = 0; - EVENT_COMPONENT_PROCESSING = 1; - EVENT_COMPONENT_NOTIFICATION = 2; - EVENT_COMPONENT_EXECUTED = 3; - EVENT_COMPONENT_TRACE = 4; -} \ No newline at end of file diff --git a/components/model-catalog/proto-definition/proto/BlueprintManagement.proto b/components/model-catalog/proto-definition/proto/BlueprintManagement.proto deleted file mode 100644 index 3b6d43f3e..000000000 --- a/components/model-catalog/proto-definition/proto/BlueprintManagement.proto +++ /dev/null @@ -1,76 +0,0 @@ -syntax = "proto3"; -import "google/protobuf/struct.proto"; -import "BlueprintCommon.proto"; -option java_multiple_files = true; -package org.onap.ccsdk.cds.controllerblueprints.management.api; - -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; - // Extra optional dynamic properties used during upload. - google.protobuf.Struct properties = 4; -} - -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 { - 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 { - org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; - bool loadCBA = 2; - bool loadModelType = 3; - bool loadResourceDictionary = 4; -} - -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; - org.onap.ccsdk.cds.controllerblueprints.common.api.Status status = 3; - // Extra optional dynamic properties. - google.protobuf.Struct properties = 4; -} - -message FileChunk { - bytes chunk = 1; -} -// Values used in BlueprintDownloadInput/actionIdentifiers/action -enum DownloadAction { - // Default is SEARCH the cba and download the cba - SEARCH = 0; - // Download the starter cba with corresponding property options - STARTER = 1; - // clone cba with corresponding property options - CLONE = 2; -} - -enum UploadAction { - // Default is DRAFT - DRAFT = 0; - ENRICH = 1; - VALIDATE = 2; - PUBLISH = 3; -} - -enum RemoveAction { - // Delete CBA from database, deploy path and clean cache. - DEFAULT = 0; -} - -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 deleted file mode 100644 index 3e8bfd8c4..000000000 --- a/components/model-catalog/proto-definition/proto/BlueprintProcessing.proto +++ /dev/null @@ -1,24 +0,0 @@ -syntax = "proto3"; -import "google/protobuf/struct.proto"; -import "BlueprintCommon.proto"; -option java_multiple_files = true; -package org.onap.ccsdk.cds.controllerblueprints.processing.api; - - -message ExecutionServiceInput { - org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; - org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; - google.protobuf.Struct payload = 3; -} - -message ExecutionServiceOutput { - org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; - org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; - org.onap.ccsdk.cds.controllerblueprints.common.api.Status status = 3; - google.protobuf.Struct payload = 4; -} - - -service BlueprintProcessingService { - rpc process (stream ExecutionServiceInput) returns (stream ExecutionServiceOutput); -} diff --git a/components/scripts/python/ccsdk_blueprints/abstract_ra_processor.py b/components/scripts/python/ccsdk_blueprints/abstract_ra_processor.py index b5d48bddc..05fe2e082 100644 --- a/components/scripts/python/ccsdk_blueprints/abstract_ra_processor.py +++ b/components/scripts/python/ccsdk_blueprints/abstract_ra_processor.py @@ -3,7 +3,7 @@ from org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.proces from org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.utils import \ ResourceAssignmentUtils from org.onap.ccsdk.cds.controllerblueprints.core import \ - BlueprintProcessorException + BluePrintProcessorException class AbstractRAProcessor(ResourceAssignmentProcessor): @@ -24,6 +24,6 @@ class AbstractRAProcessor(ResourceAssignmentProcessor): else: ResourceAssignmentUtils.Companion.setFailedResourceDataValue( resource_assignment, "Fail to resolve value") - except BlueprintProcessorException, err: - raise BlueprintProcessorException( + except BluePrintProcessorException, err: + raise BluePrintProcessorException( "Error on resource assignment. Message = " + err.message) diff --git a/components/scripts/python/ccsdk_blueprints/blueprint_runtime_service.py b/components/scripts/python/ccsdk_blueprints/blueprint_runtime_service.py index 60781cbc6..7c7beff7f 100644 --- a/components/scripts/python/ccsdk_blueprints/blueprint_runtime_service.py +++ b/components/scripts/python/ccsdk_blueprints/blueprint_runtime_service.py @@ -1,4 +1,4 @@ -class BlueprintRuntimeService: +class BluePrintRuntimeService: def __init__(self, bps): self.bps = bps -- cgit 1.2.3-korg