Update ovsdb repository and create test plan

Bridge Domain is very old AD-SAL API so we get it out

We also need a test plan for Chaudry's work

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

diff --git a/test/csit/suites/ovsdb/Bridge_Domain_OF10/010__bridge_domain.robot b/test/csit/suites/ovsdb/Bridge_Domain_OF10/010__bridge_domain.robot
deleted file mode 100644 (file)
index 0583279..0000000
--- a/test/csit/suites/ovsdb/Bridge_Domain_OF10/010__bridge_domain.robot
+++ /dev/null
@@ -1,123 +0,0 @@
-*** Settings ***
-Documentation     Test suite for OVSDB Bridge Domain
-Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTPORT}   auth=${AUTH}   headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           SSHLibrary
-Library           Collections
-Library           ../../../libraries/RequestsLibrary.py
-Library           ../../../libraries/Common.py
-Library           ../../../libraries/Topology.py
-Variables         ../../../variables/Variables.py
-
-*** Variables ***
-${key}             node
-${REST_CONTEXT_CM}    /controller/nb/v2/connectionmanager
-${REST_CONTEXT_BD}    /controller/nb/v2/networkconfig/bridgedomain
-
-*** Test Cases ***
-List connections
-    [Documentation]    Get node connections and validate result
-    [Tags]    ovsdb
-    ${topo_nodes}    Get Nodes From Topology    ${TOPO_TREE_LEVEL}
-    ${resp}    Get    session    ${REST_CONTEXT_CM}/nodes
-    Should Be Equal As Strings   ${resp.status_code}   200
-    ${result}    To JSON    ${resp.content}
-    ${nodes}    Get From Dictionary    ${result}    ${key}
-    List Should Contain Sublist   ${nodes}    ${topo_nodes}
-Connect to mininet
-    [Documentation]    Connect to mininet, list the nodes and validate result
-    [Tags]    ovsdb
-    ${body}   Create Dictionary   type   OVS   id   MININET
-    ${resp}   Put   session   ${REST_CONTEXT_CM}/node/MININET/address/${MININET}/port/6644
-    Should Be Equal As Strings   ${resp.status_code}   200
-    ${result}    To JSON    ${resp.content}
-    Dictionaries Should Be Equal    ${result}   ${body}
-    ${resp}    Get    session    ${REST_CONTEXT_CM}/nodes
-    Should Be Equal As Strings   ${resp.status_code}   200
-    ${result}    To JSON    ${resp.content}
-    ${content}    Get From Dictionary    ${result}    ${key}
-    List Should Contain Value    ${content}    ${body}
-    Sleep   2
-Add bridge s4
-    [Documentation]    Add bridge s4
-    [Tags]    ovsdb
-    ${resp}    Post    session    ${REST_CONTEXT_BD}/bridge/OVS/MININET/s4  data={}
-    Should Be Equal As Strings    ${resp.status_code}    201
-Delete s1 ports
-    [Documentation]    Delete s1 connected ports
-    [Tags]    ovsdb
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s1/s1-eth1
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s1/s1-eth2
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s2/s2-eth3
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s3/s3-eth3
-    Should Be Equal As Strings    ${resp.status_code}    200
-Add s4 ports 
-    [Documentation]    Add s4 connected ports
-    [Tags]    ovsdb
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s4/s4-eth1   
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s2-eth3"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s4/s4-eth2 
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s3-eth3"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s2/s2-eth3
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s4-eth1"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s3/s3-eth3
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s4-eth2"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-Ping h1 to h4
-    [Documentation]    Ping h1 to h4, verify no packet loss
-    [Tags]    ovsdb
-    Sleep   5
-    Write   h1 ping -w 10 h4
-    Sleep   10
-    Write   h4 ping -w 10 h1
-    Sleep   10
-    ${result}    Read
-    Should Contain   ${result}   64 bytes
-Delete s4 ports
-    [Documentation]    Delete s4 connected ports
-    [Tags]    ovsdb
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s4/s4-eth1
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s4/s4-eth2
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s2/s2-eth3
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s3/s3-eth3
-    Should Be Equal As Strings    ${resp.status_code}    200
-Add s1 ports 
-    [Documentation]    Add s1 connected ports
-    [Tags]    ovsdb
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s1/s1-eth1
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s2-eth3"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s1/s1-eth2
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s3-eth3"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s2/s2-eth3
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s1-eth1"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s3/s3-eth3
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s1-eth2"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-Delete bridge s4
-    [Documentation]    Delete bridge s4
-    [Tags]    ovsdb
-    ${resp}    Delete    session    ${REST_CONTEXT_BD}/bridge/OVS/MININET/s4
-    Should Be Equal As Strings    ${resp.status_code}    200
-Disconnect mininet
-    [Documentation]    Disconnect mininet, list the nodes and validate result
-    [Tags]    ovsdb
-    ${body}   Create Dictionary   type   OVS   id   MININET
-    ${resp}   Delete   session   ${REST_CONTEXT_CM}/node/OVS/MININET
-    Should Be Equal As Strings   ${resp.status_code}   200
-    ${resp}    Get    session    ${REST_CONTEXT_CM}/nodes
-    Should Be Equal As Strings   ${resp.status_code}   200
-    ${result}    To JSON    ${resp.content}
-    ${content}    Get From Dictionary    ${result}    ${key}
-    List Should Not Contain Value    ${content}    ${body}

diff --git a/test/csit/suites/ovsdb/Bridge_Domain_OF10/__init__.robot b/test/csit/suites/ovsdb/Bridge_Domain_OF10/__init__.robot
deleted file mode 100644 (file)
index 4feeb88..0000000
--- a/test/csit/suites/ovsdb/Bridge_Domain_OF10/__init__.robot
+++ /dev/null
@@ -1,12 +0,0 @@
-*** Settings ***
-Documentation     Test suite for OVSDB
-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 
-
-** Keywords ***

diff --git a/test/csit/suites/ovsdb/Bridge_Domain_OF13/010__bridge_domain.robot b/test/csit/suites/ovsdb/Bridge_Domain_OF13/010__bridge_domain.robot
deleted file mode 100644 (file)
index 0583279..0000000
--- a/test/csit/suites/ovsdb/Bridge_Domain_OF13/010__bridge_domain.robot
+++ /dev/null
@@ -1,123 +0,0 @@
-*** Settings ***
-Documentation     Test suite for OVSDB Bridge Domain
-Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTPORT}   auth=${AUTH}   headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           SSHLibrary
-Library           Collections
-Library           ../../../libraries/RequestsLibrary.py
-Library           ../../../libraries/Common.py
-Library           ../../../libraries/Topology.py
-Variables         ../../../variables/Variables.py
-
-*** Variables ***
-${key}             node
-${REST_CONTEXT_CM}    /controller/nb/v2/connectionmanager
-${REST_CONTEXT_BD}    /controller/nb/v2/networkconfig/bridgedomain
-
-*** Test Cases ***
-List connections
-    [Documentation]    Get node connections and validate result
-    [Tags]    ovsdb
-    ${topo_nodes}    Get Nodes From Topology    ${TOPO_TREE_LEVEL}
-    ${resp}    Get    session    ${REST_CONTEXT_CM}/nodes
-    Should Be Equal As Strings   ${resp.status_code}   200
-    ${result}    To JSON    ${resp.content}
-    ${nodes}    Get From Dictionary    ${result}    ${key}
-    List Should Contain Sublist   ${nodes}    ${topo_nodes}
-Connect to mininet
-    [Documentation]    Connect to mininet, list the nodes and validate result
-    [Tags]    ovsdb
-    ${body}   Create Dictionary   type   OVS   id   MININET
-    ${resp}   Put   session   ${REST_CONTEXT_CM}/node/MININET/address/${MININET}/port/6644
-    Should Be Equal As Strings   ${resp.status_code}   200
-    ${result}    To JSON    ${resp.content}
-    Dictionaries Should Be Equal    ${result}   ${body}
-    ${resp}    Get    session    ${REST_CONTEXT_CM}/nodes
-    Should Be Equal As Strings   ${resp.status_code}   200
-    ${result}    To JSON    ${resp.content}
-    ${content}    Get From Dictionary    ${result}    ${key}
-    List Should Contain Value    ${content}    ${body}
-    Sleep   2
-Add bridge s4
-    [Documentation]    Add bridge s4
-    [Tags]    ovsdb
-    ${resp}    Post    session    ${REST_CONTEXT_BD}/bridge/OVS/MININET/s4  data={}
-    Should Be Equal As Strings    ${resp.status_code}    201
-Delete s1 ports
-    [Documentation]    Delete s1 connected ports
-    [Tags]    ovsdb
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s1/s1-eth1
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s1/s1-eth2
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s2/s2-eth3
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s3/s3-eth3
-    Should Be Equal As Strings    ${resp.status_code}    200
-Add s4 ports 
-    [Documentation]    Add s4 connected ports
-    [Tags]    ovsdb
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s4/s4-eth1   
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s2-eth3"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s4/s4-eth2 
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s3-eth3"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s2/s2-eth3
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s4-eth1"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s3/s3-eth3
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s4-eth2"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-Ping h1 to h4
-    [Documentation]    Ping h1 to h4, verify no packet loss
-    [Tags]    ovsdb
-    Sleep   5
-    Write   h1 ping -w 10 h4
-    Sleep   10
-    Write   h4 ping -w 10 h1
-    Sleep   10
-    ${result}    Read
-    Should Contain   ${result}   64 bytes
-Delete s4 ports
-    [Documentation]    Delete s4 connected ports
-    [Tags]    ovsdb
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s4/s4-eth1
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s4/s4-eth2
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s2/s2-eth3
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${resp}    Delete   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s3/s3-eth3
-    Should Be Equal As Strings    ${resp.status_code}    200
-Add s1 ports 
-    [Documentation]    Add s1 connected ports
-    [Tags]    ovsdb
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s1/s1-eth1
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s2-eth3"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s1/s1-eth2
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s3-eth3"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s2/s2-eth3
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s1-eth1"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-    ${resp}   Post   session   ${REST_CONTEXT_BD}/port/OVS/MININET/s3/s3-eth3
-    ...   data={"type":"patch", "CUSTOM":{"peer":"s1-eth2"}}
-    Should Be Equal As Strings    ${resp.status_code}    201
-Delete bridge s4
-    [Documentation]    Delete bridge s4
-    [Tags]    ovsdb
-    ${resp}    Delete    session    ${REST_CONTEXT_BD}/bridge/OVS/MININET/s4
-    Should Be Equal As Strings    ${resp.status_code}    200
-Disconnect mininet
-    [Documentation]    Disconnect mininet, list the nodes and validate result
-    [Tags]    ovsdb
-    ${body}   Create Dictionary   type   OVS   id   MININET
-    ${resp}   Delete   session   ${REST_CONTEXT_CM}/node/OVS/MININET
-    Should Be Equal As Strings   ${resp.status_code}   200
-    ${resp}    Get    session    ${REST_CONTEXT_CM}/nodes
-    Should Be Equal As Strings   ${resp.status_code}   200
-    ${result}    To JSON    ${resp.content}
-    ${content}    Get From Dictionary    ${result}    ${key}
-    List Should Not Contain Value    ${content}    ${body}

diff --git a/test/csit/suites/ovsdb/Bridge_Domain_OF13/__init__.robot b/test/csit/suites/ovsdb/Bridge_Domain_OF13/__init__.robot
deleted file mode 100644 (file)
index f04089e..0000000
--- a/test/csit/suites/ovsdb/Bridge_Domain_OF13/__init__.robot
+++ /dev/null
@@ -1,11 +0,0 @@
-*** Settings ***
-Documentation     Test suite for OVSDB 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 
-
-** Keywords ***

diff --git a/test/csit/testplans/ovsdb-sbplugin.txt b/test/csit/testplans/ovsdb-sbplugin.txt
new file mode 100644 (file)
index 0000000..af5c5ce
--- /dev/null
+++ b/test/csit/testplans/ovsdb-sbplugin.txt
@@ -0,0 +1,2 @@
+# Place the suites in run order:
+integration/test/csit/suites/ovsdb/Southbound_Domain