From 13c83d37cf5f42d41367a2305880d6289fa7a1fc Mon Sep 17 00:00:00 2001 From: Tomas Sedovic Date: Wed, 7 Aug 2013 16:36:49 +0200 Subject: update the infrastructure imports Signed-off-by: Tomas Sedovic --- tuskar_ui/api.py | 2 +- tuskar_ui/infrastructure/overview/urls.py | 3 +-- .../infrastructure/resource_management/flavors/forms.py | 2 +- .../resource_management/flavors/tables.py | 2 +- .../infrastructure/resource_management/flavors/tests.py | 2 +- .../infrastructure/resource_management/flavors/urls.py | 17 ++++++----------- .../infrastructure/resource_management/flavors/views.py | 8 ++++---- .../infrastructure/resource_management/nodes/tables.py | 2 +- .../infrastructure/resource_management/nodes/tests.py | 2 +- .../infrastructure/resource_management/nodes/urls.py | 9 +++------ .../infrastructure/resource_management/nodes/views.py | 8 +++----- tuskar_ui/infrastructure/resource_management/panel.py | 2 +- .../infrastructure/resource_management/racks/forms.py | 2 +- .../infrastructure/resource_management/racks/tables.py | 2 +- .../infrastructure/resource_management/racks/tabs.py | 2 +- .../infrastructure/resource_management/racks/tests.py | 2 +- .../infrastructure/resource_management/racks/urls.py | 17 ++++++++--------- .../infrastructure/resource_management/racks/views.py | 16 ++++++++-------- .../resource_management/racks/workflows.py | 2 +- .../resource_management/resource_classes/forms.py | 2 +- .../resource_management/resource_classes/tables.py | 8 ++++---- .../resource_management/resource_classes/tabs.py | 4 ++-- .../resource_management/resource_classes/tests.py | 2 +- .../resource_management/resource_classes/urls.py | 16 ++++++++-------- .../resource_management/resource_classes/views.py | 16 ++++++++-------- .../resource_management/resource_classes/workflows.py | 6 +++--- tuskar_ui/infrastructure/resource_management/tabs.py | 6 +++--- tuskar_ui/infrastructure/resource_management/tests.py | 2 +- tuskar_ui/infrastructure/resource_management/urls.py | 10 +++++----- tuskar_ui/infrastructure/resource_management/views.py | 2 +- tuskar_ui/infrastructure/service_management/panel.py | 2 +- tuskar_ui/infrastructure/service_management/urls.py | 2 +- 32 files changed, 84 insertions(+), 96 deletions(-) (limited to 'tuskar_ui') diff --git a/tuskar_ui/api.py b/tuskar_ui/api.py index 6b1bc9c6..e1b182bb 100644 --- a/tuskar_ui/api.py +++ b/tuskar_ui/api.py @@ -29,7 +29,7 @@ from tuskarclient.v1 import client as tuskar_client from openstack_dashboard.api import base from openstack_dashboard.api import nova -import openstack_dashboard.dashboards.infrastructure.models as dummymodels +import tuskar_ui.infrastructure.models as dummymodels LOG = logging.getLogger(__name__) diff --git a/tuskar_ui/infrastructure/overview/urls.py b/tuskar_ui/infrastructure/overview/urls.py index 5176c21a..ea542383 100644 --- a/tuskar_ui/infrastructure/overview/urls.py +++ b/tuskar_ui/infrastructure/overview/urls.py @@ -17,8 +17,7 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from openstack_dashboard.dashboards.infrastructure. \ - overview.views import IndexView +from tuskar_ui.infrastructure.overview.views import IndexView urlpatterns = patterns('', diff --git a/tuskar_ui/infrastructure/resource_management/flavors/forms.py b/tuskar_ui/infrastructure/resource_management/flavors/forms.py index a859bf7f..3c7f2a82 100644 --- a/tuskar_ui/infrastructure/resource_management/flavors/forms.py +++ b/tuskar_ui/infrastructure/resource_management/flavors/forms.py @@ -19,7 +19,7 @@ from horizon import exceptions from horizon import forms from horizon import messages -from openstack_dashboard import api +from tuskar_ui import api class CreateFlavor(forms.SelfHandlingForm): diff --git a/tuskar_ui/infrastructure/resource_management/flavors/tables.py b/tuskar_ui/infrastructure/resource_management/flavors/tables.py index b1a5b975..e654d959 100644 --- a/tuskar_ui/infrastructure/resource_management/flavors/tables.py +++ b/tuskar_ui/infrastructure/resource_management/flavors/tables.py @@ -19,7 +19,7 @@ from django.utils.translation import ugettext_lazy as _ from horizon import tables -from openstack_dashboard import api +from tuskar_ui import api LOG = logging.getLogger(__name__) diff --git a/tuskar_ui/infrastructure/resource_management/flavors/tests.py b/tuskar_ui/infrastructure/resource_management/flavors/tests.py index 6fb06e09..9a720f4b 100644 --- a/tuskar_ui/infrastructure/resource_management/flavors/tests.py +++ b/tuskar_ui/infrastructure/resource_management/flavors/tests.py @@ -2,7 +2,7 @@ from django.core.urlresolvers import reverse from django import http from mox import IsA -from openstack_dashboard import api +from tuskar_ui import api from openstack_dashboard.test import helpers as test diff --git a/tuskar_ui/infrastructure/resource_management/flavors/urls.py b/tuskar_ui/infrastructure/resource_management/flavors/urls.py index ec485327..11f010e0 100644 --- a/tuskar_ui/infrastructure/resource_management/flavors/urls.py +++ b/tuskar_ui/infrastructure/resource_management/flavors/urls.py @@ -16,20 +16,15 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from openstack_dashboard.dashboards.infrastructure. \ - resource_management.flavors.views import ActiveInstancesDataView -from openstack_dashboard.dashboards.infrastructure. \ - resource_management.flavors.views import CreateView -from openstack_dashboard.dashboards.infrastructure. \ - resource_management.flavors.views import DetailEditView -from openstack_dashboard.dashboards.infrastructure. \ - resource_management.flavors.views import DetailView -from openstack_dashboard.dashboards.infrastructure. \ - resource_management.flavors.views import EditView +from tuskar_ui.infrastructure.resource_management.flavors.views import ActiveInstancesDataView +from tuskar_ui.infrastructure.resource_management.flavors.views import CreateView +from tuskar_ui.infrastructure.resource_management.flavors.views import DetailEditView +from tuskar_ui.infrastructure.resource_management.flavors.views import DetailView +from tuskar_ui.infrastructure.resource_management.flavors.views import EditView FLAVORS = r'^(?P[^/]+)/%s$' -VIEW_MOD = 'openstack_dashboard.dashboards.infrastructure.' \ +VIEW_MOD = 'tuskar_ui.infrastructure.' \ 'resource_management.flavors.views' urlpatterns = patterns(VIEW_MOD, diff --git a/tuskar_ui/infrastructure/resource_management/flavors/views.py b/tuskar_ui/infrastructure/resource_management/flavors/views.py index e66eb3fd..49f51c55 100644 --- a/tuskar_ui/infrastructure/resource_management/flavors/views.py +++ b/tuskar_ui/infrastructure/resource_management/flavors/views.py @@ -29,12 +29,12 @@ from horizon import exceptions from horizon import forms from horizon import tabs -from openstack_dashboard import api -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui import api +from tuskar_ui.infrastructure. \ resource_management.flavors.forms import CreateFlavor -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.flavors.forms import EditFlavor -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.flavors.tabs import FlavorDetailTabs diff --git a/tuskar_ui/infrastructure/resource_management/nodes/tables.py b/tuskar_ui/infrastructure/resource_management/nodes/tables.py index 2bcf1cdc..7943c4d1 100644 --- a/tuskar_ui/infrastructure/resource_management/nodes/tables.py +++ b/tuskar_ui/infrastructure/resource_management/nodes/tables.py @@ -16,7 +16,7 @@ from django.utils.translation import ugettext_lazy as _ from horizon import tables -from openstack_dashboard import api +from tuskar_ui import api class DeleteNodes(tables.DeleteAction): diff --git a/tuskar_ui/infrastructure/resource_management/nodes/tests.py b/tuskar_ui/infrastructure/resource_management/nodes/tests.py index aede3fa7..c1622a18 100644 --- a/tuskar_ui/infrastructure/resource_management/nodes/tests.py +++ b/tuskar_ui/infrastructure/resource_management/nodes/tests.py @@ -3,7 +3,7 @@ from django import http from mox import IsA -from openstack_dashboard import api +from tuskar_ui import api from openstack_dashboard.test import helpers as test diff --git a/tuskar_ui/infrastructure/resource_management/nodes/urls.py b/tuskar_ui/infrastructure/resource_management/nodes/urls.py index faae3945..e134cfa1 100644 --- a/tuskar_ui/infrastructure/resource_management/nodes/urls.py +++ b/tuskar_ui/infrastructure/resource_management/nodes/urls.py @@ -15,15 +15,12 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from openstack_dashboard.dashboards.infrastructure. \ - resource_management.nodes.views import DetailView -from openstack_dashboard.dashboards.infrastructure. \ - resource_management.nodes.views import UnrackedView +from tuskar_ui.infrastructure.resource_management.nodes.views import DetailView +from tuskar_ui.infrastructure.resource_management.nodes.views import UnrackedView NODES = r'^(?P[^/]+)/%s$' -VIEW_MOD = 'openstack_dashboard.dashboards.infrastructure.' \ - 'resource_management.nodes.views' +VIEW_MOD = 'tuskar_ui.infrastructure.resource_management.nodes.views' urlpatterns = patterns(VIEW_MOD, diff --git a/tuskar_ui/infrastructure/resource_management/nodes/views.py b/tuskar_ui/infrastructure/resource_management/nodes/views.py index 7c492184..9c7d9473 100644 --- a/tuskar_ui/infrastructure/resource_management/nodes/views.py +++ b/tuskar_ui/infrastructure/resource_management/nodes/views.py @@ -19,11 +19,9 @@ from horizon import exceptions from horizon import tables from horizon import tabs -from openstack_dashboard import api -from openstack_dashboard.dashboards.infrastructure. \ - resource_management.nodes.tables import UnrackedNodesTable -from openstack_dashboard.dashboards.infrastructure. \ - resource_management.nodes.tabs import NodeDetailTabs +from tuskar_ui import api +from tuskar_ui.infrastructure.resource_management.nodes.tables import UnrackedNodesTable +from tuskar_ui.infrastructure.resource_management.nodes.tabs import NodeDetailTabs class UnrackedView(tables.DataTableView): diff --git a/tuskar_ui/infrastructure/resource_management/panel.py b/tuskar_ui/infrastructure/resource_management/panel.py index 97ec0e13..e72a3c39 100644 --- a/tuskar_ui/infrastructure/resource_management/panel.py +++ b/tuskar_ui/infrastructure/resource_management/panel.py @@ -18,7 +18,7 @@ from django.utils.translation import ugettext_lazy as _ import horizon -from openstack_dashboard.dashboards.infrastructure import dashboard +from tuskar_ui.infrastructure import dashboard class Resource_Management(horizon.Panel): diff --git a/tuskar_ui/infrastructure/resource_management/racks/forms.py b/tuskar_ui/infrastructure/resource_management/racks/forms.py index c77d2dd3..265f98f8 100644 --- a/tuskar_ui/infrastructure/resource_management/racks/forms.py +++ b/tuskar_ui/infrastructure/resource_management/racks/forms.py @@ -7,7 +7,7 @@ from horizon import exceptions from horizon import forms from horizon import messages -from openstack_dashboard import api +from tuskar_ui import api import base64 import csv diff --git a/tuskar_ui/infrastructure/resource_management/racks/tables.py b/tuskar_ui/infrastructure/resource_management/racks/tables.py index 33fa31fb..1075255d 100644 --- a/tuskar_ui/infrastructure/resource_management/racks/tables.py +++ b/tuskar_ui/infrastructure/resource_management/racks/tables.py @@ -18,7 +18,7 @@ from django.utils.translation import ugettext_lazy as _ from horizon import tables -from openstack_dashboard import api +from tuskar_ui import api LOG = logging.getLogger(__name__) diff --git a/tuskar_ui/infrastructure/resource_management/racks/tabs.py b/tuskar_ui/infrastructure/resource_management/racks/tabs.py index e4d7ac43..0155fed5 100644 --- a/tuskar_ui/infrastructure/resource_management/racks/tabs.py +++ b/tuskar_ui/infrastructure/resource_management/racks/tabs.py @@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import tabs -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.nodes.tables import NodesTable diff --git a/tuskar_ui/infrastructure/resource_management/racks/tests.py b/tuskar_ui/infrastructure/resource_management/racks/tests.py index 131f2cf1..4bae1304 100644 --- a/tuskar_ui/infrastructure/resource_management/racks/tests.py +++ b/tuskar_ui/infrastructure/resource_management/racks/tests.py @@ -17,7 +17,7 @@ from mox import IsA from novaclient.v1_1.contrib import baremetal -from openstack_dashboard import api +from tuskar_ui import api from openstack_dashboard.test import helpers as test import base64 diff --git a/tuskar_ui/infrastructure/resource_management/racks/urls.py b/tuskar_ui/infrastructure/resource_management/racks/urls.py index dee9d718..32b109db 100644 --- a/tuskar_ui/infrastructure/resource_management/racks/urls.py +++ b/tuskar_ui/infrastructure/resource_management/racks/urls.py @@ -15,25 +15,24 @@ from django.conf.urls import patterns from django.conf.urls import url -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks.views import CreateView -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks.views import DetailEditView -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks.views import DetailView -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks.views import EditRackStatusView -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks.views import EditView -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks.views import UploadView -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks.views import UsageDataView RACKS = r'^(?P[^/]+)/%s$' -VIEW_MOD = 'openstack_dashboard.dashboards.infrastructure.' \ - 'resource_management.racks.views' +VIEW_MOD = 'tuskar_ui.infrastructure.resource_management.racks.views' urlpatterns = patterns(VIEW_MOD, diff --git a/tuskar_ui/infrastructure/resource_management/racks/views.py b/tuskar_ui/infrastructure/resource_management/racks/views.py index 1a7fed7c..dc3fe535 100644 --- a/tuskar_ui/infrastructure/resource_management/racks/views.py +++ b/tuskar_ui/infrastructure/resource_management/racks/views.py @@ -32,20 +32,20 @@ from horizon import forms from horizon import tabs from horizon import workflows -from openstack_dashboard import api -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui import api +from tuskar_ui.infrastructure. \ resource_management.racks.forms import UpdateRackStatus -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks.forms import UploadRack -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks.tabs import RackDetailTabs -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks.tables import UploadRacksTable -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks.workflows import CreateRack -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks.workflows import DetailEditRack -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks.workflows import EditRack diff --git a/tuskar_ui/infrastructure/resource_management/racks/workflows.py b/tuskar_ui/infrastructure/resource_management/racks/workflows.py index 1f197e55..4a823125 100644 --- a/tuskar_ui/infrastructure/resource_management/racks/workflows.py +++ b/tuskar_ui/infrastructure/resource_management/racks/workflows.py @@ -19,7 +19,7 @@ from horizon import exceptions from horizon import forms from horizon import workflows -from openstack_dashboard import api +from tuskar_ui import api class NodeCreateAction(workflows.Action): diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/forms.py b/tuskar_ui/infrastructure/resource_management/resource_classes/forms.py index 31d92c33..84109955 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/forms.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/forms.py @@ -5,7 +5,7 @@ from horizon import exceptions from horizon import forms from horizon import messages -from openstack_dashboard import api +from tuskar_ui import api import logging diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py b/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py index 76fb2c2a..da618455 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py @@ -21,13 +21,13 @@ from horizon import exceptions from horizon import forms from horizon import tables -from openstack_dashboard import api +from tuskar_ui import api -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.flavors import tables as flavors_tables -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks import tables as racks_tables -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management import resource_classes diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/tabs.py b/tuskar_ui/infrastructure/resource_management/resource_classes/tabs.py index 8f49d94d..aba273de 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/tabs.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/tabs.py @@ -17,9 +17,9 @@ from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import tabs -from openstack_dashboard.dashboards.infrastructure.resource_management. \ +from tuskar_ui.infrastructure.resource_management. \ resource_classes.tables import RacksTable -from openstack_dashboard.dashboards.infrastructure.resource_management. \ +from tuskar_ui.infrastructure.resource_management. \ resource_classes.tables import ResourceClassDetailFlavorsTable diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py b/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py index 3b4e2a76..d9d2437a 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py @@ -15,7 +15,7 @@ from django.core.urlresolvers import reverse from django import http from mox import IsA -from openstack_dashboard import api +from tuskar_ui import api from openstack_dashboard.test import helpers as test diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/urls.py b/tuskar_ui/infrastructure/resource_management/resource_classes/urls.py index 389b6311..fa449caa 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/urls.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/urls.py @@ -15,24 +15,24 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.views import CreateView -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.views import DetailActionView -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.views import DetailUpdateView -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.views import DetailView -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.views import UpdateFlavorsView -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.views import UpdateRacksView -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.views import UpdateView RESOURCE_CLASS = r'^(?P[^/]+)/%s$' -VIEW_MOD = 'openstack_dashboard.dashboards.infrastructure.' \ +VIEW_MOD = 'tuskar_ui.infrastructure.' \ 'resource_management.resource_classes.views' urlpatterns = patterns( diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/views.py b/tuskar_ui/infrastructure/resource_management/resource_classes/views.py index 76974290..3017be36 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/views.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/views.py @@ -32,21 +32,21 @@ from horizon import forms from horizon import tabs from horizon import workflows -from openstack_dashboard import api +from tuskar_ui import api -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.forms import DeleteForm -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.tabs import ResourceClassDetailTabs -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.workflows import CreateResourceClass -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.workflows import DetailUpdateWorkflow -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.workflows import UpdateFlavorsWorkflow -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.workflows import UpdateRacksWorkflow -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.workflows import UpdateResourceClass diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/workflows.py b/tuskar_ui/infrastructure/resource_management/resource_classes/workflows.py index 036f10ae..91cebb61 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/workflows.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/workflows.py @@ -20,13 +20,13 @@ from horizon import exceptions from horizon import forms from horizon import workflows -from openstack_dashboard import api +from tuskar_ui import api import re -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.tables import FlavorsTable -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.tables import RacksTable diff --git a/tuskar_ui/infrastructure/resource_management/tabs.py b/tuskar_ui/infrastructure/resource_management/tabs.py index d21d04e7..8c88977c 100644 --- a/tuskar_ui/infrastructure/resource_management/tabs.py +++ b/tuskar_ui/infrastructure/resource_management/tabs.py @@ -20,11 +20,11 @@ from horizon import exceptions from horizon import tabs from openstack_dashboard.api import tuskar -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.flavors.tables import FlavorsTable -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks.tables import RacksTable -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes.tables import ResourceClassesTable diff --git a/tuskar_ui/infrastructure/resource_management/tests.py b/tuskar_ui/infrastructure/resource_management/tests.py index 59c0898d..e848749a 100644 --- a/tuskar_ui/infrastructure/resource_management/tests.py +++ b/tuskar_ui/infrastructure/resource_management/tests.py @@ -19,7 +19,7 @@ from django import http from mox import IsA -from openstack_dashboard import api +from tuskar_ui import api from openstack_dashboard.test import helpers as test diff --git a/tuskar_ui/infrastructure/resource_management/urls.py b/tuskar_ui/infrastructure/resource_management/urls.py index d41e15be..71329259 100644 --- a/tuskar_ui/infrastructure/resource_management/urls.py +++ b/tuskar_ui/infrastructure/resource_management/urls.py @@ -18,15 +18,15 @@ from django.conf.urls.defaults import include from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.flavors import urls as flavor_urls -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.nodes import urls as node_urls -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.racks import urls as rack_urls -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.resource_classes import urls as resource_classes_urls -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.views import IndexView urlpatterns = patterns('', diff --git a/tuskar_ui/infrastructure/resource_management/views.py b/tuskar_ui/infrastructure/resource_management/views.py index 53ef51c0..de91b3e9 100644 --- a/tuskar_ui/infrastructure/resource_management/views.py +++ b/tuskar_ui/infrastructure/resource_management/views.py @@ -21,7 +21,7 @@ Views for Resource Management. from horizon import tabs -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ resource_management.tabs import ResourceManagementTabs diff --git a/tuskar_ui/infrastructure/service_management/panel.py b/tuskar_ui/infrastructure/service_management/panel.py index a91c5ec4..5eca425c 100644 --- a/tuskar_ui/infrastructure/service_management/panel.py +++ b/tuskar_ui/infrastructure/service_management/panel.py @@ -18,7 +18,7 @@ from django.utils.translation import ugettext_lazy as _ import horizon -#from openstack_dashboard.dashboards.infrastructure import dashboard +#from tuskar_ui.infrastructure import dashboard class Service_Management(horizon.Panel): diff --git a/tuskar_ui/infrastructure/service_management/urls.py b/tuskar_ui/infrastructure/service_management/urls.py index 8d2a2fde..4c022cd0 100644 --- a/tuskar_ui/infrastructure/service_management/urls.py +++ b/tuskar_ui/infrastructure/service_management/urls.py @@ -17,7 +17,7 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from openstack_dashboard.dashboards.infrastructure. \ +from tuskar_ui.infrastructure. \ service_management.views import IndexView -- cgit v1.2.1