commit 44fbda16b85568c9ec8080f587bf76af8ebe850f
author Kalhee Kim <Kalhee.Kim@nokia.com> Tue Apr 03 21:08:18 2018 +0000
committer Charles Chan <rascov@gmail.com> Wed Apr 04 11:30:31 2018 -0700
tree 326dc6461637da09d295dd0e3343cfa8fcc8939b
parent 54a97c908a16d9abde7dbccf4a489ed4cd093858

[CORD-2906] dhcpv6 server ack pkt needs to set VID according to client vid

Change-Id: I21d651859e8525d7fbd826921ac7352f1f13fec9

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
index e329063..4d1be53 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
@@ -1228,6 +1228,8 @@
             dhcpRelayCountersStore.incrementCounter(gCount, DhcpRelayCounters.NO_MATCHING_INTF);
             return null;
         }
+        etherReply.setVlanID(vlanIdInUse.toShort());
+
         MacAddress relayAgentMac = clientInterface.mac();
         if (relayAgentMac == null) {
             log.warn("Can not get client interface mac, abort packet..");