From 805a73b1e7669550c4ed3c8676b19d5a9d8352ad Mon Sep 17 00:00:00 2001 From: Richard Lee Date: Fri, 21 Feb 2014 12:27:22 -0500 Subject: [PATCH] Restructure contrib/ directories contrib/ directory does not follow any standards and will make it harder to programmatically install plugins on devstack. The current structure can also cause namespace collisions when loading them. This moves all plugin modules to a folder with the same name under their directory (e.g. contrib/rackspace/rackspace), allowing requirements, readmes, and other files to be separate from the actual code. This also helps to avoid namespace collisions when loading all the plugins, since all plugins will be under their namespace in the heat package. Example: heat.engine.plugins heat.engine.plugins.docker heat.engine.plugins.marconi heat.engine.plugins.rackspace Since plugin packages are now in a folder one level under contrib/, testr.conf is also updated so that all plugins are discovered correctly. Co-Authored-By: Anderson Mesquita Related-Bug: #1271226 Change-Id: Ifc8e3ca388253be82471651737da5d399c7cfb98 --- .testr.conf | 2 +- contrib/docker/{ => docker}/README.md | 0 contrib/docker/{ => docker}/__init__.py | 0 contrib/docker/{ => docker}/resources/__init__.py | 0 contrib/docker/{ => docker}/resources/docker_container.py | 0 contrib/docker/{ => docker}/tests/__init__.py | 0 contrib/docker/{ => docker}/tests/fake_docker_client.py | 0 contrib/docker/{ => docker}/tests/test_docker_container.py | 0 contrib/marconi/{ => marconi}/__init__.py | 0 contrib/marconi/{ => marconi}/clients.py | 0 contrib/marconi/{ => marconi}/resources/__init__.py | 0 contrib/marconi/{ => marconi}/resources/queue.py | 0 contrib/marconi/{ => marconi}/tests/__init__.py | 0 contrib/marconi/{ => marconi}/tests/test_queue.py | 0 contrib/rackspace/{ => rackspace}/__init__.py | 0 contrib/rackspace/{ => rackspace}/clients.py | 0 contrib/rackspace/{ => rackspace}/resources/__init__.py | 0 contrib/rackspace/{ => rackspace}/resources/auto_scale.py | 0 contrib/rackspace/{ => rackspace}/resources/cloud_dns.py | 0 .../rackspace/{ => rackspace}/resources/cloud_loadbalancer.py | 0 contrib/rackspace/{ => rackspace}/resources/cloud_server.py | 0 contrib/rackspace/{ => rackspace}/resources/cloudnetworks.py | 0 contrib/rackspace/{ => rackspace}/tests/__init__.py | 0 contrib/rackspace/{ => rackspace}/tests/test_auto_scale.py | 0 .../rackspace/{ => rackspace}/tests/test_cloud_loadbalancer.py | 0 contrib/rackspace/{ => rackspace}/tests/test_cloudnetworks.py | 0 .../rackspace/{ => rackspace}/tests/test_rackspace_clients.py | 0 .../{ => rackspace}/tests/test_rackspace_cloud_server.py | 0 contrib/rackspace/{ => rackspace}/tests/test_rackspace_dns.py | 0 29 files changed, 1 insertion(+), 1 deletion(-) rename contrib/docker/{ => docker}/README.md (100%) rename contrib/docker/{ => docker}/__init__.py (100%) rename contrib/docker/{ => docker}/resources/__init__.py (100%) rename contrib/docker/{ => docker}/resources/docker_container.py (100%) rename contrib/docker/{ => docker}/tests/__init__.py (100%) rename contrib/docker/{ => docker}/tests/fake_docker_client.py (100%) rename contrib/docker/{ => docker}/tests/test_docker_container.py (100%) rename contrib/marconi/{ => marconi}/__init__.py (100%) rename contrib/marconi/{ => marconi}/clients.py (100%) rename contrib/marconi/{ => marconi}/resources/__init__.py (100%) rename contrib/marconi/{ => marconi}/resources/queue.py (100%) rename contrib/marconi/{ => marconi}/tests/__init__.py (100%) rename contrib/marconi/{ => marconi}/tests/test_queue.py (100%) rename contrib/rackspace/{ => rackspace}/__init__.py (100%) rename contrib/rackspace/{ => rackspace}/clients.py (100%) rename contrib/rackspace/{ => rackspace}/resources/__init__.py (100%) rename contrib/rackspace/{ => rackspace}/resources/auto_scale.py (100%) rename contrib/rackspace/{ => rackspace}/resources/cloud_dns.py (100%) rename contrib/rackspace/{ => rackspace}/resources/cloud_loadbalancer.py (100%) rename contrib/rackspace/{ => rackspace}/resources/cloud_server.py (100%) rename contrib/rackspace/{ => rackspace}/resources/cloudnetworks.py (100%) rename contrib/rackspace/{ => rackspace}/tests/__init__.py (100%) rename contrib/rackspace/{ => rackspace}/tests/test_auto_scale.py (100%) rename contrib/rackspace/{ => rackspace}/tests/test_cloud_loadbalancer.py (100%) rename contrib/rackspace/{ => rackspace}/tests/test_cloudnetworks.py (100%) rename contrib/rackspace/{ => rackspace}/tests/test_rackspace_clients.py (100%) rename contrib/rackspace/{ => rackspace}/tests/test_rackspace_cloud_server.py (100%) rename contrib/rackspace/{ => rackspace}/tests/test_rackspace_dns.py (100%) diff --git a/.testr.conf b/.testr.conf index 77a8e1bd95..1bdd94e50e 100644 --- a/.testr.conf +++ b/.testr.conf @@ -2,6 +2,6 @@ test_command= PYTHON=$(echo ${PYTHON:-python} | sed 's/--source heat//g') ${PYTHON} -m subunit.run discover -s . $LISTOPT $IDOPTION - ${PYTHON} -m subunit.run discover -s contrib $LISTOPT $IDOPTION + for plugin in contrib/*; do ${PYTHON} -m subunit.run discover -s $plugin $LISTOPT $IDOPTION; done test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/contrib/docker/README.md b/contrib/docker/docker/README.md similarity index 100% rename from contrib/docker/README.md rename to contrib/docker/docker/README.md diff --git a/contrib/docker/__init__.py b/contrib/docker/docker/__init__.py similarity index 100% rename from contrib/docker/__init__.py rename to contrib/docker/docker/__init__.py diff --git a/contrib/docker/resources/__init__.py b/contrib/docker/docker/resources/__init__.py similarity index 100% rename from contrib/docker/resources/__init__.py rename to contrib/docker/docker/resources/__init__.py diff --git a/contrib/docker/resources/docker_container.py b/contrib/docker/docker/resources/docker_container.py similarity index 100% rename from contrib/docker/resources/docker_container.py rename to contrib/docker/docker/resources/docker_container.py diff --git a/contrib/docker/tests/__init__.py b/contrib/docker/docker/tests/__init__.py similarity index 100% rename from contrib/docker/tests/__init__.py rename to contrib/docker/docker/tests/__init__.py diff --git a/contrib/docker/tests/fake_docker_client.py b/contrib/docker/docker/tests/fake_docker_client.py similarity index 100% rename from contrib/docker/tests/fake_docker_client.py rename to contrib/docker/docker/tests/fake_docker_client.py diff --git a/contrib/docker/tests/test_docker_container.py b/contrib/docker/docker/tests/test_docker_container.py similarity index 100% rename from contrib/docker/tests/test_docker_container.py rename to contrib/docker/docker/tests/test_docker_container.py diff --git a/contrib/marconi/__init__.py b/contrib/marconi/marconi/__init__.py similarity index 100% rename from contrib/marconi/__init__.py rename to contrib/marconi/marconi/__init__.py diff --git a/contrib/marconi/clients.py b/contrib/marconi/marconi/clients.py similarity index 100% rename from contrib/marconi/clients.py rename to contrib/marconi/marconi/clients.py diff --git a/contrib/marconi/resources/__init__.py b/contrib/marconi/marconi/resources/__init__.py similarity index 100% rename from contrib/marconi/resources/__init__.py rename to contrib/marconi/marconi/resources/__init__.py diff --git a/contrib/marconi/resources/queue.py b/contrib/marconi/marconi/resources/queue.py similarity index 100% rename from contrib/marconi/resources/queue.py rename to contrib/marconi/marconi/resources/queue.py diff --git a/contrib/marconi/tests/__init__.py b/contrib/marconi/marconi/tests/__init__.py similarity index 100% rename from contrib/marconi/tests/__init__.py rename to contrib/marconi/marconi/tests/__init__.py diff --git a/contrib/marconi/tests/test_queue.py b/contrib/marconi/marconi/tests/test_queue.py similarity index 100% rename from contrib/marconi/tests/test_queue.py rename to contrib/marconi/marconi/tests/test_queue.py diff --git a/contrib/rackspace/__init__.py b/contrib/rackspace/rackspace/__init__.py similarity index 100% rename from contrib/rackspace/__init__.py rename to contrib/rackspace/rackspace/__init__.py diff --git a/contrib/rackspace/clients.py b/contrib/rackspace/rackspace/clients.py similarity index 100% rename from contrib/rackspace/clients.py rename to contrib/rackspace/rackspace/clients.py diff --git a/contrib/rackspace/resources/__init__.py b/contrib/rackspace/rackspace/resources/__init__.py similarity index 100% rename from contrib/rackspace/resources/__init__.py rename to contrib/rackspace/rackspace/resources/__init__.py diff --git a/contrib/rackspace/resources/auto_scale.py b/contrib/rackspace/rackspace/resources/auto_scale.py similarity index 100% rename from contrib/rackspace/resources/auto_scale.py rename to contrib/rackspace/rackspace/resources/auto_scale.py diff --git a/contrib/rackspace/resources/cloud_dns.py b/contrib/rackspace/rackspace/resources/cloud_dns.py similarity index 100% rename from contrib/rackspace/resources/cloud_dns.py rename to contrib/rackspace/rackspace/resources/cloud_dns.py diff --git a/contrib/rackspace/resources/cloud_loadbalancer.py b/contrib/rackspace/rackspace/resources/cloud_loadbalancer.py similarity index 100% rename from contrib/rackspace/resources/cloud_loadbalancer.py rename to contrib/rackspace/rackspace/resources/cloud_loadbalancer.py diff --git a/contrib/rackspace/resources/cloud_server.py b/contrib/rackspace/rackspace/resources/cloud_server.py similarity index 100% rename from contrib/rackspace/resources/cloud_server.py rename to contrib/rackspace/rackspace/resources/cloud_server.py diff --git a/contrib/rackspace/resources/cloudnetworks.py b/contrib/rackspace/rackspace/resources/cloudnetworks.py similarity index 100% rename from contrib/rackspace/resources/cloudnetworks.py rename to contrib/rackspace/rackspace/resources/cloudnetworks.py diff --git a/contrib/rackspace/tests/__init__.py b/contrib/rackspace/rackspace/tests/__init__.py similarity index 100% rename from contrib/rackspace/tests/__init__.py rename to contrib/rackspace/rackspace/tests/__init__.py diff --git a/contrib/rackspace/tests/test_auto_scale.py b/contrib/rackspace/rackspace/tests/test_auto_scale.py similarity index 100% rename from contrib/rackspace/tests/test_auto_scale.py rename to contrib/rackspace/rackspace/tests/test_auto_scale.py diff --git a/contrib/rackspace/tests/test_cloud_loadbalancer.py b/contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py similarity index 100% rename from contrib/rackspace/tests/test_cloud_loadbalancer.py rename to contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py diff --git a/contrib/rackspace/tests/test_cloudnetworks.py b/contrib/rackspace/rackspace/tests/test_cloudnetworks.py similarity index 100% rename from contrib/rackspace/tests/test_cloudnetworks.py rename to contrib/rackspace/rackspace/tests/test_cloudnetworks.py diff --git a/contrib/rackspace/tests/test_rackspace_clients.py b/contrib/rackspace/rackspace/tests/test_rackspace_clients.py similarity index 100% rename from contrib/rackspace/tests/test_rackspace_clients.py rename to contrib/rackspace/rackspace/tests/test_rackspace_clients.py diff --git a/contrib/rackspace/tests/test_rackspace_cloud_server.py b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py similarity index 100% rename from contrib/rackspace/tests/test_rackspace_cloud_server.py rename to contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py diff --git a/contrib/rackspace/tests/test_rackspace_dns.py b/contrib/rackspace/rackspace/tests/test_rackspace_dns.py similarity index 100% rename from contrib/rackspace/tests/test_rackspace_dns.py rename to contrib/rackspace/rackspace/tests/test_rackspace_dns.py