Merge "Group related panels in packages (deployment)"

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',
     )
 
 

tuskar_ui/infrastructure/deploy_compute/urls.py

@@ -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_compute import views
-
-
-urlpatterns = defaults.patterns(
-    '',
-    defaults.url(r'^$', views.IndexView.as_view(), name='index'),
-)

tuskar_ui/infrastructure/deploy_overview/urls.py

@@ -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'),
-)

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)

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(

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)

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(

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)

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(

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)

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(

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)

tuskar_ui/infrastructure/deployment/overview/urls.py

@@ -14,7 +14,7 @@
 
 from django.conf.urls import defaults
 
-from tuskar_ui.infrastructure.resources.archived import views
+from tuskar_ui.infrastructure.deployment.overview import views
 
 
 urlpatterns = defaults.patterns(

tuskar_ui/infrastructure/resources/management/urls.py

@@ -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'),
-)

tuskar_ui/infrastructure/resources/overview/urls.py

@@ -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'),
-)

tuskar_ui/infrastructure/resources/resource/urls.py

@@ -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'),
-)