Add and fix Phosphorus lighty.io support

- fix tapiLink uninitialized variable
- fix initPortMapping calls
- modify PortMapping and PortMappingImpl to be able to get
  PortMappingVersion221 instance
- fix initOpenRoadmInterfaces calls by using it
- add to pom the org.eclipse.jetty dependency removed from lighty-core
- limit its scope to tests only

JIRA: TRNSPRTPCE-579
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I31e8a0a58d7f7e342a7119f364975eb0096f5e55

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java
index 799af027251dd5c911d31e2c998b6bcdb5e1b83a..7d41d5f911e6f07a2507581d629ec5f7a56c2c2f 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java
@@ -22,6 +22,8 @@ import org.opendaylight.yangtools.yang.common.Uint16;
 
 public interface PortMapping {
 
+    PortMappingVersion221 getPortMappingVersion221();
+
     /**
      * This method creates logical to physical port mapping for a given device.
      * Instead of parsing all the circuit packs/ports in the device, this methods

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java
index 980501cbe59c6a97cd6947e9a3ebf077fd1ee74f..a697921cc701f42a08c29baf66dac0b3f51d4088 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java
@@ -56,6 +56,11 @@ public class PortMappingImpl implements PortMapping {
         this.portMappingVersion121 = portMappingVersion121;
     }
 
+    @Override
+    public PortMappingVersion221 getPortMappingVersion221() {
+        return portMappingVersion22;
+    }
+
     @Override
     public boolean createMappingData(String nodeId, String nodeVersion) {
         switch (nodeVersion) {

diff --git a/lighty/build_lighty_core.sh b/lighty/build_lighty_core.sh
index 3faf3b74509ea3d41008109866f88363b4dea852..3621fb1a4884c8e3f795f4f4db6b275ce8b15896 100755 (executable)
--- a/lighty/build_lighty_core.sh
+++ b/lighty/build_lighty_core.sh
@@ -5,6 +5,6 @@ cd ..
 git clone https://github.com/PantheonTechnologies/lighty-core.git
 cd lighty-core
 #git checkout master
-git checkout 14.0.x
+git checkout 15.1.x
 export JDK_JAVA_OPTIONS="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED"
 mvn clean install -B -U -DskipTests -Dmaven.javadoc.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn

diff --git a/lighty/pom.xml b/lighty/pom.xml
index 3e49aa7792f89f911635d9cc5ecaf83cf4037c3c..d45ac6fb365db0905ef8803f54bea78bba429ffa 100644 (file)
--- a/lighty/pom.xml
+++ b/lighty/pom.xml
@@ -11,8 +11,7 @@
     <parent>
         <groupId>io.lighty.core</groupId>
         <artifactId>lighty-app-parent</artifactId>
-        <version>14.0.0</version>
-        <!--version>14.0.1-SNAPSHOT</version-->
+        <version>15.1.0</version>
         <relativePath />
     </parent>
 
@@ -105,6 +104,12 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-client</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <finalName>tpce</finalName>

diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/Main.java b/lighty/src/main/java/io/lighty/controllers/tpce/Main.java
index 0d84d5e99b38af82d45d6339b57a6d0d85f3ef9f..9215bc29fee36c0dfe42d5cd2e8a72db76763f7d 100644 (file)
--- a/lighty/src/main/java/io/lighty/controllers/tpce/Main.java
+++ b/lighty/src/main/java/io/lighty/controllers/tpce/Main.java
@@ -104,9 +104,8 @@ public class Main {
         }
     }
 
-    /**
+    /*
      * Build options for command line arguments.
-     * @return
      */
     private static Options buildOptions() {
         Option restconfFileOption = Option.builder(RESTCONF_OPTION_NAME)

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 f0542376a91d7d4d80e34280dbf051bd24245ba1..7a8da833bf3117d0fc0355cd70958d30104c6f63 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
@@ -141,9 +141,7 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP
                 deviceTransactionManager, networkTransaction);
         TransportpceNetworkutilsService networkutilsServiceImpl = new NetworkUtilsImpl(
                 lightyServices.getBindingDataBroker());
-        MappingUtils mappingUtils = new MappingUtilsImpl(lightyServices.getBindingDataBroker());
-        OpenRoadmInterfaces openRoadmInterfaces = initOpenRoadmInterfaces(mappingUtils);
-        PortMapping portMapping = initPortMapping(lightyServices, openRoadmInterfaces);
+        PortMapping portMapping = initPortMapping(lightyServices);
         NetworkModelService networkModelService = new NetworkModelServiceImpl(networkTransaction, linkDiscoveryImpl,
                 portMapping, lightyServices.getBindingNotificationPublishService());
         FrequenciesService networkModelWavelengthService =
@@ -168,7 +166,9 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP
         pceProvider = new PceProvider(lightyServices.getRpcProviderService(), pathComputationService);
 
         LOG.info("Creating OLM beans ...");
+        MappingUtils mappingUtils = new MappingUtilsImpl(lightyServices.getBindingDataBroker());
         CrossConnect crossConnect = initCrossConnect(mappingUtils);
+        OpenRoadmInterfaces openRoadmInterfaces = initOpenRoadmInterfaces(mappingUtils, portMapping);
         PowerMgmt powerMgmt = new PowerMgmtImpl(lightyServices.getBindingDataBroker(), openRoadmInterfaces,
                 crossConnect, deviceTransactionManager, olmtimer1, olmtimer2);
         OlmPowerService olmPowerService = new OlmPowerServiceImpl(lightyServices.getBindingDataBroker(), powerMgmt,
@@ -210,6 +210,7 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP
                 networkModelListenerImpl, servicehandler);
 
         LOG.info("Creating tapi beans ...");
+        TapiLink tapiLink = new TapiLink(networkTransaction);
         R2RTapiLinkDiscovery tapilinkDiscoveryImpl = new R2RTapiLinkDiscovery(networkTransaction,
             deviceTransactionManager, tapiLink);
         TapiRendererListenerImpl tapiRendererListenerImpl = new TapiRendererListenerImpl(lightyServices
@@ -324,22 +325,22 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP
             openRoadmInterface710, openRoadmOtnInterface221, openRoadmOtnInterface710);
     }
 
-    private PortMapping initPortMapping(LightyServices lightyServices, OpenRoadmInterfaces openRoadmInterfaces) {
+    private PortMapping initPortMapping(LightyServices lightyServices) {
         PortMappingVersion710 portMappingVersion710 = new PortMappingVersion710(lightyServices.getBindingDataBroker(),
-            deviceTransactionManager, openRoadmInterfaces);
+                deviceTransactionManager);
         PortMappingVersion221 portMappingVersion221 = new PortMappingVersion221(lightyServices.getBindingDataBroker(),
-                deviceTransactionManager, openRoadmInterfaces);
+                deviceTransactionManager);
         PortMappingVersion121 portMappingVersion121 = new PortMappingVersion121(lightyServices.getBindingDataBroker(),
-                deviceTransactionManager, openRoadmInterfaces);
+                deviceTransactionManager);
         return new PortMappingImpl(lightyServices.getBindingDataBroker(), portMappingVersion710,
             portMappingVersion221, portMappingVersion121);
     }
 
-    private OpenRoadmInterfaces initOpenRoadmInterfaces(MappingUtils mappingUtils) {
+    private OpenRoadmInterfaces initOpenRoadmInterfaces(MappingUtils mappingUtils, PortMapping portMapping) {
         OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(
                 deviceTransactionManager);
         OpenRoadmInterfacesImpl221 openRoadmInterfacesImpl221 = new OpenRoadmInterfacesImpl221(
-                deviceTransactionManager);
+                deviceTransactionManager, portMapping, portMapping.getPortMappingVersion221());
         OpenRoadmInterfacesImpl710 openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(
             deviceTransactionManager);
         return new OpenRoadmInterfacesImpl(deviceTransactionManager, mappingUtils, openRoadmInterfacesImpl121,

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 4d0fc59e05d3b113e0ded85fc480769b87966954..6e1e1e26d8849fcadcf56c491b53263bca32975f 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
@@ -219,7 +219,6 @@ public final class TPCEUtils {
                     .getInstance(),
             org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.tributary.signal.interfaces.rev200529
                     .$YangModuleInfoImpl.getInstance(),
-            org.opendaylight.yang.gen.v1.http.org.openroadm.ospf.rev200529.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.rev200327.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev200529.$YangModuleInfoImpl
                     .getInstance(),
@@ -303,16 +302,16 @@ public final class TPCEUtils {
                     .$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkmodel.rev201116
                     .$YangModuleInfoImpl.getInstance(),
-            org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210618.$YangModuleInfoImpl
+            org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.$YangModuleInfoImpl
                     .getInstance(),
             org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.servicehandler.rev201125.$YangModuleInfoImpl
                     .getInstance(),
-            org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.$YangModuleInfoImpl.getInstance(),
+            org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.$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.rev210831.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.gnpy.path.rev200909.$YangModuleInfoImpl.getInstance(),
-            org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426
+            org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927
                     .$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705
                     .$YangModuleInfoImpl.getInstance(),
@@ -332,8 +331,8 @@ public final class TPCEUtils {
                     .getInstance(),
             org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.$YangModuleInfoImpl
                     .getInstance(),
-            org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160621.$YangModuleInfoImpl
-                    .getInstance(),
+            //org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160621
+            //        .$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.$YangModuleInfoImpl
                     .getInstance(),
             org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.$YangModuleInfoImpl