Remove deprecated netconf classes and API
Change-Id: I3c0e37efe827060596aea667551729bf92331950
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 446a0e2..2739872 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
@@ -19,9 +19,9 @@
import com.google.common.base.Preconditions;
import org.onosproject.net.DeviceId;
import org.onosproject.net.behaviour.ConfigGetter;
-import org.onosproject.netconf.TargetConfig;
import org.onosproject.net.driver.AbstractHandlerBehaviour;
import org.onosproject.net.driver.DriverHandler;
+import org.onosproject.netconf.DatastoreId;
import org.onosproject.netconf.NetconfController;
import org.slf4j.Logger;
@@ -56,7 +56,7 @@
return controller.getDevicesMap().
get(ofDeviceId).
getSession().
- getConfig(TargetConfig.valueOf(type));
+ getConfig(DatastoreId.datastore(type));
} catch (IOException e) {
log.error("Configuration could not be retrieved {}",
e.getMessage());
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 bce3b6d..6a8710d 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
@@ -24,6 +24,7 @@
import org.onosproject.net.behaviour.ControllerInfo;
import org.onosproject.net.driver.AbstractHandlerBehaviour;
import org.onosproject.net.driver.DriverHandler;
+import org.onosproject.netconf.DatastoreId;
import org.onosproject.netconf.NetconfController;
import org.onosproject.netconf.NetconfDevice;
@@ -35,7 +36,6 @@
import java.util.ArrayList;
import java.util.List;
-import static org.onosproject.netconf.TargetConfig.RUNNING;
import static org.slf4j.LoggerFactory.getLogger;
/**
@@ -59,7 +59,7 @@
if (mastershipService.isLocalMaster(deviceId)) {
try {
String reply = controller.getNetconfDevice(deviceId).getSession().
- getConfig(RUNNING);
+ getConfig(DatastoreId.RUNNING);
log.debug("Reply XML {}", reply);
controllers.addAll(XmlConfigParser.parseStreamControllers(XmlConfigParser.
loadXml(new ByteArrayInputStream(reply.getBytes(StandardCharsets.UTF_8)))));
@@ -87,7 +87,7 @@
String config = null;
try {
- String reply = device.getSession().getConfig(RUNNING);
+ String reply = device.getSession().getConfig(DatastoreId.RUNNING);
log.info("reply XML {}", reply);
config = XmlConfigParser.createControllersConfig(
XmlConfigParser.loadXml(getClass().getResourceAsStream("controllers.xml")),
diff --git a/drivers/netconf/src/test/java/org/onosproject/drivers/netconf/MockNetconfSession.java b/drivers/netconf/src/test/java/org/onosproject/drivers/netconf/MockNetconfSession.java
index 1a973dd..155a5a0 100644
--- a/drivers/netconf/src/test/java/org/onosproject/drivers/netconf/MockNetconfSession.java
+++ b/drivers/netconf/src/test/java/org/onosproject/drivers/netconf/MockNetconfSession.java
@@ -15,20 +15,19 @@
*/
package org.onosproject.drivers.netconf;
-import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Pattern;
+import org.onosproject.netconf.DatastoreId;
import org.onosproject.netconf.NetconfDeviceInfo;
import org.onosproject.netconf.NetconfDeviceOutputEventListener;
import org.onosproject.netconf.NetconfException;
-import org.onosproject.netconf.NetconfSession;
-import org.onosproject.netconf.TargetConfig;
+import org.onosproject.netconf.NetconfSessionAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class MockNetconfSession implements NetconfSession {
+public class MockNetconfSession extends NetconfSessionAdapter {
private static final Logger log = LoggerFactory
.getLogger(MockNetconfSession.class);
@@ -158,23 +157,13 @@
@Override
- public String getConfig(String targetConfiguration, String configurationSchema) throws NetconfException {
- return getConfig(TargetConfig.valueOf(targetConfiguration));
- }
-
- @Override
- public String getConfig(String targetConfiguration) throws NetconfException {
- return getConfig(TargetConfig.valueOf(targetConfiguration), null);
- }
-
- @Override
- public String getConfig(TargetConfig netconfTargetConfig)
+ public String getConfig(DatastoreId netconfTargetConfig)
throws NetconfException {
return getConfig(netconfTargetConfig, null);
}
@Override
- public String getConfig(TargetConfig netconfTargetConfig, String configurationFilterSchema)
+ public String getConfig(DatastoreId netconfTargetConfig, String configurationFilterSchema)
throws NetconfException {
StringBuilder rpc = new StringBuilder(XML_HEADER);
rpc.append("<rpc ");
@@ -201,7 +190,7 @@
}
@Override
- public boolean editConfig(TargetConfig netconfTargetConfig, String mode, String newConfiguration)
+ public boolean editConfig(DatastoreId netconfTargetConfig, String mode, String newConfiguration)
throws NetconfException {
newConfiguration = newConfiguration.trim();
StringBuilder rpc = new StringBuilder(XML_HEADER);
@@ -234,17 +223,11 @@
@Override
public boolean editConfig(String newConfiguration) throws NetconfException {
- return editConfig(TargetConfig.RUNNING, null, newConfiguration);
+ return editConfig(DatastoreId.RUNNING, null, newConfiguration);
}
@Override
- public boolean editConfig(String targetConfiguration, String mode, String newConfiguration)
- throws NetconfException {
- return editConfig(TargetConfig.valueOf(targetConfiguration), mode, newConfiguration);
- }
-
- @Override
- public boolean copyConfig(TargetConfig netconfTargetConfig, String newConfiguration) throws NetconfException {
+ public boolean copyConfig(DatastoreId netconfTargetConfig, String newConfiguration) throws NetconfException {
newConfiguration = newConfiguration.trim();
StringBuilder rpc = new StringBuilder(XML_HEADER);
rpc.append(RPC_OPEN);
@@ -271,11 +254,11 @@
@Override
public boolean copyConfig(String targetConfiguration, String newConfiguration) throws NetconfException {
- return copyConfig(TargetConfig.valueOf(targetConfiguration), newConfiguration);
+ return copyConfig(DatastoreId.datastore(targetConfiguration), newConfiguration);
}
@Override
- public boolean deleteConfig(TargetConfig netconfTargetConfig) throws NetconfException {
+ public boolean deleteConfig(DatastoreId netconfTargetConfig) throws NetconfException {
StringBuilder rpc = new StringBuilder(XML_HEADER);
rpc.append(RPC_OPEN);
rpc.append(MESSAGE_ID_STRING);
@@ -297,11 +280,6 @@
}
@Override
- public boolean deleteConfig(String targetConfiguration) throws NetconfException {
- return deleteConfig(TargetConfig.valueOf(targetConfiguration));
- }
-
- @Override
public void startSubscription() throws NetconfException {
// TODO Auto-generated method stub
@@ -320,18 +298,6 @@
}
@Override
- public boolean lock(String configType) throws NetconfException {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public boolean unlock(String configType) throws NetconfException {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
public boolean lock() throws NetconfException {
// TODO Auto-generated method stub
return false;
@@ -355,18 +321,6 @@
}
@Override
- public String getServerCapabilities() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void setDeviceCapabilities(List<String> capabilities) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
public void addDeviceOutputListener(NetconfDeviceOutputEventListener listener) {
// TODO Auto-generated method stub