From ebc6721b4f7181dc9e5ff70a6076c5da7610a268 Mon Sep 17 00:00:00 2001
From: Fei Long Wang <flwang@catalyst.net.nz>
Date: Thu, 26 May 2016 16:46:11 +1200
Subject: [PATCH] Rename notification/task to notification/tasks

We're using zaqar.notification.tasks to look for the notifier
driver by stevedore, so this patch just rename the package
name to keep consistence. No impact for end user and migration.

Change-Id: I7694af4dbc4f73703e429560fb0a1457f3e1193a
---
 doc/source/api/zaqar.notification.tasks.mailto.rst         | 7 +++++++
 ...sk.webhook.rst => zaqar.notification.tasks.webhook.rst} | 4 ++--
 setup.cfg                                                  | 6 +++---
 zaqar/notification/{task => tasks}/__init__.py             | 0
 zaqar/notification/{task => tasks}/mailto.py               | 0
 zaqar/notification/{task => tasks}/webhook.py              | 0
 6 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 doc/source/api/zaqar.notification.tasks.mailto.rst
 rename doc/source/api/{zaqar.notification.task.webhook.rst => zaqar.notification.tasks.webhook.rst} (50%)
 rename zaqar/notification/{task => tasks}/__init__.py (100%)
 rename zaqar/notification/{task => tasks}/mailto.py (100%)
 rename zaqar/notification/{task => tasks}/webhook.py (100%)

diff --git a/doc/source/api/zaqar.notification.tasks.mailto.rst b/doc/source/api/zaqar.notification.tasks.mailto.rst
new file mode 100644
index 000000000..2dd3cc7b2
--- /dev/null
+++ b/doc/source/api/zaqar.notification.tasks.mailto.rst
@@ -0,0 +1,7 @@
+The :mod:`zaqar.notification.tasks.mailto` module
+==================================================
+
+.. automodule:: zaqar.notification.tasks.mailto
+  :members:
+  :undoc-members:
+  :show-inheritance:
\ No newline at end of file
diff --git a/doc/source/api/zaqar.notification.task.webhook.rst b/doc/source/api/zaqar.notification.tasks.webhook.rst
similarity index 50%
rename from doc/source/api/zaqar.notification.task.webhook.rst
rename to doc/source/api/zaqar.notification.tasks.webhook.rst
index 31f7674ec..c3edbe7cc 100644
--- a/doc/source/api/zaqar.notification.task.webhook.rst
+++ b/doc/source/api/zaqar.notification.tasks.webhook.rst
@@ -1,7 +1,7 @@
-The :mod:`zaqar.notification.task.webhook` module
+The :mod:`zaqar.notification.tasks.webhook` module
 ==================================================
 
-.. automodule:: zaqar.notification.task.webhook
+.. automodule:: zaqar.notification.tasks.webhook
   :members:
   :undoc-members:
   :show-inheritance:
diff --git a/setup.cfg b/setup.cfg
index 24648e0ab..85bafbd8b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -69,9 +69,9 @@ zaqar.storage.redis.driver.queue.stages =
     message_queue_handler = zaqar.storage.redis.messages:MessageQueueHandler
 
 zaqar.notification.tasks =
-    http = zaqar.notification.task.webhook:WebhookTask
-    https = zaqar.notification.task.webhook:WebhookTask
-    mailto = zaqar.notification.task.mailto:MailtoTask
+    http = zaqar.notification.tasks.webhook:WebhookTask
+    https = zaqar.notification.tasks.webhook:WebhookTask
+    mailto = zaqar.notification.tasks.mailto:MailtoTask
 
 tempest.test_plugins =
     zaqar_tests = zaqar.tests.tempest_plugin.plugin:ZaqarTempestPlugin
diff --git a/zaqar/notification/task/__init__.py b/zaqar/notification/tasks/__init__.py
similarity index 100%
rename from zaqar/notification/task/__init__.py
rename to zaqar/notification/tasks/__init__.py
diff --git a/zaqar/notification/task/mailto.py b/zaqar/notification/tasks/mailto.py
similarity index 100%
rename from zaqar/notification/task/mailto.py
rename to zaqar/notification/tasks/mailto.py
diff --git a/zaqar/notification/task/webhook.py b/zaqar/notification/tasks/webhook.py
similarity index 100%
rename from zaqar/notification/task/webhook.py
rename to zaqar/notification/tasks/webhook.py