diff --git a/tuskar_ui/forms.py b/tuskar_ui/forms.py index d0091010e..4f397d28a 100644 --- a/tuskar_ui/forms.py +++ b/tuskar_ui/forms.py @@ -3,4 +3,3 @@ from django.forms import widgets class NumberInput(widgets.TextInput): input_type = 'number' - diff --git a/tuskar_ui/infrastructure/resource_management/flavors/tests.py b/tuskar_ui/infrastructure/resource_management/flavors/tests.py index deba53cd1..28a5f0f18 100644 --- a/tuskar_ui/infrastructure/resource_management/flavors/tests.py +++ b/tuskar_ui/infrastructure/resource_management/flavors/tests.py @@ -3,7 +3,7 @@ from django import http from mox import IsA from tuskar_ui import api as tuskar -from openstack_dashboard.test import helpers as test +from tuskar_ui.test import helpers as test class FlavorTemplatesTests(test.BaseAdminViewTests): diff --git a/tuskar_ui/infrastructure/resource_management/flavors/urls.py b/tuskar_ui/infrastructure/resource_management/flavors/urls.py index 11f010e05..af1bf3715 100644 --- a/tuskar_ui/infrastructure/resource_management/flavors/urls.py +++ b/tuskar_ui/infrastructure/resource_management/flavors/urls.py @@ -16,11 +16,16 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -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 +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$' diff --git a/tuskar_ui/infrastructure/resource_management/nodes/tests.py b/tuskar_ui/infrastructure/resource_management/nodes/tests.py index fb8743703..77b233657 100644 --- a/tuskar_ui/infrastructure/resource_management/nodes/tests.py +++ b/tuskar_ui/infrastructure/resource_management/nodes/tests.py @@ -4,7 +4,7 @@ from django import http from mox import IsA from tuskar_ui import api as tuskar -from openstack_dashboard.test import helpers as test +from tuskar_ui.test import helpers as test class ResourceViewTests(test.BaseAdminViewTests): diff --git a/tuskar_ui/infrastructure/resource_management/nodes/urls.py b/tuskar_ui/infrastructure/resource_management/nodes/urls.py index e134cfa1b..74cd9fabd 100644 --- a/tuskar_ui/infrastructure/resource_management/nodes/urls.py +++ b/tuskar_ui/infrastructure/resource_management/nodes/urls.py @@ -16,7 +16,8 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url from tuskar_ui.infrastructure.resource_management.nodes.views import DetailView -from tuskar_ui.infrastructure.resource_management.nodes.views import UnrackedView +from tuskar_ui.infrastructure.resource_management.nodes.views \ + import UnrackedView NODES = r'^(?P[^/]+)/%s$' diff --git a/tuskar_ui/infrastructure/resource_management/nodes/views.py b/tuskar_ui/infrastructure/resource_management/nodes/views.py index 93750b7b6..23dd16945 100644 --- a/tuskar_ui/infrastructure/resource_management/nodes/views.py +++ b/tuskar_ui/infrastructure/resource_management/nodes/views.py @@ -20,8 +20,10 @@ from horizon import tables from horizon import tabs from tuskar_ui import api as tuskar -from tuskar_ui.infrastructure.resource_management.nodes.tables import UnrackedNodesTable -from tuskar_ui.infrastructure.resource_management.nodes.tabs import NodeDetailTabs +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/racks/tests.py b/tuskar_ui/infrastructure/resource_management/racks/tests.py index 314c78469..3ec2ce5a9 100644 --- a/tuskar_ui/infrastructure/resource_management/racks/tests.py +++ b/tuskar_ui/infrastructure/resource_management/racks/tests.py @@ -15,9 +15,8 @@ from django import http from mox import IsA -from novaclient.v1_1.contrib import baremetal from tuskar_ui import api as tuskar -from openstack_dashboard.test import helpers as test +from tuskar_ui.test import helpers as test import base64 import tempfile diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py b/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py index 700bd00dd..bd4a5de49 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py @@ -21,7 +21,6 @@ from horizon import exceptions from horizon import tables from tuskar_ui import api as tuskar -import tuskar_ui.tables from tuskar_ui.forms import NumberInput from tuskar_ui.infrastructure. \ resource_management.flavors import tables as flavors_tables @@ -29,7 +28,7 @@ from tuskar_ui.infrastructure. \ resource_management.racks import tables as racks_tables from tuskar_ui.infrastructure. \ resource_management import resource_classes - +import tuskar_ui.tables LOG = logging.getLogger(__name__) diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py b/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py index 77ff347d3..6978e8b65 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py @@ -16,7 +16,7 @@ from django.core.urlresolvers import reverse from django import http from mox import IsA from tuskar_ui import api as tuskar -from openstack_dashboard.test import helpers as test +from tuskar_ui.test import helpers as test class ResourceClassViewTests(test.BaseAdminViewTests): @@ -55,7 +55,7 @@ class ResourceClassViewTests(test.BaseAdminViewTests): add_racks_ids = [] - api.tuskar.ResourceClass.list( + tuskar.ResourceClass.list( IsA(http.request.HttpRequest)).AndReturn( self.tuskar_resource_classes.list()) tuskar.ResourceClass.\ @@ -79,7 +79,7 @@ class ResourceClassViewTests(test.BaseAdminViewTests): ("%s?tab=resource_management_tabs__resource_classes_tab" % reverse("horizon:infrastructure:resource_management:index"))) - @test.create_stubs({api.tuskar.ResourceClass: ('get', 'list_flavors', + @test.create_stubs({tuskar.ResourceClass: ('get', 'list_flavors', 'racks_ids', 'all_racks', 'all_flavors')}) def test_edit_resource_class_get(self): @@ -194,7 +194,7 @@ class ResourceClassViewTests(test.BaseAdminViewTests): self.assertTemplateUsed(res, 'infrastructure/resource_management/resource_classes/detail.html') - @test.create_stubs({api.tuskar.ResourceClass: ('get', 'list_flavors', + @test.create_stubs({tuskar.ResourceClass: ('get', 'list_flavors', 'racks_ids', 'all_racks', 'all_flavors')}) def test_detail_edit_racks_get(self): @@ -263,7 +263,7 @@ class ResourceClassViewTests(test.BaseAdminViewTests): reverse(detail_url, args=(resource_class.id,))) self.assertRedirectsNoFollow(res, redirect_url) - @test.create_stubs({api.tuskar.ResourceClass: ('get', 'list_flavors', + @test.create_stubs({tuskar.ResourceClass: ('get', 'list_flavors', 'racks_ids', 'all_racks', 'all_flavors')}) def test_detail_edit_flavors_get(self): diff --git a/tuskar_ui/infrastructure/resource_management/tests.py b/tuskar_ui/infrastructure/resource_management/tests.py index 6522f1a2c..f9f135bb0 100644 --- a/tuskar_ui/infrastructure/resource_management/tests.py +++ b/tuskar_ui/infrastructure/resource_management/tests.py @@ -20,7 +20,7 @@ from django import http from mox import IsA from tuskar_ui import api as tuskar -from openstack_dashboard.test import helpers as test +from tuskar_ui.test import helpers as test class ResourceManagementTests(test.BaseAdminViewTests): diff --git a/tuskar_ui/test/api_tests/tuskar_tests.py b/tuskar_ui/test/api_tests/tuskar_tests.py index b8c3252ce..09d5897ec 100644 --- a/tuskar_ui/test/api_tests/tuskar_tests.py +++ b/tuskar_ui/test/api_tests/tuskar_tests.py @@ -18,13 +18,13 @@ from __future__ import absolute_import from novaclient.v1_1.contrib import baremetal -from openstack_dashboard.api.tuskar import Capacity -from openstack_dashboard.api.tuskar import Flavor -from openstack_dashboard.api.tuskar import FlavorTemplate -from openstack_dashboard.api.tuskar import Node -from openstack_dashboard.api.tuskar import Rack -from openstack_dashboard.api.tuskar import ResourceClass -from openstack_dashboard.test import helpers as test +from tuskar_ui.api import Capacity +from tuskar_ui.api import Flavor +from tuskar_ui.api import FlavorTemplate +from tuskar_ui.api import Node +from tuskar_ui.api import Rack +from tuskar_ui.api import ResourceClass +from tuskar_ui.test import helpers as test class TuskarApiTests(test.APITestCase): diff --git a/tuskar_ui/test/helpers.py b/tuskar_ui/test/helpers.py index 76572dae8..fdc676e42 100644 --- a/tuskar_ui/test/helpers.py +++ b/tuskar_ui/test/helpers.py @@ -51,7 +51,8 @@ from horizon.test import helpers as horizon_helpers from openstack_dashboard import api from openstack_dashboard import context_processors -from openstack_dashboard.test.test_data.utils import load_test_data +from tuskar_ui import api as tuskar_api +from tuskar_ui.test.test_data.utils import load_test_data # Makes output of failing mox tests much easier to read. @@ -263,8 +264,8 @@ class APITestCase(TestCase): self._original_neutronclient = api.neutron.neutronclient self._original_cinderclient = api.cinder.cinderclient self._original_heatclient = api.heat.heatclient - self._original_tuskarclient = api.tuskar.tuskarclient - self._original_baremetalclient = api.tuskar.baremetalclient + self._original_tuskarclient = tuskar_api.tuskarclient + self._original_baremetalclient = tuskar_api.baremetalclient # Replace the clients with our stubs. api.glance.glanceclient = lambda request: self.stub_glanceclient() @@ -273,8 +274,8 @@ class APITestCase(TestCase): api.neutron.neutronclient = lambda request: self.stub_neutronclient() api.cinder.cinderclient = lambda request: self.stub_cinderclient() api.heat.heatclient = lambda request: self.stub_heatclient() - api.tuskar.tuskarclient = lambda request: self.stub_tuskarclient() - api.tuskar.baremetalclient = lambda request:\ + tuskar_api.tuskarclient = lambda request: self.stub_tuskarclient() + tuskar_api.baremetalclient = lambda request:\ self.stub_baremetalclient() def tearDown(self): @@ -285,8 +286,8 @@ class APITestCase(TestCase): api.neutron.neutronclient = self._original_neutronclient api.cinder.cinderclient = self._original_cinderclient api.heat.heatclient = self._original_heatclient - api.tuskar.tuskarclient = self._original_tuskarclient - api.tuskar.baremetalclient = self._original_baremetalclient + tuskar_api.tuskarclient = self._original_tuskarclient + tuskar_api.baremetalclient = self._original_baremetalclient def stub_novaclient(self): if not hasattr(self, "novaclient"): diff --git a/tuskar_ui/test/test_data/tuskar_data.py b/tuskar_ui/test/test_data/tuskar_data.py index 587f5fac2..94d7e38f7 100644 --- a/tuskar_ui/test/test_data/tuskar_data.py +++ b/tuskar_ui/test/test_data/tuskar_data.py @@ -12,12 +12,12 @@ from collections import namedtuple -from openstack_dashboard.api.tuskar import Capacity -from openstack_dashboard.api.tuskar import Flavor -from openstack_dashboard.api.tuskar import FlavorTemplate -from openstack_dashboard.api.tuskar import Node -from openstack_dashboard.api.tuskar import Rack -from openstack_dashboard.api.tuskar import ResourceClass +from tuskar_ui.api import Capacity +from tuskar_ui.api import Flavor +from tuskar_ui.api import FlavorTemplate +from tuskar_ui.api import Node +from tuskar_ui.api import Rack +from tuskar_ui.api import ResourceClass from openstack_dashboard.test.test_data.utils import TestDataContainer diff --git a/tuskar_ui/test/test_data/utils.py b/tuskar_ui/test/test_data/utils.py index 3509cd651..297804569 100644 --- a/tuskar_ui/test/test_data/utils.py +++ b/tuskar_ui/test/test_data/utils.py @@ -22,7 +22,7 @@ def load_test_data(load_onto=None): 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 - from openstack_dashboard.test.test_data import tuskar_data + from tuskar_ui.test.test_data import tuskar_data # The order of these loaders matters, some depend on others. loaders = (exceptions.data, diff --git a/tuskar_ui/workflows.py b/tuskar_ui/workflows.py index 45993887a..8c44e09bc 100644 --- a/tuskar_ui/workflows.py +++ b/tuskar_ui/workflows.py @@ -14,28 +14,13 @@ # License for the specific language governing permissions and limitations # under the License. -import copy -import inspect import logging -from django.core import urlresolvers -from django import forms -from django.forms.forms import NON_FIELD_ERRORS from django import template -from django.template.defaultfilters import linebreaks -from django.template.defaultfilters import safe -from django.template.defaultfilters import slugify -from django.utils.encoding import force_unicode -from django.utils.importlib import import_module -from django.utils.translation import ugettext_lazy as _ # FIXME: TableStep from django.utils.datastructures import SortedDict -from horizon import base -from horizon import exceptions -from horizon.templatetags.horizon import has_permissions -from horizon.utils import html import horizon.workflows