Enhanced DeviceDescription and added default implementation for it.
diff --git a/providers/of/device/src/main/java/org/onlab/onos/provider/of/device/impl/OpenFlowDeviceProvider.java b/providers/of/device/src/main/java/org/onlab/onos/provider/of/device/impl/OpenFlowDeviceProvider.java
index f7e3c95..16a4305 100644
--- a/providers/of/device/src/main/java/org/onlab/onos/provider/of/device/impl/OpenFlowDeviceProvider.java
+++ b/providers/of/device/src/main/java/org/onlab/onos/provider/of/device/impl/OpenFlowDeviceProvider.java
@@ -1,10 +1,5 @@
package org.onlab.onos.provider.of.device.impl;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@@ -13,6 +8,7 @@
import org.onlab.onos.net.Device;
import org.onlab.onos.net.DeviceId;
import org.onlab.onos.net.MastershipRole;
+import org.onlab.onos.net.device.DefaultDeviceDescription;
import org.onlab.onos.net.device.DeviceDescription;
import org.onlab.onos.net.device.DeviceProvider;
import org.onlab.onos.net.device.DeviceProviderRegistry;
@@ -25,6 +21,11 @@
import org.onlab.onos.of.controller.RoleState;
import org.slf4j.Logger;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
/**
* Provider which uses an OpenFlow controller to detect network
* infrastructure devices.
@@ -90,17 +91,14 @@
}
private class InternalDeviceProvider implements OpenFlowSwitchListener {
-
@Override
- public void switchAdded(final Dpid dpid) {
+ public void switchAdded(Dpid dpid) {
URI uri = buildURI(dpid);
- providerService.deviceConnected(new DeviceId(uri), new DeviceDescription() {
-
- @Override
- public URI deviceURI() {
- return buildURI(dpid);
- }
- });
+ // TODO: fetch and provide switch desc information
+ DeviceDescription description =
+ new DefaultDeviceDescription(buildURI(dpid), Device.Type.SWITCH,
+ null, null, null, null);
+ providerService.deviceConnected(new DeviceId(uri), description);
}
@Override