Sort imports alphabetically

This patch also re-organizes imports to import one per line.

Change-Id: Ia958e3a30a48d4308d08d51df243c1272425c316
Fixes: bug 1188529
Fixes: bug 1188537
This commit is contained in:
Matthias Runge 2013-06-10 14:29:44 +02:00
parent a30752d9a2
commit cea720e793
197 changed files with 838 additions and 414 deletions

View File

@ -26,7 +26,10 @@ methods like :func:`~horizon.register` and :func:`~horizon.unregister`.
# should that fail.
Horizon = None
try:
from horizon.base import Horizon, Dashboard, Panel, PanelGroup
from horizon.base import Dashboard
from horizon.base import Horizon
from horizon.base import Panel
from horizon.base import PanelGroup
except ImportError:
import warnings

View File

@ -29,7 +29,9 @@ import logging
import os
from django.conf import settings
from django.conf.urls.defaults import patterns, url, include
from django.conf.urls.defaults import include
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from django.core.exceptions import ImproperlyConfigured
from django.core.urlresolvers import reverse
from django.utils.datastructures import SortedDict
@ -38,9 +40,11 @@ from django.utils.importlib import import_module
from django.utils.module_loading import module_has_submodule
from django.utils.translation import ugettext_lazy as _
from horizon import loaders
from horizon import conf
from horizon.decorators import require_auth, require_perms, _current_component
from horizon.decorators import _current_component
from horizon.decorators import require_auth
from horizon.decorators import require_perms
from horizon import loaders
LOG = logging.getLogger(__name__)

View File

@ -17,9 +17,9 @@
from django import template
from django.utils.translation import ugettext_lazy as _
from horizon.browsers.breadcrumb import Breadcrumb
from horizon.tables import DataTable
from horizon.utils import html
from .breadcrumb import Breadcrumb
class ResourceBrowser(html.HTMLElement):

View File

@ -1,12 +1,13 @@
import copy
from django.utils.functional import LazyObject, empty
from django.utils.functional import empty
from django.utils.functional import LazyObject
class LazySettings(LazyObject):
def _setup(self, name=None):
from django.conf import settings
from .default import HORIZON_CONFIG as DEFAULT_CONFIG
from horizon.conf.default import HORIZON_CONFIG as DEFAULT_CONFIG
HORIZON_CONFIG = copy.copy(DEFAULT_CONFIG)
HORIZON_CONFIG.update(settings.HORIZON_CONFIG)

View File

@ -26,10 +26,11 @@ from django.contrib.auth import logout
from django.http import HttpRequest
from django.utils import termcolors
from django.utils.translation import ugettext_lazy as _
from django.views.debug import SafeExceptionReporterFilter, CLEANSED_SUBSTITUTE
from django.views.debug import CLEANSED_SUBSTITUTE
from django.views.debug import SafeExceptionReporterFilter
from horizon import messages
from horizon.conf import HORIZON_CONFIG
from horizon import messages
LOG = logging.getLogger(__name__)
PALETTE = termcolors.PALETTES[termcolors.DEFAULT_PALETTE]

View File

@ -19,9 +19,13 @@ from django.forms import *
from django.forms import widgets
# Convenience imports for public API components.
from .base import SelfHandlingMixin, SelfHandlingForm, DateForm
from .views import ModalFormView, ModalFormMixin
from .fields import DynamicTypedChoiceField, DynamicChoiceField
from horizon.forms.base import DateForm
from horizon.forms.base import SelfHandlingForm
from horizon.forms.base import SelfHandlingMixin
from horizon.forms.fields import DynamicChoiceField
from horizon.forms.fields import DynamicTypedChoiceField
from horizon.forms.views import ModalFormMixin
from horizon.forms.views import ModalFormView
assert widgets
assert SelfHandlingMixin

View File

@ -20,7 +20,8 @@
from django import forms
from django.forms.forms import NON_FIELD_ERRORS
from django.utils import dates, timezone
from django.utils import dates
from django.utils import timezone
class SelfHandlingMixin(object):

View File

@ -15,7 +15,8 @@
# under the License.
from django.core import urlresolvers
from django.forms import fields, widgets
from django.forms import fields
from django.forms import widgets
class DynamicSelectWidget(widgets.Select):

View File

@ -24,14 +24,14 @@ Middleware provided and used by Horizon.
import json
import logging
from django import http
from django import shortcuts
from django.conf import settings
from django.contrib import messages as django_messages
from django.contrib.auth import REDIRECT_FIELD_NAME
from django.contrib.auth.views import redirect_to_login
from django.utils import timezone
from django.contrib import messages as django_messages
from django import http
from django import shortcuts
from django.utils.encoding import iri_to_uri
from django.utils import timezone
from horizon import exceptions

View File

@ -18,9 +18,11 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.views.generic import TemplateView
from django.conf.urls.defaults import patterns, url, include
from django.conf import settings
from django.conf.urls.defaults import include
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from django.views.generic import TemplateView
urlpatterns = patterns('horizon.views',

View File

@ -15,11 +15,19 @@
# under the License.
# Convenience imports for public API components.
from .actions import (Action, BatchAction, DeleteAction,
LinkAction, FilterAction, FixedFilterAction)
from .base import DataTable, Column, Row
from .views import DataTableView, MultiTableView, MultiTableMixin, \
MixedDataTableView
from horizon.tables.actions import Action
from horizon.tables.actions import BatchAction
from horizon.tables.actions import DeleteAction
from horizon.tables.actions import FilterAction
from horizon.tables.actions import FixedFilterAction
from horizon.tables.actions import LinkAction
from horizon.tables.base import Column
from horizon.tables.base import DataTable
from horizon.tables.base import Row
from horizon.tables.views import DataTableView
from horizon.tables.views import MixedDataTableView
from horizon.tables.views import MultiTableMixin
from horizon.tables.views import MultiTableView
assert Action
assert BatchAction

View File

@ -14,19 +14,20 @@
# License for the specific language governing permissions and limitations
# under the License.
from collections import defaultdict
import logging
import new
from collections import defaultdict
from django import shortcuts
from django.conf import settings
from django.core import urlresolvers
from django import shortcuts
from django.utils.functional import Promise
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions
from horizon import messages
from horizon.utils import html, functions
from horizon.utils import functions
from horizon.utils import html
LOG = logging.getLogger(__name__)

View File

@ -20,26 +20,27 @@ import logging
from operator import attrgetter
import sys
from django.conf import settings
from django.core import urlresolvers
from django import forms
from django.http import HttpResponse
from django import template
from django.conf import settings
from django.core import urlresolvers
from django.template.defaultfilters import truncatechars
from django.template.loader import render_to_string
from django.utils import http
from django.utils.datastructures import SortedDict
from django.utils.html import escape
from django.utils import http
from django.utils.http import urlencode
from django.utils.translation import ugettext_lazy as _
from django.utils.safestring import mark_safe
from django.utils import termcolors
from django.utils.translation import ugettext_lazy as _
from horizon import conf
from horizon import exceptions
from horizon import messages
from horizon.tables.actions import FilterAction
from horizon.tables.actions import LinkAction
from horizon.utils import html
from .actions import FilterAction, LinkAction
LOG = logging.getLogger(__name__)

View File

@ -14,8 +14,11 @@
# License for the specific language governing permissions and limitations
# under the License.
from .base import TabGroup, Tab, TableTab
from .views import TabView, TabbedTableView
from horizon.tabs.base import Tab
from horizon.tabs.base import TabGroup
from horizon.tabs.base import TableTab
from horizon.tabs.views import TabbedTableView
from horizon.tabs.views import TabView
assert TabGroup
assert Tab

View File

@ -16,8 +16,8 @@
import sys
from django.template import TemplateSyntaxError
from django.template.loader import render_to_string
from django.template import TemplateSyntaxError
from django.utils.datastructures import SortedDict
from horizon import exceptions

View File

@ -3,7 +3,7 @@ from django.views import generic
from horizon import exceptions
from horizon import tables
from .base import TableTab
from horizon.tabs.base import TableTab
class TabView(generic.TemplateView):

View File

@ -22,8 +22,8 @@
Template tags for customizing Horizon.
"""
from django import template
from django.conf import settings
from django import template
from django.utils.translation import ugettext_lazy as _

View File

@ -17,8 +17,8 @@
from __future__ import absolute_import
from django import template
from django.utils.encoding import force_unicode
from django.utils.datastructures import SortedDict
from django.utils.encoding import force_unicode
from django.utils.translation import ugettext_lazy as _
from horizon.base import Horizon

View File

@ -23,8 +23,8 @@ Template tags for displaying sizes
"""
from django import template
from django.utils import translation
from django.utils import formats
from django.utils import translation
register = template.Library()

View File

@ -21,14 +21,14 @@
import os
import socket
from django import http
from django import test as django_test
from django.contrib.auth.middleware import AuthenticationMiddleware
from django.contrib.auth.models import Permission
from django.contrib.auth.models import User
from django.contrib.contenttypes.models import ContentType
from django.contrib.messages.storage import default_storage
from django.contrib.auth.middleware import AuthenticationMiddleware
from django.contrib.auth.models import User
from django.core.handlers import wsgi
from django import http
from django import test as django_test
from django.test.client import RequestFactory
from django.utils import unittest

View File

@ -1,6 +1,7 @@
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import IndexView
from horizon.test.test_dashboards.cats.kittens.views import IndexView
urlpatterns = patterns('',
url(r'^$', IndexView.as_view(), name='index'),

View File

@ -1,6 +1,7 @@
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import IndexView
from horizon.test.test_dashboards.cats.tigers.views import IndexView
urlpatterns = patterns('',
url(r'^$', IndexView.as_view(), name='index'),

View File

@ -1,6 +1,7 @@
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import IndexView
from horizon.test.test_dashboards.dogs.puppies.views import IndexView
urlpatterns = patterns('',
url(r'^$', IndexView.as_view(), name='index'),

View File

@ -14,9 +14,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.core.urlresolvers import reverse
from django import http
from django import shortcuts
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext_lazy as _
from mox import IsA

View File

@ -23,7 +23,8 @@ from horizon import exceptions
from horizon import tabs as horizon_tabs
from horizon.test import helpers as test
from .tables import MyTable, TEST_DATA
from horizon.test.tests.tables import MyTable
from horizon.test.tests.tables import TEST_DATA
class BaseTestTab(horizon_tabs.Tab):

View File

@ -20,9 +20,10 @@
import re
from django.utils.text import normalize_newlines
from django.template import Context, Template
from django.conf import settings
from django.template import Context
from django.template import Template
from django.utils.text import normalize_newlines
from horizon.test import helpers as test

View File

@ -19,8 +19,8 @@ from django import http
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions
from horizon import workflows
from horizon.test import helpers as test
from horizon import workflows
PROJECT_ID = "a23lkjre389fwenj"

View File

@ -22,7 +22,9 @@
URL patterns for testing Horizon views.
"""
from django.conf.urls.defaults import patterns, url, include
from django.conf.urls.defaults import include
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.views.generic import TemplateView

View File

@ -1,11 +1,13 @@
import re
import netaddr
from django.core.exceptions import ValidationError
from django.forms import forms, widgets
from django.utils.translation import ugettext_lazy as _
from django.forms import forms
from django.forms import widgets
from django.utils.encoding import force_unicode
from django.utils.html import escape, conditional_escape
from django.utils.functional import Promise
from django.utils.html import conditional_escape
from django.utils.html import escape
from django.utils.translation import ugettext_lazy as _
import netaddr
import re
ip_allowed_symbols_re = re.compile(r'^[a-fA-F0-9:/\.]+$')
IPv4 = 1

View File

@ -18,9 +18,9 @@
from __future__ import with_statement # Python 2.5 compliance
import lockfile
import os
import random
import string
import os
class FilePermissionError(Exception):

View File

@ -1,5 +1,8 @@
from .base import Workflow, Step, Action, UpdateMembersStep
from .views import WorkflowView
from horizon.workflows.base import Action
from horizon.workflows.base import Step
from horizon.workflows.base import UpdateMembersStep
from horizon.workflows.base import Workflow
from horizon.workflows.views import WorkflowView
assert Action
assert Step

View File

@ -18,15 +18,16 @@ import copy
import inspect
import logging
from django import forms
from django import template
from django.core import urlresolvers
from django import forms
from django.forms.forms import NON_FIELD_ERRORS
from django import template
from django.template.defaultfilters import linebreaks
from django.template.defaultfilters import safe
from django.template.defaultfilters import slugify
from django.utils.encoding import force_unicode
from django.utils.importlib import import_module
from django.utils.translation import ugettext_lazy as _
from django.template.defaultfilters import linebreaks, safe
from django.forms.forms import NON_FIELD_ERRORS
from horizon import base
from horizon import exceptions

View File

@ -22,8 +22,8 @@ from django import shortcuts
from django.views import generic
from horizon import exceptions
from horizon import messages
from horizon.forms.views import ADD_TO_FIELD_HEADER
from horizon import messages
class WorkflowView(generic.TemplateView):

View File

@ -35,13 +35,13 @@ Keystone/Nova/Glance/Swift et. al.
"""
from openstack_dashboard.api import base
from openstack_dashboard.api import cinder
from openstack_dashboard.api import heat
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 nova
from openstack_dashboard.api import quantum
from openstack_dashboard.api import lbaas
from openstack_dashboard.api import swift
assert base

View File

@ -29,10 +29,11 @@ from django.utils.translation import ugettext_lazy as _
from cinderclient.v1 import client as cinder_client
from horizon import exceptions
from openstack_dashboard.api.base import QuotaSet
from openstack_dashboard.api.base import url_for
from openstack_dashboard.api import nova
from openstack_dashboard.api.base import QuotaSet
from horizon import exceptions
LOG = logging.getLogger(__name__)

View File

@ -35,8 +35,10 @@ from novaclient.v1_1.servers import REBOOT_HARD
from horizon.conf import HORIZON_CONFIG
from horizon.utils.memoized import memoized
from openstack_dashboard.api.base import (APIResourceWrapper, QuotaSet,
APIDictWrapper, url_for)
from openstack_dashboard.api.base import APIDictWrapper
from openstack_dashboard.api.base import APIResourceWrapper
from openstack_dashboard.api.base import QuotaSet
from openstack_dashboard.api.base import url_for
from openstack_dashboard.api import network

View File

@ -24,13 +24,14 @@ from __future__ import absolute_import
import logging
from django.conf import settings
from quantumclient.v2_0 import client as quantum_client
from django.utils.datastructures import SortedDict
from openstack_dashboard.api.base import APIDictWrapper, url_for
from openstack_dashboard.api.base import APIDictWrapper
from openstack_dashboard.api.base import url_for
from openstack_dashboard.api import network
from openstack_dashboard.api import nova
from quantumclient.v2_0 import client as quantum_client
LOG = logging.getLogger(__name__)

View File

@ -23,12 +23,13 @@ import logging
import swiftclient
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions
from horizon import messages
from django.utils.translation import ugettext_lazy as _
from openstack_dashboard.api.base import url_for, APIDictWrapper
from openstack_dashboard.api.base import APIDictWrapper
from openstack_dashboard.api.base import url_for
LOG = logging.getLogger(__name__)

View File

@ -25,8 +25,8 @@ from horizon import tables
from openstack_dashboard import api
from .constants import DOMAINS_CREATE_URL, \
DOMAINS_UPDATE_URL
from .constants import DOMAINS_CREATE_URL
from .constants import DOMAINS_UPDATE_URL
LOG = logging.getLogger(__name__)

View File

@ -15,21 +15,23 @@
# under the License.
from django import http
from django.core.urlresolvers import reverse
from django import http
from mox import IgnoreArg, IsA
from mox import IgnoreArg
from mox import IsA
from horizon.workflows.views import WorkflowView
from openstack_dashboard import api
from openstack_dashboard.test import helpers as test
from .constants import DOMAINS_INDEX_VIEW_TEMPLATE, \
DOMAINS_INDEX_URL as index_url, \
DOMAINS_CREATE_URL as create_url, \
DOMAINS_UPDATE_URL as update_url
from .workflows import CreateDomain, UpdateDomain
from .constants import DOMAINS_CREATE_URL as create_url
from .constants import DOMAINS_INDEX_URL as index_url
from .constants import DOMAINS_INDEX_VIEW_TEMPLATE
from .constants import DOMAINS_UPDATE_URL as update_url
from .workflows import CreateDomain
from .workflows import UpdateDomain
DOMAINS_INDEX_URL = reverse(index_url)

View File

@ -14,9 +14,12 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import IndexView, CreateDomainView, UpdateDomainView
from .views import CreateDomainView
from .views import IndexView
from .views import UpdateDomainView
urlpatterns = patterns('',

View File

@ -22,10 +22,13 @@ from horizon import tables
from horizon import workflows
from openstack_dashboard import api
from .constants import DOMAIN_INFO_FIELDS, DOMAINS_INDEX_URL, \
DOMAINS_INDEX_VIEW_TEMPLATE
from .constants import DOMAIN_INFO_FIELDS
from .constants import DOMAINS_INDEX_URL
from .constants import DOMAINS_INDEX_VIEW_TEMPLATE
from .tables import DomainsTable
from .workflows import CreateDomain, UpdateDomain
from .workflows import CreateDomain
from .workflows import UpdateDomain
class IndexView(tables.DataTableView):

View File

@ -19,8 +19,8 @@ import logging
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions
from horizon import workflows
from horizon import forms
from horizon import workflows
from openstack_dashboard import api

View File

@ -23,6 +23,7 @@ import logging
from django.utils.translation import ugettext_lazy as _
from openstack_dashboard import api
from horizon import exceptions
from horizon import forms
from horizon import messages

View File

@ -1,5 +1,5 @@
from django import http
from django.core.urlresolvers import reverse
from django import http
from mox import IsA

View File

@ -18,9 +18,12 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import IndexView, EditView, CreateView
from .views import CreateView
from .views import EditView
from .views import IndexView
urlpatterns = patterns('',
url(r'^$', IndexView.as_view(), name='index'),

View File

@ -27,8 +27,10 @@ from horizon import forms
from horizon import tables
from openstack_dashboard import api
from .forms import CreateExtraSpec
from .forms import EditExtraSpec
from .tables import ExtraSpecsTable
from .forms import CreateExtraSpec, EditExtraSpec
LOG = logging.getLogger(__name__)

View File

@ -1,9 +1,10 @@
from django import http
from django.core.urlresolvers import reverse
from django import http
from mox import IsA
from openstack_dashboard import api
from openstack_dashboard.test import helpers as test
from novaclient.v1_1 import flavors

View File

@ -18,9 +18,14 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns, url, include
from .views import IndexView, CreateView, EditView
from django.conf.urls.defaults import include
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .extras import urls as extras_urls
from .views import CreateView
from .views import EditView
from .views import IndexView
urlpatterns = patterns('openstack_dashboard.dashboards.admin.flavors.views',
url(r'^$', IndexView.as_view(), name='index'),

View File

@ -28,7 +28,9 @@ from horizon import forms
from horizon import tables
from openstack_dashboard import api
from .forms import CreateFlavor, EditFlavor
from .forms import CreateFlavor
from .forms import EditFlavor
from .tables import FlavorsTable

View File

@ -24,8 +24,10 @@ from horizon import tables
from openstack_dashboard import api
from .constants import GROUPS_CREATE_URL, GROUPS_UPDATE_URL, \
GROUPS_MANAGE_URL, GROUPS_ADD_MEMBER_URL
from .constants import GROUPS_ADD_MEMBER_URL
from .constants import GROUPS_CREATE_URL
from .constants import GROUPS_MANAGE_URL
from .constants import GROUPS_UPDATE_URL
LOG = logging.getLogger(__name__)

View File

@ -14,21 +14,22 @@
# License for the specific language governing permissions and limitations
# under the License.
from django import http
from django.core.urlresolvers import reverse
from django import http
from mox import IgnoreArg, IsA
from mox import IgnoreArg
from mox import IsA
from openstack_dashboard import api
from openstack_dashboard.test import helpers as test
from .constants import GROUPS_INDEX_VIEW_TEMPLATE, \
GROUPS_MANAGE_VIEW_TEMPLATE, \
GROUPS_INDEX_URL as index_url, \
GROUPS_CREATE_URL as create_url, \
GROUPS_UPDATE_URL as update_url, \
GROUPS_MANAGE_URL as manage_url, \
GROUPS_ADD_MEMBER_URL as add_member_url
from .constants import GROUPS_ADD_MEMBER_URL as add_member_url
from .constants import GROUPS_CREATE_URL as create_url
from .constants import GROUPS_INDEX_URL as index_url
from .constants import GROUPS_INDEX_VIEW_TEMPLATE
from .constants import GROUPS_MANAGE_URL as manage_url
from .constants import GROUPS_MANAGE_VIEW_TEMPLATE
from .constants import GROUPS_UPDATE_URL as update_url
GROUPS_INDEX_URL = reverse(index_url)

View File

@ -14,10 +14,14 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import IndexView, CreateView, UpdateView, \
ManageMembersView, NonMembersView
from .views import CreateView
from .views import IndexView
from .views import ManageMembersView
from .views import NonMembersView
from .views import UpdateView
urlpatterns = patterns('',

View File

@ -14,7 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.core.urlresolvers import reverse, reverse_lazy
from django.core.urlresolvers import reverse
from django.core.urlresolvers import reverse_lazy
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions
@ -22,13 +23,19 @@ from horizon import forms
from horizon import tables
from openstack_dashboard import api
from .constants import GROUPS_INDEX_URL, GROUPS_INDEX_VIEW_TEMPLATE, \
GROUPS_CREATE_VIEW_TEMPLATE, GROUPS_UPDATE_VIEW_TEMPLATE, \
GROUPS_MANAGE_VIEW_TEMPLATE, GROUPS_ADD_MEMBER_VIEW_TEMPLATE, \
GROUPS_ADD_MEMBER_AJAX_VIEW_TEMPLATE
from .forms import CreateGroupForm, UpdateGroupForm
from .tables import GroupsTable, GroupMembersTable, \
GroupNonMembersTable
from .constants import GROUPS_ADD_MEMBER_AJAX_VIEW_TEMPLATE
from .constants import GROUPS_ADD_MEMBER_VIEW_TEMPLATE
from .constants import GROUPS_CREATE_VIEW_TEMPLATE
from .constants import GROUPS_INDEX_URL
from .constants import GROUPS_INDEX_VIEW_TEMPLATE
from .constants import GROUPS_MANAGE_VIEW_TEMPLATE
from .constants import GROUPS_UPDATE_VIEW_TEMPLATE
from .forms import CreateGroupForm
from .forms import UpdateGroupForm
from .tables import GroupMembersTable
from .tables import GroupNonMembersTable
from .tables import GroupsTable
class IndexView(tables.DataTableView):

View File

@ -19,8 +19,13 @@ from django.utils.translation import ugettext_lazy as _
from horizon import tables
from openstack_dashboard.dashboards.project.images_and_snapshots \
.images.tables import (ImagesTable, CreateImage, EditImage,
DeleteImage)
.images.tables import CreateImage
from openstack_dashboard.dashboards.project.images_and_snapshots \
.images.tables import DeleteImage
from openstack_dashboard.dashboards.project.images_and_snapshots \
.images.tables import EditImage
from openstack_dashboard.dashboards.project.images_and_snapshots \
.images.tables import ImagesTable
class AdminCreateImage(CreateImage):

View File

@ -14,14 +14,16 @@
# License for the specific language governing permissions and limitations
# under the License.
from django import http
from django.conf import settings
from django.core.urlresolvers import reverse
from django import http
from django.test.utils import override_settings
from mox import IsA
from openstack_dashboard import api
from openstack_dashboard.test import helpers as test
from .tables import AdminImagesTable

View File

@ -18,9 +18,13 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import IndexView, CreateView, UpdateView, DetailView
from .views import CreateView
from .views import DetailView
from .views import IndexView
from .views import UpdateView
urlpatterns = patterns('openstack_dashboard.dashboards.admin.images.views',

View File

@ -29,8 +29,10 @@ from horizon import tables
from openstack_dashboard import api
from openstack_dashboard.dashboards.project \
.images_and_snapshots.images import views
from .forms import AdminCreateImageForm
from .forms import AdminUpdateImageForm
from .tables import AdminImagesTable
from .forms import AdminCreateImageForm, AdminUpdateImageForm
LOG = logging.getLogger(__name__)

View File

@ -21,7 +21,9 @@ from horizon import tabs
from openstack_dashboard.api import keystone
from openstack_dashboard.usage import quotas
from .tables import QuotasTable, ServicesTable
from .tables import QuotasTable
from .tables import ServicesTable
class DefaultQuotasTab(tabs.TableTab):

View File

@ -14,12 +14,12 @@
# License for the specific language governing permissions and limitations
# under the License.
from django import http
from django.core.urlresolvers import reverse
from django import http
from mox import IsA
from openstack_dashboard.test import helpers as test
from openstack_dashboard import api
from openstack_dashboard.test import helpers as test
INDEX_URL = reverse('horizon:admin:info:index')

View File

@ -18,7 +18,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import IndexView

View File

@ -24,13 +24,44 @@ from horizon import tables
from horizon.utils.filters import replace_underscores
from openstack_dashboard import api
from openstack_dashboard.dashboards.project.instances.tables import (
TerminateInstance, EditInstance, ConsoleLink, LogLink, CreateSnapshot,
TogglePause, ToggleSuspend, RebootInstance, SoftRebootInstance,
ConfirmResize, RevertResize, get_size, UpdateRow, get_ips,
get_power_state, is_deleting, ACTIVE_STATES, STATUS_DISPLAY_CHOICES,
TASK_DISPLAY_CHOICES)
from openstack_dashboard.dashboards.project.instances.tables import \
ACTIVE_STATES
from openstack_dashboard.dashboards.project.instances.tables import \
ConfirmResize
from openstack_dashboard.dashboards.project.instances.tables import \
ConsoleLink
from openstack_dashboard.dashboards.project.instances.tables import \
CreateSnapshot
from openstack_dashboard.dashboards.project.instances.tables import \
EditInstance
from openstack_dashboard.dashboards.project.instances.tables import \
get_ips
from openstack_dashboard.dashboards.project.instances.tables import \
get_power_state
from openstack_dashboard.dashboards.project.instances.tables import \
get_size
from openstack_dashboard.dashboards.project.instances.tables import \
is_deleting
from openstack_dashboard.dashboards.project.instances.tables import \
LogLink
from openstack_dashboard.dashboards.project.instances.tables import \
RebootInstance
from openstack_dashboard.dashboards.project.instances.tables import \
RevertResize
from openstack_dashboard.dashboards.project.instances.tables import \
SoftRebootInstance
from openstack_dashboard.dashboards.project.instances.tables import \
STATUS_DISPLAY_CHOICES
from openstack_dashboard.dashboards.project.instances.tables import \
TASK_DISPLAY_CHOICES
from openstack_dashboard.dashboards.project.instances.tables import \
TerminateInstance
from openstack_dashboard.dashboards.project.instances.tables import \
TogglePause
from openstack_dashboard.dashboards.project.instances.tables import \
ToggleSuspend
from openstack_dashboard.dashboards.project.instances.tables import \
UpdateRow
LOG = logging.getLogger(__name__)

View File

@ -16,8 +16,8 @@
import uuid
from django import http
from django.core.urlresolvers import reverse
from django import http
from django.utils.datastructures import SortedDict
from mox import IsA

View File

@ -18,11 +18,13 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import url, patterns
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import AdminIndexView, AdminUpdateView
from openstack_dashboard.dashboards.project.instances.views import \
DetailView
from .views import AdminIndexView
from .views import AdminUpdateView
INSTANCES = r'^(?P<instance_id>[^/]+)/%s$'

View File

@ -31,7 +31,13 @@ from openstack_dashboard import api
from openstack_dashboard.dashboards.admin.instances.tables import \
AdminInstancesTable
from openstack_dashboard.dashboards.project.instances.views import \
console as p_console, vnc as p_vnc, spice as p_spice, UpdateView
console as p_console
from openstack_dashboard.dashboards.project.instances.views import \
spice as p_spice
from openstack_dashboard.dashboards.project.instances.views import \
UpdateView
from openstack_dashboard.dashboards.project.instances.views import \
vnc as p_vnc
from openstack_dashboard.dashboards.project.instances.workflows.\
update_instance import AdminUpdateInstance

View File

@ -24,7 +24,9 @@ from horizon import tables
from openstack_dashboard import api
from openstack_dashboard.dashboards.project.networks.ports.tables import \
get_fixed_ips, get_attached
get_attached
from openstack_dashboard.dashboards.project.networks.ports.tables import \
get_fixed_ips
LOG = logging.getLogger(__name__)

View File

@ -14,7 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from openstack_dashboard.dashboards.project.networks.ports.views import \
DetailView

View File

@ -26,7 +26,8 @@ from openstack_dashboard import api
from openstack_dashboard.dashboards.project.networks.ports \
import views as project_views
from .forms import CreatePort, UpdatePort
from .forms import CreatePort
from .forms import UpdatePort
LOG = logging.getLogger(__name__)

View File

@ -14,7 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from openstack_dashboard.dashboards.project.networks.subnets.views import \
DetailView

View File

@ -19,7 +19,8 @@ import logging
from openstack_dashboard.dashboards.project.networks.subnets \
import views as project_views
from .workflows import CreateSubnet, UpdateSubnet
from .workflows import CreateSubnet
from .workflows import UpdateSubnet
LOG = logging.getLogger(__name__)

View File

@ -14,16 +14,17 @@
# License for the specific language governing permissions and limitations
# under the License.
from django import http
from django.core.urlresolvers import reverse
from django import http
from horizon.workflows.views import WorkflowView
from mox import IsA
from openstack_dashboard import api
from openstack_dashboard.test import helpers as test
from openstack_dashboard.dashboards.project.networks.tests \
import form_data_subnet
from horizon.workflows.views import WorkflowView
from openstack_dashboard.test import helpers as test
INDEX_URL = reverse('horizon:admin:networks:index')

View File

@ -14,16 +14,22 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns, url, include
from .views import IndexView, CreateView, DetailView, UpdateView
from django.conf.urls.defaults import include
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .subnets.views import CreateView as AddSubnetView
from .subnets.views import UpdateView as EditSubnetView
from .ports.views import CreateView as AddPortView
from .ports.views import UpdateView as EditPortView
from .views import CreateView
from .views import DetailView
from .views import IndexView
from .views import UpdateView
from .subnets import urls as subnet_urls
from .subnets.views import CreateView as AddSubnetView
from .subnets.views import UpdateView as EditSubnetView
from .ports import urls as port_urls
from .ports.views import CreateView as AddPortView
from .ports.views import UpdateView as EditPortView
NETWORKS = r'^(?P<network_id>[^/]+)/%s$'

View File

@ -17,8 +17,8 @@
import logging
from django.core.urlresolvers import reverse_lazy
from django.utils.translation import ugettext_lazy as _
from django.utils.datastructures import SortedDict
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions
from horizon import forms
@ -26,10 +26,12 @@ from horizon import tables
from openstack_dashboard import api
from openstack_dashboard.dashboards.project.networks import views as user_views
from .tables import NetworksTable
from .subnets.tables import SubnetsTable
from .forms import CreateNetwork
from .forms import UpdateNetwork
from .ports.tables import PortsTable
from .forms import CreateNetwork, UpdateNetwork
from .subnets.tables import SubnetsTable
from .tables import NetworksTable
LOG = logging.getLogger(__name__)

View File

@ -20,17 +20,18 @@
import datetime
from django import http
from django.core.urlresolvers import reverse
from django import http
from django.utils import timezone
from mox import IsA, Func
from mox import Func
from mox import IsA
from horizon.templatetags.sizeformat import mbformat
from openstack_dashboard import api
from openstack_dashboard import usage
from openstack_dashboard.test import helpers as test
from openstack_dashboard import usage
INDEX_URL = reverse('horizon:project:overview:index')

View File

@ -19,7 +19,8 @@
# under the License.
from django.conf.urls.defaults import url, patterns
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import GlobalOverview

View File

@ -1,13 +1,14 @@
import logging
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext_lazy as _
from django.utils.http import urlencode
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions
from horizon import tables
from openstack_dashboard import api
from ..users.tables import UsersTable

View File

@ -16,18 +16,21 @@
import logging
from django import http
from django.core.urlresolvers import reverse
from django import http
from mox import IsA
from horizon import exceptions
from horizon.workflows.views import WorkflowView
from openstack_dashboard import api
from openstack_dashboard.test import helpers as test
from openstack_dashboard.usage import quotas
from .workflows import CreateProject, UpdateProject
from horizon.workflows.views import WorkflowView
from .workflows import CreateProject
from .workflows import UpdateProject
INDEX_URL = reverse('horizon:admin:projects:index')

View File

@ -18,11 +18,14 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import (IndexView, TenantUsageView,
CreateProjectView, UpdateProjectView,
CreateUserView)
from .views import CreateProjectView
from .views import CreateUserView
from .views import IndexView
from .views import TenantUsageView
from .views import UpdateProjectView
urlpatterns = patterns('',

View File

@ -20,7 +20,8 @@
import logging
from django.core.urlresolvers import reverse, reverse_lazy
from django.core.urlresolvers import reverse
from django.core.urlresolvers import reverse_lazy
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions
@ -28,12 +29,16 @@ from horizon import tables
from horizon import workflows
from openstack_dashboard import api
from openstack_dashboard.dashboards.admin.users.views import CreateView
from openstack_dashboard import usage
from openstack_dashboard.usage import quotas
from openstack_dashboard.dashboards.admin.users.views import CreateView
from .forms import CreateUser
from .tables import TenantsTable, TenantUsersTable, AddUsersTable
from .workflows import CreateProject, UpdateProject
from .tables import AddUsersTable
from .tables import TenantsTable
from .tables import TenantUsersTable
from .workflows import CreateProject
from .workflows import UpdateProject
LOG = logging.getLogger(__name__)

View File

@ -20,21 +20,22 @@
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions
from horizon import workflows
from horizon import forms
from horizon import messages
from horizon import workflows
from openstack_dashboard import api
from openstack_dashboard.api import cinder, nova
from openstack_dashboard.api.base import is_service_enabled
from openstack_dashboard.usage.quotas import (NOVA_QUOTA_FIELDS,
CINDER_QUOTA_FIELDS,
QUOTA_FIELDS,
get_disabled_quotas)
from openstack_dashboard.api import cinder
from openstack_dashboard.api import nova
from openstack_dashboard.usage.quotas import CINDER_QUOTA_FIELDS
from openstack_dashboard.usage.quotas import get_disabled_quotas
from openstack_dashboard.usage.quotas import NOVA_QUOTA_FIELDS
from openstack_dashboard.usage.quotas import QUOTA_FIELDS
INDEX_URL = "horizon:admin:projects:index"
ADD_USER_URL = "horizon:admin:projects:create_user"

View File

@ -14,10 +14,11 @@
# License for the specific language governing permissions and limitations
# under the License.
from django import http
from django.core.urlresolvers import reverse
from django import http
from mox import IgnoreArg, IsA
from mox import IgnoreArg
from mox import IsA
from openstack_dashboard import api
from openstack_dashboard.test import helpers as test

View File

@ -14,9 +14,12 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import IndexView, CreateView, UpdateView
from .views import CreateView
from .views import IndexView
from .views import UpdateView
urlpatterns = patterns('openstack_dashboard.dashboards.admin.roles.views',
url(r'^$', IndexView.as_view(), name='index'),

View File

@ -14,7 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.core.urlresolvers import reverse, reverse_lazy
from django.core.urlresolvers import reverse
from django.core.urlresolvers import reverse_lazy
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions
@ -22,7 +23,9 @@ from horizon import forms
from horizon import tables
from openstack_dashboard import api
from .forms import CreateRoleForm, UpdateRoleForm
from .forms import CreateRoleForm
from .forms import UpdateRoleForm
from .tables import RolesTable

View File

@ -14,7 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import DetailView

View File

@ -17,6 +17,7 @@
import logging
from horizon import tabs
from .tabs import PortDetailTabs

View File

@ -13,9 +13,11 @@
# 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 mox import IsA
from django import http
from django.core.urlresolvers import reverse
from django import http
from mox import IsA
from openstack_dashboard import api
from openstack_dashboard.dashboards.project.routers import tests as r_test

View File

@ -14,9 +14,11 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import (IndexView, DetailView)
from .views import DetailView
from .views import IndexView
urlpatterns = patterns('horizon.dashboards.admin.routers.views',

View File

@ -20,10 +20,11 @@
from socket import timeout as socket_timeout
from django import http
from django.core.urlresolvers import reverse
from django import http
from mox import IgnoreArg, IsA
from mox import IgnoreArg
from mox import IsA
from openstack_dashboard import api
from openstack_dashboard.test import helpers as test

View File

@ -18,9 +18,12 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import IndexView, CreateView, UpdateView
from .views import CreateView
from .views import IndexView
from .views import UpdateView
urlpatterns = patterns('openstack_dashboard.dashboards.admin.users.views',
url(r'^$', IndexView.as_view(), name='index'),

View File

@ -20,7 +20,8 @@
import operator
from django.core.urlresolvers import reverse, reverse_lazy
from django.core.urlresolvers import reverse
from django.core.urlresolvers import reverse_lazy
from django.utils.decorators import method_decorator
from django.utils.translation import ugettext_lazy as _
from django.views.decorators.debug import sensitive_post_parameters
@ -30,7 +31,9 @@ from horizon import forms
from horizon import tables
from openstack_dashboard import api
from .forms import CreateUserForm, UpdateUserForm
from .forms import CreateUserForm
from .forms import UpdateUserForm
from .tables import UsersTable

View File

@ -2,8 +2,12 @@ from django.utils.translation import ugettext_lazy as _
from horizon import tables
from openstack_dashboard.api import cinder
from openstack_dashboard.dashboards.project.volumes.tables import (UpdateRow,
VolumesTable as _VolumesTable, DeleteVolume)
from openstack_dashboard.dashboards.project.volumes.tables import \
DeleteVolume
from openstack_dashboard.dashboards.project.volumes.tables import \
UpdateRow
from openstack_dashboard.dashboards.project.volumes.tables import \
VolumesTable as _VolumesTable
class CreateVolumeType(tables.LinkAction):

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django import http
from django.core.urlresolvers import reverse
from django import http
from mox import IsA
from openstack_dashboard import api

View File

@ -1,6 +1,9 @@
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import IndexView, DetailView, CreateVolumeTypeView
from .views import CreateVolumeTypeView
from .views import DetailView
from .views import IndexView
urlpatterns = patterns('',
url(r'^$', IndexView.as_view(), name='index'),

View File

@ -18,16 +18,22 @@
Admin views for managing volumes.
"""
from django.core.urlresolvers import reverse
from django.utils.datastructures import SortedDict
from django.utils.translation import ugettext_lazy as _
from django.core.urlresolvers import reverse
from openstack_dashboard.dashboards.project.volumes.views import \
VolumeTableMixIn, DetailView as _DetailView
DetailView as _DetailView
from openstack_dashboard.dashboards.project.volumes.views import \
VolumeTableMixIn
from openstack_dashboard.api import cinder
from openstack_dashboard.api import keystone
from .tables import VolumesTable, VolumeTypesTable
from .forms import CreateVolumeType
from .tables import VolumesTable
from .tables import VolumeTypesTable
from horizon import exceptions
from horizon import forms
from horizon import tables

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.utils.translation import ugettext_lazy as _
from django.template.defaultfilters import title
from django.utils.translation import ugettext_lazy as _
from horizon import tables

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.http import HttpRequest
from django.core.urlresolvers import reverse
from django.http import HttpRequest
from mox import IsA

View File

@ -18,9 +18,11 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls.defaults import patterns, url
from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url
from .views import download_ec2_bundle, download_rc_file
from .views import download_ec2_bundle
from .views import download_rc_file
urlpatterns = patterns('',

View File

@ -14,10 +14,10 @@
# License for the specific language governing permissions and limitations
# under the License.
from contextlib import closing
import logging
import tempfile
import zipfile
from contextlib import closing
from django import http
from django import shortcuts

View File

@ -17,8 +17,8 @@
import logging
from django import shortcuts
from django.core import urlresolvers
from django import shortcuts
from django.utils.http import urlencode
from django.utils.translation import ugettext_lazy as _

View File

@ -21,8 +21,8 @@
import uuid
from django import http
from django.core.urlresolvers import reverse
from django import http
from mox import IsA
@ -30,6 +30,7 @@ from openstack_dashboard import api
from openstack_dashboard.test import helpers as test
from .utils import get_int_or_uuid
from horizon.workflows.views import WorkflowView

Some files were not shown because too many files have changed in this diff Show More