aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/exec_test.sh4
-rw-r--r--docker/Dockerfile2
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot4
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot4
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot4
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot37
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.txt37
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot37
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.txt37
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot37
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.txt37
-rwxr-xr-xtestcases/Controllers/ODL/start_tests.sh6
-rw-r--r--testcases/Controllers/ODL/test_list.txt4
-rw-r--r--testcases/security_scan/connect.py7
14 files changed, 130 insertions, 127 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 291639715..2269aa7f9 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -141,6 +141,10 @@ function run_test(){
echo "The test case '${test_name}' does not exist."
exit 1
esac
+
+ if [[ $? != 0 ]]; then exit 1
+ else exit 0
+ fi
}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f119cbb91..874a0638f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -72,7 +72,7 @@ RUN git clone https://gerrit.opnfv.org/gerrit/releng ${repos_dir}/releng
RUN git clone https://gerrit.opnfv.org/gerrit/doctor ${repos_dir}/doctor
RUN git clone -b 0.3.3 https://github.com/openstack/rally.git ${repos_dir}/rally
RUN git clone https://github.com/openstack/tempest.git ${repos_dir}/tempest
-RUN git clone https://github.com/opendaylight/integration.git ${repos_dir}/odl_integration
+RUN git clone https://git.opendaylight.org/gerrit/p/integration/test.git ${repos_dir}/odl_test
RUN git clone -b stable https://github.com/boucherv-orange/clearwater-live-test ${repos_dir}/vims-test
RUN git clone https://github.com/openstack/networking-bgpvpn ${repos_dir}/bgpvpn
RUN git clone https://gerrit.onosproject.org/OnosSystemTest ${repos_dir}/onos
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot b/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot
index 583a6a153..f5633ec50 100644
--- a/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot
+++ b/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot
@@ -26,7 +26,7 @@ Check OpenStack Networks
Log ${OSResult}
Check OpenDaylight Networks
- [Documentation] Checking OpenDaylight Neutron API for Known Networks
+ [Documentation] Checking OpenDaylight Neutron API for known networks
[Tags] Network Neutron OpenDaylight
Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH}
${resp} get ODLSession ${ODLREST}
@@ -50,7 +50,7 @@ Create Network
sleep 2
Check Network
- [Documentation] Check Network created in OpenDaylight
+ [Documentation] Check network created in OpenDaylight
[Tags] Check Network OpenDaylight
${resp} get ODLSession ${ODLREST}/${NetID}
Should be Equal As Strings ${resp.status_code} 200
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot b/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot
index 5f5b82440..3eb87815b 100644
--- a/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot
+++ b/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot
@@ -16,7 +16,7 @@ ${data} {"subnet":{"network_id":"${NETID}","ip_version":4,"cidr":"172.
*** Test Cases ***
Check OpenStack Subnets
- [Documentation] Checking OpenStack Neutron for known Subnets
+ [Documentation] Checking OpenStack Neutron for known subnets
[Tags] Subnets Neutron OpenStack
Log ${X-AUTH}
${resp} get OSSession ${OSREST}
@@ -26,7 +26,7 @@ Check OpenStack Subnets
Log ${OSResult}
Check OpenDaylight subnets
- [Documentation] Checking OpenDaylight Neutron API for Known Subnets
+ [Documentation] Checking OpenDaylight Neutron API for known subnets
[Tags] Subnets Neutron OpenDaylight
Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH}
${resp} get ODLSession ${ODLREST}
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot b/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot
index 8b75733b7..d1796c35a 100644
--- a/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot
+++ b/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot
@@ -26,7 +26,7 @@ Check OpenStack ports
Log ${OSResult}
Check OpenDaylight ports
- [Documentation] Checking OpenDaylight Neutron API for Known Ports
+ [Documentation] Checking OpenDaylight Neutron API for known ports
[Tags] Ports Neutron OpenDaylight
Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH}
${resp} get ODLSession ${ODLREST}
@@ -50,7 +50,7 @@ Create New Port
sleep 2
Check New Port
- [Documentation] Check new subnet created in OpenDaylight
+ [Documentation] Check new port created in OpenDaylight
[Tags] Check subnet OpenDaylight
${resp} get ODLSession ${ODLREST}/${PORTID}
Should be Equal As Strings ${resp.status_code} 200
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot b/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot
new file mode 100644
index 000000000..1f632ddad
--- /dev/null
+++ b/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot
@@ -0,0 +1,37 @@
+*** Settings ***
+Documentation Checking Port deleted in OpenStack are deleted also in OpenDaylight
+Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
+Suite Teardown Delete All Sessions
+Library SSHLibrary
+Library Collections
+Library OperatingSystem
+Library ../../../libraries/RequestsLibrary.py
+Library ../../../libraries/Common.py
+Variables ../../../variables/Variables.py
+
+*** Variables ***
+${ODLREST} /controller/nb/v2/neutron/ports
+${OSREST} /v2.0/ports/${PORTID}
+${data} {"port":{"network_id":"${NETID}","admin_state_up": true}}
+
+*** Test Cases ***
+Delete New Port
+ [Documentation] Delete previously created port in OpenStack
+ [Tags] Delete port OpenStack Neutron
+ Log ${data}
+ ${resp} delete OSSession ${OSREST}
+ Should be Equal As Strings ${resp.status_code} 204
+ Log ${resp.content}
+ sleep 2
+
+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 ODLSession ${ODLREST}
+ Should be Equal As Strings ${resp.status_code} 200
+ ${ODLResult} To Json ${resp.content}
+ Set Suite Variable ${ODLResult}
+ Log ${ODLResult}
+ ${resp} get ODLSession ${ODLREST}/${PORTID}
+ Should be Equal As Strings ${resp.status_code} 404
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.txt b/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.txt
deleted file mode 100644
index f10298839..000000000
--- a/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-*** Settings ***
-Documentation Checking Port deleted in OpenStack are deleted also in OpenDaylight
-Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
-Suite Teardown Delete All Sessions
-Library SSHLibrary
-Library Collections
-Library OperatingSystem
-Library ../../../libraries/RequestsLibrary.py
-Library ../../../libraries/Common.py
-Variables ../../../variables/Variables.py
-
-*** Variables ***
-${ODLREST} /controller/nb/v2/neutron/ports
-${OSREST} /v2.0/ports/${PORTID}
-${data} {"port":{"network_id":"${NETID}","admin_state_up": true}}
-
-*** Test Cases ***
-Delete New Port
- [Documentation] Delete previously created port in OpenStack
- [Tags] Delete port OpenStack Neutron
- Log ${data}
- ${resp} delete OSSession ${OSREST}
- Should be Equal As Strings ${resp.status_code} 204
- Log ${resp.content}
- sleep 2
-
-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 ODLSession ${ODLREST}
- Should be Equal As Strings ${resp.status_code} 200
- ${ODLResult} To Json ${resp.content}
- Set Suite Variable ${ODLResult}
- Log ${ODLResult}
- ${resp} get ODLSession ${ODLREST}/${PORTID}
- Should be Equal As Strings ${resp.status_code} 404
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot b/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot
new file mode 100644
index 000000000..bfe2b9d69
--- /dev/null
+++ b/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot
@@ -0,0 +1,37 @@
+*** Settings ***
+Documentation Checking Subnets deleted in OpenStack are deleted also in OpenDaylight
+Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
+Suite Teardown Delete All Sessions
+Library SSHLibrary
+Library Collections
+Library OperatingSystem
+Library ../../../libraries/RequestsLibrary.py
+Library ../../../libraries/Common.py
+Variables ../../../variables/Variables.py
+
+*** Variables ***
+${ODLREST} /controller/nb/v2/neutron/subnets
+${OSREST} /v2.0/subnets/${SUBNETID}
+${data} {"subnet":{"network_id":"${NETID}","ip_version":4,"cidr":"172.16.64.0/24","allocation_pools":[{"start":"172.16.64.20","end":"172.16.64.120"}]}}
+
+*** Test Cases ***
+Delete New subnet
+ [Documentation] Delete previously created subnet in OpenStack
+ [Tags] Delete Subnet OpenStack Neutron
+ Log ${data}
+ ${resp} delete OSSession ${OSREST}
+ Should be Equal As Strings ${resp.status_code} 204
+ Log ${resp.content}
+ sleep 2
+
+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 ODLSession ${ODLREST}
+ Should be Equal As Strings ${resp.status_code} 200
+ ${ODLResult} To Json ${resp.content}
+ Set Suite Variable ${ODLResult}
+ Log ${ODLResult}
+ ${resp} get ODLSession ${ODLREST}/${SUBNETID}
+ Should be Equal As Strings ${resp.status_code} 404
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.txt b/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.txt
deleted file mode 100644
index fb619825b..000000000
--- a/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-*** Settings ***
-Documentation Checking Subnets deleted in OpenStack are deleted also in OpenDaylight
-Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
-Suite Teardown Delete All Sessions
-Library SSHLibrary
-Library Collections
-Library OperatingSystem
-Library ../../../libraries/RequestsLibrary.py
-Library ../../../libraries/Common.py
-Variables ../../../variables/Variables.py
-
-*** Variables ***
-${ODLREST} /controller/nb/v2/neutron/subnets
-${OSREST} /v2.0/subnets/${SUBNETID}
-${data} {"subnet":{"network_id":"${NETID}","ip_version":4,"cidr":"172.16.64.0/24","allocation_pools":[{"start":"172.16.64.20","end":"172.16.64.120"}]}}
-
-*** Test Cases ***
-Delete New subnet
- [Documentation] Delete previously created subnet in OpenStack
- [Tags] Delete Subnet OpenStack Neutron
- Log ${data}
- ${resp} delete OSSession ${OSREST}
- Should be Equal As Strings ${resp.status_code} 204
- Log ${resp.content}
- sleep 2
-
-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 ODLSession ${ODLREST}
- Should be Equal As Strings ${resp.status_code} 200
- ${ODLResult} To Json ${resp.content}
- Set Suite Variable ${ODLResult}
- Log ${ODLResult}
- ${resp} get ODLSession ${ODLREST}/${SUBNETID}
- Should be Equal As Strings ${resp.status_code} 404
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot b/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot
new file mode 100644
index 000000000..12828e186
--- /dev/null
+++ b/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot
@@ -0,0 +1,37 @@
+*** Settings ***
+Documentation Checking Network deleted in OpenStack are deleted also in OpenDaylight
+Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
+Suite Teardown Delete All Sessions
+Library SSHLibrary
+Library Collections
+Library OperatingSystem
+Library ../../../libraries/RequestsLibrary.py
+Library ../../../libraries/Common.py
+Variables ../../../variables/Variables.py
+
+*** Variables ***
+${ODLREST} /controller/nb/v2/neutron/networks
+${OSREST} /v2.0/networks/${NETID}
+${postNet} {"network":{"name":"odl_network","admin_state_up":true}}
+
+*** Test Cases ***
+Delete Network
+ [Documentation] Delete network in OpenStack
+ [Tags] Delete Network OpenStack Neutron
+ Log ${postNet}
+ ${resp} delete OSSession ${OSREST}
+ Should be Equal As Strings ${resp.status_code} 204
+ Log ${resp.content}
+ sleep 2
+
+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 ODLSession ${ODLREST}
+ Should be Equal As Strings ${resp.status_code} 200
+ ${ODLResult} To Json ${resp.content}
+ Set Suite Variable ${ODLResult}
+ Log ${ODLResult}
+ ${resp} get ODLSession ${ODLREST}/${NetID}
+ Should be Equal As Strings ${resp.status_code} 404
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.txt b/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.txt
deleted file mode 100644
index 528fbfca2..000000000
--- a/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-*** Settings ***
-Documentation Checking Network deleted in OpenStack are deleted also in OpenDaylight
-Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
-Suite Teardown Delete All Sessions
-Library SSHLibrary
-Library Collections
-Library OperatingSystem
-Library ../../../libraries/RequestsLibrary.py
-Library ../../../libraries/Common.py
-Variables ../../../variables/Variables.py
-
-*** Variables ***
-${ODLREST} /controller/nb/v2/neutron/networks
-${OSREST} /v2.0/networks/${NETID}
-${postNet} {"network":{"name":"odl_network","admin_state_up":true}}
-
-*** Test Cases ***
-Delete Network
- [Documentation] Delete network in OpenStack
- [Tags] Delete Network OpenStack Neutron
- Log ${postNet}
- ${resp} delete OSSession ${OSREST}
- Should be Equal As Strings ${resp.status_code} 204
- Log ${resp.content}
- sleep 2
-
-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 ODLSession ${ODLREST}
- Should be Equal As Strings ${resp.status_code} 200
- ${ODLResult} To Json ${resp.content}
- Set Suite Variable ${ODLResult}
- Log ${ODLResult}
- ${resp} get ODLSession ${ODLREST}/${NetID}
- Should be Equal As Strings ${resp.status_code} 404
diff --git a/testcases/Controllers/ODL/start_tests.sh b/testcases/Controllers/ODL/start_tests.sh
index 3800b6307..7f5f121b6 100755
--- a/testcases/Controllers/ODL/start_tests.sh
+++ b/testcases/Controllers/ODL/start_tests.sh
@@ -9,7 +9,7 @@
BASEDIR=`dirname $0`
RESULTS_DIR='/home/opnfv/functest/results/odl/'
-REPO_DIR='/home/opnfv/repos/odl_integration'
+REPO_DIR='/home/opnfv/repos/odl_test'
#TODO: read this form config_functest.yaml
# Colors
@@ -54,7 +54,7 @@ NEUTRON_IP=${NEUTRON_IP:-192.168.0.68}
KEYSTONE_IP=${KEYSTONE_IP:-192.168.0.69}
set +x
-init_file=${REPO_DIR}/test/csit/suites/openstack/neutron/__init__.robot
+init_file=${REPO_DIR}/csit/suites/openstack/neutron/__init__.robot
# Change openstack password for admin tenant in neutron suite
sed -i "s/\"password\": \".*\"/\"password\": \"${PASS}\"/" $init_file
@@ -66,7 +66,7 @@ fi
# add custom tests to suite, if there are more custom tests needed this will be reworked
echo -e "${green}Copy custom tests to suite.${nc}"
-cp -vf ${BASEDIR}/custom_tests/neutron/* ${REPO_DIR}/test/csit/suites/openstack/neutron/
+cp -vf ${BASEDIR}/custom_tests/neutron/* ${REPO_DIR}/csit/suites/openstack/neutron/
# List of tests are specified in test_list.txt
# those are relative paths to test directories from integartion suite
diff --git a/testcases/Controllers/ODL/test_list.txt b/testcases/Controllers/ODL/test_list.txt
index ad791e553..ec8cd32e2 100644
--- a/testcases/Controllers/ODL/test_list.txt
+++ b/testcases/Controllers/ODL/test_list.txt
@@ -1,5 +1,5 @@
# List of tests` which will be executed by script start_test.sh
# You can specify path to specific robot test file or directory (in that case all tests from directory will be executed)
-test/csit/suites/integration/basic/
-test/csit/suites/openstack/neutron/
+csit/suites/integration/basic/
+csit/suites/openstack/neutron/
diff --git a/testcases/security_scan/connect.py b/testcases/security_scan/connect.py
index 9430e9a74..1c4e209ad 100644
--- a/testcases/security_scan/connect.py
+++ b/testcases/security_scan/connect.py
@@ -16,15 +16,14 @@ import paramiko
import functest.utils.functest_logger as ft_logger
-# Enable below for connection debugging
-# paramiko.util.log_to_file('ssh.log')
-
# add installer IP from env
INSTALLER_IP = os.getenv('INSTALLER_IP')
-# Set up logger
+# Set up loggers
logger = ft_logger.Logger("security_scan").getLogger()
+paramiko.util.log_to_file("/var/log/paramiko.log")
+
class novaManager:
def __init__(self, *args):