From 3087c3486bda8b9deb87d3c7ec6ca1ef9812fe22 Mon Sep 17 00:00:00 2001 From: Tatiana Mazur Date: Thu, 4 Jul 2013 18:52:37 +0400 Subject: [PATCH] Enable H304 check This patch replaces relative imports with full paths and makes H304 test enabled. Fixes bug 1188535 Change-Id: I47254cf9a790727102f7993d0fd107da514983df --- horizon/browsers/__init__.py | 4 +-- .../dashboards/admin/domains/tables.py | 9 +++-- .../dashboards/admin/domains/tests.py | 16 +++++---- .../dashboards/admin/domains/urls.py | 6 ++-- .../dashboards/admin/domains/views.py | 17 ++++++---- .../dashboards/admin/domains/workflows.py | 3 +- .../dashboards/admin/flavors/extras/urls.py | 7 ++-- .../dashboards/admin/flavors/extras/views.py | 9 +++-- .../dashboards/admin/flavors/urls.py | 9 ++--- .../dashboards/admin/flavors/views.py | 6 ++-- .../dashboards/admin/groups/tables.py | 12 ++++--- .../dashboards/admin/groups/tests.py | 21 ++++++++---- .../dashboards/admin/groups/urls.py | 10 +++--- .../dashboards/admin/groups/views.py | 33 ++++++++++++------- .../dashboards/admin/hypervisors/urls.py | 3 +- .../dashboards/admin/images/tests.py | 2 +- .../dashboards/admin/images/urls.py | 8 ++--- .../dashboards/admin/images/views.py | 9 +++-- .../dashboards/admin/info/tabs.py | 4 +-- .../dashboards/admin/info/urls.py | 2 +- .../dashboards/admin/info/views.py | 2 +- .../dashboards/admin/instances/urls.py | 9 ++--- .../dashboards/admin/networks/ports/views.py | 6 ++-- .../admin/networks/subnets/views.py | 6 ++-- .../dashboards/admin/networks/urls.py | 26 +++++++++------ .../dashboards/admin/networks/views.py | 12 ++++--- .../dashboards/admin/overview/urls.py | 2 +- .../dashboards/admin/projects/tables.py | 2 +- .../dashboards/admin/projects/tests.py | 6 ++-- .../dashboards/admin/projects/urls.py | 13 +++++--- .../dashboards/admin/projects/views.py | 15 +++++---- .../dashboards/admin/roles/urls.py | 6 ++-- .../dashboards/admin/roles/views.py | 6 ++-- .../dashboards/admin/routers/ports/urls.py | 2 +- .../dashboards/admin/routers/ports/views.py | 3 +- .../dashboards/admin/routers/urls.py | 4 +-- .../dashboards/admin/routers/views.py | 5 +-- .../dashboards/admin/users/urls.py | 6 ++-- .../dashboards/admin/users/views.py | 6 ++-- .../dashboards/admin/volumes/urls.py | 7 ++-- .../dashboards/admin/volumes/views.py | 7 ++-- .../access_and_security/api_access/urls.py | 6 ++-- .../access_and_security/floating_ips/urls.py | 6 ++-- .../access_and_security/floating_ips/views.py | 6 ++-- .../access_and_security/keypairs/urls.py | 12 ++++--- .../access_and_security/keypairs/views.py | 6 ++-- .../security_groups/tests.py | 6 ++-- .../security_groups/urls.py | 9 +++-- .../security_groups/views.py | 9 +++-- .../project/access_and_security/tabs.py | 12 ++++--- .../project/access_and_security/urls.py | 15 ++++++--- .../project/access_and_security/views.py | 3 +- .../images_and_snapshots/images/tests.py | 6 ++-- .../images_and_snapshots/images/urls.py | 9 +++-- .../images_and_snapshots/images/views.py | 9 +++-- .../images_and_snapshots/snapshots/urls.py | 3 +- .../images_and_snapshots/snapshots/views.py | 3 +- .../project/images_and_snapshots/urls.py | 12 ++++--- .../project/images_and_snapshots/views.py | 9 +++-- .../volume_snapshots/tables.py | 3 +- .../dashboards/project/instances/tests.py | 8 +++-- .../instances/workflows/create_instance.py | 3 +- .../dashboards/project/loadbalancers/tabs.py | 9 +++-- .../dashboards/project/loadbalancers/tests.py | 18 ++++++---- .../project/network_topology/urls.py | 6 ++-- .../dashboards/project/networks/ports/urls.py | 3 +- .../project/networks/ports/views.py | 6 ++-- .../project/networks/subnets/urls.py | 3 +- .../project/networks/subnets/views.py | 9 +++-- .../dashboards/project/networks/tests.py | 3 +- .../dashboards/project/networks/urls.py | 23 ++++++++----- .../dashboards/project/networks/views.py | 14 +++++--- .../dashboards/project/overview/urls.py | 5 +-- .../dashboards/project/routers/ports/urls.py | 3 +- .../dashboards/project/routers/ports/views.py | 9 +++-- .../dashboards/project/routers/urls.py | 12 ++++--- .../dashboards/project/routers/views.py | 7 ++-- .../dashboards/project/stacks/tabs.py | 4 +-- .../dashboards/project/stacks/tests.py | 4 +-- .../dashboards/project/stacks/urls.py | 11 ++++--- .../dashboards/project/stacks/views.py | 11 ++++--- .../dashboards/project/volumes/forms.py | 6 ++-- .../dashboards/project/volumes/urls.py | 12 ++++--- .../dashboards/project/volumes/views.py | 15 +++++---- .../dashboards/settings/password/urls.py | 2 +- .../dashboards/settings/password/views.py | 2 +- .../dashboards/settings/user/urls.py | 2 +- .../dashboards/settings/user/views.py | 2 +- .../test/test_data/cinder_data.py | 2 +- .../test/test_data/exceptions.py | 2 +- .../test/test_data/glance_data.py | 2 +- .../test/test_data/heat_data.py | 2 +- .../test/test_data/keystone_data.py | 2 +- .../test/test_data/neutron_data.py | 2 +- .../test/test_data/nova_data.py | 2 +- .../test/test_data/swift_data.py | 2 +- openstack_dashboard/test/test_data/utils.py | 16 ++++----- tox.ini | 3 +- 98 files changed, 447 insertions(+), 285 deletions(-) diff --git a/horizon/browsers/__init__.py b/horizon/browsers/__init__.py index c824092ee1..e6a2570d33 100644 --- a/horizon/browsers/__init__.py +++ b/horizon/browsers/__init__.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -from .base import ResourceBrowser -from .views import ResourceBrowserView +from horizon.browsers.base import ResourceBrowser +from horizon.browsers.views import ResourceBrowserView assert ResourceBrowser assert ResourceBrowserView diff --git a/openstack_dashboard/dashboards/admin/domains/tables.py b/openstack_dashboard/dashboards/admin/domains/tables.py index e62ca38b9c..702cefe735 100644 --- a/openstack_dashboard/dashboards/admin/domains/tables.py +++ b/openstack_dashboard/dashboards/admin/domains/tables.py @@ -25,9 +25,12 @@ from horizon import tables from openstack_dashboard import api -from .constants import DOMAINS_CREATE_URL -from .constants import DOMAINS_INDEX_URL -from .constants import DOMAINS_UPDATE_URL +from openstack_dashboard.dashboards.admin.domains.constants \ + import DOMAINS_CREATE_URL +from openstack_dashboard.dashboards.admin.domains.constants \ + import DOMAINS_INDEX_URL +from openstack_dashboard.dashboards.admin.domains.constants \ + import DOMAINS_UPDATE_URL LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/admin/domains/tests.py b/openstack_dashboard/dashboards/admin/domains/tests.py index 5dad7c6c73..f3f2e984f8 100644 --- a/openstack_dashboard/dashboards/admin/domains/tests.py +++ b/openstack_dashboard/dashboards/admin/domains/tests.py @@ -26,12 +26,16 @@ from horizon.workflows.views import WorkflowView from openstack_dashboard import api from openstack_dashboard.test import helpers as test -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 +from openstack_dashboard.dashboards.admin.domains.constants \ + import DOMAINS_CREATE_URL as create_url +from openstack_dashboard.dashboards.admin.domains.constants \ + import DOMAINS_INDEX_URL as index_url +from openstack_dashboard.dashboards.admin.domains.constants \ + import DOMAINS_INDEX_VIEW_TEMPLATE +from openstack_dashboard.dashboards.admin.domains.constants \ + import DOMAINS_UPDATE_URL as update_url +from openstack_dashboard.dashboards.admin.domains.workflows import CreateDomain +from openstack_dashboard.dashboards.admin.domains.workflows import UpdateDomain DOMAINS_INDEX_URL = reverse(index_url) diff --git a/openstack_dashboard/dashboards/admin/domains/urls.py b/openstack_dashboard/dashboards/admin/domains/urls.py index 4ef3120286..19448ecf73 100644 --- a/openstack_dashboard/dashboards/admin/domains/urls.py +++ b/openstack_dashboard/dashboards/admin/domains/urls.py @@ -17,9 +17,9 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import CreateDomainView -from .views import IndexView -from .views import UpdateDomainView +from openstack_dashboard.dashboards.admin.domains.views import CreateDomainView +from openstack_dashboard.dashboards.admin.domains.views import IndexView +from openstack_dashboard.dashboards.admin.domains.views import UpdateDomainView urlpatterns = patterns('', diff --git a/openstack_dashboard/dashboards/admin/domains/views.py b/openstack_dashboard/dashboards/admin/domains/views.py index b5e8521d31..dedec4e8fe 100644 --- a/openstack_dashboard/dashboards/admin/domains/views.py +++ b/openstack_dashboard/dashboards/admin/domains/views.py @@ -23,12 +23,17 @@ from horizon import workflows from openstack_dashboard import api -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 -from .workflows import UpdateDomain +from openstack_dashboard.dashboards.admin.domains.constants \ + import DOMAIN_INFO_FIELDS +from openstack_dashboard.dashboards.admin.domains.constants \ + import DOMAINS_INDEX_URL +from openstack_dashboard.dashboards.admin.domains.constants \ + import DOMAINS_INDEX_VIEW_TEMPLATE +from openstack_dashboard.dashboards.admin.domains.tables import DomainsTable +from openstack_dashboard.dashboards.admin.domains.workflows \ + import CreateDomain +from openstack_dashboard.dashboards.admin.domains.workflows \ + import UpdateDomain class IndexView(tables.DataTableView): diff --git a/openstack_dashboard/dashboards/admin/domains/workflows.py b/openstack_dashboard/dashboards/admin/domains/workflows.py index 8e4821a798..8993f47f48 100644 --- a/openstack_dashboard/dashboards/admin/domains/workflows.py +++ b/openstack_dashboard/dashboards/admin/domains/workflows.py @@ -24,7 +24,8 @@ from horizon import workflows from openstack_dashboard import api -from .constants import DOMAINS_INDEX_URL +from openstack_dashboard.dashboards.admin.domains.constants \ + import DOMAINS_INDEX_URL LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/admin/flavors/extras/urls.py b/openstack_dashboard/dashboards/admin/flavors/extras/urls.py index c004f3ed61..17812a8b1b 100644 --- a/openstack_dashboard/dashboards/admin/flavors/extras/urls.py +++ b/openstack_dashboard/dashboards/admin/flavors/extras/urls.py @@ -21,9 +21,10 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import CreateView -from .views import EditView -from .views import IndexView +from openstack_dashboard.dashboards.admin.flavors.extras.views \ + import CreateView +from openstack_dashboard.dashboards.admin.flavors.extras.views import EditView +from openstack_dashboard.dashboards.admin.flavors.extras.views import IndexView urlpatterns = patterns('', url(r'^$', IndexView.as_view(), name='index'), diff --git a/openstack_dashboard/dashboards/admin/flavors/extras/views.py b/openstack_dashboard/dashboards/admin/flavors/extras/views.py index 262f404466..ffb074c6a2 100644 --- a/openstack_dashboard/dashboards/admin/flavors/extras/views.py +++ b/openstack_dashboard/dashboards/admin/flavors/extras/views.py @@ -28,9 +28,12 @@ from horizon import tables from openstack_dashboard import api -from .forms import CreateExtraSpec -from .forms import EditExtraSpec -from .tables import ExtraSpecsTable +from openstack_dashboard.dashboards.admin.flavors.extras.forms \ + import CreateExtraSpec +from openstack_dashboard.dashboards.admin.flavors.extras.forms \ + import EditExtraSpec +from openstack_dashboard.dashboards.admin.flavors.extras.tables \ + import ExtraSpecsTable LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/admin/flavors/urls.py b/openstack_dashboard/dashboards/admin/flavors/urls.py index b820c136db..7ef8c91f62 100644 --- a/openstack_dashboard/dashboards/admin/flavors/urls.py +++ b/openstack_dashboard/dashboards/admin/flavors/urls.py @@ -22,10 +22,11 @@ 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 +from openstack_dashboard.dashboards.admin.flavors.extras \ + import urls as extras_urls +from openstack_dashboard.dashboards.admin.flavors.views import CreateView +from openstack_dashboard.dashboards.admin.flavors.views import EditView +from openstack_dashboard.dashboards.admin.flavors.views import IndexView urlpatterns = patterns('openstack_dashboard.dashboards.admin.flavors.views', url(r'^$', IndexView.as_view(), name='index'), diff --git a/openstack_dashboard/dashboards/admin/flavors/views.py b/openstack_dashboard/dashboards/admin/flavors/views.py index dbd68994b0..91fbe5b0c5 100644 --- a/openstack_dashboard/dashboards/admin/flavors/views.py +++ b/openstack_dashboard/dashboards/admin/flavors/views.py @@ -29,9 +29,9 @@ from horizon import tables from openstack_dashboard import api -from .forms import CreateFlavor -from .forms import EditFlavor -from .tables import FlavorsTable +from openstack_dashboard.dashboards.admin.flavors.forms import CreateFlavor +from openstack_dashboard.dashboards.admin.flavors.forms import EditFlavor +from openstack_dashboard.dashboards.admin.flavors.tables import FlavorsTable LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/admin/groups/tables.py b/openstack_dashboard/dashboards/admin/groups/tables.py index ca263f880a..9d2a14178c 100644 --- a/openstack_dashboard/dashboards/admin/groups/tables.py +++ b/openstack_dashboard/dashboards/admin/groups/tables.py @@ -24,10 +24,14 @@ from horizon import tables from openstack_dashboard import api -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 +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_ADD_MEMBER_URL +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_CREATE_URL +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_MANAGE_URL +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_UPDATE_URL LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/admin/groups/tests.py b/openstack_dashboard/dashboards/admin/groups/tests.py index 54652805d5..2bb59105bd 100644 --- a/openstack_dashboard/dashboards/admin/groups/tests.py +++ b/openstack_dashboard/dashboards/admin/groups/tests.py @@ -23,13 +23,20 @@ from mox import IsA from openstack_dashboard import api from openstack_dashboard.test import helpers as test -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 +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_ADD_MEMBER_URL as add_member_url +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_CREATE_URL as create_url +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_INDEX_URL as index_url +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_INDEX_VIEW_TEMPLATE +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_MANAGE_URL as manage_url +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_MANAGE_VIEW_TEMPLATE +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_UPDATE_URL as update_url GROUPS_INDEX_URL = reverse(index_url) diff --git a/openstack_dashboard/dashboards/admin/groups/urls.py b/openstack_dashboard/dashboards/admin/groups/urls.py index b02de5ccbb..56b7e4f4ca 100644 --- a/openstack_dashboard/dashboards/admin/groups/urls.py +++ b/openstack_dashboard/dashboards/admin/groups/urls.py @@ -17,11 +17,11 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import CreateView -from .views import IndexView -from .views import ManageMembersView -from .views import NonMembersView -from .views import UpdateView +from openstack_dashboard.dashboards.admin.groups.views import CreateView +from openstack_dashboard.dashboards.admin.groups.views import IndexView +from openstack_dashboard.dashboards.admin.groups.views import ManageMembersView +from openstack_dashboard.dashboards.admin.groups.views import NonMembersView +from openstack_dashboard.dashboards.admin.groups.views import UpdateView urlpatterns = patterns('', diff --git a/openstack_dashboard/dashboards/admin/groups/views.py b/openstack_dashboard/dashboards/admin/groups/views.py index 8a8fb8e462..db2ad7e97f 100644 --- a/openstack_dashboard/dashboards/admin/groups/views.py +++ b/openstack_dashboard/dashboards/admin/groups/views.py @@ -24,18 +24,27 @@ from horizon import tables from openstack_dashboard import api -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 +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_ADD_MEMBER_AJAX_VIEW_TEMPLATE +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_ADD_MEMBER_VIEW_TEMPLATE +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_CREATE_VIEW_TEMPLATE +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_INDEX_URL +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_INDEX_VIEW_TEMPLATE +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_MANAGE_VIEW_TEMPLATE +from openstack_dashboard.dashboards.admin.groups.constants \ + import GROUPS_UPDATE_VIEW_TEMPLATE +from openstack_dashboard.dashboards.admin.groups.forms import CreateGroupForm +from openstack_dashboard.dashboards.admin.groups.forms import UpdateGroupForm +from openstack_dashboard.dashboards.admin.groups.tables \ + import GroupMembersTable +from openstack_dashboard.dashboards.admin.groups.tables \ + import GroupNonMembersTable +from openstack_dashboard.dashboards.admin.groups.tables import GroupsTable class IndexView(tables.DataTableView): diff --git a/openstack_dashboard/dashboards/admin/hypervisors/urls.py b/openstack_dashboard/dashboards/admin/hypervisors/urls.py index c3aedb0614..a47c123fda 100644 --- a/openstack_dashboard/dashboards/admin/hypervisors/urls.py +++ b/openstack_dashboard/dashboards/admin/hypervisors/urls.py @@ -17,7 +17,8 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import AdminIndexView +from openstack_dashboard.dashboards.admin.hypervisors.views \ + import AdminIndexView urlpatterns = patterns( diff --git a/openstack_dashboard/dashboards/admin/images/tests.py b/openstack_dashboard/dashboards/admin/images/tests.py index 27cb1f6355..07aa378dff 100644 --- a/openstack_dashboard/dashboards/admin/images/tests.py +++ b/openstack_dashboard/dashboards/admin/images/tests.py @@ -24,7 +24,7 @@ from mox import IsA from openstack_dashboard import api from openstack_dashboard.test import helpers as test -from .tables import AdminImagesTable +from openstack_dashboard.dashboards.admin.images.tables import AdminImagesTable class ImageCreateViewTest(test.BaseAdminViewTests): diff --git a/openstack_dashboard/dashboards/admin/images/urls.py b/openstack_dashboard/dashboards/admin/images/urls.py index 87ed2b7a29..8976629044 100644 --- a/openstack_dashboard/dashboards/admin/images/urls.py +++ b/openstack_dashboard/dashboards/admin/images/urls.py @@ -21,10 +21,10 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import CreateView -from .views import DetailView -from .views import IndexView -from .views import UpdateView +from openstack_dashboard.dashboards.admin.images.views import CreateView +from openstack_dashboard.dashboards.admin.images.views import DetailView +from openstack_dashboard.dashboards.admin.images.views import IndexView +from openstack_dashboard.dashboards.admin.images.views import UpdateView urlpatterns = patterns('openstack_dashboard.dashboards.admin.images.views', diff --git a/openstack_dashboard/dashboards/admin/images/views.py b/openstack_dashboard/dashboards/admin/images/views.py index 5ac7e4743d..5c3b4c566d 100644 --- a/openstack_dashboard/dashboards/admin/images/views.py +++ b/openstack_dashboard/dashboards/admin/images/views.py @@ -30,9 +30,12 @@ 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 openstack_dashboard.dashboards.admin.images.forms \ + import AdminCreateImageForm +from openstack_dashboard.dashboards.admin.images.forms \ + import AdminUpdateImageForm +from openstack_dashboard.dashboards.admin.images.tables \ + import AdminImagesTable LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/admin/info/tabs.py b/openstack_dashboard/dashboards/admin/info/tabs.py index 28740419b9..208a8441a2 100644 --- a/openstack_dashboard/dashboards/admin/info/tabs.py +++ b/openstack_dashboard/dashboards/admin/info/tabs.py @@ -22,8 +22,8 @@ from horizon import tabs from openstack_dashboard.api import keystone from openstack_dashboard.usage import quotas -from .tables import QuotasTable -from .tables import ServicesTable +from openstack_dashboard.dashboards.admin.info.tables import QuotasTable +from openstack_dashboard.dashboards.admin.info.tables import ServicesTable class DefaultQuotasTab(tabs.TableTab): diff --git a/openstack_dashboard/dashboards/admin/info/urls.py b/openstack_dashboard/dashboards/admin/info/urls.py index 11d7218046..8509abdb46 100644 --- a/openstack_dashboard/dashboards/admin/info/urls.py +++ b/openstack_dashboard/dashboards/admin/info/urls.py @@ -21,7 +21,7 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import IndexView +from openstack_dashboard.dashboards.admin.info.views import IndexView urlpatterns = patterns('openstack_dashboard.dashboards.admin.info.views', diff --git a/openstack_dashboard/dashboards/admin/info/views.py b/openstack_dashboard/dashboards/admin/info/views.py index d0f7f8f0b4..3dd1e2e7a5 100644 --- a/openstack_dashboard/dashboards/admin/info/views.py +++ b/openstack_dashboard/dashboards/admin/info/views.py @@ -22,7 +22,7 @@ import logging from horizon import tabs -from .tabs import SystemInfoTabs +from openstack_dashboard.dashboards.admin.info.tabs import SystemInfoTabs LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/admin/instances/urls.py b/openstack_dashboard/dashboards/admin/instances/urls.py index d317626888..58f4816cf5 100644 --- a/openstack_dashboard/dashboards/admin/instances/urls.py +++ b/openstack_dashboard/dashboards/admin/instances/urls.py @@ -21,10 +21,11 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import AdminIndexView -from .views import AdminUpdateView -from openstack_dashboard.dashboards.project.instances.views import \ - DetailView +from openstack_dashboard.dashboards.admin.instances.views import AdminIndexView +from openstack_dashboard.dashboards.admin.instances.views \ + import AdminUpdateView +from openstack_dashboard.dashboards.project.instances.views \ + import DetailView INSTANCES = r'^(?P[^/]+)/%s$' diff --git a/openstack_dashboard/dashboards/admin/networks/ports/views.py b/openstack_dashboard/dashboards/admin/networks/ports/views.py index d163e9c3fb..60284d10d0 100644 --- a/openstack_dashboard/dashboards/admin/networks/ports/views.py +++ b/openstack_dashboard/dashboards/admin/networks/ports/views.py @@ -26,8 +26,10 @@ from openstack_dashboard import api from openstack_dashboard.dashboards.project.networks.ports \ import views as project_views -from .forms import CreatePort -from .forms import UpdatePort +from openstack_dashboard.dashboards.admin.networks.ports.forms \ + import CreatePort +from openstack_dashboard.dashboards.admin.networks.ports.forms \ + import UpdatePort LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/admin/networks/subnets/views.py b/openstack_dashboard/dashboards/admin/networks/subnets/views.py index 2ee3f64c9a..b802b1ac80 100644 --- a/openstack_dashboard/dashboards/admin/networks/subnets/views.py +++ b/openstack_dashboard/dashboards/admin/networks/subnets/views.py @@ -19,8 +19,10 @@ import logging from openstack_dashboard.dashboards.project.networks.subnets \ import views as project_views -from .workflows import CreateSubnet -from .workflows import UpdateSubnet +from openstack_dashboard.dashboards.admin.networks.subnets.workflows \ + import CreateSubnet +from openstack_dashboard.dashboards.admin.networks.subnets.workflows \ + import UpdateSubnet LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/admin/networks/urls.py b/openstack_dashboard/dashboards/admin/networks/urls.py index 423a9042ab..ddf878803a 100644 --- a/openstack_dashboard/dashboards/admin/networks/urls.py +++ b/openstack_dashboard/dashboards/admin/networks/urls.py @@ -18,18 +18,24 @@ from django.conf.urls.defaults import include from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import CreateView -from .views import DetailView -from .views import IndexView -from .views import UpdateView +from openstack_dashboard.dashboards.admin.networks.views import CreateView +from openstack_dashboard.dashboards.admin.networks.views import DetailView +from openstack_dashboard.dashboards.admin.networks.views import IndexView +from openstack_dashboard.dashboards.admin.networks.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 openstack_dashboard.dashboards.admin.networks.subnets \ + import urls as subnet_urls +from openstack_dashboard.dashboards.admin.networks.subnets.views \ + import CreateView as AddSubnetView +from openstack_dashboard.dashboards.admin.networks.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 +from openstack_dashboard.dashboards.admin.networks.ports \ + import urls as port_urls +from openstack_dashboard.dashboards.admin.networks.ports.views \ + import CreateView as AddPortView +from openstack_dashboard.dashboards.admin.networks.ports.views \ + import UpdateView as EditPortView NETWORKS = r'^(?P[^/]+)/%s$' diff --git a/openstack_dashboard/dashboards/admin/networks/views.py b/openstack_dashboard/dashboards/admin/networks/views.py index 60322ac9a3..0cee09fa09 100644 --- a/openstack_dashboard/dashboards/admin/networks/views.py +++ b/openstack_dashboard/dashboards/admin/networks/views.py @@ -27,11 +27,13 @@ from horizon import tables from openstack_dashboard import api from openstack_dashboard.dashboards.project.networks import views as user_views -from .forms import CreateNetwork -from .forms import UpdateNetwork -from .ports.tables import PortsTable -from .subnets.tables import SubnetsTable -from .tables import NetworksTable +from openstack_dashboard.dashboards.admin.networks.forms import CreateNetwork +from openstack_dashboard.dashboards.admin.networks.forms import UpdateNetwork +from openstack_dashboard.dashboards.admin.networks.ports.tables \ + import PortsTable +from openstack_dashboard.dashboards.admin.networks.subnets.tables \ + import SubnetsTable +from openstack_dashboard.dashboards.admin.networks.tables import NetworksTable LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/admin/overview/urls.py b/openstack_dashboard/dashboards/admin/overview/urls.py index e973af47ae..6cf1bde0d4 100644 --- a/openstack_dashboard/dashboards/admin/overview/urls.py +++ b/openstack_dashboard/dashboards/admin/overview/urls.py @@ -22,7 +22,7 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import GlobalOverview +from openstack_dashboard.dashboards.admin.overview.views import GlobalOverview urlpatterns = patterns('', diff --git a/openstack_dashboard/dashboards/admin/projects/tables.py b/openstack_dashboard/dashboards/admin/projects/tables.py index cfde24a457..b6f76e71fd 100644 --- a/openstack_dashboard/dashboards/admin/projects/tables.py +++ b/openstack_dashboard/dashboards/admin/projects/tables.py @@ -9,7 +9,7 @@ from horizon import tables from openstack_dashboard import api -from ..users.tables import UsersTable +from openstack_dashboard.dashboards.admin.users.tables import UsersTable LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/admin/projects/tests.py b/openstack_dashboard/dashboards/admin/projects/tests.py index e8ef0f72a8..3339f80bb4 100644 --- a/openstack_dashboard/dashboards/admin/projects/tests.py +++ b/openstack_dashboard/dashboards/admin/projects/tests.py @@ -28,8 +28,10 @@ from openstack_dashboard import api from openstack_dashboard.test import helpers as test from openstack_dashboard.usage import quotas -from .workflows import CreateProject -from .workflows import UpdateProject +from openstack_dashboard.dashboards.admin.projects.workflows \ + import CreateProject +from openstack_dashboard.dashboards.admin.projects.workflows \ + import UpdateProject INDEX_URL = reverse('horizon:admin:projects:index') diff --git a/openstack_dashboard/dashboards/admin/projects/urls.py b/openstack_dashboard/dashboards/admin/projects/urls.py index 7afe58ad11..9b294a5690 100644 --- a/openstack_dashboard/dashboards/admin/projects/urls.py +++ b/openstack_dashboard/dashboards/admin/projects/urls.py @@ -21,11 +21,14 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import CreateProjectView -from .views import CreateUserView -from .views import IndexView -from .views import ProjectUsageView -from .views import UpdateProjectView +from openstack_dashboard.dashboards.admin.projects.views \ + import CreateProjectView +from openstack_dashboard.dashboards.admin.projects.views import CreateUserView +from openstack_dashboard.dashboards.admin.projects.views import IndexView +from openstack_dashboard.dashboards.admin.projects.views \ + import ProjectUsageView +from openstack_dashboard.dashboards.admin.projects.views \ + import UpdateProjectView urlpatterns = patterns('', diff --git a/openstack_dashboard/dashboards/admin/projects/views.py b/openstack_dashboard/dashboards/admin/projects/views.py index 120a0f4ec2..dcc27639dc 100644 --- a/openstack_dashboard/dashboards/admin/projects/views.py +++ b/openstack_dashboard/dashboards/admin/projects/views.py @@ -33,12 +33,15 @@ from openstack_dashboard.dashboards.admin.users.views import CreateView from openstack_dashboard import usage from openstack_dashboard.usage import quotas -from .forms import CreateUser -from .tables import AddUsersTable -from .tables import TenantsTable -from .tables import TenantUsersTable -from .workflows import CreateProject -from .workflows import UpdateProject +from openstack_dashboard.dashboards.admin.projects.forms import CreateUser +from openstack_dashboard.dashboards.admin.projects.tables import AddUsersTable +from openstack_dashboard.dashboards.admin.projects.tables import TenantsTable +from openstack_dashboard.dashboards.admin.projects.tables \ + import TenantUsersTable +from openstack_dashboard.dashboards.admin.projects.workflows \ + import CreateProject +from openstack_dashboard.dashboards.admin.projects.workflows \ + import UpdateProject LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/admin/roles/urls.py b/openstack_dashboard/dashboards/admin/roles/urls.py index bbcb8fc0b5..178888a106 100644 --- a/openstack_dashboard/dashboards/admin/roles/urls.py +++ b/openstack_dashboard/dashboards/admin/roles/urls.py @@ -17,9 +17,9 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import CreateView -from .views import IndexView -from .views import UpdateView +from openstack_dashboard.dashboards.admin.roles.views import CreateView +from openstack_dashboard.dashboards.admin.roles.views import IndexView +from openstack_dashboard.dashboards.admin.roles.views import UpdateView urlpatterns = patterns('openstack_dashboard.dashboards.admin.roles.views', url(r'^$', IndexView.as_view(), name='index'), diff --git a/openstack_dashboard/dashboards/admin/roles/views.py b/openstack_dashboard/dashboards/admin/roles/views.py index a4958e2584..87c7d46cf9 100644 --- a/openstack_dashboard/dashboards/admin/roles/views.py +++ b/openstack_dashboard/dashboards/admin/roles/views.py @@ -24,9 +24,9 @@ from horizon import tables from openstack_dashboard import api -from .forms import CreateRoleForm -from .forms import UpdateRoleForm -from .tables import RolesTable +from openstack_dashboard.dashboards.admin.roles.forms import CreateRoleForm +from openstack_dashboard.dashboards.admin.roles.forms import UpdateRoleForm +from openstack_dashboard.dashboards.admin.roles.tables import RolesTable class IndexView(tables.DataTableView): diff --git a/openstack_dashboard/dashboards/admin/routers/ports/urls.py b/openstack_dashboard/dashboards/admin/routers/ports/urls.py index 48f2be3be1..89ac65f800 100644 --- a/openstack_dashboard/dashboards/admin/routers/ports/urls.py +++ b/openstack_dashboard/dashboards/admin/routers/ports/urls.py @@ -17,7 +17,7 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import DetailView +from openstack_dashboard.dashboards.admin.routers.ports.views import DetailView PORTS = r'^(?P[^/]+)/%s$' diff --git a/openstack_dashboard/dashboards/admin/routers/ports/views.py b/openstack_dashboard/dashboards/admin/routers/ports/views.py index 1532b70aff..06deaf4459 100644 --- a/openstack_dashboard/dashboards/admin/routers/ports/views.py +++ b/openstack_dashboard/dashboards/admin/routers/ports/views.py @@ -18,7 +18,8 @@ import logging from horizon import tabs -from .tabs import PortDetailTabs +from openstack_dashboard.dashboards.admin.routers.ports.tabs \ + import PortDetailTabs LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/admin/routers/urls.py b/openstack_dashboard/dashboards/admin/routers/urls.py index 8666c8158d..21f8b1568b 100644 --- a/openstack_dashboard/dashboards/admin/routers/urls.py +++ b/openstack_dashboard/dashboards/admin/routers/urls.py @@ -17,8 +17,8 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import DetailView -from .views import IndexView +from openstack_dashboard.dashboards.admin.routers.views import DetailView +from openstack_dashboard.dashboards.admin.routers.views import IndexView urlpatterns = patterns('horizon.dashboards.admin.routers.views', diff --git a/openstack_dashboard/dashboards/admin/routers/views.py b/openstack_dashboard/dashboards/admin/routers/views.py index ef1663e292..e13d411588 100644 --- a/openstack_dashboard/dashboards/admin/routers/views.py +++ b/openstack_dashboard/dashboards/admin/routers/views.py @@ -28,8 +28,9 @@ from openstack_dashboard import api from openstack_dashboard.dashboards.admin.networks import views as n_views from openstack_dashboard.dashboards.project.routers import views as r_views -from .ports.tables import PortsTable -from .tables import RoutersTable +from openstack_dashboard.dashboards.admin.routers.ports.tables \ + import PortsTable +from openstack_dashboard.dashboards.admin.routers.tables import RoutersTable LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/admin/users/urls.py b/openstack_dashboard/dashboards/admin/users/urls.py index 5aa4e20d52..3387f5b290 100644 --- a/openstack_dashboard/dashboards/admin/users/urls.py +++ b/openstack_dashboard/dashboards/admin/users/urls.py @@ -21,9 +21,9 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import CreateView -from .views import IndexView -from .views import UpdateView +from openstack_dashboard.dashboards.admin.users.views import CreateView +from openstack_dashboard.dashboards.admin.users.views import IndexView +from openstack_dashboard.dashboards.admin.users.views import UpdateView urlpatterns = patterns('openstack_dashboard.dashboards.admin.users.views', url(r'^$', IndexView.as_view(), name='index'), diff --git a/openstack_dashboard/dashboards/admin/users/views.py b/openstack_dashboard/dashboards/admin/users/views.py index 5524c2206e..a0c325962b 100644 --- a/openstack_dashboard/dashboards/admin/users/views.py +++ b/openstack_dashboard/dashboards/admin/users/views.py @@ -32,9 +32,9 @@ from horizon import tables from openstack_dashboard import api -from .forms import CreateUserForm -from .forms import UpdateUserForm -from .tables import UsersTable +from openstack_dashboard.dashboards.admin.users.forms import CreateUserForm +from openstack_dashboard.dashboards.admin.users.forms import UpdateUserForm +from openstack_dashboard.dashboards.admin.users.tables import UsersTable class IndexView(tables.DataTableView): diff --git a/openstack_dashboard/dashboards/admin/volumes/urls.py b/openstack_dashboard/dashboards/admin/volumes/urls.py index 6eed1c5b6d..edcafe735f 100644 --- a/openstack_dashboard/dashboards/admin/volumes/urls.py +++ b/openstack_dashboard/dashboards/admin/volumes/urls.py @@ -1,9 +1,10 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import CreateVolumeTypeView -from .views import DetailView -from .views import IndexView +from openstack_dashboard.dashboards.admin.volumes.views \ + import CreateVolumeTypeView +from openstack_dashboard.dashboards.admin.volumes.views import DetailView +from openstack_dashboard.dashboards.admin.volumes.views import IndexView urlpatterns = patterns('', url(r'^$', IndexView.as_view(), name='index'), diff --git a/openstack_dashboard/dashboards/admin/volumes/views.py b/openstack_dashboard/dashboards/admin/volumes/views.py index 8d27a6d4e4..7029b3ad2d 100644 --- a/openstack_dashboard/dashboards/admin/volumes/views.py +++ b/openstack_dashboard/dashboards/admin/volumes/views.py @@ -30,9 +30,10 @@ from openstack_dashboard.dashboards.project.volumes.views import \ from openstack_dashboard.api import cinder from openstack_dashboard.api import keystone -from .forms import CreateVolumeType -from .tables import VolumesTable -from .tables import VolumeTypesTable +from openstack_dashboard.dashboards.admin.volumes.forms import CreateVolumeType +from openstack_dashboard.dashboards.admin.volumes.tables import VolumesTable +from openstack_dashboard.dashboards.admin.volumes.tables \ + import VolumeTypesTable from horizon import exceptions from horizon import forms diff --git a/openstack_dashboard/dashboards/project/access_and_security/api_access/urls.py b/openstack_dashboard/dashboards/project/access_and_security/api_access/urls.py index 84f9b17da1..dad12e96a0 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/api_access/urls.py +++ b/openstack_dashboard/dashboards/project/access_and_security/api_access/urls.py @@ -21,8 +21,10 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import download_ec2_bundle -from .views import download_rc_file +from openstack_dashboard.dashboards.project.access_and_security.\ + api_access.views import download_ec2_bundle +from openstack_dashboard.dashboards.project.access_and_security.\ + api_access.views import download_rc_file urlpatterns = patterns('', diff --git a/openstack_dashboard/dashboards/project/access_and_security/floating_ips/urls.py b/openstack_dashboard/dashboards/project/access_and_security/floating_ips/urls.py index 959597f575..57ecf507a7 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/floating_ips/urls.py +++ b/openstack_dashboard/dashboards/project/access_and_security/floating_ips/urls.py @@ -21,8 +21,10 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import AllocateView -from .views import AssociateView +from openstack_dashboard.dashboards.project.access_and_security.\ + floating_ips.views import AllocateView +from openstack_dashboard.dashboards.project.access_and_security.\ + floating_ips.views import AssociateView urlpatterns = patterns('', diff --git a/openstack_dashboard/dashboards/project/access_and_security/floating_ips/views.py b/openstack_dashboard/dashboards/project/access_and_security/floating_ips/views.py index 9549499ce1..abaf04f600 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/floating_ips/views.py +++ b/openstack_dashboard/dashboards/project/access_and_security/floating_ips/views.py @@ -33,8 +33,10 @@ from horizon import workflows from openstack_dashboard import api from openstack_dashboard.usage import quotas -from .forms import FloatingIpAllocate -from .workflows import IPAssociationWorkflow +from openstack_dashboard.dashboards.project.access_and_security.\ + floating_ips.forms import FloatingIpAllocate +from openstack_dashboard.dashboards.project.access_and_security.\ + floating_ips.workflows import IPAssociationWorkflow class AssociateView(workflows.WorkflowView): diff --git a/openstack_dashboard/dashboards/project/access_and_security/keypairs/urls.py b/openstack_dashboard/dashboards/project/access_and_security/keypairs/urls.py index 0d301c4c45..429df16aa3 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/keypairs/urls.py +++ b/openstack_dashboard/dashboards/project/access_and_security/keypairs/urls.py @@ -21,10 +21,14 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import CreateView -from .views import DownloadView -from .views import GenerateView -from .views import ImportView +from openstack_dashboard.dashboards.project.access_and_security.\ + keypairs.views import CreateView +from openstack_dashboard.dashboards.project.access_and_security.\ + keypairs.views import DownloadView +from openstack_dashboard.dashboards.project.access_and_security.\ + keypairs.views import GenerateView +from openstack_dashboard.dashboards.project.access_and_security.\ + keypairs.views import ImportView urlpatterns = patterns('', diff --git a/openstack_dashboard/dashboards/project/access_and_security/keypairs/views.py b/openstack_dashboard/dashboards/project/access_and_security/keypairs/views.py index 5cf962c0a2..df5767f6f9 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/keypairs/views.py +++ b/openstack_dashboard/dashboards/project/access_and_security/keypairs/views.py @@ -36,8 +36,10 @@ from horizon import forms from openstack_dashboard import api -from .forms import CreateKeypair -from .forms import ImportKeypair +from openstack_dashboard.dashboards.project.access_and_security.\ + keypairs.forms import CreateKeypair +from openstack_dashboard.dashboards.project.access_and_security.\ + keypairs.forms import ImportKeypair LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/project/access_and_security/security_groups/tests.py b/openstack_dashboard/dashboards/project/access_and_security/security_groups/tests.py index b2e59c7398..eb54079b15 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/security_groups/tests.py +++ b/openstack_dashboard/dashboards/project/access_and_security/security_groups/tests.py @@ -29,8 +29,10 @@ from mox import IsA from openstack_dashboard import api from openstack_dashboard.test import helpers as test -from .tables import RulesTable -from .tables import SecurityGroupsTable +from openstack_dashboard.dashboards.project.access_and_security.\ + security_groups.tables import RulesTable +from openstack_dashboard.dashboards.project.access_and_security.\ + security_groups.tables import SecurityGroupsTable INDEX_URL = reverse('horizon:project:access_and_security:index') diff --git a/openstack_dashboard/dashboards/project/access_and_security/security_groups/urls.py b/openstack_dashboard/dashboards/project/access_and_security/security_groups/urls.py index ce0f3ce502..e1af21fb82 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/security_groups/urls.py +++ b/openstack_dashboard/dashboards/project/access_and_security/security_groups/urls.py @@ -21,9 +21,12 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import AddRuleView -from .views import CreateView -from .views import DetailView +from openstack_dashboard.dashboards.project.access_and_security.\ + security_groups.views import AddRuleView +from openstack_dashboard.dashboards.project.access_and_security.\ + security_groups.views import CreateView +from openstack_dashboard.dashboards.project.access_and_security.\ + security_groups.views import DetailView urlpatterns = patterns('', diff --git a/openstack_dashboard/dashboards/project/access_and_security/security_groups/views.py b/openstack_dashboard/dashboards/project/access_and_security/security_groups/views.py index 6a929b692c..ca834bcc80 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/security_groups/views.py +++ b/openstack_dashboard/dashboards/project/access_and_security/security_groups/views.py @@ -34,9 +34,12 @@ from horizon import tables from openstack_dashboard import api from openstack_dashboard.utils.filters import get_int_or_uuid -from .forms import AddRule -from .forms import CreateGroup -from .tables import RulesTable +from openstack_dashboard.dashboards.project.access_and_security.\ + security_groups.forms import AddRule +from openstack_dashboard.dashboards.project.access_and_security.\ + security_groups.forms import CreateGroup +from openstack_dashboard.dashboards.project.access_and_security.\ + security_groups.tables import RulesTable LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/project/access_and_security/tabs.py b/openstack_dashboard/dashboards/project/access_and_security/tabs.py index 4d1ff70515..ae0d036460 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/tabs.py +++ b/openstack_dashboard/dashboards/project/access_and_security/tabs.py @@ -29,10 +29,14 @@ from openstack_dashboard.api import keystone from openstack_dashboard.api import network from openstack_dashboard.api import nova -from .api_access.tables import EndpointsTable -from .floating_ips.tables import FloatingIPsTable -from .keypairs.tables import KeypairsTable -from .security_groups.tables import SecurityGroupsTable +from openstack_dashboard.dashboards.project.access_and_security.\ + api_access.tables import EndpointsTable +from openstack_dashboard.dashboards.project.access_and_security.\ + floating_ips.tables import FloatingIPsTable +from openstack_dashboard.dashboards.project.access_and_security.\ + keypairs.tables import KeypairsTable +from openstack_dashboard.dashboards.project.access_and_security.\ + security_groups.tables import SecurityGroupsTable class SecurityGroupsTab(tabs.TableTab): diff --git a/openstack_dashboard/dashboards/project/access_and_security/urls.py b/openstack_dashboard/dashboards/project/access_and_security/urls.py index 5a511a7a7d..9da63fb351 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/urls.py +++ b/openstack_dashboard/dashboards/project/access_and_security/urls.py @@ -22,11 +22,16 @@ from django.conf.urls.defaults import include from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .api_access import urls as api_access_urls -from .floating_ips import urls as fip_urls -from .keypairs import urls as keypair_urls -from .security_groups import urls as sec_group_urls -from .views import IndexView +from openstack_dashboard.dashboards.project.access_and_security.\ + api_access import urls as api_access_urls +from openstack_dashboard.dashboards.project.access_and_security.\ + floating_ips import urls as fip_urls +from openstack_dashboard.dashboards.project.access_and_security.\ + keypairs import urls as keypair_urls +from openstack_dashboard.dashboards.project.access_and_security.\ + security_groups import urls as sec_group_urls +from openstack_dashboard.dashboards.project.access_and_security.views \ + import IndexView urlpatterns = patterns('', diff --git a/openstack_dashboard/dashboards/project/access_and_security/views.py b/openstack_dashboard/dashboards/project/access_and_security/views.py index 0ae2f08bec..ed4974d458 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/views.py +++ b/openstack_dashboard/dashboards/project/access_and_security/views.py @@ -25,7 +25,8 @@ Views for Instances and Volumes. from horizon import tabs -from .tabs import AccessAndSecurityTabs +from openstack_dashboard.dashboards.project.access_and_security.tabs \ + import AccessAndSecurityTabs class IndexView(tabs.TabbedTableView): diff --git a/openstack_dashboard/dashboards/project/images_and_snapshots/images/tests.py b/openstack_dashboard/dashboards/project/images_and_snapshots/images/tests.py index add9d8ebbe..b4d7626f0b 100644 --- a/openstack_dashboard/dashboards/project/images_and_snapshots/images/tests.py +++ b/openstack_dashboard/dashboards/project/images_and_snapshots/images/tests.py @@ -33,8 +33,10 @@ from horizon import tables as horizon_tables from openstack_dashboard import api from openstack_dashboard.test import helpers as test -from . import tables -from .forms import CreateImageForm +from openstack_dashboard.dashboards.project.images_and_snapshots.images.forms \ + import CreateImageForm +from openstack_dashboard.dashboards.project.images_and_snapshots.images \ + import tables IMAGES_INDEX_URL = reverse('horizon:project:images_and_snapshots:index') diff --git a/openstack_dashboard/dashboards/project/images_and_snapshots/images/urls.py b/openstack_dashboard/dashboards/project/images_and_snapshots/images/urls.py index 40dfbe1fe4..7ba26d8900 100644 --- a/openstack_dashboard/dashboards/project/images_and_snapshots/images/urls.py +++ b/openstack_dashboard/dashboards/project/images_and_snapshots/images/urls.py @@ -21,9 +21,12 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import CreateView -from .views import DetailView -from .views import UpdateView +from openstack_dashboard.dashboards.project.images_and_snapshots.images.views \ + import CreateView +from openstack_dashboard.dashboards.project.images_and_snapshots.images.views \ + import DetailView +from openstack_dashboard.dashboards.project.images_and_snapshots.images.views \ + import UpdateView VIEWS_MOD = ('openstack_dashboard.dashboards.project' diff --git a/openstack_dashboard/dashboards/project/images_and_snapshots/images/views.py b/openstack_dashboard/dashboards/project/images_and_snapshots/images/views.py index e729a598dd..0ac395a4d5 100644 --- a/openstack_dashboard/dashboards/project/images_and_snapshots/images/views.py +++ b/openstack_dashboard/dashboards/project/images_and_snapshots/images/views.py @@ -34,9 +34,12 @@ from horizon import tabs from openstack_dashboard import api -from .forms import CreateImageForm -from .forms import UpdateImageForm -from .tabs import ImageDetailTabs +from openstack_dashboard.dashboards.project.images_and_snapshots.images.forms \ + import CreateImageForm +from openstack_dashboard.dashboards.project.images_and_snapshots.images.forms \ + import UpdateImageForm +from openstack_dashboard.dashboards.project.images_and_snapshots.images.tabs \ + import ImageDetailTabs LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/project/images_and_snapshots/snapshots/urls.py b/openstack_dashboard/dashboards/project/images_and_snapshots/snapshots/urls.py index 5e5f29bc3a..b7bf675d7c 100644 --- a/openstack_dashboard/dashboards/project/images_and_snapshots/snapshots/urls.py +++ b/openstack_dashboard/dashboards/project/images_and_snapshots/snapshots/urls.py @@ -21,7 +21,8 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import CreateView +from openstack_dashboard.dashboards.project.images_and_snapshots.\ + snapshots.views import CreateView urlpatterns = patterns('', diff --git a/openstack_dashboard/dashboards/project/images_and_snapshots/snapshots/views.py b/openstack_dashboard/dashboards/project/images_and_snapshots/snapshots/views.py index 7c6911af55..2130dcda09 100644 --- a/openstack_dashboard/dashboards/project/images_and_snapshots/snapshots/views.py +++ b/openstack_dashboard/dashboards/project/images_and_snapshots/snapshots/views.py @@ -33,7 +33,8 @@ from horizon import forms from openstack_dashboard import api -from .forms import CreateSnapshot +from openstack_dashboard.dashboards.project.images_and_snapshots.\ + snapshots.forms import CreateSnapshot LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/project/images_and_snapshots/urls.py b/openstack_dashboard/dashboards/project/images_and_snapshots/urls.py index 3d3b323c77..bb0704c540 100644 --- a/openstack_dashboard/dashboards/project/images_and_snapshots/urls.py +++ b/openstack_dashboard/dashboards/project/images_and_snapshots/urls.py @@ -20,10 +20,14 @@ from django.conf.urls.defaults import * -from .images import urls as image_urls -from .snapshots import urls as snapshot_urls -from .views import DetailView -from .views import IndexView +from openstack_dashboard.dashboards.project.images_and_snapshots.images \ + import urls as image_urls +from openstack_dashboard.dashboards.project.images_and_snapshots.snapshots \ + import urls as snapshot_urls +from openstack_dashboard.dashboards.project.images_and_snapshots.views \ + import DetailView +from openstack_dashboard.dashboards.project.images_and_snapshots.views \ + import IndexView urlpatterns = patterns('', diff --git a/openstack_dashboard/dashboards/project/images_and_snapshots/views.py b/openstack_dashboard/dashboards/project/images_and_snapshots/views.py index 59de700e46..b146a90c45 100644 --- a/openstack_dashboard/dashboards/project/images_and_snapshots/views.py +++ b/openstack_dashboard/dashboards/project/images_and_snapshots/views.py @@ -34,9 +34,12 @@ from horizon import tabs from openstack_dashboard import api from openstack_dashboard.api.base import is_service_enabled -from .images.tables import ImagesTable -from .volume_snapshots.tables import VolumeSnapshotsTable -from .volume_snapshots.tabs import SnapshotDetailTabs +from openstack_dashboard.dashboards.project.images_and_snapshots.\ + images.tables import ImagesTable +from openstack_dashboard.dashboards.project.images_and_snapshots.\ + volume_snapshots.tables import VolumeSnapshotsTable +from openstack_dashboard.dashboards.project.images_and_snapshots.\ + volume_snapshots.tabs import SnapshotDetailTabs LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/project/images_and_snapshots/volume_snapshots/tables.py b/openstack_dashboard/dashboards/project/images_and_snapshots/volume_snapshots/tables.py index fa51e3e439..a3816d4925 100644 --- a/openstack_dashboard/dashboards/project/images_and_snapshots/volume_snapshots/tables.py +++ b/openstack_dashboard/dashboards/project/images_and_snapshots/volume_snapshots/tables.py @@ -26,7 +26,8 @@ from horizon import tables from openstack_dashboard import api from openstack_dashboard.api import cinder -from ...volumes import tables as volume_tables +from openstack_dashboard.dashboards.project.volumes \ + import tables as volume_tables LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/project/instances/tests.py b/openstack_dashboard/dashboards/project/instances/tests.py index 06748e6dc6..9d29f82e65 100644 --- a/openstack_dashboard/dashboards/project/instances/tests.py +++ b/openstack_dashboard/dashboards/project/instances/tests.py @@ -34,9 +34,11 @@ from openstack_dashboard import api from openstack_dashboard.api import cinder from openstack_dashboard.test import helpers as test -from .tables import LaunchLink -from .tabs import InstanceDetailTabs -from .workflows import LaunchInstance +from openstack_dashboard.dashboards.project.instances.tables import LaunchLink +from openstack_dashboard.dashboards.project.instances.tabs \ + import InstanceDetailTabs +from openstack_dashboard.dashboards.project.instances.workflows \ + import LaunchInstance from novaclient.v1_1.servers import REBOOT_HARD from novaclient.v1_1.servers import REBOOT_SOFT diff --git a/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py b/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py index 6bd468f6de..2da1872934 100644 --- a/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py +++ b/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py @@ -33,7 +33,8 @@ from horizon import workflows from openstack_dashboard import api from openstack_dashboard.api import cinder -from ...images_and_snapshots.utils import get_available_images +from openstack_dashboard.dashboards.project.images_and_snapshots.utils \ + import get_available_images LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/project/loadbalancers/tabs.py b/openstack_dashboard/dashboards/project/loadbalancers/tabs.py index d62272f66b..0b81644743 100644 --- a/openstack_dashboard/dashboards/project/loadbalancers/tabs.py +++ b/openstack_dashboard/dashboards/project/loadbalancers/tabs.py @@ -22,9 +22,12 @@ from horizon import tabs from openstack_dashboard import api -from .tables import MembersTable -from .tables import MonitorsTable -from .tables import PoolsTable +from openstack_dashboard.dashboards.project.loadbalancers.tables \ + import MembersTable +from openstack_dashboard.dashboards.project.loadbalancers.tables \ + import MonitorsTable +from openstack_dashboard.dashboards.project.loadbalancers.tables \ + import PoolsTable class PoolsTab(tabs.TableTab): diff --git a/openstack_dashboard/dashboards/project/loadbalancers/tests.py b/openstack_dashboard/dashboards/project/loadbalancers/tests.py index a395d32fb5..4a344a064b 100644 --- a/openstack_dashboard/dashboards/project/loadbalancers/tests.py +++ b/openstack_dashboard/dashboards/project/loadbalancers/tests.py @@ -15,12 +15,18 @@ from openstack_dashboard.api.lbaas import PoolMonitor from openstack_dashboard.api.lbaas import Vip from openstack_dashboard.test import helpers as test -from .workflows import AddMember -from .workflows import AddMonitor -from .workflows import AddPMAssociation -from .workflows import AddPool -from .workflows import AddVip -from .workflows import DeletePMAssociation +from openstack_dashboard.dashboards.project.loadbalancers.workflows \ + import AddMember +from openstack_dashboard.dashboards.project.loadbalancers.workflows \ + import AddMonitor +from openstack_dashboard.dashboards.project.loadbalancers.workflows \ + import AddPMAssociation +from openstack_dashboard.dashboards.project.loadbalancers.workflows \ + import AddPool +from openstack_dashboard.dashboards.project.loadbalancers.workflows \ + import AddVip +from openstack_dashboard.dashboards.project.loadbalancers.workflows \ + import DeletePMAssociation class LoadBalancerTests(test.TestCase): diff --git a/openstack_dashboard/dashboards/project/network_topology/urls.py b/openstack_dashboard/dashboards/project/network_topology/urls.py index e218360f67..8b3f8fe8e5 100644 --- a/openstack_dashboard/dashboards/project/network_topology/urls.py +++ b/openstack_dashboard/dashboards/project/network_topology/urls.py @@ -22,8 +22,10 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import JSONView -from .views import NetworkTopology +from openstack_dashboard.dashboards.project.network_topology.views \ + import JSONView +from openstack_dashboard.dashboards.project.network_topology.views \ + import NetworkTopology urlpatterns = patterns( diff --git a/openstack_dashboard/dashboards/project/networks/ports/urls.py b/openstack_dashboard/dashboards/project/networks/ports/urls.py index bd06460377..be839b52d8 100644 --- a/openstack_dashboard/dashboards/project/networks/ports/urls.py +++ b/openstack_dashboard/dashboards/project/networks/ports/urls.py @@ -17,7 +17,8 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import DetailView +from openstack_dashboard.dashboards.project.networks.ports.views \ + import DetailView PORTS = r'^(?P[^/]+)/%s$' diff --git a/openstack_dashboard/dashboards/project/networks/ports/views.py b/openstack_dashboard/dashboards/project/networks/ports/views.py index b0cbd2a119..1a4f395ffd 100644 --- a/openstack_dashboard/dashboards/project/networks/ports/views.py +++ b/openstack_dashboard/dashboards/project/networks/ports/views.py @@ -23,8 +23,10 @@ from horizon import tabs from openstack_dashboard import api -from .forms import UpdatePort -from .tabs import PortDetailTabs +from openstack_dashboard.dashboards.project.networks.ports.forms \ + import UpdatePort +from openstack_dashboard.dashboards.project.networks.ports.tabs \ + import PortDetailTabs class DetailView(tabs.TabView): diff --git a/openstack_dashboard/dashboards/project/networks/subnets/urls.py b/openstack_dashboard/dashboards/project/networks/subnets/urls.py index 07a562e751..f3aeb2e67d 100644 --- a/openstack_dashboard/dashboards/project/networks/subnets/urls.py +++ b/openstack_dashboard/dashboards/project/networks/subnets/urls.py @@ -17,7 +17,8 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import DetailView +from openstack_dashboard.dashboards.project.networks.subnets.views \ + import DetailView SUBNETS = r'^(?P[^/]+)/%s$' diff --git a/openstack_dashboard/dashboards/project/networks/subnets/views.py b/openstack_dashboard/dashboards/project/networks/subnets/views.py index 0f5490a9f7..1aa55d23af 100644 --- a/openstack_dashboard/dashboards/project/networks/subnets/views.py +++ b/openstack_dashboard/dashboards/project/networks/subnets/views.py @@ -28,9 +28,12 @@ from horizon import workflows from openstack_dashboard import api -from .tabs import SubnetDetailTabs -from .workflows import CreateSubnet -from .workflows import UpdateSubnet +from openstack_dashboard.dashboards.project.networks.subnets.tabs \ + import SubnetDetailTabs +from openstack_dashboard.dashboards.project.networks.subnets.workflows \ + import CreateSubnet +from openstack_dashboard.dashboards.project.networks.subnets.workflows \ + import UpdateSubnet LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/project/networks/tests.py b/openstack_dashboard/dashboards/project/networks/tests.py index 8a133db1de..1a0bc6ac23 100644 --- a/openstack_dashboard/dashboards/project/networks/tests.py +++ b/openstack_dashboard/dashboards/project/networks/tests.py @@ -25,7 +25,8 @@ from mox import IsA from openstack_dashboard import api from openstack_dashboard.test import helpers as test -from .workflows import CreateNetwork +from openstack_dashboard.dashboards.project.networks.workflows \ + import CreateNetwork INDEX_URL = reverse('horizon:project:networks:index') diff --git a/openstack_dashboard/dashboards/project/networks/urls.py b/openstack_dashboard/dashboards/project/networks/urls.py index bd89be6ff5..5b61e25879 100644 --- a/openstack_dashboard/dashboards/project/networks/urls.py +++ b/openstack_dashboard/dashboards/project/networks/urls.py @@ -18,15 +18,20 @@ from django.conf.urls.defaults import include from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .ports import urls as port_urls -from .ports.views import UpdateView as EditPortView -from .subnets import urls as subnet_urls -from .subnets.views import CreateView as AddSubnetView -from .subnets.views import UpdateView as EditSubnetView -from .views import CreateView -from .views import DetailView -from .views import IndexView -from .views import UpdateView +from openstack_dashboard.dashboards.project.networks.ports \ + import urls as port_urls +from openstack_dashboard.dashboards.project.networks.ports.views \ + import UpdateView as EditPortView +from openstack_dashboard.dashboards.project.networks.subnets \ + import urls as subnet_urls +from openstack_dashboard.dashboards.project.networks.subnets.views \ + import CreateView as AddSubnetView +from openstack_dashboard.dashboards.project.networks.subnets.views \ + import UpdateView as EditSubnetView +from openstack_dashboard.dashboards.project.networks.views import CreateView +from openstack_dashboard.dashboards.project.networks.views import DetailView +from openstack_dashboard.dashboards.project.networks.views import IndexView +from openstack_dashboard.dashboards.project.networks.views import UpdateView NETWORKS = r'^(?P[^/]+)/%s$' diff --git a/openstack_dashboard/dashboards/project/networks/views.py b/openstack_dashboard/dashboards/project/networks/views.py index 43e257d5a1..1df1cf7b9d 100644 --- a/openstack_dashboard/dashboards/project/networks/views.py +++ b/openstack_dashboard/dashboards/project/networks/views.py @@ -29,11 +29,15 @@ from horizon import workflows from openstack_dashboard import api -from .forms import UpdateNetwork -from .ports.tables import PortsTable -from .subnets.tables import SubnetsTable -from .tables import NetworksTable -from .workflows import CreateNetwork +from openstack_dashboard.dashboards.project.networks.forms import UpdateNetwork +from openstack_dashboard.dashboards.project.networks.ports.tables \ + import PortsTable +from openstack_dashboard.dashboards.project.networks.subnets.tables \ + import SubnetsTable +from openstack_dashboard.dashboards.project.networks.tables \ + import NetworksTable +from openstack_dashboard.dashboards.project.networks.workflows \ + import CreateNetwork LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/project/overview/urls.py b/openstack_dashboard/dashboards/project/overview/urls.py index fa0350be5d..abd7f25be9 100644 --- a/openstack_dashboard/dashboards/project/overview/urls.py +++ b/openstack_dashboard/dashboards/project/overview/urls.py @@ -22,8 +22,9 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import ProjectOverview -from .views import WarningView +from openstack_dashboard.dashboards.project.overview.views \ + import ProjectOverview +from openstack_dashboard.dashboards.project.overview.views import WarningView urlpatterns = patterns('openstack_dashboard.dashboards.project.overview.views', diff --git a/openstack_dashboard/dashboards/project/routers/ports/urls.py b/openstack_dashboard/dashboards/project/routers/ports/urls.py index b5b611074d..06a2c83971 100644 --- a/openstack_dashboard/dashboards/project/routers/ports/urls.py +++ b/openstack_dashboard/dashboards/project/routers/ports/urls.py @@ -17,7 +17,8 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import DetailView +from openstack_dashboard.dashboards.project.routers.ports.views \ + import DetailView PORTS = r'^(?P[^/]+)/%s$' diff --git a/openstack_dashboard/dashboards/project/routers/ports/views.py b/openstack_dashboard/dashboards/project/routers/ports/views.py index 520f0cc6dd..ea08080f7d 100644 --- a/openstack_dashboard/dashboards/project/routers/ports/views.py +++ b/openstack_dashboard/dashboards/project/routers/ports/views.py @@ -24,9 +24,12 @@ from horizon import tabs from openstack_dashboard import api -from .forms import AddInterface -from .forms import SetGatewayForm -from .tabs import PortDetailTabs +from openstack_dashboard.dashboards.project.routers.ports.forms \ + import AddInterface +from openstack_dashboard.dashboards.project.routers.ports.forms \ + import SetGatewayForm +from openstack_dashboard.dashboards.project.routers.ports.tabs \ + import PortDetailTabs LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/project/routers/urls.py b/openstack_dashboard/dashboards/project/routers/urls.py index 4345ca5489..f7ed2f2f5b 100644 --- a/openstack_dashboard/dashboards/project/routers/urls.py +++ b/openstack_dashboard/dashboards/project/routers/urls.py @@ -17,11 +17,13 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .ports.views import AddInterfaceView -from .ports.views import SetGatewayView -from .views import CreateView -from .views import DetailView -from .views import IndexView +from openstack_dashboard.dashboards.project.routers.ports.views \ + import AddInterfaceView +from openstack_dashboard.dashboards.project.routers.ports.views \ + import SetGatewayView +from openstack_dashboard.dashboards.project.routers.views import CreateView +from openstack_dashboard.dashboards.project.routers.views import DetailView +from openstack_dashboard.dashboards.project.routers.views import IndexView urlpatterns = patterns('horizon.dashboards.project.routers.views', diff --git a/openstack_dashboard/dashboards/project/routers/views.py b/openstack_dashboard/dashboards/project/routers/views.py index be9d204461..f48b7957fc 100644 --- a/openstack_dashboard/dashboards/project/routers/views.py +++ b/openstack_dashboard/dashboards/project/routers/views.py @@ -29,9 +29,10 @@ from horizon import forms from horizon import tables from openstack_dashboard import api -from .forms import CreateForm -from .ports.tables import PortsTable -from .tables import RoutersTable +from openstack_dashboard.dashboards.project.routers.forms import CreateForm +from openstack_dashboard.dashboards.project.routers.ports.tables \ + import PortsTable +from openstack_dashboard.dashboards.project.routers.tables import RoutersTable LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/project/stacks/tabs.py b/openstack_dashboard/dashboards/project/stacks/tabs.py index d59ca7502c..c1adf35f3d 100644 --- a/openstack_dashboard/dashboards/project/stacks/tabs.py +++ b/openstack_dashboard/dashboards/project/stacks/tabs.py @@ -20,8 +20,8 @@ from horizon import messages from horizon import tabs from openstack_dashboard import api -from .tables import EventsTable -from .tables import ResourcesTable +from openstack_dashboard.dashboards.project.stacks.tables import EventsTable +from openstack_dashboard.dashboards.project.stacks.tables import ResourcesTable LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/project/stacks/tests.py b/openstack_dashboard/dashboards/project/stacks/tests.py index 3f58502e6d..c02c781466 100644 --- a/openstack_dashboard/dashboards/project/stacks/tests.py +++ b/openstack_dashboard/dashboards/project/stacks/tests.py @@ -22,8 +22,8 @@ from mox import IsA from openstack_dashboard import api from openstack_dashboard.test import helpers as test -from . import forms -from . import mappings +from openstack_dashboard.dashboards.project.stacks import forms +from openstack_dashboard.dashboards.project.stacks import mappings INDEX_URL = reverse('horizon:project:stacks:index') diff --git a/openstack_dashboard/dashboards/project/stacks/urls.py b/openstack_dashboard/dashboards/project/stacks/urls.py index 7fe337c587..7271aeb30a 100644 --- a/openstack_dashboard/dashboards/project/stacks/urls.py +++ b/openstack_dashboard/dashboards/project/stacks/urls.py @@ -15,11 +15,12 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import CreateStackView -from .views import DetailView -from .views import IndexView -from .views import ResourceView -from .views import SelectTemplateView +from openstack_dashboard.dashboards.project.stacks.views import CreateStackView +from openstack_dashboard.dashboards.project.stacks.views import DetailView +from openstack_dashboard.dashboards.project.stacks.views import IndexView +from openstack_dashboard.dashboards.project.stacks.views import ResourceView +from openstack_dashboard.dashboards.project.stacks.views \ + import SelectTemplateView urlpatterns = patterns( '', diff --git a/openstack_dashboard/dashboards/project/stacks/views.py b/openstack_dashboard/dashboards/project/stacks/views.py index f3bcc4084d..2beda10e94 100644 --- a/openstack_dashboard/dashboards/project/stacks/views.py +++ b/openstack_dashboard/dashboards/project/stacks/views.py @@ -26,11 +26,12 @@ from django.utils.translation import ugettext_lazy as _ from openstack_dashboard import api -from .forms import StackCreateForm -from .forms import TemplateForm -from .tables import StacksTable -from .tabs import ResourceDetailTabs -from .tabs import StackDetailTabs +from openstack_dashboard.dashboards.project.stacks.forms import StackCreateForm +from openstack_dashboard.dashboards.project.stacks.forms import TemplateForm +from openstack_dashboard.dashboards.project.stacks.tables import StacksTable +from openstack_dashboard.dashboards.project.stacks.tabs \ + import ResourceDetailTabs +from openstack_dashboard.dashboards.project.stacks.tabs import StackDetailTabs LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/project/volumes/forms.py b/openstack_dashboard/dashboards/project/volumes/forms.py index 4405fa52c4..5a5c0d7640 100644 --- a/openstack_dashboard/dashboards/project/volumes/forms.py +++ b/openstack_dashboard/dashboards/project/volumes/forms.py @@ -20,11 +20,13 @@ from horizon.utils.fields import SelectWidget from horizon.utils.functions import bytes_to_gigabytes from horizon.utils.memoized import memoized -from ..images_and_snapshots.utils import get_available_images -from ..instances.tables import ACTIVE_STATES from openstack_dashboard import api from openstack_dashboard.api import cinder from openstack_dashboard.api import glance +from openstack_dashboard.dashboards.project.images_and_snapshots.utils \ + import get_available_images +from openstack_dashboard.dashboards.project.instances.tables \ + import ACTIVE_STATES class CreateForm(forms.SelfHandlingForm): diff --git a/openstack_dashboard/dashboards/project/volumes/urls.py b/openstack_dashboard/dashboards/project/volumes/urls.py index 7518d45d8b..0d77d0a292 100644 --- a/openstack_dashboard/dashboards/project/volumes/urls.py +++ b/openstack_dashboard/dashboards/project/volumes/urls.py @@ -17,11 +17,13 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import CreateSnapshotView -from .views import CreateView -from .views import DetailView -from .views import EditAttachmentsView -from .views import IndexView +from openstack_dashboard.dashboards.project.volumes.views \ + import CreateSnapshotView +from openstack_dashboard.dashboards.project.volumes.views import CreateView +from openstack_dashboard.dashboards.project.volumes.views import DetailView +from openstack_dashboard.dashboards.project.volumes.views \ + import EditAttachmentsView +from openstack_dashboard.dashboards.project.volumes.views import IndexView urlpatterns = patterns('openstack_dashboard.dashboards.project.volumes.views', diff --git a/openstack_dashboard/dashboards/project/volumes/views.py b/openstack_dashboard/dashboards/project/volumes/views.py index 2b077c796b..003d1354b5 100644 --- a/openstack_dashboard/dashboards/project/volumes/views.py +++ b/openstack_dashboard/dashboards/project/volumes/views.py @@ -22,9 +22,10 @@ from django.core.urlresolvers import reverse_lazy from django.utils.datastructures import SortedDict from django.utils.translation import ugettext_lazy as _ -from .forms import AttachForm -from .forms import CreateForm -from .forms import CreateSnapshotForm +from openstack_dashboard.dashboards.project.volumes.forms import AttachForm +from openstack_dashboard.dashboards.project.volumes.forms import CreateForm +from openstack_dashboard.dashboards.project.volumes.forms \ + import CreateSnapshotForm from horizon import exceptions from horizon import forms @@ -37,9 +38,11 @@ from openstack_dashboard import api from openstack_dashboard.api import cinder from openstack_dashboard.usage import quotas -from .tables import AttachmentsTable -from .tables import VolumesTable -from .tabs import VolumeDetailTabs +from openstack_dashboard.dashboards.project.volumes.tables \ + import AttachmentsTable +from openstack_dashboard.dashboards.project.volumes.tables import VolumesTable +from openstack_dashboard.dashboards.project.volumes.tabs \ + import VolumeDetailTabs LOG = logging.getLogger(__name__) diff --git a/openstack_dashboard/dashboards/settings/password/urls.py b/openstack_dashboard/dashboards/settings/password/urls.py index 637960ed16..cd3cf9b97c 100644 --- a/openstack_dashboard/dashboards/settings/password/urls.py +++ b/openstack_dashboard/dashboards/settings/password/urls.py @@ -17,7 +17,7 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import PasswordView +from openstack_dashboard.dashboards.settings.password.views import PasswordView urlpatterns = patterns('', diff --git a/openstack_dashboard/dashboards/settings/password/views.py b/openstack_dashboard/dashboards/settings/password/views.py index 2845d25b1e..01114af08a 100644 --- a/openstack_dashboard/dashboards/settings/password/views.py +++ b/openstack_dashboard/dashboards/settings/password/views.py @@ -16,8 +16,8 @@ from horizon import forms -from .forms import PasswordForm from django.core.urlresolvers import reverse_lazy +from openstack_dashboard.dashboards.settings.password.forms import PasswordForm class PasswordView(forms.ModalFormView): diff --git a/openstack_dashboard/dashboards/settings/user/urls.py b/openstack_dashboard/dashboards/settings/user/urls.py index 6fdfdd9cc9..16cc7d9441 100644 --- a/openstack_dashboard/dashboards/settings/user/urls.py +++ b/openstack_dashboard/dashboards/settings/user/urls.py @@ -17,7 +17,7 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from .views import UserSettingsView +from openstack_dashboard.dashboards.settings.user.views import UserSettingsView urlpatterns = patterns('', diff --git a/openstack_dashboard/dashboards/settings/user/views.py b/openstack_dashboard/dashboards/settings/user/views.py index 67d543134e..e57ba67e0e 100644 --- a/openstack_dashboard/dashboards/settings/user/views.py +++ b/openstack_dashboard/dashboards/settings/user/views.py @@ -17,7 +17,7 @@ from django.conf import settings from horizon import forms -from .forms import UserSettingsForm +from openstack_dashboard.dashboards.settings.user.forms import UserSettingsForm class UserSettingsView(forms.ModalFormView): diff --git a/openstack_dashboard/test/test_data/cinder_data.py b/openstack_dashboard/test/test_data/cinder_data.py index 84e0cb5468..e70a204466 100644 --- a/openstack_dashboard/test/test_data/cinder_data.py +++ b/openstack_dashboard/test/test_data/cinder_data.py @@ -17,7 +17,7 @@ from openstack_dashboard.api.base import Quota from openstack_dashboard.api.base import QuotaSet as QuotaSetWrapper from openstack_dashboard.usage.quotas import QuotaUsage -from .utils import TestDataContainer +from openstack_dashboard.test.test_data.utils import TestDataContainer def data(TEST): diff --git a/openstack_dashboard/test/test_data/exceptions.py b/openstack_dashboard/test/test_data/exceptions.py index 1da0d383b0..4dc358667f 100644 --- a/openstack_dashboard/test/test_data/exceptions.py +++ b/openstack_dashboard/test/test_data/exceptions.py @@ -19,7 +19,7 @@ from neutronclient.common import exceptions as neutron_exceptions from novaclient import exceptions as nova_exceptions from swiftclient import client as swift_exceptions -from .utils import TestDataContainer +from openstack_dashboard.test.test_data.utils import TestDataContainer def create_stubbed_exception(cls, status_code=500): diff --git a/openstack_dashboard/test/test_data/glance_data.py b/openstack_dashboard/test/test_data/glance_data.py index add8fb077c..1cd97e5106 100644 --- a/openstack_dashboard/test/test_data/glance_data.py +++ b/openstack_dashboard/test/test_data/glance_data.py @@ -15,7 +15,7 @@ from glanceclient.v1.images import Image from glanceclient.v1.images import ImageManager -from .utils import TestDataContainer +from openstack_dashboard.test.test_data.utils import TestDataContainer def data(TEST): diff --git a/openstack_dashboard/test/test_data/heat_data.py b/openstack_dashboard/test/test_data/heat_data.py index d3c8ebbc35..b05f3ff548 100644 --- a/openstack_dashboard/test/test_data/heat_data.py +++ b/openstack_dashboard/test/test_data/heat_data.py @@ -15,7 +15,7 @@ from heatclient.v1.stacks import Stack from heatclient.v1.stacks import StackManager -from .utils import TestDataContainer +from openstack_dashboard.test.test_data.utils import TestDataContainer # A slightly hacked up copy of a sample cloudformation template for testing. diff --git a/openstack_dashboard/test/test_data/keystone_data.py b/openstack_dashboard/test/test_data/keystone_data.py index 83ed3c4789..b9d419201d 100644 --- a/openstack_dashboard/test/test_data/keystone_data.py +++ b/openstack_dashboard/test/test_data/keystone_data.py @@ -26,7 +26,7 @@ from keystoneclient.v3 import domains from keystoneclient.v3 import groups -from .utils import TestDataContainer +from openstack_dashboard.test.test_data.utils import TestDataContainer # Dummy service catalog with all service. diff --git a/openstack_dashboard/test/test_data/neutron_data.py b/openstack_dashboard/test/test_data/neutron_data.py index 1336a12571..8898372000 100644 --- a/openstack_dashboard/test/test_data/neutron_data.py +++ b/openstack_dashboard/test/test_data/neutron_data.py @@ -28,7 +28,7 @@ from openstack_dashboard.api.neutron import SecurityGroup from openstack_dashboard.api.neutron import SecurityGroupRule from openstack_dashboard.api.neutron import Subnet -from .utils import TestDataContainer +from openstack_dashboard.test.test_data.utils import TestDataContainer def data(TEST): diff --git a/openstack_dashboard/test/test_data/nova_data.py b/openstack_dashboard/test/test_data/nova_data.py index 3399711e68..aba2b59769 100644 --- a/openstack_dashboard/test/test_data/nova_data.py +++ b/openstack_dashboard/test/test_data/nova_data.py @@ -35,7 +35,7 @@ from openstack_dashboard.api.base import QuotaSet as QuotaSetWrapper from openstack_dashboard.api.nova import FloatingIp as NetFloatingIp from openstack_dashboard.usage.quotas import QuotaUsage -from .utils import TestDataContainer +from openstack_dashboard.test.test_data.utils import TestDataContainer SERVER_DATA = """ diff --git a/openstack_dashboard/test/test_data/swift_data.py b/openstack_dashboard/test/test_data/swift_data.py index e8998e67e3..2feef81050 100644 --- a/openstack_dashboard/test/test_data/swift_data.py +++ b/openstack_dashboard/test/test_data/swift_data.py @@ -14,7 +14,7 @@ from openstack_dashboard.api import swift -from .utils import TestDataContainer +from openstack_dashboard.test.test_data.utils import TestDataContainer def data(TEST): diff --git a/openstack_dashboard/test/test_data/utils.py b/openstack_dashboard/test/test_data/utils.py index 0548fcd66e..ceb6baedbf 100644 --- a/openstack_dashboard/test/test_data/utils.py +++ b/openstack_dashboard/test/test_data/utils.py @@ -14,14 +14,14 @@ def load_test_data(load_onto=None): - from . import cinder_data - from . import exceptions - from . import glance_data - from . import heat_data - from . import keystone_data - from . import neutron_data - from . import nova_data - from . import swift_data + from openstack_dashboard.test.test_data import cinder_data + from openstack_dashboard.test.test_data import exceptions + from openstack_dashboard.test.test_data import glance_data + from openstack_dashboard.test.test_data import heat_data + from openstack_dashboard.test.test_data import keystone_data + from openstack_dashboard.test.test_data import neutron_data + from openstack_dashboard.test.test_data import nova_data + from openstack_dashboard.test.test_data import swift_data # The order of these loaders matters, some depend on others. loaders = (exceptions.data, diff --git a/tox.ini b/tox.ini index 341bf3e520..84a74008c8 100644 --- a/tox.ini +++ b/tox.ini @@ -43,8 +43,7 @@ exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,p # H201 no 'except:' at least use 'except Exception:' # H302 import only modules.'from optparse import make_option' does not import a module # H303 No wildcard (*) import. -# H304 No relative imports. 'from .views import IndexView' is a relative import # H4xx docstrings # H701 empty localization string # H702 Formatting operation should be outside of localization method call -ignore = E121,E126,E127,E128,F403,F841,F999,H201,H302,H303,H304,H4,H701,H702 +ignore = E121,E126,E127,E128,F403,F841,F999,H201,H302,H303,H4,H701,H702