diff options
Diffstat (limited to 'ms/blueprintsprocessor/functions')
12 files changed, 47 insertions, 42 deletions
diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/K8sPluginDefinitionApi.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/K8sPluginDefinitionApi.kt index 02b255673..ed0b164ef 100644 --- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/K8sPluginDefinitionApi.kt +++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/K8sPluginDefinitionApi.kt @@ -24,7 +24,6 @@ import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.definition.profile.K import com.fasterxml.jackson.module.kotlin.readValue import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.K8sConnectionPluginConfiguration import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.definition.template.K8sTemplate -import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.instance.K8sRbInstanceFull import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BlueprintWebClientService import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils @@ -156,7 +155,7 @@ class K8sPluginDefinitionApi( try { val result: BlueprintWebClientService.WebClientResponse<String> = rbDefinitionService.exchangeResource( DELETE.name, - "/profile/${profileName}", + "/profile/$profileName", "" ) log.debug(result.toString()) diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/profile/K8sProfileUploadComponent.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/profile/K8sProfileUploadComponent.kt index e7d781d7b..443233b61 100644 --- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/profile/K8sProfileUploadComponent.kt +++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/profile/K8sProfileUploadComponent.kt @@ -29,7 +29,6 @@ import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintPropertiesService import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.K8sConnectionPluginConfiguration import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.definition.K8sPluginDefinitionApi -import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.instance.K8sRbInstance import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.instance.K8sRbInstanceGvk import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceAssignment import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.ResourceResolutionConstants diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sPluginInstanceApi.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sPluginInstanceApi.kt index 1be45e892..a99179599 100644 --- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sPluginInstanceApi.kt +++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sPluginInstanceApi.kt @@ -303,7 +303,7 @@ class K8sPluginInstanceApi( } } - fun editConfigurationValuesByDelete(instanceId: String, configName: String): K8sConfigValueResponse? { + fun editConfigurationValuesByDelete(instanceId: String, configName: String): K8sConfigValueResponse? { val rbInstanceService = K8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse<String> = rbInstanceService.exchangeResource( @@ -450,9 +450,9 @@ class K8sPluginInstanceApi( val rbInstanceService = K8sRbInstanceRestClient(k8sConfiguration, instanceId) try { val result: BlueprintWebClientService.WebClientResponse<String> = rbInstanceService.exchangeResource( - GET.name, - "/config/$configName/version", - "" + GET.name, + "/config/$configName/version", + "" ) log.debug(result.toString()) return if (result.status in 200..299) { diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sPluginQueryApi.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sPluginQueryApi.kt index 9a5051f8e..36ebe1133 100644 --- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sPluginQueryApi.kt +++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sPluginQueryApi.kt @@ -1,4 +1,4 @@ -package org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.query; +package org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.query import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.K8sConnectionPluginConfiguration import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BlueprintWebClientService @@ -8,17 +8,17 @@ import org.slf4j.LoggerFactory import org.springframework.http.HttpMethod.GET public class K8sPluginQueryApi( - private val k8sConfiguration: K8sConnectionPluginConfiguration + private val k8sConfiguration: K8sConnectionPluginConfiguration ) { private val log = LoggerFactory.getLogger(K8sPluginQueryApi::class.java)!! fun queryK8sResources( - cloudRegion: String, - kind: String, - apiVersion: String, - name: String? = null, - namespace: String? = null, - labels: Map<String, String>? = null + cloudRegion: String, + kind: String, + apiVersion: String, + name: String? = null, + namespace: String? = null, + labels: Map<String, String>? = null ): K8sResourceStatus? { val rbQueryService = K8sQueryRestClient(k8sConfiguration) try { @@ -34,14 +34,14 @@ public class K8sPluginQueryApi( path = path.trimEnd(',') } val result: BlueprintWebClientService.WebClientResponse<String> = rbQueryService.exchangeResource( - GET.name, - path, - "" + GET.name, + path, + "" ) log.debug(result.toString()) return if (result.status in 200..299) { val parsedObject: K8sResourceStatus? = JacksonUtils.readValue( - result.body, K8sResourceStatus::class.java + result.body, K8sResourceStatus::class.java ) parsedObject } else if (result.status == 500 && result.body.contains("Error finding master table")) diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sQueryRestClient.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sQueryRestClient.kt index dda5a6eea..672a3667d 100644 --- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sQueryRestClient.kt +++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sQueryRestClient.kt @@ -22,7 +22,7 @@ import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.K8sAbstractRestClien import org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.K8sConnectionPluginConfiguration open class K8sQueryRestClient( - k8sConfiguration: K8sConnectionPluginConfiguration + k8sConfiguration: K8sConnectionPluginConfiguration ) : K8sAbstractRestClientService(k8sConfiguration) { override fun apiUrl(): String { diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sResourceStatus.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sResourceStatus.kt index d0e84ae8c..e3aee7814 100644 --- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sResourceStatus.kt +++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/query/K8sResourceStatus.kt @@ -41,4 +41,4 @@ class K8sResourceStatus { override fun hashCode(): Int { return javaClass.hashCode() } -}
\ No newline at end of file +} diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionExtensions.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionExtensions.kt index f7d41bcc3..38c5baa09 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionExtensions.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionExtensions.kt @@ -46,7 +46,7 @@ suspend fun AbstractComponentFunction.storedResolutionKeysForArtifactNameNB( .resolveResolutionKeysFromDatabase(bluePrintRuntimeService, artifactName) } -suspend fun AbstractComponentFunction.storedArtifactNamesAndResolutionKeysNB(): Map<String,List<String>> { +suspend fun AbstractComponentFunction.storedArtifactNamesAndResolutionKeysNB(): Map<String, List<String>> { return BluePrintDependencyService.resourceResolutionService() .resolveArtifactNamesAndResolutionKeysFromDatabase(bluePrintRuntimeService) } @@ -84,5 +84,5 @@ fun AbstractComponentFunction.storedContentFromResolvedArtifact(resolutionKey: S } fun AbstractComponentFunction.contentFromResolvedArtifact(artifactPrefix: String): String = runBlocking { - contentFromResolvedArtifactNB(artifactPrefix) - }
\ No newline at end of file + contentFromResolvedArtifactNB(artifactPrefix) +} diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionService.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionService.kt index 2352c7dbe..df07b8e03 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionService.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionService.kt @@ -145,7 +145,8 @@ open class ResourceResolutionServiceImpl( } override suspend fun resolveArtifactNamesAndResolutionKeysFromDatabase( - bluePrintRuntimeService: BluePrintRuntimeService<*>): Map<String, List<String>> { + bluePrintRuntimeService: BluePrintRuntimeService<*> + ): Map<String, List<String>> { return templateResolutionDBService.findArtifactNamesAndResolutionKeysByBlueprintNameAndBlueprintVersion( bluePrintRuntimeService ) @@ -498,4 +499,4 @@ open class ResourceResolutionServiceImpl( properties[ResourceResolutionConstants.RESOURCE_RESOLUTION_INPUT_OCCURRENCE].asJsonPrimitive() ) } -}
\ No newline at end of file +} diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolution.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolution.kt index 40a447d8b..8b0f75c96 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolution.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolution.kt @@ -35,13 +35,16 @@ import javax.persistence.TemporalType @EntityListeners(AuditingEntityListener::class) @Entity -@Table(name = "RESOURCE_RESOLUTION", -indexes = [Index(name = "idx_rr_bpnameversion", columnList = "blueprint_name, blueprint_version"), - Index(name = "idx_rr_resolution_key", columnList = "resolution_key"), - Index(name = "idx_rr_name", columnList = "name"), - Index(name = "idx_rr_artifact_name", columnList = "artifact_name"), - Index(name = "idx_rr_resource_idtype", columnList = "resource_id, resource_type") -]) +@Table( + name = "RESOURCE_RESOLUTION", + indexes = [ + Index(name = "idx_rr_bpnameversion", columnList = "blueprint_name, blueprint_version"), + Index(name = "idx_rr_resolution_key", columnList = "resolution_key"), + Index(name = "idx_rr_name", columnList = "name"), + Index(name = "idx_rr_artifact_name", columnList = "artifact_name"), + Index(name = "idx_rr_resource_idtype", columnList = "resource_id, resource_type") + ] +) @Proxy(lazy = false) class ResourceResolution : Serializable { diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt index 46e0d4569..6a7a2cd17 100755 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt @@ -35,12 +35,15 @@ import javax.persistence.TemporalType @EntityListeners(AuditingEntityListener::class) @Entity -@Table(name = "TEMPLATE_RESOLUTION", indexes = [ - Index(name = "idx_tr_bpnameversion", columnList = "blueprint_name, blueprint_version"), - Index(name = "idx_tr_resource_idtype", columnList = "resource_id, resource_type"), - Index(name = "idx_tr_artifact_name", columnList = "artifact_name"), - Index(name = "idx_tr_resolution_key", columnList = "resolution_key") -]) +@Table( + name = "TEMPLATE_RESOLUTION", + indexes = [ + Index(name = "idx_tr_bpnameversion", columnList = "blueprint_name, blueprint_version"), + Index(name = "idx_tr_resource_idtype", columnList = "resource_id, resource_type"), + Index(name = "idx_tr_artifact_name", columnList = "artifact_name"), + Index(name = "idx_tr_resolution_key", columnList = "resolution_key") + ] +) @Proxy(lazy = false) class TemplateResolution : Serializable { diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionSelector.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionSelector.kt index 4fadf969c..c069a9a80 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionSelector.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionSelector.kt @@ -3,4 +3,4 @@ package org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.db interface TemplateResolutionSelector { fun getArtifactName(): String fun getResolutionKey(): String -}
\ No newline at end of file +} diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionService.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionService.kt index fd4cc8cd6..8789ade99 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionService.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionService.kt @@ -93,7 +93,7 @@ class TemplateResolutionService(private val templateResolutionRepository: Templa suspend fun findArtifactNamesAndResolutionKeysByBlueprintNameAndBlueprintVersion( bluePrintRuntimeService: BluePrintRuntimeService<*>, occurrence: Int = 1 - ): Map<String,List<String>> = + ): Map<String, List<String>> = withContext(Dispatchers.IO) { val metadata = bluePrintRuntimeService.bluePrintContext().metadata!! @@ -241,4 +241,4 @@ class TemplateResolutionService(private val templateResolutionRepository: Templa throw BluePrintException("Failed to store resource api result.", ex) } } -}
\ No newline at end of file +} |