ODTN: Including proper Describtion and device type, removing unecessary extends call, lowering log levels
Change-Id: I59412ac1370cc9d01127c661f873ab1d30d298a5
diff --git a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/InfineraOpenConfigDeviceDiscovery.java b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/InfineraOpenConfigDeviceDiscovery.java
index 4ebe973..55eb6c7 100644
--- a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/InfineraOpenConfigDeviceDiscovery.java
+++ b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/InfineraOpenConfigDeviceDiscovery.java
@@ -31,14 +31,16 @@
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
+import org.onlab.packet.ChassisId;
import org.onosproject.net.DefaultAnnotations;
+import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Port.Type;
import org.onosproject.net.PortNumber;
+import org.onosproject.net.device.DefaultDeviceDescription;
import org.onosproject.net.device.DefaultPortDescription;
import org.onosproject.net.device.DefaultPortDescription.Builder;
import org.onosproject.net.device.DeviceDescription;
-import org.onosproject.net.device.DeviceDescriptionDiscovery;
import org.onosproject.net.device.PortDescription;
import org.onosproject.net.driver.AbstractHandlerBehaviour;
import org.onosproject.netconf.NetconfController;
@@ -55,15 +57,15 @@
*/
public class InfineraOpenConfigDeviceDiscovery
extends AbstractHandlerBehaviour
- implements OdtnDeviceDescriptionDiscovery, DeviceDescriptionDiscovery {
+ implements OdtnDeviceDescriptionDiscovery {
private static final Logger log = getLogger(InfineraOpenConfigDeviceDiscovery.class);
@Override
public DeviceDescription discoverDeviceDetails() {
- // TODO Auto-generated method stub
- // Not really used right now
- return null;
+ return new DefaultDeviceDescription(handler().data().deviceId().uri(),
+ Device.Type.OTN, "Infinera", "XT-3300",
+ "unknown", "unknown", new ChassisId());
}
@Override