Introduced additional commandline option --initial-config-xml-file retrievable

via the Simulated get-config rpc.  This supports testing a client with any
specific config without first "pushing" a config via edit-config.  This is useful
for some test scenarios such as testing with malformed configs.

Change-Id: If0da1ba310177687b76ff417ba246182e5e99b77
Signed-off-by: jameshall03885 <ghall@brocade.com>

diff --git a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java
index 510c638db125cbe92c381342944fec50192d477c..4b5c24a0647f8cf751adb64f25cfb08f0dfc1e68 100644 (file)
--- a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java
+++ b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java
@@ -83,6 +83,9 @@ public final class Main {
         @Arg(dest = "md-sal")
         public boolean mdSal;
 
+        @Arg(dest = "initial-config-xml-file")
+        public File initialConfigXMLFile;
+
         static ArgumentParser getParser() {
             final ArgumentParser parser = ArgumentParsers.newArgumentParser("netconf testool");
 
@@ -105,6 +108,11 @@ public final class Main {
                     .help("Xml file containing notifications that should be sent to clients after create subscription is called")
                     .dest("notification-file");
 
+            parser.addArgument("--initial-config-xml-file")
+                    .type(File.class)
+                    .help("Xml file containing initial simulatted configuration to be returned via get-config rpc")
+                    .dest("initial-config-xml-file");
+
             parser.addArgument("--starting-port")
                     .type(Integer.class)
                     .setDefault(17830)

diff --git a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java
index edf74ca4c6ec02c6e20e9772a898072ab5b90947..0093727be06d7b1dbd6c52ce6524fe39643f2ed8 100644 (file)
--- a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java
+++ b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java
@@ -115,7 +115,7 @@ public class NetconfDeviceSimulator implements Closeable {
         this.nioExecutor = nioExecutor;
     }
 
-    private NetconfServerDispatcherImpl createDispatcher(final Map<ModuleBuilder, String> moduleBuilders, final boolean exi, final int generateConfigsTimeout, final Optional<File> notificationsFile, final boolean mdSal) {
+    private NetconfServerDispatcherImpl createDispatcher(final Map<ModuleBuilder, String> moduleBuilders, final boolean exi, final int generateConfigsTimeout, final Optional<File> notificationsFile, final boolean mdSal, final Optional<File> initialConfigXMLFile) {
 
         final Set<Capability> capabilities = Sets.newHashSet(Collections2.transform(moduleBuilders.keySet(), new Function<ModuleBuilder, Capability>() {
             @Override
@@ -133,7 +133,7 @@ public class NetconfDeviceSimulator implements Closeable {
 
         final AggregatedNetconfOperationServiceFactory aggregatedNetconfOperationServiceFactory = new AggregatedNetconfOperationServiceFactory();
         final NetconfOperationServiceFactory operationProvider = mdSal ? new MdsalOperationProvider(idProvider, capabilities, schemaContext) :
-            new SimulatedOperationProvider(idProvider, capabilities, notificationsFile);
+            new SimulatedOperationProvider(idProvider, capabilities, notificationsFile, initialConfigXMLFile);
 
         capabilities.add(new BasicCapability("urn:ietf:params:netconf:capability:candidate:1.0"));
 
@@ -189,7 +189,7 @@ public class NetconfDeviceSimulator implements Closeable {
 
         final Map<ModuleBuilder, String> moduleBuilders = parseSchemasToModuleBuilders(params);
 
-        final NetconfServerDispatcherImpl dispatcher = createDispatcher(moduleBuilders, params.exi, params.generateConfigsTimeout, Optional.fromNullable(params.notificationFile), params.mdSal);
+        final NetconfServerDispatcherImpl dispatcher = createDispatcher(moduleBuilders, params.exi, params.generateConfigsTimeout, Optional.fromNullable(params.notificationFile), params.mdSal, Optional.fromNullable(params.initialConfigXMLFile));
 
         int currentPort = params.startingPort;
 

diff --git a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java
index 17097bd318b1b396290eb7e04df944fca8e4191a..68bebb2756c3be064e6ce3c4b92068e6f9f7c91c 100644 (file)
--- a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java
+++ b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java
@@ -34,9 +34,10 @@ class SimulatedOperationProvider implements NetconfOperationServiceFactory {
 
     public SimulatedOperationProvider(final SessionIdProvider idProvider,
                                       final Set<Capability> caps,
-                                      final Optional<File> notificationsFile) {
+                                      final Optional<File> notificationsFile,
+                                      final Optional<File> initialConfigXMLFile) {
         this.caps = caps;
-        simulatedOperationService = new SimulatedOperationService(idProvider.getCurrentSessionId(), notificationsFile);
+        simulatedOperationService = new SimulatedOperationService(idProvider.getCurrentSessionId(), notificationsFile, initialConfigXMLFile);
     }
 
     @Override
@@ -64,10 +65,12 @@ class SimulatedOperationProvider implements NetconfOperationServiceFactory {
     static class SimulatedOperationService implements NetconfOperationService {
         private final long currentSessionId;
         private final Optional<File> notificationsFile;
+        private final Optional<File> initialConfigXMLFile;
 
-        public SimulatedOperationService(final long currentSessionId, final Optional<File> notificationsFile) {
+        public SimulatedOperationService(final long currentSessionId, final Optional<File> notificationsFile, final Optional<File> initialConfigXMLFile) {
             this.currentSessionId = currentSessionId;
             this.notificationsFile = notificationsFile;
+            this.initialConfigXMLFile = initialConfigXMLFile;
         }
 
         @Override
@@ -75,7 +78,7 @@ class SimulatedOperationProvider implements NetconfOperationServiceFactory {
             final DataList storage = new DataList();
             final SimulatedGet sGet = new SimulatedGet(String.valueOf(currentSessionId), storage);
             final SimulatedEditConfig sEditConfig = new SimulatedEditConfig(String.valueOf(currentSessionId), storage);
-            final SimulatedGetConfig sGetConfig = new SimulatedGetConfig(String.valueOf(currentSessionId), storage);
+            final SimulatedGetConfig sGetConfig = new SimulatedGetConfig(String.valueOf(currentSessionId), storage, initialConfigXMLFile );
             final SimulatedCommit sCommit = new SimulatedCommit(String.valueOf(currentSessionId));
             final SimulatedLock sLock = new SimulatedLock(String.valueOf(currentSessionId));
             final SimulatedUnLock sUnlock = new SimulatedUnLock(String.valueOf(currentSessionId));

diff --git a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java
index 3342691c70e3567b3655cc2dc9125dff2a4e9b13..df0a9eeb1bb155114e8e9f07a51f7871628b0d35 100644 (file)
--- a/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java
+++ b/opendaylight/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java
@@ -9,21 +9,60 @@
 package org.opendaylight.netconf.test.tool.rpc;
 
 import com.google.common.base.Optional;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
 import org.opendaylight.controller.config.util.xml.DocumentedException;
 import org.opendaylight.controller.config.util.xml.XmlElement;
 import org.opendaylight.controller.config.util.xml.XmlUtil;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
 
 public class SimulatedGetConfig extends AbstractConfigNetconfOperation {
 
     private final DataList storage;
+    private static final Logger LOG = LoggerFactory
+            .getLogger(SimulatedGetConfig.class);
 
-    public SimulatedGetConfig(final String netconfSessionIdForReporting, final DataList storage) {
+    public SimulatedGetConfig(final String netconfSessionIdForReporting, final DataList storage, final Optional<File> initialConfigXMLFile) {
         super(null, netconfSessionIdForReporting);
-        this.storage = storage;
+
+        if(initialConfigXMLFile.isPresent()) {
+            LOG.info("File is present: {}", initialConfigXMLFile.get()
+                    .getName());
+            this.storage = loadInitialConfigXMLFile(initialConfigXMLFile.get());
+        }
+        else {
+            this.storage = storage;
+        }
+    }
+
+    private final DataList loadInitialConfigXMLFile( final File file ) {
+        LOG.info("Loading initial config xml file: {}", file.getName());
+        DataList configData = new DataList();
+        List<XmlElement> xmlElementList = Collections.emptyList();
+        try {
+            Element element = XmlUtil.readXmlToElement(file);
+            XmlElement xmlElement = XmlElement.fromDomElement(element);
+            xmlElementList = xmlElement.getChildElements();
+            configData.setConfigList(xmlElementList);
+        }
+        catch (IOException e) {
+            LOG.info("IO exception loading xml file: {} ", e.getMessage());
+
+        }
+        catch (SAXException e) {
+            LOG.info("SAXException {}", e.getMessage());
+        }
+        return configData;
     }
 
     @Override