From e313f093a20f2d1f18ecc8847ebd9c908be7a65a Mon Sep 17 00:00:00 2001 From: Christos Tranoris Date: Thu, 24 Oct 2024 15:21:41 +0300 Subject: [PATCH] fix for #47 --- .../org/etsi/osl/tmf/BootstrapResources.java | 45 ++++++++++++++----- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/etsi/osl/tmf/BootstrapResources.java b/src/main/java/org/etsi/osl/tmf/BootstrapResources.java index dacfb02..9fdf7d7 100644 --- a/src/main/java/org/etsi/osl/tmf/BootstrapResources.java +++ b/src/main/java/org/etsi/osl/tmf/BootstrapResources.java @@ -22,8 +22,10 @@ package org.etsi.osl.tmf; import com.fasterxml.jackson.databind.ObjectMapper; import org.etsi.osl.domain.model.kubernetes.KubernetesCRDV1; import org.etsi.osl.domain.model.kubernetes.KubernetesCRV1; +import org.etsi.osl.domain.model.kubernetes.KubernetesConfigMap; import org.etsi.osl.domain.model.kubernetes.KubernetesContextDefinition; import org.etsi.osl.domain.model.kubernetes.KubernetesSecret; +import org.etsi.osl.domain.model.kubernetes.KubernetesService; import org.etsi.osl.tmf.rcm634.model.ResourceCandidateUpdate; import org.etsi.osl.tmf.rcm634.model.ResourceCatalog; import org.etsi.osl.tmf.rcm634.model.ResourceCatalogCreate; @@ -207,19 +209,42 @@ public class BootstrapResources { this.addToCategory( scategoryInfra, rspecKubCRV1 ); } - resourceSpecificationObj = this.resourceSpecRepoService.findByNameAndVersion( - KubernetesSecret.OSL_KUBSECRET_RSPEC_NAME , - KubernetesSecret.OSL_KUBSECRET_RSPEC_VERSION); + resourceSpecificationObj = this.resourceSpecRepoService.findByNameAndVersion( + KubernetesSecret.OSL_KUBSECRET_RSPEC_NAME , + KubernetesSecret.OSL_KUBSECRET_RSPEC_VERSION); - if ( ( scategoryInfra != null ) && ( resourceSpecificationObj == null )) - { - ResourceSpecification rspecKubSecret = - this.resourceSpecRepoService.addResourceSpecification( KubernetesSecret.builder().build().toRSpecCreate_InitRepo() ); - KubernetesSecret.builder().build().fromRSpec(rspecKubSecret);//to update any details - this.addToCategory( scategoryInfra, rspecKubSecret ); - } + if ( ( scategoryInfra != null ) && ( resourceSpecificationObj == null )) + { + ResourceSpecification rspecKubSecret = + this.resourceSpecRepoService.addResourceSpecification( KubernetesSecret.builder().build().toRSpecCreate_InitRepo() ); + KubernetesSecret.builder().build().fromRSpec(rspecKubSecret);//to update any details + this.addToCategory( scategoryInfra, rspecKubSecret ); + } + resourceSpecificationObj = this.resourceSpecRepoService.findByNameAndVersion( + KubernetesService.OSL_KUBSERVICE_RSPEC_NAME , + KubernetesService.OSL_KUBSERVICE_RSPEC_VERSION); + + if ( ( scategoryInfra != null ) && ( resourceSpecificationObj == null )) + { + ResourceSpecification rspecKubServ = + this.resourceSpecRepoService.addResourceSpecification( KubernetesService.builder().build().toRSpecCreate_InitRepo() ); + KubernetesService.builder().build().fromRSpec(rspecKubServ);//to update any details + this.addToCategory( scategoryInfra, rspecKubServ ); + } + + resourceSpecificationObj = this.resourceSpecRepoService.findByNameAndVersion( + KubernetesConfigMap.OSL_KUBCMAP_RSPEC_NAME , + KubernetesConfigMap.OSL_KUBCMAP_RSPEC_VERSION); + + if ( ( scategoryInfra != null ) && ( resourceSpecificationObj == null )) + { + ResourceSpecification rspecKubCMap = + this.resourceSpecRepoService.addResourceSpecification( KubernetesConfigMap.builder().build().toRSpecCreate_InitRepo() ); + KubernetesConfigMap.builder().build().fromRSpec( rspecKubCMap );//to update any details + this.addToCategory( scategoryInfra, rspecKubCMap ); + } } -- GitLab