Add keyword needed by guidelines

[integration/test.git] / csit / suites / tsdr / HBase / 010_InterfaceMetrics.robot

diff --git a/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot b/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
index b7cd419f647c62fc6d8df28f0c51cf828fb9e69f..d0c52741a694d8e4225394c5212da898aea0f333 100755 (executable)
--- a/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
+++ b/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
@@ -2,6 +2,7 @@
 Documentation     Test suite for Hbase DataStore PortStats Verification
 Suite Setup       Initialize the Tsdr Suite
 Suite Teardown    Stop Tsdr Suite
 Documentation     Test suite for Hbase DataStore PortStats Verification
 Suite Setup       Initialize the Tsdr Suite
 Suite Teardown    Stop Tsdr Suite

+Metadata          https://bugs.opendaylight.org/show_bug.cgi?id=5068    ${EMPTY}

 Library           SSHLibrary
 Library           Collections
 Library           String
 Library           SSHLibrary
 Library           Collections
 Library           String


@@ -14,17 +15,17 @@ Variables         ../../../variables/Variables.py
 *** Variables ***
 @{INTERFACE_METRICS}    TransmittedPackets    TransmittedBytes    TransmitErrors    TransmitDrops    ReceivedPackets    ReceivedBytes    ReceiveOverRunError
 ...               ReceiveFrameError    ReceiveErrors    ReceiveDrops    ReceiveCrcError    CollisionCount
 *** Variables ***
 @{INTERFACE_METRICS}    TransmittedPackets    TransmittedBytes    TransmitErrors    TransmitDrops    ReceivedPackets    ReceivedBytes    ReceiveOverRunError
 ...               ReceiveFrameError    ReceiveErrors    ReceiveDrops    ReceiveCrcError    CollisionCount

-@{CATEGORY}       FlowGroupStats    FlowMeterStats    FlowStats    FlowTableStats    PortStats    QueueStats
-${TSDR_PORTSTATS}    tsdr:list PortStats
-${CONFIG_INTERVAL}    /restconf/config/TSDRDC:TSDRDCConfig
-${OPER_INTERVAL}    /restconf/operations/TSDRDC:setPollingInterval
+@{CATEGORY}       FLOWGROUPSTATS    FLOWMETERSTATS    FLOWSTATS    FLOWTABLESTATS    PORTSTATS    QUEUESTATS
+${TSDR_PORTSTATS}    tsdr:list PORTSTATS
+${CONFIG_INTERVAL}    /restconf/config/tsdr-openflow-statistics-collector:TSDROSCConfig
+${OPER_INTERVAL}    /restconf/operations/tsdr-openflow-statistics-collector:setPollingInterval
+&{HEADERS_QUERY}    Content-Type=application/json    Content-Type=application/json

 
 *** Test Cases ***
 Verification of TSDR HBase Feature Installation
     [Documentation]    Install and Verify the TSDR HBase Features
 
 *** Test Cases ***
 Verification of TSDR HBase Feature Installation
     [Documentation]    Install and Verify the TSDR HBase Features

-    COMMENT    Install a Feature    odl-tsdr-hbase    ${CONTROLLER}    ${KARAF_SHELL_PORT}    60
+    COMMENT    Install a Feature    odl-tsdr-hbase    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    60

     Verify Feature Is Installed    odl-tsdr-hbase
     Verify Feature Is Installed    odl-tsdr-hbase

-    Verify Feature Is Installed    odl-tsdr-hbase-persistence

     Verify Feature Is Installed    odl-hbaseclient
 
 Verification TSDR Command is exist in Help
     Verify Feature Is Installed    odl-hbaseclient
 
 Verification TSDR Command is exist in Help


@@ -40,32 +41,34 @@ Verification of TSDR PortStats
     [Documentation]    Verify the TSDR InterfaceMetrics
     : FOR    ${list}    IN    @{INTERFACE_METRICS}
     \    ${tsdr_cmd}=    Concatenate the String    ${TSDR_PORTSTATS}    | grep ${list} | head
     [Documentation]    Verify the TSDR InterfaceMetrics
     : FOR    ${list}    IN    @{INTERFACE_METRICS}
     \    ${tsdr_cmd}=    Concatenate the String    ${TSDR_PORTSTATS}    | grep ${list} | head

-    \    ${output}=    Issue Command On Karaf Console    ${tsdr_cmd}    ${CONTROLLER}    ${KARAF_SHELL_PORT}    30
+    \    ${output}=    Issue Command On Karaf Console    ${tsdr_cmd}    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    30

     \    Should Contain    ${output}    ${list}
 
 Verification of InterfaceMetrics-Attributes on HBase Client
     [Documentation]    Verify the InterfaceMetrics has been updated on HBase Datastore
     : FOR    ${list}    IN    @{INTERFACE_METRICS}
     \    Should Contain    ${output}    ${list}
 
 Verification of InterfaceMetrics-Attributes on HBase Client
     [Documentation]    Verify the InterfaceMetrics has been updated on HBase Datastore
     : FOR    ${list}    IN    @{INTERFACE_METRICS}

-    \    Verify the Metrics Attributes on Hbase Client    ${list}    openflow:1_1    InterfaceMetrics
+    \    Verify the Metrics Attributes on Hbase Client    ${list}    Node:openflow:1,NodeConnector:1    PORTSTATS

 
 Verify Configuration Interval-change
     [Documentation]    Verify the TSDR Collection configuration changes
 
 Verify Configuration Interval-change
     [Documentation]    Verify the TSDR Collection configuration changes

-    Verify TSDR Configuration Interval    180
-    Post TSDR Configuration Interval    200
-    Verify TSDR Configuration Interval    200
-    Post TSDR Configuration Interval    180
-    Verify TSDR Configuration Interval    180
+    Wait Until Keyword Succeeds    5x    3 sec    Post TSDR Configuration Interval    15000
+    Wait Until Keyword Succeeds    5x    3 sec    Verify TSDR Configuration Interval    15000
+    Wait Until Keyword Succeeds    5x    3 sec    Post TSDR Configuration Interval    20000
+    Wait Until Keyword Succeeds    5x    3 sec    Verify TSDR Configuration Interval    20000
+    Wait Until Keyword Succeeds    5x    3 sec    Post TSDR Configuration Interval    15000
+    Wait Until Keyword Succeeds    5x    3 sec    Verify TSDR Configuration Interval    15000
+    [Teardown]    Report_Failure_Due_To_Bug    5068

 
 *** Keywords ***
 Initialize the Tsdr Suite
     COMMENT    Initialize the HBase for TSDR
     Start Tsdr Suite
 
 *** Keywords ***
 Initialize the Tsdr Suite
     COMMENT    Initialize the HBase for TSDR
     Start Tsdr Suite

-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_QUERY}

 
 Verify TSDR Configuration Interval
     [Arguments]    ${interval}
     [Documentation]    Verify Configuration interval of TSDR Collection
 
 Verify TSDR Configuration Interval
     [Arguments]    ${interval}
     [Documentation]    Verify Configuration interval of TSDR Collection

-    ${resp}    RequestsLibrary.Get    session    ${CONFIG_INTERVAL}
+    ${resp}    RequestsLibrary.Get Request    session    ${CONFIG_INTERVAL}

     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    ${interval}
 
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    ${interval}
 


@@ -74,7 +77,6 @@ Post TSDR Configuration Interval
     [Documentation]    Configuration TSDR collection interval ${interval}
     ${p1}    Create Dictionary    interval=${interval}
     ${p2}    Create Dictionary    input=${p1}
     [Documentation]    Configuration TSDR collection interval ${interval}
     ${p1}    Create Dictionary    interval=${interval}
     ${p2}    Create Dictionary    input=${p1}

-    ${post_data}    Create Dictionary    setPollingInterval=${p2}
-    Log    ${post_data}
-    ${resp}    RequestsLibrary.Post    session    ${OPER_INTERVAL}    ${post_data}
-    Should Be Equal As Strings    ${resp.status_code}    201
+    ${p2_json}=    json.dumps    ${p2}
+    ${resp}    RequestsLibrary.Post Request    session    ${OPER_INTERVAL}    data=${p2_json}
+    Should Be Equal As Strings    ${resp.status_code}    200