Fixing mininet reads so that we always clear mininet

[integration/test.git] / test / csit / suites / base-of13 / 030__AD_SAL_NSF / 030__topology_manager.txt

diff --git a/test/csit/suites/base-of13/030__AD_SAL_NSF/030__topology_manager.txt b/test/csit/suites/base-of13/030__AD_SAL_NSF/030__topology_manager.txt
index e681cd8ebb744f1af054b361c72e603e1b7a7f23..230d6e771c651d980b1e61ec25dab89010c6671b 100644 (file)
--- a/test/csit/suites/base-of13/030__AD_SAL_NSF/030__topology_manager.txt
+++ b/test/csit/suites/base-of13/030__AD_SAL_NSF/030__topology_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Topology Manager
-Suite Setup       Create Session   session   http://${CONTROLLER}:8080   auth=${AUTH}   headers=${HEADERS}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTPORT}   auth=${AUTH}   headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           ../../../libraries/RequestsLibrary.py
@@ -8,9 +8,9 @@ Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-${node1}   "openflow:1"
-${node2}   "openflow:2"
-${node3}   "openflow:3"
+${node1}   "00:00:00:00:00:00:00:01"
+${node2}   "00:00:00:00:00:00:00:02"
+${node3}   "00:00:00:00:00:00:00:03"
 ${name}           test_userlink1
 ${key}            userLinks
 ${REST_CONTEXT}    /controller/nb/v2/topology
@@ -29,7 +29,7 @@ Add a userlink
     [Documentation]    Add a userlink, list to validate the result.
     [Tags]    add
     ${body}    Create Dictionary    name    ${name}    status    Success    srcNodeConnector
-    ...    MD_SAL|openflow:2:1@MD_SAL|openflow:2    dstNodeConnector    MD_SAL|openflow:3:1@MD_SAL|openflow:3
+    ...    OF|1@OF|00:00:00:00:00:00:00:02    dstNodeConnector    OF|1@OF|00:00:00:00:00:00:00:03
     ${resp}    Put    session    ${REST_CONTEXT}/${CONTAINER}/userLink/${name}    data=${body}
     Should Be Equal As Strings    ${resp.status_code}    201
     ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/userLinks
@@ -41,7 +41,7 @@ Remove a userlink
     [Documentation]    Remove a userlink, list to validate the result.
     [Tags]    remove
     ${body}    Create Dictionary    name    ${name}    status    Success    srcNodeConnector
-    ...    MD_SAL|openflow:2:1@MD_SAL|openflow:2    dstNodeConnector    MD_SAL|openflow:3:1@MD_SAL|openflow:3
+    ...    OF|1@OF|00:00:00:00:00:00:00:02    dstNodeConnector    OF|1@OF|00:00:00:00:00:00:00:03
     ${resp}    Delete    session    ${REST_CONTEXT}/${CONTAINER}/userLink/${name}
     Should Be Equal As Strings    ${resp.status_code}    204
     ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}/userLinks