diff --git a/.zuul.yaml b/.zuul.yaml index 7675ddffe..e798776a8 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -33,7 +33,7 @@ - compute2 - job: - name: tacker-functional-devstack-multinode-python3 + name: tacker-functional-devstack-multinode-legacy parent: devstack description: | Base multinodes job for devstack-based functional tests @@ -157,7 +157,7 @@ # Tacker services tacker: true tacker-conductor: true - tox_envlist: dsvm-functional + tox_envlist: dsvm-functional-legacy group-vars: compute: # Since a VirtualInterfaceCreateException occurs during a test, @@ -205,6 +205,15 @@ # To override the parent job's definitions. tls-proxy: false +- job: + name: tacker-functional-devstack-multinode-sol + parent: tacker-functional-devstack-multinode-legacy + description: | + Multinodes job for SOL devstack-based functional tests + host-vars: + controller-tacker: + tox_envlist: dsvm-functional-sol + - project: templates: - check-requirements @@ -215,4 +224,5 @@ - release-notes-jobs-python3 check: jobs: - - tacker-functional-devstack-multinode-python3 + - tacker-functional-devstack-multinode-legacy + - tacker-functional-devstack-multinode-sol diff --git a/tacker/tests/etc/samples/etsi/nfv/functional3/BaseHOT/simple/helloworld3.yaml b/tacker/tests/etc/samples/etsi/nfv/functional3/BaseHOT/simple/helloworld3.yaml index 7ba4a057b..9629e779d 100644 --- a/tacker/tests/etc/samples/etsi/nfv/functional3/BaseHOT/simple/helloworld3.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/functional3/BaseHOT/simple/helloworld3.yaml @@ -39,6 +39,7 @@ resources: adjustment_type: change_in_capacity VDU2_scale_group: type: OS::Heat::AutoScalingGroup + depends_on: VDU1_scale_group properties: min_size: 2 max_size: 2 diff --git a/tacker/tests/functional/nfvo/__init__.py b/tacker/tests/functional/legacy/__init__.py similarity index 100% rename from tacker/tests/functional/nfvo/__init__.py rename to tacker/tests/functional/legacy/__init__.py diff --git a/tacker/tests/functional/vnflcm/__init__.py b/tacker/tests/functional/legacy/nfvo/__init__.py similarity index 100% rename from tacker/tests/functional/vnflcm/__init__.py rename to tacker/tests/functional/legacy/nfvo/__init__.py diff --git a/tacker/tests/functional/nfvo/test_nfvo.py b/tacker/tests/functional/legacy/nfvo/test_nfvo.py similarity index 100% rename from tacker/tests/functional/nfvo/test_nfvo.py rename to tacker/tests/functional/legacy/nfvo/test_nfvo.py diff --git a/tacker/tests/functional/nfvo/test_vim.py b/tacker/tests/functional/legacy/nfvo/test_vim.py similarity index 100% rename from tacker/tests/functional/nfvo/test_vim.py rename to tacker/tests/functional/legacy/nfvo/test_vim.py diff --git a/tacker/tests/functional/vnfm/__init__.py b/tacker/tests/functional/legacy/vnfm/__init__.py similarity index 100% rename from tacker/tests/functional/vnfm/__init__.py rename to tacker/tests/functional/legacy/vnfm/__init__.py diff --git a/tacker/tests/functional/vnfm/test_tosca_vnf.py b/tacker/tests/functional/legacy/vnfm/test_tosca_vnf.py similarity index 100% rename from tacker/tests/functional/vnfm/test_tosca_vnf.py rename to tacker/tests/functional/legacy/vnfm/test_tosca_vnf.py diff --git a/tacker/tests/functional/vnfm/test_tosca_vnf_alarm.py b/tacker/tests/functional/legacy/vnfm/test_tosca_vnf_alarm.py similarity index 100% rename from tacker/tests/functional/vnfm/test_tosca_vnf_alarm.py rename to tacker/tests/functional/legacy/vnfm/test_tosca_vnf_alarm.py diff --git a/tacker/tests/functional/vnfm/test_tosca_vnf_block_storage.py b/tacker/tests/functional/legacy/vnfm/test_tosca_vnf_block_storage.py similarity index 100% rename from tacker/tests/functional/vnfm/test_tosca_vnf_block_storage.py rename to tacker/tests/functional/legacy/vnfm/test_tosca_vnf_block_storage.py diff --git a/tacker/tests/functional/vnfm/test_tosca_vnf_floatingip.py b/tacker/tests/functional/legacy/vnfm/test_tosca_vnf_floatingip.py similarity index 100% rename from tacker/tests/functional/vnfm/test_tosca_vnf_floatingip.py rename to tacker/tests/functional/legacy/vnfm/test_tosca_vnf_floatingip.py diff --git a/tacker/tests/functional/vnfm/test_tosca_vnf_maintenance.py b/tacker/tests/functional/legacy/vnfm/test_tosca_vnf_maintenance.py similarity index 100% rename from tacker/tests/functional/vnfm/test_tosca_vnf_maintenance.py rename to tacker/tests/functional/legacy/vnfm/test_tosca_vnf_maintenance.py diff --git a/tacker/tests/functional/vnfm/test_tosca_vnf_multiple_vdu.py b/tacker/tests/functional/legacy/vnfm/test_tosca_vnf_multiple_vdu.py similarity index 100% rename from tacker/tests/functional/vnfm/test_tosca_vnf_multiple_vdu.py rename to tacker/tests/functional/legacy/vnfm/test_tosca_vnf_multiple_vdu.py diff --git a/tacker/tests/functional/vnfm/test_tosca_vnf_reservation.py b/tacker/tests/functional/legacy/vnfm/test_tosca_vnf_reservation.py similarity index 100% rename from tacker/tests/functional/vnfm/test_tosca_vnf_reservation.py rename to tacker/tests/functional/legacy/vnfm/test_tosca_vnf_reservation.py diff --git a/tacker/tests/functional/vnfm/test_tosca_vnf_scale.py b/tacker/tests/functional/legacy/vnfm/test_tosca_vnf_scale.py similarity index 100% rename from tacker/tests/functional/vnfm/test_tosca_vnf_scale.py rename to tacker/tests/functional/legacy/vnfm/test_tosca_vnf_scale.py diff --git a/tacker/tests/functional/vnfm/test_tosca_vnfc.py b/tacker/tests/functional/legacy/vnfm/test_tosca_vnfc.py similarity index 98% rename from tacker/tests/functional/vnfm/test_tosca_vnfc.py rename to tacker/tests/functional/legacy/vnfm/test_tosca_vnfc.py index 9c615b27a..51a04e8ea 100644 --- a/tacker/tests/functional/vnfm/test_tosca_vnfc.py +++ b/tacker/tests/functional/legacy/vnfm/test_tosca_vnfc.py @@ -36,7 +36,7 @@ class VnfTestToscaVNFC(base.BaseTackerTest): input_yaml = read_file('sample_tosca_vnfc.yaml') tosca_dict = yaml.safe_load(input_yaml) path = os.path.abspath(os.path.join( - os.path.dirname(__file__), "../../etc/samples")) + os.path.dirname(__file__), "../../../etc/samples")) vnfd_name = 'sample-tosca-vnfc' tosca_dict['topology_template']['node_templates' ]['firewall_vnfc' diff --git a/tacker/tests/functional/vnfm/test_tosca_vnfd.py b/tacker/tests/functional/legacy/vnfm/test_tosca_vnfd.py similarity index 100% rename from tacker/tests/functional/vnfm/test_tosca_vnfd.py rename to tacker/tests/functional/legacy/vnfm/test_tosca_vnfd.py diff --git a/tacker/tests/functional/vnfm/test_vnf.py b/tacker/tests/functional/legacy/vnfm/test_vnf.py similarity index 100% rename from tacker/tests/functional/vnfm/test_vnf.py rename to tacker/tests/functional/legacy/vnfm/test_vnf.py diff --git a/tacker/tests/functional/vnfm/test_vnf_monitoring.py b/tacker/tests/functional/legacy/vnfm/test_vnf_monitoring.py similarity index 100% rename from tacker/tests/functional/vnfm/test_vnf_monitoring.py rename to tacker/tests/functional/legacy/vnfm/test_vnf_monitoring.py diff --git a/tacker/tests/functional/vnfm/test_vnf_placement_policy.py b/tacker/tests/functional/legacy/vnfm/test_vnf_placement_policy.py similarity index 100% rename from tacker/tests/functional/vnfm/test_vnf_placement_policy.py rename to tacker/tests/functional/legacy/vnfm/test_vnf_placement_policy.py diff --git a/tacker/tests/functional/vnfm/test_vnfm_param.py b/tacker/tests/functional/legacy/vnfm/test_vnfm_param.py similarity index 100% rename from tacker/tests/functional/vnfm/test_vnfm_param.py rename to tacker/tests/functional/legacy/vnfm/test_vnfm_param.py diff --git a/tacker/tests/functional/vnfpkgm/__init__.py b/tacker/tests/functional/sol/__init__.py similarity index 100% rename from tacker/tests/functional/vnfpkgm/__init__.py rename to tacker/tests/functional/sol/__init__.py diff --git a/tacker/tests/functional/sol/vnflcm/__init__.py b/tacker/tests/functional/sol/vnflcm/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tacker/tests/functional/vnflcm/base.py b/tacker/tests/functional/sol/vnflcm/base.py similarity index 100% rename from tacker/tests/functional/vnflcm/base.py rename to tacker/tests/functional/sol/vnflcm/base.py diff --git a/tacker/tests/functional/vnflcm/fake_vnflcm.py b/tacker/tests/functional/sol/vnflcm/fake_vnflcm.py similarity index 100% rename from tacker/tests/functional/vnflcm/fake_vnflcm.py rename to tacker/tests/functional/sol/vnflcm/fake_vnflcm.py diff --git a/tacker/tests/functional/vnflcm/fake_vnfpkgm.py b/tacker/tests/functional/sol/vnflcm/fake_vnfpkgm.py similarity index 100% rename from tacker/tests/functional/vnflcm/fake_vnfpkgm.py rename to tacker/tests/functional/sol/vnflcm/fake_vnfpkgm.py diff --git a/tacker/tests/functional/vnflcm/test_kubernetes.py b/tacker/tests/functional/sol/vnflcm/test_kubernetes.py similarity index 99% rename from tacker/tests/functional/vnflcm/test_kubernetes.py rename to tacker/tests/functional/sol/vnflcm/test_kubernetes.py index 756f60ce7..7682519ba 100644 --- a/tacker/tests/functional/vnflcm/test_kubernetes.py +++ b/tacker/tests/functional/sol/vnflcm/test_kubernetes.py @@ -39,7 +39,7 @@ def _create_and_upload_vnf_package(tacker_client, csar_package_name, '/vnfpkgm/v1/vnf_packages', "POST", body=body) # upload vnf package - csar_package_path = "../../etc/samples/etsi/nfv/%s" % csar_package_name + csar_package_path = "../../../etc/samples/etsi/nfv/%s" % csar_package_name file_path = os.path.abspath(os.path.join(os.path.dirname(__file__), csar_package_path)) @@ -826,7 +826,7 @@ class VnfLcmTest(base.BaseTackerTest): self): instance_file_dir = os.path.join( os.path.dirname(os.path.abspath(__file__)), - '../../etc/samples/etsi/nfv/test_create_vnf_instance_' + '../../../etc/samples/etsi/nfv/test_create_vnf_instance_' 'and_instantiate_and_terminate_cnf_with_artifact_is_url/' ) artifact_file_dir = os.path.join( diff --git a/tacker/tests/functional/vnflcm/test_vnf_instance.py b/tacker/tests/functional/sol/vnflcm/test_vnf_instance.py similarity index 99% rename from tacker/tests/functional/vnflcm/test_vnf_instance.py rename to tacker/tests/functional/sol/vnflcm/test_vnf_instance.py index 44d309270..42d3ce989 100644 --- a/tacker/tests/functional/vnflcm/test_vnf_instance.py +++ b/tacker/tests/functional/sol/vnflcm/test_vnf_instance.py @@ -95,7 +95,7 @@ def _create_and_upload_vnf_package(tacker_client, csar_package_name, '/vnfpkgm/v1/vnf_packages', "POST", body=body) # upload vnf package - csar_package_path = "../../etc/samples/etsi/nfv/%s" % csar_package_name + csar_package_path = "../../../etc/samples/etsi/nfv/%s" % csar_package_name file_path = os.path.abspath(os.path.join(os.path.dirname(__file__), csar_package_path)) diff --git a/tacker/tests/functional/vnflcm/test_vnf_instance_with_user_data.py b/tacker/tests/functional/sol/vnflcm/test_vnf_instance_with_user_data.py similarity index 98% rename from tacker/tests/functional/vnflcm/test_vnf_instance_with_user_data.py rename to tacker/tests/functional/sol/vnflcm/test_vnf_instance_with_user_data.py index 23a987d4a..4d127d29a 100644 --- a/tacker/tests/functional/vnflcm/test_vnf_instance_with_user_data.py +++ b/tacker/tests/functional/sol/vnflcm/test_vnf_instance_with_user_data.py @@ -14,8 +14,8 @@ import os from oslo_utils import uuidutils from tacker.objects import fields -from tacker.tests.functional.vnflcm import base as vnflcm_base -from tacker.tests.functional.vnflcm import fake_vnflcm +from tacker.tests.functional.sol.vnflcm import base as vnflcm_base +from tacker.tests.functional.sol.vnflcm import fake_vnflcm import tempfile import time @@ -128,7 +128,7 @@ class VnfLcmWithUserDataTest(vnflcm_base.BaseVnfLcmTest): csar_package_path = os.path.abspath( os.path.join( os.path.dirname(__file__), - "../../etc/samples/etsi/nfv", + "../../../etc/samples/etsi/nfv", sample_name)) tempname, _ = vnflcm_base._create_csar_with_unique_vnfd_id( csar_package_path) @@ -260,7 +260,7 @@ class VnfLcmWithUserDataTest(vnflcm_base.BaseVnfLcmTest): csar_package_path = os.path.abspath( os.path.join( os.path.dirname(__file__), - "../../etc/samples/etsi/nfv", + "../../../etc/samples/etsi/nfv", sample_name)) tempname, _ = vnflcm_base._create_csar_with_unique_vnfd_id( csar_package_path) @@ -307,7 +307,7 @@ class VnfLcmWithUserDataTest(vnflcm_base.BaseVnfLcmTest): csar_package_path = os.path.abspath( os.path.join( os.path.dirname(__file__), - "../../etc/samples/etsi/nfv", + "../../../etc/samples/etsi/nfv", sample_name)) tempname, _ = vnflcm_base._create_csar_with_unique_vnfd_id( csar_package_path) @@ -403,7 +403,7 @@ class VnfLcmWithUserDataTest(vnflcm_base.BaseVnfLcmTest): csar_package_path = os.path.abspath( os.path.join( os.path.dirname(__file__), - "../../etc/samples/etsi/nfv", + "../../../etc/samples/etsi/nfv", sample_name)) tempname, _ = vnflcm_base._create_csar_with_unique_vnfd_id( csar_package_path) @@ -452,7 +452,7 @@ class VnfLcmWithUserDataTest(vnflcm_base.BaseVnfLcmTest): csar_package_path = os.path.abspath( os.path.join( os.path.dirname(__file__), - "../../etc/samples/etsi/nfv", + "../../../etc/samples/etsi/nfv", sample_name)) tempname, _ = vnflcm_base._create_csar_with_unique_vnfd_id( csar_package_path) @@ -512,7 +512,7 @@ class VnfLcmWithUserDataTest(vnflcm_base.BaseVnfLcmTest): csar_package_path = os.path.abspath( os.path.join( os.path.dirname(__file__), - "../../etc/samples/etsi/nfv", + "../../../etc/samples/etsi/nfv", sample_name)) tempname, _ = vnflcm_base._create_csar_user_data_common( csar_package_path) @@ -563,7 +563,7 @@ class VnfLcmWithUserDataTest(vnflcm_base.BaseVnfLcmTest): csar_package_path = os.path.abspath( os.path.join( os.path.dirname(__file__), - "../../etc/samples/etsi/nfv", + "../../../etc/samples/etsi/nfv", sample_name)) tempname, _ = vnflcm_base._create_csar_user_data_common( csar_package_path) @@ -616,7 +616,7 @@ class VnfLcmWithUserDataTest(vnflcm_base.BaseVnfLcmTest): csar_package_path = os.path.abspath( os.path.join( os.path.dirname(__file__), - "../../etc/samples/etsi/nfv", + "../../../etc/samples/etsi/nfv", sample_name)) tempname, _ = vnflcm_base._create_csar_user_data_common( csar_package_path) @@ -670,7 +670,7 @@ class VnfLcmWithUserDataTest(vnflcm_base.BaseVnfLcmTest): csar_package_path = os.path.abspath( os.path.join( os.path.dirname(__file__), - "../../etc/samples/etsi/nfv", + "../../../etc/samples/etsi/nfv", sample_name)) tempname, _ = vnflcm_base._create_csar_user_data_common( csar_package_path) @@ -725,7 +725,7 @@ class VnfLcmWithUserDataTest(vnflcm_base.BaseVnfLcmTest): csar_package_path = os.path.abspath( os.path.join( os.path.dirname(__file__), - "../../etc/samples/etsi/nfv", + "../../../etc/samples/etsi/nfv", sample_name)) tempname, _ = vnflcm_base._create_csar_user_data_common( csar_package_path) @@ -796,7 +796,7 @@ class VnfLcmWithUserDataTest(vnflcm_base.BaseVnfLcmTest): csar_package_path = os.path.abspath( os.path.join( os.path.dirname(__file__), - "../../etc/samples/etsi/nfv", + "../../../etc/samples/etsi/nfv", sample_name)) tempname, _ = vnflcm_base._create_csar_with_unique_vnfd_id( csar_package_path) @@ -891,7 +891,7 @@ class VnfLcmWithUserDataTest(vnflcm_base.BaseVnfLcmTest): csar_package_path = os.path.abspath( os.path.join( os.path.dirname(__file__), - "../../etc/samples/etsi/nfv", + "../../../etc/samples/etsi/nfv", sample_name)) tempname, _ = vnflcm_base._create_csar_with_unique_vnfd_id( csar_package_path) diff --git a/tacker/tests/functional/sol/vnfpkgm/__init__.py b/tacker/tests/functional/sol/vnfpkgm/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tacker/tests/functional/vnfpkgm/test_vnf_package.py b/tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py similarity index 99% rename from tacker/tests/functional/vnfpkgm/test_vnf_package.py rename to tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py index a7fb3c5df..6d805dc20 100644 --- a/tacker/tests/functional/vnfpkgm/test_vnf_package.py +++ b/tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py @@ -159,7 +159,7 @@ class VnfPackageTest(base.BaseTackerTest): def _get_csar_dir_path(self, csar_name): csar_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), - "../../etc/samples/etsi/nfv", csar_name)) + "../../../etc/samples/etsi/nfv", csar_name)) return csar_dir def _create_and_upload_vnf(self, sample_name): diff --git a/tox.ini b/tox.ini index fdfa97ad8..9a64b10a3 100644 --- a/tox.ini +++ b/tox.ini @@ -40,6 +40,18 @@ setenv = {[testenv]setenv} commands = stestr --test-path=./tacker/tests/functional run --slowest --concurrency 2 {posargs} +[testenv:dsvm-functional-legacy] +setenv = {[testenv]setenv} + +commands = + stestr --test-path=./tacker/tests/functional/legacy run --slowest --concurrency 1 {posargs} + +[testenv:dsvm-functional-sol] +setenv = {[testenv]setenv} + +commands = + stestr --test-path=./tacker/tests/functional/sol run --slowest --concurrency 1 {posargs} + [testenv:debug] commands = oslo_debug_helper {posargs}