Commit ec9ad613 authored by George Tziavas's avatar George Tziavas
Browse files

Merge branch 'develop' into 49-investigate-test-failures-in-maven-deploy-process

parents 43823766 ce1392e7

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

+35 −10
Original line number Diff line number Diff line
@@ -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;
@@ -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 );

        }

		

	}

src/main/java/org/etsi/osl/tmf/rcm634/api/ResourceSpecificationApiRouteBuilder.java

+4 −4
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ public class ResourceSpecificationApiRouteBuilder extends RouteBuilder { 
	private String CATALOG_GET_RESOURCESPEC_BY_ID = "";





	@Value("${CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY}")

	private String CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY = "";

	@Value("${CATALOG_GET_RESOURCESPEC_BY_NAME_CATEGORY}")

	private String CATALOG_GET_RESOURCESPEC_BY_NAME_CATEGORY = "";

	

    @Autowired

    private ProducerTemplate template;
@@ -79,8 +79,8 @@ public class ResourceSpecificationApiRouteBuilder extends RouteBuilder { 
		.marshal().json( JsonLibrary.Jackson)

		.convertBodyTo( String.class );

		

		from( CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY )

		.log(LoggingLevel.INFO, log, CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY + " message received!")

		from( CATALOG_GET_RESOURCESPEC_BY_NAME_CATEGORY )

		.log(LoggingLevel.INFO, log, CATALOG_GET_RESOURCESPEC_BY_NAME_CATEGORY + " message received!")

		.to("log:DEBUG?showBody=true&showHeaders=true")

		.bean( resourceSpecificationRepoService, "findByNameAndCategoryAndVersionEager(${header.aname}, ${header.acategory}, ${header.aversion} )")

		.marshal().json( JsonLibrary.Jackson)

src/main/resources/application-testing.yml

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ CATALOG_ADD_RESOURCESPEC: "jms:queue:CATALOG.ADD.RESOURCESPEC" 
CATALOG_UPD_RESOURCESPEC: "jms:queue:CATALOG.UPD.RESOURCESPEC"

CATALOG_UPDADD_RESOURCESPEC: "jms:queue:CATALOG.UPDADD.RESOURCESPEC"

CATALOG_GET_RESOURCESPEC_BY_ID: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_ID"

CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_ΝAME_CATEGORY"

CATALOG_GET_RESOURCESPEC_BY_NAME_CATEGORY: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_NAME_CATEGORY"

EVENT_RESOURCE_CREATE: "jms:topic:EVENT.RESOURCE.CREATE"

EVENT_RESOURCE_STATE_CHANGED: "jms:topic:EVENT.RESOURCE.STATECHANGED"

EVENT_RESOURCE_DELETE: "jms:topic:EVENT.SERVICE.RESOURCE"

src/main/resources/application.yml

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ CATALOG_ADD_RESOURCESPEC: "jms:queue:CATALOG.ADD.RESOURCESPEC" 
CATALOG_UPD_RESOURCESPEC: "jms:queue:CATALOG.UPD.RESOURCESPEC"

CATALOG_UPDADD_RESOURCESPEC: "jms:queue:CATALOG.UPDADD.RESOURCESPEC"

CATALOG_GET_RESOURCESPEC_BY_ID: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_ID"

CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_ΝAME_CATEGORY"

CATALOG_GET_RESOURCESPEC_BY_NAME_CATEGORY: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_NAME_CATEGORY"

EVENT_RESOURCE_CREATE: "jms:topic:EVENT.RESOURCE.CREATE"

EVENT_RESOURCE_STATE_CHANGED: "jms:topic:EVENT.RESOURCE.STATECHANGED"

EVENT_RESOURCE_DELETE: "jms:topic:EVENT.SERVICE.RESOURCE"