Commit 187805a0 authored by Christos Tranoris's avatar Christos Tranoris
Browse files

refactoring

parent 45cb57de

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ 
		</dependency>

		<dependency>

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

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

			<artifactId>org.etsi.osl.model.nfv</artifactId>

			<version>${project.version}</version>

		</dependency>

		<dependency>

src/main/java/org/etsi/osl/mano/MANOClient.java

+8 −8
Original line number Diff line number Diff line
@@ -44,14 +44,14 @@ import com.fasterxml.jackson.databind.JsonMappingException; 
import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.datatype.hibernate5.jakarta.Hibernate5JakartaModule;



import org.etsi.osl.model.DeploymentDescriptor;

import org.etsi.osl.model.ExperimentMetadata;

import org.etsi.osl.model.ExperimentOnBoardDescriptor;

import org.etsi.osl.model.Infrastructure;

import org.etsi.osl.model.MANOprovider;

import org.etsi.osl.model.PortalUser;

import org.etsi.osl.model.VxFMetadata;

import org.etsi.osl.model.VxFOnBoardedDescriptor;

import org.etsi.osl.model.nfv.DeploymentDescriptor;

import org.etsi.osl.model.nfv.ExperimentMetadata;

import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;

import org.etsi.osl.model.nfv.Infrastructure;

import org.etsi.osl.model.nfv.MANOprovider;

import org.etsi.osl.model.nfv.PortalUser;

import org.etsi.osl.model.nfv.VxFMetadata;

import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor;

import org.etsi.osl.tmf.am642.model.AffectedService;

import org.etsi.osl.tmf.am642.model.AlarmCreate;

import org.etsi.osl.tmf.am642.model.AlarmStateType;

src/main/java/org/etsi/osl/mano/MANOController.java

+18 −18
Original line number Diff line number Diff line
@@ -48,24 +48,24 @@ import com.fasterxml.jackson.databind.JsonMappingException; 
import com.fasterxml.jackson.databind.ObjectMapper;

import com.jayway.jsonpath.JsonPath;



import org.etsi.osl.model.CompositeExperimentOnBoardDescriptor;

import org.etsi.osl.model.CompositeVxFOnBoardDescriptor;

import org.etsi.osl.model.ConstituentVxF;

import org.etsi.osl.model.DeploymentDescriptor;

import org.etsi.osl.model.DeploymentDescriptorStatus;

import org.etsi.osl.model.DeploymentDescriptorVxFInstanceInfo;

import org.etsi.osl.model.ExperimentMetadata;

import org.etsi.osl.model.ExperimentOnBoardDescriptor;

import org.etsi.osl.model.Infrastructure;

import org.etsi.osl.model.InfrastructureStatus;

import org.etsi.osl.model.MANOprovider;

import org.etsi.osl.model.OnBoardingStatus;

import org.etsi.osl.model.PackagingFormat;

import org.etsi.osl.model.ScaleDescriptor;

import org.etsi.osl.model.VFImage;

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.ConstituentVxF;

import org.etsi.osl.model.nfv.DeploymentDescriptor;

import org.etsi.osl.model.nfv.DeploymentDescriptorStatus;

import org.etsi.osl.model.nfv.DeploymentDescriptorVxFInstanceInfo;

import org.etsi.osl.model.nfv.ExperimentMetadata;

import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;

import org.etsi.osl.model.nfv.Infrastructure;

import org.etsi.osl.model.nfv.InfrastructureStatus;

import org.etsi.osl.model.nfv.MANOprovider;

import org.etsi.osl.model.nfv.OnBoardingStatus;

import org.etsi.osl.model.nfv.PackagingFormat;

import org.etsi.osl.model.nfv.ScaleDescriptor;

import org.etsi.osl.model.nfv.VFImage;

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.sol005nbi.OSMClient;

import org.etsi.osl.sol005nbi.ΑNSActionRequestPayload;

import jakarta.transaction.Transactional;

src/main/java/org/etsi/osl/mano/MANORouteBuilder.java

+10 −10
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ import org.springframework.beans.factory.annotation.Value; 
import org.springframework.context.annotation.Configuration;

import org.springframework.stereotype.Component;



import org.etsi.osl.model.ScaleDescriptor;

import org.etsi.osl.model.VxFOnBoardedDescriptor;

import org.etsi.osl.model.nfv.ScaleDescriptor;

import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor;



/**

 * @author ctranoris
@@ -154,25 +154,25 @@ public class MANORouteBuilder extends RouteBuilder{ 
										

		from("activemq:topic:vxf.onboard")

		.log( "activemq:topic:vxf.onboard for ${body} !" )

		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.VxFOnBoardedDescriptor.class, true)

		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.VxFOnBoardedDescriptor.class, true)

		.bean( aMANOController, "onBoardVxFToMANOProviderByOBD" )

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

		

		from("activemq:topic:vxf.onboardbyfile")

		.log( "activemq:topic:vxf.onboardbyfile for ${body} !" )

		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.VxFOnBoardedDescriptor.class, true)

		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.VxFOnBoardedDescriptor.class, true)

		.bean( aMANOController, "onBoardVxFToMANOProviderByFile" )

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



		from("activemq:topic:vxf.onBoardByCompositeObj")

		.log( "activemq:topic:vxf.onBoardByCompositeObj for ${body} !" )

		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.CompositeVxFOnBoardDescriptor.class, true)

		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.CompositeVxFOnBoardDescriptor.class, true)

		.bean( aMANOController, "onBoardVxFToMANOProviderByCompositeObj" )

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

		

		from("activemq:topic:vxf.offboard")

		.log( "activemq:topic:vxf.offboard for ${body} !" )

		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.VxFOnBoardedDescriptor.class, true)

		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.VxFOnBoardedDescriptor.class, true)

		.doTry()

			.bean( aMANOController, "offBoardVxFFromMANOProvider" ) //Replies with a ResponseInstance 

			.marshal().json( JsonLibrary.Jackson, true)
@@ -185,25 +185,25 @@ public class MANORouteBuilder extends RouteBuilder{ 


		from("activemq:topic:nsd.onboardbyfile")

		.log( "activemq:topic:nsd.onboardbyfile for ${body} !" )

		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.ExperimentOnBoardDescriptor.class, true)

		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor.class, true)

		.bean( aMANOController, "onBoardNSDToMANOProviderByFile" )

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



		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( aMANOController, "onBoardNSDToMANOProviderByCompositeObj" )

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

		

		from("activemq:topic:nsd.onboard")

		.log( "activemq:topic:nsd.onboard for ${body} !" )

		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.ExperimentOnBoardDescriptor.class, true)

		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor.class, true)

		.bean( aMANOController, "onBoardNSDToMANOProvider" )

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

		

		from("activemq:topic:nsd.offboard")

		.log( "activemq:topic:nsd.offboard for ${body} !" )

		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.ExperimentOnBoardDescriptor.class, true)

		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor.class, true)

		.doTry()

			.bean( aMANOController, "offBoardNSDFromMANOProvider" ) //Replies with a ResponseInstance 

			.marshal().json( JsonLibrary.Jackson, true)

src/main/java/org/etsi/osl/mano/NSCreateInstanceRequestPayload.java

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


package org.etsi.osl.mano;



import org.etsi.osl.model.DeploymentDescriptor;

import org.etsi.osl.model.nfv.DeploymentDescriptor;



/**

 * @author ctranoris