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

Bugfix: do not assume all Config is about DeviceId

Browse Source 
- fix for ONOS-6900

Change-Id: I5d69a252900fefaab4512433b849d5c4333d37f8
This commit is contained in:
Yuta HIGUCHI 2017-08-09 15:10:18 -07:00 committed by Yuta HIGUCHI
parent d66228c586
commit 1d4b3aa8c1
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -987,10 +987,10 @@ public class DeviceManager
@Override
public void event(NetworkConfigEvent event) {
DeviceEvent de = null;
DeviceId did = (DeviceId) event.subject();
DeviceProvider dp = getProvider(did);
if (event.configClass().equals(BasicDeviceConfig.class)) {
log.debug("Detected device network config event {}", event.type());
DeviceId did = (DeviceId) event.subject();
DeviceProvider dp = getProvider(did);
BasicDeviceConfig cfg =
networkConfigService.getConfig(did, BasicDeviceConfig.class);
@ -1005,18 +1005,24 @@ public class DeviceManager
de = store.createOrUpdateDevice(dp.id(), did, desc);
}
}
}
if (event.configClass().equals(PortDescriptionsConfig.class) && event.config().isPresent()
&& getDevice(did) != null && dp != null) {
} else if (event.configClass().equals(PortDescriptionsConfig.class)) {
DeviceId did = (DeviceId) event.subject();
DeviceProvider dp = getProvider(did);
if (!event.config().isPresent() ||
getDevice(did) == null || dp == null) {
// sanity check failed, ignore
return;
}
PortDescriptionsConfig portConfig = (PortDescriptionsConfig) event.config().get();
//updating the ports if configration exists
//updating the ports if configuration exists
List<PortDescription> complete = store.getPortDescriptions(dp.id(), did)
.collect(Collectors.toList());
complete.addAll(portConfig.portDescriptions());
store.updatePorts(dp.id(), did, complete);
}
if (portOpsIndex.containsKey(event.configClass())) {
} else if (portOpsIndex.containsKey(event.configClass())) {
ConnectPoint cpt = (ConnectPoint) event.subject();
DeviceId did = cpt.deviceId();
DeviceProvider dp = getProvider(did);
// Note: assuming PortOperator can modify existing port,
// but cannot add new port purely from Config.