Rework apidocs suite

Change-Id: I4e9036a0b8d1b344f3edf77aa78ee609345cbf43
Signed-off-by: Andrej Kilvady <akilvady@cisco.com>

diff --git a/csit/suites/netconf/apidocs/apidocs.robot b/csit/suites/netconf/apidocs/apidocs.robot
index 2457af7bea6f24a79899d23f7381e39013453798..9ca170486cc8cdcd676a3ab5b87ff00f1b9553fc 100644 (file)
--- a/csit/suites/netconf/apidocs/apidocs.robot
+++ b/csit/suites/netconf/apidocs/apidocs.robot
@@ -1,17 +1,16 @@
 *** Settings ***
 Documentation     Test suite to verify Apidocs is OK.
-Suite Setup       RequestsLibrary.Create_Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       TemplatedRequests.Create_Default_Session    timeout=3
 Suite Teardown    RequestsLibrary.Delete_All_Sessions
 Library           RequestsLibrary
 Resource          ${CURDIR}/../../../variables/Variables.robot
+Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 
 *** Variables ***
-${APIDOC_URL}     /apidoc/apis
+${VAR_DIR}        ${CURDIR}/../../../variables/
 
 *** Test Cases ***
 Get Apidoc Apis
     [Documentation]    Get the Apidoc Apis list, check 200 status and apis string presence.
-    ${resp} =    RequestsLibrary.Get_Request    session    ${APIDOC_URL}
-    BuiltIn.Log    ${resp.content}
-    BuiltIn.Should_Be_Equal    ${resp.status_code}    ${200}
-    BuiltIn.Should_Contain    ${resp.content}    apis
+    ${resp} =    TemplatedRequests.Get_As_Json_Templated    folder=${VAR_DIR}/apidoc/apis
+    BuiltIn.Should_Contain    ${resp}    apis

diff --git a/csit/variables/apidoc/apis/location.uri b/csit/variables/apidoc/apis/location.uri
new file mode 100644 (file)
index 0000000..e1d4d16
--- /dev/null
+++ b/csit/variables/apidoc/apis/location.uri
@@ -0,0 +1 @@
+/apidoc/apis