From: Vratko Polak <vrpolak@cisco.com>
Date: Thu, 17 Dec 2015 15:14:57 +0000 (+0100)
Subject: Improved integration/basic code quality
X-Git-Tag: release/beryllium-sr1~145
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=b75cf48c2c53177f3e8b57bab8543d2227ccc939

Improved integration/basic code quality

It is an example we recommend every project to start with [0],
so it should conform to code quality recommendations [1].

[0] https://wiki.opendaylight.org/view/Integration/Test/Step_by_Step_Guide_To_Creating_System_Tests#Move_your_robot_suites_.28test_folders.29_into_the_project_folder
[1] https://wiki.opendaylight.org/view/Integration/Test/Test_Code_Guidelines

Change-Id: Ic66a594eba8113c562d62a99ac41c8019252fdc2
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---

diff --git a/csit/suites/integration/basic/010_Restconf_OK.robot b/csit/suites/integration/basic/010_Restconf_OK.robot
deleted file mode 100644
index 4d19667e2d..0000000000
--- a/csit/suites/integration/basic/010_Restconf_OK.robot
+++ /dev/null
@@ -1,18 +0,0 @@
-*** Settings ***
-Documentation     Test suite to verify Restconf is OK
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-Suite Teardown    Delete All Sessions
-Library           RequestsLibrary
-Variables         ../../../variables/Variables.py
-Resource          ../../../libraries/Utils.robot
-
-*** Variables ***
-${REST_CONTEXT}    /restconf/modules
-
-*** Test Cases ***
-Get Controller Modules
-    [Documentation]    Get the controller modules via Restconf
-    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}
-    Log    ${resp.content}
-    Should Be Equal As Strings    ${resp.status_code}    200
-    Should Contain    ${resp.content}    ietf-restconf
diff --git a/csit/suites/integration/basic/restconf_modules.robot b/csit/suites/integration/basic/restconf_modules.robot
new file mode 100644
index 0000000000..88c9b22157
--- /dev/null
+++ b/csit/suites/integration/basic/restconf_modules.robot
@@ -0,0 +1,14 @@
+*** Settings ***
+Documentation     Test suite to verify Restconf is OK.
+Suite Setup       RequestsLibrary.Create_Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Teardown    RequestsLibrary.Delete_All_Sessions
+Library           RequestsLibrary
+Variables         ${CURDIR}/../../../variables/Variables.py
+
+*** Test Cases ***
+Get Controller Modules
+    [Documentation]    Get the restconf modules, check 200 status and ietf-restconf presence.
+    ${resp} =    RequestsLibrary.Get_Request    session    ${MODULES_API}
+    BuiltIn.Log    ${resp.content}
+    BuiltIn.Should_Be_Equal    ${resp.status_code}    ${200}
+    BuiltIn.Should_Contain    ${resp.content}    ietf-restconf