openstack/manila-ui
Code Issues Proposed changes

Enable projects, admin panels to load

Browse Source
This commit is contained in:
Gary W. Smith 2015-03-16 13:56:51 -07:00
parent d7d7bc10b0
commit 2dd906428c
38 changed files with 105 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_90_manila_admin_shares.py Normal file
View File

@ -0,0 +1,4 @@
PANEL_DASHBOARD = 'admin'
PANEL_GROUP = 'admin'
PANEL = 'shares'
ADD_PANEL = 'manila_ui.dashboards.admin.shares.panel.Shares'

4
_90_manila_project_shares.py Normal file
View File

@ -0,0 +1,4 @@
PANEL_DASHBOARD = 'project'
PANEL_GROUP = 'compute'
PANEL = 'shares'
ADD_PANEL = 'manila_ui.dashboards.project.shares.panel.Shares'

68
manila_ui/api/__init__.py
View File

@ -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",
]

0
manila_ui/dashboards/__init__.py Normal file
View File

0
manila_ui/dashboards/admin/__init__.py Normal file
View File

36
manila_ui/dashboards/admin/dashboard.py
View File

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

5
manila_ui/dashboards/admin/shares/forms.py
View File

@ -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 = {

9
manila_ui/dashboards/admin/shares/tables.py
View File

@ -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")

22
manila_ui/dashboards/admin/shares/tabs.py
View File

@ -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):

2
manila_ui/dashboards/admin/shares/tests.py
View File

@ -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

8
manila_ui/dashboards/admin/shares/urls.py
View File

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

2
manila_ui/dashboards/admin/shares/utils.py
View File

@ -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):

14
manila_ui/dashboards/admin/shares/views.py
View File

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

0
manila_ui/dashboards/project/__init__.py Normal file
View File

89
manila_ui/dashboards/project/dashboard.py
View File

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

2
manila_ui/dashboards/project/shares/security_services/forms.py
View File

@ -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):

2
manila_ui/dashboards/project/shares/security_services/tables.py
View File

@ -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):

4
manila_ui/dashboards/project/shares/security_services/tabs.py
View File

@ -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

8
manila_ui/dashboards/project/shares/security_services/views.py
View File

@ -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

3
manila_ui/dashboards/project/shares/share_networks/forms.py
View File

@ -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

3
manila_ui/dashboards/project/shares/share_networks/tables.py
View File

@ -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

8
manila_ui/dashboards/project/shares/share_networks/tabs.py
View File

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

5
manila_ui/dashboards/project/shares/share_networks/tests.py
View File

@ -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

10
manila_ui/dashboards/project/shares/share_networks/views.py
View File

@ -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):

2
manila_ui/dashboards/project/shares/share_networks/workflows.py
View File

@ -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):

4
manila_ui/dashboards/project/shares/shares/forms.py
View File

@ -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

7
manila_ui/dashboards/project/shares/shares/tables.py
View File

@ -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

6
manila_ui/dashboards/project/shares/shares/tabs.py
View File

@ -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):

4
manila_ui/dashboards/project/shares/shares/tests.py
View File

@ -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

8
manila_ui/dashboards/project/shares/shares/views.py
View File

@ -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

2
manila_ui/dashboards/project/shares/snapshots/forms.py
View File

@ -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):

2
manila_ui/dashboards/project/shares/snapshots/tables.py
View File

@ -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

4
manila_ui/dashboards/project/shares/snapshots/tabs.py
View File

@ -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

4
manila_ui/dashboards/project/shares/snapshots/tests.py
View File

@ -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

6
manila_ui/dashboards/project/shares/snapshots/views.py
View File

@ -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

10
manila_ui/dashboards/project/shares/urls.py
View File

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

8
manila_ui/dashboards/project/shares/views.py
View File

@ -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

15
requirements.txt
View File

@ -3,4 +3,17 @@
# process, which may cause wedges in the gate later.
pbr>=0.6,!=0.7,<1.0
Babel>=1.3
# 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