diff --git a/tests/apps/podman/restapi/listcontainers.robot b/tests/apps/podman/restapi/listcontainers.robot index 9226940cf..303864a36 100644 --- a/tests/apps/podman/restapi/listcontainers.robot +++ b/tests/apps/podman/restapi/listcontainers.robot @@ -28,7 +28,7 @@ List-Containers ${tc} ... ${cmd} ... ${extraoptions} - Ctn Run Command And Check Result As Regexp ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Regexp ${command} ${expected_result} Examples: tc extraoptions expected_result -- ... 1 ${EMPTY} ^Containers: (\\\\n\\\\[.*\\\\]){3}\\\\Z diff --git a/tests/apps/podman/restapi/listpods.robot b/tests/apps/podman/restapi/listpods.robot index af04330c7..9976da6f0 100644 --- a/tests/apps/podman/restapi/listpods.robot +++ b/tests/apps/podman/restapi/listpods.robot @@ -28,7 +28,7 @@ List-Pods ${tc} ... ${cmd} ... ${extraoptions} - Ctn Run Command And Check Result As Regexp ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Regexp ${command} ${expected_result} Examples: tc extraoptions expected_result -- ... 1 ${EMPTY} ^Pods: (\\\\n\\\\[.*\\\\]){2}\\\\Z diff --git a/tests/database/informix/snmp/list-instances.robot b/tests/database/informix/snmp/list-instances.robot index 4e025d534..9d7906975 100644 --- a/tests/database/informix/snmp/list-instances.robot +++ b/tests/database/informix/snmp/list-instances.robot @@ -23,8 +23,8 @@ list-instances ${tc} ... --snmp-timeout=1 ... ${extra_options} - Ctn Run Command And Check Result As Strings ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Strings ${command} ${expected_result} Examples: tc extra_options expected_result -- ... 1 --verbose List instances: [instance = default] - ... 2 --filter-instance='instance' List instances: [instance = default] \ No newline at end of file + ... 2 --filter-instance='instance' List instances: [instance = default] diff --git a/tests/network/aruba/aoscx/snmp/list-interfaces.robot b/tests/network/aruba/aoscx/snmp/list-interfaces.robot index d027c3cad..f7c70fcfc 100644 --- a/tests/network/aruba/aoscx/snmp/list-interfaces.robot +++ b/tests/network/aruba/aoscx/snmp/list-interfaces.robot @@ -23,7 +23,7 @@ list-interfaces ${tc} ... --snmp-timeout=1 ... ${extra_options} - Ctn Run Command And Check Result As Strings ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Strings ${command} ${expected_result} Examples: tc extra_options expected_result -- ... 1 --add-extra-oid='alias,.1.3.6.1.2.1.31.1.1.1.18' List interfaces: '1/1/1' [speed = 100][status = up][id = 1][alias = ][type = ethernetCsmacd] '1/1/10' [speed = ][status = down][id = 10][alias = ][type = ethernetCsmacd] '1/1/11' [speed = ][status = down][id = 11][alias = ][type = ethernetCsmacd] '1/1/12' [speed = ][status = down][id = 12][alias = ][type = ethernetCsmacd] '1/1/13' [speed = ][status = down][id = 13][alias = ][type = ethernetCsmacd] '1/1/14' [speed = ][status = down][id = 14][alias = ][type = ethernetCsmacd] '1/1/15' [speed = 1000][status = up][id = 15][alias = ][type = ethernetCsmacd] '1/1/16' [speed = 1000][status = up][id = 16][alias = ][type = ethernetCsmacd] 'Anonymized 124' [speed = ][status = up][id = 16777217][alias = ][type = propVirtual] '1/1/2' [speed = ][status = down][id = 2][alias = ][type = ethernetCsmacd] '1/1/3' [speed = 1000][status = up][id = 3][alias = ][type = ethernetCsmacd] '1/1/4' [speed = ][status = down][id = 4][alias = ][type = ethernetCsmacd] '1/1/5' [speed = ][status = down][id = 5][alias = ][type = ethernetCsmacd] '1/1/6' [speed = ][status = down][id = 6][alias = ][type = ethernetCsmacd] '1/1/7' [speed = ][status = down][id = 7][alias = ][type = ethernetCsmacd] 'Anonymized 066' [speed = 2000][status = up][id = 769][alias = ][type = ieee8023adLag] '1/1/8' [speed = ][status = down][id = 8][alias = ][type = ethernetCsmacd] '1/1/9' [speed = ][status = down][id = 9][alias = ][type = ethernetCsmacd] diff --git a/tests/network/aruba/aoscx/snmp/list-spanning-trees.robot b/tests/network/aruba/aoscx/snmp/list-spanning-trees.robot index 7ca7a7743..dc1597cce 100644 --- a/tests/network/aruba/aoscx/snmp/list-spanning-trees.robot +++ b/tests/network/aruba/aoscx/snmp/list-spanning-trees.robot @@ -23,7 +23,7 @@ list-spanning-trees ${tc} ... --snmp-timeout=1 ... ${extra_options} - Ctn Run Command And Check Result As Strings ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Strings ${command} ${expected_result} Examples: tc extra_options expected_result -- ... 1 ${EMPTY} List ports with spanning tree protocol: [port = Anonymized 147] [state = forwarding] [op_status = up] [admin_status = up] [index = 1] [port = Anonymized 026] [state = blocking] [op_status = down] [admin_status = up] [index = 10] [port = Anonymized 232] [state = blocking] [op_status = down] [admin_status = up] [index = 11] [port = Anonymized 093] [state = blocking] [op_status = down] [admin_status = up] [index = 12] [port = Anonymized 058] [state = blocking] [op_status = down] [admin_status = up] [index = 13] [port = Anonymized 118] [state = blocking] [op_status = down] [admin_status = up] [index = 14] [port = Anonymized 029] [state = blocking] [op_status = down] [admin_status = up] [index = 2] [port = Anonymized 088] [state = forwarding] [op_status = up] [admin_status = up] [index = 3] [port = Anonymized 220] [state = blocking] [op_status = down] [admin_status = up] [index = 4] [port = Anonymized 003] [state = blocking] [op_status = down] [admin_status = up] [index = 5] [port = Anonymized 118] [state = blocking] [op_status = down] [admin_status = up] [index = 6] [port = Anonymized 192] [state = blocking] [op_status = down] [admin_status = up] [index = 7] [port = Anonymized 218] [state = forwarding] [op_status = up] [admin_status = up] [index = 769] [port = Anonymized 123] [state = blocking] [op_status = down] [admin_status = up] [index = 8] [port = Anonymized 203] [state = blocking] [op_status = down] [admin_status = up] [index = 9] diff --git a/tests/network/backbox/restapi/listdevices.robot b/tests/network/backbox/restapi/listdevices.robot index 37de3b693..c4b073a38 100644 --- a/tests/network/backbox/restapi/listdevices.robot +++ b/tests/network/backbox/restapi/listdevices.robot @@ -29,7 +29,7 @@ List-Devices ${tc} ${command} Catenate ... ${cmd} ... ${extraoptions} - Ctn Run Command And Check Result As Regexp ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Regexp ${command} ${expected_result} Examples: tc extraoptions expected_result -- ... 1 ${EMPTY} ^Devices: (\\\\n\\\\[.*\\\\]){5}\\\\Z diff --git a/tests/network/f5/bigip/snmp/certificates.robot b/tests/network/f5/bigip/snmp/certificates.robot index 2238e5d3f..94fd0b60a 100644 --- a/tests/network/f5/bigip/snmp/certificates.robot +++ b/tests/network/f5/bigip/snmp/certificates.robot @@ -27,7 +27,7 @@ certificates ${tc} ... ${CMD} ... ${extra_options} - Ctn Run Command And Check Result As Strings ${command} ${expected_result} ${tc} + Ctn Run Command Without Connector And Check Result As Strings ${command} ${expected_result} Examples: tc extra_options expected_result -- ... 1 ${EMPTY} CRITICAL: Certificate 'Anonymized 165' has expired - Certificate 'Anonymized 186' has expired | 'certificates-count'=9;;;0; '_Anonymized 981'=212738332s;;@0:0;0; '_Anonymized 165'=0s;;@0:0;0; '_Anonymized 982'=384058793s;;@0:0;0; '_Anonymized 983'=145466616s;;@0:0;0; '_Anonymized 196'=122214889s;;@0:0;0; '_Anonymized 141'=67955030s;;@0:0;0; '_Anonymized 881'=68447205s;;@0:0;0; '_Anonymized 068'=145466616s;;@0:0;0; '_Anonymized 186'=0s;;@0:0;0; diff --git a/tests/network/f5/bigip/snmp/list-trunks.robot b/tests/network/f5/bigip/snmp/list-trunks.robot index e288d98cb..4591ac1ec 100644 --- a/tests/network/f5/bigip/snmp/list-trunks.robot +++ b/tests/network/f5/bigip/snmp/list-trunks.robot @@ -22,7 +22,7 @@ list-trunks ${tc} ... --snmp-community=network/f5/bigip/snmp/slim-f5-bigip ... ${extra_options} - Ctn Run Command And Check Result As Strings ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Strings ${command} ${expected_result} Examples: tc extra_options expected_result -- ... 1 ${EMPTY} List trunks: 'Anonymized 234' [status: up] [speed: 20000] diff --git a/tests/network/hp/procurve/snmp/list-spanning-trees.robot b/tests/network/hp/procurve/snmp/list-spanning-trees.robot index 4d6097707..3e1c73e7d 100644 --- a/tests/network/hp/procurve/snmp/list-spanning-trees.robot +++ b/tests/network/hp/procurve/snmp/list-spanning-trees.robot @@ -23,7 +23,7 @@ list-spanning-trees ${tc} ... --snmp-timeout=1 ... ${extra_options} - Ctn Run Command And Check Result As Strings ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Strings ${command} ${expected_result} Examples: tc extra_options expected_result -- ... 1 --filter-port='Anonymized 029' List ports with spanning tree protocol: [port = Anonymized 029] [state = forwarding] [op_status = up] [admin_status = up] [index = 2] diff --git a/tests/network/huawei/wlc/snmp/list-aps.robot b/tests/network/huawei/wlc/snmp/list-aps.robot index ff85094e6..53ee11bb9 100644 --- a/tests/network/huawei/wlc/snmp/list-aps.robot +++ b/tests/network/huawei/wlc/snmp/list-aps.robot @@ -24,7 +24,7 @@ list-aps ${tc} ... --snmp-timeout=1 ... ${extra_options} - Ctn Run Command And Check Result As Strings ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Strings ${command} ${expected_result} Examples: tc extra_options expected_result -- ... 1 --verbose --filter-name='Anonymized 058' List aps [oid_path: 100.19.171.37.61.112] [name: Anonymized 058] [serial: Anonymized 021] [address: 192.168.42.33] [hardware: Anonymized 104] [software: Anonymized 014] [run_time: 1w 4d 3h 1m 45s] [ap_group: Anonymized 214] [oid_path: 128.105.51.109.163.32] [name: Anonymized 058] [serial: Anonymized 025] [address: 192.168.42.225] [hardware: Anonymized 167] [software: Anonymized 034] [run_time: 11M 1w 1d 6h 12m 17s] [ap_group: Anonymized 040] [oid_path: 52.30.107.186.232.64] [name: Anonymized 058] [serial: Anonymized 073] [address: 192.168.42.66] [hardware: Anonymized 033] [software: Anonymized 168] [run_time: 11M 1w 1d 6h 15m 30s] [ap_group: Anonymized 124] diff --git a/tests/network/juniper/mseries/netconf/list-bgp.robot b/tests/network/juniper/mseries/netconf/list-bgp.robot index f1ba83d3d..68ef14efd 100644 --- a/tests/network/juniper/mseries/netconf/list-bgp.robot +++ b/tests/network/juniper/mseries/netconf/list-bgp.robot @@ -23,7 +23,7 @@ List Bgp ${tc} ... ${CMD} ... ${extraoptions} - Ctn Run Command And Check Result As Regexp ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Regexp ${command} ${expected_result} Examples: tc extraoptions expected_result -- ... 1 ${EMPTY} ^List BGP peers: (\\\\n\\\\[.*\\\\]){5}\\\\Z diff --git a/tests/network/juniper/mseries/netconf/list-disks.robot b/tests/network/juniper/mseries/netconf/list-disks.robot index 939ffd1aa..1cf05af3e 100644 --- a/tests/network/juniper/mseries/netconf/list-disks.robot +++ b/tests/network/juniper/mseries/netconf/list-disks.robot @@ -23,7 +23,7 @@ List-Disks ${tc} ${command} Catenate ... ${cmd} ... ${extraoptions} - Ctn Run Command And Check Result As Regexp ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Regexp ${command} ${expected_result} Examples: tc extraoptions expected_result -- ... 1 ${EMPTY} ^List disks: (\\\\n\\\\[.*\\\\]){5}\\\\Z diff --git a/tests/network/juniper/mseries/netconf/list-interfaces.robot b/tests/network/juniper/mseries/netconf/list-interfaces.robot index c2ae74a4b..13844e91c 100644 --- a/tests/network/juniper/mseries/netconf/list-interfaces.robot +++ b/tests/network/juniper/mseries/netconf/list-interfaces.robot @@ -23,7 +23,7 @@ List Interface ${tc} ... ${CMD} ... ${extraoptions} - Ctn Run Command And Check Result As Regexp ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Regexp ${command} ${expected_result} Examples: tc extraoptions expected_result -- ... 1 ${EMPTY} ^List interfaces: (\\\\n\\\\[.*\\\\]){6}\\\\Z diff --git a/tests/network/juniper/mseries/netconf/list-ldp.robot b/tests/network/juniper/mseries/netconf/list-ldp.robot index 62c36caab..181f911af 100644 --- a/tests/network/juniper/mseries/netconf/list-ldp.robot +++ b/tests/network/juniper/mseries/netconf/list-ldp.robot @@ -23,7 +23,7 @@ List Ldp ${tc} ... ${CMD} ... ${extraoptions} - Ctn Run Command And Check Result As Regexp ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Regexp ${command} ${expected_result} Examples: tc extraoptions expected_result -- ... 1 ${EMPTY} ^List LDP sessions: (\\\\n\\\\[.*\\\\]){4}\\\\Z diff --git a/tests/network/juniper/mseries/netconf/list-lsp.robot b/tests/network/juniper/mseries/netconf/list-lsp.robot index b797ce754..11a651a43 100644 --- a/tests/network/juniper/mseries/netconf/list-lsp.robot +++ b/tests/network/juniper/mseries/netconf/list-lsp.robot @@ -23,7 +23,7 @@ List Lsp ${tc} ... ${CMD} ... ${extraoptions} - Ctn Run Command And Check Result As Regexp ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Regexp ${command} ${expected_result} Examples: tc extraoptions expected_result -- ... 1 ${EMPTY} ^List LSP sessions: (\\\\n\\\\[.*\\\\]){3}\\\\Z diff --git a/tests/network/juniper/mseries/netconf/list-rsvp.robot b/tests/network/juniper/mseries/netconf/list-rsvp.robot index 73255dcd5..07263a2ba 100644 --- a/tests/network/juniper/mseries/netconf/list-rsvp.robot +++ b/tests/network/juniper/mseries/netconf/list-rsvp.robot @@ -23,7 +23,7 @@ List Rsvp ${tc} ... ${CMD} ... ${extraoptions} - Ctn Run Command And Check Result As Regexp ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Regexp ${command} ${expected_result} Examples: tc extraoptions expected_result -- ... 1 ${EMPTY} ^List RSVP sessions: (\\\\n\\\\[.*\\\\]){2}\\\\Z diff --git a/tests/network/juniper/mseries/netconf/list-services-rpm.robot b/tests/network/juniper/mseries/netconf/list-services-rpm.robot index 522e4bda3..a319acfe4 100644 --- a/tests/network/juniper/mseries/netconf/list-services-rpm.robot +++ b/tests/network/juniper/mseries/netconf/list-services-rpm.robot @@ -23,7 +23,7 @@ List Service Rpm ${tc} ... ${CMD} ... ${extraoptions} - Ctn Run Command And Check Result As Regexp ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Regexp ${command} ${expected_result} Examples: tc extraoptions expected_result -- ... 1 ${EMPTY} ^List services RPM: (\\\\n\\\\[.*\\\\]){2}\\\\Z diff --git a/tests/network/sonus/sbc/snmp/list-interfaces.robot b/tests/network/sonus/sbc/snmp/list-interfaces.robot index 1e330f2a3..d744a6a0f 100644 --- a/tests/network/sonus/sbc/snmp/list-interfaces.robot +++ b/tests/network/sonus/sbc/snmp/list-interfaces.robot @@ -24,7 +24,7 @@ list-interfaces ${tc} ... --snmp-timeout=1 ... ${extra_options} - Ctn Run Command And Check Result As Strings ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Strings ${command} ${expected_result} Examples: tc extra_options expected_result -- ... 1 ${EMPTY} --name --interface='Anonymized 049' List interfaces: 'Anonymized 049' [speed = ][status = up][id = 1078199296][type = voiceFXS] 'Anonymized 049' [speed = ][status = up][id = 1079510016][type = voiceFXS] diff --git a/tests/os/linux/snmp/list-processes.robot b/tests/os/linux/snmp/list-processes.robot index aadf022c7..ec7f1286d 100644 --- a/tests/os/linux/snmp/list-processes.robot +++ b/tests/os/linux/snmp/list-processes.robot @@ -25,7 +25,7 @@ list-processes ${tc} ... --snmp-timeout=1 ... ${extra_options} - Ctn Run Command And Check Result As Regexp ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Regexp ${command} ${expected_result} Examples: tc extra_options expected_result -- ... 1 --filter-name='gorgone-dbclean' name = gorgone-dbclean diff --git a/tests/os/linux/snmp/list-storages.robot b/tests/os/linux/snmp/list-storages.robot index 18c67dc6c..e0d7d0d6a 100644 --- a/tests/os/linux/snmp/list-storages.robot +++ b/tests/os/linux/snmp/list-storages.robot @@ -25,7 +25,7 @@ list-storages ${tc} ... --snmp-timeout=1 ... ${extra_options} - Ctn Run Command And Check Result As Strings ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Strings ${command} ${expected_result} Examples: tc extra_options expected_result -- ... 1 --display-transform-src='dev' List storage: ${SPACE}Skipping storage 'Physical memory': no type or no matching filter type ${SPACE}Skipping storage 'Swap space': no type or no matching filter type ${SPACE}Skipping storage 'Available memory': no type or no matching filter type ${SPACE}Skipping storage 'Virtual memory': no type or no matching filter type ${SPACE}'/run' [size = 206262272B] [id = 35] ${SPACE} '/' [size = 105088212992B] [id = 36] ${SPACE} '//shm' [size = 1031299072B] [id = 38] ${SPACE} '/run/lock' [size = 5242880B] [id = 39] ${SPACE}'/run/user/0' [size = 206258176B] [id = 55] ${SPACE} Skipping storage 'Memory buffers': no type or no matching filter type ${SPACE} Skipping storage 'Cached memory': no type or no matching filter type ${SPACE} Skipping storage 'Shared memory': no type or no matching filter type diff --git a/tests/os/windows/snmp/list-services.robot b/tests/os/windows/snmp/list-services.robot index 0b1ba922c..10e9a80ee 100644 --- a/tests/os/windows/snmp/list-services.robot +++ b/tests/os/windows/snmp/list-services.robot @@ -24,7 +24,7 @@ list-services ${tc} ... --snmp-community=os/windows/snmp/services-en ... ${extra_options} - Ctn Run Command And Check Result As Strings ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Strings ${command} ${expected_result} Examples: tc extra_options expected_result -- ... 1 --filter-name='Windows Security Service' List services: [name = Windows Security Service] [operating = active] [installed = installed] diff --git a/tests/os/windows/snmp/list-storages.robot b/tests/os/windows/snmp/list-storages.robot index a88295ed2..5c4f7db11 100644 --- a/tests/os/windows/snmp/list-storages.robot +++ b/tests/os/windows/snmp/list-storages.robot @@ -25,7 +25,7 @@ list-storages ${tc} ... --snmp-timeout=1 ... ${extra_options} - Ctn Run Command And Check Result As Strings ${command} ${expected_result} + Ctn Run Command Without Connector And Check Result As Strings ${command} ${expected_result} Examples: tc extra_options expected_result -- ... 1 --display-transform-src='dev' List storage: 'Serial Number 5a987053' [size = 63720910848B] [id = 1] Skipping storage 'D:\\\\ Label:SSS_X64FRE_FR-FR_DV9 Serial Number cf70e675': no type or no matching filter type Skipping storage 'Virtual Memory': no type or no matching filter type Skipping storage 'Physical Memory': no type or no matching filter type diff --git a/tests/resources/resources.resource b/tests/resources/resources.resource index e1a3c3148..031799db6 100644 --- a/tests/resources/resources.resource +++ b/tests/resources/resources.resource @@ -74,6 +74,7 @@ Ctn Stop Connector Ctn Run Command Without Connector And Check Result As Regexp [Arguments] ${command} ${expected_result} + Log To Console s ${output} Run ${command} ${output} Strip String ${output} Should Match Regexp @@ -84,6 +85,7 @@ Ctn Run Command Without Connector And Check Result As Regexp Ctn Run Command Without Connector And Check Result As Strings [Arguments] ${command} ${expected_result} + Log To Console s ${output} Run ${command} ${output} Strip String ${output} Should Be Equal As Strings @@ -95,6 +97,7 @@ Ctn Run Command Without Connector And Check Result As Strings Ctn Verify Command Without Connector Output [Arguments] ${command} ${expected_result} + Log To Console w ${output} Run ${command} ${output} Strip String ${output} Should Contain @@ -106,6 +109,7 @@ Ctn Verify Command Without Connector Output Ctn Run Command With Connector And Check Result As Strings [Arguments] ${command} ${expected_result} ${tc}=0 ${timeout}=${TIMEOUT} + Log To Console c Remove File /tmp/connector.output Remove File /tmp/connector.command.log Ctn Send To Connector ${tc} ${command} ${timeout} @@ -125,6 +129,7 @@ Ctn Run Command With Connector And Check Result As Strings Ctn Run Command With Connector And Check Result As Regexp [Arguments] ${command} ${expected_result} ${tc}=0 ${timeout}=${TIMEOUT} + Log To Console c Remove File /tmp/connector.output Remove File /tmp/connector.command.log Ctn Send To Connector ${tc} ${command} ${timeout} @@ -143,6 +148,7 @@ Ctn Run Command With Connector And Check Result As Regexp Ctn Run Command With Connector And Check Multiline Result [Arguments] ${command} ${expected_result} ${tc}=0 ${timeout}=${TIMEOUT} + Log To Console c Remove File /tmp/connector.output Remove File /tmp/connector.command.log Ctn Send To Connector ${tc} ${command} ${timeout} @@ -186,7 +192,7 @@ Ctn Run Command And Check Result As Regexp Ctn Run Command And Check Result As Json [Arguments] ${command} ${expected} - Log To Console ${command} + Log To Console j ${output} Run ${command} ${output} Strip String ${output} ${json_output}= evaluate json.loads('''${output}''') json @@ -196,6 +202,7 @@ Ctn Run Command And Check Result As Json Ctn Run Command And Return Parsed XML [Arguments] ${command} + Log To Console x ${output} Run ${command} ${output} Strip String ${output} ${parsed}= Parse XML ${output}