mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-21 12:22:18 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I38b8479a9e3f367c26b0400de4c7b92719f19dcc
This commit is contained in:
Thomas Vachuska 2016-01-11 21:31:38 -08:00 committed by Gerrit Code Review
parent d1ce4b0bad
commit 138de8bf40
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/src/main/java/org/onosproject/net/config/basics/BasicDeviceConfig.java
View File

@ -58,7 +58,7 @@ public final class BasicDeviceConfig extends BasicElementConfig<DeviceId> {
* @return driver name of null if not set * @return driver name of null if not set
*/ */
public String driver() { public String driver() {
return get(DRIVER, subject.toString()); return get(DRIVER, null);
} }
/** /**

2
core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
View File

@ -741,7 +741,7 @@ public class DeviceManager
public void event(NetworkConfigEvent event) { public void event(NetworkConfigEvent event) {
DeviceEvent de = null; DeviceEvent de = null;
if (event.configClass().equals(BasicDeviceConfig.class)) { if (event.configClass().equals(BasicDeviceConfig.class)) {
log.info("Detected Device network config event {}", event.type()); log.debug("Detected device network config event {}", event.type());
DeviceId did = (DeviceId) event.subject(); DeviceId did = (DeviceId) event.subject();
BasicDeviceConfig cfg = networkConfigService.getConfig(did, BasicDeviceConfig.class); BasicDeviceConfig cfg = networkConfigService.getConfig(did, BasicDeviceConfig.class);

2
core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java
View File

@ -252,7 +252,7 @@ public class HostManager
if ((event.type() == NetworkConfigEvent.Type.CONFIG_ADDED || if ((event.type() == NetworkConfigEvent.Type.CONFIG_ADDED ||
event.type() == NetworkConfigEvent.Type.CONFIG_UPDATED) && event.type() == NetworkConfigEvent.Type.CONFIG_UPDATED) &&
event.configClass().equals(BasicHostConfig.class)) { event.configClass().equals(BasicHostConfig.class)) {
log.info("Detected Host network config event {}", event.type()); log.debug("Detected host network config event {}", event.type());
kickOutBadHost(((HostId) event.subject())); kickOutBadHost(((HostId) event.subject()));
} }
} }

2
core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java
View File

@ -337,6 +337,8 @@ public class LinkManager
LinkKey lk = (LinkKey) event.subject(); LinkKey lk = (LinkKey) event.subject();
BasicLinkConfig cfg = networkConfigService.getConfig(lk, BasicLinkConfig.class); BasicLinkConfig cfg = networkConfigService.getConfig(lk, BasicLinkConfig.class);
log.debug("Detected link network config event {}", event.type());
if (!isAllowed(cfg)) { if (!isAllowed(cfg)) {
log.info("Kicking out links between {} and {}", lk.src(), lk.dst()); log.info("Kicking out links between {} and {}", lk.src(), lk.dst());
removeLink(lk.src(), lk.dst()); removeLink(lk.src(), lk.dst());

4
tools/test/cells/tom
View File

@ -1,7 +1,7 @@
# Thomas' VirtualBox-based 3 ONOS instances & ONOS mininet box # Thomas' VirtualBox-based 3 ONOS instances & ONOS mininet box
export ONOS_NIC=192.168.56.* export ONOS_NIC=192.168.56.*
export OC1="192.168.56.11" export OC1="192.168.56.14"
export OC2="192.168.56.12" export OC2="192.168.56.12"
export OC3="192.168.56.13" export OC3="192.168.56.13"
export OCN="192.168.56.7" export OCN="192.168.56.11"