GBP UI - resolved policy missing contracts fix

[groupbasedpolicy.git] / groupbasedpolicy-ui / module / src / main / resources / gbp / endpoints / endpoints-list.service.js

diff --git a/groupbasedpolicy-ui/module/src/main/resources/gbp/endpoints/endpoints-list.service.js b/groupbasedpolicy-ui/module/src/main/resources/gbp/endpoints/endpoints-list.service.js
index 94cc6a14c50303a49f0c8a8f49496c7d7a7eca66..369d4e3bc402b2de7a257661cdf28a05673a7816 100644 (file)
--- a/groupbasedpolicy-ui/module/src/main/resources/gbp/endpoints/endpoints-list.service.js
+++ b/groupbasedpolicy-ui/module/src/main/resources/gbp/endpoints/endpoints-list.service.js
@@ -49,19 +49,20 @@ define([], function () {
                 });
             }
 
-            function getByEpg(epg, successCallback) {
+            function getByEpg(epg, tenant, successCallback) {
                 /* jshint validthis:true */
                 var self = this;
                 var restObj = Restangular.one('restconf').one('operational').one('base-endpoint:endpoints');
 
                 return restObj.get().then(function (data) {
-                    //var endpoints = $filter('filter')(data.endpoints['address-endpoints']['address-endpoint'], {'endpoint-group': epg.id});
-                    var endpoints = $filter('filter')(data.endpoints['address-endpoints']['address-endpoint'].map(function(endpoint) {
-                        return endpoint;
-                    }),
-                        function(ep) {
-                            if(ep['endpoint-group'].indexOf(epg.id) != -1)
+                    var endpoints = $filter('filter')(
+                        data.endpoints['address-endpoints']['address-endpoint'].map(function(endpoint) {
+                            return endpoint;
+                        }),
+                        function (ep) {
+                            if (ep.tenant === tenant && ep['endpoint-group'].indexOf(epg.id) !== -1) {
                                 return true;
+                            }
                         }
                     );
                     self.setData(endpoints);