commit d9909e841b7caf861161e32d4b060cb056df2dea
author pier <pier@opennetworking.org> Fri Aug 23 10:45:40 2019 -0700
committer Pier Luigi Ventre <pier@opennetworking.org> Mon Sep 30 14:19:33 2019 +0000
tree 161dd685ef808d9ebf9692f5d7d227a9be35b91a
parent 63c69a74c6a9604ebfaa0e2268fafdf59f070c94

Fix dhcp6Relay

- interfaceIdOption does not proper encode vlanId
- AddHost was not using the actual vlan of the host

Change-Id: I41a639cc4f7efc0c7159f5bab07166d4032fc60a

apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerUtil.java

diff --git a/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerUtil.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerUtil.java
index 45e94c0..8936cc6 100644
--- a/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerUtil.java
+++ b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerUtil.java
@@ -452,8 +452,8 @@
         byte[] clientSoureMacBytes = clientPacket.getSourceMACAddress();
         byte[] inPortStringBytes = inPortString.getBytes();
         byte[] vlanIdBytes = new byte[2];
-        vlanIdBytes[0] = (byte) (clientPacket.getVlanID() & 0xff);
-        vlanIdBytes[1] = (byte) ((clientPacket.getVlanID() >> 8) & 0xff);
+        vlanIdBytes[0] = (byte) ((clientPacket.getVlanID() >> 8) & 0xff);
+        vlanIdBytes[1] = (byte) (clientPacket.getVlanID() & 0xff);
         byte[] interfaceIdBytes = new byte[clientSoureMacBytes.length +
                 inPortStringBytes.length + vlanIdBytes.length];
         log.debug("Length: interfaceIdBytes  {} clientSoureMacBytes {} inPortStringBytes {} vlan {}",
@@ -468,8 +468,8 @@
                 vlanIdBytes.length);
         interfaceId.setData(interfaceIdBytes);
         interfaceId.setLength((short) interfaceIdBytes.length);
-        log.debug("interfaceId write srcMac {} portString {}",
-                HexString.toHexString(clientSoureMacBytes, ":"), inPortString);
+        log.debug("interfaceId write srcMac {} portString {}, vlanId {}",
+                HexString.toHexString(clientSoureMacBytes, ":"), inPortString, vlanIdBytes);
         return interfaceId;
     }