From 73d098bc499661df6ef0044b62de4d46062ecfe9 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Wed, 24 Jan 2024 11:46:57 +0100 Subject: [PATCH] Remove softConstraints from PceGraph pceSoftConstraints is a property never used in PceGraph. Just remove it and adapt code consequently. JIRA: TRNSPRTPCE-778 Signed-off-by: Gilles Thouenon Change-Id: Iebedae657ce5114b1d36078bd386b684677db724 --- .../transportpce/pce/PceSendingPceRPCs.java | 4 ++-- .../transportpce/pce/graph/PceGraph.java | 10 +++------ .../transportpce/pce/graph/PceGraphTest.java | 22 +++++++++---------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java index 90a8862dd..f819daad5 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java @@ -123,7 +123,7 @@ public class PceSendingPceRPCs { } LOG.info("PceGraph ..."); PceGraph graph = new PceGraph(nwAnalizer.getaendPceNode(), nwAnalizer.getzendPceNode(), - nwAnalizer.getAllPceNodes(), nwAnalizer.getAllPceLinks(), hardConstraints, softConstraints, + nwAnalizer.getAllPceNodes(), nwAnalizer.getAllPceLinks(), hardConstraints, rc, serviceType, networkTransaction, mode); graph.calcPath(); rc = graph.getReturnStructure(); @@ -255,7 +255,7 @@ public class PceSendingPceRPCs { private PceGraph patchRerunGraph(PceGraph graph) { LOG.info("In pathComputation patchRerunGraph : rerun Graph with metric = PROPAGATION-DELAY "); - graph.setConstrains(pceHardConstraints, pceSoftConstraints); + graph.setConstrains(pceHardConstraints); graph.calcPath(); return graph; } diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java index 768a65d56..81656f3f8 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java @@ -53,7 +53,6 @@ public class PceGraph { private String serviceType = ""; private Double margin = null; PceConstraints pceHardConstraints; - PceConstraints pceSoftConstraints; private PceConstraintMode pceConstraintMode; // results @@ -68,9 +67,8 @@ public class PceGraph { private final NetworkTransactionService networkTransactionService; public PceGraph(PceNode aendNode, PceNode zendNode, Map allPceNodes, - Map allPceLinks, PceConstraints pceHardConstraints, PceConstraints pceSoftConstraints, - PceResult pceResult, String serviceType, NetworkTransactionService networkTransactionService, - PceConstraintMode mode) { + Map allPceLinks, PceConstraints pceHardConstraints,PceResult pceResult, String serviceType, + NetworkTransactionService networkTransactionService, PceConstraintMode mode) { super(); this.apceNode = aendNode; this.zpceNode = zendNode; @@ -78,7 +76,6 @@ public class PceGraph { this.allPceLinks = allPceLinks; this.pceResult = pceResult; this.pceHardConstraints = pceHardConstraints; - this.pceSoftConstraints = pceSoftConstraints; this.serviceType = serviceType; this.networkTransactionService = networkTransactionService; this.pceConstraintMode = mode; @@ -292,8 +289,7 @@ public class PceGraph { return margin; } - public void setConstrains(PceConstraints pceHardConstraintsInput, PceConstraints pceSoftConstraintsInput) { + public void setConstrains(PceConstraints pceHardConstraintsInput) { this.pceHardConstraints = pceHardConstraintsInput; - this.pceSoftConstraints = pceSoftConstraintsInput; } } diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java index 1a3297bc9..9af3104e0 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java @@ -249,7 +249,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_100GE_T, netTransServ, PceConstraintMode.Loose); + rc, StringConstants.SERVICE_TYPE_100GE_T, netTransServ, PceConstraintMode.Loose); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(3.0919881995992924)); } @@ -262,7 +262,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_OTUC2, netTransServ, PceConstraintMode.Loose); + rc, StringConstants.SERVICE_TYPE_OTUC2, netTransServ, PceConstraintMode.Loose); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(1.1559963686478447)); } @@ -275,7 +275,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_OTUC3, netTransServ, PceConstraintMode.Loose); + rc, StringConstants.SERVICE_TYPE_OTUC3, netTransServ, PceConstraintMode.Loose); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(0.3351048800367167)); } @@ -288,7 +288,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_400GE, netTransServ, PceConstraintMode.Loose); + rc, StringConstants.SERVICE_TYPE_400GE, netTransServ, PceConstraintMode.Loose); assertEquals(pceGraph.calcPath(), false); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(0.0)); } @@ -301,7 +301,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_400GE, netTransServ, PceConstraintMode.Loose); + rc, StringConstants.SERVICE_TYPE_400GE, netTransServ, PceConstraintMode.Loose); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(1.4432381874659086)); } @@ -314,7 +314,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_OTUC4, netTransServ, PceConstraintMode.Loose); + rc, StringConstants.SERVICE_TYPE_OTUC4, netTransServ, PceConstraintMode.Loose); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(1.4432381874659086)); } @@ -327,7 +327,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_OTUC4, netTransServ, PceConstraintMode.Loose); + rc, StringConstants.SERVICE_TYPE_OTUC4, netTransServ, PceConstraintMode.Loose); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(0.0)); } @@ -340,7 +340,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_100GE_T, netTransServ, PceConstraintMode.Loose); + rc, StringConstants.SERVICE_TYPE_100GE_T, netTransServ, PceConstraintMode.Loose); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(3.0919881995992924)); } @@ -354,8 +354,8 @@ public class PceGraphTest extends AbstractTest { pceHardConstraints.setPceMetrics(PceMetric.PropagationDelay); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_100GE_T, netTransServ, PceConstraintMode.Loose); - pceGraph.setConstrains(pceHardConstraints, null); + rc, StringConstants.SERVICE_TYPE_100GE_T, netTransServ, PceConstraintMode.Loose); + pceGraph.setConstrains(pceHardConstraints); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getPathAtoZ().get(2).getLatency()), @@ -416,7 +416,7 @@ public class PceGraphTest extends AbstractTest { allPceNodes = Map.of( new NodeId("optical"), pceOtnNode, new NodeId("optical2"), pceOtnNode2); - return new PceGraph(pceOtnNode, pceOtnNode2, allPceNodes, allPceLinks, pceHardConstraints, null, + return new PceGraph(pceOtnNode, pceOtnNode2, allPceNodes, allPceLinks, pceHardConstraints, new PceResult(), type, null, PceConstraintMode.Loose); } -- 2.36.6