diff --git a/senlin_tempest_plugin/tempest/README.rst b/senlin_tempest_plugin/README.rst similarity index 85% rename from senlin_tempest_plugin/tempest/README.rst rename to senlin_tempest_plugin/README.rst index 7d2a96a..483c10c 100644 --- a/senlin_tempest_plugin/tempest/README.rst +++ b/senlin_tempest_plugin/README.rst @@ -14,7 +14,7 @@ To run only these tests in tempest, go to tempest directory, then run:: To run a single test case, go to tempest directory, then run with test case name, e.g.:: - $ ./run_tempest.sh -N -- senlin.tests.tempest.api.test_cluster_basic.TestClusterBasic.test_cluster_create_delete + $ ./run_tempest.sh -N -- senlin_tempest_plugin.tempest.api.test_cluster_basic.TestClusterBasic.test_cluster_create_delete If you can't find run_tempest.sh script in tempest directory, that means the script has been removed in a certain version. Then you can use "nosetests -v" to replace "./run_tempest.sh -N" in above command. diff --git a/senlin_tempest_plugin/tempest/__init__.py b/senlin_tempest_plugin/api/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/__init__.py rename to senlin_tempest_plugin/api/__init__.py diff --git a/senlin_tempest_plugin/tempest/api/__init__.py b/senlin_tempest_plugin/api/actions/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/__init__.py rename to senlin_tempest_plugin/api/actions/__init__.py diff --git a/senlin_tempest_plugin/tempest/api/actions/test_action_list.py b/senlin_tempest_plugin/api/actions/test_action_list.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/actions/test_action_list.py rename to senlin_tempest_plugin/api/actions/test_action_list.py diff --git a/senlin_tempest_plugin/tempest/api/actions/test_action_list_negative.py b/senlin_tempest_plugin/api/actions/test_action_list_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/actions/test_action_list_negative.py rename to senlin_tempest_plugin/api/actions/test_action_list_negative.py diff --git a/senlin_tempest_plugin/tempest/api/actions/test_action_show.py b/senlin_tempest_plugin/api/actions/test_action_show.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/actions/test_action_show.py rename to senlin_tempest_plugin/api/actions/test_action_show.py diff --git a/senlin_tempest_plugin/tempest/api/actions/test_action_show_negative.py b/senlin_tempest_plugin/api/actions/test_action_show_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/actions/test_action_show_negative.py rename to senlin_tempest_plugin/api/actions/test_action_show_negative.py diff --git a/senlin_tempest_plugin/tempest/api/actions/__init__.py b/senlin_tempest_plugin/api/api_versions/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/actions/__init__.py rename to senlin_tempest_plugin/api/api_versions/__init__.py diff --git a/senlin_tempest_plugin/tempest/api/api_versions/test_api_version_show.py b/senlin_tempest_plugin/api/api_versions/test_api_version_show.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/api_versions/test_api_version_show.py rename to senlin_tempest_plugin/api/api_versions/test_api_version_show.py diff --git a/senlin_tempest_plugin/tempest/api/api_versions/test_api_version_show_negative.py b/senlin_tempest_plugin/api/api_versions/test_api_version_show_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/api_versions/test_api_version_show_negative.py rename to senlin_tempest_plugin/api/api_versions/test_api_version_show_negative.py diff --git a/senlin_tempest_plugin/tempest/api/api_versions/test_api_versions_list.py b/senlin_tempest_plugin/api/api_versions/test_api_versions_list.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/api_versions/test_api_versions_list.py rename to senlin_tempest_plugin/api/api_versions/test_api_versions_list.py diff --git a/senlin_tempest_plugin/tempest/api/base.py b/senlin_tempest_plugin/api/base.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/base.py rename to senlin_tempest_plugin/api/base.py diff --git a/senlin_tempest_plugin/tempest/api/api_versions/__init__.py b/senlin_tempest_plugin/api/build_info/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/api_versions/__init__.py rename to senlin_tempest_plugin/api/build_info/__init__.py diff --git a/senlin_tempest_plugin/tempest/api/build_info/test_build_info.py b/senlin_tempest_plugin/api/build_info/test_build_info.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/build_info/test_build_info.py rename to senlin_tempest_plugin/api/build_info/test_build_info.py diff --git a/senlin_tempest_plugin/tempest/api/build_info/__init__.py b/senlin_tempest_plugin/api/cluster_policies/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/build_info/__init__.py rename to senlin_tempest_plugin/api/cluster_policies/__init__.py diff --git a/senlin_tempest_plugin/tempest/api/cluster_policies/test_cluster_policy_list.py b/senlin_tempest_plugin/api/cluster_policies/test_cluster_policy_list.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/cluster_policies/test_cluster_policy_list.py rename to senlin_tempest_plugin/api/cluster_policies/test_cluster_policy_list.py diff --git a/senlin_tempest_plugin/tempest/api/cluster_policies/test_cluster_policy_list_negative.py b/senlin_tempest_plugin/api/cluster_policies/test_cluster_policy_list_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/cluster_policies/test_cluster_policy_list_negative.py rename to senlin_tempest_plugin/api/cluster_policies/test_cluster_policy_list_negative.py diff --git a/senlin_tempest_plugin/tempest/api/cluster_policies/test_cluster_policy_show.py b/senlin_tempest_plugin/api/cluster_policies/test_cluster_policy_show.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/cluster_policies/test_cluster_policy_show.py rename to senlin_tempest_plugin/api/cluster_policies/test_cluster_policy_show.py diff --git a/senlin_tempest_plugin/tempest/api/cluster_policies/test_cluster_policy_show_negative.py b/senlin_tempest_plugin/api/cluster_policies/test_cluster_policy_show_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/cluster_policies/test_cluster_policy_show_negative.py rename to senlin_tempest_plugin/api/cluster_policies/test_cluster_policy_show_negative.py diff --git a/senlin_tempest_plugin/tempest/api/cluster_policies/__init__.py b/senlin_tempest_plugin/api/clusters/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/cluster_policies/__init__.py rename to senlin_tempest_plugin/api/clusters/__init__.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_action_negative.py b/senlin_tempest_plugin/api/clusters/test_cluster_action_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_action_negative.py rename to senlin_tempest_plugin/api/clusters/test_cluster_action_negative.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_add_nodes.py b/senlin_tempest_plugin/api/clusters/test_cluster_add_nodes.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_add_nodes.py rename to senlin_tempest_plugin/api/clusters/test_cluster_add_nodes.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_check.py b/senlin_tempest_plugin/api/clusters/test_cluster_check.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_check.py rename to senlin_tempest_plugin/api/clusters/test_cluster_check.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_collect.py b/senlin_tempest_plugin/api/clusters/test_cluster_collect.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_collect.py rename to senlin_tempest_plugin/api/clusters/test_cluster_collect.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_create.py b/senlin_tempest_plugin/api/clusters/test_cluster_create.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_create.py rename to senlin_tempest_plugin/api/clusters/test_cluster_create.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_create_negative.py b/senlin_tempest_plugin/api/clusters/test_cluster_create_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_create_negative.py rename to senlin_tempest_plugin/api/clusters/test_cluster_create_negative.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_del_nodes.py b/senlin_tempest_plugin/api/clusters/test_cluster_del_nodes.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_del_nodes.py rename to senlin_tempest_plugin/api/clusters/test_cluster_del_nodes.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_delete.py b/senlin_tempest_plugin/api/clusters/test_cluster_delete.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_delete.py rename to senlin_tempest_plugin/api/clusters/test_cluster_delete.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_delete_negative.py b/senlin_tempest_plugin/api/clusters/test_cluster_delete_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_delete_negative.py rename to senlin_tempest_plugin/api/clusters/test_cluster_delete_negative.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_list.py b/senlin_tempest_plugin/api/clusters/test_cluster_list.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_list.py rename to senlin_tempest_plugin/api/clusters/test_cluster_list.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_list_negative.py b/senlin_tempest_plugin/api/clusters/test_cluster_list_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_list_negative.py rename to senlin_tempest_plugin/api/clusters/test_cluster_list_negative.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_policy_attach.py b/senlin_tempest_plugin/api/clusters/test_cluster_policy_attach.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_policy_attach.py rename to senlin_tempest_plugin/api/clusters/test_cluster_policy_attach.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_policy_detach.py b/senlin_tempest_plugin/api/clusters/test_cluster_policy_detach.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_policy_detach.py rename to senlin_tempest_plugin/api/clusters/test_cluster_policy_detach.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_policy_update.py b/senlin_tempest_plugin/api/clusters/test_cluster_policy_update.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_policy_update.py rename to senlin_tempest_plugin/api/clusters/test_cluster_policy_update.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_recover.py b/senlin_tempest_plugin/api/clusters/test_cluster_recover.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_recover.py rename to senlin_tempest_plugin/api/clusters/test_cluster_recover.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_replace_nodes.py b/senlin_tempest_plugin/api/clusters/test_cluster_replace_nodes.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_replace_nodes.py rename to senlin_tempest_plugin/api/clusters/test_cluster_replace_nodes.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_resize.py b/senlin_tempest_plugin/api/clusters/test_cluster_resize.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_resize.py rename to senlin_tempest_plugin/api/clusters/test_cluster_resize.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_scale_in.py b/senlin_tempest_plugin/api/clusters/test_cluster_scale_in.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_scale_in.py rename to senlin_tempest_plugin/api/clusters/test_cluster_scale_in.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_scale_out.py b/senlin_tempest_plugin/api/clusters/test_cluster_scale_out.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_scale_out.py rename to senlin_tempest_plugin/api/clusters/test_cluster_scale_out.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_show.py b/senlin_tempest_plugin/api/clusters/test_cluster_show.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_show.py rename to senlin_tempest_plugin/api/clusters/test_cluster_show.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_show_negative.py b/senlin_tempest_plugin/api/clusters/test_cluster_show_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_show_negative.py rename to senlin_tempest_plugin/api/clusters/test_cluster_show_negative.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_update.py b/senlin_tempest_plugin/api/clusters/test_cluster_update.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_update.py rename to senlin_tempest_plugin/api/clusters/test_cluster_update.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_update_negative.py b/senlin_tempest_plugin/api/clusters/test_cluster_update_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_update_negative.py rename to senlin_tempest_plugin/api/clusters/test_cluster_update_negative.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/test_cluster_update_profile.py b/senlin_tempest_plugin/api/clusters/test_cluster_update_profile.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/test_cluster_update_profile.py rename to senlin_tempest_plugin/api/clusters/test_cluster_update_profile.py diff --git a/senlin_tempest_plugin/tempest/api/clusters/__init__.py b/senlin_tempest_plugin/api/events/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/clusters/__init__.py rename to senlin_tempest_plugin/api/events/__init__.py diff --git a/senlin_tempest_plugin/tempest/api/events/test_event_list.py b/senlin_tempest_plugin/api/events/test_event_list.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/events/test_event_list.py rename to senlin_tempest_plugin/api/events/test_event_list.py diff --git a/senlin_tempest_plugin/tempest/api/events/test_event_list_negative.py b/senlin_tempest_plugin/api/events/test_event_list_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/events/test_event_list_negative.py rename to senlin_tempest_plugin/api/events/test_event_list_negative.py diff --git a/senlin_tempest_plugin/tempest/api/events/test_event_show.py b/senlin_tempest_plugin/api/events/test_event_show.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/events/test_event_show.py rename to senlin_tempest_plugin/api/events/test_event_show.py diff --git a/senlin_tempest_plugin/tempest/api/events/test_event_show_negative.py b/senlin_tempest_plugin/api/events/test_event_show_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/events/test_event_show_negative.py rename to senlin_tempest_plugin/api/events/test_event_show_negative.py diff --git a/senlin_tempest_plugin/tempest/api/events/__init__.py b/senlin_tempest_plugin/api/nodes/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/events/__init__.py rename to senlin_tempest_plugin/api/nodes/__init__.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/test_node_action_negative.py b/senlin_tempest_plugin/api/nodes/test_node_action_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/test_node_action_negative.py rename to senlin_tempest_plugin/api/nodes/test_node_action_negative.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/test_node_check.py b/senlin_tempest_plugin/api/nodes/test_node_check.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/test_node_check.py rename to senlin_tempest_plugin/api/nodes/test_node_check.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/test_node_create.py b/senlin_tempest_plugin/api/nodes/test_node_create.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/test_node_create.py rename to senlin_tempest_plugin/api/nodes/test_node_create.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/test_node_create_negative.py b/senlin_tempest_plugin/api/nodes/test_node_create_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/test_node_create_negative.py rename to senlin_tempest_plugin/api/nodes/test_node_create_negative.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/test_node_delete.py b/senlin_tempest_plugin/api/nodes/test_node_delete.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/test_node_delete.py rename to senlin_tempest_plugin/api/nodes/test_node_delete.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/test_node_delete_negative.py b/senlin_tempest_plugin/api/nodes/test_node_delete_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/test_node_delete_negative.py rename to senlin_tempest_plugin/api/nodes/test_node_delete_negative.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/test_node_list.py b/senlin_tempest_plugin/api/nodes/test_node_list.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/test_node_list.py rename to senlin_tempest_plugin/api/nodes/test_node_list.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/test_node_list_negative.py b/senlin_tempest_plugin/api/nodes/test_node_list_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/test_node_list_negative.py rename to senlin_tempest_plugin/api/nodes/test_node_list_negative.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/test_node_operation.py b/senlin_tempest_plugin/api/nodes/test_node_operation.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/test_node_operation.py rename to senlin_tempest_plugin/api/nodes/test_node_operation.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/test_node_recover.py b/senlin_tempest_plugin/api/nodes/test_node_recover.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/test_node_recover.py rename to senlin_tempest_plugin/api/nodes/test_node_recover.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/test_node_show.py b/senlin_tempest_plugin/api/nodes/test_node_show.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/test_node_show.py rename to senlin_tempest_plugin/api/nodes/test_node_show.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/test_node_show_negative.py b/senlin_tempest_plugin/api/nodes/test_node_show_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/test_node_show_negative.py rename to senlin_tempest_plugin/api/nodes/test_node_show_negative.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/test_node_update.py b/senlin_tempest_plugin/api/nodes/test_node_update.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/test_node_update.py rename to senlin_tempest_plugin/api/nodes/test_node_update.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/test_node_update_negative.py b/senlin_tempest_plugin/api/nodes/test_node_update_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/test_node_update_negative.py rename to senlin_tempest_plugin/api/nodes/test_node_update_negative.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/test_node_update_profile.py b/senlin_tempest_plugin/api/nodes/test_node_update_profile.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/test_node_update_profile.py rename to senlin_tempest_plugin/api/nodes/test_node_update_profile.py diff --git a/senlin_tempest_plugin/tempest/api/nodes/__init__.py b/senlin_tempest_plugin/api/policies/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/nodes/__init__.py rename to senlin_tempest_plugin/api/policies/__init__.py diff --git a/senlin_tempest_plugin/tempest/api/policies/test_policy_create.py b/senlin_tempest_plugin/api/policies/test_policy_create.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policies/test_policy_create.py rename to senlin_tempest_plugin/api/policies/test_policy_create.py diff --git a/senlin_tempest_plugin/tempest/api/policies/test_policy_create_negative.py b/senlin_tempest_plugin/api/policies/test_policy_create_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policies/test_policy_create_negative.py rename to senlin_tempest_plugin/api/policies/test_policy_create_negative.py diff --git a/senlin_tempest_plugin/tempest/api/policies/test_policy_delete.py b/senlin_tempest_plugin/api/policies/test_policy_delete.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policies/test_policy_delete.py rename to senlin_tempest_plugin/api/policies/test_policy_delete.py diff --git a/senlin_tempest_plugin/tempest/api/policies/test_policy_delete_negative.py b/senlin_tempest_plugin/api/policies/test_policy_delete_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policies/test_policy_delete_negative.py rename to senlin_tempest_plugin/api/policies/test_policy_delete_negative.py diff --git a/senlin_tempest_plugin/tempest/api/policies/test_policy_list.py b/senlin_tempest_plugin/api/policies/test_policy_list.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policies/test_policy_list.py rename to senlin_tempest_plugin/api/policies/test_policy_list.py diff --git a/senlin_tempest_plugin/tempest/api/policies/test_policy_list_negative.py b/senlin_tempest_plugin/api/policies/test_policy_list_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policies/test_policy_list_negative.py rename to senlin_tempest_plugin/api/policies/test_policy_list_negative.py diff --git a/senlin_tempest_plugin/tempest/api/policies/test_policy_show.py b/senlin_tempest_plugin/api/policies/test_policy_show.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policies/test_policy_show.py rename to senlin_tempest_plugin/api/policies/test_policy_show.py diff --git a/senlin_tempest_plugin/tempest/api/policies/test_policy_show_negative.py b/senlin_tempest_plugin/api/policies/test_policy_show_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policies/test_policy_show_negative.py rename to senlin_tempest_plugin/api/policies/test_policy_show_negative.py diff --git a/senlin_tempest_plugin/tempest/api/policies/test_policy_update.py b/senlin_tempest_plugin/api/policies/test_policy_update.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policies/test_policy_update.py rename to senlin_tempest_plugin/api/policies/test_policy_update.py diff --git a/senlin_tempest_plugin/tempest/api/policies/test_policy_update_negative.py b/senlin_tempest_plugin/api/policies/test_policy_update_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policies/test_policy_update_negative.py rename to senlin_tempest_plugin/api/policies/test_policy_update_negative.py diff --git a/senlin_tempest_plugin/tempest/api/policies/test_policy_validate.py b/senlin_tempest_plugin/api/policies/test_policy_validate.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policies/test_policy_validate.py rename to senlin_tempest_plugin/api/policies/test_policy_validate.py diff --git a/senlin_tempest_plugin/tempest/api/policies/test_policy_validate_negative.py b/senlin_tempest_plugin/api/policies/test_policy_validate_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policies/test_policy_validate_negative.py rename to senlin_tempest_plugin/api/policies/test_policy_validate_negative.py diff --git a/senlin_tempest_plugin/tempest/api/policies/__init__.py b/senlin_tempest_plugin/api/policy_types/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policies/__init__.py rename to senlin_tempest_plugin/api/policy_types/__init__.py diff --git a/senlin_tempest_plugin/tempest/api/policy_types/test_policy_type_list.py b/senlin_tempest_plugin/api/policy_types/test_policy_type_list.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policy_types/test_policy_type_list.py rename to senlin_tempest_plugin/api/policy_types/test_policy_type_list.py diff --git a/senlin_tempest_plugin/tempest/api/policy_types/test_policy_type_show.py b/senlin_tempest_plugin/api/policy_types/test_policy_type_show.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policy_types/test_policy_type_show.py rename to senlin_tempest_plugin/api/policy_types/test_policy_type_show.py diff --git a/senlin_tempest_plugin/tempest/api/policy_types/test_policy_type_show_negative.py b/senlin_tempest_plugin/api/policy_types/test_policy_type_show_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policy_types/test_policy_type_show_negative.py rename to senlin_tempest_plugin/api/policy_types/test_policy_type_show_negative.py diff --git a/senlin_tempest_plugin/tempest/api/policy_types/__init__.py b/senlin_tempest_plugin/api/profile_types/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/policy_types/__init__.py rename to senlin_tempest_plugin/api/profile_types/__init__.py diff --git a/senlin_tempest_plugin/tempest/api/profile_types/test_profile_type_list.py b/senlin_tempest_plugin/api/profile_types/test_profile_type_list.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profile_types/test_profile_type_list.py rename to senlin_tempest_plugin/api/profile_types/test_profile_type_list.py diff --git a/senlin_tempest_plugin/tempest/api/profile_types/test_profile_type_show.py b/senlin_tempest_plugin/api/profile_types/test_profile_type_show.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profile_types/test_profile_type_show.py rename to senlin_tempest_plugin/api/profile_types/test_profile_type_show.py diff --git a/senlin_tempest_plugin/tempest/api/profile_types/test_profile_type_show_negative.py b/senlin_tempest_plugin/api/profile_types/test_profile_type_show_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profile_types/test_profile_type_show_negative.py rename to senlin_tempest_plugin/api/profile_types/test_profile_type_show_negative.py diff --git a/senlin_tempest_plugin/tempest/api/profile_types/__init__.py b/senlin_tempest_plugin/api/profiles/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profile_types/__init__.py rename to senlin_tempest_plugin/api/profiles/__init__.py diff --git a/senlin_tempest_plugin/tempest/api/profiles/test_profile_create.py b/senlin_tempest_plugin/api/profiles/test_profile_create.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profiles/test_profile_create.py rename to senlin_tempest_plugin/api/profiles/test_profile_create.py diff --git a/senlin_tempest_plugin/tempest/api/profiles/test_profile_create_negative.py b/senlin_tempest_plugin/api/profiles/test_profile_create_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profiles/test_profile_create_negative.py rename to senlin_tempest_plugin/api/profiles/test_profile_create_negative.py diff --git a/senlin_tempest_plugin/tempest/api/profiles/test_profile_delete.py b/senlin_tempest_plugin/api/profiles/test_profile_delete.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profiles/test_profile_delete.py rename to senlin_tempest_plugin/api/profiles/test_profile_delete.py diff --git a/senlin_tempest_plugin/tempest/api/profiles/test_profile_delete_negative.py b/senlin_tempest_plugin/api/profiles/test_profile_delete_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profiles/test_profile_delete_negative.py rename to senlin_tempest_plugin/api/profiles/test_profile_delete_negative.py diff --git a/senlin_tempest_plugin/tempest/api/profiles/test_profile_list.py b/senlin_tempest_plugin/api/profiles/test_profile_list.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profiles/test_profile_list.py rename to senlin_tempest_plugin/api/profiles/test_profile_list.py diff --git a/senlin_tempest_plugin/tempest/api/profiles/test_profile_list_negative.py b/senlin_tempest_plugin/api/profiles/test_profile_list_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profiles/test_profile_list_negative.py rename to senlin_tempest_plugin/api/profiles/test_profile_list_negative.py diff --git a/senlin_tempest_plugin/tempest/api/profiles/test_profile_show.py b/senlin_tempest_plugin/api/profiles/test_profile_show.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profiles/test_profile_show.py rename to senlin_tempest_plugin/api/profiles/test_profile_show.py diff --git a/senlin_tempest_plugin/tempest/api/profiles/test_profile_show_negative.py b/senlin_tempest_plugin/api/profiles/test_profile_show_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profiles/test_profile_show_negative.py rename to senlin_tempest_plugin/api/profiles/test_profile_show_negative.py diff --git a/senlin_tempest_plugin/tempest/api/profiles/test_profile_update.py b/senlin_tempest_plugin/api/profiles/test_profile_update.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profiles/test_profile_update.py rename to senlin_tempest_plugin/api/profiles/test_profile_update.py diff --git a/senlin_tempest_plugin/tempest/api/profiles/test_profile_update_negative.py b/senlin_tempest_plugin/api/profiles/test_profile_update_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profiles/test_profile_update_negative.py rename to senlin_tempest_plugin/api/profiles/test_profile_update_negative.py diff --git a/senlin_tempest_plugin/tempest/api/profiles/test_profile_validate.py b/senlin_tempest_plugin/api/profiles/test_profile_validate.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profiles/test_profile_validate.py rename to senlin_tempest_plugin/api/profiles/test_profile_validate.py diff --git a/senlin_tempest_plugin/tempest/api/profiles/test_profile_validate_negative.py b/senlin_tempest_plugin/api/profiles/test_profile_validate_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profiles/test_profile_validate_negative.py rename to senlin_tempest_plugin/api/profiles/test_profile_validate_negative.py diff --git a/senlin_tempest_plugin/tempest/api/profiles/__init__.py b/senlin_tempest_plugin/api/receivers/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/profiles/__init__.py rename to senlin_tempest_plugin/api/receivers/__init__.py diff --git a/senlin_tempest_plugin/tempest/api/receivers/test_receiver_create.py b/senlin_tempest_plugin/api/receivers/test_receiver_create.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/receivers/test_receiver_create.py rename to senlin_tempest_plugin/api/receivers/test_receiver_create.py diff --git a/senlin_tempest_plugin/tempest/api/receivers/test_receiver_create_negative.py b/senlin_tempest_plugin/api/receivers/test_receiver_create_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/receivers/test_receiver_create_negative.py rename to senlin_tempest_plugin/api/receivers/test_receiver_create_negative.py diff --git a/senlin_tempest_plugin/tempest/api/receivers/test_receiver_delete.py b/senlin_tempest_plugin/api/receivers/test_receiver_delete.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/receivers/test_receiver_delete.py rename to senlin_tempest_plugin/api/receivers/test_receiver_delete.py diff --git a/senlin_tempest_plugin/tempest/api/receivers/test_receiver_delete_negative.py b/senlin_tempest_plugin/api/receivers/test_receiver_delete_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/receivers/test_receiver_delete_negative.py rename to senlin_tempest_plugin/api/receivers/test_receiver_delete_negative.py diff --git a/senlin_tempest_plugin/tempest/api/receivers/test_receiver_list.py b/senlin_tempest_plugin/api/receivers/test_receiver_list.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/receivers/test_receiver_list.py rename to senlin_tempest_plugin/api/receivers/test_receiver_list.py diff --git a/senlin_tempest_plugin/tempest/api/receivers/test_receiver_list_negative.py b/senlin_tempest_plugin/api/receivers/test_receiver_list_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/receivers/test_receiver_list_negative.py rename to senlin_tempest_plugin/api/receivers/test_receiver_list_negative.py diff --git a/senlin_tempest_plugin/tempest/api/receivers/test_receiver_show.py b/senlin_tempest_plugin/api/receivers/test_receiver_show.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/receivers/test_receiver_show.py rename to senlin_tempest_plugin/api/receivers/test_receiver_show.py diff --git a/senlin_tempest_plugin/tempest/api/receivers/test_receiver_show_negative.py b/senlin_tempest_plugin/api/receivers/test_receiver_show_negative.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/receivers/test_receiver_show_negative.py rename to senlin_tempest_plugin/api/receivers/test_receiver_show_negative.py diff --git a/senlin_tempest_plugin/tempest/api/receivers/test_webhook_trigger.py b/senlin_tempest_plugin/api/receivers/test_webhook_trigger.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/receivers/test_webhook_trigger.py rename to senlin_tempest_plugin/api/receivers/test_webhook_trigger.py diff --git a/senlin_tempest_plugin/tempest/base.py b/senlin_tempest_plugin/base.py similarity index 100% rename from senlin_tempest_plugin/tempest/base.py rename to senlin_tempest_plugin/base.py diff --git a/senlin_tempest_plugin/tempest/api/receivers/__init__.py b/senlin_tempest_plugin/common/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/api/receivers/__init__.py rename to senlin_tempest_plugin/common/__init__.py diff --git a/senlin_tempest_plugin/tempest/common/clustering_client.py b/senlin_tempest_plugin/common/clustering_client.py similarity index 100% rename from senlin_tempest_plugin/tempest/common/clustering_client.py rename to senlin_tempest_plugin/common/clustering_client.py diff --git a/senlin_tempest_plugin/tempest/common/compute_client.py b/senlin_tempest_plugin/common/compute_client.py similarity index 100% rename from senlin_tempest_plugin/tempest/common/compute_client.py rename to senlin_tempest_plugin/common/compute_client.py diff --git a/senlin_tempest_plugin/tempest/common/constants.py b/senlin_tempest_plugin/common/constants.py similarity index 100% rename from senlin_tempest_plugin/tempest/common/constants.py rename to senlin_tempest_plugin/common/constants.py diff --git a/senlin_tempest_plugin/tempest/common/messaging_client.py b/senlin_tempest_plugin/common/messaging_client.py similarity index 100% rename from senlin_tempest_plugin/tempest/common/messaging_client.py rename to senlin_tempest_plugin/common/messaging_client.py diff --git a/senlin_tempest_plugin/tempest/common/network_client.py b/senlin_tempest_plugin/common/network_client.py similarity index 100% rename from senlin_tempest_plugin/tempest/common/network_client.py rename to senlin_tempest_plugin/common/network_client.py diff --git a/senlin_tempest_plugin/tempest/common/utils.py b/senlin_tempest_plugin/common/utils.py similarity index 100% rename from senlin_tempest_plugin/tempest/common/utils.py rename to senlin_tempest_plugin/common/utils.py diff --git a/senlin_tempest_plugin/tempest/config.py b/senlin_tempest_plugin/config.py similarity index 100% rename from senlin_tempest_plugin/tempest/config.py rename to senlin_tempest_plugin/config.py diff --git a/senlin_tempest_plugin/tempest/common/__init__.py b/senlin_tempest_plugin/functional/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/common/__init__.py rename to senlin_tempest_plugin/functional/__init__.py diff --git a/senlin_tempest_plugin/tempest/functional/base.py b/senlin_tempest_plugin/functional/base.py similarity index 100% rename from senlin_tempest_plugin/tempest/functional/base.py rename to senlin_tempest_plugin/functional/base.py diff --git a/senlin_tempest_plugin/tempest/functional/test_batch_policy.py b/senlin_tempest_plugin/functional/test_batch_policy.py similarity index 100% rename from senlin_tempest_plugin/tempest/functional/test_batch_policy.py rename to senlin_tempest_plugin/functional/test_batch_policy.py diff --git a/senlin_tempest_plugin/tempest/functional/test_cluster_basic.py b/senlin_tempest_plugin/functional/test_cluster_basic.py similarity index 100% rename from senlin_tempest_plugin/tempest/functional/test_cluster_basic.py rename to senlin_tempest_plugin/functional/test_cluster_basic.py diff --git a/senlin_tempest_plugin/tempest/functional/test_cluster_membership.py b/senlin_tempest_plugin/functional/test_cluster_membership.py similarity index 100% rename from senlin_tempest_plugin/tempest/functional/test_cluster_membership.py rename to senlin_tempest_plugin/functional/test_cluster_membership.py diff --git a/senlin_tempest_plugin/tempest/functional/test_cluster_scaling.py b/senlin_tempest_plugin/functional/test_cluster_scaling.py similarity index 100% rename from senlin_tempest_plugin/tempest/functional/test_cluster_scaling.py rename to senlin_tempest_plugin/functional/test_cluster_scaling.py diff --git a/senlin_tempest_plugin/tempest/functional/test_lb_policy.py b/senlin_tempest_plugin/functional/test_lb_policy.py similarity index 100% rename from senlin_tempest_plugin/tempest/functional/test_lb_policy.py rename to senlin_tempest_plugin/functional/test_lb_policy.py diff --git a/senlin_tempest_plugin/tempest/functional/test_node_basic.py b/senlin_tempest_plugin/functional/test_node_basic.py similarity index 100% rename from senlin_tempest_plugin/tempest/functional/test_node_basic.py rename to senlin_tempest_plugin/functional/test_node_basic.py diff --git a/senlin_tempest_plugin/tempest/functional/test_receiver.py b/senlin_tempest_plugin/functional/test_receiver.py similarity index 100% rename from senlin_tempest_plugin/tempest/functional/test_receiver.py rename to senlin_tempest_plugin/functional/test_receiver.py diff --git a/senlin_tempest_plugin/tempest/functional/test_scaling_policy.py b/senlin_tempest_plugin/functional/test_scaling_policy.py similarity index 100% rename from senlin_tempest_plugin/tempest/functional/test_scaling_policy.py rename to senlin_tempest_plugin/functional/test_scaling_policy.py diff --git a/senlin_tempest_plugin/tempest/functional/__init__.py b/senlin_tempest_plugin/integration/__init__.py similarity index 100% rename from senlin_tempest_plugin/tempest/functional/__init__.py rename to senlin_tempest_plugin/integration/__init__.py diff --git a/senlin_tempest_plugin/tempest/integration/base.py b/senlin_tempest_plugin/integration/base.py similarity index 100% rename from senlin_tempest_plugin/tempest/integration/base.py rename to senlin_tempest_plugin/integration/base.py diff --git a/senlin_tempest_plugin/tempest/integration/test_heat_stack_cluster.py b/senlin_tempest_plugin/integration/test_heat_stack_cluster.py similarity index 100% rename from senlin_tempest_plugin/tempest/integration/test_heat_stack_cluster.py rename to senlin_tempest_plugin/integration/test_heat_stack_cluster.py diff --git a/senlin_tempest_plugin/tempest/integration/test_nova_server_cluster.py b/senlin_tempest_plugin/integration/test_nova_server_cluster.py similarity index 100% rename from senlin_tempest_plugin/tempest/integration/test_nova_server_cluster.py rename to senlin_tempest_plugin/integration/test_nova_server_cluster.py diff --git a/senlin_tempest_plugin/tempest/integration/test_receiver.py b/senlin_tempest_plugin/integration/test_receiver.py similarity index 100% rename from senlin_tempest_plugin/tempest/integration/test_receiver.py rename to senlin_tempest_plugin/integration/test_receiver.py diff --git a/senlin_tempest_plugin/tempest/plugin.py b/senlin_tempest_plugin/plugin.py similarity index 100% rename from senlin_tempest_plugin/tempest/plugin.py rename to senlin_tempest_plugin/plugin.py diff --git a/senlin_tempest_plugin/tempest/post_test_hook.sh b/senlin_tempest_plugin/post_test_hook.sh similarity index 100% rename from senlin_tempest_plugin/tempest/post_test_hook.sh rename to senlin_tempest_plugin/post_test_hook.sh diff --git a/senlin_tempest_plugin/tempest/pre_test_hook.sh b/senlin_tempest_plugin/pre_test_hook.sh similarity index 100% rename from senlin_tempest_plugin/tempest/pre_test_hook.sh rename to senlin_tempest_plugin/pre_test_hook.sh diff --git a/senlin_tempest_plugin/tempest/integration/__init__.py b/senlin_tempest_plugin/tempest/integration/__init__.py deleted file mode 100644 index e69de29..0000000