From 2dd906428c79f19b1dd79ad3d755e8855ef3e529 Mon Sep 17 00:00:00 2001 From: "Gary W. Smith" Date: Mon, 16 Mar 2015 13:56:51 -0700 Subject: [PATCH] Enable projects, admin panels to load --- _90_manila_admin_shares.py | 4 + _90_manila_project_shares.py | 4 + manila_ui/api/__init__.py | 68 -------------- manila_ui/dashboards/__init__.py | 0 manila_ui/dashboards/admin/__init__.py | 0 manila_ui/dashboards/admin/dashboard.py | 36 -------- manila_ui/dashboards/admin/shares/forms.py | 5 +- manila_ui/dashboards/admin/shares/tables.py | 9 +- manila_ui/dashboards/admin/shares/tabs.py | 22 ++--- manila_ui/dashboards/admin/shares/tests.py | 2 +- manila_ui/dashboards/admin/shares/urls.py | 8 +- manila_ui/dashboards/admin/shares/utils.py | 2 +- manila_ui/dashboards/admin/shares/views.py | 14 ++- manila_ui/dashboards/project/__init__.py | 0 manila_ui/dashboards/project/dashboard.py | 89 ------------------- .../project/shares/security_services/forms.py | 2 +- .../shares/security_services/tables.py | 2 +- .../project/shares/security_services/tabs.py | 4 +- .../project/shares/security_services/views.py | 8 +- .../project/shares/share_networks/forms.py | 3 +- .../project/shares/share_networks/tables.py | 3 +- .../project/shares/share_networks/tabs.py | 8 +- .../project/shares/share_networks/tests.py | 5 +- .../project/shares/share_networks/views.py | 10 +-- .../shares/share_networks/workflows.py | 2 +- .../dashboards/project/shares/shares/forms.py | 4 +- .../project/shares/shares/tables.py | 7 +- .../dashboards/project/shares/shares/tabs.py | 6 +- .../dashboards/project/shares/shares/tests.py | 4 +- .../dashboards/project/shares/shares/views.py | 8 +- .../project/shares/snapshots/forms.py | 2 +- .../project/shares/snapshots/tables.py | 2 +- .../project/shares/snapshots/tabs.py | 4 +- .../project/shares/snapshots/tests.py | 4 +- .../project/shares/snapshots/views.py | 6 +- manila_ui/dashboards/project/shares/urls.py | 10 +-- manila_ui/dashboards/project/shares/views.py | 8 +- requirements.txt | 15 +++- 38 files changed, 105 insertions(+), 285 deletions(-) create mode 100644 _90_manila_admin_shares.py create mode 100644 _90_manila_project_shares.py create mode 100644 manila_ui/dashboards/__init__.py create mode 100644 manila_ui/dashboards/admin/__init__.py delete mode 100644 manila_ui/dashboards/admin/dashboard.py create mode 100644 manila_ui/dashboards/project/__init__.py delete mode 100644 manila_ui/dashboards/project/dashboard.py diff --git a/_90_manila_admin_shares.py b/_90_manila_admin_shares.py new file mode 100644 index 00000000..0340454f --- /dev/null +++ b/_90_manila_admin_shares.py @@ -0,0 +1,4 @@ +PANEL_DASHBOARD = 'admin' +PANEL_GROUP = 'admin' +PANEL = 'shares' +ADD_PANEL = 'manila_ui.dashboards.admin.shares.panel.Shares' diff --git a/_90_manila_project_shares.py b/_90_manila_project_shares.py new file mode 100644 index 00000000..8ffb72df --- /dev/null +++ b/_90_manila_project_shares.py @@ -0,0 +1,4 @@ +PANEL_DASHBOARD = 'project' +PANEL_GROUP = 'compute' +PANEL = 'shares' +ADD_PANEL = 'manila_ui.dashboards.project.shares.panel.Shares' diff --git a/manila_ui/api/__init__.py b/manila_ui/api/__init__.py index c6f9dbae..e69de29b 100644 --- a/manila_ui/api/__init__.py +++ b/manila_ui/api/__init__.py @@ -1,68 +0,0 @@ -# Copyright 2012 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Copyright 2012 Nebula, Inc. -# Copyright 2013 Big Switch Networks -# -# 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. - -""" -Methods and interface objects used to interact with external APIs. - -API method calls return objects that are in many cases objects with -attributes that are direct maps to the data returned from the API http call. -Unfortunately, these objects are also often constructed dynamically, making -it difficult to know what data is available from the API object. Because of -this, all API calls should wrap their returned object in one defined here, -using only explicitly defined attributes and/or methods. - -In other words, Horizon developers not working on openstack_dashboard.api -shouldn't need to understand the finer details of APIs for -Keystone/Nova/Glance/Swift et. al. -""" -from openstack_dashboard.api import base -from openstack_dashboard.api import ceilometer -from openstack_dashboard.api import cinder -from openstack_dashboard.api import fwaas -from openstack_dashboard.api import glance -from openstack_dashboard.api import heat -from openstack_dashboard.api import keystone -from openstack_dashboard.api import lbaas -from openstack_dashboard.api import network -from openstack_dashboard.api import neutron -from openstack_dashboard.api import nova -from openstack_dashboard.api import sahara -from openstack_dashboard.api import swift -from openstack_dashboard.api import trove -from openstack_dashboard.api import vpn - - -__all__ = [ - "base", - "cinder", - "fwaas", - "glance", - "heat", - "keystone", - "lbaas", - "manila", - "network", - "neutron", - "nova", - "swift", - "ceilometer", - "trove", - "vpn", - "sahara", -] diff --git a/manila_ui/dashboards/__init__.py b/manila_ui/dashboards/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/manila_ui/dashboards/admin/__init__.py b/manila_ui/dashboards/admin/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/manila_ui/dashboards/admin/dashboard.py b/manila_ui/dashboards/admin/dashboard.py deleted file mode 100644 index ec2b3e09..00000000 --- a/manila_ui/dashboards/admin/dashboard.py +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2012 Nebula, Inc. -# -# 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.utils.translation import ugettext_lazy as _ - -import horizon - - -class SystemPanels(horizon.PanelGroup): - slug = "admin" - name = _("System") - panels = ('overview', 'metering', 'hypervisors', 'aggregates', - 'instances', 'volumes', 'flavors', 'images', - 'networks', 'routers', 'defaults', 'info', 'shares') - - -class Admin(horizon.Dashboard): - name = _("Admin") - slug = "admin" - panels = (SystemPanels,) - default_panel = 'overview' - permissions = ('openstack.roles.admin',) - - -horizon.register(Admin) diff --git a/manila_ui/dashboards/admin/shares/forms.py b/manila_ui/dashboards/admin/shares/forms.py index b4b2ee8d..8ad7a0df 100644 --- a/manila_ui/dashboards/admin/shares/forms.py +++ b/manila_ui/dashboards/admin/shares/forms.py @@ -20,10 +20,11 @@ from horizon import exceptions from horizon import forms from horizon import messages +from manila_ui.api import manila +from manila_ui.dashboards import utils + from openstack_dashboard.api import keystone -from openstack_dashboard.api import manila from openstack_dashboard.api import neutron -from openstack_dashboard.dashboards import utils ST_EXTRA_SPECS_FORM_ATTRS = { diff --git a/manila_ui/dashboards/admin/shares/tables.py b/manila_ui/dashboards/admin/shares/tables.py index 6807e3c3..29183b90 100644 --- a/manila_ui/dashboards/admin/shares/tables.py +++ b/manila_ui/dashboards/admin/shares/tables.py @@ -18,12 +18,11 @@ from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import tables -from openstack_dashboard.api import manila -from openstack_dashboard.api import neutron -from openstack_dashboard.dashboards.project.shares.shares \ - import tables as shares_tables -from openstack_dashboard.dashboards.project.shares.snapshots \ +from manila_ui.api import manila +from manila_ui.dashboards.project.shares.shares import tables as shares_tables +from manila_ui.dashboards.project.shares.snapshots \ import tables as snapshot_tables +from openstack_dashboard.api import neutron DELETABLE_STATES = ("available", "error") diff --git a/manila_ui/dashboards/admin/shares/tabs.py b/manila_ui/dashboards/admin/shares/tabs.py index 771644ee..c3c487c5 100644 --- a/manila_ui/dashboards/admin/shares/tabs.py +++ b/manila_ui/dashboards/admin/shares/tabs.py @@ -18,22 +18,16 @@ from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import tabs -from openstack_dashboard.api import manila from openstack_dashboard.api import neutron -from openstack_dashboard.dashboards.admin.\ - shares.tables import SharesTable -from openstack_dashboard.dashboards.admin.\ - shares.tables import SnapshotsTable -from openstack_dashboard.dashboards.admin.\ - shares.tables import SecurityServiceTable -from openstack_dashboard.dashboards.admin.\ - shares.tables import ShareNetworkTable -from openstack_dashboard.dashboards.admin.\ - shares.tables import ShareServerTable -from openstack_dashboard.dashboards.admin.\ - shares.tables import ShareTypesTable -from openstack_dashboard.dashboards.admin.shares import utils +from manila_ui.api import manila +from manila_ui.dashboards.admin.shares.tables import SharesTable +from manila_ui.dashboards.admin.shares.tables import SnapshotsTable +from manila_ui.dashboards.admin.shares.tables import SecurityServiceTable +from manila_ui.dashboards.admin.shares.tables import ShareNetworkTable +from manila_ui.dashboards.admin.shares.tables import ShareServerTable +from manila_ui.dashboards.admin.shares.tables import ShareTypesTable +from manila_ui.dashboards.admin.shares import utils class SnapshotsTab(tabs.TableTab): diff --git a/manila_ui/dashboards/admin/shares/tests.py b/manila_ui/dashboards/admin/shares/tests.py index fdc44e48..b5e66d20 100644 --- a/manila_ui/dashboards/admin/shares/tests.py +++ b/manila_ui/dashboards/admin/shares/tests.py @@ -17,8 +17,8 @@ import mock from mox import IsA # noqa +from manila_ui.dashboards.project.shares import test_data from openstack_dashboard import api -from openstack_dashboard.dashboards.project.shares import test_data from openstack_dashboard.test import helpers as test from openstack_dashboard.usage import quotas diff --git a/manila_ui/dashboards/admin/shares/urls.py b/manila_ui/dashboards/admin/shares/urls.py index cea02036..1976e4fd 100644 --- a/manila_ui/dashboards/admin/shares/urls.py +++ b/manila_ui/dashboards/admin/shares/urls.py @@ -13,12 +13,12 @@ from django.conf.urls import patterns # noqa from django.conf.urls import url # noqa -from openstack_dashboard.dashboards.admin.shares import views -from openstack_dashboard.dashboards.project.shares.security_services \ +from manila_ui.dashboards.admin.shares import views +from manila_ui.dashboards.project.shares.security_services \ import views as project_sec_services_views -from openstack_dashboard.dashboards.project.shares.share_networks\ +from manila_ui.dashboards.project.shares.share_networks\ import views as project_share_net_views -from openstack_dashboard.dashboards.project.shares.snapshots\ +from manila_ui.dashboards.project.shares.snapshots\ import views as project_snapshot_views urlpatterns = patterns('', diff --git a/manila_ui/dashboards/admin/shares/utils.py b/manila_ui/dashboards/admin/shares/utils.py index fbc5fe5c..0c8fd733 100644 --- a/manila_ui/dashboards/admin/shares/utils.py +++ b/manila_ui/dashboards/admin/shares/utils.py @@ -14,7 +14,7 @@ from horizon import exceptions from openstack_dashboard.api import keystone -from openstack_dashboard.openstack.common.gettextutils import _ # noqa +from openstack_dashboard.openstack.common._i18n import _ def set_tenant_name_to_objects(request, objects): diff --git a/manila_ui/dashboards/admin/shares/views.py b/manila_ui/dashboards/admin/shares/views.py index a7294fdc..150d1dcc 100644 --- a/manila_ui/dashboards/admin/shares/views.py +++ b/manila_ui/dashboards/admin/shares/views.py @@ -26,14 +26,10 @@ from horizon import exceptions from horizon import forms from horizon import tabs -from openstack_dashboard.api import manila -from openstack_dashboard.dashboards.admin.shares \ - import forms as project_forms -from openstack_dashboard.dashboards.admin.shares \ - import tabs as project_tabs - -from openstack_dashboard.dashboards.project.shares.shares \ - import views as share_views +from manila_ui.api import manila +from manila_ui.dashboards.admin.shares import forms as project_forms +from manila_ui.dashboards.admin.shares import tabs as project_tabs +from manila_ui.dashboards.project.shares.shares import views as share_views class IndexView(tabs.TabbedTableView, share_views.ShareTableMixIn): @@ -107,7 +103,7 @@ class ShareServDetail(tabs.TabView): share_serv.shares_list = shares_list if not hasattr(share_serv, 'share_network_id'): share_serv.share_network_id = None - + except Exception: redirect = reverse('horizon:project:shares:index') exceptions.handle(self.request, diff --git a/manila_ui/dashboards/project/__init__.py b/manila_ui/dashboards/project/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/manila_ui/dashboards/project/dashboard.py b/manila_ui/dashboards/project/dashboard.py deleted file mode 100644 index c46cf151..00000000 --- a/manila_ui/dashboards/project/dashboard.py +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 2012 Nebula, Inc. -# -# 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.utils.translation import ugettext_lazy as _ - -import horizon - - -class BasePanels(horizon.PanelGroup): - slug = "compute" - name = _("Manage Compute") - panels = ('overview', - 'instances', - 'volumes', - 'images', - 'shares', - 'access_and_security',) - - -class NetworkPanels(horizon.PanelGroup): - slug = "network" - name = _("Manage Network") - panels = ('network_topology', - 'networks', - 'routers', - 'loadbalancers', - 'firewalls', - 'vpn',) - - -class ObjectStorePanels(horizon.PanelGroup): - slug = "object_store" - name = _("Object Store") - panels = ('containers',) - - -class OrchestrationPanels(horizon.PanelGroup): - name = _("Orchestration") - slug = "orchestration" - panels = ('stacks',) - - -class DatabasePanels(horizon.PanelGroup): - name = _("Database") - slug = "database" - panels = ('databases', - 'database_backups',) - - -class DataProcessingPanels(horizon.PanelGroup): - name = _("Data Processing") - slug = "data_processing" - panels = ('data_processing.clusters', - 'data_processing.cluster_templates', - 'data_processing.nodegroup_templates', - 'data_processing.job_executions', - 'data_processing.jobs', - 'data_processing.job_binaries', - 'data_processing.data_sources', - 'data_processing.data_image_registry', - 'data_processing.data_plugins',) - - -class Project(horizon.Dashboard): - name = _("Project") - slug = "project" - panels = ( - BasePanels, - NetworkPanels, - ObjectStorePanels, - OrchestrationPanels, - DatabasePanels, - DataProcessingPanels,) - default_panel = 'overview' - supports_tenants = True - - -horizon.register(Project) diff --git a/manila_ui/dashboards/project/shares/security_services/forms.py b/manila_ui/dashboards/project/shares/security_services/forms.py index a0a07f9b..3d950d5b 100644 --- a/manila_ui/dashboards/project/shares/security_services/forms.py +++ b/manila_ui/dashboards/project/shares/security_services/forms.py @@ -28,7 +28,7 @@ from horizon import forms from horizon import messages from horizon.utils.memoized import memoized # noqa -from openstack_dashboard.api import manila +from manila_ui.api import manila class Create(forms.SelfHandlingForm): diff --git a/manila_ui/dashboards/project/shares/security_services/tables.py b/manila_ui/dashboards/project/shares/security_services/tables.py index 2426f474..4eccef47 100644 --- a/manila_ui/dashboards/project/shares/security_services/tables.py +++ b/manila_ui/dashboards/project/shares/security_services/tables.py @@ -15,7 +15,7 @@ from django.utils.translation import ugettext_lazy as _ from horizon import tables -from openstack_dashboard.api import manila +from manila_ui.api import manila class Create(tables.LinkAction): diff --git a/manila_ui/dashboards/project/shares/security_services/tabs.py b/manila_ui/dashboards/project/shares/security_services/tabs.py index c052ba88..5c2a5ec5 100644 --- a/manila_ui/dashboards/project/shares/security_services/tabs.py +++ b/manila_ui/dashboards/project/shares/security_services/tabs.py @@ -16,9 +16,9 @@ from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import tabs -from openstack_dashboard.api import manila +from manila_ui.api import manila -from openstack_dashboard.dashboards.project.shares.security_services \ +from manila_ui.dashboards.project.shares.security_services \ import tables as security_services_tables diff --git a/manila_ui/dashboards/project/shares/security_services/views.py b/manila_ui/dashboards/project/shares/security_services/views.py index 7e33e0c5..d94965c7 100644 --- a/manila_ui/dashboards/project/shares/security_services/views.py +++ b/manila_ui/dashboards/project/shares/security_services/views.py @@ -19,12 +19,12 @@ from horizon import exceptions from horizon import forms from horizon import tabs -from openstack_dashboard.api import manila -from openstack_dashboard.dashboards.project.shares.security_services import\ +from manila_ui.api import manila +from manila_ui.dashboards.project.shares.security_services import\ forms as sec_services_forms -from openstack_dashboard.dashboards.project.shares.security_services \ +from manila_ui.dashboards.project.shares.security_services \ import tabs as security_services_tabs -from openstack_dashboard.dashboards.project.shares.share_networks import forms\ +from manila_ui.dashboards.project.shares.share_networks import forms\ as share_net_forms diff --git a/manila_ui/dashboards/project/shares/share_networks/forms.py b/manila_ui/dashboards/project/shares/share_networks/forms.py index db2287fd..8f4613d4 100644 --- a/manila_ui/dashboards/project/shares/share_networks/forms.py +++ b/manila_ui/dashboards/project/shares/share_networks/forms.py @@ -27,7 +27,8 @@ from horizon import forms from horizon import messages from horizon.utils.memoized import memoized # noqa -from openstack_dashboard.api import manila +from manila_ui.api import manila + from openstack_dashboard.api import neutron diff --git a/manila_ui/dashboards/project/shares/share_networks/tables.py b/manila_ui/dashboards/project/shares/share_networks/tables.py index b47dc21e..ffc31b05 100644 --- a/manila_ui/dashboards/project/shares/share_networks/tables.py +++ b/manila_ui/dashboards/project/shares/share_networks/tables.py @@ -22,7 +22,8 @@ from django.utils.translation import ugettext_lazy as _ from horizon import tables -from openstack_dashboard.api import manila +from manila_ui.api import manila + from openstack_dashboard.api import neutron from openstack_dashboard.usage import quotas diff --git a/manila_ui/dashboards/project/shares/share_networks/tabs.py b/manila_ui/dashboards/project/shares/share_networks/tabs.py index d395e419..c58d4e71 100644 --- a/manila_ui/dashboards/project/shares/share_networks/tabs.py +++ b/manila_ui/dashboards/project/shares/share_networks/tabs.py @@ -16,12 +16,12 @@ from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import tabs -from openstack_dashboard.api import manila -from openstack_dashboard.api import neutron - -from openstack_dashboard.dashboards.project.shares.share_networks\ +from manila_ui.api import manila +from manila_ui.dashboards.project.shares.share_networks\ import tables as share_net_tables +from openstack_dashboard.api import neutron + class ShareNetworkTab(tabs.TableTab): table_classes = (share_net_tables.ShareNetworkTable,) diff --git a/manila_ui/dashboards/project/shares/share_networks/tests.py b/manila_ui/dashboards/project/shares/share_networks/tests.py index 1d941e95..fcb2db58 100644 --- a/manila_ui/dashboards/project/shares/share_networks/tests.py +++ b/manila_ui/dashboards/project/shares/share_networks/tests.py @@ -17,8 +17,9 @@ import mock from neutronclient.client import exceptions -from openstack_dashboard import api -from openstack_dashboard.dashboards.project.shares import test_data +from manila_ui import api +from manila_ui.dashboards.project.shares import test_data + from openstack_dashboard.test import helpers as test diff --git a/manila_ui/dashboards/project/shares/share_networks/views.py b/manila_ui/dashboards/project/shares/share_networks/views.py index ff2cbb78..d800cfd0 100644 --- a/manila_ui/dashboards/project/shares/share_networks/views.py +++ b/manila_ui/dashboards/project/shares/share_networks/views.py @@ -18,14 +18,14 @@ from horizon import exceptions from horizon import forms from horizon import tabs from horizon import workflows -from openstack_dashboard.api import manila -from openstack_dashboard.api import neutron -from openstack_dashboard.dashboards.project.shares.share_networks import forms\ +from manila_ui.api import manila +from manila_ui.dashboards.project.shares.share_networks import forms \ as share_net_forms -from openstack_dashboard.dashboards.project.shares.share_networks import tabs\ +from manila_ui.dashboards.project.shares.share_networks import tabs \ as share_net_tabs -from openstack_dashboard.dashboards.project.shares.share_networks \ +from manila_ui.dashboards.project.shares.share_networks \ import workflows as share_net_workflows +from openstack_dashboard.api import neutron class Update(workflows.WorkflowView): diff --git a/manila_ui/dashboards/project/shares/share_networks/workflows.py b/manila_ui/dashboards/project/shares/share_networks/workflows.py index df2ba6e4..c5d80413 100644 --- a/manila_ui/dashboards/project/shares/share_networks/workflows.py +++ b/manila_ui/dashboards/project/shares/share_networks/workflows.py @@ -17,7 +17,7 @@ from horizon import exceptions from horizon import forms from horizon import workflows -from openstack_dashboard.api import manila +from manila_ui.api import manila class UpdateShareNetworkInfoAction(workflows.Action): diff --git a/manila_ui/dashboards/project/shares/shares/forms.py b/manila_ui/dashboards/project/shares/shares/forms.py index 41ce1d20..4887c9c7 100644 --- a/manila_ui/dashboards/project/shares/shares/forms.py +++ b/manila_ui/dashboards/project/shares/shares/forms.py @@ -28,8 +28,8 @@ from horizon import forms from horizon import messages from horizon.utils.memoized import memoized # noqa -from openstack_dashboard.api import manila -from openstack_dashboard.dashboards import utils +from manila_ui.api import manila +from manila_ui.dashboards import utils #from openstack_dashboard.usage import quotas diff --git a/manila_ui/dashboards/project/shares/shares/tables.py b/manila_ui/dashboards/project/shares/shares/tables.py index 761eedc7..e9d0ed61 100644 --- a/manila_ui/dashboards/project/shares/shares/tables.py +++ b/manila_ui/dashboards/project/shares/shares/tables.py @@ -23,11 +23,10 @@ from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import messages from horizon import tables - -from openstack_dashboard.api import manila -from openstack_dashboard.dashboards.project.shares.snapshots \ +from manila_ui.api import manila +from manila_ui.dashboards.project.shares.snapshots \ import tables as snapshot_tables -from openstack_dashboard.dashboards import utils +from manila_ui.dashboards import utils from openstack_dashboard.usage import quotas diff --git a/manila_ui/dashboards/project/shares/shares/tabs.py b/manila_ui/dashboards/project/shares/shares/tabs.py index bcc64102..655b56da 100644 --- a/manila_ui/dashboards/project/shares/shares/tabs.py +++ b/manila_ui/dashboards/project/shares/shares/tabs.py @@ -16,11 +16,11 @@ from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import tabs -from openstack_dashboard.api import manila +from manila_ui.api import manila -from openstack_dashboard.dashboards.project.shares.shares \ +from manila_ui.dashboards.project.shares.shares \ import tables as share_tables -from openstack_dashboard.dashboards import utils +from manila_ui.dashboards import utils class SharesTab(tabs.TableTab): diff --git a/manila_ui/dashboards/project/shares/shares/tests.py b/manila_ui/dashboards/project/shares/shares/tests.py index 57c6cdc6..5eba2f8c 100644 --- a/manila_ui/dashboards/project/shares/shares/tests.py +++ b/manila_ui/dashboards/project/shares/shares/tests.py @@ -15,8 +15,8 @@ from django.core.urlresolvers import reverse import mock -from openstack_dashboard import api -from openstack_dashboard.dashboards.project.shares import test_data +from manila_ui import api +from manila_ui.dashboards.project.shares import test_data from openstack_dashboard.test import helpers as test diff --git a/manila_ui/dashboards/project/shares/shares/views.py b/manila_ui/dashboards/project/shares/shares/views.py index 7ef29a47..5439f96e 100644 --- a/manila_ui/dashboards/project/shares/shares/views.py +++ b/manila_ui/dashboards/project/shares/shares/views.py @@ -28,12 +28,12 @@ from horizon import tables from horizon import tabs from horizon.utils import memoized -from openstack_dashboard.api import manila -from openstack_dashboard.dashboards.project.shares.shares import forms \ +from manila_ui.api import manila +from manila_ui.dashboards.project.shares.shares import forms \ as share_form -from openstack_dashboard.dashboards.project.shares.shares \ +from manila_ui.dashboards.project.shares.shares \ import tables as shares_tables -from openstack_dashboard.dashboards.project.shares.shares \ +from manila_ui.dashboards.project.shares.shares \ import tabs as shares_tabs from openstack_dashboard.usage import quotas diff --git a/manila_ui/dashboards/project/shares/snapshots/forms.py b/manila_ui/dashboards/project/shares/snapshots/forms.py index 46143d85..01859a95 100644 --- a/manila_ui/dashboards/project/shares/snapshots/forms.py +++ b/manila_ui/dashboards/project/shares/snapshots/forms.py @@ -28,7 +28,7 @@ from horizon import forms from horizon import messages from horizon.utils.memoized import memoized # noqa -from openstack_dashboard.api import manila +from manila_ui.api import manila class CreateSnapshotForm(forms.SelfHandlingForm): diff --git a/manila_ui/dashboards/project/shares/snapshots/tables.py b/manila_ui/dashboards/project/shares/snapshots/tables.py index c6319b18..ebb1b747 100644 --- a/manila_ui/dashboards/project/shares/snapshots/tables.py +++ b/manila_ui/dashboards/project/shares/snapshots/tables.py @@ -24,7 +24,7 @@ from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import tables -from openstack_dashboard.api import manila +from manila_ui.api import manila from openstack_dashboard.usage import quotas diff --git a/manila_ui/dashboards/project/shares/snapshots/tabs.py b/manila_ui/dashboards/project/shares/snapshots/tabs.py index b4be5745..15318462 100644 --- a/manila_ui/dashboards/project/shares/snapshots/tabs.py +++ b/manila_ui/dashboards/project/shares/snapshots/tabs.py @@ -16,9 +16,9 @@ from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import tabs -from openstack_dashboard.api import manila +from manila_ui.api import manila -from openstack_dashboard.dashboards.project.shares.snapshots \ +from manila_ui.dashboards.project.shares.snapshots \ import tables as snapshot_tables diff --git a/manila_ui/dashboards/project/shares/snapshots/tests.py b/manila_ui/dashboards/project/shares/snapshots/tests.py index c8a12e39..7a279e8b 100644 --- a/manila_ui/dashboards/project/shares/snapshots/tests.py +++ b/manila_ui/dashboards/project/shares/snapshots/tests.py @@ -15,8 +15,8 @@ from django.core.urlresolvers import reverse import mock -from openstack_dashboard import api -from openstack_dashboard.dashboards.project.shares import test_data +from manila_ui import api +from manila_ui.dashboards.project.shares import test_data from openstack_dashboard.test import helpers as test diff --git a/manila_ui/dashboards/project/shares/snapshots/views.py b/manila_ui/dashboards/project/shares/snapshots/views.py index 07072b9e..47fb98f9 100644 --- a/manila_ui/dashboards/project/shares/snapshots/views.py +++ b/manila_ui/dashboards/project/shares/snapshots/views.py @@ -22,10 +22,10 @@ from horizon import forms from horizon import tabs from horizon.utils import memoized -from openstack_dashboard.api import manila -from openstack_dashboard.dashboards.project.shares.snapshots import forms \ +from manila_ui.api import manila +from manila_ui.dashboards.project.shares.snapshots import forms \ as snapshot_forms -from openstack_dashboard.dashboards.project.shares.snapshots\ +from manila_ui.dashboards.project.shares.snapshots\ import tabs as snapshot_tabs from openstack_dashboard.usage import quotas diff --git a/manila_ui/dashboards/project/shares/urls.py b/manila_ui/dashboards/project/shares/urls.py index f1a30ef6..6ef19ee6 100644 --- a/manila_ui/dashboards/project/shares/urls.py +++ b/manila_ui/dashboards/project/shares/urls.py @@ -17,15 +17,15 @@ from django.conf.urls import patterns # noqa from django.conf.urls import url # noqa -from openstack_dashboard.dashboards.project.shares.security_services \ +from manila_ui.dashboards.project.shares.security_services \ import views as security_services_views -from openstack_dashboard.dashboards.project.shares.share_networks \ +from manila_ui.dashboards.project.shares.share_networks \ import views as share_networks_views -from openstack_dashboard.dashboards.project.shares.shares \ +from manila_ui.dashboards.project.shares.shares \ import views as shares_views -from openstack_dashboard.dashboards.project.shares.snapshots\ +from manila_ui.dashboards.project.shares.snapshots\ import views as snapshot_views -from openstack_dashboard.dashboards.project.shares import views +from manila_ui.dashboards.project.shares import views urlpatterns = patterns('openstack_dashboard.dashboards.project.shares.views', diff --git a/manila_ui/dashboards/project/shares/views.py b/manila_ui/dashboards/project/shares/views.py index 0770c1d7..b5a2ab1b 100644 --- a/manila_ui/dashboards/project/shares/views.py +++ b/manila_ui/dashboards/project/shares/views.py @@ -21,13 +21,13 @@ Views for managing shares. from horizon import tabs -from openstack_dashboard.dashboards.project.shares.security_services \ +from manila_ui.dashboards.project.shares.security_services \ import tabs as security_services_tabs -from openstack_dashboard.dashboards.project.shares.share_networks \ +from manila_ui.dashboards.project.shares.share_networks \ import tabs as share_networks_tabs -from openstack_dashboard.dashboards.project.shares.shares \ +from manila_ui.dashboards.project.shares.shares \ import tabs as shares_tabs -from openstack_dashboard.dashboards.project.shares.snapshots \ +from manila_ui.dashboards.project.shares.snapshots \ import tabs as snapshots_tabs diff --git a/requirements.txt b/requirements.txt index bc7131e8..c34e7e6f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,17 @@ # process, which may cause wedges in the gate later. pbr>=0.6,!=0.7,<1.0 -Babel>=1.3 \ No newline at end of file +# Horizon Core Requirements +Babel>=1.3 +Django>=1.4.2,<1.7 +django_compressor>=1.4 +django_openstack_auth>=1.1.7,!=1.1.8 +eventlet>=0.16.1 +kombu>=2.5.0 +iso8601>=0.1.9 +netaddr>=0.7.12 +os-cloud-config +python-keystoneclient>=1.1.0 +pytz>=2013.6 + +python-manilaclient>=1.0.2