VTN test fix. This works 100% in my laptop.

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

diff --git a/test/csit/suites/karaf-vtn/050__VTN/010__vtn_manager.txt b/test/csit/suites/karaf-vtn/050__VTN/010__vtn_manager.txt
index e5535049fcdd4665a0d7cbd2888c9308a4c76983..6910dcadafd8193b364c316fc11b48668767ca65 100644 (file)
--- a/test/csit/suites/karaf-vtn/050__VTN/010__vtn_manager.txt
+++ b/test/csit/suites/karaf-vtn/050__VTN/010__vtn_manager.txt
@@ -24,12 +24,12 @@ Add a vBridge vBridge1
     Add a vBridge    Tenant1    vBridge1    {}
 
 Add a interface If1
-    [Documentation]    Add a interface if1 into vBrdige vBrdige1
+    [Documentation]    Add a interface if1 into vBridge vBrdige1
     [Tags]    add
     Add a interface    Tenant1    vBridge1    if1    {}
 
 Add a interface if2
-    [Documentation]    Add a interface if2 into vBrdige vBrdige1
+    [Documentation]    Add a interface if2 into vBridge vBrdige1
     [Tags]    add
     Add a interface    Tenant1    vBridge1    if2    {}
 
@@ -54,12 +54,12 @@ Add a vBridge vBridge2
     Add a vBridge    Tenant1    vBridge2    {}
 
 Add a interface If3
-    [Documentation]    Add a interface if3 into vBrdige vBrdige2
+    [Documentation]    Add a interface if3 into vBridge vBrdige2
     [Tags]    add
     Add a interface    Tenant1    vBridge2    if3    {}
 
 Add a interface if4
-    [Documentation]    Add a interface if4 into vBrdige vBrdige2
+    [Documentation]    Add a interface if4 into vBridge vBrdige2
     [Tags]    add
     Add a interface    Tenant1    vBridge2    if4    {}
 
@@ -80,18 +80,14 @@ Add a portmap for interface if4
 
 Ping h1 to h3
     [Documentation]    Ping h1 to h3, verify no packet loss
-    Sleep    5
     Write    h1 ping -w 10 h3
-    Sleep    10
-    ${result}    Read
+    ${result}    Read Until    mininet>
     Should Contain    ${result}    64 bytes
 
 Ping h2 to h4
     [Documentation]    Ping h2 to h4, verify no packet loss
-    Sleep    5
     Write    h2 ping -w 10 h4
-    Sleep    10
-    ${result}    Read
+    ${result}    Read Until    mininet>
     Should Contain    ${result}    64 bytes
 
 Delete a vtn Tenant1

diff --git a/test/csit/suites/karaf-vtn/050__VTN/__init__.txt b/test/csit/suites/karaf-vtn/050__VTN/__init__.txt
index c1c7716356a6ab45c2d17a4b9964c53d1e8fb782..8a8c1943c6bd9e3d48a075c7b4ea23eeac7933bf 100644 (file)
--- a/test/csit/suites/karaf-vtn/050__VTN/__init__.txt
+++ b/test/csit/suites/karaf-vtn/050__VTN/__init__.txt
@@ -1,27 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN
+Documentation     Test suite for AD-SAL NSF
 Suite Setup       Start Suite
 Suite Teardown    Stop Suite
 Library     SSHLibrary
+Resource          ../../../libraries/Utils.txt
 
 *** Variables ***
-${start}=  sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2
+${start}=   sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 
 
-*** Keywords ***
-Start Suite  
-    Log    Start mininet
-    Open Connection   ${MININET}     prompt=>
-    Login With Public Key    ${MININET_USER}   ${USER_HOME}/.ssh/id_rsa   any 
-    Write    sudo ovs-vsctl set-manager ptcp:6644
-    Write    sudo mn -c
-    Sleep    2
-    Write    ${start}
-    Sleep    30
-    Read
-Stop Suite
-    Log    Stop mininet
-    Read
-    Write    exit 
-    Sleep    6
-    Read 
-    Close Connection 
+** Keywords ***

diff --git a/test/csit/suites/karaf-vtn/060__VTN_OF13/010__vtn_manager.txt b/test/csit/suites/karaf-vtn/060__VTN_OF13/010__vtn_manager.txt
index e5535049fcdd4665a0d7cbd2888c9308a4c76983..912d0bd60a5d80e46704f876b04d5838e6840f6a 100644 (file)
--- a/test/csit/suites/karaf-vtn/060__VTN_OF13/010__vtn_manager.txt
+++ b/test/csit/suites/karaf-vtn/060__VTN_OF13/010__vtn_manager.txt
@@ -24,12 +24,12 @@ Add a vBridge vBridge1
     Add a vBridge    Tenant1    vBridge1    {}
 
 Add a interface If1
-    [Documentation]    Add a interface if1 into vBrdige vBrdige1
+    [Documentation]    Add a interface if1 into vBrdige vBridge1
     [Tags]    add
     Add a interface    Tenant1    vBridge1    if1    {}
 
 Add a interface if2
-    [Documentation]    Add a interface if2 into vBrdige vBrdige1
+    [Documentation]    Add a interface if2 into vBrdige vBridge1
     [Tags]    add
     Add a interface    Tenant1    vBridge1    if2    {}
 
@@ -54,12 +54,12 @@ Add a vBridge vBridge2
     Add a vBridge    Tenant1    vBridge2    {}
 
 Add a interface If3
-    [Documentation]    Add a interface if3 into vBrdige vBrdige2
+    [Documentation]    Add a interface if3 into vBrdige vBridge2
     [Tags]    add
     Add a interface    Tenant1    vBridge2    if3    {}
 
 Add a interface if4
-    [Documentation]    Add a interface if4 into vBrdige vBrdige2
+    [Documentation]    Add a interface if4 into vBrdige vBridge2
     [Tags]    add
     Add a interface    Tenant1    vBridge2    if4    {}
 
@@ -80,18 +80,14 @@ Add a portmap for interface if4
 
 Ping h1 to h3
     [Documentation]    Ping h1 to h3, verify no packet loss
-    Sleep    5
     Write    h1 ping -w 10 h3
-    Sleep    10
-    ${result}    Read
+    ${result}    Read Until    mininet>
     Should Contain    ${result}    64 bytes
 
 Ping h2 to h4
     [Documentation]    Ping h2 to h4, verify no packet loss
-    Sleep    5
     Write    h2 ping -w 10 h4
-    Sleep    10
-    ${result}    Read
+    ${result}    Read Until    mininet>
     Should Contain    ${result}    64 bytes
 
 Delete a vtn Tenant1

diff --git a/test/csit/suites/karaf-vtn/060__VTN_OF13/__init__.txt b/test/csit/suites/karaf-vtn/060__VTN_OF13/__init__.txt
index 59a50574e6c840196e7cf01332a4cf86de658c75..36c2d662109751f4fed4ada7a64340d3dcb8787b 100644 (file)
--- a/test/csit/suites/karaf-vtn/060__VTN_OF13/__init__.txt
+++ b/test/csit/suites/karaf-vtn/060__VTN_OF13/__init__.txt
@@ -1,27 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN
+Documentation     Test suite for AD-SAL NSF mininet OF13
 Suite Setup       Start Suite
 Suite Teardown    Stop Suite
 Library     SSHLibrary
+Resource          ../../../libraries/Utils.txt
 
 *** Variables ***
-${start}=  sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ovsk,protocols=OpenFlow13
+${start}=   sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ovsk,protocols=OpenFlow13 
 
-*** Keywords ***
-Start Suite  
-    Log    Start mininet
-    Open Connection   ${MININET}     prompt=>
-    Login With Public Key    ${MININET_USER}   ${USER_HOME}/.ssh/id_rsa   any 
-    Write    sudo ovs-vsctl set-manager ptcp:6644
-    Write    sudo mn -c
-    Sleep    2
-    Write    ${start}
-    Sleep    30
-    Read
-Stop Suite
-    Log    Stop mininet
-    Read
-    Write    exit 
-    Sleep    6
-    Read 
-    Close Connection 
+** Keywords ***