From 4e5ec8467424784b043ce4514987b1bb507721a5 Mon Sep 17 00:00:00 2001 From: Christos Tranoris Date: Sat, 25 Nov 2023 19:39:21 +0200 Subject: [PATCH] refactor packages --- pom.xml | 2 +- .../java/portal/api/PortalApplication.java | 2 +- .../java/portal/api/bus/BusController.java | 18 +-- .../portal/api/bus/BusControllerActiveMQ.java | 34 +++--- .../controller/ArtifactsAPIController.java | 44 +++---- .../controller/PortalRepositoryAPIImpl.java | 14 +-- .../PortalRepositoryVFImageAPI.java | 8 +- .../java/portal/api/mano/MANOController.java | 18 +-- .../java/portal/api/mano/MANOService.java | 2 +- .../mano/NSCreateInstanceRequestPayload.java | 2 +- .../NSInstantiateInstanceRequestPayload.java | 6 +- .../portal/api/repo/CategoriesRepository.java | 2 +- .../repo/DeploymentDescriptorRepository.java | 112 +++++++++--------- .../api/repo/InfrastructureRepository.java | 2 +- .../api/repo/ManoPlatformRepository.java | 2 +- .../api/repo/ManoProvidersRepository.java | 4 +- .../portal/api/repo/NSDOBDRepository.java | 2 +- .../java/portal/api/repo/NSDsRepository.java | 2 +- .../api/repo/PortalPropertiesRepository.java | 2 +- .../portal/api/repo/ProductRepository.java | 2 +- .../java/portal/api/repo/UsersRepository.java | 2 +- .../portal/api/repo/VFImageRepository.java | 2 +- .../portal/api/repo/VxFOBDRepository.java | 4 +- .../java/portal/api/repo/VxFsRepository.java | 2 +- .../portal/api/service/CategoryService.java | 2 +- .../service/DeploymentDescriptorService.java | 18 +-- .../api/service/InfrastructureService.java | 2 +- .../api/service/ManoPlatformService.java | 2 +- .../api/service/ManoProviderService.java | 2 +- .../portal/api/service/NSDOBDService.java | 2 +- .../java/portal/api/service/NSDService.java | 2 +- .../api/service/PortalPropertiesService.java | 2 +- .../portal/api/service/ProductService.java | 2 +- .../java/portal/api/service/UsersService.java | 4 +- .../portal/api/service/VFImageService.java | 2 +- .../portal/api/service/VxFOBDService.java | 6 +- .../java/portal/api/service/VxFService.java | 2 +- .../api/validation/ci/ValidationCIClient.java | 2 +- .../ci/ValidationCIRouteBuilder.java | 10 +- .../portal/api/InMemoryDBIntegrationTest.java | 10 +- 40 files changed, 180 insertions(+), 180 deletions(-) diff --git a/pom.xml b/pom.xml index 8cf7444..acde87e 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ org.etsi.osl - org.etsi.osl.model + org.etsi.osl.model.nfv ${project.version} diff --git a/src/main/java/portal/api/PortalApplication.java b/src/main/java/portal/api/PortalApplication.java index 687f81a..290d940 100644 --- a/src/main/java/portal/api/PortalApplication.java +++ b/src/main/java/portal/api/PortalApplication.java @@ -36,7 +36,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; */ @SpringBootApplication() @EnableWebMvc -@EntityScan( basePackages = {"org.etsi.osl.model", "org.etsi.osl.centrallog.client"}) +@EntityScan( basePackages = {"org.etsi.osl.model.nfv", "org.etsi.osl.centrallog.client"}) @ComponentScan(basePackages = { "portal.api", "portal.api.bus", diff --git a/src/main/java/portal/api/bus/BusController.java b/src/main/java/portal/api/bus/BusController.java index 2a091aa..9e01638 100644 --- a/src/main/java/portal/api/bus/BusController.java +++ b/src/main/java/portal/api/bus/BusController.java @@ -40,15 +40,15 @@ import org.springframework.http.ResponseEntity; import org.springframework.jms.core.JmsTemplate; import org.springframework.stereotype.Component; -import org.etsi.osl.model.CompositeExperimentOnBoardDescriptor; -import org.etsi.osl.model.CompositeVxFOnBoardDescriptor; -import org.etsi.osl.model.DeploymentDescriptor; -import org.etsi.osl.model.ExperimentMetadata; -import org.etsi.osl.model.ExperimentOnBoardDescriptor; -import org.etsi.osl.model.PortalUser; -import org.etsi.osl.model.VFImage; -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.ExperimentMetadata; +import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor; +import org.etsi.osl.model.nfv.PortalUser; +import org.etsi.osl.model.nfv.VFImage; +import org.etsi.osl.model.nfv.VxFMetadata; +import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor; import portal.api.mano.MANOStatus; import portal.api.validation.ci.ValidationJobResult; diff --git a/src/main/java/portal/api/bus/BusControllerActiveMQ.java b/src/main/java/portal/api/bus/BusControllerActiveMQ.java index c829bc5..b584699 100644 --- a/src/main/java/portal/api/bus/BusControllerActiveMQ.java +++ b/src/main/java/portal/api/bus/BusControllerActiveMQ.java @@ -30,12 +30,12 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; -import org.etsi.osl.model.CompositeExperimentOnBoardDescriptor; -import org.etsi.osl.model.CompositeVxFOnBoardDescriptor; -import org.etsi.osl.model.DeploymentDescriptor; -import org.etsi.osl.model.ExperimentOnBoardDescriptor; -import org.etsi.osl.model.PortalUser; -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.ExperimentOnBoardDescriptor; +import org.etsi.osl.model.nfv.PortalUser; +import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor; import portal.api.service.DeploymentDescriptorService; import portal.api.service.InfrastructureService; import portal.api.service.ManoProviderService; @@ -328,7 +328,7 @@ public class BusControllerActiveMQ extends RouteBuilder { from("activemq:queue:updateDeploymentDescriptor") .log( "activemq:queue:updateDeploymentDescriptor !" ) - .unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, true) + .unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, true) .bean( deploymentDescriptorService, "updateDeploymentEagerDataJson" ) .to("log:DEBUG?showBody=true&showHeaders=true"); @@ -351,49 +351,49 @@ public class BusControllerActiveMQ extends RouteBuilder { from("activemq:queue:updateVxFOnBoardedDescriptor") .log( "activemq:queue:updateVxFOnBoardedDescriptor 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( vxfObdService , "updateVxFOBDEagerDataJson" ) .to("log:DEBUG?showBody=true&showHeaders=true"); from("activemq:queue:addInfrastructure") .log( "activemq:queue:addInfrastructure for ${body} !" ) - .unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.Infrastructure.class, true) + .unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.Infrastructure.class, true) .bean( infraStructureService , "addInfrastructureEagerDataJson" ) .to("log:DEBUG?showBody=true&showHeaders=true"); from("activemq:queue:updateInfrastructure") .log( "activemq:queue:updateInfrastructure for ${body} !" ) - .unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.Infrastructure.class, true) + .unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.Infrastructure.class, true) .bean( infraStructureService , "updateInfrastructureEagerDataJson" ) .to("log:DEBUG?showBody=true&showHeaders=true"); from("activemq:queue:addVxFMetadata") .log( "activemq:queue:addVxFMetadata for ${body} !" ) - .unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.VxFMetadata.class, true) + .unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.VxFMetadata.class, true) .bean( vxfService , "addVxFMetadataEagerDataJson" ) .to("log:DEBUG?showBody=true&showHeaders=true"); from("activemq:queue:addExperimentMetadata") .log( "activemq:queue:addExperimentMetadata for ${body} !" ) - .unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.ExperimentMetadata.class, true) + .unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.ExperimentMetadata.class, true) .bean( nsdService , "addNSDMetadataEagerDataJson" ) .to("log:DEBUG?showBody=true&showHeaders=true"); from("activemq:queue:addVxFOnBoardedDescriptor") .log( "activemq:queue:addVxFOnBoardedDescriptor 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( vxfObdService , "addVxFOnBoardedDescriptorEagerDataJson" ) .to("log:DEBUG?showBody=true&showHeaders=true"); from("activemq:queue:addExperimentOnBoardedDescriptor") .log( "activemq:queue:addExperimentOnBoardedDescriptor 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( nsdObdService , "addExperimentOnBoardedDescriptorEagerDataJson" ) .to("log:DEBUG?showBody=true&showHeaders=true"); from("activemq:queue:updateExperimentOnBoardDescriptor") .log( "activemq:queue:updateExperimentOnBoardDescriptor 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( nsdObdService , "updateNSDOBDEagerDataJson" ) .to("log:DEBUG?showBody=true&showHeaders=true"); @@ -444,7 +444,7 @@ public class BusControllerActiveMQ extends RouteBuilder { from( NFV_CATALOG_DEPLOY_NSD_REQ ) .log(LoggingLevel.INFO, log, NFV_CATALOG_DEPLOY_NSD_REQ + " message received!") .to("log:DEBUG?showBody=true&showHeaders=true") - .unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, false) + .unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, false) .bean( deploymentDescriptorService, "createDeploymentRequestJson") .convertBodyTo( String.class ); @@ -459,7 +459,7 @@ public class BusControllerActiveMQ extends RouteBuilder { from( NFV_CATALOG_UPD_DEPLOYMENT_BY_ID ) .log(LoggingLevel.INFO, log, NFV_CATALOG_UPD_DEPLOYMENT_BY_ID + " message received!") .to("log:DEBUG?showBody=true&showHeaders=true") - .unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, false) + .unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, false) .bean( deploymentDescriptorService, "updateDeploymentEagerDataJson" ) .convertBodyTo( String.class ); diff --git a/src/main/java/portal/api/controller/ArtifactsAPIController.java b/src/main/java/portal/api/controller/ArtifactsAPIController.java index f80d41b..fd326da 100644 --- a/src/main/java/portal/api/controller/ArtifactsAPIController.java +++ b/src/main/java/portal/api/controller/ArtifactsAPIController.java @@ -77,28 +77,28 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.HttpStatusCodeException; import org.springframework.web.multipart.MultipartFile; -import org.etsi.osl.model.Category; -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.DeploymentDescriptorVxFPlacement; -import org.etsi.osl.model.ExperimentMetadata; -import org.etsi.osl.model.ExperimentOnBoardDescriptor; -import org.etsi.osl.model.Infrastructure; -import org.etsi.osl.model.MANOplatform; -import org.etsi.osl.model.MANOprovider; -import org.etsi.osl.model.OnBoardingStatus; -import org.etsi.osl.model.PortalProperty; -import org.etsi.osl.model.PortalUser; -import org.etsi.osl.model.Product; -import org.etsi.osl.model.UserRoleType; -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.Category; +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.DeploymentDescriptorVxFPlacement; +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.MANOplatform; +import org.etsi.osl.model.nfv.MANOprovider; +import org.etsi.osl.model.nfv.OnBoardingStatus; +import org.etsi.osl.model.nfv.PortalProperty; +import org.etsi.osl.model.nfv.PortalUser; +import org.etsi.osl.model.nfv.Product; +import org.etsi.osl.model.nfv.UserRoleType; +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 jakarta.annotation.PostConstruct; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; diff --git a/src/main/java/portal/api/controller/PortalRepositoryAPIImpl.java b/src/main/java/portal/api/controller/PortalRepositoryAPIImpl.java index f793443..2ce3721 100644 --- a/src/main/java/portal/api/controller/PortalRepositoryAPIImpl.java +++ b/src/main/java/portal/api/controller/PortalRepositoryAPIImpl.java @@ -55,13 +55,13 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import org.etsi.osl.model.Category; -import org.etsi.osl.model.ExperimentMetadata; -import org.etsi.osl.model.PortalUser; -import org.etsi.osl.model.Product; -import org.etsi.osl.model.UserRoleType; -import org.etsi.osl.model.UserSession; -import org.etsi.osl.model.VxFMetadata; +import org.etsi.osl.model.nfv.Category; +import org.etsi.osl.model.nfv.ExperimentMetadata; +import org.etsi.osl.model.nfv.PortalUser; +import org.etsi.osl.model.nfv.Product; +import org.etsi.osl.model.nfv.UserRoleType; +import org.etsi.osl.model.nfv.UserSession; +import org.etsi.osl.model.nfv.VxFMetadata; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import portal.api.bus.BusController; diff --git a/src/main/java/portal/api/controller/PortalRepositoryVFImageAPI.java b/src/main/java/portal/api/controller/PortalRepositoryVFImageAPI.java index f0063cb..a6a8ab7 100644 --- a/src/main/java/portal/api/controller/PortalRepositoryVFImageAPI.java +++ b/src/main/java/portal/api/controller/PortalRepositoryVFImageAPI.java @@ -56,10 +56,10 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import org.etsi.osl.model.PortalUser; -import org.etsi.osl.model.UserRoleType; -import org.etsi.osl.model.VFImage; -import org.etsi.osl.model.VxFMetadata; +import org.etsi.osl.model.nfv.PortalUser; +import org.etsi.osl.model.nfv.UserRoleType; +import org.etsi.osl.model.nfv.VFImage; +import org.etsi.osl.model.nfv.VxFMetadata; import jakarta.servlet.http.HttpServletRequest; import portal.api.bus.BusController; import portal.api.service.PortalPropertiesService; diff --git a/src/main/java/portal/api/mano/MANOController.java b/src/main/java/portal/api/mano/MANOController.java index 271c76a..78162ba 100644 --- a/src/main/java/portal/api/mano/MANOController.java +++ b/src/main/java/portal/api/mano/MANOController.java @@ -55,15 +55,15 @@ import portal.api.service.NSDService; import portal.api.service.PortalPropertiesService; import portal.api.service.VxFOBDService; import portal.api.service.VxFService; -import org.etsi.osl.model.DeploymentDescriptor; -import org.etsi.osl.model.DeploymentDescriptorStatus; -import org.etsi.osl.model.ExperimentMetadata; -import org.etsi.osl.model.ExperimentOnBoardDescriptor; -import org.etsi.osl.model.MANOprovider; -import org.etsi.osl.model.OnBoardDescriptor; -import org.etsi.osl.model.OnBoardingStatus; -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.DeploymentDescriptorStatus; +import org.etsi.osl.model.nfv.ExperimentMetadata; +import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor; +import org.etsi.osl.model.nfv.MANOprovider; +import org.etsi.osl.model.nfv.OnBoardDescriptor; +import org.etsi.osl.model.nfv.OnBoardingStatus; +import org.etsi.osl.model.nfv.VxFMetadata; +import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor; diff --git a/src/main/java/portal/api/mano/MANOService.java b/src/main/java/portal/api/mano/MANOService.java index 4afecbd..36f2725 100644 --- a/src/main/java/portal/api/mano/MANOService.java +++ b/src/main/java/portal/api/mano/MANOService.java @@ -26,7 +26,7 @@ import java.util.List; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; -import org.etsi.osl.model.MANOprovider; +import org.etsi.osl.model.nfv.MANOprovider; diff --git a/src/main/java/portal/api/mano/NSCreateInstanceRequestPayload.java b/src/main/java/portal/api/mano/NSCreateInstanceRequestPayload.java index 8909afe..c748dbe 100644 --- a/src/main/java/portal/api/mano/NSCreateInstanceRequestPayload.java +++ b/src/main/java/portal/api/mano/NSCreateInstanceRequestPayload.java @@ -21,7 +21,7 @@ package portal.api.mano; -import org.etsi.osl.model.DeploymentDescriptor; +import org.etsi.osl.model.nfv.DeploymentDescriptor; /** * @author ctranoris diff --git a/src/main/java/portal/api/mano/NSInstantiateInstanceRequestPayload.java b/src/main/java/portal/api/mano/NSInstantiateInstanceRequestPayload.java index 6c64cc6..3f40f98 100644 --- a/src/main/java/portal/api/mano/NSInstantiateInstanceRequestPayload.java +++ b/src/main/java/portal/api/mano/NSInstantiateInstanceRequestPayload.java @@ -29,9 +29,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import org.etsi.osl.model.DeploymentDescriptor; -import org.etsi.osl.model.DeploymentDescriptorVxFPlacement; -import org.etsi.osl.model.ExperimentOnBoardDescriptor; +import org.etsi.osl.model.nfv.DeploymentDescriptor; +import org.etsi.osl.model.nfv.DeploymentDescriptorVxFPlacement; +import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor; /** * @author ctranoris diff --git a/src/main/java/portal/api/repo/CategoriesRepository.java b/src/main/java/portal/api/repo/CategoriesRepository.java index da3ee6f..68a1d25 100644 --- a/src/main/java/portal/api/repo/CategoriesRepository.java +++ b/src/main/java/portal/api/repo/CategoriesRepository.java @@ -22,7 +22,7 @@ package portal.api.repo; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import org.etsi.osl.model.Category; +import org.etsi.osl.model.nfv.Category; /** diff --git a/src/main/java/portal/api/repo/DeploymentDescriptorRepository.java b/src/main/java/portal/api/repo/DeploymentDescriptorRepository.java index e9b0748..0d4b890 100644 --- a/src/main/java/portal/api/repo/DeploymentDescriptorRepository.java +++ b/src/main/java/portal/api/repo/DeploymentDescriptorRepository.java @@ -25,7 +25,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import org.etsi.osl.model.DeploymentDescriptor; +import org.etsi.osl.model.nfv.DeploymentDescriptor; /** @@ -37,70 +37,70 @@ public interface DeploymentDescriptorRepository extends CrudRepository getAllCompletedDeploymentDescriptors(); @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " - + "m.status=org.etsi.osl.model.DeploymentDescriptorStatus.REJECTED ORDER BY m.id" ) + + "m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.REJECTED ORDER BY m.id" ) List getAllRejectedDeploymentDescriptors(); @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " - + "( m.status=org.etsi.osl.model.DeploymentDescriptorStatus.FAILED ) " + + "( m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED ) " + " ORDER BY m.id") List getAllFailedDeploymentDescriptors(); @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " - + "( m.status=org.etsi.osl.model.DeploymentDescriptorStatus.FAILED " - + " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " - + " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.DELETION_FAILED " - + " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATION_FAILED ) " + + "( m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED " + + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " + + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.DELETION_FAILED " + + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATION_FAILED ) " + " ORDER BY m.id") List getAllRemovedDeploymentDescriptors(); @Query(value = "SELECT m FROM DeploymentDescriptor m " - + " WHERE m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.COMPLETED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.REJECTED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.FAILED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.DELETION_FAILED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATION_FAILED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " + + " WHERE m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.COMPLETED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.REJECTED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.DELETION_FAILED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATION_FAILED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " + " ORDER BY m.id") List readDeploymentDescriptors(); @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.owner.id=?1" - + " AND (m.status=org.etsi.osl.model.DeploymentDescriptorStatus.COMPLETED " - + " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATED ) " + + " AND (m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.COMPLETED " + + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATED ) " + " ORDER BY m.id" ) List getAllByUserCompleted(long id); @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.owner.id=?1" - + " AND m.status=org.etsi.osl.model.DeploymentDescriptorStatus.REJECTED ORDER BY m.id") + + " AND m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.REJECTED ORDER BY m.id") List getAllByUserRejected(long id); @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.owner.id=?1" - + " AND ( m.status=org.etsi.osl.model.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " - + " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.FAILED" - + " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.DELETION_FAILED " - + " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATION_FAILED ) " + + " AND ( m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " + + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED" + + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.DELETION_FAILED " + + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATION_FAILED ) " + " ORDER BY m.id") List getAllByUserFAILED_OSM_REMOVEDd(long id); @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.owner.id=?1" - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.COMPLETED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.REJECTED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.FAILED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.DELETION_FAILED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATION_FAILED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.COMPLETED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.REJECTED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.DELETION_FAILED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATION_FAILED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " + " ORDER BY m.id") List getAllByUserStatusUnknown(long id); @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.owner.id=?1" - + " AND m.status=org.etsi.osl.model.DeploymentDescriptorStatus.FAILED" + + " AND m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED" + " ORDER BY m.id") List getAllByUserFAILED(long id); @@ -108,65 +108,65 @@ public interface DeploymentDescriptorRepository extends CrudRepository getAllByMentorCompleted(long id); @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " + "( m.mentor.id=?1 OR m.owner.id=?1)" - + " AND m.status=org.etsi.osl.model.DeploymentDescriptorStatus.REJECTED ORDER BY m.id" ) + + " AND m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.REJECTED ORDER BY m.id" ) List getAllByMentorRejected(long id); @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " + "( m.mentor.id=?1 OR m.owner.id=?1)" - + " AND m.status=org.etsi.osl.model.DeploymentDescriptorStatus.FAILED" + + " AND m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED" + " ORDER BY m.id") List getAllByMentorFAILED(long id); @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " + "( m.mentor.id=?1 OR m.owner.id=?1)" - + " AND ( m.status=org.etsi.osl.model.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " - + " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.DELETION_FAILED " - + " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATION_FAILED ) " + + " AND ( m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " + + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.DELETION_FAILED " + + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATION_FAILED ) " + " ORDER BY m.id") List getAllByMentorFAILED_OSM_REMOVEDd(long id); @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " + "( m.mentor.id=?1 OR m.owner.id=?1)" - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.COMPLETED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.REJECTED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.FAILED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.DELETION_FAILED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATION_FAILED " - + " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.COMPLETED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.REJECTED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.DELETION_FAILED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATION_FAILED " + + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " + "ORDER BY m.id") List getAllByMentorStatusUnknown(long id); - @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status=org.etsi.osl.model.DeploymentDescriptorStatus.SCHEDULED ORDER BY m.id" ) + @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.SCHEDULED ORDER BY m.id" ) List getAllScheduled(); - @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status = org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATED " - + "OR m.status = org.etsi.osl.model.DeploymentDescriptorStatus.FAILED " - + "OR m.status = org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATION_FAILED") + @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATED " + + "OR m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED " + + "OR m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATION_FAILED") List readDeploymentsToBeDeleted(); @Query( value = "SELECT m FROM DeploymentDescriptor m") List readAllDeployments(); - @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status = org.etsi.osl.model.DeploymentDescriptorStatus.SCHEDULED") + @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.SCHEDULED") List readScheduledDeployments(); - @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status = org.etsi.osl.model.DeploymentDescriptorStatus.RUNNING " - + "OR m.status = org.etsi.osl.model.DeploymentDescriptorStatus.INSTANTIATING " - + "OR m.status = org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATING") + @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.RUNNING " + + "OR m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.INSTANTIATING " + + "OR m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATING") List readRunningInstantiatingDeployments(); - @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status = org.etsi.osl.model.DeploymentDescriptorStatus.RUNNING " - + "OR m.status = org.etsi.osl.model.DeploymentDescriptorStatus.INSTANTIATING " - + "OR m.status = org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATING") + @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.RUNNING " + + "OR m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.INSTANTIATING " + + "OR m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATING") List readRunningInstantiatingAndTerminatingDeployments(); @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.experiment.id = ?1") diff --git a/src/main/java/portal/api/repo/InfrastructureRepository.java b/src/main/java/portal/api/repo/InfrastructureRepository.java index d12b966..1b5867f 100644 --- a/src/main/java/portal/api/repo/InfrastructureRepository.java +++ b/src/main/java/portal/api/repo/InfrastructureRepository.java @@ -22,7 +22,7 @@ package portal.api.repo; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import org.etsi.osl.model.Infrastructure; +import org.etsi.osl.model.nfv.Infrastructure; /** diff --git a/src/main/java/portal/api/repo/ManoPlatformRepository.java b/src/main/java/portal/api/repo/ManoPlatformRepository.java index 51fb87f..7e8baec 100644 --- a/src/main/java/portal/api/repo/ManoPlatformRepository.java +++ b/src/main/java/portal/api/repo/ManoPlatformRepository.java @@ -22,7 +22,7 @@ package portal.api.repo; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import org.etsi.osl.model.MANOplatform; +import org.etsi.osl.model.nfv.MANOplatform; /** diff --git a/src/main/java/portal/api/repo/ManoProvidersRepository.java b/src/main/java/portal/api/repo/ManoProvidersRepository.java index 3182731..32b6c24 100644 --- a/src/main/java/portal/api/repo/ManoProvidersRepository.java +++ b/src/main/java/portal/api/repo/ManoProvidersRepository.java @@ -26,8 +26,8 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.stereotype.Repository; -import org.etsi.osl.model.Category; -import org.etsi.osl.model.MANOprovider; +import org.etsi.osl.model.nfv.Category; +import org.etsi.osl.model.nfv.MANOprovider; /** diff --git a/src/main/java/portal/api/repo/NSDOBDRepository.java b/src/main/java/portal/api/repo/NSDOBDRepository.java index d6756bb..71cf758 100644 --- a/src/main/java/portal/api/repo/NSDOBDRepository.java +++ b/src/main/java/portal/api/repo/NSDOBDRepository.java @@ -23,7 +23,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import org.etsi.osl.model.ExperimentOnBoardDescriptor; +import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor; /** * @author ctranoris diff --git a/src/main/java/portal/api/repo/NSDsRepository.java b/src/main/java/portal/api/repo/NSDsRepository.java index 188dee3..3eed716 100644 --- a/src/main/java/portal/api/repo/NSDsRepository.java +++ b/src/main/java/portal/api/repo/NSDsRepository.java @@ -26,7 +26,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import org.etsi.osl.model.ExperimentMetadata; +import org.etsi.osl.model.nfv.ExperimentMetadata; /** diff --git a/src/main/java/portal/api/repo/PortalPropertiesRepository.java b/src/main/java/portal/api/repo/PortalPropertiesRepository.java index ff90483..1e9f63f 100644 --- a/src/main/java/portal/api/repo/PortalPropertiesRepository.java +++ b/src/main/java/portal/api/repo/PortalPropertiesRepository.java @@ -24,7 +24,7 @@ import java.util.Optional; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import org.etsi.osl.model.PortalProperty; +import org.etsi.osl.model.nfv.PortalProperty; /** * @author ctranoris diff --git a/src/main/java/portal/api/repo/ProductRepository.java b/src/main/java/portal/api/repo/ProductRepository.java index ccb478e..c3f7ee5 100644 --- a/src/main/java/portal/api/repo/ProductRepository.java +++ b/src/main/java/portal/api/repo/ProductRepository.java @@ -25,7 +25,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import org.etsi.osl.model.Product; +import org.etsi.osl.model.nfv.Product; /** diff --git a/src/main/java/portal/api/repo/UsersRepository.java b/src/main/java/portal/api/repo/UsersRepository.java index c711c36..cef5998 100644 --- a/src/main/java/portal/api/repo/UsersRepository.java +++ b/src/main/java/portal/api/repo/UsersRepository.java @@ -26,7 +26,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import org.etsi.osl.model.PortalUser; +import org.etsi.osl.model.nfv.PortalUser; /** * diff --git a/src/main/java/portal/api/repo/VFImageRepository.java b/src/main/java/portal/api/repo/VFImageRepository.java index 8d8ee02..5a620ce 100644 --- a/src/main/java/portal/api/repo/VFImageRepository.java +++ b/src/main/java/portal/api/repo/VFImageRepository.java @@ -26,7 +26,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import org.etsi.osl.model.VFImage; +import org.etsi.osl.model.nfv.VFImage; /** diff --git a/src/main/java/portal/api/repo/VxFOBDRepository.java b/src/main/java/portal/api/repo/VxFOBDRepository.java index a545c20..070c492 100644 --- a/src/main/java/portal/api/repo/VxFOBDRepository.java +++ b/src/main/java/portal/api/repo/VxFOBDRepository.java @@ -25,8 +25,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import org.etsi.osl.model.MANOprovider; -import org.etsi.osl.model.VxFOnBoardedDescriptor; +import org.etsi.osl.model.nfv.MANOprovider; +import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor; /** * @author ctranoris diff --git a/src/main/java/portal/api/repo/VxFsRepository.java b/src/main/java/portal/api/repo/VxFsRepository.java index 0de98ac..9c17de1 100644 --- a/src/main/java/portal/api/repo/VxFsRepository.java +++ b/src/main/java/portal/api/repo/VxFsRepository.java @@ -26,7 +26,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import org.etsi.osl.model.VxFMetadata; +import org.etsi.osl.model.nfv.VxFMetadata; /** diff --git a/src/main/java/portal/api/service/CategoryService.java b/src/main/java/portal/api/service/CategoryService.java index 4495b5c..c02b415 100644 --- a/src/main/java/portal/api/service/CategoryService.java +++ b/src/main/java/portal/api/service/CategoryService.java @@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.etsi.osl.model.Category; +import org.etsi.osl.model.nfv.Category; import jakarta.annotation.PostConstruct; import portal.api.repo.CategoriesRepository; diff --git a/src/main/java/portal/api/service/DeploymentDescriptorService.java b/src/main/java/portal/api/service/DeploymentDescriptorService.java index 5b78a1e..7244d54 100644 --- a/src/main/java/portal/api/service/DeploymentDescriptorService.java +++ b/src/main/java/portal/api/service/DeploymentDescriptorService.java @@ -44,15 +44,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.etsi.osl.model.ConstituentVxF; -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.Infrastructure; -import org.etsi.osl.model.MANOprovider; -import org.etsi.osl.model.PortalUser; +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.DeploymentDescriptorVxFPlacement; +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 jakarta.persistence.EntityManagerFactory; //import portal.api.centrallog.CLevel; //import portal.api.centrallog.CentralLogger; diff --git a/src/main/java/portal/api/service/InfrastructureService.java b/src/main/java/portal/api/service/InfrastructureService.java index 8c5faf9..b6f88ba 100644 --- a/src/main/java/portal/api/service/InfrastructureService.java +++ b/src/main/java/portal/api/service/InfrastructureService.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.etsi.osl.model.Infrastructure; +import org.etsi.osl.model.nfv.Infrastructure; import portal.api.repo.InfrastructureRepository; diff --git a/src/main/java/portal/api/service/ManoPlatformService.java b/src/main/java/portal/api/service/ManoPlatformService.java index 0722dcb..860a4fe 100644 --- a/src/main/java/portal/api/service/ManoPlatformService.java +++ b/src/main/java/portal/api/service/ManoPlatformService.java @@ -25,7 +25,7 @@ import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.etsi.osl.model.MANOplatform; +import org.etsi.osl.model.nfv.MANOplatform; import portal.api.repo.ManoPlatformRepository; @Service diff --git a/src/main/java/portal/api/service/ManoProviderService.java b/src/main/java/portal/api/service/ManoProviderService.java index 5836144..0efbeac 100644 --- a/src/main/java/portal/api/service/ManoProviderService.java +++ b/src/main/java/portal/api/service/ManoProviderService.java @@ -31,7 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.etsi.osl.model.MANOprovider; +import org.etsi.osl.model.nfv.MANOprovider; import portal.api.repo.ManoProvidersRepository; @Service diff --git a/src/main/java/portal/api/service/NSDOBDService.java b/src/main/java/portal/api/service/NSDOBDService.java index 9d287d9..019c52a 100644 --- a/src/main/java/portal/api/service/NSDOBDService.java +++ b/src/main/java/portal/api/service/NSDOBDService.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.etsi.osl.model.ExperimentOnBoardDescriptor; +import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor; import portal.api.repo.NSDOBDRepository; @Service diff --git a/src/main/java/portal/api/service/NSDService.java b/src/main/java/portal/api/service/NSDService.java index 40e5991..a81aa33 100644 --- a/src/main/java/portal/api/service/NSDService.java +++ b/src/main/java/portal/api/service/NSDService.java @@ -29,7 +29,7 @@ import com.fasterxml.jackson.datatype.hibernate5.jakarta.Hibernate5JakartaModule import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.etsi.osl.model.ExperimentMetadata; +import org.etsi.osl.model.nfv.ExperimentMetadata; import portal.api.repo.NSDsRepository; @Service diff --git a/src/main/java/portal/api/service/PortalPropertiesService.java b/src/main/java/portal/api/service/PortalPropertiesService.java index 5254dc1..c366975 100644 --- a/src/main/java/portal/api/service/PortalPropertiesService.java +++ b/src/main/java/portal/api/service/PortalPropertiesService.java @@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.etsi.osl.model.PortalProperty; +import org.etsi.osl.model.nfv.PortalProperty; import jakarta.annotation.PostConstruct; import portal.api.repo.PortalPropertiesRepository; diff --git a/src/main/java/portal/api/service/ProductService.java b/src/main/java/portal/api/service/ProductService.java index 25b001d..709a53b 100644 --- a/src/main/java/portal/api/service/ProductService.java +++ b/src/main/java/portal/api/service/ProductService.java @@ -24,7 +24,7 @@ import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.etsi.osl.model.Product; +import org.etsi.osl.model.nfv.Product; import portal.api.repo.ProductRepository; @Service diff --git a/src/main/java/portal/api/service/UsersService.java b/src/main/java/portal/api/service/UsersService.java index 0d40df0..561f5ca 100644 --- a/src/main/java/portal/api/service/UsersService.java +++ b/src/main/java/portal/api/service/UsersService.java @@ -36,8 +36,8 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.etsi.osl.model.PortalUser; -import org.etsi.osl.model.UserRoleType; +import org.etsi.osl.model.nfv.PortalUser; +import org.etsi.osl.model.nfv.UserRoleType; import jakarta.annotation.PostConstruct; import portal.api.repo.UsersRepository; diff --git a/src/main/java/portal/api/service/VFImageService.java b/src/main/java/portal/api/service/VFImageService.java index c561f0a..66511df 100644 --- a/src/main/java/portal/api/service/VFImageService.java +++ b/src/main/java/portal/api/service/VFImageService.java @@ -25,7 +25,7 @@ import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.etsi.osl.model.VFImage; +import org.etsi.osl.model.nfv.VFImage; import portal.api.repo.VFImageRepository; @Service diff --git a/src/main/java/portal/api/service/VxFOBDService.java b/src/main/java/portal/api/service/VxFOBDService.java index 8c6e1b3..1fa997c 100644 --- a/src/main/java/portal/api/service/VxFOBDService.java +++ b/src/main/java/portal/api/service/VxFOBDService.java @@ -31,9 +31,9 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.etsi.osl.model.MANOprovider; -import org.etsi.osl.model.VxFMetadata; -import org.etsi.osl.model.VxFOnBoardedDescriptor; +import org.etsi.osl.model.nfv.MANOprovider; +import org.etsi.osl.model.nfv.VxFMetadata; +import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor; import portal.api.repo.VxFOBDRepository; @Service diff --git a/src/main/java/portal/api/service/VxFService.java b/src/main/java/portal/api/service/VxFService.java index d20c701..33f9122 100644 --- a/src/main/java/portal/api/service/VxFService.java +++ b/src/main/java/portal/api/service/VxFService.java @@ -29,7 +29,7 @@ import com.fasterxml.jackson.datatype.hibernate5.jakarta.Hibernate5JakartaModule import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.etsi.osl.model.VxFMetadata; +import org.etsi.osl.model.nfv.VxFMetadata; import portal.api.repo.VxFsRepository; @Service diff --git a/src/main/java/portal/api/validation/ci/ValidationCIClient.java b/src/main/java/portal/api/validation/ci/ValidationCIClient.java index 181d8f1..102ab78 100644 --- a/src/main/java/portal/api/validation/ci/ValidationCIClient.java +++ b/src/main/java/portal/api/validation/ci/ValidationCIClient.java @@ -23,7 +23,7 @@ package portal.api.validation.ci; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.etsi.osl.model.VxFMetadata; +import org.etsi.osl.model.nfv.VxFMetadata; /** * @author ctranoris diff --git a/src/main/java/portal/api/validation/ci/ValidationCIRouteBuilder.java b/src/main/java/portal/api/validation/ci/ValidationCIRouteBuilder.java index c98ed07..59bce52 100644 --- a/src/main/java/portal/api/validation/ci/ValidationCIRouteBuilder.java +++ b/src/main/java/portal/api/validation/ci/ValidationCIRouteBuilder.java @@ -33,11 +33,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; -import org.etsi.osl.model.ExperimentMetadata; -import org.etsi.osl.model.Product; -import org.etsi.osl.model.ValidationJob; -import org.etsi.osl.model.ValidationStatus; -import org.etsi.osl.model.VxFMetadata; +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; import portal.api.service.PortalPropertiesService; diff --git a/src/test/java/portal/api/InMemoryDBIntegrationTest.java b/src/test/java/portal/api/InMemoryDBIntegrationTest.java index bae002a..7140307 100644 --- a/src/test/java/portal/api/InMemoryDBIntegrationTest.java +++ b/src/test/java/portal/api/InMemoryDBIntegrationTest.java @@ -64,11 +64,11 @@ import org.springframework.transaction.annotation.Transactional; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; -import org.etsi.osl.model.DeploymentDescriptor; -import org.etsi.osl.model.ExperimentMetadata; -import org.etsi.osl.model.Infrastructure; -import org.etsi.osl.model.UserSession; -import org.etsi.osl.model.VxFMetadata; +import org.etsi.osl.model.nfv.DeploymentDescriptor; +import org.etsi.osl.model.nfv.ExperimentMetadata; +import org.etsi.osl.model.nfv.Infrastructure; +import org.etsi.osl.model.nfv.UserSession; +import org.etsi.osl.model.nfv.VxFMetadata; import portal.api.mano.MANOController; import portal.api.service.CategoryService; import portal.api.service.DeploymentDescriptorService; -- GitLab