Update connection and interface name

[transportpce.git] / renderer / src / test / java / org / opendaylight / transportpce / renderer / openroadminterface / OpenRoadMInterface221Test.java

diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java
index 7627857cea0fede06e02d9006011b1c200d7c0ac..bedee6307b9a63b3ca59bc0b4ffb6a414dcaf56b 100644 (file)
--- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java
+++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java
@@ -64,10 +64,10 @@ public class OpenRoadMInterface221Test extends AbstractTest {
         Mockito.when(fixedFlex.getStart()).thenReturn(12d);
         Mockito.when(fixedFlex.getStop()).thenReturn(12d);
         Mockito.when(fixedFlex.getCenterFrequency()).thenReturn(12d);
-        Long waveNumber = 1000L;
-        Assert.assertNotNull(openRoadMInterface221.createFlexOCH(nodeId, logicalConnPoint, waveNumber));
-        Assert.assertEquals(openRoadMInterface221.createFlexOCH(nodeId, logicalConnPoint, waveNumber),
-                Arrays.asList(logicalConnPoint + "-nmc-" + waveNumber));
+        Long waveNumber = 1L;
+        Assert.assertNotNull(openRoadMInterface221.createFlexOCH(nodeId, logicalConnPoint, waveNumber, 761, 768));
+        Assert.assertEquals(openRoadMInterface221.createFlexOCH(nodeId, logicalConnPoint, waveNumber, 761, 768),
+                Arrays.asList(logicalConnPoint + "-nmc-761:768"));
     }
 
     @Test
@@ -79,10 +79,10 @@ public class OpenRoadMInterface221Test extends AbstractTest {
         Mockito.when(fixedFlex.getStart()).thenReturn(12d);
         Mockito.when(fixedFlex.getStop()).thenReturn(12d);
         Mockito.when(fixedFlex.getCenterFrequency()).thenReturn(12d);
-        Long waveNumber = 1000L;
-        Assert.assertNotNull(openRoadMInterface221.createFlexOCH(nodeId, logicalConnPoint, waveNumber));
-        Assert.assertEquals(openRoadMInterface221.createFlexOCH(nodeId, logicalConnPoint, waveNumber),
-                Arrays.asList(logicalConnPoint + "-mc-" + waveNumber, logicalConnPoint + "-nmc-" + waveNumber));
+        Long waveNumber = 1L;
+        Assert.assertNotNull(openRoadMInterface221.createFlexOCH(nodeId, logicalConnPoint, waveNumber, 761, 768));
+        Assert.assertEquals(openRoadMInterface221.createFlexOCH(nodeId, logicalConnPoint, waveNumber, 761, 768),
+                Arrays.asList(logicalConnPoint + "-mc-" + waveNumber, logicalConnPoint + "-nmc-761:768"));
     }
 
     @Test
@@ -93,9 +93,9 @@ public class OpenRoadMInterface221Test extends AbstractTest {
                 .thenReturn(new MappingBuilder().setLogicalConnectionPoint(logicalConnPoint).build());
         Mockito.when(fixedFlex.getCenterFrequency()).thenReturn(12d);
         Mockito.when(fixedFlex.getFixedFlexWaveMapping(Mockito.anyLong())).thenReturn(new FixedFlexImpl());
-        Long waveNumber = 1000L;
-        Assert.assertEquals(openRoadMInterface221.createOpenRoadmOchInterface(nodeId, logicalConnPoint, waveNumber),
-                logicalConnPoint + "-" + waveNumber);
+        Long waveNumber = 1L;
+        Assert.assertEquals(openRoadMInterface221.createOpenRoadmOchInterface(nodeId, logicalConnPoint, waveNumber,
+                761, 768), logicalConnPoint + "-761:768");
     }
 
     @Test
@@ -115,9 +115,8 @@ public class OpenRoadMInterface221Test extends AbstractTest {
     public void testCreateOpenRoadmOchInterfaceName() {
 
         String logicalConnPoint = "logicalConnPoint";
-        Long waveNumber = 1000L;
-        Assert.assertEquals(openRoadMInterface221.createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber),
-                logicalConnPoint + "-" + waveNumber);
+        Assert.assertEquals(openRoadMInterface221.createOpenRoadmOchInterfaceName(logicalConnPoint, "761:768"),
+                logicalConnPoint + "-761:768");
 
     }