commit e87b30e54273bd9d3b165bfa7da5629dbad3761d
author Jian Li <pyguni@gmail.com> Wed Jun 12 13:11:51 2019 +0900
committer Jian Li <pyguni@gmail.com> Tue Mar 17 01:26:09 2020 +0000
tree fb9e8a8efb82d70da8ba6d0d510355b98499b9e7
parent 83a5e8d925bb22f05c26255627b8cd20669d2d0c

Fix: add new ovs controller first, remove ovs controller afterward

Change-Id: I7ed7f9b01d512ece3781891d69aaf76ba255fd1b

protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java

diff --git a/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java b/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java
index ccb153d..831a729 100644
--- a/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java
+++ b/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java
@@ -574,8 +574,6 @@
             return;
         }
 
-        removeControllers.forEach(c -> deleteConfig(CONTROLLER, UUID, c.getRow().uuid().value(),
-                                                    BRIDGE, BRIDGE_CONTROLLER, c.getRow().uuid()));
         newControllers.stream().map(c -> {
             Controller controller = (Controller) TableGenerator
                     .createTable(dbSchema, OvsdbTable.CONTROLLER);
@@ -585,6 +583,8 @@
                                     bridgeUuid.value(),
                                     c.getRow()));
 
+        removeControllers.forEach(c -> deleteConfig(CONTROLLER, UUID, c.getRow().uuid().value(),
+                BRIDGE, BRIDGE_CONTROLLER, c.getRow().uuid()));
     }
 
     @Override