Refactor script plans

Depends-On: I6c594be8ac9b084f18171dc8ab4605b4062dfd3f
Change-Id: I15849ade175b18de551d975873a9d232fa99ad77
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/csit/configplans/netvirt-1node-minimal-openstack.txt b/csit/configplans/netvirt-1node-minimal-openstack.txt
deleted file mode 100644 (file)
index 58ef5fd..0000000
--- a/csit/configplans/netvirt-1node-minimal-openstack.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Place the scripts in run order:
-integration/test/csit/scripts/set_sg_mode.sh

diff --git a/csit/configplans/netvirt-1node-openstack-tempest.txt b/csit/configplans/netvirt-1node-openstack-tempest.txt
deleted file mode 120000 (symlink)
index 4092615..0000000
--- a/csit/configplans/netvirt-1node-openstack-tempest.txt
+++ /dev/null
@@ -1 +0,0 @@
-netvirt-1node-openstack.txt
\ No newline at end of file

diff --git a/csit/configplans/netvirt-3node-openstack-tempest.txt b/csit/configplans/netvirt-3node-openstack-tempest.txt
deleted file mode 120000 (symlink)
index c3f6b34..0000000
--- a/csit/configplans/netvirt-3node-openstack-tempest.txt
+++ /dev/null
@@ -1 +0,0 @@
-netvirt-3node-openstack.txt
\ No newline at end of file

diff --git a/csit/configplans/netvirt-3node-openstack.txt b/csit/configplans/netvirt-3node-openstack.txt
deleted file mode 100644 (file)
index 3b76a33..0000000
--- a/csit/configplans/netvirt-3node-openstack.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Place the scripts in run order:
-# netvirt-3node-openstack.txt is the target file with links to it from:
-# netvirt-3node-openstack-tempest.txt
-integration/test/csit/scripts/set_sg_mode.sh
-integration/test/csit/scripts/set_federation_rabbit.sh
-integration/test/csit/scripts/set_snat_mode.sh
-integration/test/csit/scripts/disable_ofp_stats.sh
-integration/test/csit/scripts/set_transaction_debugging.sh
-integration/test/csit/scripts/set_ovsdb_inactivity_probe.sh
-integration/test/csit/scripts/set_ovsdb_monitor.sh

diff --git a/csit/configplans/netvirt-1node-openstack.txt b/csit/configplans/netvirt.txt
similarity index 78%
rename from csit/configplans/netvirt-1node-openstack.txt
rename to csit/configplans/netvirt.txt
index 04f317265833625a92b6b85b1eb08fd31a736155..9ed9a59317858fff650880b345871681b2fd5be1 100644 (file)
--- a/csit/configplans/netvirt-1node-openstack.txt
+++ b/csit/configplans/netvirt.txt
@@ -1,6 +1,4 @@
 # Place the scripts in run order:
-# netvirt-1node-openstack.txt is the target file with links to it from:
-# netvirt-1node-openstack-tempest.txt
 integration/test/csit/scripts/set_sg_mode.sh
 integration/test/csit/scripts/set_federation_rabbit.sh
 integration/test/csit/scripts/set_snat_mode.sh

diff --git a/csit/scriptplans/netvirt-1node-l2gw-openstack.txt b/csit/scriptplans/netvirt-1node-l2gw-openstack.txt
deleted file mode 120000 (symlink)
index 4092615..0000000
--- a/csit/scriptplans/netvirt-1node-l2gw-openstack.txt
+++ /dev/null
@@ -1 +0,0 @@
-netvirt-1node-openstack.txt
\ No newline at end of file

diff --git a/csit/scriptplans/netvirt-1node-openstack-tempest.txt b/csit/scriptplans/netvirt-1node-openstack-tempest.txt
deleted file mode 120000 (symlink)
index 4092615..0000000
--- a/csit/scriptplans/netvirt-1node-openstack-tempest.txt
+++ /dev/null
@@ -1 +0,0 @@
-netvirt-1node-openstack.txt
\ No newline at end of file

diff --git a/csit/scriptplans/netvirt-1node-openstack-upgrade.txt b/csit/scriptplans/netvirt-1node-openstack-upgrade.txt
deleted file mode 120000 (symlink)
index 4092615..0000000
--- a/csit/scriptplans/netvirt-1node-openstack-upgrade.txt
+++ /dev/null
@@ -1 +0,0 @@
-netvirt-1node-openstack.txt
\ No newline at end of file

diff --git a/csit/scriptplans/netvirt-1node-openstack.txt b/csit/scriptplans/netvirt-1node-openstack.txt
deleted file mode 100644 (file)
index ca9891a..0000000
--- a/csit/scriptplans/netvirt-1node-openstack.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Place the scripts in run order:
-# netvirt-1node-openstack.txt is the target file with links to it from:
-# netvirt-1node-l2gw-openstack.txt
-# netvirt-1node-openstack-tempest.txt
-# netvirt-1node-openstack-upgrade.txt
-# netvirt-1node-tdd-wip-openstack.txt
-# netvirt-3node-l2gw-openstack.txt
-# netvirt-3node-openstack.txt
-# netvirt-3node-openstack-tempest.txt
-# netvirt-3node-tdd-wip-openstack.txt
-# netvirt-extensions-sfc.txt
-integration/test/csit/scripts/set_single_shard.sh

diff --git a/csit/scriptplans/netvirt-1node-tdd-wip-openstack.txt b/csit/scriptplans/netvirt-1node-tdd-wip-openstack.txt
deleted file mode 120000 (symlink)
index 4092615..0000000
--- a/csit/scriptplans/netvirt-1node-tdd-wip-openstack.txt
+++ /dev/null
@@ -1 +0,0 @@
-netvirt-1node-openstack.txt
\ No newline at end of file

diff --git a/csit/scriptplans/netvirt-3node-l2gw-openstack.txt b/csit/scriptplans/netvirt-3node-l2gw-openstack.txt
deleted file mode 120000 (symlink)
index 4092615..0000000
--- a/csit/scriptplans/netvirt-3node-l2gw-openstack.txt
+++ /dev/null
@@ -1 +0,0 @@
-netvirt-1node-openstack.txt
\ No newline at end of file

diff --git a/csit/scriptplans/netvirt-3node-openstack-tempest.txt b/csit/scriptplans/netvirt-3node-openstack-tempest.txt
deleted file mode 120000 (symlink)
index 4092615..0000000
--- a/csit/scriptplans/netvirt-3node-openstack-tempest.txt
+++ /dev/null
@@ -1 +0,0 @@
-netvirt-1node-openstack.txt
\ No newline at end of file

diff --git a/csit/scriptplans/netvirt-3node-openstack.txt b/csit/scriptplans/netvirt-3node-openstack.txt
deleted file mode 120000 (symlink)
index 4092615..0000000
--- a/csit/scriptplans/netvirt-3node-openstack.txt
+++ /dev/null
@@ -1 +0,0 @@
-netvirt-1node-openstack.txt
\ No newline at end of file

diff --git a/csit/scriptplans/netvirt-3node-tdd-wip-openstack.txt b/csit/scriptplans/netvirt-3node-tdd-wip-openstack.txt
deleted file mode 120000 (symlink)
index 4092615..0000000
--- a/csit/scriptplans/netvirt-3node-tdd-wip-openstack.txt
+++ /dev/null
@@ -1 +0,0 @@
-netvirt-1node-openstack.txt
\ No newline at end of file

diff --git a/csit/scriptplans/netvirt-extensions-sfc.txt b/csit/scriptplans/netvirt-extensions-sfc.txt
deleted file mode 120000 (symlink)
index 4092615..0000000
--- a/csit/scriptplans/netvirt-extensions-sfc.txt
+++ /dev/null
@@ -1 +0,0 @@
-netvirt-1node-openstack.txt
\ No newline at end of file

diff --git a/csit/scriptplans/netvirt.txt b/csit/scriptplans/netvirt.txt
new file mode 100644 (file)
index 0000000..c15aa12
--- /dev/null
+++ b/csit/scriptplans/netvirt.txt
@@ -0,0 +1,2 @@
+# Place the scripts in run order:
+integration/test/csit/scripts/set_single_shard.sh