Browse Source

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 <andersonvom@gmail.com>
Related-Bug: #1271226
Change-Id: Ifc8e3ca388253be82471651737da5d399c7cfb98
changes/17/73417/8
Richard Lee 9 years ago committed by Anderson Mesquita
parent
commit
805a73b1e7
  1. 2
      .testr.conf
  2. 0
      contrib/docker/docker/README.md
  3. 0
      contrib/docker/docker/__init__.py
  4. 0
      contrib/docker/docker/resources/__init__.py
  5. 0
      contrib/docker/docker/resources/docker_container.py
  6. 0
      contrib/docker/docker/tests/__init__.py
  7. 0
      contrib/docker/docker/tests/fake_docker_client.py
  8. 0
      contrib/docker/docker/tests/test_docker_container.py
  9. 0
      contrib/marconi/marconi/__init__.py
  10. 0
      contrib/marconi/marconi/clients.py
  11. 0
      contrib/marconi/marconi/resources/__init__.py
  12. 0
      contrib/marconi/marconi/resources/queue.py
  13. 0
      contrib/marconi/marconi/tests/__init__.py
  14. 0
      contrib/marconi/marconi/tests/test_queue.py
  15. 0
      contrib/rackspace/rackspace/__init__.py
  16. 0
      contrib/rackspace/rackspace/clients.py
  17. 0
      contrib/rackspace/rackspace/resources/__init__.py
  18. 0
      contrib/rackspace/rackspace/resources/auto_scale.py
  19. 0
      contrib/rackspace/rackspace/resources/cloud_dns.py
  20. 0
      contrib/rackspace/rackspace/resources/cloud_loadbalancer.py
  21. 0
      contrib/rackspace/rackspace/resources/cloud_server.py
  22. 0
      contrib/rackspace/rackspace/resources/cloudnetworks.py
  23. 0
      contrib/rackspace/rackspace/tests/__init__.py
  24. 0
      contrib/rackspace/rackspace/tests/test_auto_scale.py
  25. 0
      contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py
  26. 0
      contrib/rackspace/rackspace/tests/test_cloudnetworks.py
  27. 0
      contrib/rackspace/rackspace/tests/test_rackspace_clients.py
  28. 0
      contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py
  29. 0
      contrib/rackspace/rackspace/tests/test_rackspace_dns.py

2
.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

0
contrib/docker/README.md → contrib/docker/docker/README.md

0
contrib/docker/__init__.py → contrib/docker/docker/__init__.py

0
contrib/docker/resources/__init__.py → contrib/docker/docker/resources/__init__.py

0
contrib/docker/resources/docker_container.py → contrib/docker/docker/resources/docker_container.py

0
contrib/docker/tests/__init__.py → contrib/docker/docker/tests/__init__.py

0
contrib/docker/tests/fake_docker_client.py → contrib/docker/docker/tests/fake_docker_client.py

0
contrib/docker/tests/test_docker_container.py → contrib/docker/docker/tests/test_docker_container.py

0
contrib/marconi/__init__.py → contrib/marconi/marconi/__init__.py

0
contrib/marconi/clients.py → contrib/marconi/marconi/clients.py

0
contrib/marconi/resources/__init__.py → contrib/marconi/marconi/resources/__init__.py

0
contrib/marconi/resources/queue.py → contrib/marconi/marconi/resources/queue.py

0
contrib/marconi/tests/__init__.py → contrib/marconi/marconi/tests/__init__.py

0
contrib/marconi/tests/test_queue.py → contrib/marconi/marconi/tests/test_queue.py

0
contrib/rackspace/__init__.py → contrib/rackspace/rackspace/__init__.py

0
contrib/rackspace/clients.py → contrib/rackspace/rackspace/clients.py

0
contrib/rackspace/resources/__init__.py → contrib/rackspace/rackspace/resources/__init__.py

0
contrib/rackspace/resources/auto_scale.py → contrib/rackspace/rackspace/resources/auto_scale.py

0
contrib/rackspace/resources/cloud_dns.py → contrib/rackspace/rackspace/resources/cloud_dns.py

0
contrib/rackspace/resources/cloud_loadbalancer.py → contrib/rackspace/rackspace/resources/cloud_loadbalancer.py

0
contrib/rackspace/resources/cloud_server.py → contrib/rackspace/rackspace/resources/cloud_server.py

0
contrib/rackspace/resources/cloudnetworks.py → contrib/rackspace/rackspace/resources/cloudnetworks.py

0
contrib/rackspace/tests/__init__.py → contrib/rackspace/rackspace/tests/__init__.py

0
contrib/rackspace/tests/test_auto_scale.py → contrib/rackspace/rackspace/tests/test_auto_scale.py

0
contrib/rackspace/tests/test_cloud_loadbalancer.py → contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py

0
contrib/rackspace/tests/test_cloudnetworks.py → contrib/rackspace/rackspace/tests/test_cloudnetworks.py

0
contrib/rackspace/tests/test_rackspace_clients.py → contrib/rackspace/rackspace/tests/test_rackspace_clients.py

0
contrib/rackspace/tests/test_rackspace_cloud_server.py → contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py

0
contrib/rackspace/tests/test_rackspace_dns.py → contrib/rackspace/rackspace/tests/test_rackspace_dns.py

Loading…
Cancel
Save