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

Merge branch 'develop' into 'main' 

MR for Release 2024Q4
parents 2cf4b319 3305304b

.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

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk 
MAINTAINER openslice.io

RUN mkdir /opt/shareclasses

RUN mkdir -p /opt/openslice/lib/

COPY target/org.etsi.osl.osom-1.0.0.jar /opt/openslice/lib/

COPY target/org.etsi.osl.osom-1.0.0-exec.jar /opt/openslice/lib/

COPY target/org.etsi.osl.osom-1.1.0.jar /opt/openslice/lib/

COPY target/org.etsi.osl.osom-1.1.0-exec.jar /opt/openslice/lib/

COPY . /opt/openslice/lib/

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.osom-1.0.0-exec.jar"]
 
 No newline at end of file
 
CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.osom-1.1.0-exec.jar"]
 
 No newline at end of file

pom.xml

+7 −2
Original line number Diff line number Diff line
@@ -5,16 +5,20 @@ 
	<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>





	<artifactId>org.etsi.osl.osom</artifactId>

	<name>org.etsi.osl.osom</name>

	<version>${org.etsi.osl.osom.version}</version>

	<url>http://maven.apache.org</url>





	<organization>

		<name>OpenSlice by ETSI</name>

		<url>https://osl.etsi.org</url>

	</organization>



	<properties>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -82,6 +86,7 @@ 
		<dependency>

			<groupId>com.h2database</groupId>

			<artifactId>h2</artifactId>

			<version>2.3.232</version>

		</dependency>

		<dependency>

			<groupId>org.etsi.osl</groupId>

src/main/java/org/etsi/osl/osom/management/AutomationCheck.java

+6 −2
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ public class AutomationCheck implements JavaDelegate { 
				execution.setVariable("brokeActivity", "RFS_OSM" ); 						

			}  else if ( spec.getType().equals("ResourceFacingServiceSpecification") &&  ( spec.findSpecCharacteristicByName( "_CR_SPEC" ) != null ) ) {

				execution.setVariable("brokeActivity", "RFS_CRSPEC" );

			}  else if ( spec.getType().equals("ResourceFacingServiceSpecification") &&  ( spec.findSpecCharacteristicByName( "_MT_QUERY" ) != null ) ) {

				 execution.setVariable("brokeActivity", "RFS_MTSPEC" );

			} else if ( spec.getType().equals("ResourceFacingServiceSpecification") ) {

              execution.setVariable("brokeActivity", "GRSPEC" );                      

          }		

		}

src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java

+2 −1
Original line number Diff line number Diff line
@@ -91,13 +91,14 @@ public class CROrchestrationCheckDeploymentService implements JavaDelegate { 
            Service serviceResult = serviceOrderManager.updateService( aService.getId(), supd, propagateToSO );

            return;

          }

         

          rlist.add(res);

          

        }

        @Valid

        ServiceStateType currentState = aService.getState();        

        

	    ServiceStateType nextState = aService.findNextStateBasedOnSupportingResources(rlist);

	    ServiceStateType nextState =  aService.findNextStateBasedOnResourceList(rlist);

	    

	    if (!currentState.equals(nextState)) {

	        supd.setState( nextState );