diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..bb7d754baa751630b25598e182a30f062e9b6ebd
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,40 @@
+include:
+ - project: osl/code/org.etsi.osl.main
+ ref: main
+ file:
+ - ci-templates/default.yml
+ - ci-templates/build.yml
+ rules:
+ - if: '$CI_COMMIT_REF_NAME == "main"'
+
+ - project: osl/code/org.etsi.osl.main
+ ref: develop
+ file:
+ - ci-templates/default.yml
+ - ci-templates/build.yml
+ rules:
+ - if: '$CI_COMMIT_REF_NAME == "develop"'
+
+ - project: osl/code/org.etsi.osl.main
+ ref: $CI_COMMIT_REF_NAME
+ file:
+ - ci-templates/default.yml
+ - ci-templates/build.yml
+ rules:
+ - if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
+
+ - project: osl/code/org.etsi.osl.main
+ ref: develop
+ file:
+ - ci-templates/default.yml
+ - ci-templates/build_unprotected.yml
+ rules:
+ - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'
+
+maven_build:
+ extends: .maven_build
+
+docker_build:
+ extends: .docker_build
+ needs:
+ - maven_build
diff --git a/Dockerfile.mano b/Dockerfile
similarity index 57%
rename from Dockerfile.mano
rename to Dockerfile
index a26cd4f781414d2e680103b3b986c9920fe6042a..7480c2bfc2f7a4b68aad66c6be3501d476badae5 100644
--- a/Dockerfile.mano
+++ b/Dockerfile
@@ -2,5 +2,5 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk
MAINTAINER openslice.io
RUN mkdir /opt/shareclasses
RUN mkdir -p /opt/openslice/lib/
-COPY target/org.etsi.osl.manoclient-1.2.0-SNAPSHOT.jar /opt/openslice/lib/
-CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.manoclient-1.2.0-SNAPSHOT.jar"]
\ No newline at end of file
+COPY target/org.etsi.osl.manoclient-1.0.0.jar /opt/openslice/lib/
+CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses","-jar", "/opt/openslice/lib/org.etsi.osl.manoclient-1.0.0.jar"]
\ No newline at end of file
diff --git a/ci_settings.xml b/ci_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..69ad06ed6c63795d191555afde6ea2d1da4e133d
--- /dev/null
+++ b/ci_settings.xml
@@ -0,0 +1,16 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
+ <servers>
+ <server>
+ <id>gitlab-maven</id>
+ <configuration>
+ <httpHeaders>
+ <property>
+ <name>Job-Token</name>
+ <value>${CI_JOB_TOKEN}</value>
+ </property>
+ </httpHeaders>
+ </configuration>
+ </server>
+ </servers>
+</settings>
diff --git a/pom.xml b/pom.xml
index 4009888679727d047d8ac07a5e6c1706468cb9ae..35d5ac7114ee1995a9d87f00ae2956cf1ffeff03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,12 +3,11 @@
<parent>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.main</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<relativePath>../org.etsi.osl.main</relativePath>
</parent>
<artifactId>org.etsi.osl.manoclient</artifactId>
-
<name>org.etsi.osl.manoclient</name>
<url>http://maven.apache.org</url>
@@ -18,6 +17,23 @@
<spring.boot-version>${spring-boot-version}</spring.boot-version>
</properties>
+ <repositories>
+ <repository>
+ <id>gitlab-maven</id>
+ <url>https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven</url>
+ </repository>
+ </repositories>
+ <distributionManagement>
+ <repository>
+ <id>gitlab-maven</id>
+ <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
+ </repository>
+ <snapshotRepository>
+ <id>gitlab-maven</id>
+ <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
+ </snapshotRepository>
+ </distributionManagement>
+
<dependencyManagement>
<dependencies>
<!-- Spring Boot BOM -->
@@ -137,31 +153,31 @@
<dependency>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.tmf.api</artifactId>
- <version>${project.version}</version>
+ <version>${org.etsi.osl.tmf.api.version}</version>
</dependency>
<dependency>
<groupId>org.etsi.osl</groupId>
- <artifactId>org.etsi.osl.model</artifactId>
- <version>${project.version}</version>
+ <artifactId>org.etsi.osl.model.nfv</artifactId>
+ <version>${org.etsi.osl.model.nfv.version}</version>
</dependency>
<dependency>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.centrallog.client</artifactId>
- <version>${project.version}</version>
+ <version>${org.etsi.osl.centrallog.client.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>org.etsi.osl.sol005nbi</groupId>
+ <groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.sol005nbi.osm</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${org.etsi.osl.sol005nbi.osm.version}</version>
</dependency>
<dependency>
- <groupId>org.etsi.osl.sol005nbi</groupId>
+ <groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.sol005nbi.osm10</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${org.etsi.osl.sol005nbi.osm10.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
diff --git a/src/main/java/org/etsi/osl/mano/MANOClient.java b/src/main/java/org/etsi/osl/mano/MANOClient.java
index cf30357678c85fe92135e0e88ac179d998646f28..3581ab72777ad78156adaadcc1e18d027d7df4ee 100644
--- a/src/main/java/org/etsi/osl/mano/MANOClient.java
+++ b/src/main/java/org/etsi/osl/mano/MANOClient.java
@@ -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;
diff --git a/src/main/java/org/etsi/osl/mano/MANOController.java b/src/main/java/org/etsi/osl/mano/MANOController.java
index b1ba5c1e830c3b1acdaa621eda5e698b2bf66b1a..a0cfb3f998d086bb4dcc0fa0bea46f76ab81f1fe 100644
--- a/src/main/java/org/etsi/osl/mano/MANOController.java
+++ b/src/main/java/org/etsi/osl/mano/MANOController.java
@@ -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;
@@ -1011,18 +1011,20 @@ public class MANOController {
try {
// Parse the json list of objects
org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[] vnfd_array = (org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[]) mapper.readValue(vnfds_list_entity.getBody(), org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[].class);
+
+ JSONArray array = new JSONArray(vnfds_list_entity.getBody());
+
// For each object
- for(org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd vnfd : vnfd_array)
- {
- String jsonInString=null;
- ObjectMapper mapper2 = new ObjectMapper();
- mapper2.setSerializationInclusion(Include.NON_NULL);
- try {
- jsonInString = mapper2.writerWithDefaultPrettyPrinter().writeValueAsString(vnfd);
- } catch (JsonProcessingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ // For each object
+ for (Object object : array) {
+
+
+ JSONObject jobj = (JSONObject) object;
+ org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd vnfd =
+ mapper.readValue( jobj.toString() , org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd.class );
+
+ String jsonInString=jobj.toString();
+ ObjectMapper mapper2 = new ObjectMapper();
// Compare db derived data with osm derived data and update the database.
logger.debug("VNFD to JSON:"+jsonInString);
@@ -1072,7 +1074,7 @@ public class MANOController {
// Store the requirements in HTML
newVxFMetadata.setDescriptorHTML(vnfreq.toHTML());
// Store the YAML file
- newVxFMetadata.setDescriptor(vnfds_list_entity.getBody());
+ newVxFMetadata.setDescriptor( jobj.toString() );
//Add VxFMetadata object to db and get the generated object
newVxFMetadata = aMANOClient.addVxFMetadata(newVxFMetadata);
@@ -1128,18 +1130,20 @@ public class MANOController {
try {
// Parse the json list of objects
org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[] vnfd_array = (org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[]) mapper.readValue(vnfds_list_entity.getBody(), org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[].class);
- // For each object
- for(org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd vnfd : vnfd_array)
- {
- String jsonInString=null;
- ObjectMapper mapper2 = new ObjectMapper();
- mapper2.setSerializationInclusion(Include.NON_NULL);
- try {
- jsonInString = mapper2.writerWithDefaultPrettyPrinter().writeValueAsString(vnfd);
- } catch (JsonProcessingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+JSONArray array = new JSONArray(vnfds_list_entity.getBody());
+
+ // For each object
+ // For each object
+ for (Object object : array) {
+
+
+ JSONObject jobj = (JSONObject) object;
+ org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd vnfd =
+ mapper.readValue( jobj.toString() , org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd.class );
+
+ String jsonInString=jobj.toString();
+ ObjectMapper mapper2 = new ObjectMapper();
+
// Compare db derived data with osm derived data and update the database.
logger.debug("VNFD to JSON:"+jsonInString);
@@ -1245,17 +1249,20 @@ public class MANOController {
// Parse the json list of objects
org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[] vnfd_array = (org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[]) mapper.readValue(vnfds_list_entity.getBody(), org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd[].class);
// For each object
- for(org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd vnfd : vnfd_array)
- {
- String jsonInString=null;
- ObjectMapper mapper2 = new ObjectMapper();
- mapper2.setSerializationInclusion(Include.NON_NULL);
- try {
- jsonInString = mapper2.writerWithDefaultPrettyPrinter().writeValueAsString(vnfd);
- } catch (JsonProcessingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ JSONArray array = new JSONArray(vnfds_list_entity.getBody());
+
+ // For each object
+ // For each object
+ for (Object object : array) {
+
+
+ JSONObject jobj = (JSONObject) object;
+ org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd vnfd =
+ mapper.readValue( jobj.toString() , org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Vnfd.class );
+
+ String jsonInString=jobj.toString();
+ ObjectMapper mapper2 = new ObjectMapper();
+
// Compare db derived data with osm derived data and update the database.
logger.debug("VNFD to JSON:"+jsonInString);
@@ -1394,20 +1401,18 @@ public class MANOController {
try {
// Parse the json list of objects
org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd[] nsd_array = (org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd[]) mapper.readValue(nsds_list_entity.getBody(), org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd[].class);
- // For each object
- for(org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd nsd : nsd_array)
- {
- String jsonInString=null;
+
+ JSONArray array = new JSONArray(nsds_list_entity.getBody());
+ // For each object
+ for (Object object : array) {
+ JSONObject jobj = (JSONObject) object;
+ org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd nsd =
+ mapper.readValue( jobj.toString() , org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd.class);
+
+ String jsonInString=jobj.toString();
ObjectMapper mapper2 = new ObjectMapper();
- mapper2.setSerializationInclusion(Include.NON_NULL);
- try {
- jsonInString = mapper2.writerWithDefaultPrettyPrinter().writeValueAsString(nsd);
- } catch (JsonProcessingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- // Εδώ θα συγκÏίνουμε αυτό που λάβαμε απο τη βάση με αυτό που λάβαμε απο το osm και θα το ανανεώσουμε στη βάση.
+ // compare the one from OSM with the one locally saved
logger.debug("NSD to JSON:"+jsonInString);
logger.info("NSD " + nsd.getInvariantId() + " added");
@@ -1455,7 +1460,7 @@ public class MANOController {
// Store the requirements in HTML
newExperimentMetadata.setDescriptorHTML(nsdreq.toHTML());
// Store the YAML file
- newExperimentMetadata.setDescriptor(nsds_list_entity.getBody());
+ newExperimentMetadata.setDescriptor( jobj.toString() );
for (Df v : nsd.getDf().values()) {
for( VnfProfile q : v.getVnfProfile().values())
@@ -1530,20 +1535,17 @@ public class MANOController {
try {
// Parse the json list of objects
org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd[] nsd_array = (org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd[]) mapper.readValue(nsds_list_entity.getBody(), org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd[].class);
- // For each object
- for(org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd nsd : nsd_array)
- {
- String jsonInString=null;
+
+ JSONArray array = new JSONArray(nsds_list_entity.getBody());
+ // For each object
+ for (Object object : array) {
+ JSONObject jobj = (JSONObject) object;
+ org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd nsd =
+ mapper.readValue( jobj.toString() , org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd.class);
+
+ String jsonInString=jobj.toString();
ObjectMapper mapper2 = new ObjectMapper();
- mapper2.setSerializationInclusion(Include.NON_NULL);
- try {
- jsonInString = mapper2.writerWithDefaultPrettyPrinter().writeValueAsString(nsd);
- } catch (JsonProcessingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- // Compare the received from the osm with the database entry and update the database.
+ // compare the one from OSM with the one locally saved
logger.debug("NSD to JSON:"+jsonInString);
logger.info("NSD " + nsd.getInvariantId() + " added");
@@ -1591,7 +1593,7 @@ public class MANOController {
// Store the requirements in HTML
newExperimentMetadata.setDescriptorHTML(nsdreq.toHTML());
// Store the YAML file
- newExperimentMetadata.setDescriptor(nsds_list_entity.getBody());
+ newExperimentMetadata.setDescriptor( jobj.toString() );
for (Df v : nsd.getDf().values()) {
for( VnfProfile q : v.getVnfProfile().values())
@@ -1663,20 +1665,20 @@ public class MANOController {
{
ObjectMapper mapper = new ObjectMapper();
try {
- // Parse the json list of objects
- org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd[] nsd_array = (org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd[]) mapper.readValue(nsds_list_entity.getBody(), org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd[].class);
- // For each object
- for(org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd nsd : nsd_array)
- {
- String jsonInString=null;
+ // Parse the json list of objects
+ org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd[] nsd_array = (org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd[]) mapper.readValue(nsds_list_entity.getBody(), org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd[].class);
+
+ JSONArray array = new JSONArray(nsds_list_entity.getBody());
+ // For each object
+ for (Object object : array) {
+ JSONObject jobj = (JSONObject) object;
+ org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd nsd =
+ mapper.readValue( jobj.toString() , org.opendaylight.yang.gen.v1.urn.etsi.nfv.yang.etsi.nfv.descriptors.rev190425.Nsd.class);
+
+ String jsonInString=jobj.toString();
ObjectMapper mapper2 = new ObjectMapper();
mapper2.setSerializationInclusion(Include.NON_NULL);
- try {
- jsonInString = mapper2.writerWithDefaultPrettyPrinter().writeValueAsString(nsd);
- } catch (JsonProcessingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+
// Compare the received from the osm with the database entry and update the database.
logger.debug("NSD to JSON:"+jsonInString);
@@ -1726,7 +1728,7 @@ public class MANOController {
// Store the requirements in HTML
newExperimentMetadata.setDescriptorHTML(nsdreq.toHTML());
// Store the YAML file
- newExperimentMetadata.setDescriptor(nsds_list_entity.getBody());
+ newExperimentMetadata.setDescriptor( jobj.toString() );
for (Df v : nsd.getDf().values()) {
for( VnfProfile q : v.getVnfProfile().values())
diff --git a/src/main/java/org/etsi/osl/mano/MANORouteBuilder.java b/src/main/java/org/etsi/osl/mano/MANORouteBuilder.java
index e902b9f4c1de22da4f5a8e0fa1f338686549db99..71891662848fdad55a999b364404f315fc0de4e4 100644
--- a/src/main/java/org/etsi/osl/mano/MANORouteBuilder.java
+++ b/src/main/java/org/etsi/osl/mano/MANORouteBuilder.java
@@ -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)
diff --git a/src/main/java/org/etsi/osl/mano/NSCreateInstanceRequestPayload.java b/src/main/java/org/etsi/osl/mano/NSCreateInstanceRequestPayload.java
index 33310424dbc95097399316c2a15f16a24f4a714b..cad1a2344aa9bd13fca82ab246c8b39dd679e5fb 100644
--- a/src/main/java/org/etsi/osl/mano/NSCreateInstanceRequestPayload.java
+++ b/src/main/java/org/etsi/osl/mano/NSCreateInstanceRequestPayload.java
@@ -21,7 +21,7 @@
package org.etsi.osl.mano;
-import org.etsi.osl.model.DeploymentDescriptor;
+import org.etsi.osl.model.nfv.DeploymentDescriptor;
/**
* @author ctranoris
diff --git a/src/main/java/org/etsi/osl/mano/NSInstantiateInstanceRequestPayload.java b/src/main/java/org/etsi/osl/mano/NSInstantiateInstanceRequestPayload.java
index 7140dd3f835f24d2a26d234c10dc2dbec6b260b0..587908906c0f264a2f9dedd1b3c6e72c3f15441a 100644
--- a/src/main/java/org/etsi/osl/mano/NSInstantiateInstanceRequestPayload.java
+++ b/src/main/java/org/etsi/osl/mano/NSInstantiateInstanceRequestPayload.java
@@ -30,9 +30,9 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
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