diff --git a/tacker/tests/unit/db/utils.py b/tacker/tests/unit/db/utils.py index 2268c3895..93ae4441c 100644 --- a/tacker/tests/unit/db/utils.py +++ b/tacker/tests/unit/db/utils.py @@ -21,7 +21,7 @@ import yaml def _get_template(name): filename = os.path.join( os.path.dirname(os.path.abspath(__file__)), - "../vm/infra_drivers/openstack/data/", name) + "../vnfm/infra_drivers/openstack/data/", name) f = codecs.open(filename, encoding='utf-8', errors='strict') return f.read() diff --git a/tacker/tests/unit/vm/__init__.py b/tacker/tests/unit/nfvo/__init__.py similarity index 100% rename from tacker/tests/unit/vm/__init__.py rename to tacker/tests/unit/nfvo/__init__.py diff --git a/tacker/tests/unit/vm/infra_drivers/__init__.py b/tacker/tests/unit/nfvo/drivers/__init__.py similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/__init__.py rename to tacker/tests/unit/nfvo/drivers/__init__.py diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/__init__.py b/tacker/tests/unit/nfvo/drivers/vim/__init__.py similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/__init__.py rename to tacker/tests/unit/nfvo/drivers/vim/__init__.py diff --git a/tacker/tests/unit/vm/nfvo/drivers/vim/test_openstack_driver.py b/tacker/tests/unit/nfvo/drivers/vim/test_openstack_driver.py similarity index 100% rename from tacker/tests/unit/vm/nfvo/drivers/vim/test_openstack_driver.py rename to tacker/tests/unit/nfvo/drivers/vim/test_openstack_driver.py diff --git a/tacker/tests/unit/vm/monitor_drivers/__init__.py b/tacker/tests/unit/nfvo/drivers/vnffg/__init__.py similarity index 100% rename from tacker/tests/unit/vm/monitor_drivers/__init__.py rename to tacker/tests/unit/nfvo/drivers/vnffg/__init__.py diff --git a/tacker/tests/unit/vm/monitor_drivers/http_ping/__init__.py b/tacker/tests/unit/nfvo/drivers/vnffg/sfc_drivers/__init__.py similarity index 100% rename from tacker/tests/unit/vm/monitor_drivers/http_ping/__init__.py rename to tacker/tests/unit/nfvo/drivers/vnffg/sfc_drivers/__init__.py diff --git a/tacker/tests/unit/vm/monitor_drivers/ping/__init__.py b/tacker/tests/unit/nfvo/drivers/vnffg/sfc_drivers/networking-sfc/__init__.py similarity index 100% rename from tacker/tests/unit/vm/monitor_drivers/ping/__init__.py rename to tacker/tests/unit/nfvo/drivers/vnffg/sfc_drivers/networking-sfc/__init__.py diff --git a/tacker/tests/unit/vm/nfvo/drivers/vnffg/sfc_drivers/networking-sfc/test_n_sfc.py b/tacker/tests/unit/nfvo/drivers/vnffg/sfc_drivers/networking-sfc/test_n_sfc.py similarity index 100% rename from tacker/tests/unit/vm/nfvo/drivers/vnffg/sfc_drivers/networking-sfc/test_n_sfc.py rename to tacker/tests/unit/nfvo/drivers/vnffg/sfc_drivers/networking-sfc/test_n_sfc.py diff --git a/tacker/tests/unit/vm/nfvo/__init__.py b/tacker/tests/unit/nfvo/drivers/workflow/__init__.py similarity index 100% rename from tacker/tests/unit/vm/nfvo/__init__.py rename to tacker/tests/unit/nfvo/drivers/workflow/__init__.py diff --git a/tacker/tests/unit/vm/nfvo/drivers/workflow/test_mistral.py b/tacker/tests/unit/nfvo/drivers/workflow/test_mistral.py similarity index 100% rename from tacker/tests/unit/vm/nfvo/drivers/workflow/test_mistral.py rename to tacker/tests/unit/nfvo/drivers/workflow/test_mistral.py diff --git a/tacker/tests/unit/vm/nfvo/test_nfvo_plugin.py b/tacker/tests/unit/nfvo/test_nfvo_plugin.py similarity index 99% rename from tacker/tests/unit/vm/nfvo/test_nfvo_plugin.py rename to tacker/tests/unit/nfvo/test_nfvo_plugin.py index a0560aeae..a73795214 100644 --- a/tacker/tests/unit/vm/nfvo/test_nfvo_plugin.py +++ b/tacker/tests/unit/nfvo/test_nfvo_plugin.py @@ -48,7 +48,7 @@ def dummy_get_vim(*args, **kwargs): def _get_template(name): filename = os.path.abspath(os.path.join(os.path.dirname(__file__), - '../../../etc/samples/' + str(name))) + '../../etc/samples/' + str(name))) f = codecs.open(filename, encoding='utf-8', errors='strict') return f.read() diff --git a/tacker/tests/unit/vm/test_alarm_receiver.py b/tacker/tests/unit/test_alarm_receiver.py similarity index 100% rename from tacker/tests/unit/vm/test_alarm_receiver.py rename to tacker/tests/unit/test_alarm_receiver.py diff --git a/tacker/tests/unit/vm/test_tosca_templates_under_samples.py b/tacker/tests/unit/test_tosca_templates_under_samples.py similarity index 97% rename from tacker/tests/unit/vm/test_tosca_templates_under_samples.py rename to tacker/tests/unit/test_tosca_templates_under_samples.py index b8c8fe195..3b9c05efd 100644 --- a/tacker/tests/unit/vm/test_tosca_templates_under_samples.py +++ b/tacker/tests/unit/test_tosca_templates_under_samples.py @@ -33,7 +33,7 @@ class TestSamples(testtools.TestCase): def _get_list_of_sample(self, tosca_files): if tosca_files: base_path = (os.path.dirname(os.path.abspath(__file__)) + - '/../../../../samples/tosca-templates/vnfd/') + '/../../../samples/tosca-templates/vnfd/') if isinstance(tosca_files, list): list_of_samples = [] for tosca_file in tosca_files: diff --git a/tacker/tests/unit/vm/nfvo/drivers/workflow/__init__.py b/tacker/tests/unit/vm/nfvo/drivers/workflow/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tacker/tests/unit/vm/nfvo/drivers/__init__.py b/tacker/tests/unit/vnfm/infra_drivers/__init__.py similarity index 100% rename from tacker/tests/unit/vm/nfvo/drivers/__init__.py rename to tacker/tests/unit/vnfm/infra_drivers/__init__.py diff --git a/tacker/tests/unit/vm/nfvo/drivers/vim/__init__.py b/tacker/tests/unit/vnfm/infra_drivers/openstack/__init__.py similarity index 100% rename from tacker/tests/unit/vm/nfvo/drivers/vim/__init__.py rename to tacker/tests/unit/vnfm/infra_drivers/openstack/__init__.py diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/config_data.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/config_data.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/config_data.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/config_data.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_alarm_scale_custom.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_alarm_scale_custom.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_alarm_scale_custom.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_alarm_scale_custom.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_flavor.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_flavor.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_flavor.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_flavor.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_flavor_and_capabilities.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_flavor_and_capabilities.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_flavor_and_capabilities.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_flavor_and_capabilities.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_flavor_defaults.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_flavor_defaults.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_flavor_defaults.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_flavor_defaults.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_flavor_no_units.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_flavor_no_units.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_flavor_no_units.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_flavor_no_units.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_image_after_processed_image.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_image_after_processed_image.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_image_after_processed_image.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_image_after_processed_image.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_image_before_processed_image.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_image_before_processed_image.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_image_before_processed_image.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_image_before_processed_image.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt_ipparams.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt_ipparams.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt_ipparams.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt_ipparams.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt_params.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt_params.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_openwrt_params.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_openwrt_params.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_scale_custom.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_scale_custom.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_scale_custom.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_scale_custom.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_scale_main.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_scale_main.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_scale_main.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_scale_main.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm_metadata.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_alarm_metadata.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm_metadata.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_alarm_metadata.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm_respawn.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_alarm_respawn.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm_respawn.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_alarm_respawn.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm_scale.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_alarm_scale.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm_scale.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_alarm_scale.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_flavor_all_numa_count.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_flavor_all_numa_count.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_flavor_all_numa_count.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_flavor_all_numa_count.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_flavor_all_numa_nodes.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_flavor_all_numa_nodes.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_flavor_all_numa_nodes.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_flavor_all_numa_nodes.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_flavor_cpu_allocations.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_flavor_cpu_allocations.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_flavor_cpu_allocations.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_flavor_cpu_allocations.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_flavor_huge_pages.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_flavor_huge_pages.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_flavor_huge_pages.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_flavor_huge_pages.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_flavor_numa_nodes.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_flavor_numa_nodes.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_flavor_numa_nodes.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_flavor_numa_nodes.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_flavor_numa_nodes_count.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_flavor_numa_nodes_count.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_flavor_numa_nodes_count.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_flavor_numa_nodes_count.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_generic_vnfd_params.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_generic_vnfd_params.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_generic_vnfd_params.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_generic_vnfd_params.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_image.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_image.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_image.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_image.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_mac_ip.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_mac_ip.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_mac_ip.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_mac_ip.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_mgmt_sriov.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_mgmt_sriov.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_mgmt_sriov.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_mgmt_sriov.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_openwrt.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_openwrt.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_openwrt.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_openwrt.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_openwrt_kilo.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_openwrt_kilo.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_openwrt_kilo.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_openwrt_kilo.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_openwrt_userdata.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_openwrt_userdata.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_openwrt_userdata.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_openwrt_userdata.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_security_groups.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_security_groups.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_security_groups.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_security_groups.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_sriov.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_sriov.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_sriov.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_sriov.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_vnfc.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_vnfc.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_vnfc.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_vnfc.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_vnic_normal.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_vnic_normal.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_vnic_normal.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/hot_tosca_vnic_normal.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_flavor.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_flavor.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_flavor_and_capabilities.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_and_capabilities.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_flavor_and_capabilities.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_and_capabilities.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_flavor_defaults.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_defaults.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_flavor_defaults.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_defaults.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_flavor_no_units.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_no_units.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_flavor_no_units.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_no_units.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_image.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_image.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_image.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_image.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_mac_ip.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_mac_ip.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_mac_ip.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_mac_ip.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_openwrt.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_openwrt.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_openwrt.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_openwrt.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_openwrt_userdata.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_openwrt_userdata.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_openwrt_userdata.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_openwrt_userdata.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_security_groups.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_security_groups.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_security_groups.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_security_groups.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_vnfc.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfc.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_vnfc.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfc.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_respawn.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_respawn.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_respawn.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_respawn.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_scale.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_scale.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_scale.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_scale.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_metadata.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_metadata.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_metadata.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_metadata.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_respawn.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_respawn.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_respawn.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_respawn.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_scale.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_scale.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm_scale.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_alarm_scale.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_flavor_all_numa_count.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_flavor_all_numa_count.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_flavor_all_numa_count.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_flavor_all_numa_count.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_flavor_all_numa_nodes.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_flavor_all_numa_nodes.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_flavor_all_numa_nodes.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_flavor_all_numa_nodes.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_flavor_cpu_allocations.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_flavor_cpu_allocations.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_flavor_cpu_allocations.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_flavor_cpu_allocations.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_flavor_huge_pages.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_flavor_huge_pages.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_flavor_huge_pages.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_flavor_huge_pages.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_flavor_numa_nodes.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_flavor_numa_nodes.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_flavor_numa_nodes.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_flavor_numa_nodes.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_flavor_numa_nodes_count.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_flavor_numa_nodes_count.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_flavor_numa_nodes_count.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_flavor_numa_nodes_count.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_generic_vnfd_params.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_generic_vnfd_params.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_generic_vnfd_params.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_generic_vnfd_params.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_invalid_vnffgd_template.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_invalid_vnffgd_template.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_invalid_vnffgd_template.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_invalid_vnffgd_template.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_mgmt_sriov.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_mgmt_sriov.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_mgmt_sriov.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_mgmt_sriov.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_nsd_template.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_nsd_template.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_nsd_template.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_nsd_template.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_scale.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_scale.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_scale.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_scale.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_sriov.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_sriov.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_sriov.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_sriov.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_vnffgd_param_template.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_vnffgd_param_template.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_vnffgd_param_template.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_vnffgd_param_template.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_vnffgd_template.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_vnffgd_template.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_vnffgd_template.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_vnffgd_template.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_vnic_port.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_vnic_port.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_vnic_port.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/tosca_vnic_port.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/update_config_data.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/update_config_data.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/update_config_data.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/update_config_data.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/vnffg_params.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/vnffg_params.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/vnffg_params.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/vnffg_params.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/vnffgd_template.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/vnffgd_template.yaml similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/data/vnffgd_template.yaml rename to tacker/tests/unit/vnfm/infra_drivers/openstack/data/vnffgd_template.yaml diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/test_openstack.py b/tacker/tests/unit/vnfm/infra_drivers/openstack/test_openstack.py similarity index 100% rename from tacker/tests/unit/vm/infra_drivers/openstack/test_openstack.py rename to tacker/tests/unit/vnfm/infra_drivers/openstack/test_openstack.py diff --git a/tacker/tests/unit/vm/nfvo/drivers/vnffg/__init__.py b/tacker/tests/unit/vnfm/monitor_drivers/__init__.py similarity index 100% rename from tacker/tests/unit/vm/nfvo/drivers/vnffg/__init__.py rename to tacker/tests/unit/vnfm/monitor_drivers/__init__.py diff --git a/tacker/tests/unit/vm/nfvo/drivers/vnffg/sfc_drivers/__init__.py b/tacker/tests/unit/vnfm/monitor_drivers/http_ping/__init__.py similarity index 100% rename from tacker/tests/unit/vm/nfvo/drivers/vnffg/sfc_drivers/__init__.py rename to tacker/tests/unit/vnfm/monitor_drivers/http_ping/__init__.py diff --git a/tacker/tests/unit/vm/monitor_drivers/http_ping/test_http_ping.py b/tacker/tests/unit/vnfm/monitor_drivers/http_ping/test_http_ping.py similarity index 100% rename from tacker/tests/unit/vm/monitor_drivers/http_ping/test_http_ping.py rename to tacker/tests/unit/vnfm/monitor_drivers/http_ping/test_http_ping.py diff --git a/tacker/tests/unit/vm/nfvo/drivers/vnffg/sfc_drivers/networking-sfc/__init__.py b/tacker/tests/unit/vnfm/monitor_drivers/ping/__init__.py similarity index 100% rename from tacker/tests/unit/vm/nfvo/drivers/vnffg/sfc_drivers/networking-sfc/__init__.py rename to tacker/tests/unit/vnfm/monitor_drivers/ping/__init__.py diff --git a/tacker/tests/unit/vm/monitor_drivers/ping/test_ping.py b/tacker/tests/unit/vnfm/monitor_drivers/ping/test_ping.py similarity index 100% rename from tacker/tests/unit/vm/monitor_drivers/ping/test_ping.py rename to tacker/tests/unit/vnfm/monitor_drivers/ping/test_ping.py diff --git a/tacker/tests/unit/vm/test_monitor.py b/tacker/tests/unit/vnfm/test_monitor.py similarity index 100% rename from tacker/tests/unit/vm/test_monitor.py rename to tacker/tests/unit/vnfm/test_monitor.py diff --git a/tacker/tests/unit/vm/test_plugin.py b/tacker/tests/unit/vnfm/test_plugin.py similarity index 100% rename from tacker/tests/unit/vm/test_plugin.py rename to tacker/tests/unit/vnfm/test_plugin.py diff --git a/tacker/tests/unit/vm/test_vim_client.py b/tacker/tests/unit/vnfm/test_vim_client.py similarity index 100% rename from tacker/tests/unit/vm/test_vim_client.py rename to tacker/tests/unit/vnfm/test_vim_client.py diff --git a/tacker/tests/unit/vm/test_toscautils.py b/tacker/tests/unit/vnfm/tosca/test_utils.py similarity index 100% rename from tacker/tests/unit/vm/test_toscautils.py rename to tacker/tests/unit/vnfm/tosca/test_utils.py