diff --git a/neutron/conf/common.py b/neutron/conf/common.py index 6c6edd937de..fb9d4e5ee9c 100644 --- a/neutron/conf/common.py +++ b/neutron/conf/common.py @@ -53,9 +53,9 @@ core_opts = [ "removed in the Ocata release.")), cfg.BoolOpt('allow_bulk', default=True, help=_("Allow the usage of the bulk API")), - cfg.BoolOpt('allow_pagination', default=False, + cfg.BoolOpt('allow_pagination', default=True, help=_("Allow the usage of the pagination")), - cfg.BoolOpt('allow_sorting', default=False, + cfg.BoolOpt('allow_sorting', default=True, help=_("Allow the usage of the sorting")), cfg.StrOpt('pagination_max_limit', default="-1", help=_("The maximum number of items returned in a single " diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh index abcfcf75bc2..69c703f0e93 100644 --- a/neutron/tests/contrib/gate_hook.sh +++ b/neutron/tests/contrib/gate_hook.sh @@ -63,8 +63,6 @@ case $VENV in # NOTE(ihrachys): note the order of hook post-* sections is significant: [quotas] hook should # go before other hooks modifying [DEFAULT]. See LP#1583214 for details. load_conf_hook quotas - load_conf_hook sorting - load_conf_hook pagination load_rc_hook qos load_rc_hook trunk load_conf_hook osprofiler diff --git a/neutron/tests/contrib/hooks/pagination b/neutron/tests/contrib/hooks/pagination deleted file mode 100644 index 71b9b99fb7c..00000000000 --- a/neutron/tests/contrib/hooks/pagination +++ /dev/null @@ -1,9 +0,0 @@ -[[post-extra|$TEMPEST_CONFIG]] - -[neutron_plugin_options] -validate_pagination = True - -[[post-config|$NEUTRON_CONF]] - -[DEFAULT] -allow_pagination=True diff --git a/neutron/tests/contrib/hooks/sorting b/neutron/tests/contrib/hooks/sorting deleted file mode 100644 index ab0682e0485..00000000000 --- a/neutron/tests/contrib/hooks/sorting +++ /dev/null @@ -1,9 +0,0 @@ -[[post-extra|$TEMPEST_CONFIG]] - -[neutron_plugin_options] -validate_sorting = True - -[[post-config|$NEUTRON_CONF]] - -[DEFAULT] -allow_sorting=True diff --git a/releasenotes/notes/enable-sorting-pagination-754390289d3311fa.yaml b/releasenotes/notes/enable-sorting-pagination-754390289d3311fa.yaml new file mode 100644 index 00000000000..b9f951eb08e --- /dev/null +++ b/releasenotes/notes/enable-sorting-pagination-754390289d3311fa.yaml @@ -0,0 +1,3 @@ +--- +upgrade: + - API sorting and pagination features are now enabled by default.