Added scripts to start HBase server before controller

Added Waiting time for 6 polling cycle for TSDR collection

Change-Id: I9f4a652270231175e2f68e4abccb78929656d03f
Signed-off-by: vasanthan_balasubram <vasanthan_balasubram@dell.com>

diff --git a/test/csit/scriptplans/tsdr-hbase-datastore.txt b/test/csit/scriptplans/tsdr-hbase-datastore.txt
new file mode 100644 (file)
index 0000000..1b9161a
--- /dev/null
+++ b/test/csit/scriptplans/tsdr-hbase-datastore.txt
@@ -0,0 +1,3 @@
+# Place the scripts in run order:
+integration/test/csit/suites/tsdr/HBase/scripts/hbase-startup.sh
+

diff --git a/test/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot b/test/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
index 349873df3a81b245c59f951970d62fac7d300724..d9552d32c234f359a4abc0386cbbbf71b112f84c 100755 (executable)
--- a/test/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
+++ b/test/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
@@ -58,7 +58,7 @@ Verify Configuration Interval-change
 \r
 *** Keywords ***\r
 Initialize the Tsdr Suite\r
-    Initialize the HBase for TSDR\r
+    COMMENT    Initialize the HBase for TSDR\r
     Start Tsdr Suite\r
     Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}\r
 \r

diff --git a/test/csit/suites/tsdr/HBase/040_QueueMetrics.robot b/test/csit/suites/tsdr/HBase/040_QueueMetrics.robot
index fe18b52035cc12b05183d3d3d1e57ee074ab5366..5b6fb63241f33438afa5c122f0db7121b2cf2e7d 100644 (file)
--- a/test/csit/suites/tsdr/HBase/040_QueueMetrics.robot
+++ b/test/csit/suites/tsdr/HBase/040_QueueMetrics.robot
@@ -17,7 +17,7 @@ ${TSDR_QUEUESTATS}    tsdr:list QueueStats
 *** Test Cases ***\r
 Verify the Queue Metrics attributes exist thru Karaf console\r
     [Documentation]    Verify the QueueMetrics attributes exist on Karaf Console\r
-    Wait Until Keyword Succeeds    120s    1s    Verify the Metric is Collected?    ${TSDR_QUEUESTATS}    Transmitted\r
+    Wait Until Keyword Succeeds    180s    1s    Verify the Metric is Collected?    ${TSDR_QUEUESTATS}    Transmitted\r
     ${output}=    Issue Command On Karaf Console    ${TSDR_QUEUESTATS}    ${CONTROLLER}    ${KARAF_SHELL_PORT}    30\r
     : FOR    ${list}    IN    @{QUEUE_METRICS}\r
     \    Should Contain    ${output}    ${list}\r

diff --git a/test/csit/suites/tsdr/HBase/050_GroupMetrics.robot b/test/csit/suites/tsdr/HBase/050_GroupMetrics.robot
index 8b6abd6543de69faefb366830cda10360d1bad99..9b48e63472a30ba569885f7ee151db7d55aa0efa 100644 (file)
--- a/test/csit/suites/tsdr/HBase/050_GroupMetrics.robot
+++ b/test/csit/suites/tsdr/HBase/050_GroupMetrics.robot
@@ -18,7 +18,7 @@ ${TSDR_FLOWGROUPSTATS}    tsdr:list FlowGroupStats
 *** Test Cases ***\r
 Verify the FlowGroup Stats attributes exist thru Karaf console\r
     [Documentation]    Verify the FlowGroupStats attributes exist on Karaf Console\r
-    Wait Until Keyword Succeeds    120s    1s    Verify the Metric is Collected?    ${TSDR_FLOWGROUPSTATS}    ByteCount\r
+    Wait Until Keyword Succeeds    180s    1s    Verify the Metric is Collected?    ${TSDR_FLOWGROUPSTATS}    ByteCount\r
     ${output}=    Issue Command On Karaf Console    ${TSDR_FLOWGROUPSTATS}    ${CONTROLLER}    ${KARAF_SHELL_PORT}    30\r
     : FOR    ${list}    IN    @{FLOWGROUP_METRICS}\r
     \    Should Contain    ${output}    ${list}\r

diff --git a/test/csit/suites/tsdr/HBase/060_FlowMeterMetrics.robot b/test/csit/suites/tsdr/HBase/060_FlowMeterMetrics.robot
index c617a3127bca209d908043891d15f0896972c256..17eaefc9b679ca9b37f69c409819d3fd70e52ae4 100644 (file)
--- a/test/csit/suites/tsdr/HBase/060_FlowMeterMetrics.robot
+++ b/test/csit/suites/tsdr/HBase/060_FlowMeterMetrics.robot
@@ -18,7 +18,7 @@ ${TSDR_FLOWMETERSTATS}    tsdr:list FlowMeterStats
 *** Test Cases ***\r
 Verify the FlowMeter Stats attributes exist thru Karaf console\r
     [Documentation]    Verify the FlowMeterStats attributes exist on Karaf Console\r
-    Wait Until Keyword Succeeds    120s    1s    Verify the Metric is Collected?    ${TSDR_FLOWMETERSTATS}    ByteInCount\r
+    Wait Until Keyword Succeeds    180s    1s    Verify the Metric is Collected?    ${TSDR_FLOWMETERSTATS}    ByteInCount\r
     ${output}=    Issue Command On Karaf Console    ${TSDR_FLOWMETERSTATS}    ${CONTROLLER}    ${KARAF_SHELL_PORT}    30\r
     : FOR    ${list}    IN    @{FLOWMETER_METRICS}\r
     \    Should Contain    ${output}    ${list}\r

diff --git a/test/csit/suites/tsdr/HBase/scripts/hbase-startup.sh b/test/csit/suites/tsdr/HBase/scripts/hbase-startup.sh
new file mode 100755 (executable)
index 0000000..72a9534
--- /dev/null
+++ b/test/csit/suites/tsdr/HBase/scripts/hbase-startup.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Installation of Hbase
+cat > ${WORKSPACE}/hbasestartup.sh <<EOF
+cd /tmp/Hbase
+echo "Start the HBase Server"
+export JAVA_HOME=/usr
+/tmp/Hbase/hbase-0.94.15/bin/start-hbase.sh
+
+EOF
+echo "Copy the Hbase startup script to ${CONTROLLER0}"
+scp ${WORKSPACE}/hbasestartup.sh ${CONTROLLER0}:/tmp
+ssh ${CONTROLLER0} 'bash /tmp/hbasestartup.sh'
+# vim: ts=4 sw=4 sts=4 et ft=sh :