Merge branch 'develop' into 'main' (1e625da9) · Commits · OSL / code / org.etsi.osl.tmf.api

.factorypath

+2 −2

Original line number	Diff line number	Diff line
		<factorypath>
		<factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/>
		<factorypathentry kind="EXTJAR" id="C:\Users\ctranoris\.m2\repository\org\mapstruct\mapstruct-processor\1.5.3.Final\mapstruct-processor-1.5.3.Final.jar" enabled="true" runInBatchMode="false"/>
		<factorypathentry kind="VARJAR" id="M2_REPO/org/mapstruct/mapstruct-processor/1.5.3.Final/mapstruct-processor-1.5.3.Final.jar" enabled="true" runInBatchMode="false"/>
		<factorypathentry kind="VARJAR" id="M2_REPO/org/projectlombok/lombok/1.18.28/lombok-1.18.28.jar" enabled="true" runInBatchMode="false"/>
		</factorypath>

.gitlab-ci.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ include:
		- ci-templates/default.yml
		- ci-templates/build.yml
		rules:
		- if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
		- if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'

		- project: osl/code/org.etsi.osl.main
		ref: develop
		@@ -29,7 +29,7 @@ include:
		- ci-templates/default.yml
		- ci-templates/build_unprotected.yml
		rules:
		- if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'
		- if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED == "false"'

		maven_build:
		extends: .maven_build

Dockerfile

+2 −2

Original line number	Diff line number	Diff line
		FROM ibm-semeru-runtimes:open-17.0.7_7-jdk
		# RUN mkdir /opt/shareclasses
		RUN mkdir -p /opt/openslice/lib/
		COPY target/org.etsi.osl.tmf.api-1.0.0-exec.jar /opt/openslice/lib/
		CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.tmf.api-1.0.0-exec.jar"]
		COPY target/org.etsi.osl.tmf.api-1.1.0-exec.jar /opt/openslice/lib/
		CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.tmf.api-1.1.0-exec.jar"]
		EXPOSE 13082
		No newline at end of file

pom.xml

+20 −6

Original line number	Diff line number	Diff line
		@@ -5,14 +5,21 @@
		<parent>
		<groupId>org.etsi.osl</groupId>
		<artifactId>org.etsi.osl.main</artifactId>
		<version>1.0.0</version>
		<version>2024Q4</version>
		<relativePath>../org.etsi.osl.main</relativePath>
		</parent>

		<version>${org.etsi.osl.tmf.api.version}</version>

		<artifactId>org.etsi.osl.tmf.api</artifactId>
		<name>org.etsi.osl.tmf.api</name>

		<organization>
		<name>OpenSlice by ETSI</name>
		<url>https://osl.etsi.org</url>
		</organization>



		<properties>
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
		@@ -289,6 +296,12 @@
		<artifactId>junit-platform-runner</artifactId>
		<scope>test</scope>
		</dependency>
		<dependency>
		<groupId>org.mockito</groupId>
		<artifactId>mockito-inline</artifactId>
		<version>4.0.0</version>
		<scope>test</scope>
		</dependency>
		<dependency>
		<groupId>com.h2database</groupId>
		<artifactId>h2</artifactId>
		@@ -431,6 +444,12 @@
		<groupId>org.apache.maven.plugins</groupId>
		<artifactId>maven-surefire-plugin</artifactId>
		<version>3.2.5</version>
		<configuration>
		<!-- Disable parallel execution -->
		<parallel>none</parallel>
		<runOrder>alphabetical</runOrder>
		<forkCount>1</forkCount>
		</configuration>
		</plugin>
		<plugin>
		<groupId>org.jacoco</groupId>
		@@ -452,11 +471,6 @@
		</executions>
		</plugin>

		<plugin>
		<groupId>org.apache.maven.plugins</groupId>
		<artifactId>maven-surefire-plugin</artifactId>
		<version>3.2.5</version>
		</plugin>
		<plugin>
		<groupId>org.jacoco</groupId>
		<artifactId>jacoco-maven-plugin</artifactId>

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

		}