Skip to content
Snippets Groups Projects
Commit 9f9b3f07 authored by trantzas's avatar trantzas
Browse files

Merge branch... 

Merge branch '2-refactor-all-org-etsi-osl-model-references-to-org-etsi-osl-model-nfv' into 'develop'

Resolve "refactor all org.etsi.osl.model references to org.etsi.osl.model.nfv"

See merge request !1
parents fd4e5397 4e5ec846
No related branches found
No related tags found
2 merge requests!8Merging 2024Q2_RC into main, creating 2024Q2 Release,!1Resolve "refactor all org.etsi.osl.model references to org.etsi.osl.model.nfv"
Hide whitespace changes
Inline Side-by-side
Showing
with 140 additions and 140 deletions
pom.xml
+ 1
− 1
View file @ 9f9b3f07
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.etsi.osl</groupId> <groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.model</artifactId> <artifactId>org.etsi.osl.model.nfv</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
......
src/main/java/portal/api/PortalApplication.java
+ 1
− 1
View file @ 9f9b3f07
...@@ -36,7 +36,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; ...@@ -36,7 +36,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
*/ */
@SpringBootApplication() @SpringBootApplication()
@EnableWebMvc @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 = { @ComponentScan(basePackages = {
"portal.api", "portal.api",
"portal.api.bus", "portal.api.bus",
......
src/main/java/portal/api/bus/BusController.java
+ 9
− 9
View file @ 9f9b3f07
...@@ -40,15 +40,15 @@ import org.springframework.http.ResponseEntity; ...@@ -40,15 +40,15 @@ import org.springframework.http.ResponseEntity;
import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.core.JmsTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.etsi.osl.model.CompositeExperimentOnBoardDescriptor; import org.etsi.osl.model.nfv.CompositeExperimentOnBoardDescriptor;
import org.etsi.osl.model.CompositeVxFOnBoardDescriptor; import org.etsi.osl.model.nfv.CompositeVxFOnBoardDescriptor;
import org.etsi.osl.model.DeploymentDescriptor; import org.etsi.osl.model.nfv.DeploymentDescriptor;
import org.etsi.osl.model.ExperimentMetadata; import org.etsi.osl.model.nfv.ExperimentMetadata;
import org.etsi.osl.model.ExperimentOnBoardDescriptor; import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;
import org.etsi.osl.model.PortalUser; import org.etsi.osl.model.nfv.PortalUser;
import org.etsi.osl.model.VFImage; import org.etsi.osl.model.nfv.VFImage;
import org.etsi.osl.model.VxFMetadata; import org.etsi.osl.model.nfv.VxFMetadata;
import org.etsi.osl.model.VxFOnBoardedDescriptor; import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor;
import portal.api.mano.MANOStatus; import portal.api.mano.MANOStatus;
import portal.api.validation.ci.ValidationJobResult; import portal.api.validation.ci.ValidationJobResult;
......
src/main/java/portal/api/bus/BusControllerActiveMQ.java
+ 17
− 17
View file @ 9f9b3f07
...@@ -30,12 +30,12 @@ import org.springframework.beans.factory.annotation.Value; ...@@ -30,12 +30,12 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.etsi.osl.model.CompositeExperimentOnBoardDescriptor; import org.etsi.osl.model.nfv.CompositeExperimentOnBoardDescriptor;
import org.etsi.osl.model.CompositeVxFOnBoardDescriptor; import org.etsi.osl.model.nfv.CompositeVxFOnBoardDescriptor;
import org.etsi.osl.model.DeploymentDescriptor; import org.etsi.osl.model.nfv.DeploymentDescriptor;
import org.etsi.osl.model.ExperimentOnBoardDescriptor; import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;
import org.etsi.osl.model.PortalUser; import org.etsi.osl.model.nfv.PortalUser;
import org.etsi.osl.model.VxFOnBoardedDescriptor; import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor;
import portal.api.service.DeploymentDescriptorService; import portal.api.service.DeploymentDescriptorService;
import portal.api.service.InfrastructureService; import portal.api.service.InfrastructureService;
import portal.api.service.ManoProviderService; import portal.api.service.ManoProviderService;
...@@ -328,7 +328,7 @@ public class BusControllerActiveMQ extends RouteBuilder { ...@@ -328,7 +328,7 @@ public class BusControllerActiveMQ extends RouteBuilder {
from("activemq:queue:updateDeploymentDescriptor") from("activemq:queue:updateDeploymentDescriptor")
.log( "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" ) .bean( deploymentDescriptorService, "updateDeploymentEagerDataJson" )
.to("log:DEBUG?showBody=true&showHeaders=true"); .to("log:DEBUG?showBody=true&showHeaders=true");
...@@ -351,49 +351,49 @@ public class BusControllerActiveMQ extends RouteBuilder { ...@@ -351,49 +351,49 @@ public class BusControllerActiveMQ extends RouteBuilder {
from("activemq:queue:updateVxFOnBoardedDescriptor") from("activemq:queue:updateVxFOnBoardedDescriptor")
.log( "activemq:queue:updateVxFOnBoardedDescriptor for ${body} !" ) .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" ) .bean( vxfObdService , "updateVxFOBDEagerDataJson" )
.to("log:DEBUG?showBody=true&showHeaders=true"); .to("log:DEBUG?showBody=true&showHeaders=true");
from("activemq:queue:addInfrastructure") from("activemq:queue:addInfrastructure")
.log( "activemq:queue:addInfrastructure for ${body} !" ) .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" ) .bean( infraStructureService , "addInfrastructureEagerDataJson" )
.to("log:DEBUG?showBody=true&showHeaders=true"); .to("log:DEBUG?showBody=true&showHeaders=true");
from("activemq:queue:updateInfrastructure") from("activemq:queue:updateInfrastructure")
.log( "activemq:queue:updateInfrastructure for ${body} !" ) .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" ) .bean( infraStructureService , "updateInfrastructureEagerDataJson" )
.to("log:DEBUG?showBody=true&showHeaders=true"); .to("log:DEBUG?showBody=true&showHeaders=true");
from("activemq:queue:addVxFMetadata") from("activemq:queue:addVxFMetadata")
.log( "activemq:queue:addVxFMetadata for ${body} !" ) .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" ) .bean( vxfService , "addVxFMetadataEagerDataJson" )
.to("log:DEBUG?showBody=true&showHeaders=true"); .to("log:DEBUG?showBody=true&showHeaders=true");
from("activemq:queue:addExperimentMetadata") from("activemq:queue:addExperimentMetadata")
.log( "activemq:queue:addExperimentMetadata for ${body} !" ) .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" ) .bean( nsdService , "addNSDMetadataEagerDataJson" )
.to("log:DEBUG?showBody=true&showHeaders=true"); .to("log:DEBUG?showBody=true&showHeaders=true");
from("activemq:queue:addVxFOnBoardedDescriptor") from("activemq:queue:addVxFOnBoardedDescriptor")
.log( "activemq:queue:addVxFOnBoardedDescriptor for ${body} !" ) .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" ) .bean( vxfObdService , "addVxFOnBoardedDescriptorEagerDataJson" )
.to("log:DEBUG?showBody=true&showHeaders=true"); .to("log:DEBUG?showBody=true&showHeaders=true");
from("activemq:queue:addExperimentOnBoardedDescriptor") from("activemq:queue:addExperimentOnBoardedDescriptor")
.log( "activemq:queue:addExperimentOnBoardedDescriptor for ${body} !" ) .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" ) .bean( nsdObdService , "addExperimentOnBoardedDescriptorEagerDataJson" )
.to("log:DEBUG?showBody=true&showHeaders=true"); .to("log:DEBUG?showBody=true&showHeaders=true");
from("activemq:queue:updateExperimentOnBoardDescriptor") from("activemq:queue:updateExperimentOnBoardDescriptor")
.log( "activemq:queue:updateExperimentOnBoardDescriptor for ${body} !" ) .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" ) .bean( nsdObdService , "updateNSDOBDEagerDataJson" )
.to("log:DEBUG?showBody=true&showHeaders=true"); .to("log:DEBUG?showBody=true&showHeaders=true");
...@@ -444,7 +444,7 @@ public class BusControllerActiveMQ extends RouteBuilder { ...@@ -444,7 +444,7 @@ public class BusControllerActiveMQ extends RouteBuilder {
from( NFV_CATALOG_DEPLOY_NSD_REQ ) from( NFV_CATALOG_DEPLOY_NSD_REQ )
.log(LoggingLevel.INFO, log, NFV_CATALOG_DEPLOY_NSD_REQ + " message received!") .log(LoggingLevel.INFO, log, NFV_CATALOG_DEPLOY_NSD_REQ + " message received!")
.to("log:DEBUG?showBody=true&showHeaders=true") .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") .bean( deploymentDescriptorService, "createDeploymentRequestJson")
.convertBodyTo( String.class ); .convertBodyTo( String.class );
...@@ -459,7 +459,7 @@ public class BusControllerActiveMQ extends RouteBuilder { ...@@ -459,7 +459,7 @@ public class BusControllerActiveMQ extends RouteBuilder {
from( NFV_CATALOG_UPD_DEPLOYMENT_BY_ID ) from( NFV_CATALOG_UPD_DEPLOYMENT_BY_ID )
.log(LoggingLevel.INFO, log, NFV_CATALOG_UPD_DEPLOYMENT_BY_ID + " message received!") .log(LoggingLevel.INFO, log, NFV_CATALOG_UPD_DEPLOYMENT_BY_ID + " message received!")
.to("log:DEBUG?showBody=true&showHeaders=true") .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" ) .bean( deploymentDescriptorService, "updateDeploymentEagerDataJson" )
.convertBodyTo( String.class ); .convertBodyTo( String.class );
......
src/main/java/portal/api/controller/ArtifactsAPIController.java
+ 22
− 22
View file @ 9f9b3f07
...@@ -77,28 +77,28 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -77,28 +77,28 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpStatusCodeException; import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.etsi.osl.model.Category; import org.etsi.osl.model.nfv.Category;
import org.etsi.osl.model.CompositeExperimentOnBoardDescriptor; import org.etsi.osl.model.nfv.CompositeExperimentOnBoardDescriptor;
import org.etsi.osl.model.CompositeVxFOnBoardDescriptor; import org.etsi.osl.model.nfv.CompositeVxFOnBoardDescriptor;
import org.etsi.osl.model.ConstituentVxF; import org.etsi.osl.model.nfv.ConstituentVxF;
import org.etsi.osl.model.DeploymentDescriptor; import org.etsi.osl.model.nfv.DeploymentDescriptor;
import org.etsi.osl.model.DeploymentDescriptorStatus; import org.etsi.osl.model.nfv.DeploymentDescriptorStatus;
import org.etsi.osl.model.DeploymentDescriptorVxFPlacement; import org.etsi.osl.model.nfv.DeploymentDescriptorVxFPlacement;
import org.etsi.osl.model.ExperimentMetadata; import org.etsi.osl.model.nfv.ExperimentMetadata;
import org.etsi.osl.model.ExperimentOnBoardDescriptor; import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;
import org.etsi.osl.model.Infrastructure; import org.etsi.osl.model.nfv.Infrastructure;
import org.etsi.osl.model.MANOplatform; import org.etsi.osl.model.nfv.MANOplatform;
import org.etsi.osl.model.MANOprovider; import org.etsi.osl.model.nfv.MANOprovider;
import org.etsi.osl.model.OnBoardingStatus; import org.etsi.osl.model.nfv.OnBoardingStatus;
import org.etsi.osl.model.PortalProperty; import org.etsi.osl.model.nfv.PortalProperty;
import org.etsi.osl.model.PortalUser; import org.etsi.osl.model.nfv.PortalUser;
import org.etsi.osl.model.Product; import org.etsi.osl.model.nfv.Product;
import org.etsi.osl.model.UserRoleType; import org.etsi.osl.model.nfv.UserRoleType;
import org.etsi.osl.model.VFImage; import org.etsi.osl.model.nfv.VFImage;
import org.etsi.osl.model.ValidationJob; import org.etsi.osl.model.nfv.ValidationJob;
import org.etsi.osl.model.ValidationStatus; import org.etsi.osl.model.nfv.ValidationStatus;
import org.etsi.osl.model.VxFMetadata; import org.etsi.osl.model.nfv.VxFMetadata;
import org.etsi.osl.model.VxFOnBoardedDescriptor; import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor;
import jakarta.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid; import jakarta.validation.Valid;
......
src/main/java/portal/api/controller/PortalRepositoryAPIImpl.java
+ 7
− 7
View file @ 9f9b3f07
...@@ -55,13 +55,13 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -55,13 +55,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.etsi.osl.model.Category; import org.etsi.osl.model.nfv.Category;
import org.etsi.osl.model.ExperimentMetadata; import org.etsi.osl.model.nfv.ExperimentMetadata;
import org.etsi.osl.model.PortalUser; import org.etsi.osl.model.nfv.PortalUser;
import org.etsi.osl.model.Product; import org.etsi.osl.model.nfv.Product;
import org.etsi.osl.model.UserRoleType; import org.etsi.osl.model.nfv.UserRoleType;
import org.etsi.osl.model.UserSession; import org.etsi.osl.model.nfv.UserSession;
import org.etsi.osl.model.VxFMetadata; import org.etsi.osl.model.nfv.VxFMetadata;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import portal.api.bus.BusController; import portal.api.bus.BusController;
......
src/main/java/portal/api/controller/PortalRepositoryVFImageAPI.java
+ 4
− 4
View file @ 9f9b3f07
...@@ -56,10 +56,10 @@ import org.springframework.web.bind.annotation.ResponseBody; ...@@ -56,10 +56,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.etsi.osl.model.PortalUser; import org.etsi.osl.model.nfv.PortalUser;
import org.etsi.osl.model.UserRoleType; import org.etsi.osl.model.nfv.UserRoleType;
import org.etsi.osl.model.VFImage; import org.etsi.osl.model.nfv.VFImage;
import org.etsi.osl.model.VxFMetadata; import org.etsi.osl.model.nfv.VxFMetadata;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import portal.api.bus.BusController; import portal.api.bus.BusController;
import portal.api.service.PortalPropertiesService; import portal.api.service.PortalPropertiesService;
......
src/main/java/portal/api/mano/MANOController.java
+ 9
− 9
View file @ 9f9b3f07
...@@ -55,15 +55,15 @@ import portal.api.service.NSDService; ...@@ -55,15 +55,15 @@ import portal.api.service.NSDService;
import portal.api.service.PortalPropertiesService; import portal.api.service.PortalPropertiesService;
import portal.api.service.VxFOBDService; import portal.api.service.VxFOBDService;
import portal.api.service.VxFService; import portal.api.service.VxFService;
import org.etsi.osl.model.DeploymentDescriptor; import org.etsi.osl.model.nfv.DeploymentDescriptor;
import org.etsi.osl.model.DeploymentDescriptorStatus; import org.etsi.osl.model.nfv.DeploymentDescriptorStatus;
import org.etsi.osl.model.ExperimentMetadata; import org.etsi.osl.model.nfv.ExperimentMetadata;
import org.etsi.osl.model.ExperimentOnBoardDescriptor; import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;
import org.etsi.osl.model.MANOprovider; import org.etsi.osl.model.nfv.MANOprovider;
import org.etsi.osl.model.OnBoardDescriptor; import org.etsi.osl.model.nfv.OnBoardDescriptor;
import org.etsi.osl.model.OnBoardingStatus; import org.etsi.osl.model.nfv.OnBoardingStatus;
import org.etsi.osl.model.VxFMetadata; import org.etsi.osl.model.nfv.VxFMetadata;
import org.etsi.osl.model.VxFOnBoardedDescriptor; import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor;
......
src/main/java/portal/api/mano/MANOService.java
+ 1
− 1
View file @ 9f9b3f07
...@@ -26,7 +26,7 @@ import java.util.List; ...@@ -26,7 +26,7 @@ import java.util.List;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.TypedQuery; import javax.persistence.TypedQuery;
import org.etsi.osl.model.MANOprovider; import org.etsi.osl.model.nfv.MANOprovider;
......
src/main/java/portal/api/mano/NSCreateInstanceRequestPayload.java
+ 1
− 1
View file @ 9f9b3f07
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
package portal.api.mano; package portal.api.mano;
import org.etsi.osl.model.DeploymentDescriptor; import org.etsi.osl.model.nfv.DeploymentDescriptor;
/** /**
* @author ctranoris * @author ctranoris
......
src/main/java/portal/api/mano/NSInstantiateInstanceRequestPayload.java
+ 3
− 3
View file @ 9f9b3f07
...@@ -29,9 +29,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; ...@@ -29,9 +29,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.etsi.osl.model.DeploymentDescriptor; import org.etsi.osl.model.nfv.DeploymentDescriptor;
import org.etsi.osl.model.DeploymentDescriptorVxFPlacement; import org.etsi.osl.model.nfv.DeploymentDescriptorVxFPlacement;
import org.etsi.osl.model.ExperimentOnBoardDescriptor; import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;
/** /**
* @author ctranoris * @author ctranoris
......
src/main/java/portal/api/repo/CategoriesRepository.java
+ 1
− 1
View file @ 9f9b3f07
...@@ -22,7 +22,7 @@ package portal.api.repo; ...@@ -22,7 +22,7 @@ package portal.api.repo;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.etsi.osl.model.Category; import org.etsi.osl.model.nfv.Category;
/** /**
......
src/main/java/portal/api/repo/DeploymentDescriptorRepository.java
+ 56
− 56
View file @ 9f9b3f07
...@@ -25,7 +25,7 @@ import org.springframework.data.jpa.repository.Query; ...@@ -25,7 +25,7 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository; 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<Deploymen ...@@ -37,70 +37,70 @@ public interface DeploymentDescriptorRepository extends CrudRepository<Deploymen
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE "
+ "( m.status=org.etsi.osl.model.DeploymentDescriptorStatus.COMPLETED " + "( m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.COMPLETED "
+ " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATED )" + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATED )"
+ "ORDER BY m.id" ) + "ORDER BY m.id" )
List<DeploymentDescriptor> getAllCompletedDeploymentDescriptors(); List<DeploymentDescriptor> getAllCompletedDeploymentDescriptors();
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " @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<DeploymentDescriptor> getAllRejectedDeploymentDescriptors(); List<DeploymentDescriptor> getAllRejectedDeploymentDescriptors();
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " @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") + " ORDER BY m.id")
List<DeploymentDescriptor> getAllFailedDeploymentDescriptors(); List<DeploymentDescriptor> getAllFailedDeploymentDescriptors();
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " @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 "
+ " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED_OSM_REMOVED "
+ " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.DELETION_FAILED " + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.DELETION_FAILED "
+ " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATION_FAILED ) " + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATION_FAILED ) "
+ " ORDER BY m.id") + " ORDER BY m.id")
List<DeploymentDescriptor> getAllRemovedDeploymentDescriptors(); List<DeploymentDescriptor> getAllRemovedDeploymentDescriptors();
@Query(value = "SELECT m FROM DeploymentDescriptor m " @Query(value = "SELECT m FROM DeploymentDescriptor m "
+ " WHERE m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.COMPLETED " + " WHERE m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.COMPLETED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.REJECTED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.REJECTED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.FAILED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.DELETION_FAILED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.DELETION_FAILED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATION_FAILED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATION_FAILED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED_OSM_REMOVED "
+ " ORDER BY m.id") + " ORDER BY m.id")
List<DeploymentDescriptor> readDeploymentDescriptors(); List<DeploymentDescriptor> readDeploymentDescriptors();
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.owner.id=?1" @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.nfv.DeploymentDescriptorStatus.COMPLETED "
+ " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATED ) " + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATED ) "
+ " ORDER BY m.id" ) + " ORDER BY m.id" )
List<DeploymentDescriptor> getAllByUserCompleted(long id); List<DeploymentDescriptor> getAllByUserCompleted(long id);
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.owner.id=?1" @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<DeploymentDescriptor> getAllByUserRejected(long id); List<DeploymentDescriptor> getAllByUserRejected(long id);
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.owner.id=?1" @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.owner.id=?1"
+ " AND ( m.status=org.etsi.osl.model.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " + " AND ( m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED_OSM_REMOVED "
+ " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.FAILED" + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED"
+ " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.DELETION_FAILED " + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.DELETION_FAILED "
+ " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATION_FAILED ) " + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATION_FAILED ) "
+ " ORDER BY m.id") + " ORDER BY m.id")
List<DeploymentDescriptor> getAllByUserFAILED_OSM_REMOVEDd(long id); List<DeploymentDescriptor> getAllByUserFAILED_OSM_REMOVEDd(long id);
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.owner.id=?1" @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.nfv.DeploymentDescriptorStatus.COMPLETED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.REJECTED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.REJECTED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.FAILED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.DELETION_FAILED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.DELETION_FAILED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATION_FAILED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATION_FAILED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED_OSM_REMOVED "
+ " ORDER BY m.id") + " ORDER BY m.id")
List<DeploymentDescriptor> getAllByUserStatusUnknown(long id); List<DeploymentDescriptor> getAllByUserStatusUnknown(long id);
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.owner.id=?1" @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") + " ORDER BY m.id")
List<DeploymentDescriptor> getAllByUserFAILED(long id); List<DeploymentDescriptor> getAllByUserFAILED(long id);
...@@ -108,65 +108,65 @@ public interface DeploymentDescriptorRepository extends CrudRepository<Deploymen ...@@ -108,65 +108,65 @@ public interface DeploymentDescriptorRepository extends CrudRepository<Deploymen
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE "
+ "( m.mentor.id=?1 OR m.owner.id=?1)" + "( 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.nfv.DeploymentDescriptorStatus.COMPLETED "
+ " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATED ) " + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATED ) "
+ " ORDER BY m.id") + " ORDER BY m.id")
List<DeploymentDescriptor> getAllByMentorCompleted(long id); List<DeploymentDescriptor> getAllByMentorCompleted(long id);
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE "
+ "( m.mentor.id=?1 OR m.owner.id=?1)" + "( 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<DeploymentDescriptor> getAllByMentorRejected(long id); List<DeploymentDescriptor> getAllByMentorRejected(long id);
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE "
+ "( m.mentor.id=?1 OR m.owner.id=?1)" + "( 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") + " ORDER BY m.id")
List<DeploymentDescriptor> getAllByMentorFAILED(long id); List<DeploymentDescriptor> getAllByMentorFAILED(long id);
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE "
+ "( m.mentor.id=?1 OR m.owner.id=?1)" + "( m.mentor.id=?1 OR m.owner.id=?1)"
+ " AND ( m.status=org.etsi.osl.model.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " + " AND ( m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED_OSM_REMOVED "
+ " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.DELETION_FAILED " + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.DELETION_FAILED "
+ " OR m.status=org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATION_FAILED ) " + " OR m.status=org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATION_FAILED ) "
+ " ORDER BY m.id") + " ORDER BY m.id")
List<DeploymentDescriptor> getAllByMentorFAILED_OSM_REMOVEDd(long id); List<DeploymentDescriptor> getAllByMentorFAILED_OSM_REMOVEDd(long id);
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE " @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE "
+ "( m.mentor.id=?1 OR m.owner.id=?1)" + "( 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.nfv.DeploymentDescriptorStatus.COMPLETED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.REJECTED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.REJECTED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.FAILED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.DELETION_FAILED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.DELETION_FAILED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATION_FAILED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATION_FAILED "
+ " AND m.status<>org.etsi.osl.model.DeploymentDescriptorStatus.FAILED_OSM_REMOVED " + " AND m.status<>org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED_OSM_REMOVED "
+ "ORDER BY m.id") + "ORDER BY m.id")
List<DeploymentDescriptor> getAllByMentorStatusUnknown(long id); List<DeploymentDescriptor> 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<DeploymentDescriptor> getAllScheduled(); List<DeploymentDescriptor> getAllScheduled();
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status = org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATED " @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATED "
+ "OR m.status = org.etsi.osl.model.DeploymentDescriptorStatus.FAILED " + "OR m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.FAILED "
+ "OR m.status = org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATION_FAILED") + "OR m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATION_FAILED")
List<DeploymentDescriptor> readDeploymentsToBeDeleted(); List<DeploymentDescriptor> readDeploymentsToBeDeleted();
@Query( value = "SELECT m FROM DeploymentDescriptor m") @Query( value = "SELECT m FROM DeploymentDescriptor m")
List<DeploymentDescriptor> readAllDeployments(); List<DeploymentDescriptor> 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<DeploymentDescriptor> readScheduledDeployments(); List<DeploymentDescriptor> readScheduledDeployments();
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status = org.etsi.osl.model.DeploymentDescriptorStatus.RUNNING " @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.RUNNING "
+ "OR m.status = org.etsi.osl.model.DeploymentDescriptorStatus.INSTANTIATING " + "OR m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.INSTANTIATING "
+ "OR m.status = org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATING") + "OR m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATING")
List<DeploymentDescriptor> readRunningInstantiatingDeployments(); List<DeploymentDescriptor> readRunningInstantiatingDeployments();
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status = org.etsi.osl.model.DeploymentDescriptorStatus.RUNNING " @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.RUNNING "
+ "OR m.status = org.etsi.osl.model.DeploymentDescriptorStatus.INSTANTIATING " + "OR m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.INSTANTIATING "
+ "OR m.status = org.etsi.osl.model.DeploymentDescriptorStatus.TERMINATING") + "OR m.status = org.etsi.osl.model.nfv.DeploymentDescriptorStatus.TERMINATING")
List<DeploymentDescriptor> readRunningInstantiatingAndTerminatingDeployments(); List<DeploymentDescriptor> readRunningInstantiatingAndTerminatingDeployments();
@Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.experiment.id = ?1") @Query( value = "SELECT m FROM DeploymentDescriptor m WHERE m.experiment.id = ?1")
......
src/main/java/portal/api/repo/InfrastructureRepository.java
+ 1
− 1
View file @ 9f9b3f07
...@@ -22,7 +22,7 @@ package portal.api.repo; ...@@ -22,7 +22,7 @@ package portal.api.repo;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.etsi.osl.model.Infrastructure; import org.etsi.osl.model.nfv.Infrastructure;
/** /**
......
src/main/java/portal/api/repo/ManoPlatformRepository.java
+ 1
− 1
View file @ 9f9b3f07
...@@ -22,7 +22,7 @@ package portal.api.repo; ...@@ -22,7 +22,7 @@ package portal.api.repo;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.etsi.osl.model.MANOplatform; import org.etsi.osl.model.nfv.MANOplatform;
/** /**
......
src/main/java/portal/api/repo/ManoProvidersRepository.java
+ 2
− 2
View file @ 9f9b3f07
...@@ -26,8 +26,8 @@ import org.springframework.data.repository.CrudRepository; ...@@ -26,8 +26,8 @@ import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.etsi.osl.model.Category; import org.etsi.osl.model.nfv.Category;
import org.etsi.osl.model.MANOprovider; import org.etsi.osl.model.nfv.MANOprovider;
/** /**
......
src/main/java/portal/api/repo/NSDOBDRepository.java
+ 1
− 1
View file @ 9f9b3f07
...@@ -23,7 +23,7 @@ import org.springframework.data.jpa.repository.Query; ...@@ -23,7 +23,7 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.etsi.osl.model.ExperimentOnBoardDescriptor; import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;
/** /**
* @author ctranoris * @author ctranoris
......
src/main/java/portal/api/repo/NSDsRepository.java
+ 1
− 1
View file @ 9f9b3f07
...@@ -26,7 +26,7 @@ import org.springframework.data.jpa.repository.Query; ...@@ -26,7 +26,7 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.etsi.osl.model.ExperimentMetadata; import org.etsi.osl.model.nfv.ExperimentMetadata;
/** /**
......
src/main/java/portal/api/repo/PortalPropertiesRepository.java
+ 1
− 1
View file @ 9f9b3f07
...@@ -24,7 +24,7 @@ import java.util.Optional; ...@@ -24,7 +24,7 @@ import java.util.Optional;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.etsi.osl.model.PortalProperty; import org.etsi.osl.model.nfv.PortalProperty;
/** /**
* @author ctranoris * @author ctranoris
......
src/main/java/portal/api/repo/ProductRepository.java
+ 1
− 1
View file @ 9f9b3f07
...@@ -25,7 +25,7 @@ import org.springframework.data.jpa.repository.Query; ...@@ -25,7 +25,7 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.etsi.osl.model.Product; import org.etsi.osl.model.nfv.Product;
/** /**
......
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