X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fgnpy%2FGnpyTopoImpl.java;fp=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fgnpy%2FGnpyTopoImpl.java;h=beb49173bf64f539df5733f6771603edca7ea7ac;hb=4bb3743a3214fb481e4cc147914a314c9ff6d1c3;hp=a213903274019f5f6b57e3f3969a708e802c8b19;hpb=a3e438d26a071955866bd610928c4fbc63fdc69c;p=transportpce.git diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java index a21390327..beb49173b 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java @@ -142,8 +142,8 @@ public class GnpyTopoImpl { throw new GnpyException("In gnpyTopoImpl: openRoadmNet or openRoadmTopo is not present"); } // Create the list of nodes - Collection openRoadmNetNodeList = openRoadmNet.get().nonnullNode().values(); - Collection openRoadmTopoNodeList = openRoadmTopo.get().nonnullNode().values(); + Collection openRoadmNetNodeList = openRoadmNet.orElseThrow().nonnullNode().values(); + Collection openRoadmTopoNodeList = openRoadmTopo.orElseThrow().nonnullNode().values(); if (openRoadmTopoNodeList.isEmpty() || openRoadmNetNodeList.isEmpty()) { throw new GnpyException("In gnpyTopoImpl: no nodes in the openradm topology or openroadm network"); @@ -204,7 +204,7 @@ public class GnpyTopoImpl { if (!openRoadmTopo.isPresent()) { throw new GnpyException("In gnpyTopoImpl: openroadmTopo is not present"); } - Network1 nw1 = openRoadmTopo.get().augmentation(Network1.class); + Network1 nw1 = openRoadmTopo.orElseThrow().augmentation(Network1.class); Collection linksList = nw1.nonnullLink().values(); // 1:EXPRESS-LINK 2:ADD-LINK 3:DROP-LINK // 4:ROADM-To-ROADM 5:XPONDER-INPUT 6:XPONDER-OUTPUT