commit ee993b11889c7db7176e26194070627b980147cf
author Charles Chan <rascov@gmail.com> Mon Aug 14 13:32:49 2017 -0700
committer Ray Milkey <ray@opennetworking.org> Tue Aug 15 16:51:18 2017 +0000
tree 04aace1bb0e846eb9f17af0fd848c9ff1d09cce1
parent 09ae368c08bf8f5134b0dc10ea51bd4211c14610

Directly use config provided by the event to prevent race condition

Change-Id: I1732b5a1095cdd04fbe1be0619e19cefac07a118

core/net/src/main/java/org/onosproject/net/intf/impl/InterfaceManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/intf/impl/InterfaceManager.java b/core/net/src/main/java/org/onosproject/net/intf/impl/InterfaceManager.java
index 5693db5..36c5bd5 100644
--- a/core/net/src/main/java/org/onosproject/net/intf/impl/InterfaceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/intf/impl/InterfaceManager.java
@@ -249,9 +249,7 @@
                 switch (event.type()) {
                 case CONFIG_ADDED:
                 case CONFIG_UPDATED:
-                    InterfaceConfig config =
-                            configService.getConfig((ConnectPoint) event.subject(), InterfaceConfig.class);
-                    updateInterfaces(config);
+                    event.config().ifPresent(config -> updateInterfaces((InterfaceConfig) config));
                     break;
                 case CONFIG_REMOVED:
                     removeInterfaces((ConnectPoint) event.subject());

core/net/src/test/java/org/onosproject/net/intf/impl/InterfaceManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/intf/impl/InterfaceManagerTest.java b/core/net/src/test/java/org/onosproject/net/intf/impl/InterfaceManagerTest.java
index 89ca4ee..b4a7163 100644
--- a/core/net/src/test/java/org/onosproject/net/intf/impl/InterfaceManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intf/impl/InterfaceManagerTest.java
@@ -163,7 +163,7 @@
         interfaces.add(newIntf);
 
         NetworkConfigEvent event = new NetworkConfigEvent(
-                NetworkConfigEvent.Type.CONFIG_ADDED, cp, CONFIG_CLASS);
+                NetworkConfigEvent.Type.CONFIG_ADDED, cp, ic, null, CONFIG_CLASS);
 
         assertEquals(NUM_INTERFACES, interfaceManager.getInterfaces().size());
 
@@ -201,12 +201,13 @@
 
         // New interface config updates the existing interface and adds a new
         // interface to the same connect point
+        InterfaceConfig oldIc = new TestInterfaceConfig(cp, Sets.newHashSet(intf));
         InterfaceConfig ic = new TestInterfaceConfig(cp, interfaces);
 
         configs.put(cp, ic);
 
         NetworkConfigEvent event = new NetworkConfigEvent(
-                NetworkConfigEvent.Type.CONFIG_UPDATED, cp, CONFIG_CLASS);
+                NetworkConfigEvent.Type.CONFIG_UPDATED, cp, ic, oldIc, CONFIG_CLASS);
 
         // Send in the event signalling the interfaces for this connect point
         // have been updated