Commit beb57884 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch... 

Merge branch '47-support-api-for-https-labs-etsi-org-rep-osl-code-org-etsi-osl-cridge-issues-14' into 'develop'

Resolve "Support API for org.etsi.osl.cridge#14"

See merge request !38
parents eada418f e313f093

src/main/java/org/etsi/osl/tmf/BootstrapResources.java

+35 −10
Original line number Original line Diff line number Diff line
@@ -22,8 +22,10 @@ package org.etsi.osl.tmf; 
import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.databind.ObjectMapper;

import org.etsi.osl.domain.model.kubernetes.KubernetesCRDV1;

import org.etsi.osl.domain.model.kubernetes.KubernetesCRDV1;

import org.etsi.osl.domain.model.kubernetes.KubernetesCRV1;

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.KubernetesContextDefinition;

import org.etsi.osl.domain.model.kubernetes.KubernetesSecret;

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.ResourceCandidateUpdate;

import org.etsi.osl.tmf.rcm634.model.ResourceCatalog;

import org.etsi.osl.tmf.rcm634.model.ResourceCatalog;

import org.etsi.osl.tmf.rcm634.model.ResourceCatalogCreate;

import org.etsi.osl.tmf.rcm634.model.ResourceCatalogCreate;
@@ -220,6 +222,29 @@ public class BootstrapResources { 
        }

        }





		

		

        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 );

        }

		

		

	}

	}