diff options
author | Radomir Dopieralski <openstack@sheep.art.pl> | 2013-12-09 16:53:10 +0100 |
---|---|---|
committer | Radomir Dopieralski <openstack@sheep.art.pl> | 2013-12-10 12:23:52 +0100 |
commit | 22a16aaaa1c2d134877571f998febca864969e71 (patch) | |
tree | 60f285fa0aaa768e66482a3199a79092d31f8644 | |
parent | ffbf33370c117cfea5d66bf5275d352c75072c3a (diff) | |
download | tuskar-ui-22a16aaaa1c2d134877571f998febca864969e71.tar.gz |
Group related panels in packages (deployment)
This is a part of a larger patch, split to make it less
confusing. This patch deals with moving the files into
the "deployment/" directory.
Make the file structure of the source reflect the logical
structure of the application (and its menus) by grouping
related panels into packages. This gives us a place to put
common code shared by those panels, and lets us find the
source code for a specific panel based on where it is in
the menu.
Because Horizon was not initially designed for autodiscovery
of panels that are not immediate children of the dashboard,
the URLs of those panels will have the form of
/infrastructure/resources.archived/. That can be amended by
a simple patch to Horizon later on.
Change-Id: I8df74ac8c8ffb913b9e653f049f64d725c4e32d3
-rw-r--r-- | tuskar_ui/infrastructure/dashboard.py | 12 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deploy_overview/urls.py | 23 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/__init__.py (renamed from tuskar_ui/infrastructure/deploy_block_storage/__init__.py) | 0 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/block_storage/__init__.py (renamed from tuskar_ui/infrastructure/deploy_compute/__init__.py) | 0 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/block_storage/panel.py (renamed from tuskar_ui/infrastructure/deploy_block_storage/panel.py) | 2 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/block_storage/urls.py (renamed from tuskar_ui/infrastructure/deploy_block_storage/urls.py) | 2 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/block_storage/views.py (renamed from tuskar_ui/infrastructure/deploy_block_storage/views.py) | 0 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/compute/__init__.py (renamed from tuskar_ui/infrastructure/deploy_controller/__init__.py) | 0 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/compute/panel.py (renamed from tuskar_ui/infrastructure/deploy_compute/panel.py) | 2 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/compute/urls.py (renamed from tuskar_ui/infrastructure/deploy_controller/urls.py) | 2 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/compute/views.py (renamed from tuskar_ui/infrastructure/deploy_compute/views.py) | 0 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/controller/__init__.py (renamed from tuskar_ui/infrastructure/deploy_object_storage/__init__.py) | 0 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/controller/panel.py (renamed from tuskar_ui/infrastructure/deploy_controller/panel.py) | 2 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/controller/urls.py (renamed from tuskar_ui/infrastructure/resources/unallocated/urls.py) | 2 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/controller/views.py (renamed from tuskar_ui/infrastructure/deploy_controller/views.py) | 0 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/object_storage/__init__.py (renamed from tuskar_ui/infrastructure/deploy_overview/__init__.py) | 0 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/object_storage/panel.py (renamed from tuskar_ui/infrastructure/deploy_object_storage/panel.py) | 2 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/object_storage/urls.py (renamed from tuskar_ui/infrastructure/deploy_object_storage/urls.py) | 2 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/object_storage/views.py (renamed from tuskar_ui/infrastructure/deploy_object_storage/views.py) | 0 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/overview/__init__.py | 0 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/overview/panel.py (renamed from tuskar_ui/infrastructure/deploy_overview/panel.py) | 2 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/overview/urls.py (renamed from tuskar_ui/infrastructure/deploy_compute/urls.py) | 2 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/deployment/overview/views.py (renamed from tuskar_ui/infrastructure/deploy_overview/views.py) | 0 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/resources/archived/urls.py | 23 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/resources/management/urls.py | 23 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/resources/overview/urls.py | 23 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/resources/resource/urls.py | 23 |
27 files changed, 16 insertions, 131 deletions
diff --git a/tuskar_ui/infrastructure/dashboard.py b/tuskar_ui/infrastructure/dashboard.py index 7b9df905..0daa11d1 100644 --- a/tuskar_ui/infrastructure/dashboard.py +++ b/tuskar_ui/infrastructure/dashboard.py @@ -26,14 +26,14 @@ class InfrastructureOverview(horizon.PanelGroup): class Deployment(horizon.PanelGroup): - slug = "deploy" + slug = "deployment" name = _("Deployment") panels = ( - 'deploy_overview', - 'deploy_controller', - 'deploy_compute', - 'deploy_object_storage', - 'deploy_block_storage', + 'deployment.overview', + 'deployment.controller', + 'deployment.compute', + 'deployment.object_storage', + 'deployment.block_storage', ) diff --git a/tuskar_ui/infrastructure/deploy_overview/urls.py b/tuskar_ui/infrastructure/deploy_overview/urls.py deleted file mode 100644 index b98691d3..00000000 --- a/tuskar_ui/infrastructure/deploy_overview/urls.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf8 -*- -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from django.conf.urls import defaults - -from tuskar_ui.infrastructure.deploy_overview import views - - -urlpatterns = defaults.patterns( - '', - defaults.url(r'^$', views.IndexView.as_view(), name='index'), -) diff --git a/tuskar_ui/infrastructure/deploy_block_storage/__init__.py b/tuskar_ui/infrastructure/deployment/__init__.py index e69de29b..e69de29b 100644 --- a/tuskar_ui/infrastructure/deploy_block_storage/__init__.py +++ b/tuskar_ui/infrastructure/deployment/__init__.py diff --git a/tuskar_ui/infrastructure/deploy_compute/__init__.py b/tuskar_ui/infrastructure/deployment/block_storage/__init__.py index e69de29b..e69de29b 100644 --- a/tuskar_ui/infrastructure/deploy_compute/__init__.py +++ b/tuskar_ui/infrastructure/deployment/block_storage/__init__.py diff --git a/tuskar_ui/infrastructure/deploy_block_storage/panel.py b/tuskar_ui/infrastructure/deployment/block_storage/panel.py index 780e5340..d021aefd 100644 --- a/tuskar_ui/infrastructure/deploy_block_storage/panel.py +++ b/tuskar_ui/infrastructure/deployment/block_storage/panel.py @@ -21,7 +21,7 @@ from tuskar_ui.infrastructure import dashboard class BlockStorage(horizon.Panel): name = _("Block Storage") - slug = "deploy_block_storage" + slug = "deployment.block_storage" dashboard.Infrastructure.register(BlockStorage) diff --git a/tuskar_ui/infrastructure/deploy_block_storage/urls.py b/tuskar_ui/infrastructure/deployment/block_storage/urls.py index 79685177..b183689c 100644 --- a/tuskar_ui/infrastructure/deploy_block_storage/urls.py +++ b/tuskar_ui/infrastructure/deployment/block_storage/urls.py @@ -14,7 +14,7 @@ from django.conf.urls import defaults -from tuskar_ui.infrastructure.deploy_block_storage import views +from tuskar_ui.infrastructure.deployment.block_storage import views urlpatterns = defaults.patterns( diff --git a/tuskar_ui/infrastructure/deploy_block_storage/views.py b/tuskar_ui/infrastructure/deployment/block_storage/views.py index f046b626..f046b626 100644 --- a/tuskar_ui/infrastructure/deploy_block_storage/views.py +++ b/tuskar_ui/infrastructure/deployment/block_storage/views.py diff --git a/tuskar_ui/infrastructure/deploy_controller/__init__.py b/tuskar_ui/infrastructure/deployment/compute/__init__.py index e69de29b..e69de29b 100644 --- a/tuskar_ui/infrastructure/deploy_controller/__init__.py +++ b/tuskar_ui/infrastructure/deployment/compute/__init__.py diff --git a/tuskar_ui/infrastructure/deploy_compute/panel.py b/tuskar_ui/infrastructure/deployment/compute/panel.py index d7d3d576..59491250 100644 --- a/tuskar_ui/infrastructure/deploy_compute/panel.py +++ b/tuskar_ui/infrastructure/deployment/compute/panel.py @@ -21,7 +21,7 @@ from tuskar_ui.infrastructure import dashboard class Compute(horizon.Panel): name = _("Compute") - slug = "deploy_compute" + slug = "deployment.compute" dashboard.Infrastructure.register(Compute) diff --git a/tuskar_ui/infrastructure/deploy_controller/urls.py b/tuskar_ui/infrastructure/deployment/compute/urls.py index ab9a548d..292e1db2 100644 --- a/tuskar_ui/infrastructure/deploy_controller/urls.py +++ b/tuskar_ui/infrastructure/deployment/compute/urls.py @@ -14,7 +14,7 @@ from django.conf.urls import defaults -from tuskar_ui.infrastructure.deploy_controller import views +from tuskar_ui.infrastructure.deployment.compute import views urlpatterns = defaults.patterns( diff --git a/tuskar_ui/infrastructure/deploy_compute/views.py b/tuskar_ui/infrastructure/deployment/compute/views.py index f046b626..f046b626 100644 --- a/tuskar_ui/infrastructure/deploy_compute/views.py +++ b/tuskar_ui/infrastructure/deployment/compute/views.py diff --git a/tuskar_ui/infrastructure/deploy_object_storage/__init__.py b/tuskar_ui/infrastructure/deployment/controller/__init__.py index e69de29b..e69de29b 100644 --- a/tuskar_ui/infrastructure/deploy_object_storage/__init__.py +++ b/tuskar_ui/infrastructure/deployment/controller/__init__.py diff --git a/tuskar_ui/infrastructure/deploy_controller/panel.py b/tuskar_ui/infrastructure/deployment/controller/panel.py index 90ba46d6..a1faaab5 100644 --- a/tuskar_ui/infrastructure/deploy_controller/panel.py +++ b/tuskar_ui/infrastructure/deployment/controller/panel.py @@ -21,7 +21,7 @@ from tuskar_ui.infrastructure import dashboard class Controller(horizon.Panel): name = _("Controller") - slug = "deploy_controller" + slug = "deployment.controller" dashboard.Infrastructure.register(Controller) diff --git a/tuskar_ui/infrastructure/resources/unallocated/urls.py b/tuskar_ui/infrastructure/deployment/controller/urls.py index 622c2871..3b74aae1 100644 --- a/tuskar_ui/infrastructure/resources/unallocated/urls.py +++ b/tuskar_ui/infrastructure/deployment/controller/urls.py @@ -14,7 +14,7 @@ from django.conf.urls import defaults -from tuskar_ui.infrastructure.resources.unallocated import views +from tuskar_ui.infrastructure.deployment.controller import views urlpatterns = defaults.patterns( diff --git a/tuskar_ui/infrastructure/deploy_controller/views.py b/tuskar_ui/infrastructure/deployment/controller/views.py index f046b626..f046b626 100644 --- a/tuskar_ui/infrastructure/deploy_controller/views.py +++ b/tuskar_ui/infrastructure/deployment/controller/views.py diff --git a/tuskar_ui/infrastructure/deploy_overview/__init__.py b/tuskar_ui/infrastructure/deployment/object_storage/__init__.py index e69de29b..e69de29b 100644 --- a/tuskar_ui/infrastructure/deploy_overview/__init__.py +++ b/tuskar_ui/infrastructure/deployment/object_storage/__init__.py diff --git a/tuskar_ui/infrastructure/deploy_object_storage/panel.py b/tuskar_ui/infrastructure/deployment/object_storage/panel.py index 95bf4f49..9dc7d79e 100644 --- a/tuskar_ui/infrastructure/deploy_object_storage/panel.py +++ b/tuskar_ui/infrastructure/deployment/object_storage/panel.py @@ -21,7 +21,7 @@ from tuskar_ui.infrastructure import dashboard class ObjectStorage(horizon.Panel): name = _("Object Storage") - slug = "deploy_object_storage" + slug = "deployment.object_storage" dashboard.Infrastructure.register(ObjectStorage) diff --git a/tuskar_ui/infrastructure/deploy_object_storage/urls.py b/tuskar_ui/infrastructure/deployment/object_storage/urls.py index 882e9e56..a2bb1e72 100644 --- a/tuskar_ui/infrastructure/deploy_object_storage/urls.py +++ b/tuskar_ui/infrastructure/deployment/object_storage/urls.py @@ -14,7 +14,7 @@ from django.conf.urls import defaults -from tuskar_ui.infrastructure.deploy_object_storage import views +from tuskar_ui.infrastructure.deployment.object_storage import views urlpatterns = defaults.patterns( diff --git a/tuskar_ui/infrastructure/deploy_object_storage/views.py b/tuskar_ui/infrastructure/deployment/object_storage/views.py index f046b626..f046b626 100644 --- a/tuskar_ui/infrastructure/deploy_object_storage/views.py +++ b/tuskar_ui/infrastructure/deployment/object_storage/views.py diff --git a/tuskar_ui/infrastructure/deployment/overview/__init__.py b/tuskar_ui/infrastructure/deployment/overview/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/tuskar_ui/infrastructure/deployment/overview/__init__.py diff --git a/tuskar_ui/infrastructure/deploy_overview/panel.py b/tuskar_ui/infrastructure/deployment/overview/panel.py index 8761cadb..5bc07abc 100644 --- a/tuskar_ui/infrastructure/deploy_overview/panel.py +++ b/tuskar_ui/infrastructure/deployment/overview/panel.py @@ -21,7 +21,7 @@ from tuskar_ui.infrastructure import dashboard class DeploymentOverview(horizon.Panel): name = _("Overview") - slug = "deploy_overview" + slug = "deployment.overview" dashboard.Infrastructure.register(DeploymentOverview) diff --git a/tuskar_ui/infrastructure/deploy_compute/urls.py b/tuskar_ui/infrastructure/deployment/overview/urls.py index 983c24ae..fd22dc43 100644 --- a/tuskar_ui/infrastructure/deploy_compute/urls.py +++ b/tuskar_ui/infrastructure/deployment/overview/urls.py @@ -14,7 +14,7 @@ from django.conf.urls import defaults -from tuskar_ui.infrastructure.deploy_compute import views +from tuskar_ui.infrastructure.deployment.overview import views urlpatterns = defaults.patterns( diff --git a/tuskar_ui/infrastructure/deploy_overview/views.py b/tuskar_ui/infrastructure/deployment/overview/views.py index f046b626..f046b626 100644 --- a/tuskar_ui/infrastructure/deploy_overview/views.py +++ b/tuskar_ui/infrastructure/deployment/overview/views.py diff --git a/tuskar_ui/infrastructure/resources/archived/urls.py b/tuskar_ui/infrastructure/resources/archived/urls.py deleted file mode 100644 index e255484b..00000000 --- a/tuskar_ui/infrastructure/resources/archived/urls.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf8 -*- -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from django.conf.urls import defaults - -from tuskar_ui.infrastructure.resources.archived import views - - -urlpatterns = defaults.patterns( - '', - defaults.url(r'^$', views.IndexView.as_view(), name='index'), -) diff --git a/tuskar_ui/infrastructure/resources/management/urls.py b/tuskar_ui/infrastructure/resources/management/urls.py deleted file mode 100644 index 8494f017..00000000 --- a/tuskar_ui/infrastructure/resources/management/urls.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf8 -*- -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from django.conf.urls import defaults - -from tuskar_ui.infrastructure.resources.management import views - - -urlpatterns = defaults.patterns( - '', - defaults.url(r'^$', views.IndexView.as_view(), name='index'), -) diff --git a/tuskar_ui/infrastructure/resources/overview/urls.py b/tuskar_ui/infrastructure/resources/overview/urls.py deleted file mode 100644 index dc2af4bc..00000000 --- a/tuskar_ui/infrastructure/resources/overview/urls.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf8 -*- -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from django.conf.urls import defaults - -from tuskar_ui.infrastructure.resources.overview import views - - -urlpatterns = defaults.patterns( - '', - defaults.url(r'^$', views.IndexView.as_view(), name='index'), -) diff --git a/tuskar_ui/infrastructure/resources/resource/urls.py b/tuskar_ui/infrastructure/resources/resource/urls.py deleted file mode 100644 index 6dcd8555..00000000 --- a/tuskar_ui/infrastructure/resources/resource/urls.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf8 -*- -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from django.conf.urls import defaults - -from tuskar_ui.infrastructure.resources.resource import views - - -urlpatterns = defaults.patterns( - '', - defaults.url(r'^$', views.IndexView.as_view(), name='index'), -) |