commit 9c4006785fb769ad0d1dbb70c14f70f2b87e3b53
author Charles Chan <rascov@gmail.com> Thu Dec 12 16:58:08 2019 -0800
committer Charles Chan <rascov@gmail.com> Thu Jan 09 17:30:28 2020 +0800
tree bd5f34a90f3320d93a17c80428844cdaaf227215
parent 2d4113bb575acb8807ccb8f4425c2e68b5cc2a78

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

Change-Id: I8aba666d65b14fd445083b21ff146dfe5e335aab

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 0e90cd2..b0b42a7 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
@@ -251,7 +251,10 @@
                             existingHost.vlan(),
                             existingHost.locations(),
                             ImmutableSet.copyOf(addresses),
+                            existingHost.innerVlan(),
+                            existingHost.tpid(),
                             existingHost.configured(),
+                            existingHost.suspended(),
                             existingHost.annotations());
                 } else {
                     return existingHost;
@@ -279,9 +282,10 @@
                         .forEach(newLocations::add);
 
                 return new DefaultHost(existingHost.providerId(),
-                                hostId, existingHost.mac(), existingHost.vlan(),
-                                newLocations, existingHost.ipAddresses(),
-                                existingHost.configured(), existingHost.annotations());
+                        hostId, existingHost.mac(), existingHost.vlan(),
+                        newLocations, existingHost.ipAddresses(),
+                        existingHost.innerVlan(), existingHost.tpid(),
+                        existingHost.configured(), existingHost.suspended(), existingHost.annotations());
             }
             return null;
         });
@@ -305,7 +309,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;
         });