Merged the netconf testplans into one.

The new test plan contains the old Netconf suite and the new
MDSAL and CRUD suites. All of these are "user features" so
they are run by a test plan called "userfeatures".

Change-Id: I251933d6f55320eac7b63069da513de6825e1a2c
Signed-off-by: Jozef Behran <jbehran@cisco.com>

diff --git a/csit/testplans/controller-netconf.txt b/csit/testplans/controller-netconf.txt
deleted file mode 100644 (file)
index 6c6a314..0000000
--- a/csit/testplans/controller-netconf.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Place the suites in run order:
-integration/test/csit/suites/netconf/ready
-integration/test/csit/suites/controller/NETCONF
-

diff --git a/csit/testplans/netconf-MDSAL.txt b/csit/testplans/netconf-MDSAL.txt
deleted file mode 100644 (file)
index 970bdd6..0000000
--- a/csit/testplans/netconf-MDSAL.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0 which accompanies this distribution,
-# 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/MDSAL

diff --git a/csit/testplans/netconf-userfeatures.txt b/csit/testplans/netconf-userfeatures.txt
index 7cdbf3de59ab51ec3af1b7c0d84f71aed8ced960..cf778413f0261c6078043cc626a9c0f24a441b7c 100644 (file)
--- a/csit/testplans/netconf-userfeatures.txt
+++ b/csit/testplans/netconf-userfeatures.txt
@@ -6,4 +6,6 @@
 
 # Place the suites in run order:
 integration/test/csit/suites/netconf/ready
+integration/test/csit/suites/netconf/MDSAL
 integration/test/csit/suites/netconf/CRUD
+integration/test/csit/suites/controller/NETCONF