commit 68f9c3221dc549864be9a8a1bf938ee8c7f7e66f
author Daniel Park <dan.park@sk.com> Tue Jun 29 16:37:56 2021 +0900
committer Jian Li <pyguni@gmail.com> Tue Jun 29 08:11:40 2021 +0000
tree 474653ca09b8102e007f360e4a06cb07ba5b1d9a
parent 10c45cc52803732f6c426c096007b1d1c7d8f464

Fix to preserve the old peer router MAC when a router is updated.

Change-Id: I690c80813254b52e46f242b21afe3d6e005ee56d
(cherry picked from commit 22591604f64ba868bec2ff305c534f667d9058e2)

apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtRouterWatcher.java

diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtRouterWatcher.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtRouterWatcher.java
index c346c58..58ca9f8 100644
--- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtRouterWatcher.java
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtRouterWatcher.java
@@ -28,6 +28,7 @@
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
 import org.onosproject.kubevirtnetworking.api.AbstractWatcher;
+import org.onosproject.kubevirtnetworking.api.KubevirtPeerRouter;
 import org.onosproject.kubevirtnetworking.api.KubevirtRouter;
 import org.onosproject.kubevirtnetworking.api.KubevirtRouterAdminService;
 import org.onosproject.kubevirtnetworking.api.KubevirtRouterService;
@@ -244,6 +245,16 @@
                     name);
 
             KubevirtRouter router = parseKubevirtRouter(resource);
+
+            KubevirtPeerRouter oldPeerRouter = adminService.router(router.name()).peerRouter();
+            if (oldPeerRouter != null
+                    && Objects.equals(oldPeerRouter.ipAddress(), router.peerRouter().ipAddress())
+                    && oldPeerRouter.macAddress() != null
+                    && router.peerRouter().macAddress() == null) {
+
+                router = router.updatePeerRouter(oldPeerRouter);
+            }
+
             if (router != null) {
                 adminService.updateRouter(router);
             }