GBP UI - resolved policy missing contracts fix

Change-Id: If246e46f053121cc13473dccb0ca216637361945
Signed-off-by: Daniel Malachovsky <dmalacho@cisco.com>

diff --git a/groupbasedpolicy-ui/module/src/main/resources/gbp/bower.json b/groupbasedpolicy-ui/module/src/main/resources/gbp/bower.json
index 1109faabd652c354d539fa2c6ae64de470521eac..2a640cadca73174b65de65d24adeec91d8901c3f 100644 (file)
--- a/groupbasedpolicy-ui/module/src/main/resources/gbp/bower.json
+++ b/groupbasedpolicy-ui/module/src/main/resources/gbp/bower.json
@@ -8,5 +8,8 @@
     "roboto-fontface": "~0.4.3",
     "angular-material-data-table": "~0.9.11",
     "NeXt": "~0.9.1"
+  },
+  "resolutions": {
+    "angular": "1.5.7"
   }
 }

diff --git a/groupbasedpolicy-ui/module/src/main/resources/gbp/common/gbp.controller.js b/groupbasedpolicy-ui/module/src/main/resources/gbp/common/gbp.controller.js
index 57c8f465b045427bb098e41d94ac17bdac8cbcb9..b11358a54e698e890bfbca8aa9e90cfe7eeb90a3 100644 (file)
--- a/groupbasedpolicy-ui/module/src/main/resources/gbp/common/gbp.controller.js
+++ b/groupbasedpolicy-ui/module/src/main/resources/gbp/common/gbp.controller.js
@@ -81,7 +81,7 @@ define([
          * @returns {{id: string, source: *, target: *, tenant: *}}
          */
         function createLink( linkId, type) {
-            var linkIdParts = linkId.split('_');
+            var linkIdParts = linkId.split('++');
             return {
                 'id': linkId,
                 'source': linkIdParts[1],

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);

diff --git a/groupbasedpolicy-ui/module/src/main/resources/gbp/resolved-policy/resolved-policy-list.service.js b/groupbasedpolicy-ui/module/src/main/resources/gbp/resolved-policy/resolved-policy-list.service.js
index 84f57d455b2074062bc9a252becd0c4dbc6befaa..5f6ac6cbbec78ec41b862045aa3c40f5e4d7978d 100644 (file)
--- a/groupbasedpolicy-ui/module/src/main/resources/gbp/resolved-policy/resolved-policy-list.service.js
+++ b/groupbasedpolicy-ui/module/src/main/resources/gbp/resolved-policy/resolved-policy-list.service.js
@@ -187,7 +187,7 @@ define(['app/gbp/resolved-policy/resolved-policy.service'], function () {
          * @returns {string}
          */
         function generateLinkId(contractId, providerEpgId, consumerEpgId) {
-            return contractId + '_' + providerEpgId + '_' + consumerEpgId;
+            return contractId + '++' + providerEpgId + '++' + consumerEpgId;
         }
 
         function getContractType(subject) {

diff --git a/groupbasedpolicy-ui/module/src/main/resources/gbp/resolved-policy/sidepanel/epg-sidepanel.controller.js b/groupbasedpolicy-ui/module/src/main/resources/gbp/resolved-policy/sidepanel/epg-sidepanel.controller.js
index 2746509ef9b6aed88f9659a6c0ee545c010c112a..ab28fa6cf88b2b8d46c6e07210985dce7b4ffccb 100644 (file)
--- a/groupbasedpolicy-ui/module/src/main/resources/gbp/resolved-policy/sidepanel/epg-sidepanel.controller.js
+++ b/groupbasedpolicy-ui/module/src/main/resources/gbp/resolved-policy/sidepanel/epg-sidepanel.controller.js
@@ -10,7 +10,7 @@ define([], function() {
 
         function getEndpoints() {
             if($scope.sidePanelObject)
-                $scope.endpoints.getByEpg($scope.sidePanelObject);
+                $scope.endpoints.getByEpg($scope.sidePanelObject, $scope.rootTenant);
         }
 
         $scope.$watch('sidePanelObject', getEndpoints);