From 04c109b516d5739f32e7b0c44bf96df82d776485 Mon Sep 17 00:00:00 2001 From: Srinivas Rachakonda Date: Tue, 14 Jul 2020 13:42:54 +0530 Subject: [PATCH] python3 changes in openstack scripts Signed-off-by: Srinivas Rachakonda Change-Id: I2bd8d821f3967f40f031d379bc2642d9d694a7fb --- csit/suites/openstack/neutron/010__networks.robot | 6 +++--- csit/suites/openstack/neutron/020__subnets.robot | 6 +++--- csit/suites/openstack/neutron/030__ports.robot | 6 +++--- csit/suites/openstack/neutron/040__delete_ports.robot | 4 ++-- csit/suites/openstack/neutron/050__delete_subnets.robot | 4 ++-- csit/suites/openstack/neutron/060__delete_networks.robot | 4 ++-- .../openstack/securitygroup/neutron_security_group.robot | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/csit/suites/openstack/neutron/010__networks.robot b/csit/suites/openstack/neutron/010__networks.robot index 90a378b556..5525ed18b3 100644 --- a/csit/suites/openstack/neutron/010__networks.robot +++ b/csit/suites/openstack/neutron/010__networks.robot @@ -17,7 +17,7 @@ Check OpenStack Networks Log ${X-AUTH} ${resp} get request OSSession ${OSREST} Should be Equal As Strings ${resp.status_code} 200 - ${OSResult} To Json ${resp.content} + ${OSResult} To Json ${resp.text} Log ${OSResult} Check OpenDaylight Networks @@ -26,7 +26,7 @@ Check OpenDaylight Networks Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH} ${resp} get request ODLSession ${NEUTRON_NETWORKS_API} Should be Equal As Strings ${resp.status_code} 200 - ${ODLResult} To Json ${resp.content} + ${ODLResult} To Json ${resp.text} Log ${ODLResult} Create Network @@ -35,7 +35,7 @@ Create Network Log ${postNet} ${resp} post request OSSession ${OSREST} data=${postNet} Should be Equal As Strings ${resp.status_code} 201 - ${result} To JSON ${resp.content} + ${result} To JSON ${resp.text} ${result} Get From Dictionary ${result} network ${NETID} Get From Dictionary ${result} id Log ${result} diff --git a/csit/suites/openstack/neutron/020__subnets.robot b/csit/suites/openstack/neutron/020__subnets.robot index 584ece1c0d..f82653d635 100644 --- a/csit/suites/openstack/neutron/020__subnets.robot +++ b/csit/suites/openstack/neutron/020__subnets.robot @@ -17,7 +17,7 @@ Check OpenStack Subnets Log ${X-AUTH} ${resp} get request OSSession ${OSREST} Should be Equal As Strings ${resp.status_code} 200 - ${OSResult} To Json ${resp.content} + ${OSResult} To Json ${resp.text} Log ${OSResult} Check OpenDaylight subnets @@ -26,7 +26,7 @@ Check OpenDaylight subnets Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH} ${resp} get request ODLSession ${NEUTRON_SUBNETS_API} Should be Equal As Strings ${resp.status_code} 200 - ${ODLResult} To Json ${resp.content} + ${ODLResult} To Json ${resp.text} Log ${ODLResult} Create New subnet @@ -35,7 +35,7 @@ Create New subnet Log ${data} ${resp} post request OSSession ${OSREST} data=${data} Should be Equal As Strings ${resp.status_code} 201 - ${result} To JSON ${resp.content} + ${result} To JSON ${resp.text} ${result} Get From Dictionary ${result} subnet ${SUBNETID} Get From Dictionary ${result} id Log ${result} diff --git a/csit/suites/openstack/neutron/030__ports.robot b/csit/suites/openstack/neutron/030__ports.robot index 1311061bd9..83db6eb9b2 100644 --- a/csit/suites/openstack/neutron/030__ports.robot +++ b/csit/suites/openstack/neutron/030__ports.robot @@ -17,7 +17,7 @@ Check OpenStack ports Log ${X-AUTH} ${resp} get request OSSession ${OSREST} Should be Equal As Strings ${resp.status_code} 200 - ${OSResult} To Json ${resp.content} + ${OSResult} To Json ${resp.text} Log ${OSResult} Check OpenDaylight ports @@ -26,7 +26,7 @@ Check OpenDaylight ports Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH} ${resp} get request ODLSession ${NEUTRON_PORTS_API} Should be Equal As Strings ${resp.status_code} 200 - ${ODLResult} To Json ${resp.content} + ${ODLResult} To Json ${resp.text} Log ${ODLResult} Create New Port @@ -35,7 +35,7 @@ Create New Port Log ${data} ${resp} post request OSSession ${OSREST} data=${data} Should be Equal As Strings ${resp.status_code} 201 - ${result} To JSON ${resp.content} + ${result} To JSON ${resp.text} ${result} Get From Dictionary ${result} port ${PORTID} Get From Dictionary ${result} id Log ${result} diff --git a/csit/suites/openstack/neutron/040__delete_ports.robot b/csit/suites/openstack/neutron/040__delete_ports.robot index 2a71496afe..a6b67668ff 100644 --- a/csit/suites/openstack/neutron/040__delete_ports.robot +++ b/csit/suites/openstack/neutron/040__delete_ports.robot @@ -16,7 +16,7 @@ Delete New Port Log ${data} ${resp} delete request OSSession ${OSREST} Should be Equal As Strings ${resp.status_code} 204 - Log ${resp.content} + Log ${resp.text} sleep 2 Check Port Deleted @@ -24,7 +24,7 @@ Check Port Deleted [Tags] Check port deleted OpenDaylight ${resp} get request ODLSession ${NEUTRON_PORTS_API} Should be Equal As Strings ${resp.status_code} 200 - ${ODLResult} To Json ${resp.content} + ${ODLResult} To Json ${resp.text} Log ${ODLResult} ${resp} get request ODLSession ${NEUTRON_PORTS_API}/${PORTID} Should be Equal As Strings ${resp.status_code} 404 diff --git a/csit/suites/openstack/neutron/050__delete_subnets.robot b/csit/suites/openstack/neutron/050__delete_subnets.robot index 3607a7bf45..cbeacdf2c1 100644 --- a/csit/suites/openstack/neutron/050__delete_subnets.robot +++ b/csit/suites/openstack/neutron/050__delete_subnets.robot @@ -16,7 +16,7 @@ Delete New subnet Log ${data} ${resp} delete request OSSession ${OSREST} Should be Equal As Strings ${resp.status_code} 204 - Log ${resp.content} + Log ${resp.text} sleep 2 Check New subnet deleted @@ -24,7 +24,7 @@ Check New subnet deleted [Tags] Check subnet deleted OpenDaylight ${resp} get request ODLSession ${NEUTRON_SUBNETS_API} Should be Equal As Strings ${resp.status_code} 200 - ${ODLResult} To Json ${resp.content} + ${ODLResult} To Json ${resp.text} Log ${ODLResult} ${resp} get request ODLSession ${NEUTRON_SUBNETS_API}/${SUBNETID} Should be Equal As Strings ${resp.status_code} 404 diff --git a/csit/suites/openstack/neutron/060__delete_networks.robot b/csit/suites/openstack/neutron/060__delete_networks.robot index 7cf6e8cb61..179d89df8a 100644 --- a/csit/suites/openstack/neutron/060__delete_networks.robot +++ b/csit/suites/openstack/neutron/060__delete_networks.robot @@ -16,7 +16,7 @@ Delete Network Log ${postNet} ${resp} delete request OSSession ${OSREST} Should be Equal As Strings ${resp.status_code} 204 - Log ${resp.content} + Log ${resp.text} sleep 2 Check Network deleted @@ -24,7 +24,7 @@ Check Network deleted [Tags] Check Network OpenDaylight ${resp} get request ODLSession ${NEUTRON_NETWORKS_API} Should be Equal As Strings ${resp.status_code} 200 - ${ODLResult} To Json ${resp.content} + ${ODLResult} To Json ${resp.text} Log ${ODLResult} ${resp} get request ODLSession ${NEUTRON_NETWORKS_API}/${NETID} Should be Equal As Strings ${resp.status_code} 404 diff --git a/csit/suites/openstack/securitygroup/neutron_security_group.robot b/csit/suites/openstack/securitygroup/neutron_security_group.robot index 1d84e2a198..c6fa94f4a8 100644 --- a/csit/suites/openstack/securitygroup/neutron_security_group.robot +++ b/csit/suites/openstack/securitygroup/neutron_security_group.robot @@ -107,9 +107,9 @@ Update Security Group Name and Verification ${output} = OpenStackOperations.Neutron Security Group Show ${sg_id} Should Contain ${output} ${verify_name} ${resp} RequestsLibrary.Get Request session ${SEC_GROUP_API} - BuiltIn.Log ${resp.content} + BuiltIn.Log ${resp.text} BuiltIn.Should Be Equal As Strings ${resp.status_code} ${RESP_CODE_200} - BuiltIn.Should Contain ${resp.content} ${verify_name} + BuiltIn.Should Contain ${resp.text} ${verify_name} Neutron Rule Creation With Invalid Parameters [Arguments] ${sg_name} ${additional_args} ${expected_error} -- 2.36.6