Use the horizon limit filter for connection limit
The limit filter is now merged in horizon so the connection limit filter used for listeners can be replaced. Partially-Implements: blueprint horizon-lbaas-v2-ui Change-Id: Idb29009bfa966a8698e6f6e7ccad3256314d6411
This commit is contained in:
parent
904b3ff5eb
commit
68d0cde4f6
|
@ -27,7 +27,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<dt translate>Connection Limit</dt>
|
<dt translate>Connection Limit</dt>
|
||||||
<dd>{$ ::ctrl.listener.connection_limit | connectionLimit $}</dd>
|
<dd>{$ ::ctrl.listener.connection_limit | limit $}</dd>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<dt translate>Admin State Up</dt>
|
<dt translate>Admin State Up</dt>
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright 2016 IBM Corp.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the 'License');
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an 'AS IS' BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
(function () {
|
|
||||||
'use strict';
|
|
||||||
|
|
||||||
angular
|
|
||||||
.module('horizon.dashboard.project.lbaasv2.listeners')
|
|
||||||
.filter('connectionLimit', connectionLimitFilter);
|
|
||||||
|
|
||||||
connectionLimitFilter.$inject = [
|
|
||||||
'horizon.framework.util.i18n.gettext'
|
|
||||||
];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @ngdoc filter
|
|
||||||
* @name connectionLimitFilter
|
|
||||||
* @description
|
|
||||||
* Takes the raw listener connection limit from the API and returns 'Unlimited' if the
|
|
||||||
* default connection limit of -1 is returned.
|
|
||||||
* @returns The function for filtering the listener connection limit.
|
|
||||||
*/
|
|
||||||
|
|
||||||
function connectionLimitFilter(gettext) {
|
|
||||||
return function (input) {
|
|
||||||
return input === -1 ? gettext('Unlimited') : input;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
}());
|
|
|
@ -1,39 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright 2016 IBM Corp.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the 'License');
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an 'AS IS' BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
(function() {
|
|
||||||
'use strict';
|
|
||||||
|
|
||||||
describe('LBaaS v2 Listeners Filters', function () {
|
|
||||||
beforeEach(module('horizon.framework.util.i18n'));
|
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2.listeners'));
|
|
||||||
|
|
||||||
describe('connectionLimit', function () {
|
|
||||||
var connectionLimitFilter;
|
|
||||||
beforeEach(inject(function (_connectionLimitFilter_) {
|
|
||||||
connectionLimitFilter = _connectionLimitFilter_;
|
|
||||||
}));
|
|
||||||
|
|
||||||
it('Returns "Unlimited" when connection limit value is -1', function () {
|
|
||||||
expect(connectionLimitFilter(-1)).toBe('Unlimited');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Returns original connection limit when value is not -1', function () {
|
|
||||||
expect(connectionLimitFilter(100)).toBe(100);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
})();
|
|
|
@ -94,7 +94,7 @@
|
||||||
</dl>
|
</dl>
|
||||||
<dl class="col-sm-2">
|
<dl class="col-sm-2">
|
||||||
<dt translate>Connection Limit</dt>
|
<dt translate>Connection Limit</dt>
|
||||||
<dd>{$ ::item.connection_limit | connectionLimit $}</dd>
|
<dd>{$ ::item.connection_limit | limit $}</dd>
|
||||||
</dl>
|
</dl>
|
||||||
<dl class="col-sm-2">
|
<dl class="col-sm-2">
|
||||||
<dt translate>Default Pool ID</dt>
|
<dt translate>Default Pool ID</dt>
|
||||||
|
|
Loading…
Reference in New Issue