Thomas Vachuska
Committed by Gerrit Code Review

FIxing basic device config and demoting some config-related messages to debug.

Change-Id: I38b8479a9e3f367c26b0400de4c7b92719f19dcc
...@@ -58,7 +58,7 @@ public final class BasicDeviceConfig extends BasicElementConfig<DeviceId> { ...@@ -58,7 +58,7 @@ public final class BasicDeviceConfig extends BasicElementConfig<DeviceId> {
58 * @return driver name of null if not set 58 * @return driver name of null if not set
59 */ 59 */
60 public String driver() { 60 public String driver() {
61 - return get(DRIVER, subject.toString()); 61 + return get(DRIVER, null);
62 } 62 }
63 63
64 /** 64 /**
......
...@@ -741,7 +741,7 @@ public class DeviceManager ...@@ -741,7 +741,7 @@ public class DeviceManager
741 public void event(NetworkConfigEvent event) { 741 public void event(NetworkConfigEvent event) {
742 DeviceEvent de = null; 742 DeviceEvent de = null;
743 if (event.configClass().equals(BasicDeviceConfig.class)) { 743 if (event.configClass().equals(BasicDeviceConfig.class)) {
744 - log.info("Detected Device network config event {}", event.type()); 744 + log.debug("Detected device network config event {}", event.type());
745 DeviceId did = (DeviceId) event.subject(); 745 DeviceId did = (DeviceId) event.subject();
746 BasicDeviceConfig cfg = networkConfigService.getConfig(did, BasicDeviceConfig.class); 746 BasicDeviceConfig cfg = networkConfigService.getConfig(did, BasicDeviceConfig.class);
747 747
......
...@@ -252,7 +252,7 @@ public class HostManager ...@@ -252,7 +252,7 @@ public class HostManager
252 if ((event.type() == NetworkConfigEvent.Type.CONFIG_ADDED || 252 if ((event.type() == NetworkConfigEvent.Type.CONFIG_ADDED ||
253 event.type() == NetworkConfigEvent.Type.CONFIG_UPDATED) && 253 event.type() == NetworkConfigEvent.Type.CONFIG_UPDATED) &&
254 event.configClass().equals(BasicHostConfig.class)) { 254 event.configClass().equals(BasicHostConfig.class)) {
255 - log.info("Detected Host network config event {}", event.type()); 255 + log.debug("Detected host network config event {}", event.type());
256 kickOutBadHost(((HostId) event.subject())); 256 kickOutBadHost(((HostId) event.subject()));
257 } 257 }
258 } 258 }
......
...@@ -337,6 +337,8 @@ public class LinkManager ...@@ -337,6 +337,8 @@ public class LinkManager
337 LinkKey lk = (LinkKey) event.subject(); 337 LinkKey lk = (LinkKey) event.subject();
338 BasicLinkConfig cfg = networkConfigService.getConfig(lk, BasicLinkConfig.class); 338 BasicLinkConfig cfg = networkConfigService.getConfig(lk, BasicLinkConfig.class);
339 339
340 + log.debug("Detected link network config event {}", event.type());
341 +
340 if (!isAllowed(cfg)) { 342 if (!isAllowed(cfg)) {
341 log.info("Kicking out links between {} and {}", lk.src(), lk.dst()); 343 log.info("Kicking out links between {} and {}", lk.src(), lk.dst());
342 removeLink(lk.src(), lk.dst()); 344 removeLink(lk.src(), lk.dst());
......
1 # Thomas' VirtualBox-based 3 ONOS instances & ONOS mininet box 1 # Thomas' VirtualBox-based 3 ONOS instances & ONOS mininet box
2 2
3 export ONOS_NIC=192.168.56.* 3 export ONOS_NIC=192.168.56.*
4 -export OC1="192.168.56.11" 4 +export OC1="192.168.56.14"
5 export OC2="192.168.56.12" 5 export OC2="192.168.56.12"
6 export OC3="192.168.56.13" 6 export OC3="192.168.56.13"
7 -export OCN="192.168.56.7" 7 +export OCN="192.168.56.11"
......