X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fnetconf%2FCRUD%2FCRUD.robot;h=f634d2236a3d750683ea21ea4341ab8f27a994ae;hb=refs%2Ftags%2Fpre-potassium;hp=d01bc69aaba359338f7d95fd5c94b6de7a85955d;hpb=3e5edace5526f9876023937f2be30c8eb91e4de4;p=integration%2Ftest.git
diff --git a/csit/suites/netconf/CRUD/CRUD.robot b/csit/suites/netconf/CRUD/CRUD.robot
index d01bc69aab..f634d2236a 100644
--- a/csit/suites/netconf/CRUD/CRUD.robot
+++ b/csit/suites/netconf/CRUD/CRUD.robot
@@ -71,7 +71,8 @@ Wait_For_Device_To_Become_Connected
Check_Device_Data_Is_Empty
[Documentation] Get the device data and make sure it is empty.
- Check_Config_Data
+ ${escaped}= BuiltIn.Regexp_Escape ${ODL_NETCONF_NAMESPACE}
+ Check_Config_Data |><\/data>) ${True}
Create_Device_Data_Label_Via_Xml
[Documentation] Send a sample test data label into the device and check that the request went OK.
@@ -212,7 +213,8 @@ Delete_Device_Data
Check_Device_Data_Is_Deleted
[Documentation] Get the device data and make sure it is empty again.
- Check_Config_Data
+ ${escaped}= BuiltIn.Regexp_Escape ${ODL_NETCONF_NAMESPACE}
+ Check_Config_Data |><\/data>) ${True}
Deconfigure_Device_From_Netconf
[Documentation] Make request to deconfigure the testtool device on Netconf connector.
@@ -259,12 +261,15 @@ Get_Config_Data
RETURN ${data}
Check_Config_Data
- [Arguments] ${expected} ${contains}=False
+ [Arguments] ${expected} ${regex}=False ${contains}=False
${data}= Get_Config_Data
- IF not ${contains}
+ IF ${regex}
+ BuiltIn.Should Match Regexp ${data} ${expected}
+ ELSE IF ${contains}
+ BuiltIn.Should_Contain ${data} ${expected}
+ ELSE
BuiltIn.Should_Be_Equal_As_Strings ${data} ${expected}
END
- IF ${contains} BuiltIn.Should_Contain ${data} ${expected}
Count_Netconf_Connectors
${count}= NetconfKeywords.Count_Netconf_Connectors_For_Device ${device_name}