[ONOS-3284]Types added Spi, SI and context header
Change-Id: Ib29d90d401c390d4ff5ac06e17507f2ffbb70f12
diff --git a/drivers/src/test/java/org/onosproject/driver/extensions/NiciraSetNshContextHeaderTest.java b/drivers/src/test/java/org/onosproject/driver/extensions/NiciraSetNshContextHeaderTest.java
index 45d6d94..5993acf 100644
--- a/drivers/src/test/java/org/onosproject/driver/extensions/NiciraSetNshContextHeaderTest.java
+++ b/drivers/src/test/java/org/onosproject/driver/extensions/NiciraSetNshContextHeaderTest.java
@@ -20,6 +20,7 @@
import static org.hamcrest.Matchers.notNullValue;
import org.junit.Test;
+import org.onosproject.net.NshContextHeader;
import org.onosproject.net.flow.instructions.ExtensionTreatmentType;
import com.google.common.testing.EqualsTester;
@@ -29,15 +30,15 @@
*/
public class NiciraSetNshContextHeaderTest {
- final NiciraSetNshContextHeader nshCh1 = new NiciraSetNshContextHeader(10,
+ final NiciraSetNshContextHeader nshCh1 = new NiciraSetNshContextHeader(NshContextHeader.of(10),
ExtensionTreatmentType.
ExtensionTreatmentTypes.
NICIRA_SET_NSH_CH1.type());
- final NiciraSetNshContextHeader sameAsNshCh1 = new NiciraSetNshContextHeader(10,
+ final NiciraSetNshContextHeader sameAsNshCh1 = new NiciraSetNshContextHeader(NshContextHeader.of(10),
ExtensionTreatmentType.
ExtensionTreatmentTypes.
NICIRA_SET_NSH_CH1.type());
- final NiciraSetNshContextHeader nshCh2 = new NiciraSetNshContextHeader(20,
+ final NiciraSetNshContextHeader nshCh2 = new NiciraSetNshContextHeader(NshContextHeader.of(20),
ExtensionTreatmentType.
ExtensionTreatmentTypes.
NICIRA_SET_NSH_CH1.type());
@@ -55,12 +56,12 @@
*/
@Test
public void testConstruction() {
- final NiciraSetNshContextHeader niciraSetNshCh = new NiciraSetNshContextHeader(10,
+ final NiciraSetNshContextHeader niciraSetNshCh = new NiciraSetNshContextHeader(NshContextHeader.of(10),
ExtensionTreatmentType.
ExtensionTreatmentTypes.
NICIRA_SET_NSH_CH1.type());
assertThat(niciraSetNshCh, is(notNullValue()));
- assertThat(niciraSetNshCh.nshCh(), is(10));
+ assertThat(niciraSetNshCh.nshCh().nshContextHeader(), is(10));
assertThat(niciraSetNshCh.type(), is(ExtensionTreatmentType.
ExtensionTreatmentTypes.
NICIRA_SET_NSH_CH1.type()));
diff --git a/drivers/src/test/java/org/onosproject/driver/extensions/NiciraSetNshSiTest.java b/drivers/src/test/java/org/onosproject/driver/extensions/NiciraSetNshSiTest.java
index 8541e9f..7113417 100644
--- a/drivers/src/test/java/org/onosproject/driver/extensions/NiciraSetNshSiTest.java
+++ b/drivers/src/test/java/org/onosproject/driver/extensions/NiciraSetNshSiTest.java
@@ -20,6 +20,7 @@
import static org.hamcrest.Matchers.notNullValue;
import org.junit.Test;
+import org.onosproject.net.NshServiceIndex;
import com.google.common.testing.EqualsTester;
@@ -28,9 +29,9 @@
*/
public class NiciraSetNshSiTest {
- final NiciraSetNshSi nshSi1 = new NiciraSetNshSi((byte) 10);
- final NiciraSetNshSi sameAsNshSi1 = new NiciraSetNshSi((byte) 10);
- final NiciraSetNshSi nshSi2 = new NiciraSetNshSi((byte) 20);
+ final NiciraSetNshSi nshSi1 = new NiciraSetNshSi(NshServiceIndex.of((short) 10));
+ final NiciraSetNshSi sameAsNshSi1 = new NiciraSetNshSi(NshServiceIndex.of((short) 10));
+ final NiciraSetNshSi nshSi2 = new NiciraSetNshSi(NshServiceIndex.of((short) 20));
/**
* Checks the operation of equals() methods.
@@ -45,8 +46,8 @@
*/
@Test
public void testConstruction() {
- final NiciraSetNshSi niciraSetNshSi = new NiciraSetNshSi((byte) 15);
+ final NiciraSetNshSi niciraSetNshSi = new NiciraSetNshSi(NshServiceIndex.of((short) 15));
assertThat(niciraSetNshSi, is(notNullValue()));
- assertThat(niciraSetNshSi.nshSi(), is((byte) 15));
+ assertThat(niciraSetNshSi.nshSi().serviceIndex(), is((short) 15));
}
}
diff --git a/drivers/src/test/java/org/onosproject/driver/extensions/NiciraSetNshSpiTest.java b/drivers/src/test/java/org/onosproject/driver/extensions/NiciraSetNshSpiTest.java
index 197e3bf..5650c82 100644
--- a/drivers/src/test/java/org/onosproject/driver/extensions/NiciraSetNshSpiTest.java
+++ b/drivers/src/test/java/org/onosproject/driver/extensions/NiciraSetNshSpiTest.java
@@ -20,6 +20,7 @@
import static org.hamcrest.Matchers.notNullValue;
import org.junit.Test;
+import org.onosproject.net.NshServicePathId;
import com.google.common.testing.EqualsTester;
@@ -28,9 +29,9 @@
*/
public class NiciraSetNshSpiTest {
- final NiciraSetNshSpi nshSpi1 = new NiciraSetNshSpi(10);
- final NiciraSetNshSpi sameAsNshSpi1 = new NiciraSetNshSpi(10);
- final NiciraSetNshSpi nshSpi2 = new NiciraSetNshSpi(20);
+ final NiciraSetNshSpi nshSpi1 = new NiciraSetNshSpi(NshServicePathId.of(10));
+ final NiciraSetNshSpi sameAsNshSpi1 = new NiciraSetNshSpi(NshServicePathId.of(10));
+ final NiciraSetNshSpi nshSpi2 = new NiciraSetNshSpi(NshServicePathId.of(20));
/**
* Checks the operation of equals() methods.
@@ -45,8 +46,8 @@
*/
@Test
public void testConstruction() {
- final NiciraSetNshSpi niciraSetNshSpi = new NiciraSetNshSpi(10);
+ final NiciraSetNshSpi niciraSetNshSpi = new NiciraSetNshSpi(NshServicePathId.of(10));
assertThat(niciraSetNshSpi, is(notNullValue()));
- assertThat(niciraSetNshSpi.nshSpi(), is(10));
+ assertThat(niciraSetNshSpi.nshSpi().servicePathId(), is(10));
}
}