From 823f6c24685b361688b5fb371d967cbb46562dfe Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Tue, 27 Nov 2018 17:27:36 -0800 Subject: [PATCH] Use openstack CLI for router delete the neutron cli is deprecated and would live to stop maintaining it. Also, the apex jobs that are coming online don't have the neutron cli installed by default. Change-Id: Ib3daf3ef79e6609cac30b4c54d7a93a9fc18a2c8 Signed-off-by: Jamo Luhrsen --- csit/suites/netvirt/vpnservice/vpn_basic.robot | 7 +++++-- csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/csit/suites/netvirt/vpnservice/vpn_basic.robot b/csit/suites/netvirt/vpnservice/vpn_basic.robot index a2c0421089..3bd138f109 100644 --- a/csit/suites/netvirt/vpnservice/vpn_basic.robot +++ b/csit/suites/netvirt/vpnservice/vpn_basic.robot @@ -196,8 +196,11 @@ Delete Router Delete Router With NonExistentRouter Name [Documentation] Delete router with nonExistentRouter name - ${rc} ${output} = Run And Return Rc And Output neutron router-delete nonExistentRouter - BuiltIn.Should Match Regexp ${output} Unable Not At URIto find router with name or id 'nonExistentRouter'|Unable to find router\\(s\\) with id\\(s\\) 'nonExistentRouter' + ${result} = Process.Run Process openstack router delete nonExistentRouter shell=True + BuiltIn.Log ${result.stdout} + BuiltIn.Log ${result.stderr} + BuiltIn.Should Be True '${result.rc}' == '1' + BuiltIn.Should Match Regexp ${result.stderr} Failed to delete router with name or ID 'nonExistentRouter': No Router found for nonExistentRouter Associate Networks To L3VPN [Documentation] Associates L3VPN to networks and verify diff --git a/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot b/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot index 96cb6a9100..588ba0bee9 100644 --- a/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot +++ b/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot @@ -154,8 +154,11 @@ Delete Router And Router Interfaces With L3VPN Verify GWMAC Flow Entry Removed From Flow Table On All Compute Nodes Delete Router With NonExistentRouter Name - ${rc} ${output}= Run And Return Rc And Output neutron router-delete nonExistentRouter - BuiltIn.Should Match Regexp ${output} Unable to find router with name or id 'nonExistentRouter'|Unable to find router\\(s\\) with id\\(s\\) 'nonExistentRouter' + ${result} = Process.Run Process openstack router delete nonExistentRouter shell=True + BuiltIn.Log ${result.stdout} + BuiltIn.Log ${result.stderr} + BuiltIn.Should Be True '${result.rc}' == '1' + BuiltIn.Should Match Regexp ${result.stderr} Failed to delete router with name or ID 'nonExistentRouter': No Router found for nonExistentRouter Associate L3VPN To Networks ${network1_id} = OpenStackOperations.Get Net Id @{NETWORKS}[0] -- 2.36.6