commit f594537ba0dd224496efcf8787e5e7709a489ee8
author Michele Santuari <msantuari@fbk.eu> Thu Jan 19 16:39:21 2017 +0100
committer Jonathan Hart <jono@onlab.us> Wed Jan 25 17:14:23 2017 +0000
tree 5894e4e47d041c0b0ad4420c5112ab4817d6e7b6
parent 0282ab8e956820f4a093c6551671b1343a2ab169

fix juniper driver

- fix wrong NBR for get devices info
- fix port number: the format of the port generated by
  PortNumber.fromString is not supported by the cli and netcfg
- the errors are reported in the log without throwing an exception

Change-Id: Idd456055e2e1b50185d6987866b066441ce5a15a

drivers/juniper/src/main/java/org/onosproject/drivers/juniper/LinkDiscoveryJuniperImpl.java

diff --git a/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/LinkDiscoveryJuniperImpl.java b/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/LinkDiscoveryJuniperImpl.java
index ba346d5..2b99faa 100644
--- a/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/LinkDiscoveryJuniperImpl.java
+++ b/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/LinkDiscoveryJuniperImpl.java
@@ -16,9 +16,8 @@
 
 package org.onosproject.drivers.juniper;
 
-//import com.google.common.base.Optional;
-
 import com.google.common.annotations.Beta;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import org.onosproject.drivers.utilities.XmlConfigParser;
 import org.onosproject.net.Device;
@@ -29,7 +28,6 @@
 import org.onosproject.net.driver.AbstractHandlerBehaviour;
 import org.onosproject.net.link.LinkDescription;
 import org.onosproject.netconf.NetconfController;
-import org.onosproject.netconf.NetconfException;
 import org.onosproject.netconf.NetconfSession;
 import org.slf4j.Logger;
 
@@ -45,7 +43,6 @@
 import static org.onosproject.drivers.juniper.JuniperUtils.requestBuilder;
 import static org.onosproject.net.AnnotationKeys.PORT_NAME;
 import static org.onosproject.drivers.juniper.JuniperUtils.REQ_LLDP_NBR_INFO;
-import static org.onosproject.drivers.juniper.JuniperUtils.FAILED_CFG;
 import static org.slf4j.LoggerFactory.getLogger;
 
 
@@ -71,7 +68,8 @@
         try {
             reply = session.get(requestBuilder(REQ_LLDP_NBR_INFO));
         } catch (IOException e) {
-            throw new RuntimeException(new NetconfException(FAILED_CFG, e));
+            log.warn("Failed to retrieve ports for device {}", localDeviceId);
+            return ImmutableSet.of();
         }
         log.debug("Reply from device {} : {}", localDeviceId, reply);
         Set<LinkAbstraction> linkAbstractions = parseJuniperLldp(