Use md-sal datastore for netconf-testtool

There are a few test cases that require netconf-testtool to use
the md-sal datastore. Since the issue with mdsal-netconf-connector
(NETCONF-879) which prevented successful mounting of netconf-testtool
has been addressed, restore the netconf-testtool configuration to use
the md-sal datastore.

This effectively reverts the following change:
Ifd378b8cacf82d71aa81d83e01305d0ce853c597

Change-Id: Idbb2f548bb80c7a66ac3065c27eaa6b72d5b6f79
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>

diff --git a/csit/suites/netconf/CRUD-ACTION/CRUD-ACTION.robot b/csit/suites/netconf/CRUD-ACTION/CRUD-ACTION.robot
index 0dcf50ad1a4a798021bd55b94d455c90d4e871ef..9f644ac9643532a2019df4678aaecd9983f5df1b 100644 (file)
--- a/csit/suites/netconf/CRUD-ACTION/CRUD-ACTION.robot
+++ b/csit/suites/netconf/CRUD-ACTION/CRUD-ACTION.robot
@@ -111,7 +111,7 @@ Setup_Everything
     ${DEVICE_TYPE} =    CompareStream.Set_Variable_If_At_Most_Nitrogen    ${DEVICE_TYPE_RPC}    ${DEVICE_TYPE_RPC_CREATE}
     BuiltIn.Set_Suite_Variable    ${DEVICE_TYPE}
     OperatingSystem.File Should Exist    ${RPC_FILE}
     ${DEVICE_TYPE} =    CompareStream.Set_Variable_If_At_Most_Nitrogen    ${DEVICE_TYPE_RPC}    ${DEVICE_TYPE_RPC_CREATE}
     BuiltIn.Set_Suite_Variable    ${DEVICE_TYPE}
     OperatingSystem.File Should Exist    ${RPC_FILE}

-    NetconfKeywords.Install_And_Start_Testtool    device-count=1    schemas=${CURDIR}/../../../variables/netconf/CRUD/schemas    rpc_config=${RPC_FILE}    mdsal=false
+    NetconfKeywords.Install_And_Start_Testtool    device-count=1    schemas=${CURDIR}/../../../variables/netconf/CRUD/schemas    rpc_config=${RPC_FILE}    mdsal=true

 
 Teardown_Everything
     [Documentation]    Teardown the test infrastructure, perform cleanup and release all resources.
 
 Teardown_Everything
     [Documentation]    Teardown the test infrastructure, perform cleanup and release all resources.

diff --git a/csit/suites/netconf/CRUD/CRUD-RPC.robot b/csit/suites/netconf/CRUD/CRUD-RPC.robot
index 0bd2eeac953ee681661194ae4ec87174b823765d..4fc2d8c140a21b4575bc32f7f3d3cef98d660010 100644 (file)
--- a/csit/suites/netconf/CRUD/CRUD-RPC.robot
+++ b/csit/suites/netconf/CRUD/CRUD-RPC.robot
@@ -45,7 +45,7 @@ ${delete_location}    delete_location
 Start_Testtool
     [Documentation]    Deploy and start test tool, then wait for all its devices to become online.
     [Tags]    ODLMICRO_IGN
 Start_Testtool
     [Documentation]    Deploy and start test tool, then wait for all its devices to become online.
     [Tags]    ODLMICRO_IGN

-    NetconfKeywords.Install_And_Start_Testtool    device-count=1    schemas=${CURDIR}/../../../variables/netconf/CRUD/schemas    mdsal=false
+    NetconfKeywords.Install_And_Start_Testtool    device-count=1    schemas=${CURDIR}/../../../variables/netconf/CRUD/schemas    mdsal=true

 
 Check_Device_Is_Not_Configured_At_Beginning
     [Documentation]    Sanity check making sure our device is not there. Fail if found.
 
 Check_Device_Is_Not_Configured_At_Beginning
     [Documentation]    Sanity check making sure our device is not there. Fail if found.

diff --git a/csit/suites/netconf/CRUD/CRUD.robot b/csit/suites/netconf/CRUD/CRUD.robot
index b614e25909d18cef6296bee56dad24e2d667e1cd..d8f81d0f06023bb8128b0bb7195d5e2a699cc6fb 100644 (file)
--- a/csit/suites/netconf/CRUD/CRUD.robot
+++ b/csit/suites/netconf/CRUD/CRUD.robot
@@ -41,7 +41,7 @@ ${USE_NETCONF_CONNECTOR}    ${False}
 Start_Testtool
     [Tags]    ODLMICRO_IGN
     [Documentation]    Deploy and start test tool, then wait for all its devices to become online.
 Start_Testtool
     [Tags]    ODLMICRO_IGN
     [Documentation]    Deploy and start test tool, then wait for all its devices to become online.

-    NetconfKeywords.Install_And_Start_Testtool    device-count=1    schemas=${CURDIR}/../../../variables/netconf/CRUD/schemas    mdsal=false
+    NetconfKeywords.Install_And_Start_Testtool    device-count=1    schemas=${CURDIR}/../../../variables/netconf/CRUD/schemas    mdsal=true

 
 Check_Device_Is_Not_Configured_At_Beginning
     [Documentation]    Sanity check making sure our device is not there. Fail if found.
 
 Check_Device_Is_Not_Configured_At_Beginning
     [Documentation]    Sanity check making sure our device is not there. Fail if found.