commit a64b3bcfbe91049375edf224d70804bc11589a64
author Gamze Abaka <gamze.abaka@netsia.com> Fri Jan 31 06:51:43 2020 +0000
committer Andrea Campanella <andrea@opennetworking.org> Wed Feb 05 09:32:45 2020 +0100
tree c08e8398b934cc56e26ad3a007d39ffc3adbff7c
parent d9bccbac32edc5d184f3ed2b24de03c566552228

[SEBA-937] Multi Tcont support by DhcpL2Relay app.

Change-Id: Id9b8e4b507e5608a92a040b72c8d497cc5783ba8

app/src/test/java/org/opencord/dhcpl2relay/impl/DhcpL2RelayTest.java

diff --git a/app/src/test/java/org/opencord/dhcpl2relay/impl/DhcpL2RelayTest.java b/app/src/test/java/org/opencord/dhcpl2relay/impl/DhcpL2RelayTest.java
index 9841953..a0cab4a 100755
--- a/app/src/test/java/org/opencord/dhcpl2relay/impl/DhcpL2RelayTest.java
+++ b/app/src/test/java/org/opencord/dhcpl2relay/impl/DhcpL2RelayTest.java
@@ -18,6 +18,7 @@
 import static org.junit.Assert.assertEquals;
 
 import java.nio.ByteBuffer;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
@@ -65,6 +66,7 @@
         dhcpL2Relay.sadisService = new MockSadisService();
         dhcpL2Relay.hostService = new MockHostService();
         dhcpL2Relay.mastershipService = new MockMastershipService();
+        dhcpL2Relay.dhcpL2RelayCounters = new MockDhcpL2RelayCountersStore();
         TestUtils.setField(dhcpL2Relay, "eventDispatcher", new TestEventDispatcher());
         dhcpL2Relay.refreshService = new MockExecutor(dhcpL2Relay.refreshService);
         dhcpL2Relay.activate(new DhcpL2RelayTestBase.MockComponentContext());
@@ -241,6 +243,7 @@
         sent.setSourceMACAddress(OLT_MAC_ADDRESS);
         sent.setQinQVID(CLIENT_S_TAG.toShort());
         sent.setVlanID(CLIENT_C_TAG.toShort());
+        sent.setPriorityCode((byte) CLIENT_C_PBIT);
 
         IPv4 ipv4Packet = (IPv4) sent.getPayload();
         UDP udpPacket = (UDP) ipv4Packet.getPayload();
@@ -263,7 +266,8 @@
 
     public void compareServerPackets(Ethernet sent, Ethernet relayed) {
         sent.setDestinationMACAddress(CLIENT_MAC);
-        sent.setQinQVID(CLIENT_S_TAG.toShort());
+        sent.setQinQVID(NOT_PROVIDED);
+        sent.setQinQPriorityCode((byte) NOT_PROVIDED);
         sent.setVlanID(CLIENT_C_TAG.toShort());
 
         final ByteBuffer byteBuffer = ByteBuffer.wrap(sent.serialize());
@@ -276,4 +280,31 @@
         assertEquals(expectedPacket, relayed);
 
     }
+
+    private class MockDhcpL2RelayCountersStore implements DhcpL2RelayCountersStore {
+        @Override
+        public void initCounters(String counterClass) {
+
+        }
+
+        @Override
+        public void incrementCounter(String counterClass, DhcpL2RelayCounters counterType) {
+
+        }
+
+        @Override
+        public void setCounter(String counterClass, DhcpL2RelayCounters counterType, Long value) {
+
+        }
+
+        @Override
+        public Map<DhcpL2RelayCountersIdentifier, AtomicLong> getCountersMap() {
+            return new HashMap<>();
+        }
+
+        @Override
+        public void resetCounters(String counterClass) {
+
+        }
+    }
 }
\ No newline at end of file