Code Review
/
functest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
96aef41
)
file/dir renaming for consistency
65/24865/6
author
Morgan Richomme
<morgan.richomme@orange.com>
Thu, 24 Nov 2016 17:25:52 +0000
(18:25 +0100)
committer
Morgan Richomme
<morgan.richomme@orange.com>
Fri, 25 Nov 2016 14:09:35 +0000
(15:09 +0100)
JIRA: FUNCTEST-579
Change-Id: Iaa545db70bfb76770df0a3d17871e29ce518ff2d
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
73 files changed:
functest/ci/config_functest.yaml
patch
|
blob
|
history
functest/ci/exec_test.sh
patch
|
blob
|
history
functest/ci/testcases.yaml
patch
|
blob
|
history
functest/opnfv_tests/features/domino.py
patch
|
blob
|
history
functest/opnfv_tests/features/sdnvpn.py
patch
|
blob
|
history
functest/opnfv_tests/openstack/__init__.py
[moved from
functest/opnfv_tests/Controllers/ODL/__init__.py
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/examples/create_instance_and_ip.py
[moved from
functest/opnfv_tests/OpenStack/examples/create_instance_and_ip.py
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/healthcheck/healthcheck.sh
[moved from
functest/opnfv_tests/OpenStack/healthcheck/healthcheck.sh
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/blacklist.txt
[moved from
functest/opnfv_tests/OpenStack/rally/blacklist.txt
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/macro/macro.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/macro/macro.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/run_rally-cert.py
[moved from
functest/opnfv_tests/OpenStack/rally/run_rally-cert.py
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-cinder.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/full/opnfv-heat.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-heat.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/full/opnfv-neutron.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-neutron.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-nova.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/opnfv-authenticate.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/opnfv-authenticate.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/opnfv-glance.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/opnfv-glance.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/opnfv-keystone.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/opnfv-keystone.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/opnfv-quotas.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/opnfv-quotas.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/opnfv-requests.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/opnfv-requests.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/opnfv-vm.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/opnfv-vm.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-cinder.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-heat.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-heat.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-neutron.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-neutron.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-nova.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/support/instance_dd_test.sh
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/support/instance_dd_test.sh
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/templates/autoscaling_policy.yaml.template
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/templates/default.yaml.template
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/templates/default.yaml.template
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/templates/random_strings.yaml.template
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/templates/random_strings.yaml.template
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/templates/resource_group.yaml.template
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/templates/resource_group.yaml.template
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_ports.yaml.template
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_volume.yaml.template
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_add.yaml.template
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_delete.yaml.template
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_replace.yaml.template
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_increase.yaml.template
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_reduce.yaml.template
[moved from
functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/rally/task.yaml
[moved from
functest/opnfv_tests/OpenStack/rally/task.yaml
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt
[moved from
functest/opnfv_tests/OpenStack/tempest/custom_tests/blacklist.txt
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/tempest/custom_tests/defcore_req.txt
[moved from
functest/opnfv_tests/OpenStack/tempest/custom_tests/defcore_req.txt
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/tempest/gen_tempest_conf.py
[moved from
functest/opnfv_tests/OpenStack/tempest/gen_tempest_conf.py
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/tempest/run_tempest.py
[moved from
functest/opnfv_tests/OpenStack/tempest/run_tempest.py
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/vping/__init__.py
[moved from
functest/opnfv_tests/Controllers/ONOS/Teston/__init__.py
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/vping/ping.sh
[moved from
functest/opnfv_tests/OpenStack/vPing/ping.sh
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/vping/vping_base.py
[moved from
functest/opnfv_tests/OpenStack/vPing/vping_base.py
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/vping/vping_ssh.py
[moved from
functest/opnfv_tests/OpenStack/vPing/vping_ssh.py
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/openstack/vping/vping_userdata.py
[moved from
functest/opnfv_tests/OpenStack/vPing/vping_userdata.py
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/__init__.py
[moved from
functest/opnfv_tests/Controllers/ONOS/Teston/adapters/__init__.py
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/odl/__init__.py
[moved from
functest/opnfv_tests/Controllers/__init__.py
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/odl/odl.py
[moved from
functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py
with 99% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/onos/sfc/README.md
[moved from
functest/opnfv_tests/Controllers/ONOS/Sfc/README.md
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/onos/sfc/sfc.py
[moved from
functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc.py
with 99% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py
[moved from
functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc_fun.py
with 99% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/onos/teston/Readme.txt
[moved from
functest/opnfv_tests/Controllers/ONOS/Teston/Readme.txt
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/onos/teston/__init__.py
[moved from
functest/opnfv_tests/OpenStack/__init__.py
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/onos/teston/adapters/__init__.py
[moved from
functest/opnfv_tests/OpenStack/vPing/__init__.py
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/onos/teston/adapters/client.py
[moved from
functest/opnfv_tests/Controllers/ONOS/Teston/adapters/client.py
with 95% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/onos/teston/adapters/connection.py
[moved from
functest/opnfv_tests/Controllers/ONOS/Teston/adapters/connection.py
with 98% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/onos/teston/adapters/environment.py
[moved from
functest/opnfv_tests/Controllers/ONOS/Teston/adapters/environment.py
with 98% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py
[moved from
functest/opnfv_tests/Controllers/ONOS/Teston/adapters/foundation.py
with 97% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/onos/teston/dependencies/onos
[moved from
functest/opnfv_tests/Controllers/ONOS/Teston/dependencies/onos
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/onos/teston/log/gitignore
[moved from
functest/opnfv_tests/Controllers/ONOS/Teston/log/gitignore
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/sdn/onos/teston/onos.py
[moved from
functest/opnfv_tests/Controllers/ONOS/Teston/onosfunctest.py
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/vnf/ims/clearwater.py
[moved from
functest/opnfv_tests/vnf/vIMS/clearwater.py
with 99% similarity]
patch
|
blob
|
history
functest/opnfv_tests/vnf/ims/create_venv.sh
[moved from
functest/opnfv_tests/vnf/vIMS/create_venv.sh
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/vnf/ims/orchestrator.py
[moved from
functest/opnfv_tests/vnf/vIMS/orchestrator.py
with 99% similarity]
patch
|
blob
|
history
functest/opnfv_tests/vnf/ims/requirements.pip
[moved from
functest/opnfv_tests/vnf/vIMS/requirements.pip
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/vnf/ims/vims.py
[moved from
functest/opnfv_tests/vnf/vIMS/vIMS.py
with 98% similarity]
patch
|
blob
|
history
functest/opnfv_tests/vnf/rnc/__init__.py
[moved from
functest/opnfv_tests/vnf/vRNC/__init__.py
with 100% similarity]
patch
|
blob
|
history
functest/opnfv_tests/vnf/rnc/parser.py
[moved from
functest/opnfv_tests/vnf/vRNC/parser.py
with 100% similarity, mode: 0644]
patch
|
blob
|
history
functest/tests/unit/odl/test_odl.py
patch
|
blob
|
history
run_unit_tests.sh
patch
|
blob
|
history
diff --git
a/functest/ci/config_functest.yaml
b/functest/ci/config_functest.yaml
index
a19139c
..
c75afda
100755
(executable)
--- a/
functest/ci/config_functest.yaml
+++ b/
functest/ci/config_functest.yaml
@@
-1,13
+1,13
@@
general:
\r
directories:
\r
# Relative to the path where the repo is cloned:
\r
general:
\r
directories:
\r
# Relative to the path where the repo is cloned:
\r
- dir_vping: functest/opnfv_tests/
OpenStack/vP
ing
\r
- dir_odl: functest/opnfv_tests/
Controllers/ODL
\r
- dir_rally: functest/opnfv_tests/
OpenS
tack/rally
\r
- dir_tempest_cases: functest/opnfv_tests/
OpenS
tack/tempest/custom_tests
\r
- dir_vIMS: functest/opnfv_tests/vnf/
vIMS
\r
- dir_onos: functest/opnfv_tests/
Controllers/ONOS/T
eston
\r
- dir_onos_sfc: functest/opnfv_tests/
Controllers/ONOS/S
fc
\r
+ dir_vping: functest/opnfv_tests/
openstack/vp
ing
\r
+ dir_odl: functest/opnfv_tests/
sdn/odl
\r
+ dir_rally: functest/opnfv_tests/
opens
tack/rally
\r
+ dir_tempest_cases: functest/opnfv_tests/
opens
tack/tempest/custom_tests
\r
+ dir_vIMS: functest/opnfv_tests/vnf/
ims
\r
+ dir_onos: functest/opnfv_tests/
sdn/onos/t
eston
\r
+ dir_onos_sfc: functest/opnfv_tests/
sdn/onos/s
fc
\r
\r
# Absolute path
\r
dir_home: /home/opnfv
\r
\r
# Absolute path
\r
dir_home: /home/opnfv
\r
diff --git
a/functest/ci/exec_test.sh
b/functest/ci/exec_test.sh
index
5767842
..
16c2ed3
100644
(file)
--- a/
functest/ci/exec_test.sh
+++ b/
functest/ci/exec_test.sh
@@
-87,35
+87,35
@@
function run_test(){
"odl")
odl_tests
[[ "$report" == "-r" ]] && args=-p
"odl")
odl_tests
[[ "$report" == "-r" ]] && args=-p
- ${FUNCTEST_TEST_DIR}/
Controllers/ODL/OpenDaylightTesting
.py \
+ ${FUNCTEST_TEST_DIR}/
sdn/odl/odl
.py \
--keystoneip $keystone_ip --neutronip $neutron_ip \
--osusername ${OS_USERNAME} --ostenantname ${OS_TENANT_NAME} \
--ospassword ${OS_PASSWORD} \
--odlip $odl_ip --odlwebport $odl_port ${args}
;;
"tempest_smoke_serial")
--keystoneip $keystone_ip --neutronip $neutron_ip \
--osusername ${OS_USERNAME} --ostenantname ${OS_TENANT_NAME} \
--ospassword ${OS_PASSWORD} \
--odlip $odl_ip --odlwebport $odl_port ${args}
;;
"tempest_smoke_serial")
- python ${FUNCTEST_TEST_DIR}/
OpenS
tack/tempest/run_tempest.py \
+ python ${FUNCTEST_TEST_DIR}/
opens
tack/tempest/run_tempest.py \
$clean_flag -s -m smoke $report
;;
"tempest_full_parallel")
$clean_flag -s -m smoke $report
;;
"tempest_full_parallel")
- python ${FUNCTEST_TEST_DIR}/
OpenS
tack/tempest/run_tempest.py \
+ python ${FUNCTEST_TEST_DIR}/
opens
tack/tempest/run_tempest.py \
$serial_flag $clean_flag -m full $report
;;
"vims")
$serial_flag $clean_flag -m full $report
;;
"vims")
- python ${FUNCTEST_TEST_DIR}/vnf/
vIMS/vIMS
.py $clean_flag $report
+ python ${FUNCTEST_TEST_DIR}/vnf/
ims/vims
.py $clean_flag $report
;;
"rally_full")
;;
"rally_full")
- python ${FUNCTEST_TEST_DIR}/
OpenS
tack/rally/run_rally-cert.py $clean_flag all $report
+ python ${FUNCTEST_TEST_DIR}/
opens
tack/rally/run_rally-cert.py $clean_flag all $report
;;
"rally_sanity")
;;
"rally_sanity")
- python ${FUNCTEST_TEST_DIR}/
OpenS
tack/rally/run_rally-cert.py \
+ python ${FUNCTEST_TEST_DIR}/
opens
tack/rally/run_rally-cert.py \
$clean_flag --sanity all $report
;;
"onos")
$clean_flag --sanity all $report
;;
"onos")
- python ${FUNCTEST_TEST_DIR}/
Controllers/ONOS/Teston/onosfunctest
.py
+ python ${FUNCTEST_TEST_DIR}/
sdn/onos/teston/onos
.py
;;
"onos_sfc")
;;
"onos_sfc")
- python ${FUNCTEST_TEST_DIR}/
Controllers/ONOS/Teston/onosfunctest
.py -t sfc
+ python ${FUNCTEST_TEST_DIR}/
sdn/onos/teston/onos
.py -t sfc
;;
"promise")
python ${FUNCTEST_TEST_DIR}/features/promise.py $report
;;
"promise")
python ${FUNCTEST_TEST_DIR}/features/promise.py $report
@@
-141,10
+141,10
@@
function run_test(){
python ${REPOS_DIR}/moon/tests/run_tests.py $report
;;
"multisite")
python ${REPOS_DIR}/moon/tests/run_tests.py $report
;;
"multisite")
- python ${FUNCTEST_TEST_DIR}/
OpenS
tack/tempest/gen_tempest_conf.py
- python ${FUNCTEST_TEST_DIR}/
OpenS
tack/tempest/run_tempest.py \
+ python ${FUNCTEST_TEST_DIR}/
opens
tack/tempest/gen_tempest_conf.py
+ python ${FUNCTEST_TEST_DIR}/
opens
tack/tempest/run_tempest.py \
$clean_flag -s -m feature_multisite $report \
$clean_flag -s -m feature_multisite $report \
- -c ${FUNCTEST_TEST_DIR}/
OpenS
tack/tempest/tempest_multisite.conf
+ -c ${FUNCTEST_TEST_DIR}/
opens
tack/tempest/tempest_multisite.conf
;;
"odl-sfc")
ODL_SFC_DIR=${REPOS_DIR}/sfc/tests/functest/odl-sfc
;;
"odl-sfc")
ODL_SFC_DIR=${REPOS_DIR}/sfc/tests/functest/odl-sfc
diff --git
a/functest/ci/testcases.yaml
b/functest/ci/testcases.yaml
index
e5424a6
..
ae6e16d
100755
(executable)
--- a/
functest/ci/testcases.yaml
+++ b/
functest/ci/testcases.yaml
@@
-38,7
+38,7
@@
tiers:
installer: ''
scenario: '^((?!bgpvpn|odl_l3).)*$'
run:
installer: ''
scenario: '^((?!bgpvpn|odl_l3).)*$'
run:
- module: 'functest.opnfv_tests.
OpenStack.vP
ing.vping_ssh'
+ module: 'functest.opnfv_tests.
openstack.vp
ing.vping_ssh'
class: 'VPingSSH'
-
class: 'VPingSSH'
-
@@
-52,7
+52,7
@@
tiers:
installer: ''
scenario: '^((?!lxd).)*$'
run:
installer: ''
scenario: '^((?!lxd).)*$'
run:
- module: 'functest.opnfv_tests.
OpenStack.vP
ing.vping_userdata'
+ module: 'functest.opnfv_tests.
openstack.vp
ing.vping_userdata'
class: 'VPingUserdata'
-
class: 'VPingUserdata'
-
@@
-99,8
+99,8
@@
tiers:
installer: ''
scenario: 'odl'
run:
installer: ''
scenario: 'odl'
run:
- module: 'functest.opnfv_tests.
Controllers.ODL.OpenDaylightTesting
'
- class: 'ODLTest
Case
s'
+ module: 'functest.opnfv_tests.
sdn.odl.odl
'
+ class: 'ODLTests'
-
name: onos
-
name: onos
@@
-153,7
+153,7
@@
tiers:
scenario: 'bgpvpn'
run:
module: 'functest.opnfv_tests.features.sdnvpn'
scenario: 'bgpvpn'
run:
module: 'functest.opnfv_tests.features.sdnvpn'
- class: 'S
DNVPN
'
+ class: 'S
dnVpnTests
'
-
name: security_scan
-
name: security_scan
@@
-203,7
+203,7
@@
tiers:
scenario: ''
run:
module: 'functest.opnfv_tests.features.domino'
scenario: ''
run:
module: 'functest.opnfv_tests.features.domino'
- class: 'Domino
Case
s'
+ class: 'Domino
Test
s'
-
name: odl-sfc
criteria: 'status == "PASS"'
-
name: odl-sfc
criteria: 'status == "PASS"'
@@
-232,7
+232,7
@@
tiers:
installer: 'fuel'
scenario: '^((?!bgpvpn|noha).)*$'
run:
installer: 'fuel'
scenario: '^((?!bgpvpn|noha).)*$'
run:
- module: 'functest.opnfv_tests.vnf.
vRNC
.parser'
+ module: 'functest.opnfv_tests.vnf.
rnc
.parser'
class: 'Parser'
-
name: openstack
class: 'Parser'
-
name: openstack
diff --git
a/functest/opnfv_tests/features/domino.py
b/functest/opnfv_tests/features/domino.py
index
2deeb4c
..
30d33a1
100755
(executable)
--- a/
functest/opnfv_tests/features/domino.py
+++ b/
functest/opnfv_tests/features/domino.py
@@
-24,13
+24,13
@@
import functest.utils.functest_utils as ft_utils
import functest.utils.functest_constants as ft_constants
import functest.utils.functest_constants as ft_constants
-class Domino
Case
s(TestCasesBase.TestCasesBase):
+class Domino
Test
s(TestCasesBase.TestCasesBase):
DOMINO_REPO = ft_constants.DOMINO_REPO
RESULTS_DIR = ft_constants.FUNCTEST_RESULTS_DIR
logger = ft_logger.Logger("domino").getLogger()
def __init__(self):
DOMINO_REPO = ft_constants.DOMINO_REPO
RESULTS_DIR = ft_constants.FUNCTEST_RESULTS_DIR
logger = ft_logger.Logger("domino").getLogger()
def __init__(self):
- super(Domino
Case
s, self).__init__()
+ super(Domino
Test
s, self).__init__()
self.project_name = "domino"
self.case_name = "domino-multinode"
self.project_name = "domino"
self.case_name = "domino-multinode"
@@
-72,7
+72,7
@@
if __name__ == '__main__':
help="Create json result file",
action="store_true")
args = vars(parser.parse_args())
help="Create json result file",
action="store_true")
args = vars(parser.parse_args())
- domino = Domino
Case
s()
+ domino = Domino
Test
s()
try:
result = domino.main(**args)
if result != TestCasesBase.TestCasesBase.EX_OK:
try:
result = domino.main(**args)
if result != TestCasesBase.TestCasesBase.EX_OK:
diff --git
a/functest/opnfv_tests/features/sdnvpn.py
b/functest/opnfv_tests/features/sdnvpn.py
index
efc67b0
..
719d4fb
100644
(file)
--- a/
functest/opnfv_tests/features/sdnvpn.py
+++ b/
functest/opnfv_tests/features/sdnvpn.py
@@
-20,14
+20,14
@@
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
import functest.utils.functest_utils as ft_utils
-class S
DNVPN
(TestCasesBase.TestCasesBase):
+class S
dnVpnTests
(TestCasesBase.TestCasesBase):
SDNVPN_REPO = ft_constants.SDNVPN_REPO_DIR
SDNVPN_REPO_TESTS = os.path.join(SDNVPN_REPO, "tests/functest")
RESULTS_DIR = ft_constants.FUNCTEST_RESULTS_DIR
logger = ft_logger.Logger("sdnvpn").getLogger()
def __init__(self):
SDNVPN_REPO = ft_constants.SDNVPN_REPO_DIR
SDNVPN_REPO_TESTS = os.path.join(SDNVPN_REPO, "tests/functest")
RESULTS_DIR = ft_constants.FUNCTEST_RESULTS_DIR
logger = ft_logger.Logger("sdnvpn").getLogger()
def __init__(self):
- super(S
DNVPN
, self).__init__()
+ super(S
dnVpnTests
, self).__init__()
self.project_name = "sdnvpn"
self.case_name = "bgpvpn"
self.project_name = "sdnvpn"
self.case_name = "bgpvpn"
@@
-69,7
+69,7
@@
if __name__ == '__main__':
help="Create json result file",
action="store_true")
args = vars(parser.parse_args())
help="Create json result file",
action="store_true")
args = vars(parser.parse_args())
- sdnvpn = S
DNVPN
()
+ sdnvpn = S
dnVpnTests
()
try:
result = sdnvpn.main(**args)
if result != TestCasesBase.TestCasesBase.EX_OK:
try:
result = sdnvpn.main(**args)
if result != TestCasesBase.TestCasesBase.EX_OK:
diff --git
a/functest/opnfv_tests/Controllers/ODL/__init__.py
b/functest/opnfv_tests/openstack/__init__.py
similarity index 100%
rename from
functest/opnfv_tests/Controllers/ODL/__init__.py
rename to
functest/opnfv_tests/openstack/__init__.py
diff --git
a/functest/opnfv_tests/OpenStack/examples/create_instance_and_ip.py
b/functest/opnfv_tests/openstack/examples/create_instance_and_ip.py
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/examples/create_instance_and_ip.py
rename to
functest/opnfv_tests/openstack/examples/create_instance_and_ip.py
diff --git
a/functest/opnfv_tests/OpenStack/healthcheck/healthcheck.sh
b/functest/opnfv_tests/openstack/healthcheck/healthcheck.sh
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/healthcheck/healthcheck.sh
rename to
functest/opnfv_tests/openstack/healthcheck/healthcheck.sh
diff --git
a/functest/opnfv_tests/OpenStack/rally/blacklist.txt
b/functest/opnfv_tests/openstack/rally/blacklist.txt
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/blacklist.txt
rename to
functest/opnfv_tests/openstack/rally/blacklist.txt
diff --git
a/functest/opnfv_tests/OpenStack/rally/macro/macro.yaml
b/functest/opnfv_tests/openstack/rally/macro/macro.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/macro/macro.yaml
rename to
functest/opnfv_tests/openstack/rally/macro/macro.yaml
diff --git
a/functest/opnfv_tests/OpenStack/rally/run_rally-cert.py
b/functest/opnfv_tests/openstack/rally/run_rally-cert.py
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/run_rally-cert.py
rename to
functest/opnfv_tests/openstack/rally/run_rally-cert.py
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-cinder.yaml
b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-cinder.yaml
rename to
functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-heat.yaml
b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-heat.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-heat.yaml
rename to
functest/opnfv_tests/openstack/rally/scenario/full/opnfv-heat.yaml
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-neutron.yaml
b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-neutron.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-neutron.yaml
rename to
functest/opnfv_tests/openstack/rally/scenario/full/opnfv-neutron.yaml
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-nova.yaml
b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-nova.yaml
rename to
functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-authenticate.yaml
b/functest/opnfv_tests/openstack/rally/scenario/opnfv-authenticate.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/opnfv-authenticate.yaml
rename to
functest/opnfv_tests/openstack/rally/scenario/opnfv-authenticate.yaml
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-glance.yaml
b/functest/opnfv_tests/openstack/rally/scenario/opnfv-glance.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/opnfv-glance.yaml
rename to
functest/opnfv_tests/openstack/rally/scenario/opnfv-glance.yaml
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-keystone.yaml
b/functest/opnfv_tests/openstack/rally/scenario/opnfv-keystone.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/opnfv-keystone.yaml
rename to
functest/opnfv_tests/openstack/rally/scenario/opnfv-keystone.yaml
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-quotas.yaml
b/functest/opnfv_tests/openstack/rally/scenario/opnfv-quotas.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/opnfv-quotas.yaml
rename to
functest/opnfv_tests/openstack/rally/scenario/opnfv-quotas.yaml
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-requests.yaml
b/functest/opnfv_tests/openstack/rally/scenario/opnfv-requests.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/opnfv-requests.yaml
rename to
functest/opnfv_tests/openstack/rally/scenario/opnfv-requests.yaml
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-vm.yaml
b/functest/opnfv_tests/openstack/rally/scenario/opnfv-vm.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/opnfv-vm.yaml
rename to
functest/opnfv_tests/openstack/rally/scenario/opnfv-vm.yaml
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-cinder.yaml
b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-cinder.yaml
rename to
functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-heat.yaml
b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-heat.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-heat.yaml
rename to
functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-heat.yaml
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-neutron.yaml
b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-neutron.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-neutron.yaml
rename to
functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-neutron.yaml
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-nova.yaml
b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-nova.yaml
rename to
functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/support/instance_dd_test.sh
b/functest/opnfv_tests/openstack/rally/scenario/support/instance_dd_test.sh
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/support/instance_dd_test.sh
rename to
functest/opnfv_tests/openstack/rally/scenario/support/instance_dd_test.sh
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template
b/functest/opnfv_tests/openstack/rally/scenario/templates/autoscaling_policy.yaml.template
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template
rename to
functest/opnfv_tests/openstack/rally/scenario/templates/autoscaling_policy.yaml.template
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/templates/default.yaml.template
b/functest/opnfv_tests/openstack/rally/scenario/templates/default.yaml.template
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/templates/default.yaml.template
rename to
functest/opnfv_tests/openstack/rally/scenario/templates/default.yaml.template
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/templates/random_strings.yaml.template
b/functest/opnfv_tests/openstack/rally/scenario/templates/random_strings.yaml.template
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/templates/random_strings.yaml.template
rename to
functest/opnfv_tests/openstack/rally/scenario/templates/random_strings.yaml.template
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/templates/resource_group.yaml.template
b/functest/opnfv_tests/openstack/rally/scenario/templates/resource_group.yaml.template
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/templates/resource_group.yaml.template
rename to
functest/opnfv_tests/openstack/rally/scenario/templates/resource_group.yaml.template
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_ports.yaml.template
b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_ports.yaml.template
rename to
functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_volume.yaml.template
b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_volume.yaml.template
rename to
functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template
b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template
rename to
functest/opnfv_tests/openstack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template
b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_add.yaml.template
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template
rename to
functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_add.yaml.template
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template
b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_delete.yaml.template
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template
rename to
functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_delete.yaml.template
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template
b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_replace.yaml.template
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template
rename to
functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_replace.yaml.template
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template
b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_increase.yaml.template
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template
rename to
functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_increase.yaml.template
diff --git
a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template
b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_reduce.yaml.template
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template
rename to
functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_reduce.yaml.template
diff --git
a/functest/opnfv_tests/OpenStack/rally/task.yaml
b/functest/opnfv_tests/openstack/rally/task.yaml
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/rally/task.yaml
rename to
functest/opnfv_tests/openstack/rally/task.yaml
diff --git
a/functest/opnfv_tests/OpenStack/tempest/custom_tests/blacklist.txt
b/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/tempest/custom_tests/blacklist.txt
rename to
functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt
diff --git
a/functest/opnfv_tests/OpenStack/tempest/custom_tests/defcore_req.txt
b/functest/opnfv_tests/openstack/tempest/custom_tests/defcore_req.txt
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/tempest/custom_tests/defcore_req.txt
rename to
functest/opnfv_tests/openstack/tempest/custom_tests/defcore_req.txt
diff --git
a/functest/opnfv_tests/OpenStack/tempest/gen_tempest_conf.py
b/functest/opnfv_tests/openstack/tempest/gen_tempest_conf.py
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/tempest/gen_tempest_conf.py
rename to
functest/opnfv_tests/openstack/tempest/gen_tempest_conf.py
diff --git
a/functest/opnfv_tests/OpenStack/tempest/run_tempest.py
b/functest/opnfv_tests/openstack/tempest/run_tempest.py
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/tempest/run_tempest.py
rename to
functest/opnfv_tests/openstack/tempest/run_tempest.py
diff --git
a/functest/opnfv_tests/Controllers/ONOS/Teston/__init__.py
b/functest/opnfv_tests/openstack/vping/__init__.py
similarity index 100%
rename from
functest/opnfv_tests/Controllers/ONOS/Teston/__init__.py
rename to
functest/opnfv_tests/openstack/vping/__init__.py
diff --git
a/functest/opnfv_tests/OpenStack/vPing/ping.sh
b/functest/opnfv_tests/openstack/vping/ping.sh
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/vPing/ping.sh
rename to
functest/opnfv_tests/openstack/vping/ping.sh
diff --git
a/functest/opnfv_tests/OpenStack/vPing/vping_base.py
b/functest/opnfv_tests/openstack/vping/vping_base.py
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/vPing/vping_base.py
rename to
functest/opnfv_tests/openstack/vping/vping_base.py
diff --git
a/functest/opnfv_tests/OpenStack/vPing/vping_ssh.py
b/functest/opnfv_tests/openstack/vping/vping_ssh.py
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/vPing/vping_ssh.py
rename to
functest/opnfv_tests/openstack/vping/vping_ssh.py
diff --git
a/functest/opnfv_tests/OpenStack/vPing/vping_userdata.py
b/functest/opnfv_tests/openstack/vping/vping_userdata.py
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/vPing/vping_userdata.py
rename to
functest/opnfv_tests/openstack/vping/vping_userdata.py
diff --git
a/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/__init__.py
b/functest/opnfv_tests/sdn/__init__.py
similarity index 100%
rename from
functest/opnfv_tests/Controllers/ONOS/Teston/adapters/__init__.py
rename to
functest/opnfv_tests/sdn/__init__.py
diff --git
a/functest/opnfv_tests/Controllers/__init__.py
b/functest/opnfv_tests/sdn/odl/__init__.py
similarity index 100%
rename from
functest/opnfv_tests/Controllers/__init__.py
rename to
functest/opnfv_tests/sdn/odl/__init__.py
diff --git
a/functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py
b/functest/opnfv_tests/sdn/odl/odl.py
similarity index 99%
rename from
functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py
rename to
functest/opnfv_tests/sdn/odl/odl.py
index
b78db8b
..
c3fcb24
100755
(executable)
--- a/
functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py
+++ b/
functest/opnfv_tests/sdn/odl/odl.py
@@
-47,7
+47,7
@@
class ODLResultVisitor(ResultVisitor):
return self._data
return self._data
-class ODLTest
Case
s(TestCasesBase.TestCasesBase):
+class ODLTests(TestCasesBase.TestCasesBase):
repos = ft_constants.REPOS_DIR
odl_test_repo = os.path.join(repos, "odl_test")
repos = ft_constants.REPOS_DIR
odl_test_repo = os.path.join(repos, "odl_test")
@@
-230,7
+230,7
@@
if __name__ == '__main__':
action='store_true')
args = vars(parser.parse_args())
action='store_true')
args = vars(parser.parse_args())
- odl = ODLTest
Case
s()
+ odl = ODLTests()
try:
result = odl.main(**args)
if result != TestCasesBase.TestCasesBase.EX_OK:
try:
result = odl.main(**args)
if result != TestCasesBase.TestCasesBase.EX_OK:
diff --git
a/functest/opnfv_tests/Controllers/ONOS/Sfc/README.md
b/functest/opnfv_tests/sdn/onos/sfc/README.md
similarity index 100%
rename from
functest/opnfv_tests/Controllers/ONOS/Sfc/README.md
rename to
functest/opnfv_tests/sdn/onos/sfc/README.md
diff --git
a/functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc.py
b/functest/opnfv_tests/sdn/onos/sfc/sfc.py
similarity index 99%
rename from
functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc.py
rename to
functest/opnfv_tests/sdn/onos/sfc/sfc.py
index
e3f0804
..
2241227
100755
(executable)
--- a/
functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc.py
+++ b/
functest/opnfv_tests/sdn/onos/sfc/sfc.py
@@
-26,10
+26,10
@@
import time
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
import time
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
-from
Sfc_fun import Sfc_fun
+from
sfc_onos import SfcOnos
logger = ft_logger.Logger("sfc").getLogger()
logger = ft_logger.Logger("sfc").getLogger()
-Sfc_obj = Sfc
_fun
()
+Sfc_obj = Sfc
Onos
()
OK = 200
CREATED = 201
OK = 200
CREATED = 201
diff --git
a/functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc_fun.py
b/functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py
similarity index 99%
rename from
functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc_fun.py
rename to
functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py
index
69e076d
..
78bf6f4
100644
(file)
--- a/
functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc_fun.py
+++ b/
functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py
@@
-16,7
+16,7
@@
ACCEPTED = 202
NO_CONTENT = 204
NO_CONTENT = 204
-class Sfc
_fun
:
+class Sfc
Onos
:
"""Defines all the def function of SFC."""
def __init__(self):
"""Defines all the def function of SFC."""
def __init__(self):
diff --git
a/functest/opnfv_tests/Controllers/ONOS/Teston/Readme.txt
b/functest/opnfv_tests/sdn/onos/teston/Readme.txt
similarity index 100%
rename from
functest/opnfv_tests/Controllers/ONOS/Teston/Readme.txt
rename to
functest/opnfv_tests/sdn/onos/teston/Readme.txt
diff --git
a/functest/opnfv_tests/OpenStack/__init__.py
b/functest/opnfv_tests/sdn/onos/teston/__init__.py
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/__init__.py
rename to
functest/opnfv_tests/sdn/onos/teston/__init__.py
diff --git
a/functest/opnfv_tests/OpenStack/vPing/__init__.py
b/functest/opnfv_tests/sdn/onos/teston/adapters/__init__.py
similarity index 100%
rename from
functest/opnfv_tests/OpenStack/vPing/__init__.py
rename to
functest/opnfv_tests/sdn/onos/teston/adapters/__init__.py
diff --git
a/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/client.py
b/functest/opnfv_tests/sdn/onos/teston/adapters/client.py
similarity index 95%
rename from
functest/opnfv_tests/Controllers/ONOS/Teston/adapters/client.py
rename to
functest/opnfv_tests/sdn/onos/teston/adapters/client.py
index
6b3285e
..
81d5f7d
100644
(file)
--- a/
functest/opnfv_tests/Controllers/ONOS/Teston/adapters/client.py
+++ b/
functest/opnfv_tests/sdn/onos/teston/adapters/client.py
@@
-15,17
+15,17
@@
import pexpect
import requests
import time
import requests
import time
-from environment import
e
nvironment
+from environment import
E
nvironment
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_logger as ft_logger
-class
client(e
nvironment):
+class
Client(E
nvironment):
logger = ft_logger.Logger("client").getLogger()
def __init__(self):
logger = ft_logger.Logger("client").getLogger()
def __init__(self):
-
e
nvironment.__init__(self)
- self.loginfo =
e
nvironment()
+
E
nvironment.__init__(self)
+ self.loginfo =
E
nvironment()
self.testcase = ''
def RunScript(self, handle, testname, timeout=300):
self.testcase = ''
def RunScript(self, handle, testname, timeout=300):
diff --git
a/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/connection.py
b/functest/opnfv_tests/sdn/onos/teston/adapters/connection.py
similarity index 98%
rename from
functest/opnfv_tests/Controllers/ONOS/Teston/adapters/connection.py
rename to
functest/opnfv_tests/sdn/onos/teston/adapters/connection.py
index
b2a2e3d
..
3786945
100644
(file)
--- a/
functest/opnfv_tests/Controllers/ONOS/Teston/adapters/connection.py
+++ b/
functest/opnfv_tests/sdn/onos/teston/adapters/connection.py
@@
-17,17
+17,17
@@
import os
import pexpect
import re
import pexpect
import re
-from foundation import
f
oundation
+from foundation import
F
oundation
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_logger as ft_logger
-class
connection(f
oundation):
+class
Connection(F
oundation):
logger = ft_logger.Logger("connection").getLogger()
def __init__(self):
logger = ft_logger.Logger("connection").getLogger()
def __init__(self):
-
f
oundation.__init__(self)
- self.loginfo =
f
oundation()
+
F
oundation.__init__(self)
+ self.loginfo =
F
oundation()
def AddKnownHost(self, handle, ipaddr, username, password):
"""
def AddKnownHost(self, handle, ipaddr, username, password):
"""
diff --git
a/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/environment.py
b/functest/opnfv_tests/sdn/onos/teston/adapters/environment.py
similarity index 98%
rename from
functest/opnfv_tests/Controllers/ONOS/Teston/adapters/environment.py
rename to
functest/opnfv_tests/sdn/onos/teston/adapters/environment.py
index
01f70b8
..
06d25b9
100644
(file)
--- a/
functest/opnfv_tests/Controllers/ONOS/Teston/adapters/environment.py
+++ b/
functest/opnfv_tests/sdn/onos/teston/adapters/environment.py
@@
-22,17
+22,17
@@
import os
import sys
import time
import sys
import time
-from connection import
c
onnection
+from connection import
C
onnection
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_logger as ft_logger
-class
environment(c
onnection):
+class
Environment(C
onnection):
logger = ft_logger.Logger("environment").getLogger()
def __init__(self):
logger = ft_logger.Logger("environment").getLogger()
def __init__(self):
-
c
onnection.__init__(self)
- self.loginfo =
c
onnection()
+
C
onnection.__init__(self)
+ self.loginfo =
C
onnection()
self.masterhandle = ''
self.home = ''
self.masterhandle = ''
self.home = ''
diff --git
a/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/foundation.py
b/functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py
similarity index 97%
rename from
functest/opnfv_tests/Controllers/ONOS/Teston/adapters/foundation.py
rename to
functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py
index
6f7a40f
..
52462b6
100644
(file)
--- a/
functest/opnfv_tests/Controllers/ONOS/Teston/adapters/foundation.py
+++ b/
functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py
@@
-21,13
+21,13
@@
import functest.utils.functest_constants as ft_constants
import functest.utils.functest_utils as ft_utils
import functest.utils.functest_utils as ft_utils
-class
f
oundation:
+class
F
oundation:
def __init__(self):
# currentpath = os.getcwd()
currentpath = \
def __init__(self):
# currentpath = os.getcwd()
currentpath = \
- ft_constants.FUNCTEST_TEST_DIR + '/
Controllers/ONOS/Teston/CI
'
+ ft_constants.FUNCTEST_TEST_DIR + '/
sdn/onos/teston/ci
'
self.cipath = currentpath
self.logdir = os.path.join(currentpath, 'log')
self.workhome = currentpath[0: currentpath.rfind('opnfv_tests') - 1]
self.cipath = currentpath
self.logdir = os.path.join(currentpath, 'log')
self.workhome = currentpath[0: currentpath.rfind('opnfv_tests') - 1]
diff --git
a/functest/opnfv_tests/Controllers/ONOS/Teston/dependencies/onos
b/functest/opnfv_tests/sdn/onos/teston/dependencies/onos
similarity index 100%
rename from
functest/opnfv_tests/Controllers/ONOS/Teston/dependencies/onos
rename to
functest/opnfv_tests/sdn/onos/teston/dependencies/onos
diff --git
a/functest/opnfv_tests/Controllers/ONOS/Teston/log/gitignore
b/functest/opnfv_tests/sdn/onos/teston/log/gitignore
similarity index 100%
rename from
functest/opnfv_tests/Controllers/ONOS/Teston/log/gitignore
rename to
functest/opnfv_tests/sdn/onos/teston/log/gitignore
diff --git
a/functest/opnfv_tests/Controllers/ONOS/Teston/onosfunctest.py
b/functest/opnfv_tests/sdn/onos/teston/onos.py
similarity index 100%
rename from
functest/opnfv_tests/Controllers/ONOS/Teston/onosfunctest.py
rename to
functest/opnfv_tests/sdn/onos/teston/onos.py
diff --git
a/functest/opnfv_tests/vnf/vIMS/clearwater.py
b/functest/opnfv_tests/vnf/ims/clearwater.py
similarity index 99%
rename from
functest/opnfv_tests/vnf/vIMS/clearwater.py
rename to
functest/opnfv_tests/vnf/ims/clearwater.py
index
7236f4f
..
eb0abac
100644
(file)
--- a/
functest/opnfv_tests/vnf/vIMS/clearwater.py
+++ b/
functest/opnfv_tests/vnf/ims/clearwater.py
@@
-12,7
+12,7
@@
########################################################################
########################################################################
-class
c
learwater:
+class
C
learwater:
def __init__(self, inputs={}, orchestrator=None, logger=None):
self.config = inputs
def __init__(self, inputs={}, orchestrator=None, logger=None):
self.config = inputs
diff --git
a/functest/opnfv_tests/vnf/vIMS/create_venv.sh
b/functest/opnfv_tests/vnf/ims/create_venv.sh
similarity index 100%
rename from
functest/opnfv_tests/vnf/vIMS/create_venv.sh
rename to
functest/opnfv_tests/vnf/ims/create_venv.sh
diff --git
a/functest/opnfv_tests/vnf/vIMS/orchestrator.py
b/functest/opnfv_tests/vnf/ims/orchestrator.py
similarity index 99%
rename from
functest/opnfv_tests/vnf/vIMS/orchestrator.py
rename to
functest/opnfv_tests/vnf/ims/orchestrator.py
index
61157a4
..
5f84df0
100644
(file)
--- a/
functest/opnfv_tests/vnf/vIMS/orchestrator.py
+++ b/
functest/opnfv_tests/vnf/ims/orchestrator.py
@@
-21,7
+21,7
@@
from git import Repo
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_logger as ft_logger
-class
o
rchestrator:
+class
O
rchestrator:
def __init__(self, testcase_dir, inputs={}):
self.testcase_dir = testcase_dir
def __init__(self, testcase_dir, inputs={}):
self.testcase_dir = testcase_dir
diff --git
a/functest/opnfv_tests/vnf/vIMS/requirements.pip
b/functest/opnfv_tests/vnf/ims/requirements.pip
similarity index 100%
rename from
functest/opnfv_tests/vnf/vIMS/requirements.pip
rename to
functest/opnfv_tests/vnf/ims/requirements.pip
diff --git
a/functest/opnfv_tests/vnf/vIMS/vIMS.py
b/functest/opnfv_tests/vnf/ims/vims.py
similarity index 98%
rename from
functest/opnfv_tests/vnf/vIMS/vIMS.py
rename to
functest/opnfv_tests/vnf/ims/vims.py
index
4cc8ce3
..
fe888b6
100755
(executable)
--- a/
functest/opnfv_tests/vnf/vIMS/vIMS.py
+++ b/
functest/opnfv_tests/vnf/ims/vims.py
@@
-27,8
+27,8
@@
from neutronclient.v2_0 import client as ntclient
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
import functest.utils.openstack_utils as os_utils
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
import functest.utils.openstack_utils as os_utils
-from clearwater import
c
learwater
-from orchestrator import
o
rchestrator
+from clearwater import
C
learwater
+from orchestrator import
O
rchestrator
import functest.utils.functest_constants as ft_constants
pp = pprint.PrettyPrinter(indent=4)
import functest.utils.functest_constants as ft_constants
pp = pprint.PrettyPrinter(indent=4)
@@
-49,7
+49,7
@@
logger = ft_logger.Logger("vIMS").getLogger()
# Cloudify parameters
# Cloudify parameters
-VIMS_DIR = os.path.join(ft_constants.FUNCTEST_TEST_DIR, 'vnf/
vIMS
/')
+VIMS_DIR = os.path.join(ft_constants.FUNCTEST_TEST_DIR, 'vnf/
ims
/')
VIMS_DATA_DIR = ft_constants.VIMS_DATA_DIR
VIMS_TEST_DIR = ft_constants.VIMS_TEST_DIR
VIMS_TENANT_NAME = ft_constants.VIMS_TENANT_NAME
VIMS_DATA_DIR = ft_constants.VIMS_DATA_DIR
VIMS_TEST_DIR = ft_constants.VIMS_TEST_DIR
VIMS_TENANT_NAME = ft_constants.VIMS_TENANT_NAME
@@
-328,7
+328,7
@@
def main():
public_auth_url = keystone.service_catalog.url_for(
service_type='identity', endpoint_type='publicURL')
public_auth_url = keystone.service_catalog.url_for(
service_type='identity', endpoint_type='publicURL')
- cfy =
o
rchestrator(VIMS_DATA_DIR, CFY_INPUTS)
+ cfy =
O
rchestrator(VIMS_DATA_DIR, CFY_INPUTS)
cfy.set_credentials(username=ks_creds['username'], password=ks_creds[
'password'], tenant_name=ks_creds['tenant_name'],
cfy.set_credentials(username=ks_creds['username'], password=ks_creds[
'password'], tenant_name=ks_creds['tenant_name'],
@@
-413,7
+413,7
@@
def main():
# ############### CLEARWATER INITIALISATION ################
# ############### CLEARWATER INITIALISATION ################
- cw =
c
learwater(CW_INPUTS, cfy, logger)
+ cw =
C
learwater(CW_INPUTS, cfy, logger)
logger.info("Collect flavor id for all clearwater vm")
nova = nvclient.Client("2", **nv_creds)
logger.info("Collect flavor id for all clearwater vm")
nova = nvclient.Client("2", **nv_creds)
diff --git
a/functest/opnfv_tests/vnf/vRNC/__init__.py
b/functest/opnfv_tests/vnf/rnc/__init__.py
similarity index 100%
rename from
functest/opnfv_tests/vnf/vRNC/__init__.py
rename to
functest/opnfv_tests/vnf/rnc/__init__.py
diff --git
a/functest/opnfv_tests/vnf/vRNC/parser.py
b/functest/opnfv_tests/vnf/rnc/parser.py
old mode 100755
(executable)
new mode 100644
(file)
similarity index 100%
rename from
functest/opnfv_tests/vnf/vRNC/parser.py
rename to
functest/opnfv_tests/vnf/rnc/parser.py
diff --git
a/functest/tests/unit/odl/test_odl.py
b/functest/tests/unit/odl/test_odl.py
index
fdd4576
..
46707e8
100644
(file)
--- a/
functest/tests/unit/odl/test_odl.py
+++ b/
functest/tests/unit/odl/test_odl.py
@@
-16,11
+16,11
@@
import unittest
from robot.errors import RobotError
from functest.core import TestCasesBase
from robot.errors import RobotError
from functest.core import TestCasesBase
-from functest.opnfv_tests.
Controllers.ODL import OpenDaylightTesting
+from functest.opnfv_tests.
sdn.odl import odl
from functest.utils import functest_constants as ft_constants
from functest.utils import functest_constants as ft_constants
-class ODLTest
CasesTest
ing(unittest.TestCase):
+class ODLTesting(unittest.TestCase):
logging.disable(logging.CRITICAL)
logging.disable(logging.CRITICAL)
@@
-39,7
+39,7
@@
class ODLTestCasesTesting(unittest.TestCase):
ft_constants.OS_USERNAME = self._os_username
ft_constants.OS_PASSWORD = self._os_password
ft_constants.OS_TENANT_NAME = self._os_tenantname
ft_constants.OS_USERNAME = self._os_username
ft_constants.OS_PASSWORD = self._os_password
ft_constants.OS_TENANT_NAME = self._os_tenantname
- self.test =
OpenDaylightTesting.ODLTestCase
s()
+ self.test =
odl.ODLTest
s()
@mock.patch('fileinput.input', side_effect=Exception())
def test_set_robotframework_vars_failed(self, *args):
@mock.patch('fileinput.input', side_effect=Exception())
def test_set_robotframework_vars_failed(self, *args):
@@
-53,9
+53,9
@@
class ODLTestCasesTesting(unittest.TestCase):
def _fake_url_for(cls, service_type='identity', **kwargs):
if service_type == 'identity':
return "http://{}:5000/v2.0".format(
def _fake_url_for(cls, service_type='identity', **kwargs):
if service_type == 'identity':
return "http://{}:5000/v2.0".format(
- ODLTest
CasesTest
ing._keystone_ip)
+ ODLTesting._keystone_ip)
elif service_type == 'network':
elif service_type == 'network':
- return "http://{}:9696".format(ODLTest
CasesTest
ing._neutron_ip)
+ return "http://{}:9696".format(ODLTesting._neutron_ip)
else:
return None
else:
return None
@@
-85,7
+85,7
@@
class ODLTestCasesTesting(unittest.TestCase):
def _test_main(self, status, *args):
kwargs = self._get_main_kwargs()
self.assertEqual(self.test.main(**kwargs), status)
def _test_main(self, status, *args):
kwargs = self._get_main_kwargs()
self.assertEqual(self.test.main(**kwargs), status)
- odl_res_dir =
OpenDaylightTesting.ODLTestCase
s.res_dir
+ odl_res_dir =
odl.ODLTest
s.res_dir
if len(args) > 0:
args[0].assert_called_once_with(odl_res_dir)
if len(args) > 1:
if len(args) > 0:
args[0].assert_called_once_with(odl_res_dir)
if len(args) > 1:
@@
-99,8
+99,8
@@
class ODLTestCasesTesting(unittest.TestCase):
'RESTCONFPORT:{}'.format(self._odl_restconfport)]
output_file = os.path.join(odl_res_dir, 'output.xml')
args[1].assert_called_once_with(
'RESTCONFPORT:{}'.format(self._odl_restconfport)]
output_file = os.path.join(odl_res_dir, 'output.xml')
args[1].assert_called_once_with(
-
OpenDaylightTesting.ODLTestCase
s.basic_suite_dir,
-
OpenDaylightTesting.ODLTestCase
s.neutron_suite_dir,
+
odl.ODLTest
s.basic_suite_dir,
+
odl.ODLTest
s.neutron_suite_dir,
log='NONE',
output=output_file,
report='NONE',
log='NONE',
output=output_file,
report='NONE',
diff --git
a/run_unit_tests.sh
b/run_unit_tests.sh
index
dc5a501
..
6283691
100755
(executable)
--- a/
run_unit_tests.sh
+++ b/
run_unit_tests.sh
@@
-56,7
+56,7
@@
nosetests --with-xunit \
--with-coverage \
--cover-erase \
--cover-package=functest.core.TestCasesBase \
--with-coverage \
--cover-erase \
--cover-package=functest.core.TestCasesBase \
- --cover-package=functest.opnfv_tests.
Controllers.ODL.OpenDaylightTesting
\
+ --cover-package=functest.opnfv_tests.
sdn.odl.odl
\
--cover-xml \
--cover-html \
functest/tests/unit
--cover-xml \
--cover-html \
functest/tests/unit