Bug 9045 - Update netconf readiness suite

netconf-connector readiness test suite checks if system is ready to
mount netconf devices. This is done by mounting CSS netconf endpoint and
trying to access
config:modules/module/sal-restconf-service:json-restconf-service-impl
/json-restconf-service-impl
resource located on mounted CSS netconf server.

However, this resource was deprecated and removed in Nitrogen release.
Check ietf-netconf-monitoring:netconf-state resource instead. Netconf
monitoring is supported on CSS netconf endpoint, so this resource is
present.

Change-Id: I8525cbcf8803046f512de306aacd84f536793447
Signed-off-by: Jakub Morvay <jmorvay@cisco.com>

diff --git a/csit/suites/netconf/ready/netconfready.robot b/csit/suites/netconf/ready/netconfready.robot
index efbe5161806043db7ce52b2528adfb31aab39406..0355dbc59321ecad68972cfea04302f309ef6129 100644 (file)
--- a/csit/suites/netconf/ready/netconfready.robot
+++ b/csit/suites/netconf/ready/netconfready.robot
@@ -164,11 +164,11 @@ Verify_Netconf_Topology_Ready_For_Node
     ...    and performing GET operation got from the device's mount point.
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    member_index=${node_index}
     Configure_Netconf_Device    ${DEVICE_NAME}    ${session}    ${ODL_SYSTEM_${node_index}_IP}
-    &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    MODULE_TYPE=sal-restconf-service:json-restconf-service-impl    MODULE_NAME=json-restconf-service-impl
+    &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}
     Wait_Netconf_Device_Mounted    ${DEVICE_NAME}    ${session}    ${mapping}
     : FOR    ${idx}    IN    @{ClusterManagement__member_index_list}
     \    ${mod_session}=    ClusterManagement.Resolve_Http_Session_For_Member    member_index=${idx}
-    \    BuiltIn.Wait_Until_Keyword_Succeeds    5x    3s    TemplatedRequests.Get_As_Xml_Templated    ${NETCONF_FOLDER}${/}module    mapping=${mapping}
+    \    BuiltIn.Wait_Until_Keyword_Succeeds    5x    3s    TemplatedRequests.Get_As_Xml_Templated    ${NETCONF_FOLDER}${/}netconf-state    mapping=${mapping}
     \    ...    session=${mod_session}
     [Teardown]    Remove_Netconf_Device    ${DEVICE_NAME}    ${session}
 

diff --git a/csit/variables/netconf/device/module/location.uri b/csit/variables/netconf/device/module/location.uri
deleted file mode 100644 (file)
index edf10b6..0000000
--- a/csit/variables/netconf/device/module/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/$MODULE_TYPE/$MODULE_NAME

diff --git a/csit/variables/netconf/device/netconf-state/location.uri b/csit/variables/netconf/device/netconf-state/location.uri
new file mode 100644 (file)
index 0000000..838d1f9
--- /dev/null
+++ b/csit/variables/netconf/device/netconf-state/location.uri
@@ -0,0 +1 @@
+restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/ietf-netconf-monitoring:netconf-state