From 9bb27cb98374d76b579c97be3083524b5e94f9bd Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Fri, 28 Feb 2020 11:29:21 +0100 Subject: [PATCH] Fix GNPy functional tests issue due to Mg bump Signed-off-by: Gilles Thouenon Co-authored-by: Ahmed Triki Change-Id: I418faab4b76899313c9d1ca86db4240704aaabd5 --- .../transportpce/pce/gnpy/GnpyServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java index 44ba0f543..2bf8dfb65 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java @@ -137,8 +137,11 @@ public class GnpyServiceImpl { ExplicitRouteObjects explicitRouteObjects = new ExplicitRouteObjectsBuilder() .setRouteObjectIncludeExclude(routeObjectIncludeExcludes).build(); //Create Path Constraint - PathConstraints pathConstraints = - createPathConstraints(atoz.getRate().toJava(),atoz.getAToZWavelengthNumber().toJava()); + Long atozWavelength = null; + if (atoz.getAToZWavelengthNumber() != null) { + atozWavelength = atoz.getAToZWavelengthNumber().toJava(); + } + PathConstraints pathConstraints = createPathConstraints(atoz.getRate().toJava(), atozWavelength); // Create the path request List pathRequestList = new ArrayList<>(); @@ -170,8 +173,11 @@ public class GnpyServiceImpl { ExplicitRouteObjects explicitRouteObjects = new ExplicitRouteObjectsBuilder() .setRouteObjectIncludeExclude(routeObjectIncludeExcludes).build(); //Create Path Constraint - PathConstraints pathConstraints = createPathConstraints(ztoa.getRate().toJava(), - ztoa.getZToAWavelengthNumber().toJava()); + Long ztoaWavelength = null; + if (ztoa.getZToAWavelengthNumber() != null) { + ztoaWavelength = ztoa.getZToAWavelengthNumber().toJava(); + } + PathConstraints pathConstraints = createPathConstraints(ztoa.getRate().toJava(), ztoaWavelength); // Create the path request List pathRequestList = new ArrayList<>(); -- 2.36.6