summaryrefslogtreecommitdiffstats
path: root/testcases
diff options
context:
space:
mode:
Diffstat (limited to 'testcases')
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot14
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot14
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot16
-rw-r--r--testcases/Controllers/ODL/odlreport2db.py4
-rw-r--r--testcases/Controllers/ONOS/Teston/onosfunctest.py2
-rwxr-xr-xtestcases/OpenStack/rally/run_rally-cert.py9
-rw-r--r--testcases/OpenStack/tempest/run_tempest.py11
-rw-r--r--testcases/OpenStack/vPing/vPing_ssh.py2
-rw-r--r--testcases/OpenStack/vPing/vPing_userdata.py2
-rw-r--r--testcases/security_scan/security_scan.py7
-rw-r--r--testcases/vIMS/vIMS.py4
11 files changed, 63 insertions, 22 deletions
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot b/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot
index 7260d78de..b934ca5d3 100644
--- a/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot
+++ b/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot
@@ -1,6 +1,6 @@
*** Settings ***
Documentation Checking Port deleted in OpenStack are deleted also in OpenDaylight
-Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
+Suite Setup Start Suite
Suite Teardown Delete All Sessions
Library RequestsLibrary
Variables ../../../variables/Variables.py
@@ -23,7 +23,6 @@ Delete New Port
Check Port Deleted
[Documentation] Check port deleted in OpenDaylight
[Tags] Check port deleted OpenDaylight
- Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH}
${resp} get request ODLSession ${ODLREST}
Should be Equal As Strings ${resp.status_code} 200
${ODLResult} To Json ${resp.content}
@@ -31,3 +30,14 @@ Check Port Deleted
Log ${ODLResult}
${resp} get request ODLSession ${ODLREST}/${PORTID}
Should be Equal As Strings ${resp.status_code} 404
+
+*** Keywords ***
+Check Port Exists
+ [Arguments] ${portid}
+ ${resp} get request ODLSession ${ODLREST}/${portid}
+ Should be Equal As Strings ${resp.status_code} 200
+
+Start Suite
+ Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
+ Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH}
+ Check Port Exists ${PORTID}
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot b/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot
index ede9123f4..16e396fd0 100644
--- a/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot
+++ b/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot
@@ -1,6 +1,6 @@
*** Settings ***
Documentation Checking Subnets deleted in OpenStack are deleted also in OpenDaylight
-Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
+Suite Setup Start Suite
Suite Teardown Delete All Sessions
Library RequestsLibrary
Variables ../../../variables/Variables.py
@@ -23,7 +23,6 @@ Delete New subnet
Check New subnet deleted
[Documentation] Check subnet deleted in OpenDaylight
[Tags] Check subnet deleted OpenDaylight
- Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH}
${resp} get request ODLSession ${ODLREST}
Should be Equal As Strings ${resp.status_code} 200
${ODLResult} To Json ${resp.content}
@@ -31,3 +30,14 @@ Check New subnet deleted
Log ${ODLResult}
${resp} get request ODLSession ${ODLREST}/${SUBNETID}
Should be Equal As Strings ${resp.status_code} 404
+
+*** Keywords ***
+Check Subnet Exists
+ [Arguments] ${subnetid}
+ ${resp} get request ODLSession ${ODLREST}/${subnetid}
+ Should be Equal As Strings ${resp.status_code} 200
+
+Start Suite
+ Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
+ Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH}
+ Check Subnet Exists ${SUBNETID}
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot b/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot
index d917632b5..574e13248 100644
--- a/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot
+++ b/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot
@@ -1,6 +1,6 @@
*** Settings ***
Documentation Checking Network deleted in OpenStack are deleted also in OpenDaylight
-Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
+Suite Setup Start Suite
Suite Teardown Delete All Sessions
Library RequestsLibrary
Variables ../../../variables/Variables.py
@@ -23,11 +23,21 @@ Delete Network
Check Network deleted
[Documentation] Check network deleted in OpenDaylight
[Tags] Check Network OpenDaylight
- Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH}
${resp} get request ODLSession ${ODLREST}
Should be Equal As Strings ${resp.status_code} 200
${ODLResult} To Json ${resp.content}
Set Suite Variable ${ODLResult}
Log ${ODLResult}
- ${resp} get request ODLSession ${ODLREST}/${NetID}
+ ${resp} get request ODLSession ${ODLREST}/${NETID}
Should be Equal As Strings ${resp.status_code} 404
+
+*** Keywords ***
+Check Network Exists
+ [Arguments] ${netid}
+ ${resp} get request ODLSession ${ODLREST}/${netid}
+ Should be Equal As Strings ${resp.status_code} 200
+
+Start Suite
+ Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
+ Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH}
+ Check Network Exists ${NETID}
diff --git a/testcases/Controllers/ODL/odlreport2db.py b/testcases/Controllers/ODL/odlreport2db.py
index 075de5a86..0c9f341c9 100644
--- a/testcases/Controllers/ODL/odlreport2db.py
+++ b/testcases/Controllers/ODL/odlreport2db.py
@@ -115,7 +115,7 @@ def main(argv):
data['description'] = all_data['suite']['@name']
data['version'] = all_data['@generator']
data['test_project'] = "functest"
- data['case_name'] = "ODL"
+ data['case_name'] = "odl"
data['pod_name'] = pod
data['installer'] = installer
@@ -144,7 +144,7 @@ def main(argv):
if (tests_failed < 1):
status = "PASS"
- functest_utils.push_results_to_db("functest",
+ functest_utils.push_results_to_db(data['test_project'],
data['case_name'],
None,
start_time,
diff --git a/testcases/Controllers/ONOS/Teston/onosfunctest.py b/testcases/Controllers/ONOS/Teston/onosfunctest.py
index 38935c5dd..058114bde 100644
--- a/testcases/Controllers/ONOS/Teston/onosfunctest.py
+++ b/testcases/Controllers/ONOS/Teston/onosfunctest.py
@@ -192,7 +192,7 @@ def main():
logger.error("Unable to set ONOS criteria")
functest_utils.push_results_to_db("functest",
- "ONOS",
+ "onos",
logger,
start_time,
stop_time,
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py
index 7822c7e9e..8afbccaa3 100755
--- a/testcases/OpenStack/rally/run_rally-cert.py
+++ b/testcases/OpenStack/rally/run_rally-cert.py
@@ -535,11 +535,16 @@ def main():
if total_success >= 90:
status = "passed"
+ if args.sanity:
+ case_name = "rally_sanity"
+ else:
+ case_name = "rally_full"
+
if args.report:
logger.debug("Pushing Rally summary into DB...")
functest_utils.push_results_to_db("functest",
- "Rally",
- logger,
+ case_name,
+ None,
start_time,
stop_time,
status,
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index f59ba5263..a16ba26f7 100644
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -333,11 +333,16 @@ def run_tempest(OPTION):
"tests": int(num_tests), "failures": int(num_failures),
"errors": error_logs}
logger.info("Results: " + str(json_results))
- # TODO split Tempest smoke and full
+ # split Tempest smoke and full
+ if "smoke" in args.mode:
+ case_name = "tempest_smoke_serial"
+ else:
+ case_name = "tempest_full_parallel"
+
try:
ft_utils.push_results_to_db("functest",
- "Tempest",
- logger,
+ case_name,
+ None,
start_time,
stop_time,
status,
diff --git a/testcases/OpenStack/vPing/vPing_ssh.py b/testcases/OpenStack/vPing/vPing_ssh.py
index 3f90bc214..1609dd95b 100644
--- a/testcases/OpenStack/vPing/vPing_ssh.py
+++ b/testcases/OpenStack/vPing/vPing_ssh.py
@@ -429,7 +429,7 @@ def main():
try:
logger.debug("Pushing vPing SSH results into DB...")
functest_utils.push_results_to_db("functest",
- "vPing",
+ "vping_ssh",
logger,
start_time,
stop_time,
diff --git a/testcases/OpenStack/vPing/vPing_userdata.py b/testcases/OpenStack/vPing/vPing_userdata.py
index 5b7d2d90f..ff7158ee3 100644
--- a/testcases/OpenStack/vPing/vPing_userdata.py
+++ b/testcases/OpenStack/vPing/vPing_userdata.py
@@ -362,7 +362,7 @@ def main():
try:
logger.debug("Pushing vPing userdata results into DB...")
functest_utils.push_results_to_db("functest",
- "vPing_userdata",
+ "vping_userdata",
logger,
start_time,
stop_time,
diff --git a/testcases/security_scan/security_scan.py b/testcases/security_scan/security_scan.py
index 7ed85b64d..5910331a0 100644
--- a/testcases/security_scan/security_scan.py
+++ b/testcases/security_scan/security_scan.py
@@ -16,6 +16,7 @@ import argparse
import connect
import datetime
import os
+import sys
from ConfigParser import SafeConfigParser
from keystoneclient.auth.identity import v2
@@ -27,8 +28,8 @@ __author__ = 'Luke Hinds (lhinds@redhat.com)'
__url__ = 'https://wiki.opnfv.org/display/functest/Functest+Security'
# Global vars
-oscapbin = 'sudo /bin/oscap'
INSTALLER_IP = os.getenv('INSTALLER_IP')
+oscapbin = 'sudo /bin/oscap'
# Apex Spefic var needed to query Undercloud
if os.getenv('OS_AUTH_URL') is None:
@@ -37,7 +38,7 @@ if os.getenv('OS_AUTH_URL') is None:
else:
OS_AUTH_URL = os.getenv('OS_AUTH_URL')
-# argparse
+# args
parser = argparse.ArgumentParser(description='OPNFV OpenSCAP Scanner')
parser.add_argument('--config', action='store', dest='cfgfile',
help='Config file', required=True)
@@ -58,7 +59,7 @@ setup.getockey()
com = 'sudo hiera admin_password'
setup = connect.SetUp(com)
keypass = setup.keystonepass()
-auth = v2.Password(auth_url='http://{0}:5000/v2.0'.format(OS_AUTH_URL),
+auth = v2.Password(auth_url=OS_AUTH_URL,
username='admin',
password=str(keypass).rstrip(),
tenant_name='admin')
diff --git a/testcases/vIMS/vIMS.py b/testcases/vIMS/vIMS.py
index 260cb4ce2..a35eba98d 100644
--- a/testcases/vIMS/vIMS.py
+++ b/testcases/vIMS/vIMS.py
@@ -122,8 +122,8 @@ def step_failure(step_name, error_msg):
if step_name == "sig_test":
status = "PASS"
functest_utils.push_results_to_db("functest",
- "vIMS",
- logger,
+ "vims",
+ None,
start_time,
stop_time,
status,