Fix for NonExistentRouter delete TC for Newton

Change-Id: Ib645cee7c23b811e6affefc5e980d3be95d3b829
Signed-off-by: suvitha.balu <suvitha.balu@tcs.com>

diff --git a/csit/suites/netvirt/Netvirt_Vpnservice/basic_vpnservice.robot b/csit/suites/netvirt/Netvirt_Vpnservice/basic_vpnservice.robot
index 8dbaa829f3454de1e7b4356cae18c1221c988ce1..3fb3f9a11b483b3c9edce07818633da807da45e3 100644 (file)
--- a/csit/suites/netvirt/Netvirt_Vpnservice/basic_vpnservice.robot
+++ b/csit/suites/netvirt/Netvirt_Vpnservice/basic_vpnservice.robot
@@ -115,7 +115,7 @@ Add Interfaces To Router
     ${devstack_conn_id} =    Get ControlNode Connection
     : FOR    ${INTERFACE}    IN    @{SUBNETS}
     \    Add Router Interface    ${ROUTERS[0]}    ${INTERFACE}
-    ${interface_output} =    show Router Interface    ${ROUTERS[0]}
+    ${interface_output} =    Show Router Interface    ${ROUTERS[0]}
     : FOR    ${INTERFACE}    IN    @{SUBNETS}
     \    ${subnet_id} =    Get Subnet Id    ${INTERFACE}    ${devstack_conn_id}
     \    Should Contain    ${interface_output}    ${subnet_id}
@@ -248,13 +248,13 @@ Delete Router And Router Interfaces With L3VPN
     ${resp}=    VPN Get L3VPN    vpnid=${VPN_INSTANCE_ID[0]}
     Should Not Contain    ${resp}    ${router_id}
 
-Delete Router With Unknown ID
-    [Documentation]    Delete router with unknown ID
+Delete Router With NonExistentRouter Name
+    [Documentation]    Delete router with nonExistentRouter name
     ${devstack_conn_id}=    Get ControlNode Connection
     Switch Connection    ${devstack_conn_id}
-    ${output} =    Write Commands Until Prompt    neutron router-delete unknowRouter    30s
+    ${output} =    Write Commands Until Prompt    neutron router-delete nonExistentRouter    30s
     Close Connection
-    Should Contain    ${output}    Unable to find router with name or id
+    Should Match Regexp    ${output}    Unable to find router with name or id 'nonExistentRouter'|Unable to find router\\(s\\) with id\\(s\\) 'nonExistentRouter'
 
 Associate L3VPN To Networks
     [Documentation]    Associates L3VPN to networks and verify