From 5f8cd4730e1e150aca8b1feba58a08975a84df08 Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Mon, 30 Jun 2014 21:42:35 -0700 Subject: [PATCH] Making room for performance test & setting sleep for mininet shutdown Change-Id: Ic3e312b5275477170de1c29d5e7199e397aeb003 Signed-off-by: Luis Gomez --- test/csit/suites/base-of10/010__AD_SAL_NSF/__init__.txt | 2 +- test/csit/suites/base-of10/020__AD_SAL_Apps/__init__.txt | 2 +- test/csit/suites/base-of10/030__OVSDB/__init__.txt | 2 +- test/csit/suites/base-of13/010__MD_SAL_NSF/__init__.txt | 2 +- test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/__init__.txt | 2 +- test/csit/suites/base-of13/030__AD_SAL_NSF/__init__.txt | 2 +- test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/__init__.txt | 2 +- test/csit/suites/base-of13/050__AD_SAL_Apps/__init__.txt | 2 +- test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/__init__.txt | 2 +- test/csit/suites/base-of13/070__Flows_OF13/__init__.txt | 2 +- .../base-of13/{080__OVSDB => 090__OVSDB}/010__bridge_domain.txt | 2 +- .../suites/base-of13/{080__OVSDB => 090__OVSDB}/__init__.txt | 2 +- .../{090__OVSDB_OF13 => 100__OVSDB_OF13}/010__bridge_domain.txt | 2 +- .../base-of13/{090__OVSDB_OF13 => 100__OVSDB_OF13}/__init__.txt | 2 +- test/csit/suites/sp-of10/010__AD_SAL_NSF/__init__.txt | 2 +- test/csit/suites/vtn-of10/010__AD_SAL_NSF/__init__.txt | 2 +- test/csit/suites/vtn-of10/020__VTN/__init__.txt | 2 +- test/csit/suites/vtn-of13/050__VTN/__init__.txt | 2 +- test/csit/suites/vtn-of13/060__VTN_OF13/__init__.txt | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) rename test/csit/suites/base-of13/{080__OVSDB => 090__OVSDB}/010__bridge_domain.txt (99%) rename test/csit/suites/base-of13/{080__OVSDB => 090__OVSDB}/__init__.txt (97%) rename test/csit/suites/base-of13/{090__OVSDB_OF13 => 100__OVSDB_OF13}/010__bridge_domain.txt (99%) rename test/csit/suites/base-of13/{090__OVSDB_OF13 => 100__OVSDB_OF13}/__init__.txt (97%) diff --git a/test/csit/suites/base-of10/010__AD_SAL_NSF/__init__.txt b/test/csit/suites/base-of10/010__AD_SAL_NSF/__init__.txt index 8c56b003cc..bfb1b99bb3 100644 --- a/test/csit/suites/base-of10/010__AD_SAL_NSF/__init__.txt +++ b/test/csit/suites/base-of10/010__AD_SAL_NSF/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection diff --git a/test/csit/suites/base-of10/020__AD_SAL_Apps/__init__.txt b/test/csit/suites/base-of10/020__AD_SAL_Apps/__init__.txt index 310cb945b0..38c3564efe 100644 --- a/test/csit/suites/base-of10/020__AD_SAL_Apps/__init__.txt +++ b/test/csit/suites/base-of10/020__AD_SAL_Apps/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection diff --git a/test/csit/suites/base-of10/030__OVSDB/__init__.txt b/test/csit/suites/base-of10/030__OVSDB/__init__.txt index 182db102cc..3b63660d6b 100644 --- a/test/csit/suites/base-of10/030__OVSDB/__init__.txt +++ b/test/csit/suites/base-of10/030__OVSDB/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection diff --git a/test/csit/suites/base-of13/010__MD_SAL_NSF/__init__.txt b/test/csit/suites/base-of13/010__MD_SAL_NSF/__init__.txt index 7cbfbf18e3..ea644f144e 100644 --- a/test/csit/suites/base-of13/010__MD_SAL_NSF/__init__.txt +++ b/test/csit/suites/base-of13/010__MD_SAL_NSF/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection diff --git a/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/__init__.txt b/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/__init__.txt index 019b0883b6..7b77f73dc1 100644 --- a/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/__init__.txt +++ b/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection diff --git a/test/csit/suites/base-of13/030__AD_SAL_NSF/__init__.txt b/test/csit/suites/base-of13/030__AD_SAL_NSF/__init__.txt index 29d6ca5748..207406366f 100644 --- a/test/csit/suites/base-of13/030__AD_SAL_NSF/__init__.txt +++ b/test/csit/suites/base-of13/030__AD_SAL_NSF/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection diff --git a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/__init__.txt b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/__init__.txt index b2ca3487c3..c79119017f 100644 --- a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/__init__.txt +++ b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection diff --git a/test/csit/suites/base-of13/050__AD_SAL_Apps/__init__.txt b/test/csit/suites/base-of13/050__AD_SAL_Apps/__init__.txt index 0c6c07592e..a951e5a898 100644 --- a/test/csit/suites/base-of13/050__AD_SAL_Apps/__init__.txt +++ b/test/csit/suites/base-of13/050__AD_SAL_Apps/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection diff --git a/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/__init__.txt b/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/__init__.txt index 5882daa213..0f342eaf56 100644 --- a/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/__init__.txt +++ b/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection diff --git a/test/csit/suites/base-of13/070__Flows_OF13/__init__.txt b/test/csit/suites/base-of13/070__Flows_OF13/__init__.txt index 2adb9689ee..6bc7123def 100644 --- a/test/csit/suites/base-of13/070__Flows_OF13/__init__.txt +++ b/test/csit/suites/base-of13/070__Flows_OF13/__init__.txt @@ -23,6 +23,6 @@ Stop Suite Log Stop the test on the base edition Read Write exit - Sleep 4 + Sleep 2 Read Close Connection diff --git a/test/csit/suites/base-of13/080__OVSDB/010__bridge_domain.txt b/test/csit/suites/base-of13/090__OVSDB/010__bridge_domain.txt similarity index 99% rename from test/csit/suites/base-of13/080__OVSDB/010__bridge_domain.txt rename to test/csit/suites/base-of13/090__OVSDB/010__bridge_domain.txt index 32f79060fa..92d8a399ed 100644 --- a/test/csit/suites/base-of13/080__OVSDB/010__bridge_domain.txt +++ b/test/csit/suites/base-of13/090__OVSDB/010__bridge_domain.txt @@ -6,7 +6,7 @@ Library SSHLibrary Library Collections Library ../../../libraries/RequestsLibrary.py Library ../../../libraries/Common.py -Library ../../../libraries/Topologynew.py +Library ../../../libraries/Topology.py Variables ../../../variables/Variables.py *** Variables *** diff --git a/test/csit/suites/base-of13/080__OVSDB/__init__.txt b/test/csit/suites/base-of13/090__OVSDB/__init__.txt similarity index 97% rename from test/csit/suites/base-of13/080__OVSDB/__init__.txt rename to test/csit/suites/base-of13/090__OVSDB/__init__.txt index 31c9137a28..278306451f 100644 --- a/test/csit/suites/base-of13/080__OVSDB/__init__.txt +++ b/test/csit/suites/base-of13/090__OVSDB/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection diff --git a/test/csit/suites/base-of13/090__OVSDB_OF13/010__bridge_domain.txt b/test/csit/suites/base-of13/100__OVSDB_OF13/010__bridge_domain.txt similarity index 99% rename from test/csit/suites/base-of13/090__OVSDB_OF13/010__bridge_domain.txt rename to test/csit/suites/base-of13/100__OVSDB_OF13/010__bridge_domain.txt index 32f79060fa..92d8a399ed 100644 --- a/test/csit/suites/base-of13/090__OVSDB_OF13/010__bridge_domain.txt +++ b/test/csit/suites/base-of13/100__OVSDB_OF13/010__bridge_domain.txt @@ -6,7 +6,7 @@ Library SSHLibrary Library Collections Library ../../../libraries/RequestsLibrary.py Library ../../../libraries/Common.py -Library ../../../libraries/Topologynew.py +Library ../../../libraries/Topology.py Variables ../../../variables/Variables.py *** Variables *** diff --git a/test/csit/suites/base-of13/090__OVSDB_OF13/__init__.txt b/test/csit/suites/base-of13/100__OVSDB_OF13/__init__.txt similarity index 97% rename from test/csit/suites/base-of13/090__OVSDB_OF13/__init__.txt rename to test/csit/suites/base-of13/100__OVSDB_OF13/__init__.txt index 98abe73cf9..a6e6479ca3 100644 --- a/test/csit/suites/base-of13/090__OVSDB_OF13/__init__.txt +++ b/test/csit/suites/base-of13/100__OVSDB_OF13/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection diff --git a/test/csit/suites/sp-of10/010__AD_SAL_NSF/__init__.txt b/test/csit/suites/sp-of10/010__AD_SAL_NSF/__init__.txt index 8c56b003cc..bfb1b99bb3 100644 --- a/test/csit/suites/sp-of10/010__AD_SAL_NSF/__init__.txt +++ b/test/csit/suites/sp-of10/010__AD_SAL_NSF/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection diff --git a/test/csit/suites/vtn-of10/010__AD_SAL_NSF/__init__.txt b/test/csit/suites/vtn-of10/010__AD_SAL_NSF/__init__.txt index 8c56b003cc..bfb1b99bb3 100644 --- a/test/csit/suites/vtn-of10/010__AD_SAL_NSF/__init__.txt +++ b/test/csit/suites/vtn-of10/010__AD_SAL_NSF/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection diff --git a/test/csit/suites/vtn-of10/020__VTN/__init__.txt b/test/csit/suites/vtn-of10/020__VTN/__init__.txt index 2eae73851a..470da70a1a 100644 --- a/test/csit/suites/vtn-of10/020__VTN/__init__.txt +++ b/test/csit/suites/vtn-of10/020__VTN/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection diff --git a/test/csit/suites/vtn-of13/050__VTN/__init__.txt b/test/csit/suites/vtn-of13/050__VTN/__init__.txt index 40f27106ae..c1c7716356 100644 --- a/test/csit/suites/vtn-of13/050__VTN/__init__.txt +++ b/test/csit/suites/vtn-of13/050__VTN/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection diff --git a/test/csit/suites/vtn-of13/060__VTN_OF13/__init__.txt b/test/csit/suites/vtn-of13/060__VTN_OF13/__init__.txt index 40f27106ae..c1c7716356 100644 --- a/test/csit/suites/vtn-of13/060__VTN_OF13/__init__.txt +++ b/test/csit/suites/vtn-of13/060__VTN_OF13/__init__.txt @@ -22,6 +22,6 @@ Stop Suite Log Stop mininet Read Write exit - Sleep 4 + Sleep 6 Read Close Connection -- 2.36.6