Refactored zaqar tempest plugin directory structure

* switch from zaqar.tests.tempest_plugin to zaqar_tempest_plugin
* Cleaned up README.rst and setup.cfg
* Use zaqar_tempest_plugin as a tempest plugin package
* Fixed git-review
* Fixed tox.ini

Implements: blueprint zaqar-tempest-plugin

Change-Id: I78d657bcdec4d5c095af8eb1dfb93b5e3dfa0ff5

.gitreview

@@ -1,4 +1,4 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=openstack/openstack.git
+project=openstack/zaqar-tempest-plugin.git

README.rst

@@ -1,19 +1,12 @@
-===============================
-openstack
-===============================
+====================
+Zaqar Tempest Plugin
+====================
 
-Tempest plugin zaqar_tempest_plugin
+Tempest plugin for Zaqar project.
 
-Please fill here a long description which must be at least 3 lines wrapped on
-80 cols, so that distribution package maintainers can use it in their packages.
-Note that this is a hard requirement.
+It contains the tempest plugin for the functional testing of Zaqar Project.
 
 * Free software: Apache license
-* Documentation: http://docs.openstack.org/developer/openstack
-* Source: http://git.openstack.org/cgit/openstack/openstack
-* Bugs: http://bugs.launchpad.net/zaqar_tempest_plugin
-
-Features
---------
-
-* TODO
+* Documentation: http://docs.openstack.org/developer/zaqar
+* Source: http://git.openstack.org/cgit/openstack/zaqar-tempest-plugin
+* Bugs: http://bugs.launchpad.net/zaqar

setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-name = openstack
+name = zaqar_tempest_plugin
 summary = Tempest plugin zaqar_tempest_plugin
 description-file =
     README.rst
@@ -21,7 +21,7 @@ classifier =
 
 [files]
 packages =
-    zaqar
+    zaqar_tempest_plugin
 
 [build_sphinx]
 all-files = 1
@@ -33,19 +33,19 @@ build-dir = doc/build
 upload-dir = doc/build/html
 
 [compile_catalog]
-directory = zaqar/locale
-domain = zaqar
+directory = zaqar_tempest_plugin/locale
+domain = zaqar_tempest_plugin
 
 [update_catalog]
-domain = zaqar
-output_dir = zaqar/locale
-input_file = zaqar/locale/zaqar_tempest_plugin.pot
+domain = zaqar_tempest_plugin
+output_dir = zaqar_tempest_plugin/locale
+input_file = zaqar_tempest_plugin/locale/zaqar_tempest_plugin.pot
 
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
-output_file = zaqar/locale/zaqar_tempest_plugin.pot
+output_file = zaqar_tempest_plugin/locale/zaqar_tempest_plugin.pot
 
 [entry_points]
 tempest.test_plugins =
-    zaqar_tests = zaqar.tests.tempest_plugin.plugin:ZaqarTempestPlugin
+    zaqar_tests = zaqar_tempest_plugin.plugin:ZaqarTempestPlugin

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py34,py27,pypy,pep8
+envlist = py35,py27,pypy,pep8
 skipsdist = True
 
 [testenv]
@@ -9,7 +9,8 @@ install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstac
 setenv =
    VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
-deps = -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 commands = python setup.py test --slowest --testr-args='{posargs}'
 
 [testenv:pep8]

zaqar_tempest_plugin/plugin.py

@@ -18,17 +18,14 @@ import os
 
 from tempest.test_discover import plugins
 
-from zaqar.tests.tempest_plugin import config as zaqar_config
+from zaqar_tempest_plugin import config as zaqar_config
 
 
 class ZaqarTempestPlugin(plugins.TempestPlugin):
     def load_tests(self):
         base_path = os.path.split(os.path.dirname(
             os.path.abspath(__file__)))[0]
-        # Note: base_path should be set to the top directory
-        # of zaqar.
-        base_path += '/../..'
-        test_dir = "zaqar/tests/tempest_plugin/tests"
+        test_dir = "zaqar_tempest_plugin/tests"
         full_test_dir = os.path.join(base_path, test_dir)
         return full_test_dir, base_path
 

zaqar_tempest_plugin/services/messaging/json/messaging_client.py

@@ -19,11 +19,11 @@ from oslo_serialization import jsonutils as json
 from six.moves.urllib import parse as urllib
 from tempest.lib.common import rest_client
 
-from zaqar.tests.tempest_plugin.api_schema.response.v1 \
+from zaqar_tempest_plugin.api_schema.response.v1 \
     import queues as v1schema
-from zaqar.tests.tempest_plugin.api_schema.response.v1_1 \
+from zaqar_tempest_plugin.api_schema.response.v1_1 \
     import queues as v11schema
-from zaqar.tests.tempest_plugin.api_schema.response.v2 \
+from zaqar_tempest_plugin.api_schema.response.v2 \
     import queues as v2schema
 
 

zaqar_tempest_plugin/tests/base.py

@@ -17,7 +17,7 @@ from tempest import config
 from tempest.lib.common.utils import data_utils
 from tempest import test
 
-from zaqar.tests.tempest_plugin.services.messaging.json import messaging_client
+from zaqar_tempest_plugin.services.messaging.json import messaging_client
 
 CONF = config.CONF
 

zaqar_tempest_plugin/tests/v1/test_claims.py

@@ -18,7 +18,7 @@ from tempest import config
 from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
 
-from zaqar.tests.tempest_plugin.tests import base
+from zaqar_tempest_plugin.tests import base
 
 
 CONF = config.CONF

zaqar_tempest_plugin/tests/v1/test_messages.py

@@ -17,7 +17,7 @@ from tempest import config
 from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
 
-from zaqar.tests.tempest_plugin.tests import base
+from zaqar_tempest_plugin.tests import base
 
 CONF = config.CONF
 

zaqar_tempest_plugin/tests/v1/test_queues.py

@@ -20,7 +20,7 @@ from tempest.lib import decorators
 from tempest.lib import exceptions as lib_exc
 from testtools import matchers
 
-from zaqar.tests.tempest_plugin.tests import base
+from zaqar_tempest_plugin.tests import base
 
 
 class TestQueues(base.BaseV1MessagingTest):

zaqar_tempest_plugin/tests/v1_1/test_claims.py

@@ -18,7 +18,7 @@ from tempest import config
 from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
 
-from zaqar.tests.tempest_plugin.tests import base
+from zaqar_tempest_plugin.tests import base
 
 
 CONF = config.CONF

zaqar_tempest_plugin/tests/v1_1/test_messages.py

@@ -18,7 +18,7 @@ from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
 from tempest.lib import exceptions as lib_exc
 
-from zaqar.tests.tempest_plugin.tests import base
+from zaqar_tempest_plugin.tests import base
 
 CONF = config.CONF
 

zaqar_tempest_plugin/tests/v1_1/test_queues.py

@@ -18,7 +18,7 @@ from six import moves
 from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
 
-from zaqar.tests.tempest_plugin.tests import base
+from zaqar_tempest_plugin.tests import base
 
 
 class TestQueues(base.BaseV11MessagingTest):

zaqar_tempest_plugin/tests/v2/test_claims.py

@@ -20,7 +20,7 @@ from tempest import config
 from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
 
-from zaqar.tests.tempest_plugin.tests import base
+from zaqar_tempest_plugin.tests import base
 
 
 CONF = config.CONF

zaqar_tempest_plugin/tests/v2/test_claims_negative.py

@@ -20,7 +20,7 @@ from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
 from tempest.lib import exceptions as lib_exc
 
-from zaqar.tests.tempest_plugin.tests import base
+from zaqar_tempest_plugin.tests import base
 
 CONF = config.CONF
 

zaqar_tempest_plugin/tests/v2/test_messages.py

@@ -18,7 +18,7 @@ from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
 from tempest.lib import exceptions as lib_exc
 
-from zaqar.tests.tempest_plugin.tests import base
+from zaqar_tempest_plugin.tests import base
 
 CONF = config.CONF
 

zaqar_tempest_plugin/tests/v2/test_messages_negative.py

@@ -22,7 +22,7 @@ from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
 from tempest.lib import exceptions as lib_exc
 
-from zaqar.tests.tempest_plugin.tests import base
+from zaqar_tempest_plugin.tests import base
 
 CONF = config.CONF
 

zaqar_tempest_plugin/tests/v2/test_queues.py

@@ -20,7 +20,7 @@ from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
 from testtools import matchers
 
-from zaqar.tests.tempest_plugin.tests import base
+from zaqar_tempest_plugin.tests import base
 
 CONF = config.CONF
 

zaqar_tempest_plugin/tests/v2/test_queues_negative.py

@@ -18,7 +18,7 @@ from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
 from tempest.lib import exceptions as lib_exc
 
-from zaqar.tests.tempest_plugin.tests import base
+from zaqar_tempest_plugin.tests import base
 
 
 class QueueNegativeTestJSON(base.BaseV2MessagingTest):

zaqar_tempest_plugin/tests/v2/test_subscriptions.py

@@ -20,7 +20,7 @@ from tempest.lib.common.utils import data_utils
 from tempest.lib.common.utils import test_utils
 from tempest.lib import decorators
 
-from zaqar.tests.tempest_plugin.tests import base
+from zaqar_tempest_plugin.tests import base
 
 
 class TestSubscriptions(base.BaseV2MessagingTest):

zaqar_tempest_plugin/tests/v2/test_subscriptions_negative.py

@@ -20,7 +20,7 @@ from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
 from tempest.lib import exceptions as lib_exc
 
-from zaqar.tests.tempest_plugin.tests import base
+from zaqar_tempest_plugin.tests import base
 
 CONF = config.CONF