Fix netconf cluter test

- Update model name.
- Adjust perf test duration and tool timeout.
- Remove netconf ready suite.
- Comment failing suite (adding jira ticket)
- Also fix tox issue in docs/conf.py

Change-Id: Ie154e55772f548b5b35adb5c2e017e82e5c302cf
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/csit/suites/netconf/clustering/bug8086.robot b/csit/suites/netconf/clustering/bug8086.robot
index feb335d63b4722e6f4f70147ddeb244b715e73d4..8ecda549a4bb121211a6a5b26f2e58eba390b14d 100644 (file)
--- a/csit/suites/netconf/clustering/bug8086.robot
+++ b/csit/suites/netconf/clustering/bug8086.robot
@@ -210,4 +210,4 @@ Populate_Schema_Directory_Over_Active_Connection
     ...    TODO: Make this configurable and move to NexusKeywords.
     ${filename} =    NexusKeywords.Deploy_Artifact    component=carpeople    artifact=clustering-it-model    name_suffix=-sources.jar
     ${dir} =    BuiltIn.Set_Variable    '${SCHEMA_DIRECTORY}'
-    SSHKeywords.Execute_Command_Should_Pass    mkdir -p '${SCHEMA_DIRECTORY}' && unzip -j '${filename}' META-INF/yang/car.yang -d '${SCHEMA_DIRECTORY}/' && rm '${filename}'
+    SSHKeywords.Execute_Command_Should_Pass    mkdir -p '${SCHEMA_DIRECTORY}' && unzip -j '${filename}' META-INF/yang/car@2014-08-18.yang -d '${SCHEMA_DIRECTORY}/' && rm '${filename}'

diff --git a/csit/suites/netconf/clusteringscale/performance.robot b/csit/suites/netconf/clusteringscale/performance.robot
index 308da600900211801fbc25b911bde8c8e090db40..ec8799f47fcbf470c419b98213ed930c3ba8bfa9 100644 (file)
--- a/csit/suites/netconf/clusteringscale/performance.robot
+++ b/csit/suites/netconf/clusteringscale/performance.robot
@@ -41,7 +41,7 @@ Variables         ${CURDIR}/../../../variables/Variables.py
 
 *** Variables ***
 ${DEVICE_NAME}    ${FIRST_TESTTOOL_PORT}-sim-device
-${REQUEST_COUNT}    65536
+${REQUEST_COUNT}    16384
 ${directory_with_crud_templates}    ${CURDIR}/../../../variables/netconf/CRUD
 ${DEVICE_DATA_CONNECT_TIMEOUT}    60s
 
@@ -99,7 +99,7 @@ Cleanup_And_Collect
 Setup_Everything
     [Documentation]    Setup everything needed for the test cases.
     # Calculate and set the value of the timeout
-    ${value}=    BuiltIn.Evaluate    ${REQUEST_COUNT}/15+10
+    ${value}=    BuiltIn.Evaluate    ${REQUEST_COUNT}/10+20
     Utils.Set_User_Configurable_Variable_Default    TESTTOOL_DEVICE_TIMEOUT    ${value} s
     # Setup resources used by the suite.
     SetupUtils.Setup_Utils_For_Setup_And_Teardown

diff --git a/csit/testplans/netconf-clustering-scale.txt b/csit/testplans/netconf-clustering-scale.txt
index a4654a9cb561644ad8b7723056cbd60120f5ab98..136173ff222ce9ba8239444eee21e6f602c6bff9 100644 (file)
--- a/csit/testplans/netconf-clustering-scale.txt
+++ b/csit/testplans/netconf-clustering-scale.txt
@@ -5,5 +5,4 @@
 # and is available at http://www.eclipse.org/legal/epl-v10.html
 
 # Place the suites in run order:
-integration/test/csit/suites/netconf/ready
 integration/test/csit/suites/netconf/clusteringscale/performance.robot

diff --git a/csit/testplans/netconf-clustering.txt b/csit/testplans/netconf-clustering.txt
index 095faeab510a59dbe16ff0f125884220c8522681..bf8e50d4c586f2e8eb422f7d9842cc54d34cabf4 100644 (file)
--- a/csit/testplans/netconf-clustering.txt
+++ b/csit/testplans/netconf-clustering.txt
@@ -7,21 +7,19 @@
 # Place the suites in run order:
 
 # Run non intrusive cluster tests first.
-integration/test/csit/suites/netconf/ready/netconfready.robot
 integration/test/csit/suites/netconf/clustering/CRUD.robot
 integration/test/csit/suites/netconf/clustering/bug8086.robot
 
 # Run the intrusive cluster tests after the non-intrusive ones.
 integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
-integration/test/csit/suites/netconf/ready/netconfready.robot
 integration/test/csit/suites/netconf/clustering/entity.robot
 integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
-integration/test/csit/suites/netconf/ready/netconfready.robot
-integration/test/csit/suites/netconf/clustering/entity-isolation-rejoin.robot
-integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
-integration/test/csit/suites/netconf/ready/netconfready.robot
 integration/test/csit/suites/netconf/clustering/outages.robot
 
+# Next suite is commented because of NETCONF-454
+#integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
+#integration/test/csit/suites/netconf/clustering/entity-isolation-rejoin.robot
+
 # Repeat some suites again to try to detect breakage caused by
 # the intrusive tests that survived a "device deconfigure" - "device
 # reconfigure" cycle.

diff --git a/docs/conf.py b/docs/conf.py
index 7b2e98172f5856b26ea6b8e41ebddfcda33c6f67..379b33bc72b761e93cc33aaa29a7dc30c11da477 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -10,6 +10,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
+import platform
 from docs_conf.conf import *
 
 # Append to intersphinx_mapping
@@ -23,7 +24,6 @@ linkcheck_ignore = [
 
 nitpicky = True
 
-import platform
 if platform.system() != 'Windows':
     import subprocess
     subprocess.call(["./build-integration-robot-libdoc.sh"])