Remove load url from future and fix gate
1.The "load url from future" must be removed for Django 1.9 support, and isn't needed in Django 1.8. This patch fixes that to allow Django 1.9 to work. 2.import helpers and settings from horizon instead of rewrite it again, this make watcher-dashboard always keep the latest settings and helpers from horizon. Co-Authored-By: zhurong <aaronzhu1121@gmail.com> Change-Id: I82dc5f1fdb3c1957019534c1e0e20c0f5ee3e975
This commit is contained in:
Yumeng Bao
zhurong
parent
078d3577c8
commit
4bbc0d17bf
@ -416,7 +416,7 @@ class Goal(base.APIDictWrapper):
|
||||
"""Goal resource."""
|
||||
|
||||
_attrs = ('uuid', 'name', 'display_name', 'created_at',
|
||||
'updated_at', 'deleted_at')
|
||||
'updated_at', 'deleted_at', 'efficacy_specifications')
|
||||
|
||||
def __init__(self, apiresource, request=None):
|
||||
super(Goal, self).__init__(apiresource)
|
||||
|
||||
@ -51,12 +51,14 @@ class GoalsTest(test.BaseAdminViewTests):
|
||||
self.assertMessageCount(resp, error=1, warning=0)
|
||||
|
||||
@test.create_stubs({api.watcher.Goal: ('get',)})
|
||||
@test.create_stubs({api.watcher.Strategy: ('list',)})
|
||||
def test_details(self):
|
||||
goal = self.goals.first()
|
||||
goal_id = goal.uuid
|
||||
api.watcher.Goal.get(
|
||||
IsA(http.HttpRequest), goal_id).MultipleTimes().AndReturn(goal)
|
||||
self.mox.ReplayAll()
|
||||
|
||||
DETAILS_URL = urlresolvers.reverse(DETAILS_VIEW, args=[goal_id])
|
||||
res = self.client.get(DETAILS_URL)
|
||||
self.assertTemplateUsed(res, 'infra_optim/goals/details.html')
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{% load i18n %}
|
||||
{% load url from future%}
|
||||
|
||||
{% if meter_conf %}
|
||||
<div class="nodes">
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{% load i18n sizeformat %}
|
||||
{% load url from future %}
|
||||
|
||||
<h3>{% trans "Action Plan Overview" %}</h3>
|
||||
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{% extends 'infra_optim/base.html' %}
|
||||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
{% block title %}{% trans 'Action Plans' %}{% endblock %}
|
||||
|
||||
{% block page_header %}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{% extends 'infra_optim/base.html' %}
|
||||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
{% block title %}{% trans 'Actions' %}{% endblock %}
|
||||
|
||||
{% block page_header %}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{% extends 'infra_optim/base.html' %}
|
||||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
{% block title %}{% trans 'Audits' %}{% endblock %}
|
||||
|
||||
{% block page_header %}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{% extends 'infra_optim/base.html' %}
|
||||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
{% block title %}{% trans 'Audit Templates' %}{% endblock %}
|
||||
|
||||
{% block page_header %}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{% extends 'infra_optim/base.html' %}
|
||||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
{% block title %}{% trans 'Audits' %}{% endblock %}
|
||||
|
||||
{% block page_header %}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{% extends 'infra_optim/base.html' %}
|
||||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
{% block title %}{% trans 'Goals' %}{% endblock %}
|
||||
|
||||
{% block page_header %}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{% extends 'infra_optim/base.html' %}
|
||||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
{% block title %}{% trans 'Strategies' %}{% endblock %}
|
||||
|
||||
{% block page_header %}
|
||||
|
||||
@ -16,498 +16,45 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import collections
|
||||
import copy
|
||||
from functools import wraps
|
||||
import importlib
|
||||
import json
|
||||
import os
|
||||
import unittest
|
||||
|
||||
from django.conf import settings
|
||||
from django.contrib.messages.storage import default_storage # noqa
|
||||
from django.core.handlers import wsgi
|
||||
from django.core import urlresolvers
|
||||
from django.test.client import RequestFactory # noqa
|
||||
from django.test import utils as django_test_utils
|
||||
from horizon import base
|
||||
from horizon import conf
|
||||
from horizon.test import helpers as horizon_helpers
|
||||
import httplib2
|
||||
from keystoneclient.v2_0 import client as keystone_client
|
||||
import mock
|
||||
from mox3 import mox
|
||||
from openstack_auth import user
|
||||
from openstack_auth import utils
|
||||
from openstack_dashboard import api
|
||||
from openstack_dashboard import context_processors
|
||||
from watcherclient import client as watcherclient
|
||||
|
||||
from watcher_dashboard import api as wapi
|
||||
from watcher_dashboard.test.test_data import utils as test_utils
|
||||
from openstack_dashboard.test import helpers
|
||||
|
||||
|
||||
# Makes output of failing mox tests much easier to read.
|
||||
wsgi.WSGIRequest.__repr__ = lambda self: "<class 'django.http.HttpRequest'>"
|
||||
from watcher_dashboard import api
|
||||
from watcher_dashboard.test.test_data import utils
|
||||
|
||||
|
||||
def create_stubs(stubs_to_create={}):
|
||||
"""decorator to simplify setting up multiple stubs at once via mox
|
||||
|
||||
:param stubs_to_create: methods to stub in one or more modules
|
||||
:type stubs_to_create: dict
|
||||
|
||||
The keys are python paths to the module containing the methods to mock.
|
||||
|
||||
To mock a method in openstack_dashboard/api/nova.py, the key is::
|
||||
|
||||
api.nova
|
||||
|
||||
The values are either a tuple of list of methods to mock in the module
|
||||
indicated by the key.
|
||||
|
||||
For example::
|
||||
|
||||
('server_list',)
|
||||
-or-
|
||||
('flavor_list', 'server_list',)
|
||||
-or-
|
||||
['flavor_list', 'server_list']
|
||||
|
||||
Additionally, multiple modules can be mocked at once::
|
||||
|
||||
{
|
||||
api.nova: ('flavor_list', 'server_list'),
|
||||
api.glance: ('image_list_detailed',),
|
||||
}
|
||||
|
||||
"""
|
||||
|
||||
if not isinstance(stubs_to_create, dict):
|
||||
raise TypeError("create_stub must be passed a dict, but a %s was "
|
||||
"given." % type(stubs_to_create).__name__)
|
||||
|
||||
def inner_stub_out(fn):
|
||||
@wraps(fn)
|
||||
def instance_stub_out(self, *args, **kwargs):
|
||||
for key in stubs_to_create:
|
||||
if not (isinstance(stubs_to_create[key], tuple) or
|
||||
isinstance(stubs_to_create[key], list)):
|
||||
raise TypeError("The values of the create_stub "
|
||||
"dict must be lists or tuples, but "
|
||||
"is a %s."
|
||||
% type(stubs_to_create[key]).__name__)
|
||||
|
||||
for value in stubs_to_create[key]:
|
||||
self.mox.StubOutWithMock(key, value)
|
||||
return fn(self, *args, **kwargs)
|
||||
return instance_stub_out
|
||||
return inner_stub_out
|
||||
return helpers.create_stubs(stubs_to_create)
|
||||
|
||||
|
||||
class RequestFactoryWithMessages(RequestFactory):
|
||||
def get(self, *args, **kwargs):
|
||||
req = super(RequestFactoryWithMessages, self).get(*args, **kwargs)
|
||||
req.user = utils.get_user(req)
|
||||
req.session = []
|
||||
req._messages = default_storage(req)
|
||||
return req
|
||||
|
||||
def post(self, *args, **kwargs):
|
||||
req = super(RequestFactoryWithMessages, self).post(*args, **kwargs)
|
||||
req.user = utils.get_user(req)
|
||||
req.session = []
|
||||
req._messages = default_storage(req)
|
||||
return req
|
||||
|
||||
|
||||
@unittest.skipIf(os.environ.get('SKIP_UNITTESTS', False),
|
||||
"The SKIP_UNITTESTS env variable is set.")
|
||||
class TestCase(horizon_helpers.TestCase):
|
||||
"""Specialized base test case class for Horizon.
|
||||
|
||||
It gives access to numerous additional features:
|
||||
|
||||
* A full suite of test data through various attached objects and
|
||||
managers (e.g. ``self.servers``, ``self.user``, etc.). See the
|
||||
docs for
|
||||
:class:`~openstack_dashboard.test.test_data.utils.TestData`
|
||||
for more information.
|
||||
* The ``mox`` mocking framework via ``self.mox``.
|
||||
* A set of request context data via ``self.context``.
|
||||
* A ``RequestFactory`` class which supports Django's ``contrib.messages``
|
||||
framework via ``self.factory``.
|
||||
* A ready-to-go request object via ``self.request``.
|
||||
* The ability to override specific time data controls for easier testing.
|
||||
* Several handy additional assertion methods.
|
||||
"""
|
||||
def setUp(self):
|
||||
def fake_conn_request(*args, **kwargs):
|
||||
raise Exception("An external URI request tried to escape through "
|
||||
"an httplib2 client. Args: %s, kwargs: %s"
|
||||
% (args, kwargs))
|
||||
|
||||
self._real_conn_request = httplib2.Http._conn_request
|
||||
httplib2.Http._conn_request = fake_conn_request
|
||||
|
||||
self._real_context_processor = context_processors.openstack
|
||||
context_processors.openstack = lambda request: self.context
|
||||
|
||||
self.patchers = {}
|
||||
self.add_panel_mocks()
|
||||
|
||||
super(TestCase, self).setUp()
|
||||
|
||||
class WatcherTestsMixin(object):
|
||||
def _setup_test_data(self):
|
||||
super(TestCase, self)._setup_test_data()
|
||||
test_utils.load_test_data(self)
|
||||
self.context = {'authorized_tenants': self.tenants.list()}
|
||||
|
||||
def _setup_factory(self):
|
||||
# For some magical reason we need a copy of this here.
|
||||
self.factory = RequestFactoryWithMessages()
|
||||
|
||||
def _setup_user(self):
|
||||
self._real_get_user = utils.get_user
|
||||
tenants = self.context['authorized_tenants']
|
||||
self.set_active_user(
|
||||
id=self.user.id,
|
||||
token=self.token,
|
||||
username=self.user.name,
|
||||
domain_id=self.domain.id,
|
||||
tenant_id=self.tenant.id,
|
||||
service_catalog=self.service_catalog,
|
||||
authorized_tenants=tenants)
|
||||
|
||||
def _setup_request(self):
|
||||
super(TestCase, self)._setup_request()
|
||||
self.request.session['token'] = self.token.id
|
||||
|
||||
def add_panel_mocks(self):
|
||||
"""Global mocks on panels that get called on all views."""
|
||||
self.patchers['aggregates'] = mock.patch(
|
||||
'openstack_dashboard.dashboards.admin'
|
||||
'.aggregates.panel.Aggregates.can_access',
|
||||
mock.Mock(return_value=True))
|
||||
self.patchers['aggregates'].start()
|
||||
|
||||
def tearDown(self):
|
||||
httplib2.Http._conn_request = self._real_conn_request
|
||||
context_processors.openstack = self._real_context_processor
|
||||
utils.get_user = self._real_get_user
|
||||
mock.patch.stopall()
|
||||
super(TestCase, self).tearDown()
|
||||
|
||||
def set_active_user(self, id=None, token=None, username=None,
|
||||
tenant_id=None, service_catalog=None, tenant_name=None,
|
||||
roles=None, authorized_tenants=None, enabled=True,
|
||||
domain_id=None):
|
||||
def get_user(request):
|
||||
return user.User(id=id,
|
||||
token=token,
|
||||
user=username,
|
||||
domain_id=domain_id,
|
||||
tenant_id=tenant_id,
|
||||
service_catalog=service_catalog,
|
||||
roles=roles,
|
||||
enabled=enabled,
|
||||
authorized_tenants=authorized_tenants,
|
||||
endpoint=settings.OPENSTACK_KEYSTONE_URL)
|
||||
utils.get_user = get_user
|
||||
|
||||
def assertRedirectsNoFollow(self, response, expected_url):
|
||||
"""Check for redirect.
|
||||
|
||||
Asserts that the given response issued a 302 redirect without
|
||||
processing the view which is redirected to.
|
||||
"""
|
||||
assert (300 <= response.status_code < 400), \
|
||||
"The response did not return a redirect."
|
||||
self.assertEqual(response._headers.get('location', None),
|
||||
('Location', settings.TESTSERVER + expected_url))
|
||||
self.assertEqual(response.status_code, 302)
|
||||
|
||||
def assertNoFormErrors(self, response, context_name="form"):
|
||||
"""Checks for no form errors.
|
||||
|
||||
Asserts that the response either does not contain a form in its
|
||||
context, or that if it does, that form has no errors.
|
||||
"""
|
||||
context = getattr(response, "context", {})
|
||||
if not context or context_name not in context:
|
||||
return True
|
||||
errors = response.context[context_name]._errors
|
||||
assert len(errors) == 0, \
|
||||
"Unexpected errors were found on the form: %s" % errors
|
||||
|
||||
def assertFormErrors(self, response, count=0, message=None,
|
||||
context_name="form"):
|
||||
"""Check for form errors.
|
||||
|
||||
Asserts that the response does contain a form in its
|
||||
context, and that form has errors, if count were given,
|
||||
it must match the exact numbers of errors
|
||||
"""
|
||||
context = getattr(response, "context", {})
|
||||
assert (context and context_name in context), \
|
||||
"The response did not contain a form."
|
||||
errors = response.context[context_name]._errors
|
||||
if count:
|
||||
assert len(errors) == count, \
|
||||
"%d errors were found on the form, %d expected" % \
|
||||
(len(errors), count)
|
||||
if message and message not in str(errors):
|
||||
self.fail("Expected message not found, instead found: %s"
|
||||
% ["%s: %s" % (key, [e for e in field_errors]) for
|
||||
(key, field_errors) in errors.items()])
|
||||
else:
|
||||
assert len(errors) > 0, "No errors were found on the form"
|
||||
|
||||
def assertStatusCode(self, response, expected_code):
|
||||
"""Validates an expected status code.
|
||||
|
||||
Matches camel case of other assert functions
|
||||
"""
|
||||
if response.status_code == expected_code:
|
||||
return
|
||||
self.fail('status code %r != %r: %s' % (response.status_code,
|
||||
expected_code,
|
||||
response.content))
|
||||
|
||||
def assertItemsCollectionEqual(self, response, items_list):
|
||||
self.assertEqual(response.content,
|
||||
'{"items": ' + json.dumps(items_list) + "}")
|
||||
|
||||
@staticmethod
|
||||
def mock_rest_request(**args):
|
||||
mock_args = {
|
||||
'user.is_authenticated.return_value': True,
|
||||
'is_ajax.return_value': True,
|
||||
'policy.check.return_value': True,
|
||||
'body': ''
|
||||
}
|
||||
mock_args.update(args)
|
||||
return mock.Mock(**mock_args)
|
||||
super(WatcherTestsMixin, self)._setup_test_data()
|
||||
utils.load_test_data(self)
|
||||
|
||||
|
||||
class BaseAdminViewTests(TestCase):
|
||||
"""Sets an active user with the "admin" role.
|
||||
|
||||
For testing admin-only views and functionality.
|
||||
"""
|
||||
def set_active_user(self, *args, **kwargs):
|
||||
if "roles" not in kwargs:
|
||||
kwargs['roles'] = [self.roles.admin._info]
|
||||
super(BaseAdminViewTests, self).set_active_user(*args, **kwargs)
|
||||
|
||||
def set_session_values(self, **kwargs):
|
||||
settings.SESSION_ENGINE = 'django.contrib.sessions.backends.file'
|
||||
engine = importlib.import_module(settings.SESSION_ENGINE)
|
||||
store = engine.SessionStore()
|
||||
for key in kwargs:
|
||||
store[key] = kwargs[key]
|
||||
self.request.session[key] = kwargs[key]
|
||||
store.save()
|
||||
self.session = store
|
||||
self.client.cookies[settings.SESSION_COOKIE_NAME] = store.session_key
|
||||
class TestCase(WatcherTestsMixin, helpers.TestCase):
|
||||
pass
|
||||
|
||||
|
||||
class APITestCase(TestCase):
|
||||
"""Testing APIs.
|
||||
|
||||
For use with tests which deal with the underlying clients rather than
|
||||
stubbing out the openstack_dashboard.api.* methods.
|
||||
"""
|
||||
class APITestCase(WatcherTestsMixin, helpers.APITestCase):
|
||||
def setUp(self):
|
||||
super(APITestCase, self).setUp()
|
||||
utils.patch_middleware_get_user()
|
||||
|
||||
def fake_keystoneclient(request, admin=False):
|
||||
"""Returns the stub keystoneclient.
|
||||
self._original_watcherclient = api.watcher.watcherclient
|
||||
|
||||
Only necessary because the function takes too many arguments to
|
||||
conveniently be a lambda.
|
||||
"""
|
||||
return self.stub_keystoneclient()
|
||||
|
||||
# Store the original clients
|
||||
self._original_watcherclient = wapi.watcher.watcherclient
|
||||
self._original_keystoneclient = api.keystone.keystoneclient
|
||||
|
||||
# Replace the clients with our stubs.
|
||||
wapi.watcher.watcherclient = lambda request: self.stub_watcherclient()
|
||||
api.keystone.keystoneclient = fake_keystoneclient
|
||||
api.watcher.watcherclient = lambda request: self.stub_watcherclient()
|
||||
|
||||
def tearDown(self):
|
||||
super(APITestCase, self).tearDown()
|
||||
wapi.watcher.watcherclient = self._original_watcherclient
|
||||
api.keystone.keystoneclient = self._original_keystoneclient
|
||||
|
||||
def stub_keystoneclient(self):
|
||||
if not hasattr(self, "keystoneclient"):
|
||||
self.mox.StubOutWithMock(keystone_client, 'Client')
|
||||
# NOTE(saschpe): Mock properties, MockObject.__init__ ignores them:
|
||||
keystone_client.Client.auth_token = 'foo'
|
||||
keystone_client.Client.service_catalog = None
|
||||
keystone_client.Client.tenant_id = '1'
|
||||
keystone_client.Client.tenant_name = 'tenant_1'
|
||||
keystone_client.Client.management_url = ""
|
||||
keystone_client.Client.__dir__ = lambda: []
|
||||
self.keystoneclient = self.mox.CreateMock(keystone_client.Client)
|
||||
return self.keystoneclient
|
||||
api.watcher.watcherclient = self._original_watcherclient
|
||||
|
||||
def stub_watcherclient(self):
|
||||
if not hasattr(self, "watcherclient"):
|
||||
self.mox.StubOutWithMock(watcherclient, 'Client')
|
||||
self.watcherclient = self.mox.CreateMock(watcherclient.Client)
|
||||
self.watcherclient = mock.Mock()
|
||||
return self.watcherclient
|
||||
|
||||
|
||||
@unittest.skipUnless(os.environ.get('WITH_SELENIUM', False),
|
||||
"The WITH_SELENIUM env variable is not set.")
|
||||
class SeleniumTestCase(horizon_helpers.SeleniumTestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(SeleniumTestCase, self).setUp()
|
||||
|
||||
test_utils.load_test_data(self)
|
||||
self.mox = mox.Mox()
|
||||
|
||||
self._real_get_user = utils.get_user
|
||||
self.set_active_user(id=self.user.id,
|
||||
token=self.token,
|
||||
username=self.user.name,
|
||||
tenant_id=self.tenant.id,
|
||||
service_catalog=self.service_catalog,
|
||||
authorized_tenants=self.tenants.list())
|
||||
self.patchers = {}
|
||||
self.patchers['aggregates'] = mock.patch(
|
||||
'openstack_dashboard.dashboards.admin'
|
||||
'.aggregates.panel.Aggregates.can_access',
|
||||
mock.Mock(return_value=True))
|
||||
self.patchers['aggregates'].start()
|
||||
os.environ["HORIZON_TEST_RUN"] = "True"
|
||||
|
||||
def tearDown(self):
|
||||
super(SeleniumTestCase, self).tearDown()
|
||||
self.mox.UnsetStubs()
|
||||
utils.get_user = self._real_get_user
|
||||
mock.patch.stopall()
|
||||
self.mox.VerifyAll()
|
||||
del os.environ["HORIZON_TEST_RUN"]
|
||||
|
||||
def set_active_user(self, id=None, token=None, username=None,
|
||||
tenant_id=None, service_catalog=None, tenant_name=None,
|
||||
roles=None, authorized_tenants=None, enabled=True):
|
||||
def get_user(request):
|
||||
return user.User(id=id,
|
||||
token=token,
|
||||
user=username,
|
||||
tenant_id=tenant_id,
|
||||
service_catalog=service_catalog,
|
||||
roles=roles,
|
||||
enabled=enabled,
|
||||
authorized_tenants=authorized_tenants,
|
||||
endpoint=settings.OPENSTACK_KEYSTONE_URL)
|
||||
utils.get_user = get_user
|
||||
|
||||
|
||||
class SeleniumAdminTestCase(SeleniumTestCase):
|
||||
"""Version of AdminTestCase for Selenium.
|
||||
|
||||
Sets an active user with the "admin" role for testing admin-only views and
|
||||
functionality.
|
||||
"""
|
||||
def set_active_user(self, *args, **kwargs):
|
||||
if "roles" not in kwargs:
|
||||
kwargs['roles'] = [self.roles.admin._info]
|
||||
super(SeleniumAdminTestCase, self).set_active_user(*args, **kwargs)
|
||||
|
||||
|
||||
def my_custom_sort(flavor):
|
||||
sort_order = {
|
||||
'm1.secret': 0,
|
||||
'm1.tiny': 1,
|
||||
'm1.massive': 2,
|
||||
'm1.metadata': 3,
|
||||
}
|
||||
return sort_order[flavor.name]
|
||||
|
||||
|
||||
class PluginTestCase(TestCase):
|
||||
"""Test case for testing plugin system of Horizon.
|
||||
|
||||
For use with tests which deal with the pluggable dashboard and panel
|
||||
configuration, it takes care of backing up and restoring the Horizon
|
||||
configuration.
|
||||
"""
|
||||
def setUp(self):
|
||||
super(PluginTestCase, self).setUp()
|
||||
self.old_horizon_config = conf.HORIZON_CONFIG
|
||||
conf.HORIZON_CONFIG = conf.LazySettings()
|
||||
base.Horizon._urls()
|
||||
# Store our original dashboards
|
||||
self._discovered_dashboards = base.Horizon._registry.keys()
|
||||
# Gather up and store our original panels for each dashboard
|
||||
self._discovered_panels = {}
|
||||
for dash in self._discovered_dashboards:
|
||||
panels = base.Horizon._registry[dash]._registry.keys()
|
||||
self._discovered_panels[dash] = panels
|
||||
|
||||
def tearDown(self):
|
||||
super(PluginTestCase, self).tearDown()
|
||||
conf.HORIZON_CONFIG = self.old_horizon_config
|
||||
# Destroy our singleton and re-create it.
|
||||
base.HorizonSite._instance = None
|
||||
del base.Horizon
|
||||
base.Horizon = base.HorizonSite()
|
||||
# Reload the convenience references to Horizon stored in __init__
|
||||
reload(importlib.import_module("horizon"))
|
||||
# Re-register our original dashboards and panels.
|
||||
# This is necessary because autodiscovery only works on the first
|
||||
# import, and calling reload introduces innumerable additional
|
||||
# problems. Manual re-registration is the only good way for testing.
|
||||
for dash in self._discovered_dashboards:
|
||||
base.Horizon.register(dash)
|
||||
for panel in self._discovered_panels[dash]:
|
||||
dash.register(panel)
|
||||
self._reload_urls()
|
||||
|
||||
def _reload_urls(self):
|
||||
"""CLeans up URLs.
|
||||
|
||||
Clears out the URL caches, reloads the root urls module, and
|
||||
re-triggers the autodiscovery mechanism for Horizon. Allows URLs
|
||||
to be re-calculated after registering new dashboards. Useful
|
||||
only for testing and should never be used on a live site.
|
||||
"""
|
||||
urlresolvers.clear_url_caches()
|
||||
reload(importlib.import_module(settings.ROOT_URLCONF))
|
||||
base.Horizon._urls()
|
||||
|
||||
|
||||
class update_settings(django_test_utils.override_settings):
|
||||
"""override_settings which allows override an item in dict.
|
||||
|
||||
django original override_settings replaces a dict completely,
|
||||
however OpenStack dashboard setting has many dictionary configuration
|
||||
and there are test case where we want to override only one item in
|
||||
a dictionary and keep other items in the dictionary.
|
||||
This version of override_settings allows this if keep_dict is True.
|
||||
|
||||
If keep_dict False is specified, the original behavior of
|
||||
Django override_settings is used.
|
||||
"""
|
||||
|
||||
def __init__(self, keep_dict=True, **kwargs):
|
||||
if keep_dict:
|
||||
for key, new_value in kwargs.items():
|
||||
value = getattr(settings, key, None)
|
||||
if (isinstance(new_value, collections.Mapping) and
|
||||
isinstance(value, collections.Mapping)):
|
||||
copied = copy.copy(value)
|
||||
copied.update(new_value)
|
||||
kwargs[key] = copied
|
||||
super(update_settings, self).__init__(**kwargs)
|
||||
class BaseAdminViewTests(WatcherTestsMixin, helpers.BaseAdminViewTests):
|
||||
pass
|
||||
|
||||
@ -11,46 +11,8 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import importlib
|
||||
import os
|
||||
import six
|
||||
|
||||
from django.utils.translation import pgettext_lazy
|
||||
from horizon.test.settings import * # noqa
|
||||
from horizon.utils import secret_key
|
||||
from openstack_dashboard import exceptions
|
||||
from openstack_dashboard import theme_settings
|
||||
from openstack_dashboard.utils import settings as settings_utils
|
||||
|
||||
DEBUG = True
|
||||
TEMPLATE_DEBUG = DEBUG
|
||||
|
||||
TEST_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
ROOT_PATH = os.path.abspath(os.path.join(TEST_DIR, ".."))
|
||||
|
||||
MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media'))
|
||||
MEDIA_URL = '/media/'
|
||||
STATIC_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'static'))
|
||||
STATIC_URL = '/static/'
|
||||
|
||||
SECRET_KEY = secret_key.generate_or_read_from_file(
|
||||
os.path.join(TEST_DIR, '.secret_key_store'))
|
||||
ROOT_URLCONF = 'watcher_dashboard.test.urls'
|
||||
TEMPLATE_DIRS = (
|
||||
os.path.join(TEST_DIR, 'templates'),
|
||||
)
|
||||
|
||||
STATICFILES_FINDERS = (
|
||||
'django.contrib.staticfiles.finders.FileSystemFinder',
|
||||
'horizon.contrib.staticfiles.finders.HorizonStaticFinder',
|
||||
'compressor.finders.CompressorFinder',
|
||||
)
|
||||
|
||||
COMPRESS_ENABLED = False
|
||||
|
||||
TEMPLATE_CONTEXT_PROCESSORS = (
|
||||
'openstack_dashboard.context_processors.openstack',
|
||||
)
|
||||
from openstack_dashboard.test.settings import * # noqa
|
||||
|
||||
INSTALLED_APPS = (
|
||||
'django.contrib.contenttypes',
|
||||
@ -64,191 +26,18 @@ INSTALLED_APPS = (
|
||||
'compressor',
|
||||
'horizon',
|
||||
'openstack_dashboard',
|
||||
'openstack_dashboard.dashboards',
|
||||
)
|
||||
|
||||
AUTHENTICATION_BACKENDS = ('openstack_auth.backend.KeystoneBackend',)
|
||||
|
||||
SITE_BRANDING = 'OpenStack'
|
||||
|
||||
HORIZON_CONFIG = {
|
||||
"password_validator": {
|
||||
"regex": '^.{8,18}$',
|
||||
"help_text": "Password must be between 8 and 18 characters."
|
||||
},
|
||||
'user_home': None,
|
||||
'help_url': "http://docs.openstack.org",
|
||||
'exceptions': {'recoverable': exceptions.RECOVERABLE,
|
||||
'not_found': exceptions.NOT_FOUND,
|
||||
'unauthorized': exceptions.UNAUTHORIZED},
|
||||
'angular_modules': [],
|
||||
'js_files': [],
|
||||
}
|
||||
|
||||
# ### THEMING ### #
|
||||
|
||||
# Deprecated Theme Settings
|
||||
CUSTOM_THEME_PATH = None
|
||||
DEFAULT_THEME_PATH = None
|
||||
# The default theme if no cookie is present
|
||||
DEFAULT_THEME = 'default'
|
||||
# Theme Static Directory
|
||||
THEME_COLLECTION_DIR = 'themes'
|
||||
|
||||
AVAILABLE_THEMES = [
|
||||
(
|
||||
'default',
|
||||
pgettext_lazy('Default style theme', 'Default'),
|
||||
'themes/default'
|
||||
), (
|
||||
'material',
|
||||
pgettext_lazy("Google's Material Design style theme", "Material"),
|
||||
'themes/material'
|
||||
),
|
||||
]
|
||||
|
||||
AVAILABLE_THEMES, DEFAULT_THEME = theme_settings.get_available_themes(
|
||||
AVAILABLE_THEMES,
|
||||
CUSTOM_THEME_PATH,
|
||||
DEFAULT_THEME_PATH,
|
||||
DEFAULT_THEME
|
||||
)
|
||||
|
||||
# Dictionary of currently available angular features
|
||||
ANGULAR_FEATURES = {
|
||||
'images_panel': False,
|
||||
'flavors_panel': False,
|
||||
}
|
||||
|
||||
# Notice all customizable configurations should be above this line
|
||||
XSTATIC_MODULES = settings_utils.BASE_XSTATIC_MODULES
|
||||
|
||||
# Discover all the directories that contain static files; at the same time
|
||||
# discover all the xstatic module entry points to embed in our HTML
|
||||
STATICFILES_DIRS = settings_utils.get_xstatic_dirs(
|
||||
XSTATIC_MODULES, HORIZON_CONFIG)
|
||||
STATICFILES_DIRS += theme_settings.get_theme_static_dirs(
|
||||
AVAILABLE_THEMES, THEME_COLLECTION_DIR, ROOT_PATH)
|
||||
|
||||
|
||||
# populate HORIZON_CONFIG with auto-discovered JavaScript sources, mock files,
|
||||
# specs files and external templates.
|
||||
settings_utils.find_static_files(HORIZON_CONFIG, AVAILABLE_THEMES,
|
||||
THEME_COLLECTION_DIR, ROOT_PATH)
|
||||
|
||||
# ############## #
|
||||
|
||||
|
||||
# Load the pluggable dashboard settings
|
||||
dashboard_module_names = [
|
||||
'openstack_dashboard.enabled',
|
||||
'openstack_dashboard.local.enabled',
|
||||
'watcher_dashboard.local.enabled',
|
||||
]
|
||||
dashboard_modules = []
|
||||
# All dashboards must be enabled for the namespace to get registered, which is
|
||||
# needed by the unit tests.
|
||||
for module_name in dashboard_module_names:
|
||||
module = importlib.import_module(module_name)
|
||||
dashboard_modules.append(module)
|
||||
for submodule in six.itervalues(settings_utils.import_submodules(module)):
|
||||
if getattr(submodule, 'DISABLED', None):
|
||||
delattr(submodule, 'DISABLED')
|
||||
import openstack_dashboard.enabled
|
||||
import watcher_dashboard.local.enabled
|
||||
|
||||
INSTALLED_APPS = list(INSTALLED_APPS) # Make sure it's mutable
|
||||
settings_utils.update_dashboards(
|
||||
dashboard_modules,
|
||||
HORIZON_CONFIG, INSTALLED_APPS
|
||||
[
|
||||
watcher_dashboard.local.enabled,
|
||||
openstack_dashboard.enabled,
|
||||
],
|
||||
HORIZON_CONFIG,
|
||||
INSTALLED_APPS,
|
||||
)
|
||||
|
||||
# Set to True to allow users to upload images to glance via Horizon server.
|
||||
# When enabled, a file form field will appear on the create image form.
|
||||
# See documentation for deployment considerations.
|
||||
HORIZON_IMAGES_ALLOW_UPLOAD = True
|
||||
|
||||
AVAILABLE_REGIONS = [
|
||||
('http://localhost:5000/v2.0', 'local'),
|
||||
('http://remote:5000/v2.0', 'remote'),
|
||||
]
|
||||
|
||||
OPENSTACK_API_VERSIONS = {
|
||||
"identity": 3
|
||||
}
|
||||
|
||||
OPENSTACK_KEYSTONE_URL = "http://localhost:5000/v2.0"
|
||||
OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_"
|
||||
|
||||
OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = False
|
||||
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = 'test_domain'
|
||||
|
||||
OPENSTACK_KEYSTONE_BACKEND = {
|
||||
'name': 'native',
|
||||
'can_edit_user': True,
|
||||
'can_edit_group': True,
|
||||
'can_edit_project': True,
|
||||
'can_edit_domain': True,
|
||||
'can_edit_role': True
|
||||
}
|
||||
|
||||
OPENSTACK_CINDER_FEATURES = {
|
||||
'enable_backup': True,
|
||||
}
|
||||
|
||||
OPENSTACK_NEUTRON_NETWORK = {
|
||||
'enable_lb': False,
|
||||
'enable_firewall': False,
|
||||
'enable_vpn': False
|
||||
}
|
||||
|
||||
OPENSTACK_HYPERVISOR_FEATURES = {
|
||||
'can_set_mount_point': True,
|
||||
|
||||
# NOTE: as of Grizzly this is not yet supported in Nova so enabling this
|
||||
# setting will not do anything useful
|
||||
'can_encrypt_volumes': False
|
||||
}
|
||||
|
||||
LOGGING['loggers']['openstack_dashboard'] = {
|
||||
'handlers': ['test'],
|
||||
'propagate': False,
|
||||
}
|
||||
|
||||
LOGGING['loggers']['selenium'] = {
|
||||
'handlers': ['test'],
|
||||
'propagate': False,
|
||||
}
|
||||
|
||||
LOGGING['loggers']['watcher_dashboard'] = {
|
||||
'handlers': ['test'],
|
||||
'propagate': False,
|
||||
}
|
||||
|
||||
SECURITY_GROUP_RULES = {
|
||||
'all_tcp': {
|
||||
'name': 'ALL TCP',
|
||||
'ip_protocol': 'tcp',
|
||||
'from_port': '1',
|
||||
'to_port': '65535',
|
||||
},
|
||||
'http': {
|
||||
'name': 'HTTP',
|
||||
'ip_protocol': 'tcp',
|
||||
'from_port': '80',
|
||||
'to_port': '80',
|
||||
},
|
||||
}
|
||||
|
||||
NOSE_ARGS = ['--nocapture',
|
||||
'--nologcapture',
|
||||
'--cover-package=openstack_dashboard',
|
||||
'--cover-inclusive',
|
||||
'--all-modules']
|
||||
|
||||
POLICY_FILES_PATH = os.path.join(ROOT_PATH, "conf")
|
||||
POLICY_FILES = {
|
||||
'identity': 'keystone_policy.json',
|
||||
'compute': 'nova_policy.json'
|
||||
}
|
||||
|
||||
# The openstack_auth.user.Token object isn't JSON-serializable ATM
|
||||
SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
|
||||
|
||||
@ -35,16 +35,23 @@ def data(TEST):
|
||||
)
|
||||
|
||||
TEST.goals = utils.TestDataContainer()
|
||||
TEST.efficacy_specifications = utils.TestDataContainer()
|
||||
TEST.api_goals = utils.TestDataContainer()
|
||||
efficacy_specifications_dict1 = {'name': 'spec1'}
|
||||
efficacy_specifications_dict2 = {'name': 'spec2'}
|
||||
spec1 = watcher.EfficacyIndicatorSpec(efficacy_specifications_dict1)
|
||||
spec2 = watcher.EfficacyIndicatorSpec(efficacy_specifications_dict2)
|
||||
goal_dict1 = {
|
||||
'uuid': 'gggggggg-1111-1111-1111-gggggggggggg',
|
||||
'name': 'MINIMIZE_LICENSING_COST',
|
||||
'display_name': 'Dummy',
|
||||
'efficacy_specifications': spec1
|
||||
}
|
||||
goal_dict2 = {
|
||||
'uuid': 'gggggggg-2222-2222-2222-gggggggggggg',
|
||||
'name': 'SERVER_CONSOLIDATION',
|
||||
'display_name': 'Server consolidation',
|
||||
'efficacy_specifications': spec2
|
||||
}
|
||||
TEST.api_goals.add(goal_dict1)
|
||||
TEST.api_goals.add(goal_dict2)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user