Change REST and RESTCONF port to variables

- Default RESTPORT = 8080
- Default RESTCONFPORT = 8080
- Change via pybot command -v RESTCONFPORT=8181 when testing Karaf features

Change-Id: Ied8065d6d9c91f82dfffdc26f8feee23c2010a23
Signed-off-by: Christopher O'Shea <christopher.o.shea@ericsson.com>

diff --git a/test/csit/suites/base-of10/010__AD_SAL_NSF/010__switch_manager.txt b/test/csit/suites/base-of10/010__AD_SAL_NSF/010__switch_manager.txt
index ac71cefc6d892a17d6c9361e8d27a342513d3760..13e0694c14bf5d6760d9a552270759c9546e0abc 100644 (file)
--- a/test/csit/suites/base-of10/010__AD_SAL_NSF/010__switch_manager.txt
+++ b/test/csit/suites/base-of10/010__AD_SAL_NSF/010__switch_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Switch Manager
-Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary

diff --git a/test/csit/suites/base-of10/010__AD_SAL_NSF/020__statistics_manager.txt b/test/csit/suites/base-of10/010__AD_SAL_NSF/020__statistics_manager.txt
index c632b3a190e1f8824c5a8fed873a083a1e8fc704..9bd466e39c4226427ce76479a7944eda8a96a7de 100644 (file)
--- a/test/csit/suites/base-of10/010__AD_SAL_NSF/020__statistics_manager.txt
+++ b/test/csit/suites/base-of10/010__AD_SAL_NSF/020__statistics_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Statistics Manager
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   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

diff --git a/test/csit/suites/base-of10/010__AD_SAL_NSF/030__topology_manager.txt b/test/csit/suites/base-of10/010__AD_SAL_NSF/030__topology_manager.txt
index 57fdde3b169c1a52e8a651105f359e6854515980..230d6e771c651d980b1e61ec25dab89010c6671b 100644 (file)
--- a/test/csit/suites/base-of10/010__AD_SAL_NSF/030__topology_manager.txt
+++ b/test/csit/suites/base-of10/010__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}:${PORT}   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

diff --git a/test/csit/suites/base-of10/010__AD_SAL_NSF/040__flow_programmer.txt b/test/csit/suites/base-of10/010__AD_SAL_NSF/040__flow_programmer.txt
index 68b99c2f31def6aa00139a6c0471adf66c95f3a6..315e76da6f70c4de3fe0d48c0a5ed897f1915135 100644 (file)
--- a/test/csit/suites/base-of10/010__AD_SAL_NSF/040__flow_programmer.txt
+++ b/test/csit/suites/base-of10/010__AD_SAL_NSF/040__flow_programmer.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Flow Programmer
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}  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

diff --git a/test/csit/suites/base-of10/020__AD_SAL_Apps/010__host_tracker.txt b/test/csit/suites/base-of10/020__AD_SAL_Apps/010__host_tracker.txt
index 3c7c239b97d4031f15f1584b4bbef0e6be87e0a5..637f20069d1b0eece9881fb8a612bc077d78d97b 100644 (file)
--- a/test/csit/suites/base-of10/020__AD_SAL_Apps/010__host_tracker.txt
+++ b/test/csit/suites/base-of10/020__AD_SAL_Apps/010__host_tracker.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Host Tracker
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   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

diff --git a/test/csit/suites/base-of10/020__AD_SAL_Apps/020__static_route.txt b/test/csit/suites/base-of10/020__AD_SAL_Apps/020__static_route.txt
index ed74a6d91000d2d5c5d2a8d298c58a390d9b9bee..983a051dc46d8f46ea1b3782939db499c56d22c3 100644 (file)
--- a/test/csit/suites/base-of10/020__AD_SAL_Apps/020__static_route.txt
+++ b/test/csit/suites/base-of10/020__AD_SAL_Apps/020__static_route.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Static Route
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTPORT}   auth=${AUTH}   headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of10/020__AD_SAL_Apps/030__subnet_gateway.txt b/test/csit/suites/base-of10/020__AD_SAL_Apps/030__subnet_gateway.txt
index b5cf86958f6581ba49d1a364e8e9941cfed165c0..84a959034b497e16b6f79ca2d8140610a03ad2de 100644 (file)
--- a/test/csit/suites/base-of10/020__AD_SAL_Apps/030__subnet_gateway.txt
+++ b/test/csit/suites/base-of10/020__AD_SAL_Apps/030__subnet_gateway.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Subnet Gateway
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTPORT}   auth=${AUTH}   headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/010__MD_SAL_NSF/010__restconf_inventory.txt b/test/csit/suites/base-of13/010__MD_SAL_NSF/010__restconf_inventory.txt
index 40c3ce5c14565fd552e6cd6407d3ac6404500d81..ab87a8961aac44cb422abd7fde15d1f83f8b0575 100644 (file)
--- a/test/csit/suites/base-of13/010__MD_SAL_NSF/010__restconf_inventory.txt
+++ b/test/csit/suites/base-of13/010__MD_SAL_NSF/010__restconf_inventory.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF inventory
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS_XML}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTCONFPORT}   auth=${AUTH}   headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           ../../../libraries/RequestsLibrary.py

diff --git a/test/csit/suites/base-of13/010__MD_SAL_NSF/020__restconf_statistics.txt b/test/csit/suites/base-of13/010__MD_SAL_NSF/020__restconf_statistics.txt
index 0cfa827ffdad5298b29cbb2791d004208b4960ab..bb4ea2167a9b7989e434ffb8a2fbc3603a5d403a 100644 (file)
--- a/test/csit/suites/base-of13/010__MD_SAL_NSF/020__restconf_statistics.txt
+++ b/test/csit/suites/base-of13/010__MD_SAL_NSF/020__restconf_statistics.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF statistics
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS_XML}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTCONFPORT}   auth=${AUTH}   headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           ../../../libraries/RequestsLibrary.py

diff --git a/test/csit/suites/base-of13/010__MD_SAL_NSF/030__restconf_topology.txt b/test/csit/suites/base-of13/010__MD_SAL_NSF/030__restconf_topology.txt
index dfa4694121ffafbb0d11a639a677a17f979027e6..b4e3495f54b531f2fc9e65c60325525f4047b134 100644 (file)
--- a/test/csit/suites/base-of13/010__MD_SAL_NSF/030__restconf_topology.txt
+++ b/test/csit/suites/base-of13/010__MD_SAL_NSF/030__restconf_topology.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF Topology 
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTCONFPORT}   auth=${AUTH}   headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           ../../../libraries/RequestsLibrary.py

diff --git a/test/csit/suites/base-of13/010__MD_SAL_NSF/040__restconf_frm.txt b/test/csit/suites/base-of13/010__MD_SAL_NSF/040__restconf_frm.txt
index f648f8afa3fda52e5a9f68dd96a38be597a3fba2..a4d4cfd839c6a12ca27607d962e5561224adce80 100644 (file)
--- a/test/csit/suites/base-of13/010__MD_SAL_NSF/040__restconf_frm.txt
+++ b/test/csit/suites/base-of13/010__MD_SAL_NSF/040__restconf_frm.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF FRM
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS_XML}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTCONFPORT}   auth=${AUTH}   headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           ../../../libraries/RequestsLibrary.py

diff --git a/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/010__restconf_inventory.txt b/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/010__restconf_inventory.txt
index 40c3ce5c14565fd552e6cd6407d3ac6404500d81..ab87a8961aac44cb422abd7fde15d1f83f8b0575 100644 (file)
--- a/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/010__restconf_inventory.txt
+++ b/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/010__restconf_inventory.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF inventory
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS_XML}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTCONFPORT}   auth=${AUTH}   headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           ../../../libraries/RequestsLibrary.py

diff --git a/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/020__restconf_statistics.txt b/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/020__restconf_statistics.txt
index 0cfa827ffdad5298b29cbb2791d004208b4960ab..bb4ea2167a9b7989e434ffb8a2fbc3603a5d403a 100644 (file)
--- a/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/020__restconf_statistics.txt
+++ b/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/020__restconf_statistics.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF statistics
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS_XML}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTCONFPORT}   auth=${AUTH}   headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           ../../../libraries/RequestsLibrary.py

diff --git a/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/030__restconf_topology.txt b/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/030__restconf_topology.txt
index 9ef2a9447ad46373e9a8eda134963cffa46dc66d..8322bcfa11543a8c5be142a4daee3c2ff73bda70 100644 (file)
--- a/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/030__restconf_topology.txt
+++ b/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/030__restconf_topology.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite RESTCONF Topology 
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTCONFPORT}   auth=${AUTH}   headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           ../../../libraries/RequestsLibrary.py

diff --git a/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/040__restconf_frm.txt b/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/040__restconf_frm.txt
index 2ddcd2c4041125d54b3069bc12f86281272ac246..6f1e0b07a6bd34aa367a85c58e56518f97d1592b 100644 (file)
--- a/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/040__restconf_frm.txt
+++ b/test/csit/suites/base-of13/020__MD_SAL_NSF_OF13/040__restconf_frm.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF FRM
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS_XML}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTCONFPORT}   auth=${AUTH}   headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           ../../../libraries/RequestsLibrary.py

diff --git a/test/csit/suites/base-of13/030__AD_SAL_NSF/010__switch_manager.txt b/test/csit/suites/base-of13/030__AD_SAL_NSF/010__switch_manager.txt
index ac71cefc6d892a17d6c9361e8d27a342513d3760..13e0694c14bf5d6760d9a552270759c9546e0abc 100644 (file)
--- a/test/csit/suites/base-of13/030__AD_SAL_NSF/010__switch_manager.txt
+++ b/test/csit/suites/base-of13/030__AD_SAL_NSF/010__switch_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Switch Manager
-Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary

diff --git a/test/csit/suites/base-of13/030__AD_SAL_NSF/020__statistics_manager.txt b/test/csit/suites/base-of13/030__AD_SAL_NSF/020__statistics_manager.txt
index c632b3a190e1f8824c5a8fed873a083a1e8fc704..9bd466e39c4226427ce76479a7944eda8a96a7de 100644 (file)
--- a/test/csit/suites/base-of13/030__AD_SAL_NSF/020__statistics_manager.txt
+++ b/test/csit/suites/base-of13/030__AD_SAL_NSF/020__statistics_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Statistics Manager
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   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

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 57fdde3b169c1a52e8a651105f359e6854515980..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}:${PORT}   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

diff --git a/test/csit/suites/base-of13/030__AD_SAL_NSF/040__flow_programmer.txt b/test/csit/suites/base-of13/030__AD_SAL_NSF/040__flow_programmer.txt
index 367cec2e9817f9e7a9f934d15d3519fb0378a3ae..e4fac2a8775dee1362dcd5b929e1e4e3678e0b11 100644 (file)
--- a/test/csit/suites/base-of13/030__AD_SAL_NSF/040__flow_programmer.txt
+++ b/test/csit/suites/base-of13/030__AD_SAL_NSF/040__flow_programmer.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Flow Programmer
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}  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

diff --git a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/010__switch_manager.txt b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/010__switch_manager.txt
index ac71cefc6d892a17d6c9361e8d27a342513d3760..13e0694c14bf5d6760d9a552270759c9546e0abc 100644 (file)
--- a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/010__switch_manager.txt
+++ b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/010__switch_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Switch Manager
-Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary

diff --git a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/020__statistics_manager.txt b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/020__statistics_manager.txt
index c632b3a190e1f8824c5a8fed873a083a1e8fc704..9bd466e39c4226427ce76479a7944eda8a96a7de 100644 (file)
--- a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/020__statistics_manager.txt
+++ b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/020__statistics_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Statistics Manager
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   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

diff --git a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/030__topology_manager.txt b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/030__topology_manager.txt
index 57fdde3b169c1a52e8a651105f359e6854515980..230d6e771c651d980b1e61ec25dab89010c6671b 100644 (file)
--- a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/030__topology_manager.txt
+++ b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/030__topology_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Topology Manager
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   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

diff --git a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/040__flow_programmer.txt b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/040__flow_programmer.txt
index 367cec2e9817f9e7a9f934d15d3519fb0378a3ae..e4fac2a8775dee1362dcd5b929e1e4e3678e0b11 100644 (file)
--- a/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/040__flow_programmer.txt
+++ b/test/csit/suites/base-of13/040__AD_SAL_NSF_OF13/040__flow_programmer.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Flow Programmer
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}  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

diff --git a/test/csit/suites/base-of13/050__AD_SAL_Apps/010__host_tracker.txt b/test/csit/suites/base-of13/050__AD_SAL_Apps/010__host_tracker.txt
index 66537292d10eb0ed8618572a6a748a458b6b010c..ade4e70f545746fd4a1d42082d184bc2ff8e795b 100644 (file)
--- a/test/csit/suites/base-of13/050__AD_SAL_Apps/010__host_tracker.txt
+++ b/test/csit/suites/base-of13/050__AD_SAL_Apps/010__host_tracker.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Host Tracker
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   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

diff --git a/test/csit/suites/base-of13/050__AD_SAL_Apps/020__static_route.txt b/test/csit/suites/base-of13/050__AD_SAL_Apps/020__static_route.txt
index ffa639bd8820b9210ed86e8cc1feccf5f30195f9..b72a07a633637ea6559fe649b9bb6d571b30b9a0 100644 (file)
--- a/test/csit/suites/base-of13/050__AD_SAL_Apps/020__static_route.txt
+++ b/test/csit/suites/base-of13/050__AD_SAL_Apps/020__static_route.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Static Route
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTPORT}   auth=${AUTH}   headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/050__AD_SAL_Apps/030__subnet_gateway.txt b/test/csit/suites/base-of13/050__AD_SAL_Apps/030__subnet_gateway.txt
index b5cf86958f6581ba49d1a364e8e9941cfed165c0..84a959034b497e16b6f79ca2d8140610a03ad2de 100644 (file)
--- a/test/csit/suites/base-of13/050__AD_SAL_Apps/030__subnet_gateway.txt
+++ b/test/csit/suites/base-of13/050__AD_SAL_Apps/030__subnet_gateway.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Subnet Gateway
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTPORT}   auth=${AUTH}   headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/010__host_tracker.txt b/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/010__host_tracker.txt
index 66537292d10eb0ed8618572a6a748a458b6b010c..ade4e70f545746fd4a1d42082d184bc2ff8e795b 100644 (file)
--- a/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/010__host_tracker.txt
+++ b/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/010__host_tracker.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Host Tracker
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   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

diff --git a/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/020__static_route.txt b/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/020__static_route.txt
index ffa639bd8820b9210ed86e8cc1feccf5f30195f9..b72a07a633637ea6559fe649b9bb6d571b30b9a0 100644 (file)
--- a/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/020__static_route.txt
+++ b/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/020__static_route.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Static Route
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTPORT}   auth=${AUTH}   headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/030__subnet_gateway.txt b/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/030__subnet_gateway.txt
index b5cf86958f6581ba49d1a364e8e9941cfed165c0..84a959034b497e16b6f79ca2d8140610a03ad2de 100644 (file)
--- a/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/030__subnet_gateway.txt
+++ b/test/csit/suites/base-of13/060__AD_SAL_Apps_OF13/030__subnet_gateway.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Subnet Gateway
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTPORT}   auth=${AUTH}   headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/300__dst_ip.txt b/test/csit/suites/base-of13/070__Flows_OF13/300__dst_ip.txt
index c2c6834cd63dca981a218eaebf4d59c4bee2d256..0cb793aef32ad74989f48ae2f1ff141805ee8360 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/300__dst_ip.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/300__dst_ip.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for pushing/verify/remove a flow through RESTCONF
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/301__src_ip.txt b/test/csit/suites/base-of13/070__Flows_OF13/301__src_ip.txt
index 86409f444d7307cd193e01745ab41ed4e6848dd0..6e6e8c85c2c6d04be1eda3bf2b90c3b977531731 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/301__src_ip.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/301__src_ip.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for pushing/verify/remove a flow through RESTCONF
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/302__dst_mac.txt b/test/csit/suites/base-of13/070__Flows_OF13/302__dst_mac.txt
index 7d27f771441343574d14a847e5f8998ab1e2984a..369952cb152ac0c9c631e6da3e5d5c1e4f846811 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/302__dst_mac.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/302__dst_mac.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for pushing/verify/remove a flow through RESTCONF
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/304__eth_ip_port.txt b/test/csit/suites/base-of13/070__Flows_OF13/304__eth_ip_port.txt
index 56f66ccf36eb270a49e4903c5429e0f739b92908..c10b26b646800c5f2b4a34a89457577fb649f44e 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/304__eth_ip_port.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/304__eth_ip_port.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IP,Ethernet and port
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/305__ttl.txt b/test/csit/suites/base-of13/070__Flows_OF13/305__ttl.txt
index 829b16a6329935b098051e1a9590a0272fbf6a09..25cd14eb27bb6f9d23dffbd5ff7b926f52229157 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/305__ttl.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/305__ttl.txt
@@ -8,7 +8,7 @@ Documentation     OF1.3 Suite to cover TTL Actions
 ...               - Decrement MPLS TTL
 ...
 ...               NOTE: for OVS, it appears that set_ttl, and both copy in/out are not supported, so need to skip those checks for now.
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Test Template     Create And Remove Flow
 Library           SSHLibrary

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/306__eth_ip_qos.txt b/test/csit/suites/base-of13/070__Flows_OF13/306__eth_ip_qos.txt
index 857c7776d85d0c25ebc240914822bfa527f21d3a..d315d77ea418f0865c1a3bf2d8583535e7a72a81 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/306__eth_ip_qos.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/306__eth_ip_qos.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IP,Ethernet,DSCP and Action dec TTL
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/307__eth_ip_qos_port_tcpport.txt b/test/csit/suites/base-of13/070__Flows_OF13/307__eth_ip_qos_port_tcpport.txt
index 19adc52e62074ee3a8d324bc7ebbc0ccf4eef96b..e0b73b6e6230af070b0a65899c8e85706daebe87 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/307__eth_ip_qos_port_tcpport.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/307__eth_ip_qos_port_tcpport.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IP,Ethernet,QoS, TCP dst/src port and Action dec MPLS TTL
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.txt b/test/csit/suites/base-of13/070__Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.txt
index 165f87d089063cad422de9988eea05dcaba10838..272ec358d960ddae02adefc133be848f2c835183 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IP,Ethernet,QoS, TCP dst/src port and Action dec MPLS TTL
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/309__eth_ip_qos_sctp.txt b/test/csit/suites/base-of13/070__Flows_OF13/309__eth_ip_qos_sctp.txt
index 25c5112bb0fa009cf229ec5acd76e94db130fba1..5ccff7690898b75dcd09c07373865f45bf814d83 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/309__eth_ip_qos_sctp.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/309__eth_ip_qos_sctp.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IP,Ethernet,QoS, SCTP dst/src port and Action dec TTL
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/310__eth_ip_qos_icmp.txt b/test/csit/suites/base-of13/070__Flows_OF13/310__eth_ip_qos_icmp.txt
index d121aa07fa75dca8babf09528bb2a3e2ce56ce30..820fd99d9bdd4d472db65f9cbdbe5edd308ac1d4 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/310__eth_ip_qos_icmp.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/310__eth_ip_qos_icmp.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IP,Ethernet,QoS, SCTP dst/src port and Action dec TTL
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/311__eth_arp.txt b/test/csit/suites/base-of13/070__Flows_OF13/311__eth_arp.txt
index 6ef4d05f5d0adbe40a9b01025f121d72ce0bf897..49f15dcfc367a221874006bb9a83214f79e4e89c 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/311__eth_arp.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/311__eth_arp.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Ethernet,QoS, ARP and Action drop
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/312__eth_arp_transport.txt b/test/csit/suites/base-of13/070__Flows_OF13/312__eth_arp_transport.txt
index 5552c1b06a413341e47dd6e949e5bee37bdce1f8..9e4faefb314bd2cb7c7ba2ce62bf9e33f5659819 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/312__eth_arp_transport.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/312__eth_arp_transport.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Ethernet,QoS, ARP and Action drop
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/313__eth_arp_transport_hardware.txt b/test/csit/suites/base-of13/070__Flows_OF13/313__eth_arp_transport_hardware.txt
index ab103fe54481e9fb5e86f2a840ca27e08496f53a..ee7bdb8e6dd8f6a02d9c2cdf09d25c7ca45c6aae 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/313__eth_arp_transport_hardware.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/313__eth_arp_transport_hardware.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Ethernet,QoS, ARP and Action drop
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/314__eth_vlan.txt b/test/csit/suites/base-of13/070__Flows_OF13/314__eth_vlan.txt
index beb5c811dc38c3e68552e87ab971a5b3ca2564cb..a2d65302c636a536d6d028879ce759c55638578c 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/314__eth_vlan.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/314__eth_vlan.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Ethernet,QoS, ARP and Action drop
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/315__timeout_vlan_pcp_vlan.txt b/test/csit/suites/base-of13/070__Flows_OF13/315__timeout_vlan_pcp_vlan.txt
index eaa8339fc8bb23503c6e52314ea0d64dcbc90b4e..f6160d49abccc6a2c048a14c5a3576cdfdee1076 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/315__timeout_vlan_pcp_vlan.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/315__timeout_vlan_pcp_vlan.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Time our values and Vlan and PCP Vlan
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/316__eth_mpls_tc_bos.txt b/test/csit/suites/base-of13/070__Flows_OF13/316__eth_mpls_tc_bos.txt
index d3514114f10d36be53fdeec5efacc9b26079e522..2adc23884f231010688c5700ae0cd8da5fb5570f 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/316__eth_mpls_tc_bos.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/316__eth_mpls_tc_bos.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Ethernet,QoS, ARP and Action drop
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/317__eth_ipv6.txt b/test/csit/suites/base-of13/070__Flows_OF13/317__eth_ipv6.txt
index fe6627b5f229e3b974d9b2609487859ab4e2bdcf..c8de82fb84135291e0af95f0b61e38c6b328bd79 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/317__eth_ipv6.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/317__eth_ipv6.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IPv6
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/318__metadata.txt b/test/csit/suites/base-of13/070__Flows_OF13/318__metadata.txt
index cb7585882853c2fc0dae07f794b72f64583620ad..ef5daefe0e02dacac16804de55c54d038b9c0701 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/318__metadata.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/318__metadata.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for metadata
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/319__metadata_mask.txt b/test/csit/suites/base-of13/070__Flows_OF13/319__metadata_mask.txt
index 6c87d94213e4f9549d11848416b14f6202b91668..7958869e4d68d084a4b11be298e6d835c04b16fe 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/319__metadata_mask.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/319__metadata_mask.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for metadata and mask
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/320__ipv6_meta_qos_udp.txt b/test/csit/suites/base-of13/070__Flows_OF13/320__ipv6_meta_qos_udp.txt
index dc62b48a2a3c95708cbda68c830db9262e378c78..f76fc6f1855185112b36e729786c5554f4df65d1 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/320__ipv6_meta_qos_udp.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/320__ipv6_meta_qos_udp.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for metadata and mask
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/321__ipv6_meta_qos_tcp.txt b/test/csit/suites/base-of13/070__Flows_OF13/321__ipv6_meta_qos_tcp.txt
index 8328938ae81b1e052ab844e7e16bdafae8695283..8bf00b56602da815682471bc130bfd0acfc29176 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/321__ipv6_meta_qos_tcp.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/321__ipv6_meta_qos_tcp.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for metadata and mask
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/322__ipv6_flow.txt b/test/csit/suites/base-of13/070__Flows_OF13/322__ipv6_flow.txt
index 9fe0141920e0e281581ffd8d6c2eff418ca0d3ef..e681048e4394f84d4f48a280842e975e02374068 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/322__ipv6_flow.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/322__ipv6_flow.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IPv6 flow labelk
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/323__tunnel.txt b/test/csit/suites/base-of13/070__Flows_OF13/323__tunnel.txt
index 245cad5143a25ec1ae27c38cb564d21d6f5d70e0..0c9dddb2cbfd871f15eae3960ab1b08a6ea2b05b 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/323__tunnel.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/323__tunnel.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Tunnel ID
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/324__ipv6_flow_label.txt b/test/csit/suites/base-of13/070__Flows_OF13/324__ipv6_flow_label.txt
index a710a4ec74b01921472fd5424926830daf261837..d2bf2f91db606804f209bc0dd23adc8ca5e8ca82 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/324__ipv6_flow_label.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/324__ipv6_flow_label.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for IPv6 Flow label and ICMP type
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/080__Inventory_Performance/010__restconf_inventory.txt b/test/csit/suites/base-of13/080__Inventory_Performance/010__restconf_inventory.txt
index fe1e7630e7c65aa9383e3d9919fab58e391a71bd..45b98ea65633d8080602dfc4ec18bcb4b097fc66 100644 (file)
--- a/test/csit/suites/base-of13/080__Inventory_Performance/010__restconf_inventory.txt
+++ b/test/csit/suites/base-of13/080__Inventory_Performance/010__restconf_inventory.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF inventory
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS_XML}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTCONFPORT}   auth=${AUTH}   headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           ../../../libraries/RequestsLibrary.py

diff --git a/test/csit/suites/base-of13/080__Inventory_Performance/020__switch_manager.txt b/test/csit/suites/base-of13/080__Inventory_Performance/020__switch_manager.txt
index f406ecc3418beff999f3a90e870edaa6348205b3..841a85de26cb0a4029c0c4337e549e922fcf28b6 100644 (file)
--- a/test/csit/suites/base-of13/080__Inventory_Performance/020__switch_manager.txt
+++ b/test/csit/suites/base-of13/080__Inventory_Performance/020__switch_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Switch Manager
-Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary

diff --git a/test/csit/suites/base-of13/080__Inventory_Performance/030__statistics_manager.txt b/test/csit/suites/base-of13/080__Inventory_Performance/030__statistics_manager.txt
index dc754b72beb744cf9afbcadf417e890e6c7f36fb..790e59a7a6c19744366009b01fa5a3466b23bc73 100644 (file)
--- a/test/csit/suites/base-of13/080__Inventory_Performance/030__statistics_manager.txt
+++ b/test/csit/suites/base-of13/080__Inventory_Performance/030__statistics_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Statistics Manager
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   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

diff --git a/test/csit/suites/base-of13/080__Inventory_Performance/040__topology_manager.txt b/test/csit/suites/base-of13/080__Inventory_Performance/040__topology_manager.txt
index 0b3370586baffc19cae4b229c4be017e48496642..d510c46025ad2e28dcfe065e4f39d01fc8915be5 100644 (file)
--- a/test/csit/suites/base-of13/080__Inventory_Performance/040__topology_manager.txt
+++ b/test/csit/suites/base-of13/080__Inventory_Performance/040__topology_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Topology Manager
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   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

diff --git a/test/csit/suites/base-of13/090__OVSDB/010__bridge_domain.txt b/test/csit/suites/base-of13/090__OVSDB/010__bridge_domain.txt
index 91b363ae797df27aa47629f60661de83fb03ee6d..04f74590311094cfdc63eee28b3fc63d9c817316 100644 (file)
--- a/test/csit/suites/base-of13/090__OVSDB/010__bridge_domain.txt
+++ b/test/csit/suites/base-of13/090__OVSDB/010__bridge_domain.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for OVSDB Bridge Domain
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTPORT}   auth=${AUTH}   headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/base-of13/100__OVSDB_OF13/010__bridge_domain.txt b/test/csit/suites/base-of13/100__OVSDB_OF13/010__bridge_domain.txt
index 91b363ae797df27aa47629f60661de83fb03ee6d..04f74590311094cfdc63eee28b3fc63d9c817316 100644 (file)
--- a/test/csit/suites/base-of13/100__OVSDB_OF13/010__bridge_domain.txt
+++ b/test/csit/suites/base-of13/100__OVSDB_OF13/010__bridge_domain.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for OVSDB Bridge Domain
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   auth=${AUTH}   headers=${HEADERS}
+Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTPORT}   auth=${AUTH}   headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/sp-of10/010__AD_SAL_NSF/010__switch_manager.txt b/test/csit/suites/sp-of10/010__AD_SAL_NSF/010__switch_manager.txt
index ac71cefc6d892a17d6c9361e8d27a342513d3760..13e0694c14bf5d6760d9a552270759c9546e0abc 100644 (file)
--- a/test/csit/suites/sp-of10/010__AD_SAL_NSF/010__switch_manager.txt
+++ b/test/csit/suites/sp-of10/010__AD_SAL_NSF/010__switch_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Switch Manager
-Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary

diff --git a/test/csit/suites/sp-of10/010__AD_SAL_NSF/020__statistics_manager.txt b/test/csit/suites/sp-of10/010__AD_SAL_NSF/020__statistics_manager.txt
index c632b3a190e1f8824c5a8fed873a083a1e8fc704..9bd466e39c4226427ce76479a7944eda8a96a7de 100644 (file)
--- a/test/csit/suites/sp-of10/010__AD_SAL_NSF/020__statistics_manager.txt
+++ b/test/csit/suites/sp-of10/010__AD_SAL_NSF/020__statistics_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Statistics Manager
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   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

diff --git a/test/csit/suites/sp-of10/010__AD_SAL_NSF/030__topology_manager.txt b/test/csit/suites/sp-of10/010__AD_SAL_NSF/030__topology_manager.txt
index 57fdde3b169c1a52e8a651105f359e6854515980..230d6e771c651d980b1e61ec25dab89010c6671b 100644 (file)
--- a/test/csit/suites/sp-of10/010__AD_SAL_NSF/030__topology_manager.txt
+++ b/test/csit/suites/sp-of10/010__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}:${PORT}   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

diff --git a/test/csit/suites/sp-of10/010__AD_SAL_NSF/040__flow_programmer.txt b/test/csit/suites/sp-of10/010__AD_SAL_NSF/040__flow_programmer.txt
index 68b99c2f31def6aa00139a6c0471adf66c95f3a6..315e76da6f70c4de3fe0d48c0a5ed897f1915135 100644 (file)
--- a/test/csit/suites/sp-of10/010__AD_SAL_NSF/040__flow_programmer.txt
+++ b/test/csit/suites/sp-of10/010__AD_SAL_NSF/040__flow_programmer.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Flow Programmer
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}  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

diff --git a/test/csit/suites/sp-of13/030__AD_SAL_NSF/010__switch_manager.txt b/test/csit/suites/sp-of13/030__AD_SAL_NSF/010__switch_manager.txt
index ac71cefc6d892a17d6c9361e8d27a342513d3760..13e0694c14bf5d6760d9a552270759c9546e0abc 100644 (file)
--- a/test/csit/suites/sp-of13/030__AD_SAL_NSF/010__switch_manager.txt
+++ b/test/csit/suites/sp-of13/030__AD_SAL_NSF/010__switch_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Switch Manager
-Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary

diff --git a/test/csit/suites/sp-of13/030__AD_SAL_NSF/020__statistics_manager.txt b/test/csit/suites/sp-of13/030__AD_SAL_NSF/020__statistics_manager.txt
index c632b3a190e1f8824c5a8fed873a083a1e8fc704..9bd466e39c4226427ce76479a7944eda8a96a7de 100644 (file)
--- a/test/csit/suites/sp-of13/030__AD_SAL_NSF/020__statistics_manager.txt
+++ b/test/csit/suites/sp-of13/030__AD_SAL_NSF/020__statistics_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Statistics Manager
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   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

diff --git a/test/csit/suites/sp-of13/030__AD_SAL_NSF/030__topology_manager.txt b/test/csit/suites/sp-of13/030__AD_SAL_NSF/030__topology_manager.txt
index 57fdde3b169c1a52e8a651105f359e6854515980..230d6e771c651d980b1e61ec25dab89010c6671b 100644 (file)
--- a/test/csit/suites/sp-of13/030__AD_SAL_NSF/030__topology_manager.txt
+++ b/test/csit/suites/sp-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}:${PORT}   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

diff --git a/test/csit/suites/sp-of13/030__AD_SAL_NSF/040__flow_programmer.txt b/test/csit/suites/sp-of13/030__AD_SAL_NSF/040__flow_programmer.txt
index 367cec2e9817f9e7a9f934d15d3519fb0378a3ae..e4fac2a8775dee1362dcd5b929e1e4e3678e0b11 100644 (file)
--- a/test/csit/suites/sp-of13/030__AD_SAL_NSF/040__flow_programmer.txt
+++ b/test/csit/suites/sp-of13/030__AD_SAL_NSF/040__flow_programmer.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Flow Programmer
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}  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

diff --git a/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/010__switch_manager.txt b/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/010__switch_manager.txt
index ac71cefc6d892a17d6c9361e8d27a342513d3760..13e0694c14bf5d6760d9a552270759c9546e0abc 100644 (file)
--- a/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/010__switch_manager.txt
+++ b/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/010__switch_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Switch Manager
-Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary

diff --git a/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/020__statistics_manager.txt b/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/020__statistics_manager.txt
index c632b3a190e1f8824c5a8fed873a083a1e8fc704..9bd466e39c4226427ce76479a7944eda8a96a7de 100644 (file)
--- a/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/020__statistics_manager.txt
+++ b/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/020__statistics_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Statistics Manager
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   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

diff --git a/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/030__topology_manager.txt b/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/030__topology_manager.txt
index 57fdde3b169c1a52e8a651105f359e6854515980..230d6e771c651d980b1e61ec25dab89010c6671b 100644 (file)
--- a/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/030__topology_manager.txt
+++ b/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/030__topology_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Topology Manager
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   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

diff --git a/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/040__flow_programmer.txt b/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/040__flow_programmer.txt
index 367cec2e9817f9e7a9f934d15d3519fb0378a3ae..e4fac2a8775dee1362dcd5b929e1e4e3678e0b11 100644 (file)
--- a/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/040__flow_programmer.txt
+++ b/test/csit/suites/sp-of13/040__AD_SAL_NSF_OF13/040__flow_programmer.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Flow Programmer
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}  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

diff --git a/test/csit/suites/vtn-of10/010__AD_SAL_NSF/010__switch_manager.txt b/test/csit/suites/vtn-of10/010__AD_SAL_NSF/010__switch_manager.txt
index ac71cefc6d892a17d6c9361e8d27a342513d3760..13e0694c14bf5d6760d9a552270759c9546e0abc 100644 (file)
--- a/test/csit/suites/vtn-of10/010__AD_SAL_NSF/010__switch_manager.txt
+++ b/test/csit/suites/vtn-of10/010__AD_SAL_NSF/010__switch_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Switch Manager
-Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    ${ODL_CONTROLLER_SESSION}    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary

diff --git a/test/csit/suites/vtn-of10/010__AD_SAL_NSF/020__statistics_manager.txt b/test/csit/suites/vtn-of10/010__AD_SAL_NSF/020__statistics_manager.txt
index c632b3a190e1f8824c5a8fed873a083a1e8fc704..9bd466e39c4226427ce76479a7944eda8a96a7de 100644 (file)
--- a/test/csit/suites/vtn-of10/010__AD_SAL_NSF/020__statistics_manager.txt
+++ b/test/csit/suites/vtn-of10/010__AD_SAL_NSF/020__statistics_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Statistics Manager
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}   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

diff --git a/test/csit/suites/vtn-of10/010__AD_SAL_NSF/030__topology_manager.txt b/test/csit/suites/vtn-of10/010__AD_SAL_NSF/030__topology_manager.txt
index 57fdde3b169c1a52e8a651105f359e6854515980..230d6e771c651d980b1e61ec25dab89010c6671b 100644 (file)
--- a/test/csit/suites/vtn-of10/010__AD_SAL_NSF/030__topology_manager.txt
+++ b/test/csit/suites/vtn-of10/010__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}:${PORT}   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

diff --git a/test/csit/suites/vtn-of10/010__AD_SAL_NSF/040__flow_programmer.txt b/test/csit/suites/vtn-of10/010__AD_SAL_NSF/040__flow_programmer.txt
index 68b99c2f31def6aa00139a6c0471adf66c95f3a6..315e76da6f70c4de3fe0d48c0a5ed897f1915135 100644 (file)
--- a/test/csit/suites/vtn-of10/010__AD_SAL_NSF/040__flow_programmer.txt
+++ b/test/csit/suites/vtn-of10/010__AD_SAL_NSF/040__flow_programmer.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Flow Programmer
-Suite Setup       Create Session   session   http://${CONTROLLER}:${PORT}  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

diff --git a/test/csit/suites/vtn-of10/020__VTN/010__vtn_manager.txt b/test/csit/suites/vtn-of10/020__VTN/010__vtn_manager.txt
index 8d85621dbbcb6c95eee11372b831b40030f548b0..e5535049fcdd4665a0d7cbd2888c9308a4c76983 100644 (file)
--- a/test/csit/suites/vtn-of10/020__VTN/010__vtn_manager.txt
+++ b/test/csit/suites/vtn-of10/020__VTN/010__vtn_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for VTN Manager
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/vtn-of13/050__VTN/010__vtn_manager.txt b/test/csit/suites/vtn-of13/050__VTN/010__vtn_manager.txt
index 8d85621dbbcb6c95eee11372b831b40030f548b0..e5535049fcdd4665a0d7cbd2888c9308a4c76983 100644 (file)
--- a/test/csit/suites/vtn-of13/050__VTN/010__vtn_manager.txt
+++ b/test/csit/suites/vtn-of13/050__VTN/010__vtn_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for VTN Manager
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/suites/vtn-of13/060__VTN_OF13/010__vtn_manager.txt b/test/csit/suites/vtn-of13/060__VTN_OF13/010__vtn_manager.txt
index 8d85621dbbcb6c95eee11372b831b40030f548b0..e5535049fcdd4665a0d7cbd2888c9308a4c76983 100644 (file)
--- a/test/csit/suites/vtn-of13/060__VTN_OF13/010__vtn_manager.txt
+++ b/test/csit/suites/vtn-of13/060__VTN_OF13/010__vtn_manager.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for VTN Manager
-Suite Setup       Create Session    session    http://${CONTROLLER}:${PORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections

diff --git a/test/csit/variables/Variables.py b/test/csit/variables/Variables.py
index defeb2c54793dbc8ccf36f7e76f17b5912d88385..ecd8b0e0b7fda5ccde11982af880b47ce044d909 100644 (file)
--- a/test/csit/variables/Variables.py
+++ b/test/csit/variables/Variables.py
@@ -8,6 +8,8 @@ import collections
 # Global variables
 CONTROLLER = '127.0.0.1'
 PORT = '8080'
+RESTPORT = '8080'
+RESTCONFPORT = '8080'
 PREFIX = 'http://' + CONTROLLER + ':' + PORT
 CONTAINER = 'default'
 USER = 'admin'