Skip to content
Snippets Groups Projects
Commit 7904164c authored by trantzas's avatar trantzas
Browse files

Merging 2024Q2_RC into main, creating 2024Q2 Release

parents 6886f66e 316e504c
No related branches found
Tags 2024Q2
1 merge request!8Merging 2024Q2_RC into main, creating 2024Q2 Release
Pipeline #7303 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml 0 → 100644
+ 40
− 0
View file @ 7904164c
include:
- project: osl/code/org.etsi.osl.main
ref: main
file:
- ci-templates/default.yml
- ci-templates/build.yml
rules:
- if: '$CI_COMMIT_REF_NAME == "main"'
- project: osl/code/org.etsi.osl.main
ref: develop
file:
- ci-templates/default.yml
- ci-templates/build.yml
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" && !$CI_COMMIT_REF_PROTECTED'
maven_build:
extends: .maven_build
docker_build:
extends: .docker_build
needs:
- maven_build
Dockerfile.bugzilla → Dockerfile
+ 2
− 2
View file @ 7904164c
......@@ -2,5 +2,5 @@ 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.bugzilla-1.2.0-SNAPSHOT.jar /opt/openslice/lib/
CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.bugzilla-1.2.0-SNAPSHOT.jar"]
\ No newline at end of file
COPY target/org.etsi.osl.bugzilla-1.0.0.jar /opt/openslice/lib/
CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.bugzilla-1.0.0.jar"]
\ No newline at end of file
ci_settings.xml 0 → 100644
+ 16
− 0
View file @ 7904164c
<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
<servers>
<server>
<id>gitlab-maven</id>
<configuration>
<httpHeaders>
<property>
<name>Job-Token</name>
<value>${CI_JOB_TOKEN}</value>
</property>
</httpHeaders>
</configuration>
</server>
</servers>
</settings>
pom.xml
+ 22
− 7
View file @ 7904164c
......@@ -2,16 +2,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.main</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>1.0.0</version>
<relativePath>../org.etsi.osl.main</relativePath>
</parent>
<artifactId>org.etsi.osl.bugzilla</artifactId>
<artifactId>org.etsi.osl.bugzilla</artifactId>
<name>org.etsi.osl.bugzilla</name>
<url>http://maven.apache.org</url>
......@@ -22,6 +21,22 @@
<spring.cloud-consul-version>${spring-cloud-consul-version}</spring.cloud-consul-version>
</properties>
<repositories>
<repository>
<id>gitlab-maven</id>
<url>https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven</url>
</repository>
</repositories>
<distributionManagement>
<repository>
<id>gitlab-maven</id>
<url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
</repository>
<snapshotRepository>
<id>gitlab-maven</id>
<url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
</snapshotRepository>
</distributionManagement>
<dependencyManagement>
<dependencies>
......@@ -164,13 +179,13 @@
<!-- models -->
<dependency>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.model</artifactId>
<version>${project.version}</version>
<artifactId>org.etsi.osl.model.nfv</artifactId>
<version>${org.etsi.osl.model.nfv.version}</version>
</dependency>
<dependency>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.tmf.api</artifactId>
<version>${project.version}</version>
<artifactId>org.etsi.osl.model.tmf</artifactId>
<version>${org.etsi.osl.model.tmf.version}</version>
</dependency>
......
src/main/java/org/etsi/osl/bugzilla/BugzillaClient.java
+ 15
− 15
View file @ 7904164c
......@@ -45,21 +45,21 @@ import org.springframework.stereotype.Component;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.etsi.osl.model.CompositeExperimentOnBoardDescriptor;
import org.etsi.osl.model.CompositeVxFOnBoardDescriptor;
import org.etsi.osl.model.DeploymentDescriptor;
import org.etsi.osl.model.DeploymentDescriptorStatus;
import org.etsi.osl.model.DeploymentDescriptorVxFPlacement;
import org.etsi.osl.model.ExperimentMetadata;
import org.etsi.osl.model.ExperimentOnBoardDescriptor;
import org.etsi.osl.model.IMANOCommunicationStatus;
import org.etsi.osl.model.OnBoardingStatus;
import org.etsi.osl.model.PortalUser;
import org.etsi.osl.model.VFImage;
import org.etsi.osl.model.ValidationJob;
import org.etsi.osl.model.ValidationStatus;
import org.etsi.osl.model.VxFMetadata;
import org.etsi.osl.model.VxFOnBoardedDescriptor;
import org.etsi.osl.model.nfv.CompositeExperimentOnBoardDescriptor;
import org.etsi.osl.model.nfv.CompositeVxFOnBoardDescriptor;
import org.etsi.osl.model.nfv.DeploymentDescriptor;
import org.etsi.osl.model.nfv.DeploymentDescriptorStatus;
import org.etsi.osl.model.nfv.DeploymentDescriptorVxFPlacement;
import org.etsi.osl.model.nfv.ExperimentMetadata;
import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;
import org.etsi.osl.model.nfv.IMANOCommunicationStatus;
import org.etsi.osl.model.nfv.OnBoardingStatus;
import org.etsi.osl.model.nfv.PortalUser;
import org.etsi.osl.model.nfv.VFImage;
import org.etsi.osl.model.nfv.ValidationJob;
import org.etsi.osl.model.nfv.ValidationStatus;
import org.etsi.osl.model.nfv.VxFMetadata;
import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor;
import org.etsi.osl.tmf.common.model.Notification;
import org.etsi.osl.tmf.common.model.service.Characteristic;
import org.etsi.osl.tmf.common.model.service.Note;
......
src/main/java/org/etsi/osl/bugzilla/BugzillaRouteBuilder.java
+ 24
− 24
View file @ 7904164c
......@@ -211,7 +211,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
*/
from("activemq:topic:users.create").routeId( "users-create-route" )
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.PortalUser.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.PortalUser.class, true)
.bean( BugzillaClient.class, "transformUser2BugzillaUser")
.marshal().json( JsonLibrary.Jackson, true)
.convertBodyTo( String.class ).to("stream:out")
......@@ -322,7 +322,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Update Validation Route
*/
from("activemq:topic:vxf.validationresult.update")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.ValidationStatus.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.ValidationStatus.class, true)
.bean( BugzillaClient.class, "transformVxFValidation2BugBody")
.to("direct:bugzilla.bugmanage");
......@@ -331,12 +331,12 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Create VxF Validate New Route
*/
from("activemq:topic:vxf.onboard")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.VxFOnBoardedDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.VxFOnBoardedDescriptor.class, true)
.bean( BugzillaClient.class, "transformVxFAutomaticOnBoarding2BugBody")
.to("direct:bugzilla.newIssue");
from("activemq:topic:vxf.onBoardByCompositeObj")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.CompositeVxFOnBoardDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.CompositeVxFOnBoardDescriptor.class, true)
.bean( BugzillaClient.class, "transformVxFAutomaticOnBoarding2BugBodyCompObj")
.to("direct:bugzilla.newIssue");
......@@ -344,7 +344,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Create VxF OffBoard New Route
*/
from("activemq:topic:vxf.offboard")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.VxFOnBoardedDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.VxFOnBoardedDescriptor.class, true)
.bean( BugzillaClient.class, "transformVxFAutomaticOffBoarding2BugBody")
.to("direct:bugzilla.bugmanage");
......@@ -352,7 +352,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Automatic OnBoarding Route Success
*/
from("activemq:topic:vxf.onboard.success")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.VxFOnBoardedDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.VxFOnBoardedDescriptor.class, true)
.delay(30000)
.bean( BugzillaClient.class, "transformVxFAutomaticOnBoarding2BugBody")
.process( BugHeaderExtractProcessor )
......@@ -364,7 +364,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Automatic OnBoarding Route Fail
*/
from("activemq:topic:vxf.onboard.fail")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.VxFOnBoardedDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.VxFOnBoardedDescriptor.class, true)
.delay(30000)
.bean( BugzillaClient.class, "transformVxFAutomaticOnBoarding2BugBody")
.process( BugHeaderExtractProcessor )
......@@ -402,7 +402,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Create NSD onboard New Route
*/
from("activemq:topic:nsd.onboard")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.ExperimentOnBoardDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor.class, true)
.bean( BugzillaClient.class, "transformNSDAutomaticOnBoarding2BugBody")
.to("direct:bugzilla.newIssue");
......@@ -411,7 +411,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
*/
from("activemq:topic:nsd.onBoardByCompositeObj")
.log( "activemq:topic:nsd.onBoardByCompositeObj for ${body} !" )
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.CompositeExperimentOnBoardDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.CompositeExperimentOnBoardDescriptor.class, true)
.bean( BugzillaClient.class, "transformNSDAutomaticOnBoarding2BugBodyCompObj")
.to("direct:bugzilla.newIssue");
......@@ -419,7 +419,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Create NSD offboard New Route
*/
from("activemq:topic:nsd.offboard")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.ExperimentOnBoardDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor.class, true)
.bean( BugzillaClient.class, "transformNSDAutomaticOffBoarding2BugBody")
.to("direct:bugzilla.bugmanage");
......@@ -427,7 +427,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Automatic OnBoarding Route Success
*/
from("activemq:topic:nsd.onboard.success")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.ExperimentOnBoardDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor.class, true)
.delay(30000)
.bean( BugzillaClient.class, "transformNSDAutomaticOnBoarding2BugBody")
.process( BugHeaderExtractProcessor )
......@@ -438,7 +438,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Automatic OnBoarding Route Fail
*/
from("activemq:topic:nsd.onboard.fail")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.ExperimentOnBoardDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor.class, true)
.delay(30000)
.bean( BugzillaClient.class, "transformNSDAutomaticOnBoarding2BugBody")
.process( BugHeaderExtractProcessor )
......@@ -449,7 +449,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Automatic NS Instantiation Route Success
*/
from("activemq:topic:nsd.deployment.instantiation.success")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, true)
.delay(30000)
.bean( BugzillaClient.class, "transformNSInstantiation2BugBody")
.to("direct:bugzilla.bugmanage");
......@@ -458,13 +458,13 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Automatic NS Termination Route Success
*/
from("activemq:topic:nsd.deployment.termination.success")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, true)
.delay(30000)
.bean( BugzillaClient.class, "transformNSInstantiation2BugBody")
.to("direct:bugzilla.bugmanage");
from("activemq:topic:nsd.deployment.termination.fail")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, true)
.delay(30000)
.bean( BugzillaClient.class, "transformNSInstantiation2BugBody")
.to("direct:bugzilla.bugmanage");
......@@ -474,7 +474,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Create Deployment Route Issue
*/
from("activemq:topic:deployments.create")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, true)
.bean( BugzillaClient.class, "transformDeployment2BugBody")
.to("direct:bugzilla.newIssue");
......@@ -482,7 +482,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Update Deployment Route
*/
from("activemq:topic:deployments.update")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, true)
.bean( BugzillaClient.class, "transformDeployment2BugBody")
.process( BugHeaderExtractProcessor )
.to("direct:bugzilla.updateIssue");
......@@ -504,7 +504,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* NS Scheduling Route
*/
from("activemq:topic:nsd.schedule")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, true)
.delay(30000)
.bean( BugzillaClient.class, "transformNSInstantiation2BugBody")
.to("direct:bugzilla.bugmanage");
......@@ -513,7 +513,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Automatic NS Instantiation Route Fail
*/
from("activemq:topic:nsd.deployment.instantiation.fail")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, true)
.delay(30000)
.bean( BugzillaClient.class, "transformNSInstantiation2BugBody")
.to("direct:bugzilla.bugmanage");
......@@ -522,7 +522,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Automatic NS Termination Route Success
*/
from("activemq:topic:nsd.instance.termination.success")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, true)
.delay(30000)
.bean( BugzillaClient.class, "transformNSTermination2BugBody")
.to("direct:bugzilla.bugmanage");
......@@ -531,7 +531,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Automatic NS Termination Route Fail
*/
from("activemq:topic:nsd.instance.termination.fail")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, true)
.delay(30000)
.bean( BugzillaClient.class, "transformNSTermination2BugBody")
.to("direct:bugzilla.bugmanage");
......@@ -540,7 +540,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Automatic NS Deletion Route Success
*/
from("activemq:topic:nsd.instance.deletion.success")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, true)
.delay(30000)
.bean( BugzillaClient.class, "transformNSDeletion2BugBody")
.to("direct:bugzilla.bugmanage");
......@@ -549,7 +549,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Automatic NS Deletion Route Fail
*/
from("activemq:topic:nsd.instance.deletion.fail")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, true)
.delay(30000)
.bean( BugzillaClient.class, "transformNSDeletion2BugBody")
.to("direct:bugzilla.bugmanage");
......@@ -558,7 +558,7 @@ public class BugzillaRouteBuilder extends RouteBuilder {
* Reject Deployment Route Issue
*/
from("activemq:topic:nsd.deployment.reject")
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, true)
.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, true)
.delay(30000)
.bean( BugzillaClient.class, "transformDeployment2BugBody")
.to("direct:bugzilla.bugmanage");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment