From dfc8bdc0f42566650988621d4c4c211547b9a61c Mon Sep 17 00:00:00 2001
From: Dina Belova <dbelova@mirantis.com>
Date: Tue, 14 Jan 2014 15:55:33 +0400
Subject: [PATCH] Fix packages naming

Also rename root module name not to intersect with Climate
project repository itself.

Change-Id: I5adc897dfe15088190d2da72779d3f51a37c121b
---
 .testr.conf                                              | 2 +-
 {climate => climatenova}/__init__.py                     | 0
 {climate => climatenova}/filters/__init__.py             | 0
 {climate => climatenova}/filters/host_reservation.py     | 0
 {climate => climatenova}/openstack/__init__.py           | 0
 {climate => climatenova}/openstack/common/__init__.py    | 0
 {climate => climatenova}/openstack/common/test.py        | 2 +-
 {climate => climatenova}/tests/__init__.py               | 2 +-
 {climate => climatenova}/tests/test_climate_scheduler.py | 4 ++--
 setup.cfg                                                | 4 ++--
 tox.ini                                                  | 2 +-
 11 files changed, 8 insertions(+), 8 deletions(-)
 rename {climate => climatenova}/__init__.py (100%)
 rename {climate => climatenova}/filters/__init__.py (100%)
 rename {climate => climatenova}/filters/host_reservation.py (100%)
 rename {climate => climatenova}/openstack/__init__.py (100%)
 rename {climate => climatenova}/openstack/common/__init__.py (100%)
 rename {climate => climatenova}/openstack/common/test.py (96%)
 rename {climate => climatenova}/tests/__init__.py (93%)
 rename {climate => climatenova}/tests/test_climate_scheduler.py (92%)

diff --git a/.testr.conf b/.testr.conf
index 1c480b9..1bb0f44 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -2,6 +2,6 @@
 test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
              OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} -m subunit.run discover climate $LISTOPT $IDOPTION
+             ${PYTHON:-python} -m subunit.run discover climatenova $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/climate/__init__.py b/climatenova/__init__.py
similarity index 100%
rename from climate/__init__.py
rename to climatenova/__init__.py
diff --git a/climate/filters/__init__.py b/climatenova/filters/__init__.py
similarity index 100%
rename from climate/filters/__init__.py
rename to climatenova/filters/__init__.py
diff --git a/climate/filters/host_reservation.py b/climatenova/filters/host_reservation.py
similarity index 100%
rename from climate/filters/host_reservation.py
rename to climatenova/filters/host_reservation.py
diff --git a/climate/openstack/__init__.py b/climatenova/openstack/__init__.py
similarity index 100%
rename from climate/openstack/__init__.py
rename to climatenova/openstack/__init__.py
diff --git a/climate/openstack/common/__init__.py b/climatenova/openstack/common/__init__.py
similarity index 100%
rename from climate/openstack/common/__init__.py
rename to climatenova/openstack/common/__init__.py
diff --git a/climate/openstack/common/test.py b/climatenova/openstack/common/test.py
similarity index 96%
rename from climate/openstack/common/test.py
rename to climatenova/openstack/common/test.py
index 06cde34..717be2f 100644
--- a/climate/openstack/common/test.py
+++ b/climatenova/openstack/common/test.py
@@ -29,7 +29,7 @@ class BaseTestCase(testtools.TestCase):
         super(BaseTestCase, self).setUp()
         self._set_timeout()
         self._fake_output()
-        self.useFixture(fixtures.FakeLogger('climate.openstack.common'))
+        self.useFixture(fixtures.FakeLogger('climatenova.openstack.common'))
         self.useFixture(fixtures.NestedTempfile())
 
     def _set_timeout(self):
diff --git a/climate/tests/__init__.py b/climatenova/tests/__init__.py
similarity index 93%
rename from climate/tests/__init__.py
rename to climatenova/tests/__init__.py
index 778f0b0..dcc0b3a 100644
--- a/climate/tests/__init__.py
+++ b/climatenova/tests/__init__.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from climate.openstack.common import test
+from climatenova.openstack.common import test
 
 
 class TestCase(test.BaseTestCase):
diff --git a/climate/tests/test_climate_scheduler.py b/climatenova/tests/test_climate_scheduler.py
similarity index 92%
rename from climate/tests/test_climate_scheduler.py
rename to climatenova/tests/test_climate_scheduler.py
index 36aeb92..b9b8a2a 100644
--- a/climate/tests/test_climate_scheduler.py
+++ b/climatenova/tests/test_climate_scheduler.py
@@ -14,8 +14,8 @@
 
 from nova.tests.scheduler import fakes
 
-from climate.filters import host_reservation
-from climate import tests
+from climatenova.filters import host_reservation
+from climatenova import tests
 
 
 class ClimateSchedulerTestCase(tests.TestCase):
diff --git a/setup.cfg b/setup.cfg
index 784d792..643c4c9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [metadata]
-name = climate
+name = climate-nova
 version = 2013.1
 summary = Reservation Service for OpenStack clouds
 description-file = README.md
@@ -24,4 +24,4 @@ setup-hooks = pbr.hooks.setup_hook
 
 [files]
 packages =
-    climate
+    climatenova
diff --git a/tox.ini b/tox.ini
index a119f41..8c47768 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,7 @@ commands =
 sitepackages = False
 
 [testenv:cover]
-commands = nosetests --no-path-adjustment --with-coverage --cover-erase --cover-package=climate --cover-inclusive []
+commands = nosetests --no-path-adjustment --with-coverage --cover-erase --cover-package=climatenova --cover-inclusive []
 
 [testenv:pep8]
 commands = flake8 {posargs}