From 9ade6598b3a5c59af3ac3800525c8ec31be035a9 Mon Sep 17 00:00:00 2001 From: Zhao Chao Date: Wed, 18 Apr 2018 16:10:07 +0800 Subject: [PATCH] Remove table UpdateAction and declare mox dependency The UpdateAction of tables was deprecated in [1], and finally removed in [2]. The only usage of this feature is in ConfigurationDetailTabs, it's now removed in the way as Horizon does. [1]: https://review.openstack.org/#/c/343861/ [2]: https://review.openstack.org/#/c/560790/ Mox usage is now disable by default in horizon [3], so we have to delcare use_mox = True explicitly. After we have finished mock migration for all test cases, we could remove the usage of use_mox. [3]: https://review.openstack.org/#/c/558048/ Change-Id: I1b24a3b3cdae27930421d2c8faa02c116e18a006 Signed-off-by: Zhao Chao --- .../content/database_configurations/tables.py | 59 +------------------ trove_dashboard/test/helpers.py | 4 +- 2 files changed, 4 insertions(+), 59 deletions(-) diff --git a/trove_dashboard/content/database_configurations/tables.py b/trove_dashboard/content/database_configurations/tables.py index ee31838..2e89f1d 100644 --- a/trove_dashboard/content/database_configurations/tables.py +++ b/trove_dashboard/content/database_configurations/tables.py @@ -12,9 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -import types - -from django.core import exceptions as core_exceptions from django.core import urlresolvers from django import shortcuts from django.utils.translation import ugettext_lazy as _ @@ -25,7 +22,6 @@ import six from horizon import forms from horizon import messages from horizon import tables -from horizon.utils import memoized from trove_dashboard import api from trove_dashboard.content.database_configurations \ @@ -181,63 +177,10 @@ class UpdateRow(tables.Row): request, self.table.kwargs["configuration_id"]).get_param(name) -class UpdateCell(tables.UpdateAction): - def update_cell(self, request, datum, name, - cell_name, new_cell_value): - config_param = datum - - config = config_param_manager.get(request, - config_param.configuration_id) - validation_param = config_param_manager.find_parameter( - name, - self.parameters(request, - config.configuration.datastore_name, - config.configuration.datastore_version_name)) - if validation_param: - error_msg = config_param_manager.validate_config_param_value( - validation_param, new_cell_value) - if error_msg: - raise core_exceptions.ValidationError(error_msg) - - if isinstance(config_param.value, types.IntType): - value = int(new_cell_value) - elif isinstance(config_param.value, types.LongType): - value = long(new_cell_value) - else: - value = new_cell_value - - setattr(datum, cell_name, value) - - (config_param_manager - .get(request, config_param.configuration_id) - .update_param(name, value)) - - return True - - @memoized.memoized_method - def parameters(self, request, datastore, datastore_version): - return api.trove.configuration_parameters_list( - request, datastore, datastore_version) - - def _adjust_type(self, data_type, value): - if not value: - return value - if data_type == "float": - new_value = float(value) - elif data_type == "long": - new_value = long(value) - elif data_type == "integer": - new_value = int(value) - else: - new_value = value - return new_value - - class ValuesTable(tables.DataTable): name = tables.Column("name", verbose_name=_("Name")) value = tables.Column("value", verbose_name=_("Value"), - form_field=forms.CharField(required=False), - update_action=UpdateCell) + form_field=forms.CharField(required=False)) class Meta(object): name = "values" diff --git a/trove_dashboard/test/helpers.py b/trove_dashboard/test/helpers.py index 59b4aa6..f4a8181 100644 --- a/trove_dashboard/test/helpers.py +++ b/trove_dashboard/test/helpers.py @@ -30,7 +30,9 @@ class TroveTestsMixin(object): class TestCase(TroveTestsMixin, helpers.TestCase): - pass + # We should declare mox dependency before we finish mock migration + # for all test cases. + use_mox = True class BaseAdminViewTests(TroveTestsMixin, helpers.TestCase):