From: Jamo Luhrsen Date: Tue, 22 Mar 2016 18:03:02 +0000 (-0700) Subject: cleaning up system variables X-Git-Tag: release/beryllium-sr1^0 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=63342e0454b82783a6ef7a9b19e1698b9b5cd621 cleaning up system variables - trying to change all MININET to TOOLS_SYSTEM as well as CONTROLLER to ODL_SYSTEM - also found a few small refactors to make * MODULES_API instead of REST_CONTEXT * moved DIDM variables to subdir for clarity Change-Id: Ifa50e14a6f9479c55dfd0a748fb8936e1a6af0a6 Signed-off-by: Jamo Luhrsen --- diff --git a/csit/libraries/KarafKeywords.robot b/csit/libraries/KarafKeywords.robot index 90b4e8c28c..9cec844567 100644 --- a/csit/libraries/KarafKeywords.robot +++ b/csit/libraries/KarafKeywords.robot @@ -60,7 +60,7 @@ Check Karaf Log Has Messages [Return] ${output} Check Karaf Log File Does Not Have Messages - [Arguments] ${ip} ${message} ${user}=${ODL_SYSTEM_USER} ${password}=${CONTROLLER_PASSWORD} ${prompt}=${DEFAULT_LINUX_PROMPT} ${log_file}=${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log + [Arguments] ${ip} ${message} ${user}=${ODL_SYSTEM_USER} ${password}=${ODL_SYSTEM_PASSWORD} ${prompt}=${DEFAULT_LINUX_PROMPT} ${log_file}=${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log [Documentation] Fails if the provided ${message} is found in the karaf.log file. Uses grep to search. The ... karaf.log file can be overridden with ${log_file} to be any file on the given system @ ${ip} ${output}= Run Command On Controller ${ip} grep -c '${message}' ${log_file} user=${user} password=${password} prompt=${prompt} diff --git a/csit/libraries/KillPythonTool.robot b/csit/libraries/KillPythonTool.robot index f50bd0911c..f5dcd7d740 100644 --- a/csit/libraries/KillPythonTool.robot +++ b/csit/libraries/KillPythonTool.robot @@ -9,7 +9,7 @@ Documentation Robot keyword library (Resource) for killing possibly left-ove ... ... ... This library assumes that a SSH connections exists (and is switched to) -... to a Linux machine (usualy MININET) where the Python process should be killed. +... to a Linux machine (usualy TOOLS_SYSTEM_IP) where the Python process should be killed. ... TODO: The Utils.robot library has a "Run Command On Remote System" if we didn't want to make the assumption that an SSH connection was already open. ... alternative TODO: Explain that it is not worth to perform separate SSH logins. ... diff --git a/csit/libraries/UnimgrKeywords.robot b/csit/libraries/UnimgrKeywords.robot index 8678131a9e..d34a295beb 100644 --- a/csit/libraries/UnimgrKeywords.robot +++ b/csit/libraries/UnimgrKeywords.robot @@ -14,7 +14,7 @@ ${UniMgr_Variables_DIR} ../variables/unimgr *** Keywords *** Setup Unimgr Test Environment [Documentation] Establish the Opendayligh session and prepair the Mininet VMs - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Prepair Unimgr Test Environment ${TOOLS_SYSTEM_IP} Prepair Unimgr Test Environment ${TOOLS_SYSTEM_2_IP} diff --git a/csit/suites/aaa/idmlite/010_CRUD_Rest_CommandsTests.robot b/csit/suites/aaa/idmlite/010_CRUD_Rest_CommandsTests.robot index 775a8cbe62..09f8b0430f 100644 --- a/csit/suites/aaa/idmlite/010_CRUD_Rest_CommandsTests.robot +++ b/csit/suites/aaa/idmlite/010_CRUD_Rest_CommandsTests.robot @@ -22,7 +22,7 @@ Resource ../../../libraries/AAAKeywords.robot *** Variables *** # port is fixed in Jetty configuration, as well -${URI} http://${CONTROLLER}:8282 +${URI} http://${ODL_SYSTEM_IP}:8282 # create lists for Domains, Roles and Users - that can be cleaned up upon Teardown @{cleanup_domain_list} @{cleanup_role_list} diff --git a/csit/suites/alto/basic/010_resourcepool.robot b/csit/suites/alto/basic/010_resourcepool.robot index 1072712ec1..43c5e53f13 100644 --- a/csit/suites/alto/basic/010_resourcepool.robot +++ b/csit/suites/alto/basic/010_resourcepool.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for resourcepool -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library RequestsLibrary Variables ../../../variables/Variables.py diff --git a/csit/suites/alto/basic/020_simple_IRD.robot b/csit/suites/alto/basic/020_simple_IRD.robot index 88df14f063..b8b7b0d233 100644 --- a/csit/suites/alto/basic/020_simple_IRD.robot +++ b/csit/suites/alto/basic/020_simple_IRD.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for ALTO simple IRD (Information Resource Dictionary) -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library RequestsLibrary Library ../../../libraries/ALTO/AltoParser.py diff --git a/csit/suites/armoury/basic/010_Restconf_OK.robot b/csit/suites/armoury/basic/010_Restconf_OK.robot index 7f9cede557..7fe98847e2 100644 --- a/csit/suites/armoury/basic/010_Restconf_OK.robot +++ b/csit/suites/armoury/basic/010_Restconf_OK.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite to verify Restconf is OK -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library RequestsLibrary Library ../../../libraries/Common.py diff --git a/csit/suites/bgpcep/pcepuser/pcepuser.robot b/csit/suites/bgpcep/pcepuser/pcepuser.robot index c1d37b19a5..ee5fd21fa0 100644 --- a/csit/suites/bgpcep/pcepuser/pcepuser.robot +++ b/csit/suites/bgpcep/pcepuser/pcepuser.robot @@ -16,10 +16,9 @@ Resource ${CURDIR}/../../../libraries/NexusKeywords.robot Resource ${CURDIR}/../../../libraries/PcepOperations.robot Resource ${CURDIR}/../../../libraries/Utils.robot Variables ${CURDIR}/../../../variables/Variables.py -Variables ${CURDIR}/../../../variables/pcepuser/variables.py ${MININET} +Variables ${CURDIR}/../../../variables/pcepuser/variables.py ${TOOLS_SYSTEM_IP} *** Variables *** -${MININET_PROMPT} ${DEFAULT_LINUX_PROMPT} ${OUTPUT_TIMEOUT} 10 # FIXME: Unify parameter naming and case. ${ExpDir} ${CURDIR}/expected @@ -34,7 +33,7 @@ Topology_Precondition Start_Pcc_Mock [Documentation] Execute pcc-mock on Mininet, fail is Open is not sent, keep it running for next tests. - ${command}= NexusKeywords.Compose_Full_Java_Command -jar ${filename} --local-address ${MININET} --remote-address ${CONTROLLER} 2>&1 | tee pccmock.log + ${command}= NexusKeywords.Compose_Full_Java_Command -jar ${filename} --local-address ${TOOLS_SYSTEM_IP} --remote-address ${ODL_SYSTEM_IP} 2>&1 | tee pccmock.log Log ${command} Write ${command} Read_Until started, sent proposal Open @@ -120,7 +119,7 @@ Set_It_Up ... Also, delete and create directories for json diff handling. NexusKeywords.Initialize_Artifact_Deployment_And_Usage # FIXME: Unify Module prefix usage across whole file. - Create_Session ses http://${CONTROLLER}:${RESTCONFPORT}/restconf/operational/network-topology:network-topology auth=${AUTH} + Create_Session ses http://${ODL_SYSTEM_IP}:${RESTCONFPORT}/restconf/operational/network-topology:network-topology auth=${AUTH} ${name}= NexusKeywords.Deploy_Test_Tool bgpcep pcep-pcc-mock BuiltIn.Set_Suite_Variable ${filename} ${name} Remove_Directory ${ExpDir} diff --git a/csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot b/csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot index d3cad0f210..8c92b18d80 100644 --- a/csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot +++ b/csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot @@ -25,7 +25,7 @@ Resource ${CURDIR}/../../../libraries/NexusKeywords.robot Resource ${CURDIR}/../../../libraries/PcepOperations.robot Resource ${CURDIR}/../../../libraries/WaitForFailure.robot Variables ${CURDIR}/../../../variables/Variables.py -Variables ${CURDIR}/../../../variables/pcepuser/variables.py ${MININET} +Variables ${CURDIR}/../../../variables/pcepuser/variables.py ${TOOLS_SYSTEM_IP} *** Variables *** ${directory_for_actual_responses} ${TEMPDIR}${/}actual @@ -41,7 +41,7 @@ Topology_Precondition Start_Secure_Pcc_Mock [Documentation] Execute pcc-mock on Mininet with password set, fail if pcc-mock promptly exits. Keep pcc-mock running for next test cases. - ${command}= NexusKeywords.Compose_Full_Java_Command -jar ${filename} --password topsecret --reconnect 1 --local-address ${MININET} --remote-address ${CONTROLLER} 2>&1 | tee pccmock.log + ${command}= NexusKeywords.Compose_Full_Java_Command -jar ${filename} --password topsecret --reconnect 1 --local-address ${TOOLS_SYSTEM_IP} --remote-address ${ODL_SYSTEM_IP} 2>&1 | tee pccmock.log BuiltIn.Log ${command} SSHLibrary.Write ${command} Read_And_Fail_If_Prompt_Is_Seen @@ -161,7 +161,7 @@ Set_It_Up ${current_prompt}= BuiltIn.Set_Variable ${current_connection.prompt} BuiltIn.Log ${current_prompt} BuiltIn.Set_Suite_Variable ${prompt} ${current_prompt} - RequestsLibrary.Create_Session ses http://${CONTROLLER}:${RESTCONFPORT}${OPERATIONAL_TOPO_API} auth=${AUTH} + RequestsLibrary.Create_Session ses http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_TOPO_API} auth=${AUTH} ${name}= NexusKeywords.Deploy_Test_Tool bgpcep pcep-pcc-mock BuiltIn.Set_Suite_Variable ${filename} ${name} OperatingSystem.Remove_Directory ${directory_for_expected_responses} recursive=True @@ -225,6 +225,6 @@ Construct_Password_Element_Line_Using_Password Replace_Password_Xml_Element_In_Pcep_Client_Module [Arguments] ${password_element} [Documentation] Send restconf PUT to replace the config module specifying PCEP password element (may me empty=missing). - ${mapping_as_string}= BuiltIn.Set_Variable {'IP': '${MININET}', 'PASSWD': '''${password_element}'''} + ${mapping_as_string}= BuiltIn.Set_Variable {'IP': '${TOOLS_SYSTEM_IP}', 'PASSWD': '''${password_element}'''} BuiltIn.Log ${mapping_as_string} ConfigViaRestconf.Put_Xml_Template_Folder_Config_Via_Restconf ${directory_with_template_folders}${/}pcep_topology_client_module ${mapping_as_string} diff --git a/csit/suites/bgpcep/throughpcep/cases.robot b/csit/suites/bgpcep/throughpcep/cases.robot index 870f4e3454..052c1d37d0 100644 --- a/csit/suites/bgpcep/throughpcep/cases.robot +++ b/csit/suites/bgpcep/throughpcep/cases.robot @@ -85,10 +85,10 @@ Documentation PCEP performance suite, uses restconf with configurable authen ... LOG_NAME: Filename (without path) to save pcc-mock output into. ... LOG_PATH: Override if not the same as pccmock VM workspace. ... LSPS: Number of LSPs per PCC to simulate and test. -... MININET: Numeric IP address of VM to run pcc-mock and updater from by default. -... MININET_PASSWORD: Linux password to go with the username (empty means keys). -... MININET_PROMPT: Substring to identify Linux prompt on Mininet VM. -... MININET_USER: Linux username to SSH to on Mininet VM. +... TOOLS_SYSTEM_IP: Numeric IP address of VM to run pcc-mock and updater from by default. +... TOOLS_SYSTEM_PASSWORD: Linux password to go with the username (empty means keys). +... TOOLS_SYSTEM_PROMPT: Substring to identify Linux prompt on Mininet VM. +... TOOLS_SYSTEM_USER: Linux username to SSH to on Mininet VM. ... MININET_WORKSPACE: Path to where files may be created on Mininet VM. ... MOCK_FILE: Filename to use for mock-pcc executable instead of the timestamped one. ... PCCDOWNLOAD_HOSTHEADER: Download server may check checks this header before showing content. @@ -126,10 +126,6 @@ Resource ${CURDIR}/../../../libraries/Utils.robot # for Flexible_SSH # This table acts as an exhaustive list of variables users can modify on pybot invocation. # It also contains commented-out lines for variables defined elswhere. # Keep this list in alphabetical order. -# ${CONTROLLER} is inherited from Variables.py -# ${CONTROLLER_USER} is inherited from Variables.py -# ${CONTROLLER_PASSWORD} is inherited from Variables.py -${CONTROLLER_PROMPT} ${DEFAULT_LINUX_PROMPT} # from Variables.py ${CONTROLLER_WORKSPACE} /tmp ${FIRST_PCC_IP} ${PCCMOCKVM_IP} # ${LOG_FILE} is reserved for location of pybot-created log.html @@ -137,17 +133,15 @@ ${LOG_NAME} throughpcep.log ${LOG_PATH} ${PCCMOCKVM_WORKSPACE} ${LSPS} 65535 ${MININET} 127.0.0.1 -# ${MININET_PASSWORD} is inherited from Variables.py -${MININET_PROMPT} ${DEFAULT_LINUX_PROMPT} # from Variables.py ${MININET_USER} mininet ${MININET_WORKSPACE} /tmp ${PCCDOWNLOAD_HOSTHEADER} nexus.opendaylight.org ${PCCDOWNLOAD_URLBASE} http://${PCCDOWNLOAD_HOSTHEADER}/content/repositories/opendaylight.snapshot/org/opendaylight/bgpcep/pcep-pcc-mock/ ${PCCMOCK_COLOCATED} False -${PCCMOCKVM_IP} ${MININET} -${PCCMOCKVM_PASSWORD} ${MININET_PASSWORD} -${PCCMOCKVM_PROMPT} ${MININET_PROMPT} -${PCCMOCKVM_USER} ${MININET_USER} +${PCCMOCKVM_IP} ${TOOLS_SYSTEM_IP} +${PCCMOCKVM_PASSWORD} ${TOOLS_SYSTEM_PASSWORD} +${PCCMOCKVM_PROMPT} ${TOOLS_SYSTEM_PROMPT} +${PCCMOCKVM_USER} ${TOOLS_SYSTEM_USER} ${PCCMOCKVM_WORKSPACE} ${MININET_WORKSPACE} ${PCCS} 1 ${PCEP_READY_VERIFY_TIMEOUT} 300s @@ -157,13 +151,13 @@ ${RESTCONF_REUSE} True ${RESTCONF_SCOPE} ${EMPTY} ${RESTCONF_USER} ${USER} # from Variables.py ${UPDATER_COLOCATED} False -${UPDATER_ODLADDRESS} ${CONTROLLER} +${UPDATER_ODLADDRESS} ${OLD_SYSTEM_IP} ${UPDATER_REFRESH} 0.1 ${UPDATER_TIMEOUT} 300 ${UPDATERVM_ENABLE_TCP_RW_REUSE} True -${UPDATERVM_IP} ${MININET} -${UPDATERVM_PASSWORD} ${MININET_PASSWORD} -${UPDATERVM_PROMPT} ${MININET_PROMPT} +${UPDATERVM_IP} ${TOOLS_SYSTEM_IP} +${UPDATERVM_PASSWORD} ${TOOLS_SYSTEM_PASSWORD} +${UPDATERVM_PROMPT} ${TOOLS_SYSTEM_PROMPT} ${UPDATERVM_USER} ${MININET_USER} ${UPDATERVM_WORKSPACE} ${MININET_WORKSPACE} @@ -192,8 +186,8 @@ Put_Updater SSHKeywords.Assure_Library_Counter target_dir=${UPDATERVM_WORKSPACE} SSHKeywords.Assure_Library_Ipaddr target_dir=${UPDATERVM_WORKSPACE} # Done preparation of Updater VM, now use AuthStandalone to create session from robot VM too. - BuiltIn.Log_Many ${RESTCONF_USER} ${RESTCONF_PASSWORD} ${RESTCONF_SCOPE} ${CONTROLLER} - ${session} = AuthStandalone.Init_Session ${CONTROLLER} ${RESTCONF_USER} ${RESTCONF_PASSWORD} ${RESTCONF_SCOPE} + BuiltIn.Log_Many ${RESTCONF_USER} ${RESTCONF_PASSWORD} ${RESTCONF_SCOPE} ${ODL_SYSTEM_IP} + ${session} = AuthStandalone.Init_Session ${ODL_SYSTEM_IP} ${RESTCONF_USER} ${RESTCONF_PASSWORD} ${RESTCONF_SCOPE} BuiltIn.Set_Suite_Variable ${rest_session} ${session} # TODO: Define http timeouts. @@ -218,7 +212,7 @@ Topology_Precondition Start_Pcc_Mock [Documentation] Launch pcc-mock on background so simulated PCCs start connecting to controller. SSHLibrary.Switch_Connection pccmock - ${command} = NexusKeywords.Compose_Full_Java_Command -jar ${mock_location} --local-address ${FIRST_PCC_IP} --remote-address ${CONTROLLER} --pcc ${PCCS} --lsp ${LSPS} &> ${LOG_PATH}/${LOG_NAME} + ${command} = NexusKeywords.Compose_Full_Java_Command -jar ${mock_location} --local-address ${FIRST_PCC_IP} --remote-address ${ODL_SYSTEM_IP} --pcc ${PCCS} --lsp ${LSPS} &> ${LOG_PATH}/${LOG_NAME} BuiltIn.Log ${command} SSHLibrary.Write ${command} # The pccmock SSH session is left alive, but no data will be exchanged for a while. @@ -379,17 +373,17 @@ Restore_Tcp_Rw_Reuse *** Keywords *** Pccmock_From_Controller [Documentation] Copy Controller values to Pccmock VM variables. - BuiltIn.Set_Suite_Variable ${PCCMOCKVM_IP} ${CONTROLLER} - BuiltIn.Set_Suite_Variable ${PCCMOCKVM_PASSWORD} ${CONTROLLER_PASSWORD} - BuiltIn.Set_Suite_Variable ${PCCMOCKVM_PROMPT} ${CONTROLLER_PROMPT} + BuiltIn.Set_Suite_Variable ${PCCMOCKVM_IP} ${ODL_SYSTEM_IP} + BuiltIn.Set_Suite_Variable ${PCCMOCKVM_PASSWORD} ${ODL_SYSTEM_PASSWORD} + BuiltIn.Set_Suite_Variable ${PCCMOCKVM_PROMPT} ${ODL_SYSTEM_PROMPT} BuiltIn.Set_Suite_Variable ${PCCMOCKVM_WORKSPACE} ${CONTROLLER_WORKSPACE} BuiltIn.Set_Suite_Variable ${LOG_PATH} ${CONTROLLER_WORKSPACE} Updater_From_Controller [Documentation] Copy Controller values to Uprater VM variables. - BuiltIn.Set_Suite_Variable ${UPDATERVM_IP} ${CONTROLLER} - BuiltIn.Set_Suite_Variable ${UPDATERVM_PASSWORD} ${CONTROLLER_PASSWORD} - BuiltIn.Set_Suite_Variable ${UPDATERVM_PROMPT} ${CONTROLLER_PROMPT} + BuiltIn.Set_Suite_Variable ${UPDATERVM_IP} ${ODL_SYSTEM_IP} + BuiltIn.Set_Suite_Variable ${UPDATERVM_PASSWORD} ${ODL_SYSTEM_PASSWORD} + BuiltIn.Set_Suite_Variable ${UPDATERVM_PROMPT} ${ODL_SYSTEM_PROMPT} BuiltIn.Set_Suite_Variable ${UPDATERVM_WORKSPACE} ${CONTROLLER_WORKSPACE} Disconnect diff --git a/csit/suites/capwap/basic/capwap_session.robot b/csit/suites/capwap/basic/capwap_session.robot index 9e294694ce..0846142e1b 100644 --- a/csit/suites/capwap/basic/capwap_session.robot +++ b/csit/suites/capwap/basic/capwap_session.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for capwap discover functionality -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library RequestsLibrary Library ../../../libraries/Common.py @@ -15,12 +15,12 @@ ${DISC_WTP_REST} /restconf/operational/capwap-impl:capwap-ac-root/ *** Test Cases *** Get Discovered WTPs [Documentation] Get the WTP Discoverd - send discover ${CONTROLLER} + send discover ${ODL_SYSTEM_IP} Wait Until Keyword Succeeds 10s 5s Run Test Get Discovered WTP Get Specific WTP [Documentation] Get the details of specific WTP. - send discover ${CONTROLLER} + send discover ${ODL_SYSTEM_IP} Wait Until Keyword Succeeds 10s 5s Run Test Get Specifc WTP *** Keywords *** @@ -31,7 +31,7 @@ Run Test Get Discovered WTP ${result} TO JSON ${resp.content} ${ac_Root} Get From Dictionary ${result} capwap-ac-root @{wtp_discovered} Get From Dictionary ${ac_Root} discovered-wtps - ${expected_ip_addr} get simulated wtpip ${CONTROLLER} + ${expected_ip_addr} get simulated wtpip ${ODL_SYSTEM_IP} ${wtp_ip_list} Create List '' : FOR ${wtp} IN @{wtp_discovered} \ ${wtp_ip} Get From Dictionary ${wtp} ipv4-addr @@ -40,7 +40,7 @@ Run Test Get Discovered WTP List Should Contain Value ${wtp_ip_list} ${expected_ip_addr} Run Test Get Specifc WTP - ${expected_ip_addr} get simulated wtpip ${CONTROLLER} + ${expected_ip_addr} get simulated wtpip ${ODL_SYSTEM_IP} ${DISC_SPECIFIC_WTP} catenate SEPARATOR= ${DISC_WTP_REST} discovered-wtps\/ ${expected_ip_addr} \/ Log ${DISC_SPECIFIC_WTP} ${resp} RequestsLibrary.Get Request session ${DISC_SPECIFIC_WTP} diff --git a/csit/suites/didm/basic/010_Didm.robot b/csit/suites/didm/basic/010_Didm.robot index 7af0ca1f45..ef3a94e937 100644 --- a/csit/suites/didm/basic/010_Didm.robot +++ b/csit/suites/didm/basic/010_Didm.robot @@ -40,4 +40,4 @@ Setup Didm Environment Install a Feature odl-didm-mininet Install a Feature odl-hp3800 Start Suite - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} diff --git a/csit/suites/didm/discovery/device_discovery.robot b/csit/suites/didm/discovery/device_discovery.robot index 39fd9192da..7b0c7cdb7e 100644 --- a/csit/suites/didm/discovery/device_discovery.robot +++ b/csit/suites/didm/discovery/device_discovery.robot @@ -10,7 +10,7 @@ Suite Teardown DIDM Suite Teardown Library SSHLibrary Library Collections Library RequestsLibrary -Resource ../../../variables/Variables.robot +Resource ../../../variables/DIDM/Variables.robot Variables ../../../variables/Variables.py Resource ../../../libraries/Utils.robot Resource ../../../libraries/MininetKeywords.robot @@ -87,9 +87,9 @@ Setup DIDM Environment Verify Feature Is Installed odl-openflowplugin-all-li ${message}= Set Variable org.opendaylight.didm.ovs - 0.2.0.SNAPSHOT | Device-type Listener registered Wait For Karaf Log ${message} - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Log Start device ${mininet_topo_opt}= Set Variable --topo linear,1 --switch ovsk,protocols=OpenFlow13 - ${mininet_conn_id}= Start Mininet Single Controller ${DEVICE_IP} ${CONTROLLER} ${mininet_topo_opt} + ${mininet_conn_id}= Start Mininet Single Controller ${TOOLS_SYSTEM_IP} ${ODL_SYSTEM_IP} ${mininet_topo_opt} Wait Until Keyword Succeeds 11s 1s Check DIDM Registered With Device Set Suite Variable ${mininet_conn_id} diff --git a/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot b/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot index 638b102a65..d5cabe1151 100644 --- a/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot +++ b/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot @@ -17,7 +17,7 @@ Init Variables Add Tenant to one node [Documentation] Add one Tenant from JSON file - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} + Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} ${jsonbody} Read JSON From File ${GBP_TENANT1_FILE} Add Elements To URI From File ${GBP_TENANT1_API} ${GBP_TENANT1_FILE} headers=${HEADERS_YANG_JSON} ${resp} RequestsLibrary.Get Request session ${GBP_TENANT1_API} @@ -26,7 +26,7 @@ Add Tenant to one node Lists Should be Equal ${result} ${jsonbody} Read Tenant from other node - Create Session session http://${CONTROLLER1}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} + Create Session session http://${ODL_SYSTEM_2_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} ${jsonbody} Read JSON From File ${GBP_TENANT1_FILE} ${resp} RequestsLibrary.Get Request session ${GBP_TENANT1_API} Should Be Equal As Strings ${resp.status_code} 200 diff --git a/csit/suites/groupbasedpolicy/GBP/3-node/GBP_3node.robot b/csit/suites/groupbasedpolicy/GBP/3-node/GBP_3node.robot index afd4309b8d..92f5d19836 100755 --- a/csit/suites/groupbasedpolicy/GBP/3-node/GBP_3node.robot +++ b/csit/suites/groupbasedpolicy/GBP/3-node/GBP_3node.robot @@ -10,7 +10,7 @@ Setup Node [Arguments] ${GBP} ${suite_dir} ${sw_index} ${timeout}=10s ConnUtils.Connect and Login ${GBP} timeout=${timeout} SSHLibrary.Put File ${suite_dir}/init_scripts/* ${VM_HOME_FOLDER}${/}${VM_SCRIPTS_FOLDER}/ mode=0755 - ${stdout} ${stderr} ${rc} Execute in VE python ${VM_HOME_FOLDER}${/}${VM_SCRIPTS_FOLDER}/infrastructure_launch.py ${CONTROLLER} ${sw_index} timeout=${timeout} + ${stdout} ${stderr} ${rc} Execute in VE python ${VM_HOME_FOLDER}${/}${VM_SCRIPTS_FOLDER}/infrastructure_launch.py ${ODL_SYSTEM_IP} ${sw_index} timeout=${timeout} Should Be Equal As Numbers ${rc} 0 SSHLibrary.Close Connection diff --git a/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/001_set_odl.robot b/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/001_set_odl.robot index e704ce9428..35bbda1016 100644 --- a/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/001_set_odl.robot +++ b/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/001_set_odl.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for GBP Tenants, Operates functions from Restconf APIs. -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Default Tags single-tenant setup single-tenant-setup Library RequestsLibrary diff --git a/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/998_clean_odl.robot b/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/998_clean_odl.robot index 6787c6b171..9ae6682b54 100644 --- a/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/998_clean_odl.robot +++ b/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/998_clean_odl.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for cleaning up / unregister infrastructure constructs like endpoints for demo-asymmetric-chain -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Default Tags single-tenant teardown single-tenant-teardown Library RequestsLibrary diff --git a/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/001_set_odl.robot b/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/001_set_odl.robot index 4d30e8d039..e8a8a17886 100644 --- a/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/001_set_odl.robot +++ b/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/001_set_odl.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for GBP Tenants, Operates functions from Restconf APIs. -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Default Tags multi-tenant setup multi-tenant-setup Library RequestsLibrary diff --git a/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/998_clean_odl.robot b/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/998_clean_odl.robot index 54ad3ef314..3654e18992 100644 --- a/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/998_clean_odl.robot +++ b/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/998_clean_odl.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for cleaning up / unregister infrastructure constructs like endpoints for demo-asymmetric-chain -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Default Tags multi-tenant teardown multi-tenant-teardown Library RequestsLibrary diff --git a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/010_set_odl.robot b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/010_set_odl.robot index 568ac597fa..eed92160c9 100644 --- a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/010_set_odl.robot +++ b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/010_set_odl.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for setting up infrastructure for demo-asymmetric-chain -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_YANG_JSON} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_YANG_JSON} Suite Teardown Delete All Sessions Library RequestsLibrary Library OperatingSystem diff --git a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/998_clean_odl.robot b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/998_clean_odl.robot index e25997a8d7..f9c9b61ea0 100644 --- a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/998_clean_odl.robot +++ b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/998_clean_odl.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for cleaning up / unregister infrastructure constructs like endpoints for demo-asymmetric-chain -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library RequestsLibrary Library OperatingSystem diff --git a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/010_set_odl.robot b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/010_set_odl.robot index 80cdc88410..d998785411 100644 --- a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/010_set_odl.robot +++ b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/010_set_odl.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for setting up infrastructure for demo-symmetric-chain -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library RequestsLibrary Library OperatingSystem diff --git a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/998_clean_odl.robot b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/998_clean_odl.robot index fe4f678985..dcf8cf9c5c 100644 --- a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/998_clean_odl.robot +++ b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/998_clean_odl.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for cleaning up / unregister infrastructure constructs like endpoints for demo-symmetric-chain -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library RequestsLibrary Library OperatingSystem diff --git a/csit/suites/groupbasedpolicy/GBP_Basic/010_gbp_endpoint.robot b/csit/suites/groupbasedpolicy/GBP_Basic/010_gbp_endpoint.robot index 95594c495e..757652793d 100644 --- a/csit/suites/groupbasedpolicy/GBP_Basic/010_gbp_endpoint.robot +++ b/csit/suites/groupbasedpolicy/GBP_Basic/010_gbp_endpoint.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for Group Based Policy, Operates functions from Restconf APIs. -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections diff --git a/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot b/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot index a2666c814f..49f78700b1 100644 --- a/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot +++ b/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for GBP Tenants, Operates functions from Restconf APIs. -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections diff --git a/csit/suites/groupbasedpolicy/GBP_Basic/030_gbp_tunnel.robot b/csit/suites/groupbasedpolicy/GBP_Basic/030_gbp_tunnel.robot index 4457788f59..1c6e64ca15 100644 --- a/csit/suites/groupbasedpolicy/GBP_Basic/030_gbp_tunnel.robot +++ b/csit/suites/groupbasedpolicy/GBP_Basic/030_gbp_tunnel.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for GBP Tunnels, Operates functions from Restconf APIs. -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections diff --git a/csit/suites/integration/scripts/sample.sh b/csit/suites/integration/scripts/sample.sh index 4b088643be..236db4875d 100644 --- a/csit/suites/integration/scripts/sample.sh +++ b/csit/suites/integration/scripts/sample.sh @@ -1,7 +1,7 @@ #!/bin/bash -echo "Controller IP is ${CONTROLLER0}" -echo "Mininet IP is ${MININET0}" +echo "Controller IP is ${ODL_SYSTEM_IP}" +echo "Mininet IP is ${TOOLS_SYSTEM_IP}" echo "Distribution bundle URL is ${ACTUALBUNDLEURL}" echo "Distribution bundle is ${BUNDLE}" echo "Distribution bundle version is ${BUNDLEVERSION}" diff --git a/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot b/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot index a4a8153300..71eb00236b 100644 --- a/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot +++ b/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot @@ -15,14 +15,14 @@ Start Suite ${TOPO_TREE_DEPTH} Convert To Integer ${TOPO_TREE_DEPTH} ${TOPO_TREE_FANOUT} Convert To Integer ${TOPO_TREE_FANOUT} ${numnodes} Num Of Nodes ${TOPO_TREE_DEPTH} ${TOPO_TREE_FANOUT} - Open Connection ${TOOLS_SYSTEM_IP} prompt=> timeout=${numnodes*3} + Open Connection ${TOOLS_SYSTEM_IP} prompt=${DEFAULT_LINUX_PROMPT} timeout=${numnodes*3} Login With Public Key ${TOOLS_SYSTEM_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Write sudo ovs-vsctl set-manager ptcp:6644 - Read Until > + Read Until ${DEFAULT_LINUX_PROMPT} Write sudo mn -c - Read Until > - Read Until > - Read Until > + Read Until ${DEFAULT_LINUX_PROMPT} + Read Until ${DEFAULT_LINUX_PROMPT} + Read Until ${DEFAULT_LINUX_PROMPT} Write ${start} Read Until mininet> diff --git a/csit/suites/lacp/Lacp_Feature_OF13/010__lacp_inventory.robot b/csit/suites/lacp/Lacp_Feature_OF13/010__lacp_inventory.robot index 7b7ba5a98a..140452500a 100644 --- a/csit/suites/lacp/Lacp_Feature_OF13/010__lacp_inventory.robot +++ b/csit/suites/lacp/Lacp_Feature_OF13/010__lacp_inventory.robot @@ -84,5 +84,5 @@ Verify LACP Tags Are Formed LACP Inventory Suite Setup [Documentation] If these basic checks fail, there is no need to continue any of the other test cases - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Wait Until Keyword Succeeds 10s 1s Verify LACP Tags Are Formed diff --git a/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot b/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot index cbc062d221..2f4f289daf 100644 --- a/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot +++ b/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot @@ -91,14 +91,14 @@ Verify LACP Tags Are Formed LACP Inventory Suite Setup [Documentation] If these basic checks fail, there is no need to continue any of the other test cases - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Wait Until Keyword Succeeds 15s 1s Verify LACP Tags Are Formed Set Host interface state [Arguments] ${port-id} ${port-state} [Documentation] Will configure the port state of the Host to either up or down - Open Connection ${MININET} prompt=${DEFAULT_LINUX_PROMPT} - Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any + Open Connection ${TOOLS_SYSTEM_IP} prompt=${DEFAULT_LINUX_PROMPT} + Login With Public Key ${TOOLS_SYSTEM_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Write sudo ./m h2 Write sudo ifconfig ${port-id} Write sudo ifconfig ${port-id} ${port-state} @@ -106,7 +106,7 @@ Set Host interface state Verify Switch S1 Group Table [Arguments] ${group-type} ${port-id1} ${port-id2} ${port-id2-state} [Documentation] Functionality to verify the presence of LACP group entries on the OVS Switch(S1) Group table - ${group_output}= Run Command on Remote System ${MININET} sudo ovs-ofctl dump-groups s1 -O OpenFlow13 ${MININET_USER} # + ${group_output}= Run Command on Remote System ${TOOLS_SYSTEM_IP} sudo ovs-ofctl dump-groups s1 -O OpenFlow13 ${TOOLS_SYSTEM_USER} # Log ${group_output} Comment ${group_output} Read Until mininet> ${result}= Get Lines Containing String ${group_output} output:${port-id1} diff --git a/csit/suites/lacp/Lacp_Feature_OF13/030__lacp_flow_entry_stats.robot b/csit/suites/lacp/Lacp_Feature_OF13/030__lacp_flow_entry_stats.robot index 3a3c98d6d4..744efb746c 100644 --- a/csit/suites/lacp/Lacp_Feature_OF13/030__lacp_flow_entry_stats.robot +++ b/csit/suites/lacp/Lacp_Feature_OF13/030__lacp_flow_entry_stats.robot @@ -16,14 +16,14 @@ ${node1} openflow:1 *** Test Cases *** Verify Switch S1 LACP flow entry packet hit doesn't display zero value [Documentation] Verify the LACP flow entry packet hit stats doesn't display zero value on the Switch S1 - ${result}= Run Command On Remote System ${MININET} sudo ovs-ofctl dump-flows s1 -O OpenFlow13 + ${result}= Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo ovs-ofctl dump-flows s1 -O OpenFlow13 Comment ${result} Read Until mininet> Should Not Contain ${result} n_packets=0 Should Not Contain ${result} n_bytes=0 Verify Switch S1 Port stats doesn't display zero value [Documentation] Verify the port stats for the Switch S1 doesn't display value with zero - ${result}= Run Command On Remote System ${MININET} sudo ovs-ofctl dump-ports s1 -O OpenFlow13 ${MININET_USER} # + ${result}= Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo ovs-ofctl dump-ports s1 -O OpenFlow13 ${TOOLS_SYSTEM_USER} # Comment ${result} Read Until mininet> ${port1}= Get Lines Containing String ${result} 1: Should Not Contain ${port1} rx pkts=0 @@ -59,5 +59,5 @@ Verify LACP Tags Are Formed LACP Inventory Suite Setup [Documentation] If these basic checks fail, there is no need to continue any of the other test cases - Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} + Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Wait Until Keyword Succeeds 15s 1s Verify LACP Tags Are Formed diff --git a/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot b/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot index 519fac4b93..e02b24582e 100644 --- a/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot +++ b/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot @@ -12,9 +12,9 @@ ${bond} "/etc/modprobe.d/bonding.conf" *** Keywords *** Start Suite Log Start mininet - ${mininet_session_id}= Open Connection ${MININET} prompt=${DEFAULT_LINUX_PROMPT} timeout=30s + ${mininet_session_id}= Open Connection ${TOOLS_SYSTEM_IP} prompt=${DEFAULT_LINUX_PROMPT} timeout=30s Set Suite Variable ${mininet_session_id} - Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any + Login With Public Key ${TOOLS_SYSTEM_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Execute Command sudo ovs-vsctl set-manager ptcp:6633 Execute Command sudo rm -rf ${bond} Put File ${CURDIR}/LACP_custom1.py @@ -23,7 +23,7 @@ Start Suite Put File ${CURDIR}/m Put File ${CURDIR}/bonding.conf Execute Command sudo cp bonding.conf ${bond} - Execute Command sed -i -- 's/CONTROLLER/${CONTROLLER}/g' LACP_custom1.py + Execute Command sed -i -- 's/CONTROLLER/${ODL_SYSTEM_IP}/g' LACP_custom1.py Write ${start} Read Until mininet> @@ -32,6 +32,6 @@ Stop Suite Switch Connection ${mininet_session_id} Read Write exit - Execute Command sed -i -- 's/${CONTROLLER}/CONTROLLER/g' LACP_custom1.py + Execute Command sed -i -- 's/${ODL_SYSTEM_IP}/CONTROLLER/g' LACP_custom1.py Execute Command sudo rm -rf ${bond} Close Connection diff --git a/csit/suites/mdsal/dsbenchmark/dsbenchmark.robot b/csit/suites/mdsal/dsbenchmark/dsbenchmark.robot index 1cfe90cdb1..f092387b15 100644 --- a/csit/suites/mdsal/dsbenchmark/dsbenchmark.robot +++ b/csit/suites/mdsal/dsbenchmark/dsbenchmark.robot @@ -43,7 +43,6 @@ Resource ${CURDIR}/../../../libraries/Utils.robot Resource ${CURDIR}/../../../libraries/WaitForFailure.robot *** Variables *** -${MININET_PROMPT} ${DEFAULT_LINUX_PROMPT} ${ODL_LOG_LEVEL} DEFAULT ${TX_TYPE} {TX-CHAINING,SIMPLE-TX} ${OP_TYPE} {PUT,MERGE,DELETE} @@ -108,8 +107,8 @@ Setup_Everything [Documentation] Setup imported resources, SSH-login to mininet machine, ... create HTTP session, put Python tool to mininet machine. SetupUtils.Setup_Utils_For_Setup_And_Teardown - SSHLibrary.Set_Default_Configuration prompt=${MININET_PROMPT} - SSHLibrary.Open_Connection ${MININET} + SSHLibrary.Set_Default_Configuration prompt=${TOOLS_SYSTEM_PROMPT} + SSHLibrary.Open_Connection ${TOOLS_SYSTEM_IP} Utils.Flexible_Mininet_Login SSHLibrary.Put_File ${CURDIR}/../../../../tools/mdsal_benchmark/${tool} @@ -119,10 +118,10 @@ Teardown_Everything Start_Benchmark_Tool [Documentation] Start the benchmark tool. Check that it has been running at least for ${tool_startup_timeout} period. - ${command}= BuiltIn.Set_Variable python ${tool} --host ${CONTROLLER} --port ${RESTCONFPORT} --warmup ${WARMUPS} --runs ${RUNS} --total ${TOTAL_OPS} --inner ${INNER_OPS} --txtype ${TX_TYPE} --ops ${OPS_PER_TX} --optype ${OP_TYPE} --plot ${FILTER} --units ${UNITS} ${tool_args} &> ${tool_log_name} + ${command}= BuiltIn.Set_Variable python ${tool} --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} --warmup ${WARMUPS} --runs ${RUNS} --total ${TOTAL_OPS} --inner ${INNER_OPS} --txtype ${TX_TYPE} --ops ${OPS_PER_TX} --optype ${OP_TYPE} --plot ${FILTER} --units ${UNITS} ${tool_args} &> ${tool_log_name} BuiltIn.Log ${command} ${output}= SSHLibrary.Write ${command} - ${status} ${message}= BuiltIn.Run Keyword And Ignore Error Write Until Expected Output ${EMPTY} ${MININET_PROMPT} ${tool_startup_timeout} + ${status} ${message}= BuiltIn.Run Keyword And Ignore Error Write Until Expected Output ${EMPTY} ${TOOLS_SYSTEM_PROMPT} ${tool_startup_timeout} ... 1s BuiltIn.Log ${status} BuiltIn.Log ${message} diff --git a/csit/suites/messaging4transport/basic/010_Restconf_OK.robot b/csit/suites/messaging4transport/basic/010_Restconf_OK.robot index 4d19667e2d..0e3425d521 100644 --- a/csit/suites/messaging4transport/basic/010_Restconf_OK.robot +++ b/csit/suites/messaging4transport/basic/010_Restconf_OK.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite to verify Restconf is OK -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library RequestsLibrary Variables ../../../variables/Variables.py diff --git a/csit/suites/netconf/MDSAL/northbound.robot b/csit/suites/netconf/MDSAL/northbound.robot index ad62d2b603..2baa14b252 100644 --- a/csit/suites/netconf/MDSAL/northbound.robot +++ b/csit/suites/netconf/MDSAL/northbound.robot @@ -306,7 +306,7 @@ Get_Data [Return] ${data} Create_ODL_Netconf_Connection - [Arguments] ${host}=${CONTROLLER} ${port}=${ODL_NETCONF_MDSAL_PORT} ${user}=${ODL_NETCONF_USER} ${password}=${ODL_NETCONF_PASSWORD} + [Arguments] ${host}=${ODL_SYSTEM_IP} ${port}=${ODL_NETCONF_MDSAL_PORT} ${user}=${ODL_NETCONF_USER} ${password}=${ODL_NETCONF_PASSWORD} [Documentation] Open a netconf connecion to the given machine. # The "-s netconf" flag (see the "SSHLibrary.Write" line below) is not # supported by SSHLibrary, therefore we need to use this elaborate and @@ -404,7 +404,7 @@ Close_ODL_Netconf_Connection_Gracefully Setup_Everything [Documentation] Setup resources and create session for Restconf checking. SetupUtils.Setup_Utils_For_Setup_And_Teardown - RequestsLibrary.Create_Session config http://${CONTROLLER}:${RESTCONFPORT}${CONFIG_API} auth=${AUTH} + RequestsLibrary.Create_Session config http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${CONFIG_API} auth=${AUTH} Teardown_Everything [Documentation] Close the Netconf connection and destroy all sessions in the requests library. diff --git a/csit/suites/netconf/notifications/notifications_basic.robot b/csit/suites/netconf/notifications/notifications_basic.robot index c6bd7c6640..8aa74870e4 100644 --- a/csit/suites/netconf/notifications/notifications_basic.robot +++ b/csit/suites/netconf/notifications/notifications_basic.robot @@ -141,8 +141,8 @@ Setup_Everything ${output_log} = SSHLibrary.Execute_Command python -c "help('modules')" BuiltIn.Log ${output_log} Should Contain ${output_log} websocket - RequestsLibrary.Create Session restconf http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} - BuiltIn.Log http://${CONTROLLER}:${RESTCONFPORT} + RequestsLibrary.Create Session restconf http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} + BuiltIn.Log http://${ODL_SYSTEM_IP}:${RESTCONFPORT} KarafKeywords.Execute_Controller_Karaf_Command_On_Background log:set ${CONTROLLER_LOG_LEVEL} Teardown_Everything diff --git a/csit/suites/netconf/ready/netconfready.robot b/csit/suites/netconf/ready/netconfready.robot index a6ee539764..e2f9638e7f 100644 --- a/csit/suites/netconf/ready/netconfready.robot +++ b/csit/suites/netconf/ready/netconfready.robot @@ -105,7 +105,7 @@ Setup_Everything KarafKeywords.Open_Controller_Karaf_Console_On_Background KarafKeywords.Log_Message_To_Controller_Karaf Starting Netconf readiness test suite BuiltIn.Run_Keyword_If ${DEBUG_LOGGING_FOR_EVERYTHING} KarafKeywords.Execute_Controller_Karaf_Command_On_Background log:set DEBUG - RequestsLibrary.Create_Session ses http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} + RequestsLibrary.Create_Session ses http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} NetconfKeywords.Setup_Netconf_Keywords Teardown_Everything diff --git a/csit/suites/netide/basic/010_netide_endpoint.robot b/csit/suites/netide/basic/010_netide_endpoint.robot index 915d030c3d..6972bfc025 100644 --- a/csit/suites/netide/basic/010_netide_endpoint.robot +++ b/csit/suites/netide/basic/010_netide_endpoint.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite to verify Restconf is OK for NetIDE. -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library RequestsLibrary Variables ../../../variables/Variables.py diff --git a/csit/suites/openflowplugin/Bug_Validation/2429.robot b/csit/suites/openflowplugin/Bug_Validation/2429.robot index 4fc89666cb..390f9550a1 100644 --- a/csit/suites/openflowplugin/Bug_Validation/2429.robot +++ b/csit/suites/openflowplugin/Bug_Validation/2429.robot @@ -24,14 +24,14 @@ Bug_2429 ... a larger number of failed connections will be used and a small margin of error will ... determine if the test is a PASS or FAIL Log Environment Details - ${controller_pid}= Get Process ID Based On Regex On Remote System ${ODL_SYSTEM_IP} java.*distribution.*karaf ${CONTROLLER_USER} + ${controller_pid}= Get Process ID Based On Regex On Remote System ${ODL_SYSTEM_IP} java.*distribution.*karaf ${ODL_SYSTEM_USER} Should Match Regexp ${controller_pid} [0-9]+ PID was not discovered - ${starting_thread_count}= Get Process Thread Count On Remote System ${ODL_SYSTEM_IP} ${controller_pid} ${CONTROLLER_USER} + ${starting_thread_count}= Get Process Thread Count On Remote System ${ODL_SYSTEM_IP} ${controller_pid} ${ODL_SYSTEM_USER} Repeat Keyword ${number_ofconnections_to_fail} Start Process nc -w 1 ${ODL_SYSTEM_IP} ... ${openflow_port} Run pkill -f 'nc -w' Log Environment Details - ${ending_thread_count}= Get Process Thread Count On Remote System ${ODL_SYSTEM_IP} ${controller_pid} ${CONTROLLER_USER} + ${ending_thread_count}= Get Process Thread Count On Remote System ${ODL_SYSTEM_IP} ${controller_pid} ${ODL_SYSTEM_USER} Log Environment Details Log starting count: ${starting_thread_count}\nending count: ${ending_thread_count} ${acceptable_thread_count}= Evaluate ${starting_thread_count} + (${number_of_connections_to_fail} * ${margin_of_error}) @@ -42,7 +42,7 @@ Bug_2429 Log Environment Details [Documentation] Will display relevant details of the test environement to help aid debugging efforts if ... needed in the future. - ${output}= Get Process ID Based On Regex On Remote System ${ODL_SYSTEM_IP} java.*distribution.*karaf ${CONTROLLER_USER} + ${output}= Get Process ID Based On Regex On Remote System ${ODL_SYSTEM_IP} java.*distribution.*karaf ${ODL_SYSTEM_USER} Log ${output} - ${output}= Run Command On Remote System ${ODL_SYSTEM_IP} netstat -na | grep 6633 ${CONTROLLER_USER} + ${output}= Run Command On Remote System ${ODL_SYSTEM_IP} netstat -na | grep 6633 ${ODL_SYSTEM_USER} Log ${output} diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot index 854933d527..bd4785ac9f 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot @@ -15,14 +15,14 @@ Start Suite ${TOPO_TREE_DEPTH} Convert To Integer ${TOPO_TREE_DEPTH} ${TOPO_TREE_FANOUT} Convert To Integer ${TOPO_TREE_FANOUT} ${numnodes} Num Of Nodes ${TOPO_TREE_DEPTH} ${TOPO_TREE_FANOUT} - Open Connection ${TOOLS_SYSTEM_IP} prompt=> timeout=${numnodes*2} + Open Connection ${TOOLS_SYSTEM_IP} prompt=${DEFAULT_LINUX_PROMPT} timeout=${numnodes*2} Login With Public Key ${TOOLS_SYSTEM_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Write sudo ovs-vsctl set-manager ptcp:6644 - Read Until > + Read Until ${DEFAULT_LINUX_PROMPT} Write sudo mn -c - Read Until > - Read Until > - Read Until > + Read Until ${DEFAULT_LINUX_PROMPT} + Read Until ${DEFAULT_LINUX_PROMPT} + Read Until ${DEFAULT_LINUX_PROMPT} Write ${start} Read Until mininet> @@ -30,5 +30,5 @@ Stop Suite Log Stop mininet Read Write exit - Read Until > + Read Until ${DEFAULT_LINUX_PROMPT} Close Connection diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot index a4a8153300..31ec267523 100644 --- a/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot +++ b/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot @@ -15,14 +15,14 @@ Start Suite ${TOPO_TREE_DEPTH} Convert To Integer ${TOPO_TREE_DEPTH} ${TOPO_TREE_FANOUT} Convert To Integer ${TOPO_TREE_FANOUT} ${numnodes} Num Of Nodes ${TOPO_TREE_DEPTH} ${TOPO_TREE_FANOUT} - Open Connection ${TOOLS_SYSTEM_IP} prompt=> timeout=${numnodes*3} + Open Connection ${TOOLS_SYSTEM_IP} prompt=${DEFAULT_LINUX_PROMPT} timeout=${numnodes*3} Login With Public Key ${TOOLS_SYSTEM_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Write sudo ovs-vsctl set-manager ptcp:6644 - Read Until > + Read Until ${DEFAULT_LINUX_PROMPT} Write sudo mn -c - Read Until > - Read Until > - Read Until > + Read Until ${DEFAULT_LINUX_PROMPT} + Read Until ${DEFAULT_LINUX_PROMPT} + Read Until ${DEFAULT_LINUX_PROMPT} Write ${start} Read Until mininet> @@ -30,5 +30,5 @@ Stop Suite Log Stop mininet Read Write exit - Read Until > + Read Until ${DEFAULT_LINUX_PROMPT} Close Connection diff --git a/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot b/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot index cd9e211be0..5a0e1da549 100644 --- a/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot +++ b/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot @@ -33,7 +33,7 @@ Find Max Switches Start Suite [Documentation] Starts mininet with requested number of switches Log Start the test on the base edition - ${mininet_conn_id}= Open Connection ${TOOLS_SYSTEM_IP} prompt=> timeout=1800 + ${mininet_conn_id}= Open Connection ${TOOLS_SYSTEM_IP} prompt=${DEFAULT_LINUX_PROMPT} timeout=1800 Set Suite Variable ${mininet_conn_id} Login With Public Key ${TOOLS_SYSTEM_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Put File ${CURDIR}/../../../libraries/DynamicMininet.py DynamicMininet.py diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot b/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot index cfc144a91d..2a491405ca 100644 --- a/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot +++ b/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot @@ -43,18 +43,17 @@ Start Suite [Documentation] Basic setup/cleanup work that can be done safely before any system ... is run. Log Start the test on the base edition - ${mininet_conn_id}= Open Connection ${TOOLS_SYSTEM_IP} prompt=> timeout=600s + ${mininet_conn_id}= Open Connection ${TOOLS_SYSTEM_IP} prompt=${DEFAULT_LINUX_PROMPT} timeout=600s Set Suite Variable ${mininet_conn_id} Login With Public Key ${TOOLS_SYSTEM_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Write sudo ovs-vsctl set-manager ptcp:6644 - Read Until > + Read Until ${DEFAULT_LINUX_PROMPT} Write sudo mn -c - Read Until > - Read Until > - Read Until > + Read Until ${DEFAULT_LINUX_PROMPT} + Read Until ${DEFAULT_LINUX_PROMPT} + Read Until ${DEFAULT_LINUX_PROMPT} Write ${start} Read Until mininet> - Sleep 6 Stop Suite [Documentation] Cleanup/Shutdown work that should be done at the completion of all @@ -63,7 +62,7 @@ Stop Suite Switch Connection ${mininet_conn_id} Read Write exit - Read Until > + Read Until ${DEFAULT_LINUX_PROMPT} Close Connection Start Http Session diff --git a/csit/suites/openflowplugin/Sanity3Node/__init__.robot b/csit/suites/openflowplugin/Sanity3Node/__init__.robot index 395e836983..e6f2a3682e 100644 --- a/csit/suites/openflowplugin/Sanity3Node/__init__.robot +++ b/csit/suites/openflowplugin/Sanity3Node/__init__.robot @@ -11,7 +11,7 @@ ${start} sudo python DynamicMininet.py *** Keywords *** Start Suite Log Start the test on the base edition - ${mininet_conn_id}= Open Connection ${TOOLS_SYSTEM_IP} prompt=> + ${mininet_conn_id}= Open Connection ${TOOLS_SYSTEM_IP} prompt=${DEFAULT_LINUX_PROMPT} Set Suite Variable ${mininet_conn_id} Login With Public Key ${TOOLS_SYSTEM_USER} ${USER_HOME}/.ssh/id_rsa any Put File ${CURDIR}/../../../libraries/DynamicMininet.py . diff --git a/csit/suites/openstack/neutron/010__networks.robot b/csit/suites/openstack/neutron/010__networks.robot index be527d916e..d7d596f300 100644 --- a/csit/suites/openstack/neutron/010__networks.robot +++ b/csit/suites/openstack/neutron/010__networks.robot @@ -28,7 +28,7 @@ Check OpenStack Networks Check OpenDaylight Networks [Documentation] Checking OpenDaylight Neutron API for Known Networks [Tags] Network Neutron OpenDaylight - Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} + Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH} ${resp} get ODLSession ${ODLREST} Should be Equal As Strings ${resp.status_code} 200 ${ODLResult} To Json ${resp.content} diff --git a/csit/suites/openstack/neutron/020__subnets.robot b/csit/suites/openstack/neutron/020__subnets.robot index 0b4c78cca7..01769241a2 100644 --- a/csit/suites/openstack/neutron/020__subnets.robot +++ b/csit/suites/openstack/neutron/020__subnets.robot @@ -28,7 +28,7 @@ Check OpenStack Subnets Check OpenDaylight subnets [Documentation] Checking OpenDaylight Neutron API for Known Subnets [Tags] Subnets Neutron OpenDaylight - Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} + Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH} ${resp} get ODLSession ${ODLREST} Should be Equal As Strings ${resp.status_code} 200 ${ODLResult} To Json ${resp.content} diff --git a/csit/suites/openstack/neutron/030__ports.robot b/csit/suites/openstack/neutron/030__ports.robot index b3ba03f15d..01c986727c 100644 --- a/csit/suites/openstack/neutron/030__ports.robot +++ b/csit/suites/openstack/neutron/030__ports.robot @@ -28,7 +28,7 @@ Check OpenStack ports Check OpenDaylight ports [Documentation] Checking OpenDaylight Neutron API for Known Ports [Tags] Ports Neutron OpenDaylight - Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} + Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH} ${resp} get ODLSession ${ODLREST} Should be Equal As Strings ${resp.status_code} 200 ${ODLResult} To Json ${resp.content} diff --git a/csit/suites/ovsdb/Openstack_Neutron/001__connection_manager.robot b/csit/suites/ovsdb/Openstack_Neutron/001__connection_manager.robot index 70e53c1173..406e8afd41 100644 --- a/csit/suites/ovsdb/Openstack_Neutron/001__connection_manager.robot +++ b/csit/suites/ovsdb/Openstack_Neutron/001__connection_manager.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite connecting ODL to Mininet -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Test Teardown Collect OVSDB Debugs Library SSHLibrary @@ -36,17 +36,17 @@ ${PING_NOT_CONTAIN} Destination Host Unreachable Make the OVS instance to listen for connection [Documentation] Connect OVS to ODL [Tags] OVSDB netvirt - Clean Up Ovs ${MININET} - Run Command On Remote System ${MININET} sudo ovs-vsctl set-manager tcp:${CONTROLLER}:${OVSDB_PORT} - ${output} Run Command On Remote System ${MININET} sudo ovs-vsctl show - ${pingresult} Run Command On Remote System ${MININET} ping ${CONTROLLER} -c 4 + Clean Up Ovs ${TOOLS_SYSTEM_IP} + Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo ovs-vsctl set-manager tcp:${ODL_SYSTEM_IP}:${OVSDB_PORT} + ${output} Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo ovs-vsctl show + ${pingresult} Run Command On Remote System ${TOOLS_SYSTEM_IP} ping ${ODL_SYSTEM_IP} -c 4 Should Not Contain ${pingresult} ${PING_NOT_CONTAIN} Wait Until Keyword Succeeds 8s 2s Check For Elements At URI ${OPERATIONAL_TOPO_API} ${node_list} Get manager connection [Documentation] This will verify if the OVS manager is connected [Tags] OVSDB netvirt - ${output} Run Command On Remote System ${MININET} sudo ovs-vsctl show + ${output} Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo ovs-vsctl show ${lines}= Get Lines Containing String ${output} is_connected ${manager}= Get Line ${lines} 0 Should Contain ${manager} true @@ -54,7 +54,7 @@ Get manager connection Get controller connection [Documentation] This will verify if the OpenFlow controller is connected on all bridges [Tags] OVSDB netvirt - ${output} Run Command On Remote System ${MININET} sudo ovs-vsctl show + ${output} Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo ovs-vsctl show ${lines}= Get Lines Containing String ${output} is_connected ${list}= Split String ${lines} \n Remove From List ${list} 0 @@ -64,26 +64,26 @@ Get controller connection Get bridge setup [Documentation] This request is verifying that the br-int bridge has been created [Tags] OVSDB netvirt - ${output} Run Command On Remote System ${MININET} sudo ovs-vsctl show - Should Contain ${output} Controller "tcp:${CONTROLLER}:${OF_PORT}" + ${output} Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo ovs-vsctl show + Should Contain ${output} Controller "tcp:${ODL_SYSTEM_IP}:${OF_PORT}" Should Contain ${output} Bridge br-int Get port setup [Documentation] This will check the port br-int has been created [Tags] OVSDB netvirt - ${output} Run Command On Remote System ${MININET} sudo ovs-vsctl show + ${output} Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo ovs-vsctl show Should Contain ${output} Port br-int Get interface setup [Documentation] This verify the interface br-int has been created [Tags] OVSDB netvirt - ${output} Run Command On Remote System ${MININET} sudo ovs-vsctl show + ${output} Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo ovs-vsctl show Should Contain ${output} Interface br-int Get the bridge flows [Documentation] This request fetch the OF13 flow tables to verify the flows are correctly added [Tags] OVSDB netvirt - ${output} Run Command On Remote System ${MININET} sudo ovs-ofctl -O Openflow13 dump-flows br-int + ${output} Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo ovs-ofctl -O Openflow13 dump-flows br-int Should Contain ${output} ${FLOWS_TABLE_20} Should Contain ${output} ${FLOW_CONTROLLER} Should Contain ${output} ${FLOWS_TABLE_30} diff --git a/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot b/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot index 807bf5a31b..4ef821371a 100644 --- a/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot +++ b/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Checking Network created in OVSDB are pushed to OpenDaylight -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Test Teardown Collect OVSDB Debugs Library SSHLibrary @@ -49,12 +49,12 @@ ${FLOAT_IP1_ADDRESS} 192.168.111.22 Add variables to controller custom.properties [Documentation] Add variables to custom.properties [Tags] Enable l3 forwarding - Run Command On Remote System ${CONTROLLER} echo 'ovsdb.l3.fwd.enabled=yes' >> ${WORKSPACE}/${BUNDLEFOLDER}/etc/custom.properties - Run Command On Remote System ${CONTROLLER} echo 'ovsdb.l3gateway.mac=00:00:5E:00:02:01' >> ${WORKSPACE}/${BUNDLEFOLDER}/etc/custom.properties - ${controller_pid_1}= Get Process ID Based On Regex On Remote System ${CONTROLLER} java.*distribution.*karaf - Run Command On Remote System ${CONTROLLER} kill -SIGTERM ${controller_pid_1} - Run Command On Remote System ${CONTROLLER} ${WORKSPACE}/${BUNDLEFOLDER}/bin/start - ${controller_pid_2}= Get Process ID Based On Regex On Remote System ${CONTROLLER} java.*distribution.*karaf + Run Command On Remote System ${ODL_SYSTEM_IP} echo 'ovsdb.l3.fwd.enabled=yes' >> ${WORKSPACE}/${BUNDLEFOLDER}/etc/custom.properties + Run Command On Remote System ${ODL_SYSTEM_IP} echo 'ovsdb.l3gateway.mac=00:00:5E:00:02:01' >> ${WORKSPACE}/${BUNDLEFOLDER}/etc/custom.properties + ${controller_pid_1}= Get Process ID Based On Regex On Remote System ${ODL_SYSTEM_IP} java.*distribution.*karaf + Run Command On Remote System ${ODL_SYSTEM_IP} kill -SIGTERM ${controller_pid_1} + Run Command On Remote System ${ODL_SYSTEM_IP} ${WORKSPACE}/${BUNDLEFOLDER}/bin/start + ${controller_pid_2}= Get Process ID Based On Regex On Remote System ${ODL_SYSTEM_IP} java.*distribution.*karaf Should Not be Equal As Numbers ${controller_pid_1} ${controller_pid_2} Ensure controller is running @@ -159,7 +159,7 @@ Create Port DHCP [Documentation] Create Port DHCP [Tags] OpenStack Call Flow ${Data} OperatingSystem.Get File ${OVSDB_CONFIG_DIR}/create_port_dhcp.json - ${Data} Replace String ${Data} {BIND_HOST_ID} ${CONTROLLER} + ${Data} Replace String ${Data} {BIND_HOST_ID} ${ODL_SYSTEM_IP} ${Data} Replace String ${Data} {subnetId} ${TNT1_SUBNET1_ID} ${Data} Replace String ${Data} {dhcpDeviceId} ${TNT1_NET1_DHCP_DEVICE_ID} ${Data} Replace String ${Data} {netId} ${TNT1_NET1_ID} @@ -174,7 +174,7 @@ Update Port DHCP [Documentation] Update Port DHCP [Tags] OpenStack Call Flow ${Data} OperatingSystem.Get File ${OVSDB_CONFIG_DIR}/update_port_dhcp.json - ${Data} Replace String ${Data} {BIND_HOST_ID} ${CONTROLLER} + ${Data} Replace String ${Data} {BIND_HOST_ID} ${ODL_SYSTEM_IP} ${Data} Replace String ${Data} {dhcpDeviceId} ${TNT1_NET1_DHCP_DEVICE_ID} Log ${Data} ${resp} RequestsLibrary.Put Request session ${ODLREST}/ports/${TNT1_NET1_DHCP_PORT_ID} ${Data} @@ -209,7 +209,7 @@ Create Port VM [Documentation] Create Port VM [Tags] OpenStack Call Flow ${Data} OperatingSystem.Get File ${OVSDB_CONFIG_DIR}/create_port_vm.json - ${Data} Replace String ${Data} {BIND_HOST_ID} ${CONTROLLER} + ${Data} Replace String ${Data} {BIND_HOST_ID} ${ODL_SYSTEM_IP} ${Data} Replace String ${Data} {tntId} ${TNT1_ID} ${Data} Replace String ${Data} {netId} ${TNT1_NET1_ID} ${Data} Replace String ${Data} {subnetId} ${TNT1_SUBNET1_ID} diff --git a/csit/suites/ovsdb/Ovsdb_Net-virt/010_Ovsdb_Net_virt_flow.robot b/csit/suites/ovsdb/Ovsdb_Net-virt/010_Ovsdb_Net_virt_flow.robot index 5175bf6b90..b6801f3928 100644 --- a/csit/suites/ovsdb/Ovsdb_Net-virt/010_Ovsdb_Net_virt_flow.robot +++ b/csit/suites/ovsdb/Ovsdb_Net-virt/010_Ovsdb_Net_virt_flow.robot @@ -29,7 +29,7 @@ Check Shards Status Before Fail Start Mininet Multiple Connections [Documentation] Start mininet with connection to all cluster instances. - ${mininet_conn_id} Add Multiple Managers to OVS ${MININET} ${original_cluster_list} + ${mininet_conn_id} Add Multiple Managers to OVS ${TOOLS_SYSTEM_IP} ${original_cluster_list} Set Suite Variable ${mininet_conn_id} Log ${mininet_conn_id} diff --git a/csit/suites/persistence/basic/test_app.robot b/csit/suites/persistence/basic/test_app.robot index 85a8f98a38..464e48640e 100644 --- a/csit/suites/persistence/basic/test_app.robot +++ b/csit/suites/persistence/basic/test_app.robot @@ -84,10 +84,10 @@ Verify Data Persistency ${device_id} Find Device Id ${device2_ip} Issue Command On Karaf Console networkdevice:set-location ${device_id} ${location2} Issue Command On Karaf Console networkdevice:set-friendly-name ${device_id} ${device2_name} - Stop One Or More Controllers ${CONTROLLER} - Wait Until Keyword Succeeds 60s 3s Controller Down Check ${CONTROLLER} - Start One Or More Controllers ${CONTROLLER} - UtilLibrary.Wait For Controller Up ${CONTROLLER} ${RESTCONFPORT} + Stop One Or More Controllers ${ODL_SYSTEM_IP} + Wait Until Keyword Succeeds 60s 3s Controller Down Check ${ODL_SYSTEM_IP} + Start One Or More Controllers ${ODL_SYSTEM_IP} + UtilLibrary.Wait For Controller Up ${ODL_SYSTEM_IP} ${RESTCONFPORT} ${output}= Issue Command On Karaf Console user:get-enabled ${string}= Extract String To Validate ${output} User{username=Username{value= 0 Should Match ${string} ${username} diff --git a/csit/suites/sdninterfaceapp/basic/010_Restconf_OK.robot b/csit/suites/sdninterfaceapp/basic/010_Restconf_OK.robot index 6b8fdef242..ddf021b00b 100644 --- a/csit/suites/sdninterfaceapp/basic/010_Restconf_OK.robot +++ b/csit/suites/sdninterfaceapp/basic/010_Restconf_OK.robot @@ -1,18 +1,17 @@ *** Settings *** Documentation Test suite to verify Restconf is OK -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library RequestsLibrary Variables ../../../variables/Variables.py Resource ../../../libraries/Utils.robot *** Variables *** -${REST_CONTEXT} /restconf/modules *** Test Cases *** Get Controller Modules [Documentation] Get the controller modules via Restconf - ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT} + ${resp} RequestsLibrary.Get Request session ${MODULES_API} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} ietf-restconf diff --git a/csit/suites/sxp/basic/010_Restconf_OK.robot b/csit/suites/sxp/basic/010_Restconf_OK.robot index 7316faa9db..ce54d661d8 100644 --- a/csit/suites/sxp/basic/010_Restconf_OK.robot +++ b/csit/suites/sxp/basic/010_Restconf_OK.robot @@ -1,17 +1,16 @@ *** Settings *** Documentation Test suite to verify Restconf is OK -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library RequestsLibrary Variables ../../../variables/Variables.py *** Variables *** -${REST_CONTEXT} /restconf/modules *** Test Cases *** Get Controller Modules [Documentation] Get the controller modules via Restconf - ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT} + ${resp} RequestsLibrary.Get Request session ${MODULES_API} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} ietf-restconf diff --git a/csit/suites/tsdr/Cassandra/040_QueueMetrics.robot b/csit/suites/tsdr/Cassandra/040_QueueMetrics.robot index b69c3add4e..5d4ff0afe3 100644 --- a/csit/suites/tsdr/Cassandra/040_QueueMetrics.robot +++ b/csit/suites/tsdr/Cassandra/040_QueueMetrics.robot @@ -28,7 +28,7 @@ ${transmittederrors} flow-capable-node-connector-queue-statistics/transmissio *** Test Cases *** Verification of TSDR Cassandra Feature Installation [Documentation] Install and Verify the TSDR Cassandra Features - COMMENT Install a Feature odl-tsdr-cassandra-all ${CONTROLLER} ${KARAF_SHELL_PORT} 60 + COMMENT Install a Feature odl-tsdr-cassandra-all ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} 60 Verify Feature Is Installed odl-tsdr-cassandra COMMENT Verify Feature Is Installed odl-tsdr-cassandra-persistence Verify Feature Is Installed odl-tsdr-openflow-statistics-collector diff --git a/csit/suites/tsdr/H2/010_InterfaceMetrics.robot b/csit/suites/tsdr/H2/010_InterfaceMetrics.robot index 653de6db63..ed1c4a52d5 100755 --- a/csit/suites/tsdr/H2/010_InterfaceMetrics.robot +++ b/csit/suites/tsdr/H2/010_InterfaceMetrics.robot @@ -19,9 +19,9 @@ ${TSDR_PORTSTATS} tsdr:list PortStats *** Test Cases *** Verification of TSDR H2 Feature Installation [Documentation] Install and Verify the TSDR H2 Datastore and JDBC - Install a Feature jdbc ${CONTROLLER} ${KARAF_SHELL_PORT} 60 + Install a Feature jdbc ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} 60 Verify Feature Is Installed jdbc - COMMENT Install a Feature odl-tsdr-all ${CONTROLLER} ${KARAF_SHELL_PORT} 60 + COMMENT Install a Feature odl-tsdr-all ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} 60 Verify Feature Is Installed odl-tsdr-all Verify Feature Is Installed odl-tsdr-H2-persistence Verify Feature Is Installed odl-tsdr-core @@ -41,7 +41,7 @@ Verify PortStats On Karaf console [Documentation] Verify the InterfaceMetrics(PortStats),attributes using ${TSDR_PORTSTATS} : FOR ${list} IN @{INTERFACE_METRICS} \ ${tsdr_cmd}= Concatenate the String ${TSDR_PORTSTATS} | grep ${list} | head - \ ${output}= Issue Command On Karaf Console ${tsdr_cmd} ${CONTROLLER} ${KARAF_SHELL_PORT} 30 + \ ${output}= Issue Command On Karaf Console ${tsdr_cmd} ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} 30 \ Should Contain ${output} ${list} Verify PortStats-Attributes on H2 Datastore using JDBC Client diff --git a/csit/suites/tsdr/H2/020_FlowMetrics.robot b/csit/suites/tsdr/H2/020_FlowMetrics.robot index 1cceb415a5..1dc5c17ab3 100644 --- a/csit/suites/tsdr/H2/020_FlowMetrics.robot +++ b/csit/suites/tsdr/H2/020_FlowMetrics.robot @@ -18,7 +18,7 @@ ${TSDR_FLOWSTATS} tsdr:list FlowStats Verification of TSDR FlowMetrics [Documentation] Verify the TSDR FlowStats Wait Until Keyword Succeeds 60s 1s Verify the Metric is Collected? ${TSDR_FLOWSTATS} PacketCount - ${output}= Issue Command On Karaf Console ${TSDR_FLOWSTATS} ${CONTROLLER} ${KARAF_SHELL_PORT} 30 + ${output}= Issue Command On Karaf Console ${TSDR_FLOWSTATS} ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} 30 : FOR ${list} IN @{FLOW_METRICS} \ Should Contain ${output} ${list} diff --git a/csit/suites/tsdr/H2/030_FlowTableMetrics.robot b/csit/suites/tsdr/H2/030_FlowTableMetrics.robot index bfe718458b..dec85bb649 100644 --- a/csit/suites/tsdr/H2/030_FlowTableMetrics.robot +++ b/csit/suites/tsdr/H2/030_FlowTableMetrics.robot @@ -18,7 +18,7 @@ ${TSDR_FLOWTABLE_STATS} tsdr:list FlowTableStats Verification of TSDR FlowTableStats [Documentation] Verify the TSDR FlowiTableStats Wait Until Keyword Succeeds 60s 1s Verify the Metric is Collected? ${TSDR_FLOWTABLE_STATS}| grep ActiveFlow FLOWTABLESTATS - ${output}= Issue Command On Karaf Console ${TSDR_FLOWTABLE_STATS}| grep openflow:1 | head ${CONTROLLER} ${KARAF_SHELL_PORT} 180 + ${output}= Issue Command On Karaf Console ${TSDR_FLOWTABLE_STATS}| grep openflow:1 | head ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} 180 : FOR ${list} IN @{FLOWTABLE_METRICS} \ Should Contain ${output} ${list} diff --git a/csit/suites/tsdr/H2/040_QueueMetrics.robot b/csit/suites/tsdr/H2/040_QueueMetrics.robot index a1b08f1c6c..f0e05837db 100644 --- a/csit/suites/tsdr/H2/040_QueueMetrics.robot +++ b/csit/suites/tsdr/H2/040_QueueMetrics.robot @@ -19,7 +19,7 @@ ${TSDR_QUEUE_STATS} tsdr:list QueueStats Verify the Queue Stats attributes exist thru Karaf console [Documentation] Verify the QueueMetrics attributes exist on Karaf Console Wait Until Keyword Succeeds 60s 1s Verify the Metric is Collected? ${TSDR_QUEUE_STATS} Transmitted - ${output}= Issue Command On Karaf Console ${TSDR_QUEUE_STATS} ${CONTROLLER} ${KARAF_SHELL_PORT} 30 + ${output}= Issue Command On Karaf Console ${TSDR_QUEUE_STATS} ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} 30 : FOR ${list} IN @{QUEUE_METRICS} \ Should Contain ${output} ${list} @@ -31,9 +31,9 @@ Verify QueueStats-Attributes on H2 Datastore using JDBC Client Verify tsdr:purgeall command [Documentation] Verify the tsdr:purgeall command - Issue Command On Karaf Console tsdr:purgeall ${CONTROLLER} ${KARAF_SHELL_PORT} + Issue Command On Karaf Console tsdr:purgeall ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} : FOR ${list} IN @{CMD_LIST} - \ ${out}= Issue Command On Karaf Console tsdr:list ${list} ${CONTROLLER} ${KARAF_SHELL_PORT} + \ ${out}= Issue Command On Karaf Console tsdr:list ${list} ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} \ Should Contain ${out} no data of this category : FOR ${list} IN @{QUEUE_METRICS} \ ${out}= Query Metrics on H2 Datastore QUEUESTATS ${list} diff --git a/csit/suites/tsdr/H2/050_GroupMetrics.robot b/csit/suites/tsdr/H2/050_GroupMetrics.robot index 6b62714821..a04322496e 100644 --- a/csit/suites/tsdr/H2/050_GroupMetrics.robot +++ b/csit/suites/tsdr/H2/050_GroupMetrics.robot @@ -19,14 +19,14 @@ ${TSDR_FLOWGROUPSTATS} tsdr:list FlowGroupStats Verify the FlowGroup Stats attributes exist thru Karaf console [Documentation] Verify the FlowGroupStats attributes exist on Karaf Console Wait Until Keyword Succeeds 120s 1s Verify the Metric is Collected? ${TSDR_FLOWGROUPSTATS} ByteCount - ${output}= Issue Command On Karaf Console ${TSDR_FLOWGROUPSTATS} ${CONTROLLER} ${KARAF_SHELL_PORT} 30 + ${output}= Issue Command On Karaf Console ${TSDR_FLOWGROUPSTATS} ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} 30 : FOR ${list} IN @{FLOWGROUP_METRICS} \ Should Contain ${output} ${list} Verification of FlowGroupStats-ByteCount on Karaf Console [Documentation] Verify the FlowGroupStats has been updated thru tsdr:list command on karaf console ${tsdr_cmd}= Concatenate the String ${TSDR_FLOWGROUPSTATS} | grep ByteCount | head - ${output}= Issue Command On Karaf Console ${tsdr_cmd} ${CONTROLLER} ${KARAF_SHELL_PORT} 90 + ${output}= Issue Command On Karaf Console ${tsdr_cmd} ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} 90 Should Contain ${output} ByteCount Should Contain ${output} FLOWGROUPSTATS Should not Contain ${output} null @@ -45,7 +45,7 @@ Start TSDR suite with CPqD Switch Configuration of FlowGroup on Switch [Documentation] FlowGroup configuration on CPqD - Run Command On Remote System ${MININET} sudo dpctl unix:/tmp/s1 group-mod cmd=add,group=1,type=all - Run Command On Remote System ${MININET} sudo dpctl unix:/tmp/s1 flow-mod table=0,cmd=add eth_type=0x800,eth_src=00:01:02:03:04:05 apply:group=1 - Run Command On Remote System ${MININET} sudo dpctl unix:/tmp/s1 ping 10 - Run Command On Remote System ${MININET} sudo dpctl unix:/tmp/s2 ping 10 + Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo dpctl unix:/tmp/s1 group-mod cmd=add,group=1,type=all + Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo dpctl unix:/tmp/s1 flow-mod table=0,cmd=add eth_type=0x800,eth_src=00:01:02:03:04:05 apply:group=1 + Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo dpctl unix:/tmp/s1 ping 10 + Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo dpctl unix:/tmp/s2 ping 10 diff --git a/csit/suites/tsdr/H2/060_FlowMeterMetrics.robot b/csit/suites/tsdr/H2/060_FlowMeterMetrics.robot index d55e8b5045..c89afa391d 100644 --- a/csit/suites/tsdr/H2/060_FlowMeterMetrics.robot +++ b/csit/suites/tsdr/H2/060_FlowMeterMetrics.robot @@ -19,14 +19,14 @@ ${TSDR_FLOWMETERSTATS} tsdr:list FlowMeterStats Verify the FlowMeter Stats attributes exist thru Karaf console [Documentation] Verify the FlowMeterStats attributes exist on Karaf Console Wait Until Keyword Succeeds 120s 1s Verify the Metric is Collected? ${TSDR_FLOWMETERSTATS} ByteInCount - ${output}= Issue Command On Karaf Console ${TSDR_FLOWMETERSTATS} ${CONTROLLER} ${KARAF_SHELL_PORT} 30 + ${output}= Issue Command On Karaf Console ${TSDR_FLOWMETERSTATS} ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} 30 : FOR ${list} IN @{FLOWMETER_METRICS} \ Should Contain ${output} ${list} Verification of FlowMeterStats-ByteInCount on Karaf Console [Documentation] Verify the FlowMeterStats has been updated thru tsdr:list command on karaf console ${tsdr_cmd}= Concatenate the String ${TSDR_FLOWMETERSTATS} | grep ByteInCount | head - ${output}= Issue Command On Karaf Console ${tsdr_cmd} ${CONTROLLER} ${KARAF_SHELL_PORT} 90 + ${output}= Issue Command On Karaf Console ${tsdr_cmd} ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} 90 Should Contain ${output} ByteInCount Should Contain ${output} FLOWMETERSTATS Should not Contain ${output} null @@ -48,7 +48,7 @@ Uninstall all TSDR H2 Feature Verification TSDR Command shouldnot exist in help [Documentation] Verify the TSDR List command on help - ${output}= Issue Command On Karaf Console tsdr\t ${CONTROLLER} ${KARAF_SHELL_PORT} + ${output}= Issue Command On Karaf Console tsdr\t ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} Should not Contain ${output} tsdr:list *** Keyword *** @@ -57,7 +57,7 @@ Start TSDR suite with CPqD Switch Configuration of FlowMeter on Switch [Documentation] FlowMeter configuration on CPqD - Run Command On Remote System ${MININET} sudo dpctl unix:/tmp/s1 meter-mod cmd=add,flags=1,meter=1 drop:rate=100 - Run Command On Remote System ${MININET} sudo dpctl unix:/tmp/s1 flow-mod table=0,cmd=add in_port=1 meter:1 apply:output=2 - Run Command On Remote System ${MININET} sudo dpctl unix:/tmp/s1 ping 10 - Run Command On Remote System ${MININET} sudo dpctl unix:/tmp/s2 ping 10 + Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo dpctl unix:/tmp/s1 meter-mod cmd=add,flags=1,meter=1 drop:rate=100 + Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo dpctl unix:/tmp/s1 flow-mod table=0,cmd=add in_port=1 meter:1 apply:output=2 + Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo dpctl unix:/tmp/s1 ping 10 + Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo dpctl unix:/tmp/s2 ping 10 diff --git a/csit/suites/tsdr/HSQLDB/060_syslog_Collector.robot b/csit/suites/tsdr/HSQLDB/060_syslog_Collector.robot index fbd14ec6af..67a6b8edb5 100644 --- a/csit/suites/tsdr/HSQLDB/060_syslog_Collector.robot +++ b/csit/suites/tsdr/HSQLDB/060_syslog_Collector.robot @@ -11,8 +11,8 @@ Variables ../../../variables/Variables.py *** Test Cases *** Verification of TSDR HSQLDB Feature Installation [Documentation] Install and Verify the TSDR Cassandra Syslog Features - COMMENT Install a Feature odl-tsdr-hsqldb-all ${CONTROLLER} ${KARAF_SHELL_PORT} 60 - COMMENT Install a Feature odl-tsdr-syslog-collector ${CONTROLLER} ${KARAF_SHELL_PORT} 60 + COMMENT Install a Feature odl-tsdr-hsqldb-all ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} 60 + COMMENT Install a Feature odl-tsdr-syslog-collector ${ODL_SYSTEM_IP} ${KARAF_SHELL_PORT} 60 Wait Until Keyword Succeeds 24x 10 sec Check Karaf Log Has Messages tsdr.syslog Verify Feature Is Installed odl-tsdr-hsqldb Verify Feature Is Installed odl-tsdr-syslog-collector diff --git a/csit/suites/unimgr/basic/010_Restconf_OK.robot b/csit/suites/unimgr/basic/010_Restconf_OK.robot index 32f407de3c..8ec9c49d11 100644 --- a/csit/suites/unimgr/basic/010_Restconf_OK.robot +++ b/csit/suites/unimgr/basic/010_Restconf_OK.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite to verify Restconf is OK -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library RequestsLibrary Library ../../../libraries/Common.py diff --git a/csit/suites/usc/channel/USC_CHANNEL.robot b/csit/suites/usc/channel/USC_CHANNEL.robot index 00cd233390..a69b1c5484 100644 --- a/csit/suites/usc/channel/USC_CHANNEL.robot +++ b/csit/suites/usc/channel/USC_CHANNEL.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for usc channel functionality -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library RequestsLibrary Library ../../../libraries/Common.py @@ -8,12 +8,11 @@ Variables ../../../variables/Variables.py Resource ../../../libraries/Utils.robot *** Variables *** -${REST_CONTEXT} /restconf/modules *** Test Cases *** Get Controller Modules [Documentation] Get the controller modules via Restconf - ${resp} RequestsLibrary.Get session ${REST_CONTEXT} + ${resp} RequestsLibrary.Get session ${MODULES_API} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} ietf-restconf diff --git a/csit/suites/usecplugin/basic/010_Restconf_OK.robot b/csit/suites/usecplugin/basic/010_Restconf_OK.robot index 6b8fdef242..ddf021b00b 100644 --- a/csit/suites/usecplugin/basic/010_Restconf_OK.robot +++ b/csit/suites/usecplugin/basic/010_Restconf_OK.robot @@ -1,18 +1,17 @@ *** Settings *** Documentation Test suite to verify Restconf is OK -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} Suite Teardown Delete All Sessions Library RequestsLibrary Variables ../../../variables/Variables.py Resource ../../../libraries/Utils.robot *** Variables *** -${REST_CONTEXT} /restconf/modules *** Test Cases *** Get Controller Modules [Documentation] Get the controller modules via Restconf - ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT} + ${resp} RequestsLibrary.Get Request session ${MODULES_API} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 Should Contain ${resp.content} ietf-restconf diff --git a/csit/suites/vpnservice/020__configure_vpn.robot b/csit/suites/vpnservice/020__configure_vpn.robot index fd4ba847e5..2c3fb43e65 100644 --- a/csit/suites/vpnservice/020__configure_vpn.robot +++ b/csit/suites/vpnservice/020__configure_vpn.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test Suite for vpn instance -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions Library OperatingSystem Library String diff --git a/csit/suites/vpnservice/030__configure_2_switches.robot b/csit/suites/vpnservice/030__configure_2_switches.robot index 562591bd6f..c166e9a070 100644 --- a/csit/suites/vpnservice/030__configure_2_switches.robot +++ b/csit/suites/vpnservice/030__configure_2_switches.robot @@ -1,8 +1,8 @@ *** Settings *** Documentation Test Suite for vpn instance -Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions -Variables ../../variables/vpnservice/configureSwitches.py ${MININET} ${MININET1} +Variables ../../variables/vpnservice/configureSwitches.py ${TOOLS_SYSTEM_IP} ${TOOLS_SYSTEM_2_IP} Library SSHLibrary Variables ../../variables/Variables.py Resource ../../libraries/Utils.robot diff --git a/csit/suites/vpnservice/__init__.robot b/csit/suites/vpnservice/__init__.robot index 750ca69ff5..c0186da750 100644 --- a/csit/suites/vpnservice/__init__.robot +++ b/csit/suites/vpnservice/__init__.robot @@ -8,39 +8,39 @@ Variables ../../variables/Variables.py Resource ../../libraries/Utils.robot *** Variables *** -${start1} sudo mn \ --controller=remote,ip=${CONTROLLER} --custom custom.py --topo Switch1 --switch ovsk,protocols=OpenFlow13 -${start2} sudo mn \ --controller=remote,ip=${CONTROLLER} --custom custom.py --topo Switch2 --switch ovsk,protocols=OpenFlow13 +${start1} sudo mn \ --controller=remote,ip=${ODL_SYSTEM_IP} --custom custom.py --topo Switch1 --switch ovsk,protocols=OpenFlow13 +${start2} sudo mn \ --controller=remote,ip=${ODL_SYSTEM_IP} --custom custom.py --topo Switch2 --switch ovsk,protocols=OpenFlow13 *** Keywords *** Start Suite [Documentation] Test suit for vpn service using mininet OF13 and OVS 2.3.1 Log Start the tests Clean Mininet System - ${mininet1_conn_id_1}= Open Connection ${MININET} prompt=${DEFAULT_LINUX_PROMPT} timeout=30s + ${mininet1_conn_id_1}= Open Connection ${TOOLS_SYSTEM_IP} prompt=${DEFAULT_LINUX_PROMPT} timeout=30s Set Global Variable ${mininet1_conn_id_1} - Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any + Login With Public Key ${TOOLS_SYSTEM_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Execute Command sudo ovs-vsctl set-manager ptcp:6644 Put File ${CURDIR}/custom.py Write ${start1} Read Until mininet> - ${mininet1_conn_id_2}= Open Connection ${MININET} prompt=${DEFAULT_LINUX_PROMPT} timeout= 30s + ${mininet1_conn_id_2}= Open Connection ${TOOLS_SYSTEM_IP} prompt=${DEFAULT_LINUX_PROMPT} timeout= 30s Set Global Variable ${mininet1_conn_id_2} - Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any - Execute Command sudo ovs-vsctl add-port s1 s1-gre1 -- set interface s1-gre1 type=gre options:remote_ip=${MININET1} options:local_ip=${MININET} + Login With Public Key ${TOOLS_SYSTEM_USER} ${USER_HOME}/.ssh/${SSH_KEY} any + Execute Command sudo ovs-vsctl add-port s1 s1-gre1 -- set interface s1-gre1 type=gre options:remote_ip=${TOOLS_SYSTEM_2_IP} options:local_ip=${TOOLS_SYSTEM_IP} ${output} Execute Command sudo ovs-vsctl show Log ${output} Execute Command sudo ovs-ofctl add-flow s1 -O OpenFlow13 arp,actions=FLOOD - ${mininet2_conn_id_1}= Open Connection ${MININET1} prompt=${DEFAULT_LINUX_PROMPT} timeout=30s + ${mininet2_conn_id_1}= Open Connection ${TOOLS_SYSTEM_2_IP} prompt=${DEFAULT_LINUX_PROMPT} timeout=30s Set Global Variable ${mininet2_conn_id_1} - Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any + Login With Public Key ${TOOLS_SYSTEM_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Execute Command sudo ovs-vsctl set-manager ptcp:6644 Put File ${CURDIR}/custom.py Write ${start2} Read Until mininet> - ${mininet2_conn_id_2}= Open Connection ${MININET1} prompt=${DEFAULT_LINUX_PROMPT} timeout= 30s + ${mininet2_conn_id_2}= Open Connection ${TOOLS_SYSTEM_2_IP} prompt=${DEFAULT_LINUX_PROMPT} timeout= 30s Set Global Variable ${mininet2_conn_id_2} - Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any - Execute Command sudo ovs-vsctl add-port s2 s2-gre1 -- set interface s2-gre1 type=gre options:remote_ip=${MININET} options:local_ip=${MININET1} + Login With Public Key ${TOOLS_SYSTEM_USER} ${USER_HOME}/.ssh/${SSH_KEY} any + Execute Command sudo ovs-vsctl add-port s2 s2-gre1 -- set interface s2-gre1 type=gre options:remote_ip=${TOOLS_SYSTEM_IP} options:local_ip=${TOOLS_SYSTEM_2_IP} ${output} Execute Command sudo ovs-vsctl show Log ${output} Execute Command sudo ovs-ofctl add-flow s2 -O OpenFlow13 arp,actions=FLOOD diff --git a/csit/variables/DIDM/Variables.robot b/csit/variables/DIDM/Variables.robot new file mode 100644 index 0000000000..572b888a1d --- /dev/null +++ b/csit/variables/DIDM/Variables.robot @@ -0,0 +1,8 @@ +*** Variables *** +# DIDM suite variables +${DEVICE_TYPE} mininet +${DEVICE_DESCRIPTION} None +${DEVICE_HW_INFO} Open vSwitch +${DEVICE_SW_INFO} 2.0.0 +${DEVICE_MANUFACTURE} Nicira, Inc. +${DEVICE_SERIAL_NUMBER} None diff --git a/csit/variables/Variables.py b/csit/variables/Variables.py index f33a790dd9..0c385150ac 100644 --- a/csit/variables/Variables.py +++ b/csit/variables/Variables.py @@ -198,11 +198,6 @@ ENABLE_GLOBAL_TEST_DEADLINES = True # Deprecated old variables, to be removed once all tests that need them are # updated to use the new names. CONTROLLER = ODL_SYSTEM_IP -CONTROLLERS = ['CONTROLLER', 'CONTROLLER1', 'CONTROLLER2'] +CONTROLLERS = ['ODL_SYSTEM_1_IP', 'ODL_SYSTEM_2_IP', 'ODL_SYSTEM_3_IP'] CONTROLLER_PASSWORD = ODL_SYSTEM_PASSWORD CONTROLLER_PROMPT = ODL_SYSTEM_PROMPT -MININET = TOOLS_SYSTEM_IP -MININET_USER = TOOLS_SYSTEM_USER -MININET_PASSWORD = TOOLS_SYSTEM_PASSWORD -MININET_PROMPT = TOOLS_SYSTEM_PROMPT -PROMPT = '>' # TODO: remove this as it's vague. need to fix any occurances of it first. diff --git a/csit/variables/Variables.robot b/csit/variables/Variables.robot deleted file mode 100644 index efff469e9e..0000000000 --- a/csit/variables/Variables.robot +++ /dev/null @@ -1,15 +0,0 @@ -*** Variables *** -# DIDM suite variables -${DEVICE_IP} ${TOOLS_SYSTEM_IP} -${MININET} ${DEVICE_IP} -${DEVICE_USER} ${TOOLS_SYSTEM_USER} -${MININET_USER} ${DEVICE_USER} -${DEVICE_PASSWORD} ${TOOLS_SYSTEM_PASSWORD} -${MININET_PASSWORD} ${DEVICE_PASSWORD} -${MININET_PROMPT} ${TOOLS_SYSTEM_PROMPT} -${DEVICE_TYPE} mininet -${DEVICE_DESCRIPTION} None -${DEVICE_HW_INFO} Open vSwitch -${DEVICE_SW_INFO} 2.0.0 -${DEVICE_MANUFACTURE} Nicira, Inc. -${DEVICE_SERIAL_NUMBER} None diff --git a/tools/tools_vm/scripts/run_test_base.sh b/tools/tools_vm/scripts/run_test_base.sh index 5b3067b344..7d3d93a65e 100755 --- a/tools/tools_vm/scripts/run_test_base.sh +++ b/tools/tools_vm/scripts/run_test_base.sh @@ -10,4 +10,4 @@ if [ -d $1 ]; then exit 1 fi cd ~ -pybot -d ${HOME} -v CONTROLLER:$1 -v MININET:$MYIP -v USER_HOME:${HOME} -v MININET_USER:${USER} ${HOME}/integration/test/csit/suites/base +pybot -d ${HOME} -v ODL_SYSTEM_IP:$1 -v TOOLS_SYSTEM_IP:$MYIP -v USER_HOME:${HOME} -v TOOLS_SYSTEM_USER:${USER} ${HOME}/integration/test/csit/suites/base diff --git a/tools/tools_vm/scripts/run_test_base_self.sh b/tools/tools_vm/scripts/run_test_base_self.sh index 9bb5a3ae50..fa03cb405a 100755 --- a/tools/tools_vm/scripts/run_test_base_self.sh +++ b/tools/tools_vm/scripts/run_test_base_self.sh @@ -8,7 +8,7 @@ cd ~/controller-base/opendaylight sleep 120 ./run.sh -status cd ~ -pybot -d ${HOME} -v CONTROLLER:127.0.0.1 -v MININET:127.0.0.1 -v USER_HOME:${HOME} -v MININET_USER:${USER} ${HOME}/integration/test/csit/suites/base +pybot -d ${HOME} -v ODL_SYSTEM_IP:127.0.0.1 -v TOOLS_SYSTEM_IP:127.0.0.1 -v USER_HOME:${HOME} -v TOOLS_SYSTEM_USER:${USER} ${HOME}/integration/test/csit/suites/base cd ~/controller-base/opendaylight ./run.sh -stop