diff --git a/README.rst b/README.rst index 98686aa..b2123c0 100644 --- a/README.rst +++ b/README.rst @@ -59,11 +59,11 @@ To install freezer dashboard for development you need to do the following:: # cd freezer-web-ui - # cp freezer-web-ui/disaster_recovery/enabled/_5050_freezer.py /opt/stack/horizon/openstack_dashboard/enabled/_5050_freezer.py + # cp freezer-web-ui/freezer_ui/enabled/_5050_freezer.py /opt/stack/horizon/openstack_dashboard/enabled/_5050_freezer.py # to disable the panel just copy the following file - # cp freezer-web-ui/disaster_recovery/enabled/_7050_freezer_remove_panel_.py /opt/stack/horizon/openstack_dashboard/enabled/_7050_freezer_remove_panel_.py + # cp freezer-web-ui/freezer_ui/enabled/_7050_freezer_remove_panel_.py /opt/stack/horizon/openstack_dashboard/enabled/_7050_freezer_remove_panel_.py # cd /opt/stack/horizon/ @@ -82,11 +82,11 @@ To deploy freezer dashboard in production you need to do the following:: # cd freezer-web-ui - # cp freezer-web-ui/disaster_recovery/enabled/_5050_freezer.py /opt/stack/horizon/openstack_dashboard/enabled/_5050_freezer.py + # cp freezer-web-ui/freezer_ui/enabled/_5050_freezer.py /opt/stack/horizon/openstack_dashboard/enabled/_5050_freezer.py # to disable the panel just copy the following file - # cp freezer-web-ui/disaster_recovery/enabled/_7050_freezer_remove_panel_.py /opt/stack/horizon/openstack_dashboard/enabled/_7050_freezer_remove_panel_.py + # cp freezer-web-ui/freezer_ui/enabled/_7050_freezer_remove_panel_.py /opt/stack/horizon/openstack_dashboard/enabled/_7050_freezer_remove_panel_.py # make sure freezer is installed from source as detailed in the first step diff --git a/disaster_recovery/__init__.py b/freezer_ui/__init__.py similarity index 100% rename from disaster_recovery/__init__.py rename to freezer_ui/__init__.py diff --git a/disaster_recovery/actions/__init__.py b/freezer_ui/actions/__init__.py similarity index 100% rename from disaster_recovery/actions/__init__.py rename to freezer_ui/actions/__init__.py diff --git a/disaster_recovery/actions/panel.py b/freezer_ui/actions/panel.py similarity index 95% rename from disaster_recovery/actions/panel.py rename to freezer_ui/actions/panel.py index 6822f0d..e7b0136 100644 --- a/disaster_recovery/actions/panel.py +++ b/freezer_ui/actions/panel.py @@ -16,7 +16,7 @@ from django.utils.translation import gettext_lazy as _ import horizon -from disaster_recovery import dashboard +from freezer_ui import dashboard class ActionsPanel(horizon.Panel): diff --git a/disaster_recovery/actions/tables.py b/freezer_ui/actions/tables.py similarity index 98% rename from disaster_recovery/actions/tables.py rename to freezer_ui/actions/tables.py index 731a765..a28ee9f 100644 --- a/disaster_recovery/actions/tables.py +++ b/freezer_ui/actions/tables.py @@ -17,7 +17,7 @@ from django.utils.translation import ngettext_lazy from horizon import tables from django.urls import reverse -import disaster_recovery.api.api as freezer_api +import freezer_ui.api.api as freezer_api class DeleteAction(tables.DeleteAction): diff --git a/disaster_recovery/actions/templates/actions/_action.html b/freezer_ui/actions/templates/actions/_action.html similarity index 100% rename from disaster_recovery/actions/templates/actions/_action.html rename to freezer_ui/actions/templates/actions/_action.html diff --git a/disaster_recovery/actions/templates/actions/_advanced.html b/freezer_ui/actions/templates/actions/_advanced.html similarity index 100% rename from disaster_recovery/actions/templates/actions/_advanced.html rename to freezer_ui/actions/templates/actions/_advanced.html diff --git a/disaster_recovery/actions/templates/actions/_rules.html b/freezer_ui/actions/templates/actions/_rules.html similarity index 100% rename from disaster_recovery/actions/templates/actions/_rules.html rename to freezer_ui/actions/templates/actions/_rules.html diff --git a/disaster_recovery/actions/templates/actions/_snapshot.html b/freezer_ui/actions/templates/actions/_snapshot.html similarity index 100% rename from disaster_recovery/actions/templates/actions/_snapshot.html rename to freezer_ui/actions/templates/actions/_snapshot.html diff --git a/disaster_recovery/actions/templates/actions/detail.html b/freezer_ui/actions/templates/actions/detail.html similarity index 100% rename from disaster_recovery/actions/templates/actions/detail.html rename to freezer_ui/actions/templates/actions/detail.html diff --git a/disaster_recovery/actions/templates/actions/index.html b/freezer_ui/actions/templates/actions/index.html similarity index 100% rename from disaster_recovery/actions/templates/actions/index.html rename to freezer_ui/actions/templates/actions/index.html diff --git a/disaster_recovery/actions/urls.py b/freezer_ui/actions/urls.py similarity index 95% rename from disaster_recovery/actions/urls.py rename to freezer_ui/actions/urls.py index 1af550f..7567f2c 100644 --- a/disaster_recovery/actions/urls.py +++ b/freezer_ui/actions/urls.py @@ -14,7 +14,7 @@ from django.urls import re_path -from disaster_recovery.actions import views +from freezer_ui.actions import views urlpatterns = [ re_path(r'^$', views.IndexView.as_view(), name='index'), diff --git a/disaster_recovery/actions/views.py b/freezer_ui/actions/views.py similarity index 91% rename from disaster_recovery/actions/views.py rename to freezer_ui/actions/views.py index 36b6ec3..22f3d76 100644 --- a/disaster_recovery/actions/views.py +++ b/freezer_ui/actions/views.py @@ -19,11 +19,11 @@ from django.views import generic from horizon import tables from horizon import workflows -import disaster_recovery.api.api as freezer_api +import freezer_ui.api.api as freezer_api -from disaster_recovery.actions import tables as freezer_tables -from disaster_recovery.actions.workflows import action as action_workflow -from disaster_recovery.utils import shield +from freezer_ui.actions import tables as freezer_tables +from freezer_ui.actions.workflows import action as action_workflow +from freezer_ui.utils import shield class IndexView(tables.DataTableView): diff --git a/disaster_recovery/actions/workflows/__init__.py b/freezer_ui/actions/workflows/__init__.py similarity index 100% rename from disaster_recovery/actions/workflows/__init__.py rename to freezer_ui/actions/workflows/__init__.py diff --git a/disaster_recovery/actions/workflows/action.py b/freezer_ui/actions/workflows/action.py similarity index 99% rename from disaster_recovery/actions/workflows/action.py rename to freezer_ui/actions/workflows/action.py index e202f8e..4fdd107 100644 --- a/disaster_recovery/actions/workflows/action.py +++ b/freezer_ui/actions/workflows/action.py @@ -19,7 +19,7 @@ from horizon import exceptions from horizon import forms from horizon import workflows -import disaster_recovery.api.api as freezer_api +import freezer_ui.api.api as freezer_api class ActionConfigurationAction(workflows.Action): diff --git a/disaster_recovery/api/__init__.py b/freezer_ui/api/__init__.py similarity index 100% rename from disaster_recovery/api/__init__.py rename to freezer_ui/api/__init__.py diff --git a/disaster_recovery/api/api.py b/freezer_ui/api/api.py similarity index 99% rename from disaster_recovery/api/api.py rename to freezer_ui/api/api.py index 2b7ac93..7db8277 100644 --- a/disaster_recovery/api/api.py +++ b/freezer_ui/api/api.py @@ -19,7 +19,7 @@ from django.conf import settings from horizon.utils.memoized import memoized # noqa from freezerclient import client as freezer_client -from disaster_recovery import utils +from freezer_ui import utils LOG = log.getLogger(__name__) diff --git a/disaster_recovery/api/rest/__init__.py b/freezer_ui/api/rest/__init__.py similarity index 100% rename from disaster_recovery/api/rest/__init__.py rename to freezer_ui/api/rest/__init__.py diff --git a/disaster_recovery/api/rest/rest_api.py b/freezer_ui/api/rest/rest_api.py similarity index 98% rename from disaster_recovery/api/rest/rest_api.py rename to freezer_ui/api/rest/rest_api.py index 49bfe9f..25e3599 100644 --- a/disaster_recovery/api/rest/rest_api.py +++ b/freezer_ui/api/rest/rest_api.py @@ -21,7 +21,7 @@ from django.views import generic from openstack_dashboard.api.rest import utils as rest_utils from openstack_dashboard.api.rest import utils -import disaster_recovery.api.api as freezer_api +import freezer_ui.api.api as freezer_api # https://github.com/tornadoweb/tornado/issues/1009 diff --git a/disaster_recovery/api/rest/urls.py b/freezer_ui/api/rest/urls.py similarity index 95% rename from disaster_recovery/api/rest/urls.py rename to freezer_ui/api/rest/urls.py index 404e844..79ad082 100644 --- a/disaster_recovery/api/rest/urls.py +++ b/freezer_ui/api/rest/urls.py @@ -18,7 +18,7 @@ URL patterns for the OpenStack Dashboard. from django.urls import re_path -from disaster_recovery.api.rest import rest_api +from freezer_ui.api.rest import rest_api urlpatterns = [ re_path(r'^api/clients/$', rest_api.Clients.as_view(), diff --git a/disaster_recovery/backups/__init__.py b/freezer_ui/backups/__init__.py similarity index 100% rename from disaster_recovery/backups/__init__.py rename to freezer_ui/backups/__init__.py diff --git a/disaster_recovery/backups/panel.py b/freezer_ui/backups/panel.py similarity index 95% rename from disaster_recovery/backups/panel.py rename to freezer_ui/backups/panel.py index 94693bd..be72356 100644 --- a/disaster_recovery/backups/panel.py +++ b/freezer_ui/backups/panel.py @@ -16,7 +16,7 @@ from django.utils.translation import gettext_lazy as _ import horizon -from disaster_recovery import dashboard +from freezer_ui import dashboard class BackupsPanel(horizon.Panel): diff --git a/disaster_recovery/backups/tables.py b/freezer_ui/backups/tables.py similarity index 96% rename from disaster_recovery/backups/tables.py rename to freezer_ui/backups/tables.py index f7b9093..2107541 100644 --- a/disaster_recovery/backups/tables.py +++ b/freezer_ui/backups/tables.py @@ -20,9 +20,9 @@ from django.utils.translation import gettext_lazy as _ from horizon import tables from horizon.utils import functions as utils -import disaster_recovery.api.api as freezer_api -from disaster_recovery.utils import shield -from disaster_recovery.utils import timestamp_to_string +import freezer_ui.api.api as freezer_api +from freezer_ui.utils import shield +from freezer_ui.utils import timestamp_to_string class Restore(tables.LinkAction): diff --git a/disaster_recovery/backups/templates/backups/detail.html b/freezer_ui/backups/templates/backups/detail.html similarity index 100% rename from disaster_recovery/backups/templates/backups/detail.html rename to freezer_ui/backups/templates/backups/detail.html diff --git a/disaster_recovery/backups/templates/backups/index.html b/freezer_ui/backups/templates/backups/index.html similarity index 100% rename from disaster_recovery/backups/templates/backups/index.html rename to freezer_ui/backups/templates/backups/index.html diff --git a/disaster_recovery/backups/templates/backups/restore.html b/freezer_ui/backups/templates/backups/restore.html similarity index 100% rename from disaster_recovery/backups/templates/backups/restore.html rename to freezer_ui/backups/templates/backups/restore.html diff --git a/disaster_recovery/backups/urls.py b/freezer_ui/backups/urls.py similarity index 95% rename from disaster_recovery/backups/urls.py rename to freezer_ui/backups/urls.py index b7da993..7261701 100644 --- a/disaster_recovery/backups/urls.py +++ b/freezer_ui/backups/urls.py @@ -15,7 +15,7 @@ from django.urls import re_path -from disaster_recovery.backups import views +from freezer_ui.backups import views urlpatterns = [ diff --git a/disaster_recovery/backups/views.py b/freezer_ui/backups/views.py similarity index 92% rename from disaster_recovery/backups/views.py rename to freezer_ui/backups/views.py index 6f7efc0..b503912 100644 --- a/disaster_recovery/backups/views.py +++ b/freezer_ui/backups/views.py @@ -19,11 +19,11 @@ from django.views import generic from horizon import tables from horizon import workflows -import disaster_recovery.api.api as freezer_api +import freezer_ui.api.api as freezer_api -from disaster_recovery.backups import tables as freezer_tables -from disaster_recovery.backups.workflows import restore as restore_workflow -from disaster_recovery.utils import shield +from freezer_ui.backups import tables as freezer_tables +from freezer_ui.backups.workflows import restore as restore_workflow +from freezer_ui.utils import shield class IndexView(tables.DataTableView): diff --git a/disaster_recovery/backups/workflows/__init__.py b/freezer_ui/backups/workflows/__init__.py similarity index 100% rename from disaster_recovery/backups/workflows/__init__.py rename to freezer_ui/backups/workflows/__init__.py diff --git a/disaster_recovery/backups/workflows/restore.py b/freezer_ui/backups/workflows/restore.py similarity index 97% rename from disaster_recovery/backups/workflows/restore.py rename to freezer_ui/backups/workflows/restore.py index f23bafb..8feefd8 100644 --- a/disaster_recovery/backups/workflows/restore.py +++ b/freezer_ui/backups/workflows/restore.py @@ -19,7 +19,7 @@ from horizon import exceptions from horizon import forms from horizon import workflows -import disaster_recovery.api.api as freezer_api +import freezer_ui.api.api as freezer_api class DestinationAction(workflows.MembershipAction): diff --git a/disaster_recovery/clients/__init__.py b/freezer_ui/clients/__init__.py similarity index 100% rename from disaster_recovery/clients/__init__.py rename to freezer_ui/clients/__init__.py diff --git a/disaster_recovery/clients/panel.py b/freezer_ui/clients/panel.py similarity index 95% rename from disaster_recovery/clients/panel.py rename to freezer_ui/clients/panel.py index 4a00b20..375c6c4 100644 --- a/disaster_recovery/clients/panel.py +++ b/freezer_ui/clients/panel.py @@ -16,7 +16,7 @@ from django.utils.translation import gettext_lazy as _ import horizon -from disaster_recovery import dashboard +from freezer_ui import dashboard class ClientsPanel(horizon.Panel): diff --git a/disaster_recovery/clients/tables.py b/freezer_ui/clients/tables.py similarity index 95% rename from disaster_recovery/clients/tables.py rename to freezer_ui/clients/tables.py index eba2388..c0d7e0e 100644 --- a/disaster_recovery/clients/tables.py +++ b/freezer_ui/clients/tables.py @@ -16,8 +16,8 @@ from django.utils.translation import ngettext_lazy from horizon import tables from django.urls import reverse -import disaster_recovery.api.api as freezer_api -from disaster_recovery.utils import shield +import freezer_ui.api.api as freezer_api +from freezer_ui.utils import shield class Filter(tables.FilterAction): diff --git a/disaster_recovery/clients/templates/clients/detail.html b/freezer_ui/clients/templates/clients/detail.html similarity index 100% rename from disaster_recovery/clients/templates/clients/detail.html rename to freezer_ui/clients/templates/clients/detail.html diff --git a/disaster_recovery/clients/templates/clients/index.html b/freezer_ui/clients/templates/clients/index.html similarity index 100% rename from disaster_recovery/clients/templates/clients/index.html rename to freezer_ui/clients/templates/clients/index.html diff --git a/disaster_recovery/clients/urls.py b/freezer_ui/clients/urls.py similarity index 95% rename from disaster_recovery/clients/urls.py rename to freezer_ui/clients/urls.py index 335b236..a63bd20 100644 --- a/disaster_recovery/clients/urls.py +++ b/freezer_ui/clients/urls.py @@ -14,7 +14,7 @@ from django.urls import re_path -from disaster_recovery.clients import views +from freezer_ui.clients import views urlpatterns = [ re_path(r'^$', views.IndexView.as_view(), name='index'), diff --git a/disaster_recovery/clients/views.py b/freezer_ui/clients/views.py similarity index 90% rename from disaster_recovery/clients/views.py rename to freezer_ui/clients/views.py index e720cab..60e7eed 100644 --- a/disaster_recovery/clients/views.py +++ b/freezer_ui/clients/views.py @@ -17,10 +17,10 @@ from django.views import generic from horizon import tables -import disaster_recovery.api.api as freezer_api +import freezer_ui.api.api as freezer_api -from disaster_recovery.clients import tables as freezer_tables -from disaster_recovery.utils import shield +from freezer_ui.clients import tables as freezer_tables +from freezer_ui.utils import shield class IndexView(tables.DataTableView): diff --git a/disaster_recovery/dashboard.py b/freezer_ui/dashboard.py similarity index 100% rename from disaster_recovery/dashboard.py rename to freezer_ui/dashboard.py diff --git a/disaster_recovery/enabled/_5050_freezer.py b/freezer_ui/enabled/_5050_freezer.py similarity index 91% rename from disaster_recovery/enabled/_5050_freezer.py rename to freezer_ui/enabled/_5050_freezer.py index f9e97d4..78086fe 100644 --- a/disaster_recovery/enabled/_5050_freezer.py +++ b/freezer_ui/enabled/_5050_freezer.py @@ -6,5 +6,5 @@ DISABLED = False # A list of applications to be added to INSTALLED_APPS. ADD_INSTALLED_APPS = [ - 'disaster_recovery', + 'freezer_ui', ] diff --git a/disaster_recovery/enabled/_7050_freezer_remove_panel_.py b/freezer_ui/enabled/_7050_freezer_remove_panel_.py similarity index 100% rename from disaster_recovery/enabled/_7050_freezer_remove_panel_.py rename to freezer_ui/enabled/_7050_freezer_remove_panel_.py diff --git a/disaster_recovery/enabled/__init__.py b/freezer_ui/enabled/__init__.py similarity index 100% rename from disaster_recovery/enabled/__init__.py rename to freezer_ui/enabled/__init__.py diff --git a/disaster_recovery/jobs/__init__.py b/freezer_ui/jobs/__init__.py similarity index 100% rename from disaster_recovery/jobs/__init__.py rename to freezer_ui/jobs/__init__.py diff --git a/disaster_recovery/jobs/browsers.py b/freezer_ui/jobs/browsers.py similarity index 95% rename from disaster_recovery/jobs/browsers.py rename to freezer_ui/jobs/browsers.py index 41b3fc2..a0c274a 100644 --- a/disaster_recovery/jobs/browsers.py +++ b/freezer_ui/jobs/browsers.py @@ -14,7 +14,7 @@ from django.utils.translation import gettext_lazy as _ -from disaster_recovery.jobs import tables +from freezer_ui.jobs import tables from horizon import browsers diff --git a/disaster_recovery/jobs/panel.py b/freezer_ui/jobs/panel.py similarity index 95% rename from disaster_recovery/jobs/panel.py rename to freezer_ui/jobs/panel.py index 6b88022..f73e832 100644 --- a/disaster_recovery/jobs/panel.py +++ b/freezer_ui/jobs/panel.py @@ -16,7 +16,7 @@ from django.utils.translation import gettext_lazy as _ import horizon -from disaster_recovery import dashboard +from freezer_ui import dashboard class JobsPanel(horizon.Panel): diff --git a/disaster_recovery/jobs/tables.py b/freezer_ui/jobs/tables.py similarity index 98% rename from disaster_recovery/jobs/tables.py rename to freezer_ui/jobs/tables.py index 4e49dd6..e3fec65 100644 --- a/disaster_recovery/jobs/tables.py +++ b/freezer_ui/jobs/tables.py @@ -20,8 +20,8 @@ from horizon import tables from horizon import messages from django.urls import reverse -import disaster_recovery.api.api as freezer_api -from disaster_recovery.utils import shield +import freezer_ui.api.api as freezer_api +from freezer_ui.utils import shield class ObjectFilterAction(tables.FilterAction): diff --git a/disaster_recovery/jobs/templates/jobs/_actions.html b/freezer_ui/jobs/templates/jobs/_actions.html similarity index 100% rename from disaster_recovery/jobs/templates/jobs/_actions.html rename to freezer_ui/jobs/templates/jobs/_actions.html diff --git a/disaster_recovery/jobs/templates/jobs/_info.html b/freezer_ui/jobs/templates/jobs/_info.html similarity index 100% rename from disaster_recovery/jobs/templates/jobs/_info.html rename to freezer_ui/jobs/templates/jobs/_info.html diff --git a/disaster_recovery/jobs/templates/jobs/browser.html b/freezer_ui/jobs/templates/jobs/browser.html similarity index 100% rename from disaster_recovery/jobs/templates/jobs/browser.html rename to freezer_ui/jobs/templates/jobs/browser.html diff --git a/disaster_recovery/jobs/urls.py b/freezer_ui/jobs/urls.py similarity index 96% rename from disaster_recovery/jobs/urls.py rename to freezer_ui/jobs/urls.py index 2ac6e34..21c4c21 100644 --- a/disaster_recovery/jobs/urls.py +++ b/freezer_ui/jobs/urls.py @@ -13,7 +13,7 @@ # limitations under the License. from django.urls import re_path -from disaster_recovery.jobs import views +from freezer_ui.jobs import views urlpatterns = [ re_path(r'^(?P[^/]+)?$', diff --git a/disaster_recovery/jobs/views.py b/freezer_ui/jobs/views.py similarity index 90% rename from disaster_recovery/jobs/views.py rename to freezer_ui/jobs/views.py index a379771..324bdf8 100644 --- a/disaster_recovery/jobs/views.py +++ b/freezer_ui/jobs/views.py @@ -13,14 +13,14 @@ from horizon import browsers from horizon import workflows -from disaster_recovery.jobs.workflows import create as configure_workflow -from disaster_recovery.jobs.workflows import update_job as update_job_workflow -from disaster_recovery.jobs.workflows import update_actions as update_workflow +from freezer_ui.jobs.workflows import create as configure_workflow +from freezer_ui.jobs.workflows import update_job as update_job_workflow +from freezer_ui.jobs.workflows import update_actions as update_workflow -import disaster_recovery.api.api as freezer_api -import disaster_recovery.jobs.browsers as project_browsers +import freezer_ui.api.api as freezer_api +import freezer_ui.jobs.browsers as project_browsers -from disaster_recovery.utils import shield +from freezer_ui.utils import shield class JobsView(browsers.ResourceBrowserView): diff --git a/disaster_recovery/jobs/workflows/__init__.py b/freezer_ui/jobs/workflows/__init__.py similarity index 100% rename from disaster_recovery/jobs/workflows/__init__.py rename to freezer_ui/jobs/workflows/__init__.py diff --git a/disaster_recovery/jobs/workflows/actions.py b/freezer_ui/jobs/workflows/actions.py similarity index 98% rename from disaster_recovery/jobs/workflows/actions.py rename to freezer_ui/jobs/workflows/actions.py index 5437569..38a4083 100644 --- a/disaster_recovery/jobs/workflows/actions.py +++ b/freezer_ui/jobs/workflows/actions.py @@ -17,7 +17,7 @@ from horizon import exceptions from horizon import forms from horizon import workflows -import disaster_recovery.api.api as freezer_api +import freezer_ui.api.api as freezer_api class ActionsConfigurationAction(workflows.Action): diff --git a/disaster_recovery/jobs/workflows/create.py b/freezer_ui/jobs/workflows/create.py similarity index 99% rename from disaster_recovery/jobs/workflows/create.py rename to freezer_ui/jobs/workflows/create.py index fb47a49..683dc7e 100644 --- a/disaster_recovery/jobs/workflows/create.py +++ b/freezer_ui/jobs/workflows/create.py @@ -21,7 +21,7 @@ from horizon import exceptions from horizon import forms from horizon import workflows -import disaster_recovery.api.api as freezer_api +import freezer_ui.api.api as freezer_api class ActionsConfigurationAction(workflows.Action): diff --git a/disaster_recovery/jobs/workflows/update_actions.py b/freezer_ui/jobs/workflows/update_actions.py similarity index 97% rename from disaster_recovery/jobs/workflows/update_actions.py rename to freezer_ui/jobs/workflows/update_actions.py index 410c5e2..25fcfb6 100644 --- a/disaster_recovery/jobs/workflows/update_actions.py +++ b/freezer_ui/jobs/workflows/update_actions.py @@ -19,7 +19,7 @@ from horizon import exceptions from horizon import forms from horizon import workflows -import disaster_recovery.api.api as freezer_api +import freezer_ui.api.api as freezer_api class ActionsConfigurationAction(workflows.Action): diff --git a/disaster_recovery/jobs/workflows/update_job.py b/freezer_ui/jobs/workflows/update_job.py similarity index 98% rename from disaster_recovery/jobs/workflows/update_job.py rename to freezer_ui/jobs/workflows/update_job.py index 2cb8f3f..e2c1b23 100644 --- a/disaster_recovery/jobs/workflows/update_job.py +++ b/freezer_ui/jobs/workflows/update_job.py @@ -21,7 +21,7 @@ from horizon import exceptions from horizon import forms from horizon import workflows -import disaster_recovery.api.api as freezer_api +import freezer_ui.api.api as freezer_api class InfoConfigurationAction(workflows.Action): diff --git a/disaster_recovery/locale/de/LC_MESSAGES/django.po b/freezer_ui/locale/de/LC_MESSAGES/django.po similarity index 100% rename from disaster_recovery/locale/de/LC_MESSAGES/django.po rename to freezer_ui/locale/de/LC_MESSAGES/django.po diff --git a/disaster_recovery/locale/en_GB/LC_MESSAGES/django.po b/freezer_ui/locale/en_GB/LC_MESSAGES/django.po similarity index 100% rename from disaster_recovery/locale/en_GB/LC_MESSAGES/django.po rename to freezer_ui/locale/en_GB/LC_MESSAGES/django.po diff --git a/disaster_recovery/locale/ko_KR/LC_MESSAGES/django.po b/freezer_ui/locale/ko_KR/LC_MESSAGES/django.po similarity index 100% rename from disaster_recovery/locale/ko_KR/LC_MESSAGES/django.po rename to freezer_ui/locale/ko_KR/LC_MESSAGES/django.po diff --git a/disaster_recovery/locale/zh_Hans/LC_MESSAGES/django.po b/freezer_ui/locale/zh_Hans/LC_MESSAGES/django.po similarity index 100% rename from disaster_recovery/locale/zh_Hans/LC_MESSAGES/django.po rename to freezer_ui/locale/zh_Hans/LC_MESSAGES/django.po diff --git a/disaster_recovery/models.py b/freezer_ui/models.py similarity index 100% rename from disaster_recovery/models.py rename to freezer_ui/models.py diff --git a/disaster_recovery/sessions/__init__.py b/freezer_ui/sessions/__init__.py similarity index 100% rename from disaster_recovery/sessions/__init__.py rename to freezer_ui/sessions/__init__.py diff --git a/disaster_recovery/sessions/browsers.py b/freezer_ui/sessions/browsers.py similarity index 95% rename from disaster_recovery/sessions/browsers.py rename to freezer_ui/sessions/browsers.py index 6daddee..1940c06 100644 --- a/disaster_recovery/sessions/browsers.py +++ b/freezer_ui/sessions/browsers.py @@ -14,7 +14,7 @@ from django.utils.translation import gettext_lazy as _ -from disaster_recovery.sessions import tables +from freezer_ui.sessions import tables from horizon import browsers diff --git a/disaster_recovery/sessions/panel.py b/freezer_ui/sessions/panel.py similarity index 95% rename from disaster_recovery/sessions/panel.py rename to freezer_ui/sessions/panel.py index 8423dca..3b85526 100644 --- a/disaster_recovery/sessions/panel.py +++ b/freezer_ui/sessions/panel.py @@ -17,7 +17,7 @@ from django.utils.translation import gettext_lazy as _ import horizon -from disaster_recovery import dashboard +from freezer_ui import dashboard class SessionsPanel(horizon.Panel): diff --git a/disaster_recovery/sessions/tables.py b/freezer_ui/sessions/tables.py similarity index 97% rename from disaster_recovery/sessions/tables.py rename to freezer_ui/sessions/tables.py index 951ac7a..00671a6 100644 --- a/disaster_recovery/sessions/tables.py +++ b/freezer_ui/sessions/tables.py @@ -18,8 +18,8 @@ from django.urls import reverse from horizon import tables -import disaster_recovery.api.api as freezer_api -from disaster_recovery.utils import shield +import freezer_ui.api.api as freezer_api +from freezer_ui.utils import shield class ObjectFilterAction(tables.FilterAction): diff --git a/disaster_recovery/sessions/templates/sessions/_info.html b/freezer_ui/sessions/templates/sessions/_info.html similarity index 100% rename from disaster_recovery/sessions/templates/sessions/_info.html rename to freezer_ui/sessions/templates/sessions/_info.html diff --git a/disaster_recovery/sessions/templates/sessions/browser.html b/freezer_ui/sessions/templates/sessions/browser.html similarity index 100% rename from disaster_recovery/sessions/templates/sessions/browser.html rename to freezer_ui/sessions/templates/sessions/browser.html diff --git a/disaster_recovery/sessions/urls.py b/freezer_ui/sessions/urls.py similarity index 96% rename from disaster_recovery/sessions/urls.py rename to freezer_ui/sessions/urls.py index 25547eb..9c14d14 100644 --- a/disaster_recovery/sessions/urls.py +++ b/freezer_ui/sessions/urls.py @@ -14,7 +14,7 @@ from django.urls import re_path -from disaster_recovery.sessions import views +from freezer_ui.sessions import views urlpatterns = [ re_path(r'^(?P[^/]+)?$', diff --git a/disaster_recovery/sessions/views.py b/freezer_ui/sessions/views.py similarity index 91% rename from disaster_recovery/sessions/views.py rename to freezer_ui/sessions/views.py index 7e7eada..c1fdc3b 100644 --- a/disaster_recovery/sessions/views.py +++ b/freezer_ui/sessions/views.py @@ -15,12 +15,12 @@ from horizon import browsers from horizon import workflows -import disaster_recovery.api.api as freezer_api -import disaster_recovery.sessions.browsers as project_browsers +import freezer_ui.api.api as freezer_api +import freezer_ui.sessions.browsers as project_browsers -from disaster_recovery.sessions.workflows import attach -from disaster_recovery.sessions.workflows import create -from disaster_recovery.utils import shield +from freezer_ui.sessions.workflows import attach +from freezer_ui.sessions.workflows import create +from freezer_ui.utils import shield class SessionsView(browsers.ResourceBrowserView): diff --git a/disaster_recovery/sessions/workflows/__init__.py b/freezer_ui/sessions/workflows/__init__.py similarity index 100% rename from disaster_recovery/sessions/workflows/__init__.py rename to freezer_ui/sessions/workflows/__init__.py diff --git a/disaster_recovery/sessions/workflows/attach.py b/freezer_ui/sessions/workflows/attach.py similarity index 98% rename from disaster_recovery/sessions/workflows/attach.py rename to freezer_ui/sessions/workflows/attach.py index 87ae840..42c2c40 100644 --- a/disaster_recovery/sessions/workflows/attach.py +++ b/freezer_ui/sessions/workflows/attach.py @@ -19,7 +19,7 @@ from horizon import exceptions from horizon import forms from horizon import workflows -import disaster_recovery.api.api as freezer_api +import freezer_ui.api.api as freezer_api class SessionConfigurationAction(workflows.Action): diff --git a/disaster_recovery/sessions/workflows/create.py b/freezer_ui/sessions/workflows/create.py similarity index 98% rename from disaster_recovery/sessions/workflows/create.py rename to freezer_ui/sessions/workflows/create.py index 5050a7b..5eb2677 100644 --- a/disaster_recovery/sessions/workflows/create.py +++ b/freezer_ui/sessions/workflows/create.py @@ -22,7 +22,7 @@ from horizon import exceptions from horizon import forms from horizon import workflows -import disaster_recovery.api.api as freezer_api +import freezer_ui.api.api as freezer_api class SessionConfigurationAction(workflows.Action): diff --git a/disaster_recovery/static/freezer/css/bootstrap-datetimepicker.min.css b/freezer_ui/static/freezer/css/bootstrap-datetimepicker.min.css similarity index 100% rename from disaster_recovery/static/freezer/css/bootstrap-datetimepicker.min.css rename to freezer_ui/static/freezer/css/bootstrap-datetimepicker.min.css diff --git a/disaster_recovery/static/freezer/css/freezer.css b/freezer_ui/static/freezer/css/freezer.css similarity index 100% rename from disaster_recovery/static/freezer/css/freezer.css rename to freezer_ui/static/freezer/css/freezer.css diff --git a/disaster_recovery/static/freezer/js/freezer.action.datetimepicker.js b/freezer_ui/static/freezer/js/freezer.action.datetimepicker.js similarity index 100% rename from disaster_recovery/static/freezer/js/freezer.action.datetimepicker.js rename to freezer_ui/static/freezer/js/freezer.action.datetimepicker.js diff --git a/disaster_recovery/static/freezer/js/freezer.actions.action.js b/freezer_ui/static/freezer/js/freezer.actions.action.js similarity index 100% rename from disaster_recovery/static/freezer/js/freezer.actions.action.js rename to freezer_ui/static/freezer/js/freezer.actions.action.js diff --git a/disaster_recovery/static/freezer/js/freezer.actions.advanced.js b/freezer_ui/static/freezer/js/freezer.actions.advanced.js similarity index 100% rename from disaster_recovery/static/freezer/js/freezer.actions.advanced.js rename to freezer_ui/static/freezer/js/freezer.actions.advanced.js diff --git a/disaster_recovery/static/freezer/js/freezer.actions.snapshot.js b/freezer_ui/static/freezer/js/freezer.actions.snapshot.js similarity index 100% rename from disaster_recovery/static/freezer/js/freezer.actions.snapshot.js rename to freezer_ui/static/freezer/js/freezer.actions.snapshot.js diff --git a/disaster_recovery/static/freezer/js/freezer.common.js b/freezer_ui/static/freezer/js/freezer.common.js similarity index 83% rename from disaster_recovery/static/freezer/js/freezer.common.js rename to freezer_ui/static/freezer/js/freezer.common.js index 5485a7a..f8b54dd 100644 --- a/disaster_recovery/static/freezer/js/freezer.common.js +++ b/freezer_ui/static/freezer/js/freezer.common.js @@ -5,7 +5,7 @@ var Browser = (function () { url += "//"; url += $(location).attr("host"); - url += WEBROOT + 'disaster_recovery/api/'; + url += WEBROOT + 'freezer_ui/api/'; return { get_url : function () { diff --git a/disaster_recovery/static/freezer/js/freezer.datetimepicker.js b/freezer_ui/static/freezer/js/freezer.datetimepicker.js similarity index 100% rename from disaster_recovery/static/freezer/js/freezer.datetimepicker.js rename to freezer_ui/static/freezer/js/freezer.datetimepicker.js diff --git a/disaster_recovery/static/freezer/js/freezer.jobs.create.infos.js b/freezer_ui/static/freezer/js/freezer.jobs.create.infos.js similarity index 100% rename from disaster_recovery/static/freezer/js/freezer.jobs.create.infos.js rename to freezer_ui/static/freezer/js/freezer.jobs.create.infos.js diff --git a/disaster_recovery/static/freezer/js/freezer.jobs.sortable.js b/freezer_ui/static/freezer/js/freezer.jobs.sortable.js similarity index 100% rename from disaster_recovery/static/freezer/js/freezer.jobs.sortable.js rename to freezer_ui/static/freezer/js/freezer.jobs.sortable.js diff --git a/disaster_recovery/static/freezer/js/freezer.js b/freezer_ui/static/freezer/js/freezer.js similarity index 94% rename from disaster_recovery/static/freezer/js/freezer.js rename to freezer_ui/static/freezer/js/freezer.js index ff1ef9b..08f98a8 100644 --- a/disaster_recovery/static/freezer/js/freezer.js +++ b/freezer_ui/static/freezer/js/freezer.js @@ -21,7 +21,7 @@ angular.module('hz').controller('DestinationCtrl', function ($scope, $http, $location) { $scope.query = ''; - $http.get($location.protocol() + "://" + $location.host() + ":" + $location.port() + "/disaster_recovery/api/clients"). + $http.get($location.protocol() + "://" + $location.host() + ":" + $location.port() + "/freezer_ui/api/clients"). success(function (data) { $scope.clients = data; }); diff --git a/disaster_recovery/static/freezer/js/freezer.restore.js b/freezer_ui/static/freezer/js/freezer.restore.js similarity index 100% rename from disaster_recovery/static/freezer/js/freezer.restore.js rename to freezer_ui/static/freezer/js/freezer.restore.js diff --git a/disaster_recovery/static/freezer/js/vendor/LICENSE b/freezer_ui/static/freezer/js/vendor/LICENSE similarity index 100% rename from disaster_recovery/static/freezer/js/vendor/LICENSE rename to freezer_ui/static/freezer/js/vendor/LICENSE diff --git a/disaster_recovery/static/freezer/js/vendor/bootstrap-datetimepicker.js b/freezer_ui/static/freezer/js/vendor/bootstrap-datetimepicker.js similarity index 100% rename from disaster_recovery/static/freezer/js/vendor/bootstrap-datetimepicker.js rename to freezer_ui/static/freezer/js/vendor/bootstrap-datetimepicker.js diff --git a/disaster_recovery/static/freezer/js/vendor/moment.js b/freezer_ui/static/freezer/js/vendor/moment.js similarity index 100% rename from disaster_recovery/static/freezer/js/vendor/moment.js rename to freezer_ui/static/freezer/js/vendor/moment.js diff --git a/disaster_recovery/tests/__init__.py b/freezer_ui/tests/__init__.py similarity index 100% rename from disaster_recovery/tests/__init__.py rename to freezer_ui/tests/__init__.py diff --git a/disaster_recovery/tests/settings.py b/freezer_ui/tests/settings.py similarity index 100% rename from disaster_recovery/tests/settings.py rename to freezer_ui/tests/settings.py diff --git a/disaster_recovery/tests/test_api.py b/freezer_ui/tests/test_api.py similarity index 100% rename from disaster_recovery/tests/test_api.py rename to freezer_ui/tests/test_api.py diff --git a/disaster_recovery/urls.py b/freezer_ui/urls.py similarity index 93% rename from disaster_recovery/urls.py rename to freezer_ui/urls.py index 0babea3..3638b84 100644 --- a/disaster_recovery/urls.py +++ b/freezer_ui/urls.py @@ -14,7 +14,7 @@ from django.conf.urls import include from django.urls import re_path -import disaster_recovery.api.rest.urls as rest_urls +import freezer_ui.api.rest.urls as rest_urls urlpatterns = [ diff --git a/disaster_recovery/utils.py b/freezer_ui/utils.py similarity index 100% rename from disaster_recovery/utils.py rename to freezer_ui/utils.py diff --git a/disaster_recovery/version.py b/freezer_ui/version.py similarity index 100% rename from disaster_recovery/version.py rename to freezer_ui/version.py diff --git a/manage.py b/manage.py index 6fd19f1..1f82d60 100755 --- a/manage.py +++ b/manage.py @@ -18,6 +18,6 @@ import sys if __name__ == "__main__": os.environ.setdefault( - "DJANGO_SETTINGS_MODULE", "disaster_recovery.tests.settings") + "DJANGO_SETTINGS_MODULE", "freezer_ui.tests.settings") from django.core.management import execute_from_command_line # noqa execute_from_command_line(sys.argv) diff --git a/releasenotes/notes/package_rename-635a1b32e355cd11.yaml b/releasenotes/notes/package_rename-635a1b32e355cd11.yaml new file mode 100644 index 0000000..0f8a671 --- /dev/null +++ b/releasenotes/notes/package_rename-635a1b32e355cd11.yaml @@ -0,0 +1,7 @@ +--- +prelude: > + Python package name for Freezer Horizon Dashboard has been renamed from + ``disaster_recovery`` to ``freezer_ui`` in order to align with repository + naming and naming conventions for Dashboards. + This will not have any effect on URIs inside of the Horizon as well as + representation of the Dashboard in UI. diff --git a/run_tests.sh b/run_tests.sh index aed8402..bf4f109 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -57,7 +57,7 @@ root=`pwd -P` venv=$root/.venv venv_env_version=$venv/environments with_venv=tools/with_venv.sh -included_dirs="disaster_recovery" +included_dirs="freezer_ui" always_venv=0 backup_env=0 @@ -187,7 +187,7 @@ function warn_on_flake8_without_venv { function run_pep8 { echo "Running flake8 ..." warn_on_flake8_without_venv - DJANGO_SETTINGS_MODULE=disaster_recovery.test.settings ${command_wrapper} flake8 + DJANGO_SETTINGS_MODULE=freezer_ui.test.settings ${command_wrapper} flake8 } function run_pep8_changed { @@ -200,13 +200,13 @@ function run_pep8_changed { files=$(git diff --name-only $base_commit | tr '\n' ' ') echo "Running flake8 on ${files}" warn_on_flake8_without_venv - diff -u --from-file /dev/null ${files} | DJANGO_SETTINGS_MODULE=disaster_recovery.test.settings ${command_wrapper} flake8 --diff + diff -u --from-file /dev/null ${files} | DJANGO_SETTINGS_MODULE=freezer_ui.test.settings ${command_wrapper} flake8 --diff exit } function run_sphinx { echo "Building sphinx..." - DJANGO_SETTINGS_MODULE=disaster_recovery.test.settings ${command_wrapper} python setup.py build_sphinx + DJANGO_SETTINGS_MODULE=freezer_ui.test.settings ${command_wrapper} python setup.py build_sphinx echo "Build complete." } @@ -340,7 +340,7 @@ function run_tests { fi if [ $with_selenium -eq 0 -a $integration -eq 0 ]; then - testopts="$testopts --exclude-dir=disaster_recovery/test/integration_tests" + testopts="$testopts --exclude-dir=freezer_ui/test/integration_tests" fi if [ $selenium_headless -eq 1 ]; then @@ -361,11 +361,11 @@ function run_tests_subset { function run_tests_all { echo "Running Freezer Web UI tests" - export NOSE_XUNIT_FILE=disaster_recovery/nosetests.xml + export NOSE_XUNIT_FILE=freezer_ui/nosetests.xml if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then export NOSE_HTML_OUT_FILE='dashboard_nose_results.html' fi - ${command_wrapper} ${coverage_run} $root/manage.py test disaster_recovery --settings=disaster_recovery.test.settings $testopts + ${command_wrapper} ${coverage_run} $root/manage.py test freezer_ui --settings=freezer_ui.test.settings $testopts # get results of the openstack_dashboard tests DASHBOARD_RESULT=$? @@ -421,7 +421,7 @@ function babel_extract { function run_makemessages { echo -n "freezer web ui: " - cd disaster_recovery + cd freezer_ui babel_extract django FREEZER_PY_RESULT=$? @@ -431,7 +431,7 @@ function run_makemessages { cd .. if [ $check_only -eq 1 ]; then - rm disaster_recovery/locale/django*.pot + rm freezer_ui/locale/django*.pot fi exit $(($FREEZER_PY_RESULT || $FREEZER_JS_RESULT)) diff --git a/setup.cfg b/setup.cfg index 097491c..c5f7749 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,4 +32,4 @@ keywords = [files] packages = - disaster_recovery + freezer_ui diff --git a/tox.ini b/tox.ini index 6cef44d..cc552f1 100644 --- a/tox.ini +++ b/tox.ini @@ -38,11 +38,11 @@ commands = python setup.py test --coverage --testr-args={posargs} [testenv:docs] deps = -r{toxinidir}/doc/requirements.txt -setenv = DJANGO_SETTINGS_MODULE=disaster_recovery.test.settings +setenv = DJANGO_SETTINGS_MODULE=freezer_ui.test.settings commands = sphinx-build -W --keep-going -b html doc/source doc/build/html [testenv:pylint] -commands = pylint --rcfile .pylintrc disaster_recovery +commands = pylint --rcfile .pylintrc freezer_ui [flake8] # W504 line break after binary operator