fixes to catch proper netconf exception
- part of ONOS-7020
Change-Id: I55c02ca9fdb97f1ae12b4e3d7b76da565f9da741
diff --git a/drivers/netconf/src/main/java/org/onosproject/drivers/netconf/NetconfConfigGetter.java b/drivers/netconf/src/main/java/org/onosproject/drivers/netconf/NetconfConfigGetter.java
index 2739872..a353c28 100644
--- a/drivers/netconf/src/main/java/org/onosproject/drivers/netconf/NetconfConfigGetter.java
+++ b/drivers/netconf/src/main/java/org/onosproject/drivers/netconf/NetconfConfigGetter.java
@@ -23,10 +23,9 @@
import org.onosproject.net.driver.DriverHandler;
import org.onosproject.netconf.DatastoreId;
import org.onosproject.netconf.NetconfController;
+import org.onosproject.netconf.NetconfException;
import org.slf4j.Logger;
-import java.io.IOException;
-
import static org.slf4j.LoggerFactory.getLogger;
/**
@@ -57,7 +56,7 @@
get(ofDeviceId).
getSession().
getConfig(DatastoreId.datastore(type));
- } catch (IOException e) {
+ } catch (NetconfException e) {
log.error("Configuration could not be retrieved {}",
e.getMessage());
}
diff --git a/drivers/netconf/src/main/java/org/onosproject/drivers/netconf/NetconfConfigSetter.java b/drivers/netconf/src/main/java/org/onosproject/drivers/netconf/NetconfConfigSetter.java
index 138aa4f..6102b1a 100644
--- a/drivers/netconf/src/main/java/org/onosproject/drivers/netconf/NetconfConfigSetter.java
+++ b/drivers/netconf/src/main/java/org/onosproject/drivers/netconf/NetconfConfigSetter.java
@@ -22,6 +22,7 @@
import org.onosproject.net.DeviceId;
import org.onosproject.net.driver.DriverHandler;
import org.onosproject.netconf.NetconfController;
+import org.onosproject.netconf.NetconfException;
import org.slf4j.Logger;
import java.io.IOException;
@@ -68,7 +69,7 @@
.get(deviceId)
.getSession()
.requestSync(request);
- } catch (IOException e) {
+ } catch (NetconfException e) {
log.error("Configuration could not be set", e);
}
return UNABLE_TO_SET_CONFIG;
diff --git a/drivers/netconf/src/main/java/org/onosproject/drivers/netconf/NetconfControllerConfig.java b/drivers/netconf/src/main/java/org/onosproject/drivers/netconf/NetconfControllerConfig.java
index 6a8710d..70f01a6 100644
--- a/drivers/netconf/src/main/java/org/onosproject/drivers/netconf/NetconfControllerConfig.java
+++ b/drivers/netconf/src/main/java/org/onosproject/drivers/netconf/NetconfControllerConfig.java
@@ -27,11 +27,10 @@
import org.onosproject.netconf.DatastoreId;
import org.onosproject.netconf.NetconfController;
import org.onosproject.netconf.NetconfDevice;
-
+import org.onosproject.netconf.NetconfException;
import org.slf4j.Logger;
import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -63,7 +62,7 @@
log.debug("Reply XML {}", reply);
controllers.addAll(XmlConfigParser.parseStreamControllers(XmlConfigParser.
loadXml(new ByteArrayInputStream(reply.getBytes(StandardCharsets.UTF_8)))));
- } catch (IOException e) {
+ } catch (NetconfException e) {
log.error("Cannot communicate with device {} ", deviceId, e);
}
} else {
@@ -95,14 +94,14 @@
new ByteArrayInputStream(reply.getBytes(StandardCharsets.UTF_8))),
"running", "merge", "create", controllers
);
- } catch (IOException e) {
+ } catch (NetconfException e) {
log.error("Cannot comunicate to device {} , exception {}", deviceId, e.getMessage());
}
device.getSession().editConfig(config.substring(config.indexOf("-->") + 3));
} catch (NullPointerException e) {
log.warn("No NETCONF device with requested parameters " + e);
throw new NullPointerException("No NETCONF device with requested parameters " + e);
- } catch (IOException e) {
+ } catch (NetconfException e) {
log.error("Cannot comunicate to device {} , exception {}", deviceId, e.getMessage());
}
} else {