Transplant DatastoreId to Mina based session impl.
- porting ONOS-6410 support to mina.
See https://gerrit.onosproject.org/13814
Change-Id: I026fec6cd153afdac9b47bc8a380ae5f011fd741
diff --git a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfSessionMinaImpl.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfSessionMinaImpl.java
index cdbde45..94a14e5 100644
--- a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfSessionMinaImpl.java
+++ b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfSessionMinaImpl.java
@@ -26,6 +26,7 @@
import org.apache.sshd.client.future.OpenFuture;
import org.apache.sshd.client.session.ClientSession;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
+import org.onosproject.netconf.DatastoreId;
import org.onosproject.netconf.NetconfDeviceInfo;
import org.onosproject.netconf.NetconfDeviceOutputEvent;
import org.onosproject.netconf.NetconfDeviceOutputEvent.Type;
@@ -33,7 +34,6 @@
import org.onosproject.netconf.NetconfException;
import org.onosproject.netconf.NetconfSession;
import org.onosproject.netconf.NetconfSessionFactory;
-import org.onosproject.netconf.TargetConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
@@ -501,22 +501,13 @@
}
@Override
- public String getConfig(TargetConfig netconfTargetConfig) throws NetconfException {
+ public String getConfig(DatastoreId netconfTargetConfig) throws NetconfException {
return getConfig(netconfTargetConfig, null);
}
@Override
- public String getConfig(String netconfTargetConfig) throws NetconfException {
- return getConfig(TargetConfig.toTargetConfig(netconfTargetConfig));
- }
-
- @Override
- public String getConfig(String netconfTargetConfig, String configurationFilterSchema) throws NetconfException {
- return getConfig(TargetConfig.toTargetConfig(netconfTargetConfig), configurationFilterSchema);
- }
-
- @Override
- public String getConfig(TargetConfig netconfTargetConfig, String configurationSchema) throws NetconfException {
+ public String getConfig(DatastoreId netconfTargetConfig,
+ String configurationSchema) throws NetconfException {
StringBuilder rpc = new StringBuilder(XML_HEADER);
rpc.append("<rpc ");
rpc.append(MESSAGE_ID_STRING);
@@ -548,14 +539,11 @@
}
@Override
- public boolean editConfig(String netconfTargetConfig, String mode, String newConfiguration)
+ public boolean editConfig(DatastoreId netconfTargetConfig,
+ String mode,
+ String newConfiguration)
throws NetconfException {
- return editConfig(TargetConfig.toTargetConfig(netconfTargetConfig), mode, newConfiguration);
- }
- @Override
- public boolean editConfig(TargetConfig netconfTargetConfig, String mode, String newConfiguration)
- throws NetconfException {
newConfiguration = newConfiguration.trim();
StringBuilder rpc = new StringBuilder(XML_HEADER);
rpc.append(RPC_OPEN);
@@ -586,27 +574,61 @@
}
@Override
- public boolean copyConfig(String netconfTargetConfig, String newConfiguration) throws NetconfException {
- return copyConfig(TargetConfig.toTargetConfig(netconfTargetConfig), newConfiguration);
+ public boolean copyConfig(DatastoreId destination,
+ DatastoreId source)
+ throws NetconfException {
+ return bareCopyConfig(destination.asXml(), source.asXml());
}
@Override
- public boolean copyConfig(TargetConfig netconfTargetConfig, String newConfiguration)
+ public boolean copyConfig(DatastoreId netconfTargetConfig,
+ String newConfiguration)
throws NetconfException {
- newConfiguration = newConfiguration.trim();
- if (!newConfiguration.startsWith("<config>")) {
- newConfiguration = "<config>" + newConfiguration
- + "</config>";
+ return bareCopyConfig(netconfTargetConfig.asXml(),
+ normalizeCopyConfigParam(newConfiguration));
+ }
+
+ @Override
+ public boolean copyConfig(String netconfTargetConfig,
+ String newConfiguration) throws NetconfException {
+ return bareCopyConfig(normalizeCopyConfigParam(netconfTargetConfig),
+ normalizeCopyConfigParam(newConfiguration));
+ }
+
+ /**
+ * Normalize String parameter passed to copy-config API.
+ * <p>
+ * Provided for backward compatibility purpose
+ *
+ * @param input passed to copyConfig API
+ * @return XML likely to be suitable for copy-config source or target
+ */
+ private static CharSequence normalizeCopyConfigParam(String input) {
+ input = input.trim();
+ if (input.startsWith("<url")) {
+ return input;
+ } else if (!input.startsWith("<")) {
+ // assume it is a datastore name
+ return DatastoreId.datastore(input).asXml();
+ } else if (!input.startsWith("<config>")) {
+ return "<config>" + input + "</config>";
}
+ return input;
+ }
+
+ private boolean bareCopyConfig(CharSequence target,
+ CharSequence source)
+ throws NetconfException {
+
StringBuilder rpc = new StringBuilder(XML_HEADER);
rpc.append(RPC_OPEN);
rpc.append(NETCONF_BASE_NAMESPACE).append(">\n");
rpc.append("<copy-config>");
rpc.append("<target>");
- rpc.append("<").append(netconfTargetConfig).append("/>");
+ rpc.append(target);
rpc.append("</target>");
rpc.append("<source>");
- rpc.append(newConfiguration);
+ rpc.append(source);
rpc.append("</source>");
rpc.append("</copy-config>");
rpc.append("</rpc>");
@@ -615,13 +637,8 @@
}
@Override
- public boolean deleteConfig(String netconfTargetConfig) throws NetconfException {
- return deleteConfig(TargetConfig.toTargetConfig(netconfTargetConfig));
- }
-
- @Override
- public boolean deleteConfig(TargetConfig netconfTargetConfig) throws NetconfException {
- if (netconfTargetConfig.equals(TargetConfig.RUNNING)) {
+ public boolean deleteConfig(DatastoreId netconfTargetConfig) throws NetconfException {
+ if (netconfTargetConfig.equals(DatastoreId.RUNNING)) {
log.warn("Target configuration for delete operation can't be \"running\"",
netconfTargetConfig);
return false;
@@ -639,13 +656,13 @@
}
@Override
- public boolean lock(String configType) throws NetconfException {
+ public boolean lock(DatastoreId configType) throws NetconfException {
StringBuilder rpc = new StringBuilder(XML_HEADER);
rpc.append("<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n");
rpc.append("<lock>");
rpc.append("<target>");
rpc.append("<");
- rpc.append(configType);
+ rpc.append(configType.id());
rpc.append("/>");
rpc.append("</target>");
rpc.append("</lock>");
@@ -656,13 +673,13 @@
}
@Override
- public boolean unlock(String configType) throws NetconfException {
+ public boolean unlock(DatastoreId configType) throws NetconfException {
StringBuilder rpc = new StringBuilder(XML_HEADER);
rpc.append("<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n");
rpc.append("<unlock>");
rpc.append("<target>");
rpc.append("<");
- rpc.append(configType);
+ rpc.append(configType.id());
rpc.append("/>");
rpc.append("</target>");
rpc.append("</unlock>");
@@ -673,16 +690,6 @@
}
@Override
- public boolean lock() throws NetconfException {
- return lock("running");
- }
-
- @Override
- public boolean unlock() throws NetconfException {
- return unlock("running");
- }
-
- @Override
public boolean close() throws NetconfException {
return close(false);
}