From 398e11dc7102b48b9e8f032238332a5184b90850 Mon Sep 17 00:00:00 2001 From: Zhenguo Niu Date: Mon, 15 May 2017 13:11:40 +0800 Subject: [PATCH] Move project panels to new project dir This is to make panels division more clear, we will add admin panels later. Change-Id: I84c3f53eed5b2399abfc59d476a1031c1bfc258f --- mogan_ui/content/project/__init__.py | 17 +++++++++++++++++ .../content/{ => project}/key_pairs/__init__.py | 0 .../content/{ => project}/key_pairs/forms.py | 0 .../content/{ => project}/key_pairs/panel.py | 0 .../content/{ => project}/key_pairs/tables.py | 0 .../templates/server_key_pairs/_create.html | 0 .../templates/server_key_pairs/_import.html | 0 .../templates/server_key_pairs/create.html | 0 .../templates/server_key_pairs/detail.html | 0 .../templates/server_key_pairs/download.html | 0 .../templates/server_key_pairs/import.html | 0 .../content/{ => project}/key_pairs/urls.py | 2 +- .../content/{ => project}/key_pairs/views.py | 4 ++-- .../content/{ => project}/servers/__init__.py | 0 mogan_ui/content/{ => project}/servers/panel.py | 0 .../content/{ => project}/servers/tables.py | 0 mogan_ui/content/{ => project}/servers/tabs.py | 0 .../templates/servers/_detail_overview.html | 0 .../servers/_launch_customize_help.html | 0 .../templates/servers/_launch_network_help.html | 0 .../servers/templates/servers/_server_ips.html | 0 .../templates/servers/_update_networks.html | 0 .../servers/templates/servers/index.html | 0 mogan_ui/content/{ => project}/servers/urls.py | 2 +- mogan_ui/content/{ => project}/servers/views.py | 6 +++--- .../{ => project}/servers/workflows/__init__.py | 3 ++- .../servers/workflows/create_server.py | 0 .../_1820_project_baremetal_servers_panel.py | 2 +- .../_1830_project_baremetal_keypairs_panel.py | 2 +- 29 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 mogan_ui/content/project/__init__.py rename mogan_ui/content/{ => project}/key_pairs/__init__.py (100%) rename mogan_ui/content/{ => project}/key_pairs/forms.py (100%) rename mogan_ui/content/{ => project}/key_pairs/panel.py (100%) rename mogan_ui/content/{ => project}/key_pairs/tables.py (100%) rename mogan_ui/content/{ => project}/key_pairs/templates/server_key_pairs/_create.html (100%) rename mogan_ui/content/{ => project}/key_pairs/templates/server_key_pairs/_import.html (100%) rename mogan_ui/content/{ => project}/key_pairs/templates/server_key_pairs/create.html (100%) rename mogan_ui/content/{ => project}/key_pairs/templates/server_key_pairs/detail.html (100%) rename mogan_ui/content/{ => project}/key_pairs/templates/server_key_pairs/download.html (100%) rename mogan_ui/content/{ => project}/key_pairs/templates/server_key_pairs/import.html (100%) rename mogan_ui/content/{ => project}/key_pairs/urls.py (96%) rename mogan_ui/content/{ => project}/key_pairs/views.py (97%) rename mogan_ui/content/{ => project}/servers/__init__.py (100%) rename mogan_ui/content/{ => project}/servers/panel.py (100%) rename mogan_ui/content/{ => project}/servers/tables.py (100%) rename mogan_ui/content/{ => project}/servers/tabs.py (100%) rename mogan_ui/content/{ => project}/servers/templates/servers/_detail_overview.html (100%) rename mogan_ui/content/{ => project}/servers/templates/servers/_launch_customize_help.html (100%) rename mogan_ui/content/{ => project}/servers/templates/servers/_launch_network_help.html (100%) rename mogan_ui/content/{ => project}/servers/templates/servers/_server_ips.html (100%) rename mogan_ui/content/{ => project}/servers/templates/servers/_update_networks.html (100%) rename mogan_ui/content/{ => project}/servers/templates/servers/index.html (100%) rename mogan_ui/content/{ => project}/servers/urls.py (94%) rename mogan_ui/content/{ => project}/servers/views.py (94%) rename mogan_ui/content/{ => project}/servers/workflows/__init__.py (87%) rename mogan_ui/content/{ => project}/servers/workflows/create_server.py (100%) diff --git a/mogan_ui/content/project/__init__.py b/mogan_ui/content/project/__init__.py new file mode 100644 index 0000000..6a87c3c --- /dev/null +++ b/mogan_ui/content/project/__init__.py @@ -0,0 +1,17 @@ +# 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. + +import pbr.version + + +__version__ = pbr.version.VersionInfo( + 'mogan-ui').version_string() diff --git a/mogan_ui/content/key_pairs/__init__.py b/mogan_ui/content/project/key_pairs/__init__.py similarity index 100% rename from mogan_ui/content/key_pairs/__init__.py rename to mogan_ui/content/project/key_pairs/__init__.py diff --git a/mogan_ui/content/key_pairs/forms.py b/mogan_ui/content/project/key_pairs/forms.py similarity index 100% rename from mogan_ui/content/key_pairs/forms.py rename to mogan_ui/content/project/key_pairs/forms.py diff --git a/mogan_ui/content/key_pairs/panel.py b/mogan_ui/content/project/key_pairs/panel.py similarity index 100% rename from mogan_ui/content/key_pairs/panel.py rename to mogan_ui/content/project/key_pairs/panel.py diff --git a/mogan_ui/content/key_pairs/tables.py b/mogan_ui/content/project/key_pairs/tables.py similarity index 100% rename from mogan_ui/content/key_pairs/tables.py rename to mogan_ui/content/project/key_pairs/tables.py diff --git a/mogan_ui/content/key_pairs/templates/server_key_pairs/_create.html b/mogan_ui/content/project/key_pairs/templates/server_key_pairs/_create.html similarity index 100% rename from mogan_ui/content/key_pairs/templates/server_key_pairs/_create.html rename to mogan_ui/content/project/key_pairs/templates/server_key_pairs/_create.html diff --git a/mogan_ui/content/key_pairs/templates/server_key_pairs/_import.html b/mogan_ui/content/project/key_pairs/templates/server_key_pairs/_import.html similarity index 100% rename from mogan_ui/content/key_pairs/templates/server_key_pairs/_import.html rename to mogan_ui/content/project/key_pairs/templates/server_key_pairs/_import.html diff --git a/mogan_ui/content/key_pairs/templates/server_key_pairs/create.html b/mogan_ui/content/project/key_pairs/templates/server_key_pairs/create.html similarity index 100% rename from mogan_ui/content/key_pairs/templates/server_key_pairs/create.html rename to mogan_ui/content/project/key_pairs/templates/server_key_pairs/create.html diff --git a/mogan_ui/content/key_pairs/templates/server_key_pairs/detail.html b/mogan_ui/content/project/key_pairs/templates/server_key_pairs/detail.html similarity index 100% rename from mogan_ui/content/key_pairs/templates/server_key_pairs/detail.html rename to mogan_ui/content/project/key_pairs/templates/server_key_pairs/detail.html diff --git a/mogan_ui/content/key_pairs/templates/server_key_pairs/download.html b/mogan_ui/content/project/key_pairs/templates/server_key_pairs/download.html similarity index 100% rename from mogan_ui/content/key_pairs/templates/server_key_pairs/download.html rename to mogan_ui/content/project/key_pairs/templates/server_key_pairs/download.html diff --git a/mogan_ui/content/key_pairs/templates/server_key_pairs/import.html b/mogan_ui/content/project/key_pairs/templates/server_key_pairs/import.html similarity index 100% rename from mogan_ui/content/key_pairs/templates/server_key_pairs/import.html rename to mogan_ui/content/project/key_pairs/templates/server_key_pairs/import.html diff --git a/mogan_ui/content/key_pairs/urls.py b/mogan_ui/content/project/key_pairs/urls.py similarity index 96% rename from mogan_ui/content/key_pairs/urls.py rename to mogan_ui/content/project/key_pairs/urls.py index ac5a34e..fc0c9b4 100644 --- a/mogan_ui/content/key_pairs/urls.py +++ b/mogan_ui/content/project/key_pairs/urls.py @@ -17,7 +17,7 @@ # under the License. from django.conf.urls import url -from mogan_ui.content.key_pairs import views +from mogan_ui.content.project.key_pairs import views urlpatterns = [ url(r'^$', views.IndexView.as_view(), name='index'), diff --git a/mogan_ui/content/key_pairs/views.py b/mogan_ui/content/project/key_pairs/views.py similarity index 97% rename from mogan_ui/content/key_pairs/views.py rename to mogan_ui/content/project/key_pairs/views.py index 960b2e9..0fc571c 100644 --- a/mogan_ui/content/key_pairs/views.py +++ b/mogan_ui/content/project/key_pairs/views.py @@ -27,8 +27,8 @@ from horizon import tables from horizon.utils import memoized from horizon import views from mogan_ui.api import mogan -from mogan_ui.content.key_pairs import forms as key_pairs_forms -from mogan_ui.content.key_pairs import tables as key_pairs_tables +from mogan_ui.content.project.key_pairs import forms as key_pairs_forms +from mogan_ui.content.project.key_pairs import tables as key_pairs_tables class IndexView(tables.DataTableView): diff --git a/mogan_ui/content/servers/__init__.py b/mogan_ui/content/project/servers/__init__.py similarity index 100% rename from mogan_ui/content/servers/__init__.py rename to mogan_ui/content/project/servers/__init__.py diff --git a/mogan_ui/content/servers/panel.py b/mogan_ui/content/project/servers/panel.py similarity index 100% rename from mogan_ui/content/servers/panel.py rename to mogan_ui/content/project/servers/panel.py diff --git a/mogan_ui/content/servers/tables.py b/mogan_ui/content/project/servers/tables.py similarity index 100% rename from mogan_ui/content/servers/tables.py rename to mogan_ui/content/project/servers/tables.py diff --git a/mogan_ui/content/servers/tabs.py b/mogan_ui/content/project/servers/tabs.py similarity index 100% rename from mogan_ui/content/servers/tabs.py rename to mogan_ui/content/project/servers/tabs.py diff --git a/mogan_ui/content/servers/templates/servers/_detail_overview.html b/mogan_ui/content/project/servers/templates/servers/_detail_overview.html similarity index 100% rename from mogan_ui/content/servers/templates/servers/_detail_overview.html rename to mogan_ui/content/project/servers/templates/servers/_detail_overview.html diff --git a/mogan_ui/content/servers/templates/servers/_launch_customize_help.html b/mogan_ui/content/project/servers/templates/servers/_launch_customize_help.html similarity index 100% rename from mogan_ui/content/servers/templates/servers/_launch_customize_help.html rename to mogan_ui/content/project/servers/templates/servers/_launch_customize_help.html diff --git a/mogan_ui/content/servers/templates/servers/_launch_network_help.html b/mogan_ui/content/project/servers/templates/servers/_launch_network_help.html similarity index 100% rename from mogan_ui/content/servers/templates/servers/_launch_network_help.html rename to mogan_ui/content/project/servers/templates/servers/_launch_network_help.html diff --git a/mogan_ui/content/servers/templates/servers/_server_ips.html b/mogan_ui/content/project/servers/templates/servers/_server_ips.html similarity index 100% rename from mogan_ui/content/servers/templates/servers/_server_ips.html rename to mogan_ui/content/project/servers/templates/servers/_server_ips.html diff --git a/mogan_ui/content/servers/templates/servers/_update_networks.html b/mogan_ui/content/project/servers/templates/servers/_update_networks.html similarity index 100% rename from mogan_ui/content/servers/templates/servers/_update_networks.html rename to mogan_ui/content/project/servers/templates/servers/_update_networks.html diff --git a/mogan_ui/content/servers/templates/servers/index.html b/mogan_ui/content/project/servers/templates/servers/index.html similarity index 100% rename from mogan_ui/content/servers/templates/servers/index.html rename to mogan_ui/content/project/servers/templates/servers/index.html diff --git a/mogan_ui/content/servers/urls.py b/mogan_ui/content/project/servers/urls.py similarity index 94% rename from mogan_ui/content/servers/urls.py rename to mogan_ui/content/project/servers/urls.py index dd6dfbd..d8db1d4 100644 --- a/mogan_ui/content/servers/urls.py +++ b/mogan_ui/content/project/servers/urls.py @@ -14,7 +14,7 @@ # limitations under the License. from django.conf.urls import url -from mogan_ui.content.servers import views +from mogan_ui.content.project.servers import views urlpatterns = [ url(r'^$', views.IndexView.as_view(), name='index'), diff --git a/mogan_ui/content/servers/views.py b/mogan_ui/content/project/servers/views.py similarity index 94% rename from mogan_ui/content/servers/views.py rename to mogan_ui/content/project/servers/views.py index 38fe759..10e3153 100644 --- a/mogan_ui/content/servers/views.py +++ b/mogan_ui/content/project/servers/views.py @@ -17,9 +17,9 @@ from django.core.urlresolvers import reverse from django.utils.translation import ugettext_lazy as _ from mogan_ui.api import mogan -from mogan_ui.content.servers import tables as project_tables -from mogan_ui.content.servers import tabs as project_tabs -from mogan_ui.content.servers import workflows as project_workflows +from mogan_ui.content.project.servers import tables as project_tables +from mogan_ui.content.project.servers import tabs as project_tabs +from mogan_ui.content.project.servers import workflows as project_workflows from horizon import exceptions from horizon import tables diff --git a/mogan_ui/content/servers/workflows/__init__.py b/mogan_ui/content/project/servers/workflows/__init__.py similarity index 87% rename from mogan_ui/content/servers/workflows/__init__.py rename to mogan_ui/content/project/servers/workflows/__init__.py index c3ea89d..94c8256 100644 --- a/mogan_ui/content/servers/workflows/__init__.py +++ b/mogan_ui/content/project/servers/workflows/__init__.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from mogan_ui.content.servers.workflows.create_server import LaunchServer +from mogan_ui.content.project.servers.workflows.create_server \ + import LaunchServer __all__ = [ 'LaunchServer', diff --git a/mogan_ui/content/servers/workflows/create_server.py b/mogan_ui/content/project/servers/workflows/create_server.py similarity index 100% rename from mogan_ui/content/servers/workflows/create_server.py rename to mogan_ui/content/project/servers/workflows/create_server.py diff --git a/mogan_ui/enabled/_1820_project_baremetal_servers_panel.py b/mogan_ui/enabled/_1820_project_baremetal_servers_panel.py index 14148fe..5cc0929 100644 --- a/mogan_ui/enabled/_1820_project_baremetal_servers_panel.py +++ b/mogan_ui/enabled/_1820_project_baremetal_servers_panel.py @@ -18,4 +18,4 @@ PANEL_GROUP = 'baremetal_compute' PANEL_DASHBOARD = 'project' # Python panel class of the PANEL to be added. -ADD_PANEL = 'mogan_ui.content.servers.panel.Servers' +ADD_PANEL = 'mogan_ui.content.project.servers.panel.Servers' diff --git a/mogan_ui/enabled/_1830_project_baremetal_keypairs_panel.py b/mogan_ui/enabled/_1830_project_baremetal_keypairs_panel.py index 24973ed..177f42c 100644 --- a/mogan_ui/enabled/_1830_project_baremetal_keypairs_panel.py +++ b/mogan_ui/enabled/_1830_project_baremetal_keypairs_panel.py @@ -18,4 +18,4 @@ PANEL_GROUP = 'baremetal_compute' PANEL_DASHBOARD = 'project' # Python panel class of the PANEL to be added. -ADD_PANEL = 'mogan_ui.content.key_pairs.panel.KeyPairs' +ADD_PANEL = 'mogan_ui.content.project.key_pairs.panel.KeyPairs'