commit d575a3cc598a3ec0690e210c44817d23ab8890ef
author Jian Li <pyguni@gmail.com> Wed Jun 12 13:11:51 2019 +0900
committer Jian Li <pyguni@gmail.com> Wed Jun 12 15:13:13 2019 +0900
tree 8b02d2e374571b79d28e5998490e0f26c79dcc4a
parent 4d8785b5b1be86b2e499115a6552222654643b9e

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 5914dc7..c32c341 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
@@ -575,8 +575,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);
@@ -586,6 +584,8 @@
                                     bridgeUuid.value(),
                                     c.getRow()));
 
+        removeControllers.forEach(c -> deleteConfig(CONTROLLER, UUID, c.getRow().uuid().value(),
+                BRIDGE, BRIDGE_CONTROLLER, c.getRow().uuid()));
     }
 
     @Override