update lighty.io build for Magnesium support

- update lighy-core branch to 12.1.x
- update dependencies version to 12.1.0
- update functional tests to use lighty executable version 12.1.0
- JAVA 11 support: disable javadoc to allow building directly
  without setting the JAVA_HOME variable
- add transportpcer-networkmodel new dependency
- fix tpce java Main class and utils class

TODO: centralize lighty version configuration
      add tapi and inventory support
      fix functional tests with lighty

JIRA: TRNSPRTPCE-237
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Co-authored-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: Icec9547f5ead4e0abc10cdb67e2e8d8e6055a4ec

diff --git a/lighty/README.md b/lighty/README.md
index 5ecfd64f680dc6434cbd30b2ff1294b1bb4a6abc..a88acbc58be8691849f8678bdc3de3460fbf7e07 100644 (file)
--- a/lighty/README.md
+++ b/lighty/README.md
@@ -3,8 +3,8 @@
 This project starts [TransportPCE](https://git.opendaylight.org/gerrit/#/admin/projects/transportpce) without karaf framework.
 
 ## Build & Run
 This project starts [TransportPCE](https://git.opendaylight.org/gerrit/#/admin/projects/transportpce) without karaf framework.
 
 ## Build & Run

-* Make sure you have JDK8 or later installed
-* Make sure you have [maven 3.5.0](https://maven.apache.org/download.cgi) or later installed.
+* Make sure you have JDK11 or later installed.
+* Make sure you have [maven 3.5.2](https://maven.apache.org/download.cgi) or later installed.

 * Make sure you have proper [settings.xml](https://github.com/opendaylight/odlparent/blob/master/settings.xml)  in your ``~/.m2`` directory.
 
 #### Before compiling Lighty-TransportPCE
 * Make sure you have proper [settings.xml](https://github.com/opendaylight/odlparent/blob/master/settings.xml)  in your ``~/.m2`` directory.
 
 #### Before compiling Lighty-TransportPCE


@@ -14,91 +14,30 @@ Make sure upstream projects are compiled locally and stored in local ``~/.m2/rep
 git clone https://git.opendaylight.org/gerrit/transportpce && (cd transportpce && curl -kLo `git rev-parse --git-dir`/hooks/commit-msg https://git.opendaylight.org/gerrit/tools/hooks/commit-msg; chmod +x `git rev-parse --git-dir`/hooks/commit-msg)
 cd transportpce
 ```
 git clone https://git.opendaylight.org/gerrit/transportpce && (cd transportpce && curl -kLo `git rev-parse --git-dir`/hooks/commit-msg https://git.opendaylight.org/gerrit/tools/hooks/commit-msg; chmod +x `git rev-parse --git-dir`/hooks/commit-msg)
 cd transportpce
 ```

-Before compilation, make sure that deviations are not present in models:
+mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true -Dodlparent.spotbugs.skip -Dodlparent.checkstyle.skip

 ```
 ```

-transportpce/ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2018-11-30.yang
-transportpce/ordmodels/network/src/main/yang/org-openroadm-network-topology@2018-11-30.yang
-transportpce/ordmodels/network/src/main/yang/org-openroadm-network@2018-11-30.yang
-```
-After deviations are removed from models, compile the project.
-```
-mvn clean install -DskipTests
-```
-2. compile __lighty-core/10.0.x__
+2. compile __lighty-core/12.1.x__

 ```
 git clone https://github.com/PantheonTechnologies/lighty-core.git
 cd lighty-core
 ```
 git clone https://github.com/PantheonTechnologies/lighty-core.git
 cd lighty-core

-git checkout 10.0.x
-mvn clean install -DskipTests
+git checkout 12.1.x
+mvn clean install -DskipTests -Dmaven.javadoc.skip=true

 ```
 #### Compile Lighty-TransportPCE
 * Project is build using maven command:
 ```
 cd ../lighty
 ```
 #### Compile Lighty-TransportPCE
 * Project is build using maven command:
 ```
 cd ../lighty

-mvn clean install
+mvn clean install -Dmaven.javadoc.skip=true

 ```
 * After project build is done, use binary package to run the TransportPCE controller.
 ```
 cd  target
 ```
 * After project build is done, use binary package to run the TransportPCE controller.
 ```
 cd  target

-unzip lighty-transportpce-10.0.1-SNAPSHOT-bin.zip
-cd lighty-transportpce-10.0.1-SNAPSHOT
+unzip lighty-transportpce-12.1.0-SNAPSHOT-bin.zip
+cd lighty-transportpce-12.1.0-SNAPSHOT

 ./start-controller.sh
 ```
 * The whole build process described here and in the previous section can be performed automatically by launching the script build.sh from lighty folder.
 
 ## TransportPCE lighty.io - karaf comparison
 
 ./start-controller.sh
 ```
 * The whole build process described here and in the previous section can be performed automatically by launching the script build.sh from lighty folder.
 
 ## TransportPCE lighty.io - karaf comparison
 

-### Application Boot test
-This test compares TransportPCE application on lighty.io and karaf.
-After TransportPCE is started, performance is measured using [visualvm](https://visualvm.github.io/) tool.
-
-| Property Name                     | ODL/Karaf *    | lighty.io ** |
-|-----------------------------------|----------------|--------------|
-| Build size                        | 225M           | 64M          |
-| Startup Time                      | ~15s           | ~6s          |
-| Shutdown Time                     | ~5s            | ~100ms       |
-| Process memory allocated (RSS)*** | 1236 MB        | 353 MB       |
-| HEAP memory (used/allocated)      | 135 / 1008 MB  | 58 / 128 MB  |
-| Metaspace (used/allocated)        | 115 / 132 MB   | 62 /  65 MB  |
-| Threads (live/daemon)             | 111 / 48       | 70 /  11     |
-| Classes loaded                    | 22027          | 12019        |
-| No. of jars                       | 680            | 244          |
-
-### test_end2end_lighty.py
-This test compares TransportPCE application on lighty.io and karaf while running __test_end2end_lighty.py__ (4 connected netconf devices).
-
-| Property Name                     | ODL/Karaf *    | lighty.io ** |
-|-----------------------------------|----------------|--------------|
-| Build size                        | 225M           | 64M          |
-| Startup Time                      | ~15s           | ~6s          |
-| Shutdown Time                     | ~5s            | ~100ms       |
-| Process memory allocated (RSS)*** | 1185 MB        | 440 MB       |
-| HEAP memory (used/allocated)      | 158 / 960 MB   | 85 / 128 MB  |
-| Metaspace (used/allocated)        | 128 / 146 MB   | 83 /  87 MB  |
-| Threads (live/daemon)             | 148 / 60       | 129 / 26     |
-| Classes loaded                    | 24326          | 16155        |
-| No. of jars                       | 680            | 244          |
-
-`* JVM parameters: -Xms128M -Xmx2048m ...`
-`** JVM parameters: -Xms128m -Xmx128m -XX:MaxMetaspaceSize=128m`
-`*** sudo ps -o pid,rss,user,command ax | grep java | grep transportpce`
-
-### Integration Test results
-| Test Name                             | Failed | All | Comment                    |
-|---------------------------------------|--------|-----|----------------------------|
-| test_portmapping.py                   | 0      |  18 |                            |
-| test_topoPortMapping.py               | 1      |   6 | (same results with karaf)  |
-| test_topology.py                      | 0      |  33 |                            |
-| test_renderer_service_path_nominal.py | 0      |  24 |                            |
-| test_pce.py                           | 0      |  22 |                            |
-| test_olm.py                           | 1      |  40 | (same results with karaf)  |
-| test_end2end_lighty.py                | 18     |  52 | (same as karaf, need check)|
-
-`karaf: executable = "../karaf/target/assembly/bin/karaf"`
-`lighty.io executable = "../lighty/target/lighty-transportpce-10.0.1-SNAPSHOT/start-controller.sh": `
-
-* __Total Success: 175__
-* __Total Failed: 20__
-
-### Postman collection
-Check this [postman collection](docs/TransportPCE.postman_collection.json) for RESTCONF examples.
+see the previous version of this file in README.neon.md

diff --git a/lighty/README.neon.md b/lighty/README.neon.md
new file mode 100644 (file)
index 0000000..5ecfd64
--- /dev/null
+++ b/lighty/README.neon.md
@@ -0,0 +1,104 @@
+# Lighty-TransportPCE Controller
+
+This project starts [TransportPCE](https://git.opendaylight.org/gerrit/#/admin/projects/transportpce) without karaf framework.
+
+## Build & Run
+* Make sure you have JDK8 or later installed
+* Make sure you have [maven 3.5.0](https://maven.apache.org/download.cgi) or later installed.
+* Make sure you have proper [settings.xml](https://github.com/opendaylight/odlparent/blob/master/settings.xml)  in your ``~/.m2`` directory.
+
+#### Before compiling Lighty-TransportPCE
+Make sure upstream projects are compiled locally and stored in local ``~/.m2/repository``:
+1. compile __transportpce/master__
+```
+git clone https://git.opendaylight.org/gerrit/transportpce && (cd transportpce && curl -kLo `git rev-parse --git-dir`/hooks/commit-msg https://git.opendaylight.org/gerrit/tools/hooks/commit-msg; chmod +x `git rev-parse --git-dir`/hooks/commit-msg)
+cd transportpce
+```
+Before compilation, make sure that deviations are not present in models:
+```
+transportpce/ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2018-11-30.yang
+transportpce/ordmodels/network/src/main/yang/org-openroadm-network-topology@2018-11-30.yang
+transportpce/ordmodels/network/src/main/yang/org-openroadm-network@2018-11-30.yang
+```
+After deviations are removed from models, compile the project.
+```
+mvn clean install -DskipTests
+```
+2. compile __lighty-core/10.0.x__
+```
+git clone https://github.com/PantheonTechnologies/lighty-core.git
+cd lighty-core
+git checkout 10.0.x
+mvn clean install -DskipTests
+```
+#### Compile Lighty-TransportPCE
+* Project is build using maven command:
+```
+cd ../lighty
+mvn clean install
+```
+* After project build is done, use binary package to run the TransportPCE controller.
+```
+cd  target
+unzip lighty-transportpce-10.0.1-SNAPSHOT-bin.zip
+cd lighty-transportpce-10.0.1-SNAPSHOT
+./start-controller.sh
+```
+* The whole build process described here and in the previous section can be performed automatically by launching the script build.sh from lighty folder.
+
+## TransportPCE lighty.io - karaf comparison
+
+### Application Boot test
+This test compares TransportPCE application on lighty.io and karaf.
+After TransportPCE is started, performance is measured using [visualvm](https://visualvm.github.io/) tool.
+
+| Property Name                     | ODL/Karaf *    | lighty.io ** |
+|-----------------------------------|----------------|--------------|
+| Build size                        | 225M           | 64M          |
+| Startup Time                      | ~15s           | ~6s          |
+| Shutdown Time                     | ~5s            | ~100ms       |
+| Process memory allocated (RSS)*** | 1236 MB        | 353 MB       |
+| HEAP memory (used/allocated)      | 135 / 1008 MB  | 58 / 128 MB  |
+| Metaspace (used/allocated)        | 115 / 132 MB   | 62 /  65 MB  |
+| Threads (live/daemon)             | 111 / 48       | 70 /  11     |
+| Classes loaded                    | 22027          | 12019        |
+| No. of jars                       | 680            | 244          |
+
+### test_end2end_lighty.py
+This test compares TransportPCE application on lighty.io and karaf while running __test_end2end_lighty.py__ (4 connected netconf devices).
+
+| Property Name                     | ODL/Karaf *    | lighty.io ** |
+|-----------------------------------|----------------|--------------|
+| Build size                        | 225M           | 64M          |
+| Startup Time                      | ~15s           | ~6s          |
+| Shutdown Time                     | ~5s            | ~100ms       |
+| Process memory allocated (RSS)*** | 1185 MB        | 440 MB       |
+| HEAP memory (used/allocated)      | 158 / 960 MB   | 85 / 128 MB  |
+| Metaspace (used/allocated)        | 128 / 146 MB   | 83 /  87 MB  |
+| Threads (live/daemon)             | 148 / 60       | 129 / 26     |
+| Classes loaded                    | 24326          | 16155        |
+| No. of jars                       | 680            | 244          |
+
+`* JVM parameters: -Xms128M -Xmx2048m ...`
+`** JVM parameters: -Xms128m -Xmx128m -XX:MaxMetaspaceSize=128m`
+`*** sudo ps -o pid,rss,user,command ax | grep java | grep transportpce`
+
+### Integration Test results
+| Test Name                             | Failed | All | Comment                    |
+|---------------------------------------|--------|-----|----------------------------|
+| test_portmapping.py                   | 0      |  18 |                            |
+| test_topoPortMapping.py               | 1      |   6 | (same results with karaf)  |
+| test_topology.py                      | 0      |  33 |                            |
+| test_renderer_service_path_nominal.py | 0      |  24 |                            |
+| test_pce.py                           | 0      |  22 |                            |
+| test_olm.py                           | 1      |  40 | (same results with karaf)  |
+| test_end2end_lighty.py                | 18     |  52 | (same as karaf, need check)|
+
+`karaf: executable = "../karaf/target/assembly/bin/karaf"`
+`lighty.io executable = "../lighty/target/lighty-transportpce-10.0.1-SNAPSHOT/start-controller.sh": `
+
+* __Total Success: 175__
+* __Total Failed: 20__
+
+### Postman collection
+Check this [postman collection](docs/TransportPCE.postman_collection.json) for RESTCONF examples.

diff --git a/lighty/build.sh b/lighty/build.sh
index 2c99dfa1ae67a7b2fe184fb2ab970777c5832e57..43a4fb7769e5961865bf7d826af6e3a66072d35b 100755 (executable)
--- a/lighty/build.sh
+++ b/lighty/build.sh
@@ -1,14 +1,15 @@
-#!/bin/bash
+#!/bin/sh

 
 

+cd $(dirname "$0")

 cd ..
 cd ..

-#mvn clean install -DskipTests
+#mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true -Dodlparent.spotbugs.skip -Dodlparent.checkstyle.skip

 git clone https://github.com/PantheonTechnologies/lighty-core.git
 cd lighty-core
 git clone https://github.com/PantheonTechnologies/lighty-core.git
 cd lighty-core

-git checkout master
-mvn clean install -DskipTests
+git checkout 12.1.x
+mvn clean install -DskipTests -Dmaven.javadoc.skip=true

 cd ../lighty
 cd ../lighty

-mvn clean install
+mvn clean install -Dmaven.javadoc.skip=true

 cd  target
 cd  target

-unzip lighty-transportpce-12.0.0-SNAPSHOT-bin.zip
+unzip lighty-transportpce-12.1.0-SNAPSHOT-bin.zip

 cd ..
 rm -rf ../lighty-core
 cd ..
 rm -rf ../lighty-core

diff --git a/lighty/pom.xml b/lighty/pom.xml
index f06c97d00de440882656d27f66357258a4b87061..45f2655a8b0fec109d875ee84b9f0df1a94f94ed 100644 (file)
--- a/lighty/pom.xml
+++ b/lighty/pom.xml
@@ -12,13 +12,13 @@
     <parent>
         <groupId>io.lighty.core</groupId>
         <artifactId>lighty-app-parent</artifactId>
     <parent>
         <groupId>io.lighty.core</groupId>
         <artifactId>lighty-app-parent</artifactId>

-        <version>12.0.0-SNAPSHOT</version>
+        <version>12.1.0-SNAPSHOT</version>

         <relativePath/>
     </parent>
 
     <groupId>io.lighty.examples.controllers</groupId>
     <artifactId>lighty-transportpce</artifactId>
         <relativePath/>
     </parent>
 
     <groupId>io.lighty.examples.controllers</groupId>
     <artifactId>lighty-transportpce</artifactId>

-    <version>12.0.0-SNAPSHOT</version>
+    <version>12.1.0-SNAPSHOT</version>

     <packaging>jar</packaging>
 
     <properties>
     <packaging>jar</packaging>
 
     <properties>


@@ -56,6 +56,11 @@
             <artifactId>transportpce-ordmodels-service</artifactId>
             <version>${transportpce.version}</version>
         </dependency>
             <artifactId>transportpce-ordmodels-service</artifactId>
             <version>${transportpce.version}</version>
         </dependency>

+        <dependency>
+            <groupId>org.opendaylight.transportpce</groupId>
+            <artifactId>transportpce-networkmodel</artifactId>
+            <version>${transportpce.version}</version>
+        </dependency>

         <!-- TPCE Models -   END -->
 
         <!-- TPCE bundles - BEGIN -->
         <!-- TPCE Models -   END -->
 
         <!-- TPCE bundles - BEGIN -->

diff --git a/lighty/src/main/assembly/resources/clean-start-controller.sh b/lighty/src/main/assembly/resources/clean-start-controller.sh
index 22356736e8a218bb66a4d1daa03187ed1333929c..5a967bce15bdce74b558630877c90af100250b22 100755 (executable)
--- a/lighty/src/main/assembly/resources/clean-start-controller.sh
+++ b/lighty/src/main/assembly/resources/clean-start-controller.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh

 
 BASEDIR=$(dirname "$0")
 #echo "${BASEDIR}"
 
 BASEDIR=$(dirname "$0")
 #echo "${BASEDIR}"


@@ -8,4 +8,4 @@ rm -rf cache
 rm -rf target
 
 #start controller
 rm -rf target
 
 #start controller

-java -ms128m -mx128m -XX:MaxMetaspaceSize=128m -jar lighty-transportpce-12.0.0-SNAPSHOT.jar
+java -ms128m -mx128m -XX:MaxMetaspaceSize=128m -jar lighty-transportpce-12.1.0-SNAPSHOT.jar

diff --git a/lighty/src/main/assembly/resources/start-controller.sh b/lighty/src/main/assembly/resources/start-controller.sh
index 82bdd1df367db74cdcff2200159904de8dd763da..d0d8d2a72123f67efe92a46bb74a9cbdde0eddc3 100755 (executable)
--- a/lighty/src/main/assembly/resources/start-controller.sh
+++ b/lighty/src/main/assembly/resources/start-controller.sh
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/sh

 
 BASEDIR=$(dirname "$0")
 #echo "${BASEDIR}"
 cd ${BASEDIR}
 
 #start controller
 
 BASEDIR=$(dirname "$0")
 #echo "${BASEDIR}"
 cd ${BASEDIR}
 
 #start controller

-java -ms128m -mx128m -XX:MaxMetaspaceSize=128m -jar lighty-transportpce-12.0.0-SNAPSHOT.jar
+java -ms128m -mx128m -XX:MaxMetaspaceSize=128m -jar lighty-transportpce-12.1.0-SNAPSHOT.jar

diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java
index 6dc86b9e7ceb96c3bce5c8d34a8bca8f7e58c0f4..883b5b42d7e82b25dae03b2302363fc18e749152 100644 (file)
--- a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java
+++ b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java
@@ -29,8 +29,9 @@ import org.opendaylight.transportpce.networkmodel.NetworkModelProvider;
 import org.opendaylight.transportpce.networkmodel.NetworkUtilsImpl;
 import org.opendaylight.transportpce.networkmodel.R2RLinkDiscovery;
 import org.opendaylight.transportpce.networkmodel.service.NetworkModelServiceImpl;
 import org.opendaylight.transportpce.networkmodel.NetworkUtilsImpl;
 import org.opendaylight.transportpce.networkmodel.R2RLinkDiscovery;
 import org.opendaylight.transportpce.networkmodel.service.NetworkModelServiceImpl;

-import org.opendaylight.transportpce.networkmodel.util.OpenRoadmFactory;
-import org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology22;
+// OpenRoadmFctory and OpenRoadmTopology22 has been deleted
+import org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology;
+

 import org.opendaylight.transportpce.olm.OlmPowerServiceRpcImpl;
 import org.opendaylight.transportpce.olm.OlmProvider;
 import org.opendaylight.transportpce.olm.power.PowerMgmt;
 import org.opendaylight.transportpce.olm.OlmPowerServiceRpcImpl;
 import org.opendaylight.transportpce.olm.OlmProvider;
 import org.opendaylight.transportpce.olm.power.PowerMgmt;


@@ -42,10 +43,17 @@ import org.opendaylight.transportpce.renderer.NetworkModelWavelengthServiceImpl;
 import org.opendaylight.transportpce.renderer.RendererProvider;
 import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface121;
 import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface221;
 import org.opendaylight.transportpce.renderer.RendererProvider;
 import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface121;
 import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface221;

+// Adding OTN interface
+import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmOtnInterface221;
+

 import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterfaceFactory;
 import org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererServiceImpl;
 import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterfaceFactory;
 import org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererServiceImpl;

+// Add OTN
+import org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererServiceImpl;
+

 import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperationsImpl;
 import org.opendaylight.transportpce.renderer.rpcs.DeviceRendererRPCImpl;
 import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperationsImpl;
 import org.opendaylight.transportpce.renderer.rpcs.DeviceRendererRPCImpl;

+

 import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.transportpce.servicehandler.impl.ServicehandlerProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;


@@ -76,8 +84,10 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP
     private final PceProvider pceProvider;
 
     // network model beans
     private final PceProvider pceProvider;
 
     // network model beans

-    private final OpenRoadmTopology22 openRoadmTopology22;
-    private final OpenRoadmFactory openRoadmFactory;
+    // private final OpenRoadmTopology22 openRoadmTopology22;
+    // private final OpenRoadmFactory openRoadmFactory;
+    // private final OpenRoadmTopology openRoadmTopology;
+

     private final R2RLinkDiscovery linkDiscoveryImpl;
     private final NetworkUtilsImpl networkutilsServiceImpl;
     private final NetworkModelServiceImpl networkModelService;
     private final R2RLinkDiscovery linkDiscoveryImpl;
     private final NetworkUtilsImpl networkutilsServiceImpl;
     private final NetworkModelServiceImpl networkModelService;


@@ -92,9 +102,12 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP
 
     // renderer beans
     private final OpenRoadmInterface121 openRoadmInterface121;
 
     // renderer beans
     private final OpenRoadmInterface121 openRoadmInterface121;

-    private final OpenRoadmInterface221 openRoadmInterface22;
+    private final OpenRoadmInterface221 openRoadmInterface221;
+    private final OpenRoadmOtnInterface221 openRoadmOtnInterface221;
+

     private final OpenRoadmInterfaceFactory openRoadmInterfaceFactory;
     private final DeviceRendererServiceImpl deviceRendererService;
     private final OpenRoadmInterfaceFactory openRoadmInterfaceFactory;
     private final DeviceRendererServiceImpl deviceRendererService;

+    private final OtnDeviceRendererServiceImpl otnDeviceRendererService;

     private final DeviceRendererRPCImpl deviceRendererRPC;
     private final NetworkModelWavelengthServiceImpl networkModelWavelengthService;
     private final RendererServiceOperationsImpl rendererServiceOperations;
     private final DeviceRendererRPCImpl deviceRendererRPC;
     private final NetworkModelWavelengthServiceImpl networkModelWavelengthService;
     private final RendererServiceOperationsImpl rendererServiceOperations;


@@ -125,13 +138,18 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP
         pceProvider = new PceProvider(lightyServices.getRpcProviderService(), pathComputationService);
 
         LOG.info("Creating network-model beans ...");
         pceProvider = new PceProvider(lightyServices.getRpcProviderService(), pathComputationService);
 
         LOG.info("Creating network-model beans ...");

-        openRoadmTopology22 = new OpenRoadmTopology22(networkTransaction, deviceTransactionManager);
-        openRoadmFactory = new OpenRoadmFactory(mappingUtils, openRoadmTopology22);
-        linkDiscoveryImpl = new R2RLinkDiscovery(lightyServices.getBindingDataBroker(), deviceTransactionManager, openRoadmFactory, networkTransaction);
-        networkutilsServiceImpl = new NetworkUtilsImpl(lightyServices.getBindingDataBroker(), openRoadmFactory);
-        networkModelService = new NetworkModelServiceImpl(networkTransaction, linkDiscoveryImpl, deviceTransactionManager, openRoadmFactory, portMapping);
+        // TODO: Need to look into it
+
+
+
+        // TODO: Add OTN network model
+        //
+        linkDiscoveryImpl = new R2RLinkDiscovery(lightyServices.getBindingDataBroker(), deviceTransactionManager, networkTransaction);
+        networkutilsServiceImpl = new NetworkUtilsImpl(lightyServices.getBindingDataBroker());
+        networkModelService = new NetworkModelServiceImpl(networkTransaction, linkDiscoveryImpl, portMapping);

         netConfTopologyListener = new NetConfTopologyListener(networkModelService, lightyServices.getBindingDataBroker(), deviceTransactionManager);
         netConfTopologyListener = new NetConfTopologyListener(networkModelService, lightyServices.getBindingDataBroker(), deviceTransactionManager);

-        networkModelProvider = new NetworkModelProvider(networkTransaction, lightyServices.getBindingDataBroker(), lightyServices.getRpcProviderService(), networkutilsServiceImpl, netConfTopologyListener, openRoadmFactory);
+        networkModelProvider = new NetworkModelProvider(networkTransaction, lightyServices.getBindingDataBroker(),
+            lightyServices.getRpcProviderService(), networkutilsServiceImpl, netConfTopologyListener);

 
         LOG.info("Creating OLM beans ...");
         powerMgmt = new PowerMgmtImpl(lightyServices.getBindingDataBroker(), openRoadmInterfaces, crossConnect, deviceTransactionManager);
 
         LOG.info("Creating OLM beans ...");
         powerMgmt = new PowerMgmtImpl(lightyServices.getBindingDataBroker(), openRoadmInterfaces, crossConnect, deviceTransactionManager);


@@ -141,10 +159,15 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP
 
         LOG.info("Creating renderer beans ...");
         openRoadmInterface121 = new OpenRoadmInterface121(portMapping, openRoadmInterfaces);
 
         LOG.info("Creating renderer beans ...");
         openRoadmInterface121 = new OpenRoadmInterface121(portMapping, openRoadmInterfaces);

-        openRoadmInterface22 = new OpenRoadmInterface221(portMapping, openRoadmInterfaces, fixedFlex);
-        openRoadmInterfaceFactory = new OpenRoadmInterfaceFactory(mappingUtils, openRoadmInterface121, openRoadmInterface22);
-        deviceRendererService = new DeviceRendererServiceImpl(lightyServices.getBindingDataBroker(), deviceTransactionManager, openRoadmInterfaceFactory, openRoadmInterfaces, crossConnect, portMapping);
-        deviceRendererRPC = new DeviceRendererRPCImpl(deviceRendererService);
+        openRoadmInterface221 = new OpenRoadmInterface221(portMapping, openRoadmInterfaces, fixedFlex);
+        openRoadmOtnInterface221 = new OpenRoadmOtnInterface221(portMapping, openRoadmInterfaces);
+        openRoadmInterfaceFactory = new OpenRoadmInterfaceFactory(mappingUtils, openRoadmInterface121,
+            openRoadmInterface221, openRoadmOtnInterface221);
+        deviceRendererService = new DeviceRendererServiceImpl(lightyServices.getBindingDataBroker(), deviceTransactionManager,
+            openRoadmInterfaceFactory, openRoadmInterfaces, crossConnect, portMapping, networkModelService);
+        otnDeviceRendererService = new OtnDeviceRendererServiceImpl(openRoadmInterfaceFactory, crossConnect, openRoadmInterfaces,
+            deviceTransactionManager, networkModelService);
+        deviceRendererRPC = new DeviceRendererRPCImpl(deviceRendererService, otnDeviceRendererService);

         networkModelWavelengthService = new NetworkModelWavelengthServiceImpl(lightyServices.getBindingDataBroker());
         rendererServiceOperations = new RendererServiceOperationsImpl(deviceRendererService, olmPowerServiceRpc, lightyServices.getBindingDataBroker(), networkModelWavelengthService, lightyServices.getBindingNotificationPublishService());
         rendererProvider = new RendererProvider(lightyServices.getRpcProviderService(), deviceRendererRPC, rendererServiceOperations);
         networkModelWavelengthService = new NetworkModelWavelengthServiceImpl(lightyServices.getBindingDataBroker());
         rendererServiceOperations = new RendererServiceOperationsImpl(deviceRendererService, olmPowerServiceRpc, lightyServices.getBindingDataBroker(), networkModelWavelengthService, lightyServices.getBindingNotificationPublishService());
         rendererProvider = new RendererProvider(lightyServices.getRpcProviderService(), deviceRendererRPC, rendererServiceOperations);

diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java b/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java
index 0549b8473eb8b605b1c6b80aedd0106b806b0710..ff38e40d44f76d1b98f5f2d9a2b8f08b9c888e57 100644 (file)
--- a/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java
+++ b/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java
@@ -139,7 +139,7 @@ public final class TPCEUtils {
             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.$YangModuleInfoImpl.getInstance(),

-            org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.$YangModuleInfoImpl.getInstance(),
+            org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.$YangModuleInfoImpl.getInstance(),

             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.servicehandler.rev171017.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.servicehandler.rev171017.$YangModuleInfoImpl.getInstance(),


@@ -148,14 +148,14 @@ public final class TPCEUtils {
             org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev190103.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.gnpy.gnpy.eqpt.config.rev181119.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.gnpy.gnpy.network.topology.rev181214.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev190103.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.gnpy.gnpy.eqpt.config.rev181119.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.gnpy.gnpy.network.topology.rev181214.$YangModuleInfoImpl.getInstance(),

-            org.opendaylight.yang.gen.v1.gnpy.path.rev190502.$YangModuleInfoImpl.getInstance(),
+            org.opendaylight.yang.gen.v1.gnpy.path.rev200202.$YangModuleInfoImpl.getInstance(),

             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.$YangModuleInfoImpl.getInstance(),
 
             org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.$YangModuleInfoImpl.getInstance(),
 
             org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.$YangModuleInfoImpl.getInstance(),

-            org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.$YangModuleInfoImpl.getInstance(),
+            org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.$YangModuleInfoImpl.getInstance(),

 
             org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.$YangModuleInfoImpl.getInstance(),
 
             org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.$YangModuleInfoImpl.getInstance(),

diff --git a/tests/transportpce_tests/1.2.1/test_utils.py b/tests/transportpce_tests/1.2.1/test_utils.py
index 1b7f45f7adb87b84cee6bfa78bc4ea450b1cfb8d..7a38ff42508425bdb74165a9a0b5b13440195de3 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_utils.py
+++ b/tests/transportpce_tests/1.2.1/test_utils.py
@@ -71,7 +71,7 @@ def start_tpce():
         print("starting LIGHTY.IO TransportPCE build...")
         executable = os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
         print("starting LIGHTY.IO TransportPCE build...")
         executable = os.path.join(
             os.path.dirname(os.path.realpath(__file__)),

-            "..", "..", "..", "lighty", "target", "lighty-transportpce-12.0.0-SNAPSHOT",
+            "..", "..", "..", "lighty", "target", "lighty-transportpce-12.1.0-SNAPSHOT",

             "clean-start-controller.sh")
         with open('odl.log', 'w') as outfile:
             return subprocess.Popen(
             "clean-start-controller.sh")
         with open('odl.log', 'w') as outfile:
             return subprocess.Popen(

diff --git a/tests/transportpce_tests/2.2.1/test_utils.py b/tests/transportpce_tests/2.2.1/test_utils.py
index 2427cf4e2343993702778c794500703d760d445f..9633c3fa1030b88b5837751f1f3dea65cf839f92 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_utils.py
+++ b/tests/transportpce_tests/2.2.1/test_utils.py
@@ -63,7 +63,7 @@ def start_tpce():
         print("starting LIGHTY.IO TransportPCE build...")
         executable = os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
         print("starting LIGHTY.IO TransportPCE build...")
         executable = os.path.join(
             os.path.dirname(os.path.realpath(__file__)),

-            "..", "..", "..", "lighty", "target", "lighty-transportpce-12.0.0-SNAPSHOT",
+            "..", "..", "..", "lighty", "target", "lighty-transportpce-12.1.0-SNAPSHOT",

             "clean-start-controller.sh")
         with open('odl.log', 'w') as outfile:
             return subprocess.Popen(
             "clean-start-controller.sh")
         with open('odl.log', 'w') as outfile:
             return subprocess.Popen(