From 68d0cde4f645e5b8df7a4c1cf545bc71de4b703b Mon Sep 17 00:00:00 2001
From: Justin Pomeroy <jpomero@linux.vnet.ibm.com>
Date: Sat, 20 Feb 2016 09:45:59 -0600
Subject: [PATCH] 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
---
 .../project/lbaasv2/listeners/detail.html     |  2 +-
 .../project/lbaasv2/listeners/filters.js      | 42 -------------------
 .../project/lbaasv2/listeners/filters.spec.js | 39 -----------------
 .../project/lbaasv2/listeners/table.html      |  2 +-
 4 files changed, 2 insertions(+), 83 deletions(-)
 delete mode 100644 neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/filters.js
 delete mode 100644 neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/filters.spec.js

diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.html b/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.html
index 331194e..3c87247 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.html
+++ b/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.html
@@ -27,7 +27,7 @@
       </div>
       <div>
         <dt translate>Connection Limit</dt>
-        <dd>{$ ::ctrl.listener.connection_limit | connectionLimit $}</dd>
+        <dd>{$ ::ctrl.listener.connection_limit | limit $}</dd>
       </div>
       <div>
         <dt translate>Admin State Up</dt>
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/filters.js b/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/filters.js
deleted file mode 100644
index c6496a3..0000000
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/filters.js
+++ /dev/null
@@ -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;
-    };
-  }
-
-}());
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/filters.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/filters.spec.js
deleted file mode 100644
index ebf9940..0000000
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/filters.spec.js
+++ /dev/null
@@ -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);
-      });
-    });
-
-  });
-})();
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.html b/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.html
index a77c02a..3641cf2 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.html
+++ b/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.html
@@ -94,7 +94,7 @@
           </dl>
           <dl class="col-sm-2">
             <dt translate>Connection Limit</dt>
-            <dd>{$ ::item.connection_limit | connectionLimit $}</dd>
+            <dd>{$ ::item.connection_limit | limit $}</dd>
           </dl>
           <dl class="col-sm-2">
             <dt translate>Default Pool ID</dt>