From 3a117d3958701fd563e083c7d5560348487539c2 Mon Sep 17 00:00:00 2001
From: vasanthan_balasubram <vasanthan_balasubram@dell.com>
Date: Thu, 11 Jun 2015 16:04:16 +0530
Subject: [PATCH] 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>
---
 test/csit/scriptplans/tsdr-hbase-datastore.txt     |  3 +++
 .../suites/tsdr/HBase/010_InterfaceMetrics.robot   |  2 +-
 test/csit/suites/tsdr/HBase/040_QueueMetrics.robot |  2 +-
 test/csit/suites/tsdr/HBase/050_GroupMetrics.robot |  2 +-
 .../suites/tsdr/HBase/060_FlowMeterMetrics.robot   |  2 +-
 .../suites/tsdr/HBase/scripts/hbase-startup.sh     | 14 ++++++++++++++
 6 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 test/csit/scriptplans/tsdr-hbase-datastore.txt
 create mode 100755 test/csit/suites/tsdr/HBase/scripts/hbase-startup.sh

diff --git a/test/csit/scriptplans/tsdr-hbase-datastore.txt b/test/csit/scriptplans/tsdr-hbase-datastore.txt
new file mode 100644
index 0000000000..1b9161ae6b
--- /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 349873df3a..d9552d32c2 100755
--- 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
 
 *** Keywords ***
 Initialize the Tsdr Suite
-    Initialize the HBase for TSDR
+    COMMENT    Initialize the HBase for TSDR
     Start Tsdr Suite
     Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 
diff --git a/test/csit/suites/tsdr/HBase/040_QueueMetrics.robot b/test/csit/suites/tsdr/HBase/040_QueueMetrics.robot
index fe18b52035..5b6fb63241 100644
--- 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 ***
 Verify the Queue Metrics attributes exist thru Karaf console
     [Documentation]    Verify the QueueMetrics attributes exist on Karaf Console
-    Wait Until Keyword Succeeds    120s    1s    Verify the Metric is Collected?    ${TSDR_QUEUESTATS}    Transmitted
+    Wait Until Keyword Succeeds    180s    1s    Verify the Metric is Collected?    ${TSDR_QUEUESTATS}    Transmitted
     ${output}=    Issue Command On Karaf Console    ${TSDR_QUEUESTATS}    ${CONTROLLER}    ${KARAF_SHELL_PORT}    30
     : FOR    ${list}    IN    @{QUEUE_METRICS}
     \    Should Contain    ${output}    ${list}
diff --git a/test/csit/suites/tsdr/HBase/050_GroupMetrics.robot b/test/csit/suites/tsdr/HBase/050_GroupMetrics.robot
index 8b6abd6543..9b48e63472 100644
--- 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 ***
 Verify the FlowGroup Stats attributes exist thru Karaf console
     [Documentation]    Verify the FlowGroupStats attributes exist on Karaf Console
-    Wait Until Keyword Succeeds    120s    1s    Verify the Metric is Collected?    ${TSDR_FLOWGROUPSTATS}    ByteCount
+    Wait Until Keyword Succeeds    180s    1s    Verify the Metric is Collected?    ${TSDR_FLOWGROUPSTATS}    ByteCount
     ${output}=    Issue Command On Karaf Console    ${TSDR_FLOWGROUPSTATS}    ${CONTROLLER}    ${KARAF_SHELL_PORT}    30
     : FOR    ${list}    IN    @{FLOWGROUP_METRICS}
     \    Should Contain    ${output}    ${list}
diff --git a/test/csit/suites/tsdr/HBase/060_FlowMeterMetrics.robot b/test/csit/suites/tsdr/HBase/060_FlowMeterMetrics.robot
index c617a3127b..17eaefc9b6 100644
--- 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 ***
 Verify the FlowMeter Stats attributes exist thru Karaf console
     [Documentation]    Verify the FlowMeterStats attributes exist on Karaf Console
-    Wait Until Keyword Succeeds    120s    1s    Verify the Metric is Collected?    ${TSDR_FLOWMETERSTATS}    ByteInCount
+    Wait Until Keyword Succeeds    180s    1s    Verify the Metric is Collected?    ${TSDR_FLOWMETERSTATS}    ByteInCount
     ${output}=    Issue Command On Karaf Console    ${TSDR_FLOWMETERSTATS}    ${CONTROLLER}    ${KARAF_SHELL_PORT}    30
     : FOR    ${list}    IN    @{FLOWMETER_METRICS}
     \    Should Contain    ${output}    ${list}
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
index 0000000000..72a95349ed
--- /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 :
-- 
2.36.6