Merge "BUG-632: add TCP-MD5 configuration fragments"

diff --git a/test/csit/suites/vtn/050__vtn_coordinator.txt b/test/csit/suites/vtn/050__vtn_coordinator.txt
new file mode 100644 (file)
index 0000000..64ebd21
--- /dev/null
+++ b/test/csit/suites/vtn/050__vtn_coordinator.txt
@@ -0,0 +1,102 @@
+
+*** Settings ***
+Documentation     Test suite for VTN Coordinator
+Suite Setup       Create Session    session    http://${VTNC}:8083  headers=${VTNC_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
+
+
+*** Test Cases ***
+Add a ODL Controller
+    [Documentation]    Add a Controller odc1
+    [Tags]    vtnc
+    Add a Controller    odc_test     ${CONTROLLER}
+
+Verify the Controller Status is up
+    [Documentation]    Check Controller status
+    [Tags]   vtnc
+    Check Controller Status    odc_test  up   20
+
+Verify switch1
+    [Documentation]    Get switch1
+    [Tags]   vtnc
+    Verify Switch    odc_test     00:00:00:00:00:00:00:01  30
+
+Verify switch2
+    [Documentation]    Get switch2
+    [Tags]   vtnc
+    Verify Switch    odc_test     00:00:00:00:00:00:00:02  1
+
+Verify switch3
+    [Documentation]    Get switch3
+    [Tags]   vtnc
+    Verify Switch    odc_test     00:00:00:00:00:00:00:03  1
+
+Verify switchPort switch1
+    [Documentation]   Get switchport/switch1
+    [Tags]   vtnc
+    Verify SwitchPort    odc_test     00:00:00:00:00:00:00:01  15
+
+Verify switchPort switch2
+    [Documentation]   Get switchport/switch2
+    [Tags]   vtnc
+    Verify SwitchPort    odc_test     00:00:00:00:00:00:00:02  1
+
+Verify switchPort switch3
+    [Documentation]   Get switchport/switch3
+    [Tags]   vtnc
+    Verify SwitchPort    odc_test     00:00:00:00:00:00:00:03  1
+
+Delete a Controller
+    [Documentation]   Delete Controller odc1
+    [Tags]   vtnc
+    Remove Controller    odc_test
+
+
+*** Keywords ***
+Add a Controller
+   [Arguments]   ${ctrlname}   ${ctrlip}
+   [Documentation]    Create a controller
+   ${controllerinfo}    Create Dictionary   controller_id   ${ctrlname}   type    odc    ipaddr    ${CONTROLLER}    version    1.0    auditstatus    enable
+   ${controllercreate}    Create Dictionary   controller    ${controllerinfo}
+   ${resp}    PostJson    session    ${VTNWEBAPI}/${CTRLS_CREATE}    data=${controllercreate}
+   Should Be Equal As Strings    ${resp.status_code}    201
+
+
+Remove Controller
+   [Arguments]   ${ctrlname}
+   [Documentation]   Delete a Controller
+   ${resp}    Delete   session    ${VTNWEBAPI}/${CTRLS}/${ctrlname}.json
+   Should Be Equal As Strings    ${resp.status_code}    204
+
+Check Controller Status
+   [Arguments]   ${ctrlname}   ${stat}   ${sec}
+   [Documentation]    Get controller status
+   Sleep    ${sec}
+   ${resp}    Get   session    ${VTNWEBAPI}/${CTRLS}/${ctrlname}.json
+   ${contents}    To JSON    ${resp.content}
+   ${controllerblock}    Get From Dictionary    ${contents}   controller
+   ${status}    Get From Dictionary    ${controllerblock}     operstatus
+   Should Be Equal As Strings    ${status}    ${stat}
+
+Verify Switch
+   [Arguments]   ${ctrlname}  ${switch_id}  ${sec}
+   [Documentation]    Get switch
+   Sleep    ${sec}
+   ${resp}    Get   session    ${VTNWEBAPI}/${CTRLS}/${ctrlname}/${SW}/${switch_id}.json
+   ${contents}    To JSON    ${resp.content}
+   ${switchblock}    Get From Dictionary    ${contents}   switch
+   ${status}    Get From Dictionary    ${switchblock}     switch_id
+   Should Be Equal As Strings    ${status}     ${switch_id}
+
+Verify SwitchPort
+   [Arguments]   ${ctrlname}  ${switch_id}  ${sec}
+   [Documentation]    Get switch
+   Sleep    ${sec}
+   ${resp}    Get   session    ${VTNWEBAPI}/${CTRLS}/${ctrlname}/${SW}/${switch_id}/${PORTS}
+   Should Be Equal As Strings    ${resp.status_code}    200

diff --git a/test/csit/suites/vtn/060__vtn_coordinator.txt b/test/csit/suites/vtn/060__vtn_coordinator.txt
new file mode 100644 (file)
index 0000000..d392e4c
--- /dev/null
+++ b/test/csit/suites/vtn/060__vtn_coordinator.txt
@@ -0,0 +1,176 @@
+*** Settings ***
+Documentation     Test suite for VTN Coordinator
+Suite Setup       Create Session    session    http://${VTNC}:8083  headers=${VTNC_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
+
+
+*** Test Cases ***
+Add a ODL Controller
+    [Documentation]    Add a Controller
+    [Tags]    vtnc
+    Add a Controller    odc_test     ${CONTROLLER}
+
+Verify the Controller Status is up
+    [Documentation]    Check Controller status
+    [Tags]   vtnc
+    Check Controller Status    odc_test   up   20
+
+Add a Vtn Tenant1
+    [Documentation]   Create Vtn Tenant1
+    [Tags]   vtnc
+    Add a VTN  Tenant1  VTN_TEST
+
+Create VBR in VTN Tenant1
+    [Documentation]   Create a VBR in Tenant1 as Vbridge1
+    [Tags]   vtnc
+    Create VBR in VTN     Tenant1    Vbridge1    odc_test
+
+Update controller ip invalid
+    [Documentation]    Update Controller ip to invalid
+    [Tags]    vtnc
+    Update Controller    odc_test     10.0.0.1   invalid_IP
+
+Verify the Controller State is down
+    [Documentation]    Check Controller status
+    [Tags]   vtnc
+    Check Controller Status    odc_test   down   45
+
+Create VBRIF in VBRIDGE Vbridge1 Interface1
+    [Documentation]   Create an interface to Vbridge1
+    [Tags]   vtnc
+    Create VBRIF in VBR   Tenant1    Vbridge1   Interface1  Interface1
+
+Create VBRIF in VBRIDGE Vbridge1 Interface2
+    [Documentation]   Create an interface to Vbridge1
+    [Tags]   vtnc
+    Create VBRIF in VBR   Tenant1    Vbridge1   Interface2  Interface2
+
+Update controller ip valid
+    [Documentation]    Update Controller ip to valid
+    [Tags]    vtnc
+    Update Controller    odc_test     ${CONTROLLER}   valid_IP
+
+Verify the Controller State is up
+    [Documentation]    Check Controller status
+    [Tags]   vtnc
+    Check Controller Status    odc_test   up   45
+
+Define Portmap for Interface1
+    [Documentation]   Map Interface1 to a logical port
+    [Tags]   vtnc
+    Define Portmap for VBRIF    Tenant1    Vbridge1     Interface1    PP-OF:00:00:00:00:00:00:00:02-s2-eth1
+
+Define Portmap for Interface2
+    [Documentation]   Map Interface2 to a logical port
+    [Tags]   vtnc
+    Define Portmap for VBRIF    Tenant1    Vbridge1     Interface2    PP-OF:00:00:00:00:00:00:00:02-s2-eth2
+
+Test Ping for Configuration1
+    [Documentation]   ping between hosts in mininet
+    [Tags]   vtnc
+    Test Ping    h1    h2
+
+Delete a VTN Tenant1
+    [Documentation]   Delete Vtn Tenant1
+    [Tags]   vtnc
+    Delete a VTN  Tenant1
+
+Delete a Controller odc1
+    [Documentation]   Delete Controller odc1
+    [Tags]   vtnc
+    Remove Controller    odc_test
+
+
+*** Keywords ***
+Add a Controller
+   [Arguments]   ${ctrlname}   ${ctrlip}
+   [Documentation]    Create a controller
+   ${controllerinfo}    Create Dictionary   controller_id   ${ctrlname}   type    odc    ipaddr    ${CONTROLLER}    version    1.0    auditstatus    enable
+   ${controllercreate}    Create Dictionary   controller    ${controllerinfo}
+   ${resp}    PostJson    session    ${VTNWEBAPI}/${CTRLS_CREATE}    data=${controllercreate}
+   Should Be Equal As Strings    ${resp.status_code}    201
+
+
+Remove Controller
+   [Arguments]   ${ctrlname}
+   [Documentation]   Delete a Controller
+   ${resp}    Delete   session    ${VTNWEBAPI}/${CTRLS}/${ctrlname}.json
+   Should Be Equal As Strings    ${resp.status_code}    204
+
+
+Update Controller
+   [Arguments]   ${ctrlname}    ${ctrlip}    ${desc}
+   [Documentation]    Update controller
+   ${controllerinfo}    Create Dictionary    description    ${desc}    ipaddr    ${ctrlip}    version    1.0    auditstatus    enable
+   ${controllerupdate}    Create Dictionary   controller    ${controllerinfo}
+   ${resp}    Put    session    ${VTNWEBAPI}/${CTRLS}/${ctrlname}.json    data=${controllerupdate}
+   Should Be Equal As Strings    ${resp.status_code}    204
+
+
+Check Controller Status
+   [Arguments]   ${ctrlname}   ${stat}   ${sec}
+   [Documentation]    Get controller status
+   Sleep    ${sec}
+   ${resp}    Get   session    ${VTNWEBAPI}/${CTRLS}/${ctrlname}.json
+   ${contents}    To JSON    ${resp.content}
+   ${controllerblock}    Get From Dictionary    ${contents}   controller
+   ${status}    Get From Dictionary    ${controllerblock}     operstatus
+   Should Be Equal As Strings    ${status}    ${stat}
+
+
+Add a VTN
+   [Arguments]   ${vtnname}    ${vtndescription}
+   [Documentation]    Create VTN in Coordinator
+   ${vtninfo}    Create Dictionary    vtn_name    ${vtnname}    description    ${vtndescription}
+   ${vtncreate}    Create Dictionary    vtn    ${vtninfo}
+   ${resp}    PostJson    session    ${VTNWEBAPI}/${VTNS_CREATE}    data=${vtncreate}
+   Should Be Equal As Strings    ${resp.status_code}    201
+
+
+Delete a VTN
+   [Arguments]   ${vtnname}
+   [Documentation]  Delete a VTN Created
+   ${resp}    Delete    session    ${VTNWEBAPI}/${VTNS}/${vtnname}.json
+   Should Be Equal As Strings    ${resp.status_code}    204
+
+
+Create VBR in VTN
+   [Arguments]   ${vtnname}    ${vbrname}    ${ctrlname}
+   [Documentation]    Create VBR for VTN in Coordinator
+   ${vbrinfo}    Create Dictionary   vbr_name    ${vbrname}    controller_id   ${ctrlname}    domain_id    (DEFAULT)
+   ${vbrcreate}   Create Dictionary   vbridge    ${vbrinfo}
+   ${resp}    PostJson    session    ${VTNWEBAPI}/${VTNS}/${vtnname}/${VBRS_CREATE}    data=${vbrcreate}
+   Should Be Equal As Strings    ${resp.status_code}    201
+
+
+Create VBRIF in VBR
+   [Arguments]   ${vtnname}    ${vbrname}    ${vbrifname}    ${ifdescription}
+   [Documentation]    Create VBR Interface in VBR
+   ${vbrifinfo}    Create Dictionary   if_name    ${vbrifname}    description    ${ifdescription}
+   ${vbrifcreate}    Create Dictionary   interface    ${vbrifinfo}
+   ${resp}    PostJson    session    ${VTNWEBAPI}/${VTNS}/${vtnname}/${VBRS}/${vbrname}/${VBRIFS_CREATE}  data=${vbrifcreate}
+   Should Be Equal As Strings    ${resp.status_code}    201
+
+
+Define Portmap for VBRIF
+   [Arguments]   ${vtnname}    ${vbrname}    ${vbrifname}   ${logical_port_id}
+   [Documentation]   Map  Interface to a logical port
+   ${logical_port_info}    Create Dictionary    logical_port_id    ${logical_port_id}
+   ${portmapdefine}     Create Dictionary     portmap     ${logical_port_info}
+   ${resp}   Put     session      ${VTNWEBAPI}/${VTNS}/${vtnname}/${VBRS}/${vbrname}/${VBRIFS}/${vbrifname}/${PORTMAP_CREATE}    data=${portmapdefine}
+   Should Be Equal As Strings    ${resp.status_code}    204
+
+Test Ping
+   [Arguments]   ${host1}    ${host2}
+   [Documentation]  Ping hosts to check connectivity
+   Sleep   5
+   Write    ${host1} ping -c 10 ${host2}
+   Sleep    10
+   ${result}    Read
+   Should Contain    ${result}    64 bytes

diff --git a/test/csit/variables/Variables.py b/test/csit/variables/Variables.py
index e7349700b710e55f704f37b398c95f1346813f9f..1bb32a7e712576341583dcf13c75794408142cc9 100644 (file)
--- a/test/csit/variables/Variables.py
+++ b/test/csit/variables/Variables.py
@@ -28,6 +28,7 @@ VTNWEBAPI='/vtn-webapi'
 #controllers URL
 CTRLS_CREATE='controllers.json'
 CTRLS='controllers'
+SW='switches'
 
 #vtn URL
 VTNS_CREATE='vtns.json'
@@ -43,3 +44,9 @@ VBRIFS='interfaces'
 
 #portmap URL
 PORTMAP_CREATE='portmap.json'
+
+#vlanmap URL
+VLANMAP_CREATE='vlanmaps.json'
+
+#ports URL
+PORTS='ports/detail.json'