commit 4dc25b8545b51f622540b60cd15956154c4e1fc2
author Charles Chan <rascov@gmail.com> Thu Dec 12 16:58:08 2019 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Thu Jan 09 02:01:01 2020 +0000
tree 6091e1ed572c126806ffcaae899e5043c6481ed3
parent e6c4764d0af415479b215e807f7663a4eaa1db81

Fixed an issue that innerVlan, tpid and suspended bit is not correctly set

Change-Id: I8aba666d65b14fd445083b21ff146dfe5e335aab
(cherry picked from commit 7993dfd283180e6a723650b061bec7acfff4fb52)

core/store/dist/src/main/java/org/onosproject/store/host/impl/DistributedHostStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/host/impl/DistributedHostStore.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/DistributedHostStore.java
index b2f90ee..c4e1b68 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/host/impl/DistributedHostStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/host/impl/DistributedHostStore.java
@@ -248,7 +248,10 @@
                             existingHost.vlan(),
                             existingHost.locations(),
                             ImmutableSet.copyOf(addresses),
+                            existingHost.innerVlan(),
+                            existingHost.tpid(),
                             existingHost.configured(),
+                            existingHost.suspended(),
                             existingHost.annotations());
                 } else {
                     return existingHost;
@@ -278,7 +281,8 @@
                 return new DefaultHost(existingHost.providerId(),
                         hostId, existingHost.mac(), existingHost.vlan(),
                         newLocations, existingHost.ipAddresses(),
-                        existingHost.configured(), existingHost.annotations());
+                        existingHost.innerVlan(), existingHost.tpid(),
+                        existingHost.configured(), existingHost.suspended(), existingHost.annotations());
             }
             return null;
         });
@@ -302,7 +306,8 @@
                         new DefaultHost(existingHost.providerId(),
                                 hostId, existingHost.mac(), existingHost.vlan(),
                                 locations, existingHost.ipAddresses(),
-                                existingHost.configured(), existingHost.annotations());
+                                existingHost.innerVlan(), existingHost.tpid(),
+                                existingHost.configured(), existingHost.suspended(), existingHost.annotations());
             }
             return null;
         });