diff --git a/.testr.conf b/.testr.conf index 1bb0f44..fbdb8b6 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 climatenova $LISTOPT $IDOPTION + ${PYTHON:-python} -m subunit.run discover blazarnova $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/blazarnova/__init__.py b/blazarnova/__init__.py index ac47dbf..e69de29 100644 --- a/blazarnova/__init__.py +++ b/blazarnova/__init__.py @@ -1,5 +0,0 @@ -import os - -__path__ = [ - os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), - 'climatenova')] diff --git a/climatenova/api/__init__.py b/blazarnova/api/__init__.py similarity index 100% rename from climatenova/api/__init__.py rename to blazarnova/api/__init__.py diff --git a/climatenova/api/extensions/__init__.py b/blazarnova/api/extensions/__init__.py similarity index 100% rename from climatenova/api/extensions/__init__.py rename to blazarnova/api/extensions/__init__.py diff --git a/climatenova/api/extensions/default_reservation.py b/blazarnova/api/extensions/default_reservation.py similarity index 100% rename from climatenova/api/extensions/default_reservation.py rename to blazarnova/api/extensions/default_reservation.py diff --git a/climatenova/api/extensions/reservation.py b/blazarnova/api/extensions/reservation.py similarity index 100% rename from climatenova/api/extensions/reservation.py rename to blazarnova/api/extensions/reservation.py diff --git a/climatenova/openstack/__init__.py b/blazarnova/openstack/__init__.py similarity index 100% rename from climatenova/openstack/__init__.py rename to blazarnova/openstack/__init__.py diff --git a/climatenova/openstack/common/__init__.py b/blazarnova/openstack/common/__init__.py similarity index 100% rename from climatenova/openstack/common/__init__.py rename to blazarnova/openstack/common/__init__.py diff --git a/climatenova/openstack/common/test.py b/blazarnova/openstack/common/test.py similarity index 96% rename from climatenova/openstack/common/test.py rename to blazarnova/openstack/common/test.py index 717be2f..2e65a73 100644 --- a/climatenova/openstack/common/test.py +++ b/blazarnova/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('climatenova.openstack.common')) + self.useFixture(fixtures.FakeLogger('blazarnova.openstack.common')) self.useFixture(fixtures.NestedTempfile()) def _set_timeout(self): diff --git a/climatenova/scheduler/__init__.py b/blazarnova/scheduler/__init__.py similarity index 100% rename from climatenova/scheduler/__init__.py rename to blazarnova/scheduler/__init__.py diff --git a/climatenova/scheduler/filters/__init__.py b/blazarnova/scheduler/filters/__init__.py similarity index 100% rename from climatenova/scheduler/filters/__init__.py rename to blazarnova/scheduler/filters/__init__.py diff --git a/climatenova/scheduler/filters/blazar_filter.py b/blazarnova/scheduler/filters/blazar_filter.py similarity index 100% rename from climatenova/scheduler/filters/blazar_filter.py rename to blazarnova/scheduler/filters/blazar_filter.py diff --git a/climatenova/scheduler/filters/climate_filter.py b/blazarnova/scheduler/filters/climate_filter.py similarity index 100% rename from climatenova/scheduler/filters/climate_filter.py rename to blazarnova/scheduler/filters/climate_filter.py diff --git a/climatenova/tests/__init__.py b/blazarnova/tests/__init__.py similarity index 100% rename from climatenova/tests/__init__.py rename to blazarnova/tests/__init__.py diff --git a/climatenova/tests/api/__init__.py b/blazarnova/tests/api/__init__.py similarity index 100% rename from climatenova/tests/api/__init__.py rename to blazarnova/tests/api/__init__.py diff --git a/climatenova/tests/api/extensions/__init__.py b/blazarnova/tests/api/extensions/__init__.py similarity index 100% rename from climatenova/tests/api/extensions/__init__.py rename to blazarnova/tests/api/extensions/__init__.py diff --git a/climatenova/tests/api/extensions/test_default_reservation.py b/blazarnova/tests/api/extensions/test_default_reservation.py similarity index 100% rename from climatenova/tests/api/extensions/test_default_reservation.py rename to blazarnova/tests/api/extensions/test_default_reservation.py diff --git a/climatenova/tests/api/extensions/test_reservation.py b/blazarnova/tests/api/extensions/test_reservation.py similarity index 100% rename from climatenova/tests/api/extensions/test_reservation.py rename to blazarnova/tests/api/extensions/test_reservation.py diff --git a/climatenova/tests/scheduler/__init__.py b/blazarnova/tests/scheduler/__init__.py similarity index 100% rename from climatenova/tests/scheduler/__init__.py rename to blazarnova/tests/scheduler/__init__.py diff --git a/climatenova/tests/scheduler/filters/__init__.py b/blazarnova/tests/scheduler/filters/__init__.py similarity index 100% rename from climatenova/tests/scheduler/filters/__init__.py rename to blazarnova/tests/scheduler/filters/__init__.py diff --git a/climatenova/tests/scheduler/filters/test_blazar_filter.py b/blazarnova/tests/scheduler/filters/test_blazar_filter.py similarity index 100% rename from climatenova/tests/scheduler/filters/test_blazar_filter.py rename to blazarnova/tests/scheduler/filters/test_blazar_filter.py diff --git a/climatenova/__init__.py b/climatenova/__init__.py index e69de29..255d8b6 100644 --- a/climatenova/__init__.py +++ b/climatenova/__init__.py @@ -0,0 +1,5 @@ +import os + +__path__ = [ + os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), + 'blazarnova')] diff --git a/etc/nova.conf.example b/etc/nova.conf.example index c22054d..8811039 100644 --- a/etc/nova.conf.example +++ b/etc/nova.conf.example @@ -1,8 +1,8 @@ [DEFAULT] scheduler_available_filters = nova.scheduler.filters.all_filters -scheduler_available_filters = climatenova.scheduler.filters.climate_filter.ClimateFilter +scheduler_available_filters = blazarnova.scheduler.filters.blazar_filter.ClimateFilter scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ClimateFilter osapi_compute_extension = nova.api.openstack.compute.contrib.standard_extensions -osapi_compute_extension = climatenova.api.extensions.default_reservation.Default_reservation -osapi_compute_extension = climatenova.api.extensions.reservation.Reservation +osapi_compute_extension = blazarnova.api.extensions.default_reservation.Default_reservation +osapi_compute_extension = blazarnova.api.extensions.reservation.Reservation diff --git a/setup.cfg b/setup.cfg index 0f98b7b..34e09f5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,4 +23,4 @@ setup-hooks = pbr.hooks.setup_hook [files] packages = - climatenova + blazarnova