Correctly space expected_status

[integration/test.git] / csit / suites / controller / NETCONF / 010__netconf_inventory.robot

diff --git a/csit/suites/controller/NETCONF/010__netconf_inventory.robot b/csit/suites/controller/NETCONF/010__netconf_inventory.robot
index d14ee22ff9dee5620c61ad8b426bd59ed89134e4..47ffaf0d3c1e8b602b9ed7d69022943b9178cb98 100644 (file)
--- a/csit/suites/controller/NETCONF/010__netconf_inventory.robot
+++ b/csit/suites/controller/NETCONF/010__netconf_inventory.robot
@@ -1,22 +1,26 @@
 *** Settings ***
-Documentation     Test suite for NETCONF client
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-Suite Teardown    Delete All Sessions
-Library           Collections
-Library           OperatingSystem
-Library           String
-Library           RequestsLibrary
-Library           ../../../libraries/Common.py
-Variables         ../../../variables/Variables.py
+Documentation       Test suite for NETCONF client
+
+Library             Collections
+Library             OperatingSystem
+Library             String
+Library             RequestsLibrary
+Library             ../../../libraries/Common.py
+Variables           ../../../variables/Variables.py
+
+Suite Setup         Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
-${NETOPEER}       ${MININET}
-${NETOPEER_USER}    ${MININET_USER}
-${FILE}           ${CURDIR}/../../../variables/xmls/netconf.xml
-${REST_CONT_CONF}    /restconf/config/network-topology:network-topology/topology/topology-netconf
-${REST_CONT_OPER}    /restconf/operational/network-topology:network-topology/topology/topology-netconf
-${REST_NTPR_CONF}    node/controller-config/yang-ext:mount/config:modules
-${REST_NTPR_MOUNT}    node/netopeer/yang-ext:mount/
+${NETOPEER}             ${TOOLS_SYSTEM_IP}
+${NETOPEER_USER}        ${TOOLS_SYSTEM_USER}
+${FILE}                 ${CURDIR}/../../../variables/xmls/netconf.xml
+${REST_CONT_CONF}       /restconf/config/network-topology:network-topology/topology/topology-netconf
+${REST_CONT_OPER}       /restconf/operational/network-topology:network-topology/topology/topology-netconf
+${REST_NTPR_CONF}       node/controller-config/yang-ext:mount/config:modules
+${REST_NTPR_MOUNT}      node/netopeer/yang-ext:mount/
+
 
 *** Test Cases ***
 Add NetConf device
@@ -26,7 +30,7 @@ Add NetConf device
     ${XML2}    Replace String    ${XML1}    127.0.0.1    ${NETOPEER}
     ${body}    Replace String    ${XML2}    mininet    ${NETOPEER_USER}
     Log    ${body}
-    ${resp}    Post    session    ${REST_CONT_CONF}/${REST_NTPR_CONF}    data=${body}
+    ${resp}    Post Request    session    ${REST_CONT_CONF}/${REST_NTPR_CONF}    data=${body}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    204
 
@@ -38,7 +42,7 @@ Get Controller Inventory
 Pull External Device configuration
     [Documentation]    Pull Netopeer configuration
     [Tags]    netconf
-    ${resp}    Get    session    ${REST_CONT_CONF}/${REST_NTPR_MOUNT}
+    ${resp}    Get Request    session    ${REST_CONT_CONF}/${REST_NTPR_MOUNT}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    {}
@@ -46,16 +50,17 @@ Pull External Device configuration
 Verify Device Operational data
     [Documentation]    Verify Netopeer operational data
     [Tags]    exclude
-    ${resp}    Get    session    ${REST_CONT_OPER}/${REST_NTPR_MOUNT}
+    ${resp}    Get Request    session    ${REST_CONT_OPER}/${REST_NTPR_MOUNT}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    schema
     Should Contain    ${resp.content}    statistics
     Should Contain    ${resp.content}    datastores
 
+
 *** Keywords ***
 Get Inventory
-    ${resp}    Get    session    ${REST_CONT_OPER}/node/netopeer
+    ${resp}    Get Request    session    ${REST_CONT_OPER}/node/netopeer
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    "node-id":"netopeer"