Generate configs for beryllium path.

Make testtool generate configs for beryllium paths with lithium fallback.
Also add keepalive executor to prevent warnings.

Change-Id: I63f5530e89fd024a0a1bb025ae9ba20bc8ee81ed
Signed-off-by: Tomas Cere <tcere@cisco.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 4b5c24a0647f8cf751adb64f25cfb08f0dfc1e68..ee8cce67034a45f27f7000997317894961d183ee 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
@@ -379,7 +379,12 @@ public final class Main {
             checkExistingDir(distroFolder, String.format("Folder %s does not exist", distroFolder));
 
             final File systemDir = checkExistingDir(new File(distroFolder, "system"), String.format("Folder %s does not contain a karaf distro, folder system is missing", distroFolder));
-            final File netconfConnectorFeaturesParentDir = checkExistingDir(new File(systemDir, "org/opendaylight/controller/" + featureName), String.format("Karaf distro in %s does not contain netconf-connector features", distroFolder));
+
+            //check if beryllium path exists, if it doesnt check for lithium and fail/succeed after
+            File netconfConnectorFeaturesParentDir = new File(systemDir, "org/opendaylight/netconf/" + featureName);
+            if (!netconfConnectorFeaturesParentDir.exists() || !netconfConnectorFeaturesParentDir.isDirectory()) {
+                netconfConnectorFeaturesParentDir = checkExistingDir(new File(systemDir, "org/opendaylight/controller/" + featureName), String.format("Karaf distro in %s does not contain netconf-connector features", distroFolder));
+            }
 
             // Find newest version for features
             final File newestVersionDir = Collections.max(

diff --git a/opendaylight/netconf/tools/netconf-testtool/src/main/resources/99-netconf-connector-simulated.xml b/opendaylight/netconf/tools/netconf-testtool/src/main/resources/99-netconf-connector-simulated.xml
index f0d429d7cd5a1b7b0dc05c66315053528c474f6b..43b94559528aeead823c1e95bc9e9874e8bdb7c8 100644 (file)
--- a/opendaylight/netconf/tools/netconf-testtool/src/main/resources/99-netconf-connector-simulated.xml
+++ b/opendaylight/netconf/tools/netconf-testtool/src/main/resources/99-netconf-connector-simulated.xml
@@ -42,11 +42,15 @@
             <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:threadpool">prefix:threadpool</type>
             <name>global-netconf-processing-executor</name>
           </processing-executor>
+          <keepalive-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
+            <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:threadpool">prefix:scheduled-threadpool</type>
+            <name>global-netconf-ssh-scheduled-executor</name>
+          </keepalive-executor>
         </module>
         </modules>
     </data>
   </configuration>
   <required-capabilities>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf?module=odl-sal-netconf-connector-cfg&amp;revision=2013-10-28</capability>
+    <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf?module=odl-sal-netconf-connector-cfg&amp;revision=2015-08-03</capability>
   </required-capabilities>
 </snapshot>