Remove deprecated netconf classes and API
Change-Id: I3c0e37efe827060596aea667551729bf92331950
diff --git a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltAlertConfig.java b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltAlertConfig.java
index bbb373d..860d6e1 100644
--- a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltAlertConfig.java
+++ b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltAlertConfig.java
@@ -31,7 +31,7 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static org.onosproject.drivers.fujitsu.FujitsuVoltXmlUtility.*;
import static org.slf4j.LoggerFactory.getLogger;
-import static org.onosproject.netconf.TargetConfig.RUNNING;
+import static org.onosproject.netconf.DatastoreId.RUNNING;
/**
* Implementation to get and set parameters available in vOLT
diff --git a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltNniLinkConfig.java b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltNniLinkConfig.java
index 4fd8ed1..c304609 100644
--- a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltNniLinkConfig.java
+++ b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltNniLinkConfig.java
@@ -31,7 +31,7 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static org.onosproject.drivers.fujitsu.FujitsuVoltXmlUtility.*;
import static org.slf4j.LoggerFactory.getLogger;
-import static org.onosproject.netconf.TargetConfig.RUNNING;
+import static org.onosproject.netconf.DatastoreId.RUNNING;
/**
* Implementation to get and set parameters available in vOLT
diff --git a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltPonLinkConfig.java b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltPonLinkConfig.java
index 4908127..bbf405c 100644
--- a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltPonLinkConfig.java
+++ b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltPonLinkConfig.java
@@ -35,7 +35,7 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static org.onosproject.drivers.fujitsu.FujitsuVoltXmlUtility.*;
import static org.slf4j.LoggerFactory.getLogger;
-import static org.onosproject.netconf.TargetConfig.RUNNING;
+import static org.onosproject.netconf.DatastoreId.RUNNING;
/**
* Implementation to get and set parameters available in vOLT
diff --git a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuNetconfControllerMock.java b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuNetconfControllerMock.java
index e9b3af4..8659246 100644
--- a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuNetconfControllerMock.java
+++ b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuNetconfControllerMock.java
@@ -24,7 +24,7 @@
import org.onosproject.netconf.NetconfDevice;
import org.onosproject.netconf.NetconfDeviceInfo;
import org.onosproject.netconf.NetconfException;
-import org.onosproject.netconf.ctl.NetconfControllerImpl;
+import org.onosproject.netconf.ctl.impl.NetconfControllerImpl;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuNetconfSessionListenerTest.java b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuNetconfSessionListenerTest.java
index a5b1433..f1930bc 100644
--- a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuNetconfSessionListenerTest.java
+++ b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuNetconfSessionListenerTest.java
@@ -17,7 +17,7 @@
package org.onosproject.drivers.fujitsu;
-import org.onosproject.netconf.TargetConfig;
+import org.onosproject.netconf.DatastoreId;
public interface FujitsuNetconfSessionListenerTest {
@@ -50,7 +50,7 @@
* @param newConfiguration configuration to set
* @return true if everuthing as expected
*/
- boolean verifyEditConfig(TargetConfig targetConfiguration, String mode, String newConfiguration);
+ boolean verifyEditConfig(DatastoreId targetConfiguration, String mode, String newConfiguration);
/**
* Verify get request arguments.
diff --git a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuNetconfSessionMock.java b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuNetconfSessionMock.java
index 745c095..132b11d 100644
--- a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuNetconfSessionMock.java
+++ b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuNetconfSessionMock.java
@@ -17,19 +17,19 @@
package org.onosproject.drivers.fujitsu;
import com.google.common.annotations.Beta;
-import org.onosproject.netconf.TargetConfig;
+
+import org.onosproject.netconf.DatastoreId;
import org.onosproject.netconf.NetconfDeviceOutputEventListener;
import org.onosproject.netconf.NetconfException;
-import org.onosproject.netconf.NetconfSession;
+import org.onosproject.netconf.NetconfSessionAdapter;
-import java.util.List;
import java.util.concurrent.CompletableFuture;
/**
* Mock NetconfSessionImpl.
*/
-public class FujitsuNetconfSessionMock implements NetconfSession {
+public class FujitsuNetconfSessionMock extends NetconfSessionAdapter {
private FujitsuNetconfSessionListenerTest listener;
@@ -81,28 +81,6 @@
}
@Override
- public String getConfig(TargetConfig targetConfiguration) throws NetconfException {
- return null;
- }
-
- @Override
- public String getConfig(String targetConfiguration) throws NetconfException {
- return null;
- }
-
- @Override
- public String getConfig(TargetConfig targetConfiguration, String configurationFilterSchema)
- throws NetconfException {
- return null;
- }
-
- @Override
- public String getConfig(String targetConfiguration, String configurationFilterSchema)
- throws NetconfException {
- return null;
- }
-
- @Override
public boolean editConfig(String newConfiguration) throws NetconfException {
boolean result = true;
if (listener != null) {
@@ -112,7 +90,7 @@
}
@Override
- public boolean editConfig(TargetConfig targetConfiguration, String mode, String newConfiguration)
+ public boolean editConfig(DatastoreId targetConfiguration, String mode, String newConfiguration)
throws NetconfException {
boolean result = true;
if (listener != null) {
@@ -122,17 +100,7 @@
}
@Override
- public boolean editConfig(String targetConfiguration, String mode, String newConfiguration)
- throws NetconfException {
- boolean result = true;
- if (listener != null) {
- result = listener.verifyEditConfig(targetConfiguration, mode, newConfiguration);
- }
- return result;
- }
-
- @Override
- public boolean copyConfig(TargetConfig targetConfiguration, String newConfiguration)
+ public boolean copyConfig(DatastoreId targetConfiguration, String newConfiguration)
throws NetconfException {
return false;
}
@@ -144,17 +112,11 @@
}
@Override
- public boolean deleteConfig(TargetConfig targetConfiguration) throws NetconfException {
+ public boolean deleteConfig(DatastoreId targetConfiguration) throws NetconfException {
return false;
}
@Override
- public boolean deleteConfig(String targetConfiguration) throws NetconfException {
- return false;
- }
-
-
- @Override
public void startSubscription() throws NetconfException {
}
@@ -172,12 +134,12 @@
}
@Override
- public boolean lock(String configType) throws NetconfException {
+ public boolean lock(DatastoreId configType) throws NetconfException {
return false;
}
@Override
- public boolean unlock(String configType) throws NetconfException {
+ public boolean unlock(DatastoreId configType) throws NetconfException {
return false;
}
@@ -202,15 +164,6 @@
}
@Override
- public String getServerCapabilities() {
- return null;
- }
-
- @Override
- public void setDeviceCapabilities(List<String> capabilities) {
- }
-
- @Override
public void checkAndReestablish() throws NetconfException {
}
diff --git a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltAlertConfigTest.java b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltAlertConfigTest.java
index 02136f8..f12b631 100644
--- a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltAlertConfigTest.java
+++ b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltAlertConfigTest.java
@@ -19,7 +19,7 @@
import org.apache.commons.io.IOUtils;
import org.junit.Before;
import org.junit.Test;
-import org.onosproject.netconf.TargetConfig;
+import org.onosproject.netconf.DatastoreId;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -31,7 +31,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import static org.onosproject.drivers.fujitsu.FujitsuVoltXmlUtilityMock.*;
-import static org.onosproject.netconf.TargetConfig.*;
+import static org.onosproject.netconf.DatastoreId.*;
/**
@@ -232,11 +232,11 @@
@Override
public boolean verifyEditConfig(String targetConfiguration, String mode, String newConfiguration) {
- return verifyEditConfig(TargetConfig.valueOf(targetConfiguration), mode, newConfiguration);
+ return verifyEditConfig(DatastoreId.datastore(targetConfiguration), mode, newConfiguration);
}
@Override
- public boolean verifyEditConfig(TargetConfig target, String mode, String request) {
+ public boolean verifyEditConfig(DatastoreId target, String mode, String request) {
boolean result;
assertTrue("Incorrect target", target.equals(RUNNING));
diff --git a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltControllerConfigTest.java b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltControllerConfigTest.java
index 3365bb8..0605ba7 100644
--- a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltControllerConfigTest.java
+++ b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltControllerConfigTest.java
@@ -23,8 +23,7 @@
import org.onosproject.net.behaviour.ControllerInfo;
import org.junit.Before;
import org.junit.Test;
-import org.onosproject.netconf.TargetConfig;
-
+import org.onosproject.netconf.DatastoreId;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -191,7 +190,7 @@
}
@Override
- public boolean verifyEditConfig(TargetConfig target, String mode, String request) {
+ public boolean verifyEditConfig(DatastoreId target, String mode, String request) {
return false;
}
diff --git a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltFwdlConfigTest.java b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltFwdlConfigTest.java
index c01b448..fb8b373 100644
--- a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltFwdlConfigTest.java
+++ b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltFwdlConfigTest.java
@@ -18,7 +18,7 @@
import org.junit.Before;
import org.junit.Test;
-import org.onosproject.netconf.TargetConfig;
+import org.onosproject.netconf.DatastoreId;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
@@ -165,7 +165,7 @@
}
@Override
- public boolean verifyEditConfig(TargetConfig target, String mode, String request) {
+ public boolean verifyEditConfig(DatastoreId target, String mode, String request) {
return false;
}
diff --git a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltNeConfigTest.java b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltNeConfigTest.java
index 2368eb1..0214627 100644
--- a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltNeConfigTest.java
+++ b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltNeConfigTest.java
@@ -18,8 +18,7 @@
import org.junit.Before;
import org.junit.Test;
-import org.onosproject.netconf.TargetConfig;
-
+import org.onosproject.netconf.DatastoreId;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNotNull;
import static org.onosproject.drivers.fujitsu.FujitsuVoltXmlUtilityMock.*;
@@ -81,7 +80,7 @@
}
@Override
- public boolean verifyEditConfig(TargetConfig target, String mode, String request) {
+ public boolean verifyEditConfig(DatastoreId target, String mode, String request) {
return false;
}
diff --git a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltNniLinkConfigTest.java b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltNniLinkConfigTest.java
index 5e9c55c..53e19d3 100644
--- a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltNniLinkConfigTest.java
+++ b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltNniLinkConfigTest.java
@@ -18,14 +18,13 @@
import org.junit.Before;
import org.junit.Test;
-import org.onosproject.netconf.TargetConfig;
-
+import org.onosproject.netconf.DatastoreId;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertNotNull;
import static org.onosproject.drivers.fujitsu.FujitsuVoltXmlUtilityMock.*;
-import static org.onosproject.netconf.TargetConfig.RUNNING;
+import static org.onosproject.netconf.DatastoreId.RUNNING;
/**
* Unit tests for methods of FujitsuVoltPonLinkConfig.
@@ -216,7 +215,7 @@
}
@Override
- public boolean verifyEditConfig(TargetConfig target, String mode, String request) {
+ public boolean verifyEditConfig(DatastoreId target, String mode, String request) {
boolean result;
assertTrue("Incorrect target", target.equals(RUNNING));
diff --git a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltOnuConfigTest.java b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltOnuConfigTest.java
index 5778a1b..aecf2c1 100644
--- a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltOnuConfigTest.java
+++ b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltOnuConfigTest.java
@@ -18,8 +18,7 @@
import org.junit.Before;
import org.junit.Test;
-import org.onosproject.netconf.TargetConfig;
-
+import org.onosproject.netconf.DatastoreId;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertNotNull;
@@ -345,7 +344,7 @@
}
@Override
- public boolean verifyEditConfig(TargetConfig target, String mode, String request) {
+ public boolean verifyEditConfig(DatastoreId target, String mode, String request) {
return false;
}
diff --git a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltOnuOperConfigTest.java b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltOnuOperConfigTest.java
index 7268d9a..307af6a 100644
--- a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltOnuOperConfigTest.java
+++ b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltOnuOperConfigTest.java
@@ -18,7 +18,7 @@
import org.junit.Before;
import org.junit.Test;
-import org.onosproject.netconf.TargetConfig;
+import org.onosproject.netconf.DatastoreId;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
@@ -220,7 +220,7 @@
}
@Override
- public boolean verifyEditConfig(TargetConfig target, String mode, String request) {
+ public boolean verifyEditConfig(DatastoreId target, String mode, String request) {
return false;
}
diff --git a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltPonLinkConfigTest.java b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltPonLinkConfigTest.java
index a1d7f7a..ba141b2 100644
--- a/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltPonLinkConfigTest.java
+++ b/drivers/fujitsu/src/test/java/org/onosproject/drivers/fujitsu/FujitsuVoltPonLinkConfigTest.java
@@ -18,14 +18,13 @@
import org.junit.Before;
import org.junit.Test;
-import org.onosproject.netconf.TargetConfig;
-
+import org.onosproject.netconf.DatastoreId;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertNotNull;
import static org.onosproject.drivers.fujitsu.FujitsuVoltXmlUtilityMock.*;
-import static org.onosproject.netconf.TargetConfig.RUNNING;
+import static org.onosproject.netconf.DatastoreId.RUNNING;
/**
* Unit tests for methods of FujitsuVoltPonLinkConfig.
@@ -227,7 +226,7 @@
}
@Override
- public boolean verifyEditConfig(TargetConfig target, String mode, String request) {
+ public boolean verifyEditConfig(DatastoreId target, String mode, String request) {
boolean result;
assertTrue("Incorrect target", target.equals(RUNNING));
diff --git a/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/NetconfConfigGetter.java b/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/NetconfConfigGetter.java
index bbdd614..087af0c 100644
--- a/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/NetconfConfigGetter.java
+++ b/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/NetconfConfigGetter.java
@@ -16,6 +16,7 @@
package org.onosproject.drivers.microsemi;
+import static org.onosproject.netconf.DatastoreId.datastore;
import static org.slf4j.LoggerFactory.getLogger;
import java.io.IOException;
@@ -66,7 +67,8 @@
return UNABLE_TO_READ_CONFIG;
}
try {
- return controller.getDevicesMap().get(ofDeviceId).getSession().getConfig(type.replace("cfgType=", ""));
+ return controller.getDevicesMap().get(ofDeviceId).getSession()
+ .getConfig(datastore(type.replace("cfgType=", "")));
} catch (IOException e) {
log.error("Configuration could not be retrieved {}", e.getMessage());
}
diff --git a/drivers/microsemi/src/test/java/org/onosproject/drivers/microsemi/yang/MockNetconfSessionEa1000.java b/drivers/microsemi/src/test/java/org/onosproject/drivers/microsemi/yang/MockNetconfSessionEa1000.java
index 244934b..8068cff 100644
--- a/drivers/microsemi/src/test/java/org/onosproject/drivers/microsemi/yang/MockNetconfSessionEa1000.java
+++ b/drivers/microsemi/src/test/java/org/onosproject/drivers/microsemi/yang/MockNetconfSessionEa1000.java
@@ -15,7 +15,6 @@
*/
package org.onosproject.drivers.microsemi.yang;
-import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Pattern;
@@ -24,12 +23,11 @@
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 MockNetconfSessionEa1000 implements NetconfSession {
+public class MockNetconfSessionEa1000 extends NetconfSessionAdapter {
private static final Logger log = LoggerFactory
.getLogger(MockNetconfSessionEa1000.class);
@@ -822,7 +820,6 @@
return reply;
}
-
@Override
public String getConfig(DatastoreId targetConfiguration, String configurationSchema) throws NetconfException {
StringBuilder rpc = new StringBuilder(XML_HEADER);
@@ -888,7 +885,7 @@
@Override
public boolean copyConfig(String targetConfiguration, String newConfiguration) throws NetconfException {
- return copyConfig(TargetConfig.valueOf(targetConfiguration), newConfiguration);
+ return copyConfig(DatastoreId.datastore(targetConfiguration), newConfiguration);
}
@Override
@@ -933,18 +930,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
diff --git a/drivers/microsemi/src/test/java/org/onosproject/drivers/microsemi/yang/package-info.java b/drivers/microsemi/src/test/java/org/onosproject/drivers/microsemi/yang/package-info.java
deleted file mode 100644
index 7acdee9..0000000
--- a/drivers/microsemi/src/test/java/org/onosproject/drivers/microsemi/yang/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2016-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Package for Microsemi device drivers support for NETCONF for EA1000.
- */
-package org.onosproject.drivers.microsemi.yang;
\ No newline at end of file
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