Merge remote-tracking branch 'remotes/origin/2024Q2_RC' into develop (378a4e8c) · Commits · OSL / code / org.etsi.osl.tmf.api

.gitlab-ci.yml

+9 −1

Original line number	Diff line number	Diff line
		@@ -15,13 +15,21 @@ include:
		rules:
		- if: '$CI_COMMIT_REF_NAME == "develop"'

		- project: osl/code/org.etsi.osl.main
		ref: $CI_COMMIT_REF_NAME
		file:
		- ci-templates/default.yml
		- ci-templates/build.yml
		rules:
		- if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'

		- project: osl/code/org.etsi.osl.main
		ref: develop
		file:
		- ci-templates/default.yml
		- ci-templates/build_unprotected.yml
		rules:
		- if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
		- if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'

		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-SNAPSHOT-exec.jar /opt/openslice/lib/
		CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.tmf.api-1.0.0-SNAPSHOT-exec.jar"]
		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"]
		EXPOSE 13082
		No newline at end of file

pom.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		<parent>
		<groupId>org.etsi.osl</groupId>
		<artifactId>org.etsi.osl.main</artifactId>
		<version>1.0.0-SNAPSHOT</version>
		<version>1.0.0</version>
		<relativePath>../org.etsi.osl.main</relativePath>
		</parent>

src/main/java/org/etsi/osl/tmf/scm633/reposervices/ServiceSpecificationRepoService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1144,7 +1144,7 @@ public class ServiceSpecificationRepoService {
		return null;
		}

		logger.error("nsdid returned: " + nsd.getName());
		logger.debug("nsdid returned: " + nsd.getName());

		List<ServiceSpecification> newRfservices = new ArrayList<>();

src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiRouteBuilder.java

+40 −5

Original line number	Diff line number	Diff line
		@@ -20,12 +20,15 @@
		package org.etsi.osl.tmf.sim638.api;

		import java.io.IOException;

		import java.util.Date;
		import java.util.Map;
		import com.fasterxml.jackson.annotation.JsonInclude;
		import com.fasterxml.jackson.databind.ObjectMapper;

		import org.apache.camel.Exchange;
		import org.apache.camel.LoggingLevel;
		import org.apache.camel.Processor;
		import org.apache.camel.ProducerTemplate;
		import org.apache.camel.RuntimeCamelException;
		import org.apache.camel.builder.RouteBuilder;
		import org.apache.camel.model.dataformat.JsonLibrary;
		import org.apache.commons.logging.Log;
		@@ -44,6 +47,11 @@ import org.springframework.context.annotation.Configuration;
		import org.springframework.stereotype.Component;

		import org.etsi.osl.model.nfv.DeploymentDescriptor;
		import org.etsi.osl.model.nfv.ExperimentMetadata;
		import org.etsi.osl.model.nfv.Product;
		import org.etsi.osl.model.nfv.ValidationJob;
		import org.etsi.osl.model.nfv.ValidationStatus;
		import org.etsi.osl.model.nfv.VxFMetadata;

		@Configuration
		//@RefreshScope
		@@ -111,6 +119,9 @@ public class ServiceApiRouteBuilder extends RouteBuilder {
		@Override
		public void configure() throws Exception {




		from( CATALOG_ADD_SERVICE )
		.log(LoggingLevel.INFO, log, CATALOG_ADD_SERVICE + " message received and will be processed for service inventory!")
		.to("log:DEBUG?showBody=true&showHeaders=true")
		@@ -190,7 +201,6 @@ public class ServiceApiRouteBuilder extends RouteBuilder {




		from( EVENT_RESOURCE_STATE_CHANGED )
		.log(LoggingLevel.INFO, log, EVENT_RESOURCE_STATE_CHANGED + " message received and will be processed for service inventory!")
		.to("log:DEBUG?showBody=true&showHeaders=true")
		@@ -199,6 +209,13 @@ public class ServiceApiRouteBuilder extends RouteBuilder {


		from( EVENT_RESOURCE_CREATE )
		.errorHandler(deadLetterChannel("direct:retriesDeadLetters")
		.maximumRedeliveries(5)
		.redeliveryDelay(1000).useOriginalMessage()
		.logExhausted(true)
		.logHandled(true)
		.retriesExhaustedLogLevel(LoggingLevel.ERROR)
		.retryAttemptedLogLevel(LoggingLevel.ERROR))
		.log(LoggingLevel.INFO, log, EVENT_RESOURCE_CREATE + " message received and will be processed for service inventory!")
		.to("log:DEBUG?showBody=true&showHeaders=true")
		.unmarshal().json( JsonLibrary.Jackson, ResourceCreateNotification.class, true)
		@@ -208,12 +225,30 @@ public class ServiceApiRouteBuilder extends RouteBuilder {


		from( EVENT_RESOURCE_ATTRIBUTE_VALUE_CHANGED )
		.errorHandler(deadLetterChannel("direct:retriesDeadLetters")
		.maximumRedeliveries(5)
		.redeliveryDelay(1000).useOriginalMessage()
		.logExhausted(true)
		.logHandled(true)
		.retriesExhaustedLogLevel(LoggingLevel.ERROR)
		.retryAttemptedLogLevel(LoggingLevel.ERROR))

		.log(LoggingLevel.INFO, log, EVENT_RESOURCE_ATTRIBUTE_VALUE_CHANGED + " message received and will be processed for service inventory!")
		.to("log:DEBUG?showBody=true&showHeaders=true")
		.unmarshal().json( JsonLibrary.Jackson, ResourceAttributeValueChangeNotification.class, true)
		.bean( serviceRepoService, "resourceAttrChangedEvent(${body})");



		/**
		* dead Letter Queue msgs if everything fails to connect
		*/
		from("direct:retriesDeadLetters")
		//.setBody()
		//.body(String.class)
		//.process( ErroneousValidationProcessor )
		.to("log:DEBUG?showBody=true&showHeaders=true")
		.to("stream:out");
		}