From: Sam Hague Date: Thu, 8 Mar 2018 19:35:04 +0000 (-0500) Subject: Remove newton code X-Git-Tag: pre-potassium~892 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=48e4130b02fec59f9c73e809dae6d05ad2130e40 Remove newton code Change-Id: I71d7cfa174333f69e2ef02aa3ee6ec0227b10041 Signed-off-by: Sam Hague --- diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot index 59ea39d383..b362475c7e 100644 --- a/csit/libraries/OpenStackOperations.robot +++ b/csit/libraries/OpenStackOperations.robot @@ -39,10 +39,7 @@ Create Network Update Network [Arguments] ${network_name} ${additional_args}=${EMPTY} [Documentation] Update Network with neutron request. - ${cmd} = BuiltIn.Set Variable If '${OPENSTACK_BRANCH}'=='stable/newton' neutron -v net-update ${network_name} ${additional_args} openstack network set ${network_name} ${additional_args} - ${rc} ${output} = OperatingSystem.Run And Return Rc And Output ${cmd} - BuiltIn.Log ${output} - BuiltIn.Should Be True '${rc}' == '0' + ${output} = OpenStack CLI openstack network set ${network_name} ${additional_args} [Return] ${output} Show Network @@ -74,10 +71,7 @@ Create SubNet Update SubNet [Arguments] ${subnet_name} ${additional_args}=${EMPTY} [Documentation] Update subnet with neutron request. - ${cmd} = BuiltIn.Set Variable If '${OPENSTACK_BRANCH}'=='stable/newton' neutron -v subnet-update ${subnet_name} ${additional_args} openstack subnet set ${subnet_name} ${additional_args} - ${rc} ${output} = OperatingSystem.Run And Return Rc And Output ${cmd} - BuiltIn.Log ${output} - BuiltIn.Should Be True '${rc}' == '0' + ${output} = OpenStack CLI openstack subnet set ${subnet_name} ${additional_args} [Return] ${output} Show SubNet @@ -92,13 +86,9 @@ Create Port # if allowed_address_pairs is not empty we need to create the arguments to pass to the port create command. They are # in a different format with the neutron vs openstack cli. ${address_pair_length} = BuiltIn.Get Length ${allowed_address_pairs} - ${allowed_pairs_argv} = BuiltIn.Set Variable If '${OPENSTACK_BRANCH}'=='stable/newton' and '${address_pair_length}'=='2' --allowed-address-pairs type=dict list=true ip_address=@{allowed_address_pairs}[0] ip_address=@{allowed_address_pairs}[1] - ${allowed_pairs_argv} = BuiltIn.Set Variable If '${OPENSTACK_BRANCH}'!='stable/newton' and '${address_pair_length}'=='2' --allowed-address ip-address=@{allowed_address_pairs}[0] --allowed-address ip-address=@{allowed_address_pairs}[1] ${allowed_pairs_argv} - ${allowed_pairs_argv} = BuiltIn.Set Variable If '${address_pair_length}'=='0' ${EMPTY} ${allowed_pairs_argv} - ${cmd} = BuiltIn.Set Variable If '${OPENSTACK_BRANCH}'=='stable/newton' neutron -v port-create ${network_name} --name ${port_name} --security-group ${sg} ${additional_args} ${allowed_pairs_argv} openstack port create --network ${network_name} ${port_name} --security-group ${sg} ${additional_args} ${allowed_pairs_argv} - ${rc} ${output} = OperatingSystem.Run And Return Rc And Output ${cmd} - BuiltIn.Log ${output} - BuiltIn.Should Be True '${rc}' == '0' + ${allowed_pairs_argv} = BuiltIn.Set Variable ${EMPTY} + ${allowed_pairs_argv} = BuiltIn.Set Variable If '${address_pair_length}'=='2' --allowed-address ip-address=@{allowed_address_pairs}[0] --allowed-address ip-address=@{allowed_address_pairs}[1] ${allowed_pairs_argv} + ${output} = OpenStack CLI openstack port create --network ${network_name} ${port_name} --security-group ${sg} ${additional_args} ${allowed_pairs_argv} Update Port [Arguments] ${port_name} ${additional_args}=${EMPTY} @@ -470,9 +460,7 @@ Show Router Interface Add Router Gateway [Arguments] ${router_name} ${external_network_name} - ${cmd} = BuiltIn.Set Variable If '${OPENSTACK_BRANCH}'=='stable/newton' neutron -v router-gateway-set ${router_name} ${external_network_name} openstack router set ${router_name} --external-gateway ${external_network_name} - ${rc} ${output} = OperatingSystem.Run And Return Rc And Output ${cmd} - BuiltIn.Should Be True '${rc}' == '0' + ${output} = OpenStack CLI openstack router set ${router_name} --external-gateway ${external_network_name} Remove Interface [Arguments] ${router_name} ${interface_name} @@ -642,10 +630,8 @@ Neutron Security Group Rule Create ... ELSE BuiltIn.Catenate ${cmd} ${cmd} = BuiltIn.Run Keyword If '${remote_ip_prefix}'!='None' BuiltIn.Catenate ${cmd} --src-ip ${remote_ip_prefix} ... ELSE BuiltIn.Catenate ${cmd} - ${rc} ${output} = OperatingSystem.Run And Return Rc And Output ${cmd} + ${output} = OpenStack CLI ${cmd} ${rule_id} = BuiltIn.Should Match Regexp ${output} ${REGEX_UUID} - BuiltIn.Log ${rule_id} - BuiltIn.Should Be True '${rc}' == '0' [Return] ${output} ${rule_id} Neutron Security Group Rule Create Legacy Cli diff --git a/csit/libraries/Tempest.robot b/csit/libraries/Tempest.robot index 08fa361423..88344602d7 100644 --- a/csit/libraries/Tempest.robot +++ b/csit/libraries/Tempest.robot @@ -7,7 +7,6 @@ Resource SSHKeywords.robot Resource ../variables/Variables.robot *** Variables *** -@{stable/newton_EXCLUSION_REGEXES} ${EMPTY} @{stable/ocata_EXCLUSION_REGEXES} ${EMPTY} @{stable/pike_EXCLUSION_REGEXES} ${EMPTY} @{stable/queens_EXCLUSION_REGEXES} ${EMPTY} diff --git a/csit/suites/netvirt/vpnservice/vpn_basic.robot b/csit/suites/netvirt/vpnservice/vpn_basic.robot index 89d5cf88fd..7d560fe539 100644 --- a/csit/suites/netvirt/vpnservice/vpn_basic.robot +++ b/csit/suites/netvirt/vpnservice/vpn_basic.robot @@ -59,7 +59,7 @@ Add Ssh Allow All Rule OpenStackOperations.Create Allow All SecurityGroup ${SECURITY_GROUP} Create Neutron Ports - ${allowed_address_pairs_args}= Set Variable If '${OPENSTACK_BRANCH}'=='stable/newton' --allowed-address ip_address=@{EXTRA_NW_SUBNET}[0] --allowed-address ip_address=@{EXTRA_NW_SUBNET}[1] --allowed-address ip-address=@{EXTRA_NW_SUBNET}[0] --allowed-address ip-address=@{EXTRA_NW_SUBNET}[1] + ${allowed_address_pairs_args} = BuiltIn.Set Variable --allowed-address ip-address=@{EXTRA_NW_SUBNET}[0] --allowed-address ip-address=@{EXTRA_NW_SUBNET}[1] Create Port @{NETWORKS}[0] @{PORTS}[0] sg=${SECURITY_GROUP} additional_args=${allowed_address_pairs_args} Create Port @{NETWORKS}[0] @{PORTS}[1] sg=${SECURITY_GROUP} additional_args=${allowed_address_pairs_args} Create Port @{NETWORKS}[1] @{PORTS}[2] sg=${SECURITY_GROUP} additional_args=${allowed_address_pairs_args} diff --git a/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot b/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot index 2336c7cef8..981f68825c 100644 --- a/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot +++ b/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot @@ -75,7 +75,7 @@ Add Ssh V6 Allow All Rule OpenStackOperations.Create Allow All SecurityGroup ${SECURITY_GROUP} IPv6 Create Neutron Ports - ${allowed_address_pairs_args}= Set Variable If '${OPENSTACK_BRANCH}'=='stable/newton' --allowed-address ip_address=@{EXTRA_NW_SUBNET}[0] --allowed-address ip_address=@{EXTRA_NW_SUBNET}[1] --allowed-address ip-address=@{EXTRA_NW_SUBNET}[0] --allowed-address ip-address=@{EXTRA_NW_SUBNET}[1] + ${allowed_address_pairs_args} = BuiltIn.Set Variable --allowed-address ip-address=@{EXTRA_NW_SUBNET}[0] --allowed-address ip-address=@{EXTRA_NW_SUBNET}[1] Create Port @{NETWORKS}[0] @{PORTS}[0] sg=${SECURITY_GROUP} additional_args=${allowed_address_pairs_args} Create Port @{NETWORKS}[0] @{PORTS}[1] sg=${SECURITY_GROUP} additional_args=${allowed_address_pairs_args} Create Port @{NETWORKS}[1] @{PORTS}[2] sg=${SECURITY_GROUP} additional_args=${allowed_address_pairs_args} diff --git a/csit/variables/netvirt/Variables.robot b/csit/variables/netvirt/Variables.robot index 9d527fa0ab..810f04003f 100644 --- a/csit/variables/netvirt/Variables.robot +++ b/csit/variables/netvirt/Variables.robot @@ -3,7 +3,6 @@ Documentation Variables for Netvirt Test Suites *** Variables *** @{legacy_feature_list} odl-vtn-manager-neutron odl-ovsdb-openstack -${CIRROS_stable/newton} cirros-0.3.4-x86_64-uec ${CIRROS_stable/ocata} cirros-0.3.4-x86_64-uec ${CIRROS_stable/pike} cirros-0.3.5-x86_64-disk ${CIRROS_stable/queens} cirros-0.3.5-x86_64-disk