', - - ''].join(''), - - defaults: joint.util.deepSupplement({ - - type: 'basic.TextBlock', - - // see joint.css for more element styles - attrs: { - rect: { - fill: '#ffffff', - stroke: '#000000', - width: 80, - height: 100 - }, - text: { - fill: '#000000', - 'font-size': 14, - 'font-family': 'Arial, helvetica, sans-serif' - }, - '.content': { - text: '', - ref: 'rect', - 'ref-x': .5, - 'ref-y': .5, - 'y-alignment': 'middle', - 'x-alignment': 'middle' - } - }, - - content: '' - - }, joint.shapes.basic.Generic.prototype.defaults), - - initialize: function() { - - if (typeof SVGForeignObjectElement !== 'undefined') { - - // foreignObject supported - this.setForeignObjectSize(this, this.get('size')); - this.setDivContent(this, this.get('content')); - this.listenTo(this, 'change:size', this.setForeignObjectSize); - this.listenTo(this, 'change:content', this.setDivContent); - - } - - joint.shapes.basic.Generic.prototype.initialize.apply(this, arguments); - }, - - setForeignObjectSize: function(cell, size) { - - // Selector `foreignObject' doesn't work accross all browsers, we'r using class selector instead. - // We have to clone size as we don't want attributes.div.style to be same object as attributes.size. - cell.attr({ - '.fobj': _.clone(size), - div: { style: _.clone(size) } - }); - }, - - setDivContent: function(cell, content) { - - // Append the content to div as html. - cell.attr({ div : { - html: content - }}); - } - -}); - -// TextBlockView implements the fallback for IE when no foreignObject exists and -// the text needs to be manually broken. -joint.shapes.basic.TextBlockView = joint.dia.ElementView.extend({ - - initialize: function() { - - joint.dia.ElementView.prototype.initialize.apply(this, arguments); - - if (typeof SVGForeignObjectElement === 'undefined') { - - this.noSVGForeignObjectElement = true; - - this.listenTo(this.model, 'change:content', function(cell) { - // avoiding pass of extra paramters - this.updateContent(cell); - }); - } - }, - - update: function(cell, renderingOnlyAttrs) { - - if (this.noSVGForeignObjectElement) { - - var model = this.model; - - // Update everything but the content first. - var noTextAttrs = _.omit(renderingOnlyAttrs || model.get('attrs'), '.content'); - joint.dia.ElementView.prototype.update.call(this, model, noTextAttrs); - - if (!renderingOnlyAttrs || _.has(renderingOnlyAttrs, '.content')) { - // Update the content itself. - this.updateContent(model, renderingOnlyAttrs); - } - - } else { - - joint.dia.ElementView.prototype.update.call(this, model, renderingOnlyAttrs); - } - }, - - updateContent: function(cell, renderingOnlyAttrs) { - - // Create copy of the text attributes - var textAttrs = _.merge({}, (renderingOnlyAttrs || cell.get('attrs'))['.content']); - - delete textAttrs.text; - - // Break the content to fit the element size taking into account the attributes - // set on the model. - var text = joint.util.breakText(cell.get('content'), cell.get('size'), textAttrs, { - // measuring sandbox svg document - svgDocument: this.paper.svg - }); - - // Create a new attrs with same structure as the model attrs { text: { *textAttributes* }} - var attrs = joint.util.setByPath({}, '.content', textAttrs, '/'); - - // Replace text attribute with the one we just processed. - attrs['.content'].text = text; - - // Update the view using renderingOnlyAttributes parameter. - joint.dia.ElementView.prototype.update.call(this, cell, attrs); - } -}); - -joint.routers.orthogonal = (function() { - - // bearing -> opposite bearing - var opposite = { - N: 'S', - S: 'N', - E: 'W', - W: 'E' - }; - - // bearing -> radians - var radians = { - N: -Math.PI / 2 * 3, - S: -Math.PI / 2, - E: 0, - W: Math.PI - }; - - // HELPERS // - - // simple bearing method (calculates only orthogonal cardinals) - function bearing(from, to) { - if (from.x == to.x) return from.y > to.y ? 'N' : 'S'; - if (from.y == to.y) return from.x > to.x ? 'W' : 'E'; - return null; - } - - // returns either width or height of a bbox based on the given bearing - function boxSize(bbox, brng) { - return bbox[brng == 'W' || brng == 'E' ? 'width' : 'height']; - } - - // expands a box by specific value - function expand(bbox, val) { - return g.rect(bbox).moveAndExpand({ x: -val, y: -val, width: 2 * val, height: 2 * val }); - } - - // transform point to a rect - function pointBox(p) { - return g.rect(p.x, p.y, 0, 0); - } - - // returns a minimal rect which covers the given boxes - function boundary(bbox1, bbox2) { - - var x1 = Math.min(bbox1.x, bbox2.x); - var y1 = Math.min(bbox1.y, bbox2.y); - var x2 = Math.max(bbox1.x + bbox1.width, bbox2.x + bbox2.width); - var y2 = Math.max(bbox1.y + bbox1.height, bbox2.y + bbox2.height); - - return g.rect(x1, y1, x2 - x1, y2 - y1); - } - - // returns a point `p` where lines p,p1 and p,p2 are perpendicular and p is not contained - // in the given box - function freeJoin(p1, p2, bbox) { - - var p = g.point(p1.x, p2.y); - if (bbox.containsPoint(p)) p = g.point(p2.x, p1.y); - // kept for reference - // if (bbox.containsPoint(p)) p = null; - return p; - } - - // PARTIAL ROUTERS // - - function vertexVertex(from, to, brng) { - - var p1 = g.point(from.x, to.y); - var p2 = g.point(to.x, from.y); - var d1 = bearing(from, p1); - var d2 = bearing(from, p2); - var xBrng = opposite[brng]; - - var p = (d1 == brng || (d1 != xBrng && (d2 == xBrng || d2 != brng))) ? p1 : p2; - - return { points: [p], direction: bearing(p, to) }; - } - - function elementVertex(from, to, fromBBox) { - - var p = freeJoin(from, to, fromBBox); - - return { points: [p], direction: bearing(p, to) }; - } - - function vertexElement(from, to, toBBox, brng) { - - var route = {}; - - var pts = [g.point(from.x, to.y), g.point(to.x, from.y)]; - var freePts = _.filter(pts, function(pt) { return !toBBox.containsPoint(pt); }); - var freeBrngPts = _.filter(freePts, function(pt) { return bearing(pt, from) != brng; }); - - var p; - - if (freeBrngPts.length > 0) { - - // try to pick a point which bears the same direction as the previous segment - p = _.filter(freeBrngPts, function(pt) { return bearing(from, pt) == brng; }).pop(); - p = p || freeBrngPts[0]; - - route.points = [p]; - route.direction = bearing(p, to); - - } else { - - // Here we found only points which are either contained in the element or they would create - // a link segment going in opposite direction from the previous one. - // We take the point inside element and move it outside the element in the direction the - // route is going. Now we can join this point with the current end (using freeJoin). - - p = _.difference(pts, freePts)[0]; - - var p2 = g.point(to).move(p, -boxSize(toBBox, brng) / 2); - var p1 = freeJoin(p2, from, toBBox); - - route.points = [p1, p2]; - route.direction = bearing(p2, to); - } - - return route; - } - - function elementElement(from, to, fromBBox, toBBox) { - - var route = elementVertex(to, from, toBBox); - var p1 = route.points[0]; - - if (fromBBox.containsPoint(p1)) { - - route = elementVertex(from, to, fromBBox); - var p2 = route.points[0]; - - if (toBBox.containsPoint(p2)) { - - var fromBorder = g.point(from).move(p2, -boxSize(fromBBox, bearing(from, p2)) / 2); - var toBorder = g.point(to).move(p1, -boxSize(toBBox, bearing(to, p1)) / 2); - var mid = g.line(fromBorder, toBorder).midpoint(); - - var startRoute = elementVertex(from, mid, fromBBox); - var endRoute = vertexVertex(mid, to, startRoute.direction); - - route.points = [startRoute.points[0], endRoute.points[0]]; - route.direction = endRoute.direction; - } - } - - return route; - } - - // Finds route for situations where one of end is inside the other. - // Typically the route is conduct outside the outer element first and - // let go back to the inner element. - function insideElement(from, to, fromBBox, toBBox, brng) { - - var route = {}; - var bndry = expand(boundary(fromBBox, toBBox), 1); - - // start from the point which is closer to the boundary - var reversed = bndry.center().distance(to) > bndry.center().distance(from); - var start = reversed ? to : from; - var end = reversed ? from : to; - - var p1, p2, p3; - - if (brng) { - // Points on circle with radius equals 'W + H` are always outside the rectangle - // with width W and height H if the center of that circle is the center of that rectangle. - p1 = g.point.fromPolar(bndry.width + bndry.height, radians[brng], start); - p1 = bndry.pointNearestToPoint(p1).move(p1, -1); - } else { - p1 = bndry.pointNearestToPoint(start).move(start, 1); - } - - p2 = freeJoin(p1, end, bndry); - - if (p1.round().equals(p2.round())) { - p2 = g.point.fromPolar(bndry.width + bndry.height, g.toRad(p1.theta(start)) + Math.PI / 2, end); - p2 = bndry.pointNearestToPoint(p2).move(end, 1).round(); - p3 = freeJoin(p1, p2, bndry); - route.points = reversed ? [p2, p3, p1] : [p1, p3, p2]; - } else { - route.points = reversed ? [p2, p1] : [p1, p2]; - } - - route.direction = reversed ? bearing(p1, to) : bearing(p2, to); - - return route; - } - - // MAIN ROUTER // - - // Return points that one needs to draw a connection through in order to have a orthogonal link - // routing from source to target going through `vertices`. - function findOrthogonalRoute(vertices, opt, linkView) { - - var padding = opt.elementPadding || 20; - - var orthogonalVertices = []; - var sourceBBox = expand(linkView.sourceBBox, padding); - var targetBBox = expand(linkView.targetBBox, padding); - - vertices = _.map(vertices, g.point); - vertices.unshift(sourceBBox.center()); - vertices.push(targetBBox.center()); - - var brng; - - for (var i = 0, max = vertices.length - 1; i < max; i++) { - - var route = null; - var from = vertices[i]; - var to = vertices[i + 1]; - var isOrthogonal = !!bearing(from, to); - - if (i == 0) { - - if (i + 1 == max) { // route source -> target - - // Expand one of elements by 1px so we detect also situations when they - // are positioned one next other with no gap between. - if (sourceBBox.intersect(expand(targetBBox, 1))) { - route = insideElement(from, to, sourceBBox, targetBBox); - } else if (!isOrthogonal) { - route = elementElement(from, to, sourceBBox, targetBBox); - } - - } else { // route source -> vertex - - if (sourceBBox.containsPoint(to)) { - route = insideElement(from, to, sourceBBox, expand(pointBox(to), padding)); - } else if (!isOrthogonal) { - route = elementVertex(from, to, sourceBBox); - } - } - - } else if (i + 1 == max) { // route vertex -> target - - var orthogonalLoop = isOrthogonal && bearing(to, from) == brng; - - if (targetBBox.containsPoint(from) || orthogonalLoop) { - route = insideElement(from, to, expand(pointBox(from), padding), targetBBox, brng); - } else if (!isOrthogonal) { - route = vertexElement(from, to, targetBBox, brng); - } - - } else if (!isOrthogonal) { // route vertex -> vertex - route = vertexVertex(from, to, brng); - } - - if (route) { - Array.prototype.push.apply(orthogonalVertices, route.points); - brng = route.direction; - } else { - // orthogonal route and not looped - brng = bearing(from, to); - } - - if (i + 1 < max) { - orthogonalVertices.push(to); - } - } - - return orthogonalVertices; - }; - - return findOrthogonalRoute; - -})(); - -joint.routers.manhattan = (function() { - - 'use strict'; - - var config = { - - // size of the step to find a route - step: 10, - - // use of the perpendicular linkView option to connect center of element with first vertex - perpendicular: true, - - // tells how to divide the paper when creating the elements map - mapGridSize: 100, - - // should be source or target not to be consider as an obstacle - excludeEnds: [], // 'source', 'target' - - // should be any element with a certain type not to be consider as an obstacle - excludeTypes: ['basic.Text'], - - // if number of route finding loops exceed the maximum, stops searching and returns - // fallback route - maximumLoops: 500, - - // possible starting directions from an element - startDirections: ['left', 'right', 'top', 'bottom'], - - // possible ending directions to an element - endDirections: ['left', 'right', 'top', 'bottom'], - - // specify directions above - directionMap: { - right: { x: 1, y: 0 }, - bottom: { x: 0, y: 1 }, - left: { x: -1, y: 0 }, - top: { x: 0, y: -1 } - }, - - // maximum change of the direction - maxAllowedDirectionChange: 1, - - // padding applied on the element bounding boxes - paddingBox: function() { - - var step = this.step; - - return { - x: -step, - y: -step, - width: 2 * step, - height: 2 * step - }; - }, - - // an array of directions to find next points on the route - directions: function() { - - var step = this.step; - - return [ - { offsetX: step , offsetY: 0 , cost: step }, - { offsetX: 0 , offsetY: step , cost: step }, - { offsetX: -step , offsetY: 0 , cost: step }, - { offsetX: 0 , offsetY: -step , cost: step } - ]; - }, - - // a penalty received for direction change - penalties: function() { - - return [0, this.step / 2, this.step]; - }, - - // heurestic method to determine the distance between two points - estimateCost: function(from, to) { - - return from.manhattanDistance(to); - }, - - // a simple route used in situations, when main routing method fails - // (exceed loops, inaccessible). - fallbackRoute: function(from, to, opts) { - - // Find an orthogonal route ignoring obstacles. - - var prevDirIndexes = opts.prevDirIndexes || {}; - - var point = (prevDirIndexes[from] || 0) % 2 - ? g.point(from.x, to.y) - : g.point(to.x, from.y); - - return [point, to]; - }, - - // if a function is provided, it's used to route the link while dragging an end - // i.e. function(from, to, opts) { return []; } - draggingRoute: null - }; - - // reconstructs a route by concating points with their parents - function reconstructRoute(parents, point) { - - var route = []; - var prevDiff = { x: 0, y: 0 }; - var current = point; - var parent; - - while ((parent = parents[current])) { - - var diff = parent.difference(current); - - if (!diff.equals(prevDiff)) { - - route.unshift(current); - prevDiff = diff; - } - - current = parent; - } - - route.unshift(current); - - return route; - }; - - // find points around the rectangle taking given directions in the account - function getRectPoints(bbox, directionList, opts) { - - var step = opts.step; - - var center = bbox.center(); - - var startPoints = _.chain(opts.directionMap).pick(directionList).map(function(direction) { - - var x = direction.x * bbox.width / 2; - var y = direction.y * bbox.height / 2; - - var point = g.point(center).offset(x, y).snapToGrid(step); - - if (bbox.containsPoint(point)) { - - point.offset(direction.x * step, direction.y * step); - } - - return point; - - }).value(); - - return startPoints; - }; - - // returns a direction index from start point to end point - function getDirection(start, end, dirLen) { - - var dirAngle = 360 / dirLen; - - var q = Math.floor(start.theta(end) / dirAngle); - - return dirLen - q; - } - - // finds the route between to points/rectangles implementing A* alghoritm - function findRoute(start, end, map, opt) { - - var startDirections = opt.reversed ? opt.endDirections : opt.startDirections; - var endDirections = opt.reversed ? opt.startDirections : opt.endDirections; - - // set of points we start pathfinding from - var startSet = start instanceof g.rect - ? getRectPoints(start, startDirections, opt) - : [start]; - - // set of points we want the pathfinding to finish at - var endSet = end instanceof g.rect - ? getRectPoints(end, endDirections, opt) - : [end]; - - var startCenter = startSet.length > 1 ? start.center() : startSet[0]; - var endCenter = endSet.length > 1 ? end.center() : endSet[0]; - - // take into account only accessible end points - var endPoints = _.filter(endSet, function(point) { - - var mapKey = g.point(point).snapToGrid(opt.mapGridSize).toString(); - - var accesible = _.every(map[mapKey], function(obstacle) { - return !obstacle.containsPoint(point); - }); - - return accesible; - }); - - - if (endPoints.length) { - - var step = opt.step; - var penalties = opt.penalties; - - // choose the end point with the shortest estimated path cost - var endPoint = _.chain(endPoints).invoke('snapToGrid', step).min(function(point) { - - return opt.estimateCost(startCenter, point); - - }).value(); - - var parents = {}; - var costFromStart = {}; - var totalCost = {}; - - // directions - var dirs = opt.directions; - var dirLen = dirs.length; - var dirHalfLen = dirLen / 2; - var dirIndexes = opt.previousDirIndexes || {}; - - // The set of point already evaluated. - var closeHash = {}; // keeps only information whether a point was evaluated' - - // The set of tentative points to be evaluated, initially containing the start points - var openHash = {}; // keeps only information whether a point is to be evaluated' - var openSet = _.chain(startSet).invoke('snapToGrid', step).each(function(point) { - - var key = point.toString(); - - costFromStart[key] = 0; // Cost from start along best known path. - totalCost[key] = opt.estimateCost(point, endPoint); - dirIndexes[key] = dirIndexes[key] || getDirection(startCenter, point, dirLen); - openHash[key] = true; - - }).map(function(point) { - - return point.toString(); - - }).sortBy(function(pointKey) { - - return totalCost[pointKey]; - - }).value(); - - var loopCounter = opt.maximumLoops; - - var maxAllowedDirectionChange = opt.maxAllowedDirectionChange; - - // main route finding loop - while (openSet.length && loopCounter--) { - - var currentKey = openSet[0]; - var currentPoint = g.point(currentKey); - - if (endPoint.equals(currentPoint)) { - - opt.previousDirIndexes = _.pick(dirIndexes, currentKey); - return reconstructRoute(parents, currentPoint); - } - - // remove current from the open list - openSet.splice(0, 1); - openHash[neighborKey] = null; - - // add current to the close list - closeHash[neighborKey] = true; - - var currentDirIndex = dirIndexes[currentKey]; - var currentDist = costFromStart[currentKey]; - - for (var dirIndex = 0; dirIndex < dirLen; dirIndex++) { - - var dirChange = Math.abs(dirIndex - currentDirIndex); - - if (dirChange > dirHalfLen) { - - dirChange = dirLen - dirChange; - } - - // if the direction changed rapidly don't use this point - if (dirChange > maxAllowedDirectionChange) { - - continue; - } - - var dir = dirs[dirIndex]; - - var neighborPoint = g.point(currentPoint).offset(dir.offsetX, dir.offsetY); - var neighborKey = neighborPoint.toString(); - - if (closeHash[neighborKey]) { - - continue; - } - - // is point accesible - no obstacle in the way - - var mapKey = g.point(neighborPoint).snapToGrid(opt.mapGridSize).toString(); - - var isAccesible = _.every(map[mapKey], function(obstacle) { - return !obstacle.containsPoint(neighborPoint); - }); - - if (!isAccesible) { - - continue; - } - - var inOpenSet = _.has(openHash, neighborKey); - - var costToNeighbor = currentDist + dir.cost; - - if (!inOpenSet || costToNeighbor < costFromStart[neighborKey]) { - - parents[neighborKey] = currentPoint; - dirIndexes[neighborKey] = dirIndex; - costFromStart[neighborKey] = costToNeighbor; - - totalCost[neighborKey] = costToNeighbor + - opt.estimateCost(neighborPoint, endPoint) + - penalties[dirChange]; - - if (!inOpenSet) { - - var openIndex = _.sortedIndex(openSet, neighborKey, function(openKey) { - - return totalCost[openKey]; - }); - - openSet.splice(openIndex, 0, neighborKey); - openHash[neighborKey] = true; - } - }; - }; - } - } - - // no route found ('to' point wasn't either accessible or finding route took - // way to much calculations) - return opt.fallbackRoute(startCenter, endCenter, opt); - }; - - // initiation of the route finding - function router(oldVertices, opt) { - - // resolve some of the options - opt.directions = _.result(opt, 'directions'); - opt.penalties = _.result(opt, 'penalties'); - opt.paddingBox = _.result(opt, 'paddingBox'); - - // enable/disable linkView perpendicular option - this.options.perpendicular = !!opt.perpendicular; - - // As route changes its shape rapidly when we start finding route from different point - // it's necessary to start from the element that was not interacted with - // (the position was changed) at very last. - var reverseRouting = opt.reversed = (this.lastEndChange === 'source'); - - var sourceBBox = reverseRouting ? g.rect(this.targetBBox) : g.rect(this.sourceBBox); - var targetBBox = reverseRouting ? g.rect(this.sourceBBox) : g.rect(this.targetBBox); - - // expand boxes by specific padding - sourceBBox.moveAndExpand(opt.paddingBox); - targetBBox.moveAndExpand(opt.paddingBox); - - // building an elements map - - var link = this.model; - var graph = this.paper.model; - - // source or target element could be excluded from set of obstacles - var excludedEnds = _.chain(opt.excludeEnds) - .map(link.get, link) - .pluck('id') - .map(graph.getCell, graph).value(); - - var mapGridSize = opt.mapGridSize; - - var excludeAncestors = []; - - var sourceId = link.get('source').id; - if (sourceId !== undefined) { - var source = graph.getCell(sourceId); - if (source !== undefined) { - excludeAncestors = _.union(excludeAncestors, _.map(source.getAncestors(), 'id')); - }; - } - - var targetId = link.get('target').id; - if (targetId !== undefined) { - var target = graph.getCell(targetId); - if (target !== undefined) { - excludeAncestors = _.union(excludeAncestors, _.map(target.getAncestors(), 'id')); - } - } - - // builds a map of all elements for quicker obstacle queries (i.e. is a point contained - // in any obstacle?) (a simplified grid search) - // The paper is divided to smaller cells, where each of them holds an information which - // elements belong to it. When we query whether a point is in an obstacle we don't need - // to go through all obstacles, we check only those in a particular cell. - var map = _.chain(graph.getElements()) - // remove source and target element if required - .difference(excludedEnds) - // remove all elements whose type is listed in excludedTypes array - .reject(function(element) { - // reject any element which is an ancestor of either source or target - return _.contains(opt.excludeTypes, element.get('type')) || _.contains(excludeAncestors, element.id); - }) - // change elements (models) to their bounding boxes - .invoke('getBBox') - // expand their boxes by specific padding - .invoke('moveAndExpand', opt.paddingBox) - // build the map - .foldl(function(res, bbox) { - - var origin = bbox.origin().snapToGrid(mapGridSize); - var corner = bbox.corner().snapToGrid(mapGridSize); - - for (var x = origin.x; x <= corner.x; x += mapGridSize) { - for (var y = origin.y; y <= corner.y; y += mapGridSize) { - - var gridKey = x + '@' + y; - - res[gridKey] = res[gridKey] || []; - res[gridKey].push(bbox); - } - } - - return res; - - }, {}).value(); - - // pathfinding - - var newVertices = []; - - var points = _.map(oldVertices, g.point); - - var tailPoint = sourceBBox.center(); - - // find a route by concating all partial routes (routes need to go through the vertices) - // startElement -> vertex[1] -> ... -> vertex[n] -> endElement - for (var i = 0, len = points.length; i <= len; i++) { - - var partialRoute = null; - - var from = to || sourceBBox; - var to = points[i]; - - if (!to) { - - to = targetBBox; - - // 'to' is not a vertex. If the target is a point (i.e. it's not an element), we - // might use dragging route instead of main routing method if that is enabled. - var endingAtPoint = !this.model.get('source').id || !this.model.get('target').id; - - if (endingAtPoint && _.isFunction(opt.draggingRoute)) { - // Make sure we passing points only (not rects). - var dragFrom = from instanceof g.rect ? from.center() : from; - partialRoute = opt.draggingRoute(dragFrom, to.origin(), opt); - } - } - - // if partial route has not been calculated yet use the main routing method to find one - partialRoute = partialRoute || findRoute(from, to, map, opt); - - var leadPoint = _.first(partialRoute); - - if (leadPoint && leadPoint.equals(tailPoint)) { - - // remove the first point if the previous partial route had the same point as last - partialRoute.shift(); - } - - tailPoint = _.last(partialRoute) || tailPoint; - - newVertices = newVertices.concat(partialRoute); - }; - - // we might have to reverse the result if we swapped source and target at the beginning - return reverseRouting ? newVertices.reverse() : newVertices; - }; - - // public function - return function(vertices, opt, linkView) { - - return router.call(linkView, vertices, _.extend({}, config, opt)); - }; - -})(); - -joint.routers.metro = (function() { - - if (!_.isFunction(joint.routers.manhattan)) { - - throw('Metro requires the manhattan router.'); - } - - var config = { - - // cost of a diagonal step (calculated if not defined). - diagonalCost: null, - - // an array of directions to find next points on the route - directions: function() { - - var step = this.step; - var diagonalCost = this.diagonalCost || Math.ceil(Math.sqrt(step * step << 1)); - - return [ - { offsetX: step , offsetY: 0 , cost: step }, - { offsetX: step , offsetY: step , cost: diagonalCost }, - { offsetX: 0 , offsetY: step , cost: step }, - { offsetX: -step , offsetY: step , cost: diagonalCost }, - { offsetX: -step , offsetY: 0 , cost: step }, - { offsetX: -step , offsetY: -step , cost: diagonalCost }, - { offsetX: 0 , offsetY: -step , cost: step }, - { offsetX: step , offsetY: -step , cost: diagonalCost } - ]; - }, - - // a simple route used in situations, when main routing method fails - // (exceed loops, inaccessible). - fallbackRoute: function(from, to, opts) { - - // Find a route which breaks by 45 degrees ignoring all obstacles. - - var theta = from.theta(to); - - var a = { x: to.x, y: from.y }; - var b = { x: from.x, y: to.y }; - - if (theta % 180 > 90) { - var t = a; - a = b; - b = t; - } - - var p1 = (theta % 90) < 45 ? a : b; - - var l1 = g.line(from, p1); - - var alpha = 90 * Math.ceil(theta / 90); - - var p2 = g.point.fromPolar(l1.squaredLength(), g.toRad(alpha + 135), p1); - - var l2 = g.line(to, p2); - - var point = l1.intersection(l2); - - return point ? [point.round(), to] : [to]; - } - }; - - // public function - return function(vertices, opts, linkView) { - - return joint.routers.manhattan(vertices, _.extend({}, config, opts), linkView); - }; - -})(); - -joint.connectors.normal = function(sourcePoint, targetPoint, vertices) { - - // Construct the `d` attribute of the `` element. - var d = ['M', sourcePoint.x, sourcePoint.y]; - - _.each(vertices, function(vertex) { - - d.push(vertex.x, vertex.y); - }); - - d.push(targetPoint.x, targetPoint.y); - - return d.join(' '); -}; - -joint.connectors.rounded = function(sourcePoint, targetPoint, vertices, opts) { - - var offset = opts.radius || 10; - - var c1, c2, d1, d2, prev, next; - - // Construct the `d` attribute of the `` element. - var d = ['M', sourcePoint.x, sourcePoint.y]; - - _.each(vertices, function(vertex, index) { - - // the closest vertices - prev = vertices[index - 1] || sourcePoint; - next = vertices[index + 1] || targetPoint; - - // a half distance to the closest vertex - d1 = d2 || g.point(vertex).distance(prev) / 2; - d2 = g.point(vertex).distance(next) / 2; - - // control points - c1 = g.point(vertex).move(prev, -Math.min(offset, d1)).round(); - c2 = g.point(vertex).move(next, -Math.min(offset, d2)).round(); - - d.push(c1.x, c1.y, 'S', vertex.x, vertex.y, c2.x, c2.y, 'L'); - }); - - d.push(targetPoint.x, targetPoint.y); - - return d.join(' '); -}; - -joint.connectors.smooth = function(sourcePoint, targetPoint, vertices) { - - var d; - - if (vertices.length) { - - d = g.bezier.curveThroughPoints([sourcePoint].concat(vertices).concat([targetPoint])); - - } else { - // if we have no vertices use a default cubic bezier curve, cubic bezier requires - // two control points. The two control points are both defined with X as mid way - // between the source and target points. SourceControlPoint Y is equal to sourcePoint Y - // and targetControlPointY being equal to targetPointY. Handle situation were - // sourcePointX is greater or less then targetPointX. - var controlPointX = (sourcePoint.x < targetPoint.x) - ? targetPoint.x - ((targetPoint.x - sourcePoint.x) / 2) - : sourcePoint.x - ((sourcePoint.x - targetPoint.x) / 2); - - d = [ - 'M', sourcePoint.x, sourcePoint.y, - 'C', controlPointX, sourcePoint.y, controlPointX, targetPoint.y, - targetPoint.x, targetPoint.y - ]; - } - - return d.join(' '); -}; - - - return joint; - -})); diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/js/joint.css b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/js/joint.css deleted file mode 100644 index a5fcfebfd..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/js/joint.css +++ /dev/null @@ -1,249 +0,0 @@ -/*! JointJS v0.9.3 - JavaScript diagramming library 2015-05-22 - - -This Source Code Form is subject to the terms of the Mozilla Public -License, v. 2.0. If a copy of the MPL was not distributed with this -file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - - -/* -A complete list of SVG properties that can be set through CSS is here: -http://www.w3.org/TR/SVG/styling.html - -Important note: Presentation attributes have a lower precedence over CSS style rules. -*/ - - -/* .viewport is a node wrapping all diagram elements in the paper */ -.viewport { - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; -} - -/* -1. IE can't handle paths without the `d` attribute for bounding box calculation -2. IE can't even handle 'd' attribute as a css selector (e.g path[d]) so the following rule will - break the links rendering. - -path:not([d]) { - display: none; -} - -*/ - -/* .magnet is an element that can be either source or a target of a link */ -/* -.magnet { - fill: black; - fill-opacity: 0; - stroke: black; - stroke-width: 15; - stroke-opacity: 0; - pointer-events: visibleStroke; - cursor: crosshair; - vector-effect: non-scaling-stroke; -} - -.magnet:hover { - stroke-opacity: .5; -} -*/ - -[magnet=true]:not(.element) { - cursor: crosshair; -} -[magnet=true]:not(.element):hover { - opacity: .7; -} - -/* - -Elements have CSS classes named by their types. E.g. type: basic.Rect has a CSS class "element basic Rect". -This makes it possible to easilly style elements in CSS and have generic CSS rules applying to -the whole group of elements. Each plugin can provide its own stylesheet. - -*/ - -.element { - /* Give the user a hint that he can drag&drop the element. */ - cursor: move; -} - -.element * { - /* The default behavior when scaling an element is not to scale the stroke in order to prevent the ugly effect of stroke with different proportions. */ - vector-effect: non-scaling-stroke; - -moz-user-select: none; - user-drag: none; -} - - -/* - -connection-wrap is a element of the joint.dia.Link that follows the .connection of that link. -In other words, the `d` attribute of the .connection-wrap contains the same data as the `d` attribute of the -.connection . The advantage of using .connection-wrap is to be able to catch pointer events -in the neighborhood of the .connection . This is especially handy if the .connection is -very thin. - -*/ - -.connection-wrap { - fill: none; - stroke: black; - stroke-width: 15; - stroke-linecap: round; - stroke-linejoin: round; - opacity: 0; - cursor: move; -} -.connection-wrap:hover { - opacity: .4; - stroke-opacity: .4; -} - - -.connection { - /* stroke: black; */ - /* stroke width cannot be overriden by attribute? */ - /* stroke-width: 1; */ - fill: none; - stroke-linejoin: round; -} - -.marker-source, .marker-target { -/* Cannot be in CSS otherwise it could not be overruled by attributes. - fill: black; - stroke: black; -*/ - /* This makes the arrowheads point to the border of objects even though the transform: scale() is applied on them. */ - vector-effect: non-scaling-stroke; -} - -/* - -Vertex markers are `` elements that appear at connection vertex positions. - -*/ - -/* element wrapping .marker-vertex-group. */ -.marker-vertices { - opacity: 0; - cursor: move; -} -.marker-arrowheads { - opacity: 0; - cursor: move; - cursor: -webkit-grab; - cursor: -moz-grab; -/* display: none; */ /* setting `display: none` on .marker-arrowheads effectivelly switches of links reconnecting */ -} -.link-tools { - opacity: 0; - cursor: pointer; -} -.link-tools .tool-options { - display: none; /* by default, we don't display link options tool */ -} -.link-tools .tool-remove circle { - fill: red; -} -.link-tools .tool-remove path { - fill: white; -} -.link:hover .marker-vertices, -.link:hover .marker-arrowheads, -.link:hover .link-tools { - opacity: 1; -} - -/* element inside .marker-vertex-group element */ -.marker-vertex { - fill: #1ABC9C; -} -.marker-vertex:hover { - fill: #34495E; - stroke: none; -} - -.marker-arrowhead { - fill: #1ABC9C; -} -.marker-arrowhead:hover { - fill: #F39C12; - stroke: none; -} - -/* element used to remove a vertex */ -.marker-vertex-remove { - cursor: pointer; - opacity: .1; - fill: white; -} - -.marker-vertex-group:hover .marker-vertex-remove { - opacity: 1; -} - -.marker-vertex-remove-area { - opacity: .1; - cursor: pointer; -} -.marker-vertex-group:hover .marker-vertex-remove-area { - opacity: 1; -} - -/* Cell highlighting - e.g a cell underneath the dragged link get highlighted. - See joint.dia.cell.js highlight(); */ -.highlighted { - opacity: 0.7; -} - -/* For some reason, CSS `outline` property - does not work on `` elements. */ -text.highlighted { - fill: #FF0000; -} - -/* `outline` doesn't work in Firefox, Opera and IE9+. - The only engine supporting outlines on SVG elements is Webkit. */ -@media screen and (-webkit-min-device-pixel-ratio:0) { - .highlighted { - outline: 2px solid #FF0000; - opacity: initial; - } -} - -/* -Example of custom changes (in pure CSS only!): - -Do not show marker vertices at all: .marker-vertices { display: none; } -Do not allow adding new vertices: .connection-wrap { pointer-events: none; } -*/ - -/* foreignObject inside the elements (i.e joint.shapes.basic.TextBlock) */ -.element .fobj body { - background-color: transparent; - margin: 0px; -} -.element .fobj div { - text-align: center; - vertical-align: middle; - display: table-cell; - padding: 0px 5px 0px 5px; -} - -svg { - border: none; - border-radius: none; - background-image: none; -} - -text.text1, text.text2 { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 14px; -} diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/js/lodash.min.js b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/js/lodash.min.js deleted file mode 100644 index 4d6e9ff0b..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/js/lodash.min.js +++ /dev/null @@ -1,98 +0,0 @@ -/** - * @license - * lodash 3.9.3 (Custom Build) lodash.com/license | Underscore.js 1.8.3 underscorejs.org/LICENSE - * Build: `lodash modern -o ./lodash.js` - */ -;(function(){function n(n,t){if(n!==t){var r=null===n,e=n===m,u=n===n,i=null===t,o=t===m,f=t===t;if(n>t&&!i||!u||r&&!o&&f||e&&f)return 1;if(n=n&&9<=n&&13>=n||32==n||160==n||5760==n||6158==n||8192<=n&&(8202>=n||8232==n||8233==n||8239==n||8287==n||12288==n||65279==n); -}function _(n,t){for(var r=-1,e=n.length,u=-1,i=[];++ro(t,l,0)&&u.push(l);return u}function at(n,t){var r=true;return Mu(n,function(n,e,u){return r=!!t(n,e,u)}),r}function ct(n,t,r,e){var u=e,i=u;return Mu(n,function(n,o,f){o=+t(n,o,f),(r(o,u)||o===e&&o===i)&&(u=o,i=n)}),i}function st(n,t){var r=[];return Mu(n,function(n,e,u){t(n,e,u)&&r.push(n); -}),r}function pt(n,t,r,e){var u;return r(n,function(n,r,i){return t(n,r,i)?(u=e?r:n,false):void 0}),u}function ht(n,t,r){for(var e=-1,u=n.length,i=-1,o=[];++et&&(t=-t>u?0:u+t),r=r===m||r>u?u:+r||0,0>r&&(r+=u),u=t>r?0:r-t>>>0,t>>>=0,r=Me(u);++eu(l,s,0)&&((t||f)&&l.push(s),a.push(c))}return a}function Ft(n,t){for(var r=-1,e=t.length,u=Me(e);++r>>1,o=n[i];(r?o<=t:ou?m:i,u=1);++earguments.length;return typeof e=="function"&&i===m&&Ti(r)?n(r,e,u,o):Et(r,mr(e,i,4),u,o,t)}}function sr(n,t,r,e,u,i,o,f,l,a){function c(){for(var w=arguments.length,A=w,j=Me(w);A--;)j[A]=arguments[A];if(e&&(j=qt(j,e,u)),i&&(j=Dt(j,i,o)),v||y){var A=c.placeholder,k=_(j,A),w=w-k.length; -if(wt?0:t)):[]}function qr(n,t,r){var e=n?n.length:0;return e?((r?Cr(n,t,r):null==t)&&(t=1), -t=e-(+t||0),Ct(n,0,0>t?0:t)):[]}function Dr(n){return n?n[0]:m}function Kr(n,t,e){var u=n?n.length:0;if(!u)return-1;if(typeof e=="number")e=0>e?ku(u+e,0):e;else if(e)return e=zt(n,t),n=n[e],(t===t?t===n:n!==n)?e:-1;return r(n,t,e||0)}function Vr(n){var t=n?n.length:0;return t?n[t-1]:m}function Yr(n){return Pr(n,1)}function Zr(n,t,e,u){if(!n||!n.length)return[];null!=t&&typeof t!="boolean"&&(u=e,e=Cr(n,t,u)?null:t,t=false);var i=mr();if((null!=e||i!==it)&&(e=i(e,u,3)),t&&br()==r){t=e;var o;e=-1,u=n.length; -for(var i=-1,f=[];++er?ku(u+r,0):r||0,typeof n=="string"||!Ti(n)&&me(n)?rt?0:+t||0,e);++r=n&&(t=null),r}}function fe(n,t,r){function e(){var r=t-(wi()-a);0>=r||r>t?(f&&cu(f),r=p,f=s=p=m,r&&(h=wi(),l=n.apply(c,o),s||f||(o=c=null))):s=gu(e,r)}function u(){s&&cu(s),f=s=p=m,(v||_!==t)&&(h=wi(),l=n.apply(c,o),s||f||(o=c=null))}function i(){if(o=arguments,a=wi(),c=this,p=v&&(s||!g),false===_)var r=g&&!s;else{f||g||(h=a);var i=_-(a-h),y=0>=i||i>_;y?(f&&(f=cu(f)),h=a,l=n.apply(c,o)):f||(f=gu(u,i))}return y&&s?s=cu(s):s||t===_||(s=gu(e,t)),r&&(y=true,l=n.apply(c,o)), -!y||s||f||(o=c=null),l}var o,f,l,a,c,s,p,h=0,_=false,v=true;if(typeof n!="function")throw new Je(N);if(t=0>t?0:+t||0,true===r)var g=true,v=false;else ve(r)&&(g=r.leading,_="maxWait"in r&&ku(+r.maxWait||0,t),v="trailing"in r?r.trailing:v);return i.cancel=function(){s&&cu(s),f&&cu(f),f=s=p=m},i}function le(n,t){function r(){var e=arguments,u=t?t.apply(this,e):e[0],i=r.cache;return i.has(u)?i.get(u):(e=n.apply(this,e),r.cache=i.set(u,e),e)}if(typeof n!="function"||t&&typeof t!="function")throw new Je(N);return r.cache=new le.Cache, -r}function ae(n,t){if(typeof n!="function")throw new Je(N);return t=ku(t===m?n.length-1:+t||0,0),function(){for(var r=arguments,e=-1,u=ku(r.length-t,0),i=Me(u);++et}function se(n){return p(n)&&Ir(n)&&uu.call(n)==z}function pe(n){return!!n&&1===n.nodeType&&p(n)&&-1t||!n||!Au(t))return r;do t%2&&(r+=n),t=su(t/2),n+=n;while(t);return r}function Se(n,t,r){var e=n;return(n=u(n))?(r?Cr(e,t,r):null==t)?n.slice(v(n),g(n)+1):(t+="",n.slice(i(n,t),o(n,t)+1)):n}function Te(n,t,r){ -return r&&Cr(n,t,r)&&(t=null),n=u(n),n.match(t||Wn)||[]}function Ue(n,t,r){return r&&Cr(n,t,r)&&(t=null),p(n)?Ne(n):it(n,t)}function $e(n){return function(){return n}}function Fe(n){return n}function Ne(n){return xt(ot(n,true))}function Le(n,t,r){if(null==r){var e=ve(t),u=e?Ki(t):null;((u=u&&u.length?yt(t,u):null)?u.length:e)||(u=false,r=t,t=n,n=this)}u||(u=yt(t,Ki(t)));var i=true,e=-1,o=$i(n),f=u.length;false===r?i=false:ve(r)&&"chain"in r&&(i=r.chain);for(;++e=S)return r}else n=0;return Ku(r,e)}}(),Ju=ae(function(n,t){return Ir(n)?lt(n,ht(t,false,true)):[]}),Xu=tr(),Hu=tr(true),Qu=ae(function(n){for(var t=n.length,e=t,u=Me(c),i=br(),o=i==r,f=[];e--;){var l=n[e]=Ir(l=n[e])?l:[];u[e]=o&&120<=l.length?Vu(e&&l):null}var o=n[0],a=-1,c=o?o.length:0,s=u[0]; -n:for(;++a(s?qn(s,l):i(f,l,0))){for(e=t;--e;){var p=u[e];if(0>(p?qn(p,l):i(n[e],l,0)))continue n}s&&s.push(l),f.push(l)}return f}),ni=ae(function(t,r){r=ht(r);var e=et(t,r);return Rt(t,r.sort(n)),e}),ti=_r(),ri=_r(true),ei=ae(function(n){return $t(ht(n,false,true))}),ui=ae(function(n,t){return Ir(n)?lt(n,t):[]}),ii=ae(Gr),oi=ae(function(n){var t=n.length,r=2--n?t.apply(this,arguments):void 0}},Nn.ary=function(n,t,r){return r&&Cr(n,t,r)&&(t=null),t=n&&null==t?n.length:ku(+t||0,0),vr(n,I,null,null,null,null,t)},Nn.assign=Ni,Nn.at=fi,Nn.before=oe,Nn.bind=bi,Nn.bindAll=xi,Nn.bindKey=Ai,Nn.callback=Ue,Nn.chain=Hr,Nn.chunk=function(n,t,r){t=(r?Cr(n,t,r):null==t)?1:ku(+t||1,1),r=0;for(var e=n?n.length:0,u=-1,i=Me(au(e/t));rr&&(r=-r>u?0:u+r),e=e===m||e>u?u:+e||0,0>e&&(e+=u),u=r>e?0:e>>>0,r>>>=0;rt?0:t)):[]},Nn.takeRight=function(n,t,r){var e=n?n.length:0;return e?((r?Cr(n,t,r):null==t)&&(t=1),t=e-(+t||0),Ct(n,0>t?0:t)):[]},Nn.takeRightWhile=function(n,t,r){return n&&n.length?Nt(n,mr(t,r,3),false,true):[]},Nn.takeWhile=function(n,t,r){return n&&n.length?Nt(n,mr(t,r,3)):[]; -},Nn.tap=function(n,t,r){return t.call(r,n),n},Nn.throttle=function(n,t,r){var e=true,u=true;if(typeof n!="function")throw new Je(N);return false===r?e=false:ve(r)&&(e="leading"in r?!!r.leading:e,u="trailing"in r?!!r.trailing:u),Fn.leading=e,Fn.maxWait=+t,Fn.trailing=u,fe(n,t,Fn)},Nn.thru=Qr,Nn.times=function(n,t,r){if(n=su(n),1>n||!Au(n))return[];var e=-1,u=Me(Ou(n,4294967295));for(t=Mt(t,r,1);++ee?u[e]=t(e):t(e);return u},Nn.toArray=xe,Nn.toPlainObject=Ae,Nn.transform=function(n,t,r,e){var u=Ti(n)||we(n); -return t=mr(t,e,4),null==r&&(u||ve(n)?(e=n.constructor,r=u?Ti(n)?new e:[]:Bu($i(e)?e.prototype:null)):r={}),(u?Kn:vt)(n,function(n,e,u){return t(r,n,e,u)}),r},Nn.union=ei,Nn.uniq=Zr,Nn.unzip=Gr,Nn.unzipWith=Jr,Nn.values=Re,Nn.valuesIn=function(n){return Ft(n,ke(n))},Nn.where=function(n,t){return te(n,xt(t))},Nn.without=ui,Nn.wrap=function(n,t){return t=null==t?Fe:t,vr(t,O,null,[n],[])},Nn.xor=function(){for(var n=-1,t=arguments.length;++nr?0:+r||0,e),r-=t.length,0<=r&&n.indexOf(t,r)==r},Nn.escape=function(n){return(n=u(n))&&pn.test(n)?n.replace(cn,a):n},Nn.escapeRegExp=Ee,Nn.every=ne,Nn.find=ai,Nn.findIndex=Xu,Nn.findKey=zi,Nn.findLast=ci,Nn.findLastIndex=Hu,Nn.findLastKey=Bi,Nn.findWhere=function(n,t){return ai(n,xt(t))},Nn.first=Dr,Nn.get=function(n,t,r){ -return n=null==n?m:dt(n,Br(t),t+""),n===m?r:n},Nn.gt=ce,Nn.gte=function(n,t){return n>=t},Nn.has=function(n,t){if(null==n)return false;var r=ru.call(n,t);if(!r&&!Wr(t)){if(t=Br(t),n=1==t.length?n:dt(n,Ct(t,0,-1)),null==n)return false;t=Vr(t),r=ru.call(n,t)}return r||Tr(n.length)&&Er(t,n.length)&&(Ti(n)||se(n))},Nn.identity=Fe,Nn.includes=re,Nn.indexOf=Kr,Nn.inRange=function(n,t,r){return t=+t||0,"undefined"===typeof r?(r=t,t=0):r=+r||0,n>=Ou(t,r)&&nr?ku(e+r,0):Ou(r||0,e-1))+1;else if(r)return u=zt(n,t,true)-1,n=n[u],(t===t?t===n:n!==n)?u:-1;if(t!==t)return s(n,u,true);for(;u--;)if(n[u]===t)return u;return-1},Nn.lt=be,Nn.lte=function(n,t){return n<=t},Nn.max=oo,Nn.min=fo,Nn.noConflict=function(){return h._=iu,this},Nn.noop=ze,Nn.now=wi, -Nn.pad=function(n,t,r){n=u(n),t=+t;var e=n.length;return er?0:+r||0,n.length),n.lastIndexOf(t,r)==r},Nn.sum=function(n,t,r){r&&Cr(n,t,r)&&(t=null);var e=mr(),u=null==t;if(u&&e===it||(u=false, -t=e(t,r,3)),u){for(n=Ti(n)?n:Lr(n),t=n.length,r=0;t--;)r+=+n[t]||0;n=r}else n=Ut(n,t);return n},Nn.template=function(n,t,r){var e=Nn.templateSettings;r&&Cr(n,t,r)&&(t=r=null),n=u(n),t=tt(rt({},r||t),e,nt),r=tt(rt({},t.imports),e.imports,nt);var i,o,f=Ki(r),l=Ft(r,f),a=0;r=t.interpolate||En;var s="__p+='";r=Ze((t.escape||En).source+"|"+r.source+"|"+(r===vn?An:En).source+"|"+(t.evaluate||En).source+"|$","g");var p="sourceURL"in t?"//# sourceURL="+t.sourceURL+"\n":"";if(n.replace(r,function(t,r,e,u,f,l){ -return e||(e=u),s+=n.slice(a,l).replace(Cn,c),r&&(i=true,s+="'+__e("+r+")+'"),f&&(o=true,s+="';"+f+";\n__p+='"),e&&(s+="'+((__t=("+e+"))==null?'':__t)+'"),a=l+t.length,t}),s+="';",(t=t.variable)||(s="with(obj){"+s+"}"),s=(o?s.replace(on,""):s).replace(fn,"$1").replace(ln,"$1;"),s="function("+(t||"obj")+"){"+(t?"":"obj||(obj={});")+"var __t,__p=''"+(i?",__e=_.escape":"")+(o?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+s+"return __p}",t=eo(function(){return De(f,p+"return "+s).apply(m,l); -}),t.source=s,_e(t))throw t;return t},Nn.trim=Se,Nn.trimLeft=function(n,t,r){var e=n;return(n=u(n))?n.slice((r?Cr(e,t,r):null==t)?v(n):i(n,t+"")):n},Nn.trimRight=function(n,t,r){var e=n;return(n=u(n))?(r?Cr(e,t,r):null==t)?n.slice(0,g(n)+1):n.slice(0,o(n,t+"")+1):n},Nn.trunc=function(n,t,r){r&&Cr(n,t,r)&&(t=null);var e=C;if(r=W,null!=t)if(ve(t)){var i="separator"in t?t.separator:i,e="length"in t?+t.length||0:e;r="omission"in t?u(t.omission):r}else e=+t||0;if(n=u(n),e>=n.length)return n;if(e-=r.length, -1>e)return r;if(t=n.slice(0,e),null==i)return t+r;if(de(i)){if(n.slice(e).search(i)){var o,f=n.slice(0,e);for(i.global||(i=Ze(i.source,(jn.exec(i)||"")+"g")),i.lastIndex=0;n=i.exec(f);)o=n.index;t=t.slice(0,null==o?e:o)}}else n.indexOf(i,e)!=e&&(i=t.lastIndexOf(i),-1u.__dir__?"Right":"")}),u},Bn.prototype[n+"Right"]=function(t){return this.reverse()[n](t).reverse(); -},Bn.prototype[n+"RightWhile"]=function(n,t){return this.reverse()[r](n,t).reverse()}}),Kn(["first","last"],function(n,t){var r="take"+(t?"Right":"");Bn.prototype[n]=function(){return this[r](1).value()[0]}}),Kn(["initial","rest"],function(n,t){var r="drop"+(t?"":"Right");Bn.prototype[n]=function(){return this[r](1)}}),Kn(["pluck","where"],function(n,t){var r=t?"filter":"map",e=t?xt:Be;Bn.prototype[n]=function(n){return this[r](e(n))}}),Bn.prototype.compact=function(){return this.filter(Fe)},Bn.prototype.reject=function(n,t){ -return n=mr(n,t,1),this.filter(function(t){return!n(t)})},Bn.prototype.slice=function(n,t){n=null==n?0:+n||0;var r=this;return 0>n?r=this.takeRight(-n):n&&(r=this.drop(n)),t!==m&&(t=+t||0,r=0>t?r.dropRight(-t):r.take(t-n)),r},Bn.prototype.toArray=function(){return this.drop(0)},vt(Bn.prototype,function(n,t){var r=Nn[t];if(r){var e=/^(?:filter|map|reject)|While$/.test(t),u=/^(?:first|last)$/.test(t);Nn.prototype[t]=function(){function t(n){return n=[n],_u.apply(n,i),r.apply(Nn,n)}var i=arguments,o=this.__chain__,f=this.__wrapped__,l=!!this.__actions__.length,a=f instanceof Bn,c=i[0],s=a||Ti(f); -return s&&e&&typeof c=="function"&&1!=c.length&&(a=s=false),a=a&&!l,u&&!o?a?n.call(f):r.call(Nn,this.value()):s?(f=n.apply(a?f:new Bn(this),i),u||!l&&!f.__actions__||(f.__actions__||(f.__actions__=[])).push({func:Qr,args:[t],thisArg:Nn}),new zn(f,o)):this.thru(t)}}}),Kn("concat join pop push replace shift sort splice split unshift".split(" "),function(n){var t=(/^(?:replace|split)$/.test(n)?Qe:Xe)[n],r=/^(?:push|sort|unshift)$/.test(n)?"tap":"thru",e=/^(?:join|pop|replace|shift)$/.test(n);Nn.prototype[n]=function(){ -var n=arguments;return e&&!this.__chain__?t.apply(this.value(),n):this[r](function(r){return t.apply(r,n)})}}),vt(Bn.prototype,function(n,t){var r=Nn[t];if(r){var e=r.name;(Lu[e]||(Lu[e]=[])).push({name:t,func:r})}}),Lu[sr(null,x).name]=[{name:"wrapper",func:null}],Bn.prototype.clone=function(){var n=this.__actions__,t=this.__iteratees__,r=this.__views__,e=new Bn(this.__wrapped__);return e.__actions__=n?Dn(n):null,e.__dir__=this.__dir__,e.__filtered__=this.__filtered__,e.__iteratees__=t?Dn(t):null, -e.__takeCount__=this.__takeCount__,e.__views__=r?Dn(r):null,e},Bn.prototype.reverse=function(){if(this.__filtered__){var n=new Bn(this);n.__dir__=-1,n.__filtered__=true}else n=this.clone(),n.__dir__*=-1;return n},Bn.prototype.value=function(){var n=this.__wrapped__.value();if(!Ti(n))return Lt(n,this.__actions__);var t,r=this.__dir__,e=0>r;t=n.length;for(var u=this.__views__,i=0,o=-1,f=u?u.length:0;++op.index:u=_:!h(s))))continue n}else if(p=h(s),_==F)s=p;else if(!p){if(_==$)continue n;break n}}a[l++]=s}return a},Nn.prototype.chain=function(){ -return Hr(this)},Nn.prototype.commit=function(){return new zn(this.value(),this.__chain__)},Nn.prototype.plant=function(n){for(var t,r=this;r instanceof Ln;){var e=Mr(r);t?u.__wrapped__=e:t=e;var u=e,r=r.__wrapped__}return u.__wrapped__=n,t},Nn.prototype.reverse=function(){var n=this.__wrapped__;return n instanceof Bn?(this.__actions__.length&&(n=new Bn(this)),new zn(n.reverse(),this.__chain__)):this.thru(function(n){return n.reverse()})},Nn.prototype.toString=function(){return this.value()+""},Nn.prototype.run=Nn.prototype.toJSON=Nn.prototype.valueOf=Nn.prototype.value=function(){ -return Lt(this.__wrapped__,this.__actions__)},Nn.prototype.collect=Nn.prototype.map,Nn.prototype.head=Nn.prototype.first,Nn.prototype.select=Nn.prototype.filter,Nn.prototype.tail=Nn.prototype.rest,Nn}var m,w="3.9.3",b=1,x=2,A=4,j=8,k=16,O=32,R=64,I=128,E=256,C=30,W="...",S=150,T=16,U=0,$=1,F=2,N="Expected a function",L="__lodash_placeholder__",z="[object Arguments]",B="[object Array]",M="[object Boolean]",P="[object Date]",q="[object Error]",D="[object Function]",K="[object Number]",V="[object Object]",Y="[object RegExp]",Z="[object String]",G="[object ArrayBuffer]",J="[object Float32Array]",X="[object Float64Array]",H="[object Int8Array]",Q="[object Int16Array]",nn="[object Int32Array]",tn="[object Uint8Array]",rn="[object Uint8ClampedArray]",en="[object Uint16Array]",un="[object Uint32Array]",on=/\b__p\+='';/g,fn=/\b(__p\+=)''\+/g,ln=/(__e$.*?$|\b__t\))\+'';/g,an=/&(?:amp|lt|gt|quot|#39|#96);/g,cn=/[&<>"'`]/g,sn=RegExp(an.source),pn=RegExp(cn.source),hn=/<%-([\s\S]+?)%>/g,_n=/<%([\s\S]+?)%>/g,vn=/<%=([\s\S]+?)%>/g,gn=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\n\\]|\\.)*?\1)\]/,yn=/^\w*$/,dn=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\n\\]|\\.)*?)\2)\]/g,mn=/[.*+?^${}()|[\]\/\\]/g,wn=RegExp(mn.source),bn=/[\u0300-\u036f\ufe20-\ufe23]/g,xn=/\$\$?/g,An=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,jn=/\w*$/,kn=/^0[xX]/,On=/^\[object .+?Constructor\]$/,Rn=/^\d+$/,In=/[\xc0-\xd6\xd8-\xde\xdf-\xf6\xf8-\xff]/g,En=/($^)/,Cn=/['\n\r\u2028\u2029\\]/g,Wn=RegExp("[A-Z\\xc0-\\xd6\\xd8-\\xde]+(?=[A-Z\\xc0-\\xd6\\xd8-\\xde][a-z\\xdf-\\xf6\\xf8-\\xff]+)|[A-Z\\xc0-\\xd6\\xd8-\\xde]?[a-z\\xdf-\\xf6\\xf8-\\xff]+|[A-Z\\xc0-\\xd6\\xd8-\\xde]+|[0-9]+","g"),Sn=" \t\x0b\f\xa0\ufeff\n\r\u2028\u2029\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000",Tn="Array ArrayBuffer Date Error Float32Array Float64Array Function Int8Array Int16Array Int32Array Math Number Object RegExp Set String _ clearTimeout document isFinite parseFloat parseInt setTimeout TypeError Uint8Array Uint8ClampedArray Uint16Array Uint32Array WeakMap window".split(" "),Un={}; -Un[J]=Un[X]=Un[H]=Un[Q]=Un[nn]=Un[tn]=Un[rn]=Un[en]=Un[un]=true,Un[z]=Un[B]=Un[G]=Un[M]=Un[P]=Un[q]=Un[D]=Un["[object Map]"]=Un[K]=Un[V]=Un[Y]=Un["[object Set]"]=Un[Z]=Un["[object WeakMap]"]=false;var $n={};$n[z]=$n[B]=$n[G]=$n[M]=$n[P]=$n[J]=$n[X]=$n[H]=$n[Q]=$n[nn]=$n[K]=$n[V]=$n[Y]=$n[Z]=$n[tn]=$n[rn]=$n[en]=$n[un]=true,$n[q]=$n[D]=$n["[object Map]"]=$n["[object Set]"]=$n["[object WeakMap]"]=false;var Fn={leading:false,maxWait:0,trailing:false},Nn={"\xc0":"A","\xc1":"A","\xc2":"A","\xc3":"A","\xc4":"A","\xc5":"A", -"\xe0":"a","\xe1":"a","\xe2":"a","\xe3":"a","\xe4":"a","\xe5":"a","\xc7":"C","\xe7":"c","\xd0":"D","\xf0":"d","\xc8":"E","\xc9":"E","\xca":"E","\xcb":"E","\xe8":"e","\xe9":"e","\xea":"e","\xeb":"e","\xcc":"I","\xcd":"I","\xce":"I","\xcf":"I","\xec":"i","\xed":"i","\xee":"i","\xef":"i","\xd1":"N","\xf1":"n","\xd2":"O","\xd3":"O","\xd4":"O","\xd5":"O","\xd6":"O","\xd8":"O","\xf2":"o","\xf3":"o","\xf4":"o","\xf5":"o","\xf6":"o","\xf8":"o","\xd9":"U","\xda":"U","\xdb":"U","\xdc":"U","\xf9":"u","\xfa":"u", -"\xfb":"u","\xfc":"u","\xdd":"Y","\xfd":"y","\xff":"y","\xc6":"Ae","\xe6":"ae","\xde":"Th","\xfe":"th","\xdf":"ss"},Ln={"&":"&","<":"<",">":">",'"':""","'":"'","`":"`"},zn={"&":"&","<":"<",">":">",""":'"',"'":"'","`":"`"},Bn={"function":true,object:true},Mn={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},Pn=Bn[typeof exports]&&exports&&!exports.nodeType&&exports,qn=Bn[typeof module]&&module&&!module.nodeType&&module,Dn=Bn[typeof self]&&self&&self.Object&&self,Kn=Bn[typeof window]&&window&&window.Object&&window,Vn=qn&&qn.exports===Pn&&Pn,Yn=Pn&&qn&&typeof global=="object"&&global&&global.Object&&global||Kn!==(this&&this.window)&&Kn||Dn||this,Zn=d(); -typeof define=="function"&&typeof define.amd=="object"&&define.amd?(Yn._=Zn, define(function(){return Zn})):Pn&&qn?Vn?(qn.exports=Zn)._=Zn:Pn._=Zn:Yn._=Zn}).call(this); \ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/js/vectorizer.js b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/js/vectorizer.js deleted file mode 100644 index fe2a05da1..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/js/vectorizer.js +++ /dev/null @@ -1,1055 +0,0 @@ -/*! JointJS v0.9.3 - JavaScript diagramming library 2015-05-22 - - -This Source Code Form is subject to the terms of the Mozilla Public -License, v. 2.0. If a copy of the MPL was not distributed with this -file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ -// Vectorizer. -// ----------- - -// A tiny library for making your live easier when dealing with SVG. -// The only Vectorizer dependency is the Geometry library. - -// Copyright Â© 2012 - 2015 client IO (http://client.io) - -(function(root, factory) { - - if (typeof define === 'function' && define.amd) { - - // AMD. Register as an anonymous module. - define(['app/gbp-old/js/geometry'], function(g) { - return factory(g); - }); - - - } else if (typeof exports === 'object') { - - // Node. Does not work with strict CommonJS, but - // only CommonJS-like environments that support module.exports, - // like Node. - module.exports = factory(); - - } else { - - // Browser globals. - root.Vectorizer = root.V = factory(); - - } - -}(this, function(g) { - - var SVGsupported = typeof window === 'object' && !!(window.SVGAngle || document.implementation.hasFeature('http://www.w3.org/TR/SVG11/feature#BasicStructure', '1.1')); - - // SVG support is required. - if (!SVGsupported) return function() {}; - - // XML namespaces. - var ns = { - xmlns: 'http://www.w3.org/2000/svg', - xlink: 'http://www.w3.org/1999/xlink' - }; - // SVG version. - var SVGversion = '1.1'; - - // A function returning a unique identifier for this client session with every call. - var idCounter = 0; - function uniqueId() { - var id = ++idCounter + ''; - return 'v-' + id; - } - - // Create an SVG document element. - // If `content` is passed, it will be used as the SVG content of the `

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/actions.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/actions.tpl.html deleted file mode 100644 index cfc2833b9..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/actions.tpl.html +++ /dev/null @@ -1,50 +0,0 @@ -

Actions

- -

- - - - - -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/box/contract-content-static.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/box/contract-content-static.tpl.html deleted file mode 100644 index d8b37ff94..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/box/contract-content-static.tpl.html +++ /dev/null @@ -1,106 +0,0 @@ -

Contract

- -

- Id: - {{selectedObj.id}} -

- -

- Description: - {{selectedObj.description}} -

- -

- Parent: - {{selectedObj.parent}} -

- -

- Clause - -

- Name: - {{clause.name}} -

- -

- Clause subjects: - {{subj}} -

- - -

- Subject -

- Name: - {{subject.name}} - -

- -

- Provider list: - - {{provider}} - -

- -

- Consumer list: - - {{consumer}} - -

- -

- Rule -

- Name: - {{rule.name}} - - -

- Classifier ref - -

- Name: - {{classifier.name}} -

- -

- Instance name: - {{classifier['instance-name']}} -

- -

- Direction: - {{classifier.direction}} -

- -

- Connection tracking: - {{classifier['connection-tracking']}} -

- -

- - Action ref -

- Name: - {{action.name}} -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/box/ep-content-static.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/box/ep-content-static.tpl.html deleted file mode 100644 index d66656391..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/box/ep-content-static.tpl.html +++ /dev/null @@ -1,25 +0,0 @@ -

Endpoint

- -

- Endpoint group - {{selectedObj['endpoint-group']}} -

- -

- Network containment - {{selectedObj['network-containment']}} -

- -

- L2 Contect: - {{selectedObj['l2-context']}} -

- -

- MAC address - {{selectedObj['mac-address']}} -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/box/epg-content-static.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/box/epg-content-static.tpl.html deleted file mode 100644 index ae4075db0..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/box/epg-content-static.tpl.html +++ /dev/null @@ -1,73 +0,0 @@ -

Endpoint groups

- -

- Id: - {{selectedObj.id}} -

- -

- Name: - {{selectedObj.name}} -

- -

- Description: - {{selectedObj.description}} -

- -

- Intra group policy: - {{selectedObj['intra-group-policy']}} -

- -

- Network domain: - {{selectedObj['network-domain']}} -

- -

- Parent: - {{selectedObj.parent}} -

- -

- Consumer named selectors list - -

- -

- Name: - {{cns.name}} -

- -

- Contracts: - {{con}} -

- -

- Provider named selectors list - -

- -

- Name: - {{pns.name}} -

- -

- Contracts: - {{con}} -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/box/rule-content-static.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/box/rule-content-static.tpl.html deleted file mode 100644 index 2386bebf9..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/box/rule-content-static.tpl.html +++ /dev/null @@ -1,38 +0,0 @@ -

Rule

- -

- Name: - {{selectedObj.name}} - - -

- Classifier ref - -

- Name: - {{classifier.name}} -

- -

- Direction: - {{classifier.direction}} -

- -

- - Action ref - -

- Name: - {{action.name}} -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/box/subject-content-static.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/box/subject-content-static.tpl.html deleted file mode 100644 index 3216f88cf..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/box/subject-content-static.tpl.html +++ /dev/null @@ -1,85 +0,0 @@ -

Subject

- -

- Name: - {{selectedObj.name}} - -

- -

- Provider list (Endpoint groups): -

- {{getLabel(provider, 'providerItems')}} -

- -

- Consumer list (Endpoint groups): -

- {{getLabel(consumer, 'consumerItems')}} -

- -

Rules

- -

- Rule: - {{rule.name}} - - Classifier instances: -

- -

- Name: - {{classifier.name}} -

- -

- Instance name: - {{classifier['instance-name']}} -

- -

- Direction: - {{classifier.direction}} -

- Connection tracking: - {{classifier['connection-tracking']}} -

- - Parameters: - -

- {{param.name}}: - {{param['int-value']}} -

- -

- - Action ref - -

- Name: - {{action.name}} -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/classifier-ref.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/classifier-ref.tpl.html deleted file mode 100644 index 41d9163a5..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/classifier-ref.tpl.html +++ /dev/null @@ -1,41 +0,0 @@ -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/classifiers.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/classifiers.tpl.html deleted file mode 100644 index dc4e91d87..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/classifiers.tpl.html +++ /dev/null @@ -1,54 +0,0 @@ -

Classifiers

- -

- - Add classifiers - -

- Name - - - -

- -

- Definition - -

- -

- {{ parameter.name + ' (' + parameter.type + ')' }}: - -

- -

- - -

- - - - -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/clause.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/clause.tpl.html deleted file mode 100644 index d3d2af7c9..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/clause.tpl.html +++ /dev/null @@ -1,34 +0,0 @@ -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/cns.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/cns.tpl.html deleted file mode 100644 index 0869522a2..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/cns.tpl.html +++ /dev/null @@ -1,34 +0,0 @@ -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/contracts.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/contracts.tpl.html deleted file mode 100644 index f3f5ac88e..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/contracts.tpl.html +++ /dev/null @@ -1,46 +0,0 @@ -

- -

Contracts

- - -

- -

- - Add contract - -

- Id: - -

- -

- Description: - -

- -

- Parent: - -

- - -

- -

- - - - - -

- - diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/docs.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/docs.tpl.html deleted file mode 100644 index 4b16089ae..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/docs.tpl.html +++ /dev/null @@ -1,5 +0,0 @@ -

Docs

- - -

diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/endpoint.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/endpoint.tpl.html deleted file mode 100644 index 5a233c629..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/endpoint.tpl.html +++ /dev/null @@ -1,108 +0,0 @@ -

- -

Endpoint

- -

- - -

- Network containment: - -

- -

- Endpoint group: - -

- -

- Endpoint groups: - - -

- -

- Condition: - - -

- -

- L2 context: - - - -

- -

- MAC Address: - - - - -

- -

- L3 Address: - - -

- L3 Context: - -

- -

- IP Address: - - - - -

- -

- - -

- - - - - -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/epg.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/epg.tpl.html deleted file mode 100644 index 303e92919..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/epg.tpl.html +++ /dev/null @@ -1,64 +0,0 @@ -

Endpoint groups

- -

- - - - - -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/gateway.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/gateway.tpl.html deleted file mode 100644 index cbb96dab3..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/gateway.tpl.html +++ /dev/null @@ -1,25 +0,0 @@ -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/delivered-policy.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/delivered-policy.tpl.html deleted file mode 100644 index f576bcbfb..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/delivered-policy.tpl.html +++ /dev/null @@ -1,34 +0,0 @@ -

- Tenants list -

- -

- Delivered policy -

- - -

consumes
provides

- - -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/epg-detail.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/epg-detail.tpl.html deleted file mode 100644 index f15386aaa..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/epg-detail.tpl.html +++ /dev/null @@ -1,26 +0,0 @@ -

- Epg list -

- -

- Endpoint group detail -

- - -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/expressed-policy.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/expressed-policy.tpl.html deleted file mode 100644 index f9436285a..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/expressed-policy.tpl.html +++ /dev/null @@ -1,34 +0,0 @@ -

- Tenants list -

- -

- Expressed policy -

- - -

consumes
provides

- - -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/main.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/main.tpl.html deleted file mode 100644 index 21091d96e..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/main.tpl.html +++ /dev/null @@ -1,58 +0,0 @@ -

Health

- - -

- -

- Tenants list -

- -

- - -

- -

- Renderers list -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/node-structure.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/node-structure.tpl.html deleted file mode 100644 index 389638e4b..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/node-structure.tpl.html +++ /dev/null @@ -1,37 +0,0 @@ -

- -

- • - - - -

- -

- • - - {{ key }} - - {{value}} -

- -

- - -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/renderer-configuration.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/renderer-configuration.tpl.html deleted file mode 100644 index 96c5a6be8..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/renderer-configuration.tpl.html +++ /dev/null @@ -1 +0,0 @@ -renderer-configuration \ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/renderer-state.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/renderer-state.tpl.html deleted file mode 100644 index 17ab2a24a..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/renderer-state.tpl.html +++ /dev/null @@ -1,7 +0,0 @@ -

- diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/subject-detail.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/subject-detail.tpl.html deleted file mode 100644 index 149d5eeb2..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/governance/subject-detail.tpl.html +++ /dev/null @@ -1,25 +0,0 @@ -

- -

- Subject detail -

- - -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/index.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/index.tpl.html deleted file mode 100644 index 707af51f9..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/index.tpl.html +++ /dev/null @@ -1,10 +0,0 @@ -

- -

- - - - diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/l2l3.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/l2l3.tpl.html deleted file mode 100644 index 648b2f0cd..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/l2l3.tpl.html +++ /dev/null @@ -1,175 +0,0 @@ -

- -

- -

- -

- -

- -

- -

- -

- -

- -

- -

- - - -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/l3-endpoint.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/l3-endpoint.tpl.html deleted file mode 100644 index ff6460931..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/l3-endpoint.tpl.html +++ /dev/null @@ -1,130 +0,0 @@ -

- -

L3 Prefix Endpoint

- -

- - -

- Endpoint group: - -

- -

- Endpoint groups: - - -

- -

- Condition: - - -

- -

- L3 Context: - - - -

- -

- L2 gateways: - - -

- L2 context: - -

- -

- MAC Address: - - - -

- -

- L3 gateways: - - -

- L3 Context: - -

- -

- IP Address: - - - -

- -

- IP prefix: - - - - -

- - -

- - - - - -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/main/governance.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/main/governance.tpl.html deleted file mode 100644 index 317d2fd97..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/main/governance.tpl.html +++ /dev/null @@ -1,22 +0,0 @@ -

- -

- - - - -

- diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/main/main.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/main/main.tpl.html deleted file mode 100644 index f9cfa6fb9..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/main/main.tpl.html +++ /dev/null @@ -1,39 +0,0 @@ -

GBP

- - \ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/main/policy-renderer.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/main/policy-renderer.tpl.html deleted file mode 100644 index 4983e0dfe..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/main/policy-renderer.tpl.html +++ /dev/null @@ -1,141 +0,0 @@ -

- -

- - -

- Rule:{{rule.name}} -

- Classifier: -

{{key}}: {{value}}

- Action: -

{{key}}: {{value}}

- - -

- -

- Topology type: -

- - - -

- -

- - -

- -

- Tenants list -

- -

- - - - -

- - - -

- - -

- - - - -

- -

- - - -

- -

diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/menu/main-menu.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/menu/main-menu.tpl.html deleted file mode 100644 index 1a86da3d7..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/menu/main-menu.tpl.html +++ /dev/null @@ -1,31 +0,0 @@ -

- -

- - - -

- - - - - - - -

- - - - -

- diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/parts/breadcrumbs.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/parts/breadcrumbs.tpl.html deleted file mode 100644 index b4ea0dd8c..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/parts/breadcrumbs.tpl.html +++ /dev/null @@ -1 +0,0 @@ -{{ key !== 'l1' ? ' > ' : ''}}{{value}} \ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/parts/crud-endpoint.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/parts/crud-endpoint.tpl.html deleted file mode 100644 index d3a99343b..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/parts/crud-endpoint.tpl.html +++ /dev/null @@ -1,32 +0,0 @@ -

- {{ crudLabel }} - - -

- -

- Endpoint group - -

- -

- Network containment - -

- -

- - -

- -

- - - -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/parts/crud.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/parts/crud.tpl.html deleted file mode 100644 index 141bdd0df..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/parts/crud.tpl.html +++ /dev/null @@ -1,15 +0,0 @@ -

- {{ crudLabel }} - -

- -

- - - -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/parts/param.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/parts/param.tpl.html deleted file mode 100644 index a6862efa9..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/parts/param.tpl.html +++ /dev/null @@ -1,5 +0,0 @@ -

- {{ param.name }} : - - -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/pns.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/pns.tpl.html deleted file mode 100644 index 67889bc6a..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/pns.tpl.html +++ /dev/null @@ -1,37 +0,0 @@ -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/prefix.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/prefix.tpl.html deleted file mode 100644 index 2d8ee0352..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/prefix.tpl.html +++ /dev/null @@ -1,21 +0,0 @@ -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/root.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/root.tpl.html deleted file mode 100644 index b07c00c51..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/root.tpl.html +++ /dev/null @@ -1 +0,0 @@ -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/rules.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/rules.tpl.html deleted file mode 100644 index 6bffd4004..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/rules.tpl.html +++ /dev/null @@ -1,36 +0,0 @@ -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/subjects.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/subjects.tpl.html deleted file mode 100644 index 1973ebe47..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/subjects.tpl.html +++ /dev/null @@ -1,31 +0,0 @@ -

- -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/tenants.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/tenants.tpl.html deleted file mode 100644 index 95228f77e..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/tenants.tpl.html +++ /dev/null @@ -1,38 +0,0 @@ -

- -

Tenants

- - -

- -

- - - - - -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/wizards/accessModelWizard.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/wizards/accessModelWizard.tpl.html deleted file mode 100644 index f007c8f21..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/wizards/accessModelWizard.tpl.html +++ /dev/null @@ -1,400 +0,0 @@ -

- - -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/wizards/actionReferenceWizard.tpl.html b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/wizards/actionReferenceWizard.tpl.html deleted file mode 100644 index 5190c7963..000000000 --- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/views/wizards/actionReferenceWizard.tpl.html +++ /dev/null @@ -1,153 +0,0 @@ -

- -

- - -

- Action references list: - - - - - - - - - - - - - - - -

Order	Name
{{action.order}}	{{action.name}}	- - -

- -

- Add actions - -

- Name - - - -

- -

- Definition - -

- -

- {{ parameter.name + ' (' + parameter.type + ')' }}: - -

- Pick SFC: - - - - - - - - - - - - - - - - - - -

Symmetric	Name	Functions	Action
{{chain.symmetric}}	{{chain.name}}	- - - {{function.name + ' - ' + function.type}} - - -	- -

- {{ parameter.name + ' (' + parameter.type + ')' }}: - - - -

- - -

\ No newline at end of file diff --git a/groupbasedpolicy-old-ui/pom.xml b/groupbasedpolicy-old-ui/pom.xml deleted file mode 100644 index 9f9ed01a2..000000000 --- a/groupbasedpolicy-old-ui/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - 4.0.0 - - org.opendaylight.groupbasedpolicy - groupbasedpolicy-old-ui - groupbasedpolicy-old-ui - Resources - 0.4.0-SNAPSHOT - pom - - - 3.0 - - - - module - bundle - - - diff --git a/pom.xml b/pom.xml index cbf1f5bbd..ba05e3a48 100644 --- a/pom.xml +++ b/pom.xml @@ -31,9 +31,7 @@ neutron-mapper neutron-vpp-mapper neutron-ovsdb - ui-backend groupbasedpolicy-ui - groupbasedpolicy-old-ui distribution-karaf features sxp-mapper diff --git a/ui-backend/pom.xml b/ui-backend/pom.xml deleted file mode 100644 index 2516e069b..000000000 --- a/ui-backend/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - 4.0.0 - - - org.opendaylight.controller - config-parent - 0.5.0-SNAPSHOT - - - - org.opendaylight.groupbasedpolicy - ui-backend - 0.4.0-SNAPSHOT - bundle - - - - org.opendaylight.groupbasedpolicy - groupbasedpolicy - ${project.version} - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - - - - ${project.basedir}/META-INF - - - - - \ No newline at end of file diff --git a/ui-backend/src/main/config/default-config.xml b/ui-backend/src/main/config/default-config.xml deleted file mode 100755 index d8d994571..000000000 --- a/ui-backend/src/main/config/default-config.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - binding-impl:ui-backend-impl - - ui-backend-impl - - - - binding:binding-async-data-broker - - binding-data-broker - - - - - binding:binding-rpc-registry - - binding-rpc-broker - - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:ui-backend:impl?module=ui-backend-impl&revision=2015-05-11 - - - diff --git a/ui-backend/src/main/java/org/opendaylight/controller/config/yang/config/ui_backend/impl/UiBackendModule.java b/ui-backend/src/main/java/org/opendaylight/controller/config/yang/config/ui_backend/impl/UiBackendModule.java deleted file mode 100644 index a9c45960c..000000000 --- a/ui-backend/src/main/java/org/opendaylight/controller/config/yang/config/ui_backend/impl/UiBackendModule.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.ui_backend.impl; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.groupbasedpolicy.ui.backend.UiBackendServiceImpl; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.Preconditions; - -public class UiBackendModule extends org.opendaylight.controller.config.yang.config.ui_backend.impl.AbstractUiBackendModule { - - private static final Logger LOG = LoggerFactory.getLogger(UiBackendModule.class); - - public UiBackendModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public UiBackendModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.ui_backend.impl.UiBackendModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public java.lang.AutoCloseable createInstance() { - DataBroker dataProvider = Preconditions.checkNotNull(getDataBrokerDependency()); - final UiBackendServiceImpl pgnApplicationService = new UiBackendServiceImpl(dataProvider, - getRpcRegistryDependency()); - LOG.info("ui-backend started."); - - return new AutoCloseable() { - - @Override - public void close() throws Exception { - pgnApplicationService.close(); - } - }; - } - -} diff --git a/ui-backend/src/main/java/org/opendaylight/controller/config/yang/config/ui_backend/impl/UiBackendModuleFactory.java b/ui-backend/src/main/java/org/opendaylight/controller/config/yang/config/ui_backend/impl/UiBackendModuleFactory.java deleted file mode 100644 index e9c5ba22a..000000000 --- a/ui-backend/src/main/java/org/opendaylight/controller/config/yang/config/ui_backend/impl/UiBackendModuleFactory.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -/* -* Generated file -* -* Generated from: yang module name: ui-backend-impl yang module local name: ui-backend-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Mon May 11 01:23:43 CEST 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.ui_backend.impl; -public class UiBackendModuleFactory extends org.opendaylight.controller.config.yang.config.ui_backend.impl.AbstractUiBackendModuleFactory { - -} diff --git a/ui-backend/src/main/java/org/opendaylight/groupbasedpolicy/ui/backend/UiBackendServiceImpl.java b/ui-backend/src/main/java/org/opendaylight/groupbasedpolicy/ui/backend/UiBackendServiceImpl.java deleted file mode 100755 index 50164c9ec..000000000 --- a/ui-backend/src/main/java/org/opendaylight/groupbasedpolicy/ui/backend/UiBackendServiceImpl.java +++ /dev/null @@ -1,243 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.groupbasedpolicy.ui.backend; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.concurrent.Future; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.groupbasedpolicy.dto.EgKey; -import org.opendaylight.groupbasedpolicy.dto.IndexedTenant; -import org.opendaylight.groupbasedpolicy.dto.Policy; -import org.opendaylight.groupbasedpolicy.dto.RuleGroup; -import org.opendaylight.groupbasedpolicy.util.PolicyResolverUtils; -import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.EndpointGroupId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.TenantId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.Endpoints; -import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoints.Endpoint; -import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.Tenants; -import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.Tenant; -import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.TenantKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.contract.subject.Rule; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.GetEndpointsFromEndpointGroupInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.GetEndpointsFromEndpointGroupOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.GetEndpointsFromEndpointGroupOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.GetSubjectsBetweenEndpointGroupsInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.GetSubjectsBetweenEndpointGroupsOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.GetSubjectsBetweenEndpointGroupsOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.UiBackendService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.get.endpoints.from.endpoint.group.output.UiEndpoint; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.get.endpoints.from.endpoint.group.output.UiEndpointBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.get.subjects.between.endpoint.groups.input.FromOperData; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.get.subjects.between.endpoint.groups.output.EndpointGroupPairWithSubject; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.get.subjects.between.endpoint.groups.output.EndpointGroupPairWithSubjectBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.get.subjects.between.endpoint.groups.output.endpoint.group.pair.with.subject.UiSubject; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.get.subjects.between.endpoint.groups.output.endpoint.group.pair.with.subject.UiSubjectBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.get.subjects.between.endpoint.groups.output.endpoint.group.pair.with.subject.ui.subject.UiRule; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.ui.backend.rev150511.get.subjects.between.endpoint.groups.output.endpoint.group.pair.with.subject.ui.subject.UiRuleBuilder; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.common.RpcResultBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Table; -import com.google.common.collect.Table.Cell; -import com.google.common.util.concurrent.CheckedFuture; -import com.google.common.util.concurrent.Futures; - -public class UiBackendServiceImpl implements UiBackendService, AutoCloseable { - - private static final Logger LOG = LoggerFactory.getLogger(UiBackendServiceImpl.class); - - private final DataBroker dataProvider; - private final BindingAwareBroker.RpcRegistration rpcRegistration; - private final InstanceIdentifier ENDPOINTS_IID = InstanceIdentifier.builder(Endpoints.class).build(); - - public UiBackendServiceImpl(DataBroker dataBroker, RpcProviderRegistry rpcRegistry) { - Preconditions.checkNotNull(dataBroker); - Preconditions.checkNotNull(rpcRegistry); - this.dataProvider = dataBroker; - rpcRegistration = rpcRegistry.addRpcImplementation(UiBackendService.class, this); - } - - @Override - public Future> getEndpointsFromEndpointGroup( - GetEndpointsFromEndpointGroupInput input) { - LOG.trace("getEndpointsFromEndpointGroup: {}", input); - final TenantId tenantId = input.getTenantId(); - if (tenantId == null) { - throw new IllegalArgumentException("Missing tenant-Id in RPC input."); - } - final EndpointGroupId epgId = input.getEndpointGroupId(); - if (epgId == null) { - throw new IllegalArgumentException("Missing endpoint-group-id in RPC input."); - } - ReadOnlyTransaction rTx = dataProvider.newReadOnlyTransaction(); - CheckedFuture, ReadFailedException> futureEndpoints = rTx.read( - LogicalDatastoreType.OPERATIONAL, ENDPOINTS_IID); - return Futures.transform(futureEndpoints, - new Function, RpcResult>() { - - @Override - public RpcResult apply(Optional potentialEndpoints) { - GetEndpointsFromEndpointGroupOutputBuilder outputBuilder = new GetEndpointsFromEndpointGroupOutputBuilder(); - if (!potentialEndpoints.isPresent() || potentialEndpoints.get().getEndpoint() == null) { - LOG.trace("No endpoint in datastore."); - return RpcResultBuilder.success(outputBuilder.build()).build(); - } - - List endpoints = potentialEndpoints.get().getEndpoint(); - List uiEndpoints = new ArrayList<>(); - for (Endpoint ep : endpoints) { - if (tenantId.equals(ep.getTenant()) && isEpInEpg(ep, epgId)) { - uiEndpoints.add(new UiEndpointBuilder(ep).build()); - } - } - outputBuilder.setUiEndpoint(uiEndpoints); - return RpcResultBuilder.success(outputBuilder.build()).build(); - } - }); - } - - private boolean isEpInEpg(Endpoint ep, EndpointGroupId epgId) { - if (epgId.equals(ep.getEndpointGroup())) { - return true; - } - if (ep.getEndpointGroups() != null) { - for (EndpointGroupId epgFromEp : ep.getEndpointGroups()) { - if (epgId.equals(epgFromEp)) { - return true; - } - } - } - return false; - } - - @Override - public Future> getSubjectsBetweenEndpointGroups( - GetSubjectsBetweenEndpointGroupsInput input) { - LOG.trace("getSubjectsBetweenEndpointGroups: {}", input); - final TenantId tenantId = input.getTenantId(); - if (tenantId == null) { - throw new IllegalArgumentException("Missing tenant-Id in RPC input."); - } - final FromOperData fromOperData = input.getFromOperData(); - InstanceIdentifier tenantIid = InstanceIdentifier.builder(Tenants.class) - .child(Tenant.class, new TenantKey(tenantId)) - .build(); - CheckedFuture, ReadFailedException> futureTenant; - try (ReadOnlyTransaction rTx = dataProvider.newReadOnlyTransaction()) { - if (fromOperData == null) { - futureTenant = rTx.read(LogicalDatastoreType.CONFIGURATION, tenantIid); - } else { - futureTenant = rTx.read(LogicalDatastoreType.OPERATIONAL, tenantIid); - } - } - return Futures.transform(futureTenant, - new Function, RpcResult>() { - - @Override - public RpcResult apply(Optional potentialTenant) { - GetSubjectsBetweenEndpointGroupsOutputBuilder outputBuilder = new GetSubjectsBetweenEndpointGroupsOutputBuilder(); - if (!potentialTenant.isPresent()) { - LOG.trace( - "No tenant with id {} in {} datastore", - tenantId.getValue(), - fromOperData == null ? LogicalDatastoreType.CONFIGURATION : LogicalDatastoreType.OPERATIONAL); - return RpcResultBuilder.success(outputBuilder.build()).build(); - } - - Tenant tenant = potentialTenant.get(); - Table resolvedPolicy = PolicyResolverUtils.resolvePolicy(ImmutableSet.of(new IndexedTenant( - tenant))); - List epgPairsWithSubjects = new ArrayList<>(); - for (Cell policyByConsProvEpg : resolvedPolicy.cellSet()) { - Policy policy = policyByConsProvEpg.getValue(); - List subjects = getUniqueSortedSubjects(policy); - List uiSubjects = new ArrayList<>(); - for (RuleGroup subject : subjects) { - UiSubject uiSubject = new UiSubjectBuilder().setName(subject.getRelatedSubject()) - .setOrder(subject.getOrder()) - .setUiRule(getUiRules(subject.getRules())) - .build(); - uiSubjects.add(uiSubject); - } - EgKey consEgKey = policyByConsProvEpg.getRowKey(); - EgKey provEgKey = policyByConsProvEpg.getColumnKey(); - LOG.trace( - "Resolved policies from {} datastore: \nConsumer EPG: {}\nProvider EPG: {}\nPolicy: {}", - fromOperData == null ? LogicalDatastoreType.CONFIGURATION : LogicalDatastoreType.OPERATIONAL, - consEgKey, provEgKey, policy); - EndpointGroupPairWithSubject epgPairWithSubject = new EndpointGroupPairWithSubjectBuilder().setConsumerEndpointGroupId( - consEgKey.getEgId()) - .setConsumerTenantId(consEgKey.getTenantId()) - .setProviderEndpointGroupId(provEgKey.getEgId()) - .setProviderTenantId(provEgKey.getTenantId()) - .setUiSubject(uiSubjects) - .build(); - epgPairsWithSubjects.add(epgPairWithSubject); - } - GetSubjectsBetweenEndpointGroupsOutput result = outputBuilder.setEndpointGroupPairWithSubject( - epgPairsWithSubjects).build(); - return RpcResultBuilder.success(result).build(); - } - }); - } - - private List getUniqueSortedSubjects(Policy policy) { - Set uniqueSubjects = new HashSet<>(); - for (List subjects : policy.getRuleMap().values()) { - for (RuleGroup subject : subjects) { - uniqueSubjects.add(subject); - } - } - ArrayList sortedSubjects = new ArrayList<>(uniqueSubjects); - Collections.sort(sortedSubjects); - return sortedSubjects; - } - - private List getUiRules(List rules) { - if (rules == null) { - return Collections.emptyList(); - } - List uiRules = new ArrayList<>(); - for (Rule rule : rules) { - UiRule uiRule = new UiRuleBuilder().setName(rule.getName()) - .setOrder(rule.getOrder()) - .setClassifierRef(rule.getClassifierRef()) - .setActionRef(rule.getActionRef()) - .build(); - uiRules.add(uiRule); - } - return uiRules; - } - - /** - * @see java.lang.AutoCloseable#close() - */ - @Override - public void close() throws Exception { - rpcRegistration.close(); - } - -} diff --git a/ui-backend/src/main/yang/ui-backend-impl.yang b/ui-backend/src/main/yang/ui-backend-impl.yang deleted file mode 100644 index bd3f9cc45..000000000 --- a/ui-backend/src/main/yang/ui-backend-impl.yang +++ /dev/null @@ -1,52 +0,0 @@ -module ui-backend-impl { - - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:ui-backend:impl"; - prefix "ui-backend-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - - description - "This module contains the base YANG definitions for - ui-backend implementation."; - - revision "2015-05-11" { - description - "Initial revision."; - } - - // This is the definition of the service implementation as a module identity. - identity ui-backend-impl { - base config:module-type; - - // Specifies the prefix for generated java classes. - config:java-name-prefix UiBackend; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case ui-backend-impl { - when "/config:modules/config:module/config:type = 'ui-backend-impl'"; - - container data-broker { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity mdsal:binding-async-data-broker; - } - } - } - - container rpc-registry { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity mdsal:binding-rpc-registry; - } - } - } - - } - } -} \ No newline at end of file diff --git a/ui-backend/src/main/yang/ui-backend.yang b/ui-backend/src/main/yang/ui-backend.yang deleted file mode 100755 index 128c78f99..000000000 --- a/ui-backend/src/main/yang/ui-backend.yang +++ /dev/null @@ -1,105 +0,0 @@ -module ui-backend { - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:ui-backend"; - prefix "ui-backend"; - - import policy {prefix gbp-policy;} - import gbp-common {prefix gbp-common;} - import endpoint {prefix endpoint;} - - description - "Module contains RPC definitions for more easier interaction of the GUI with the GBP APIs."; - - revision "2015-05-11" { - description "Initial revision of ui-backend model"; - } - - grouping endpoint-group-identifier-fields { - leaf tenant-id { - type gbp-common:tenant-id; - } - leaf endpoint-group-id { - type gbp-common:endpoint-group-id; - } - } - - grouping consumer-endpoint-group-ref { - leaf consumer-tenant-id { - type leafref { - path "/gbp-policy:tenants/gbp-policy:tenant/gbp-policy:id"; - } - } - leaf consumer-endpoint-group-id { - type leafref { - path "/gbp-policy:tenants/gbp-policy:tenant/gbp-policy:policy/gbp-policy:endpoint-group/gbp-policy:id"; - } - } - } - - grouping provider-endpoint-group-ref { - leaf provider-tenant-id { - type leafref { - path "/gbp-policy:tenants/gbp-policy:tenant/gbp-policy:id"; - } - } - leaf provider-endpoint-group-id { - type leafref { - path "/gbp-policy:tenants/gbp-policy:tenant/gbp-policy:policy/gbp-policy:endpoint-group/gbp-policy:id"; - } - } - } - - rpc get-endpoints-from-endpoint-group { - description "Returns endpoints which are in the given endpoint group."; - input { - uses endpoint-group-identifier-fields; - } - output { - list ui-endpoint { - description - "Endpoints indexed by layer 2 addreses."; - key "l2-context mac-address"; - uses endpoint:endpoint-fields; - } - } - } - - rpc get-subjects-between-endpoint-groups { - description "Returns subjects between endpoint group pairs where endpoint groups are from the given tenant."; - input { - leaf tenant-id { - description "Tenant ID of the tenant."; - type gbp-common:tenant-id; - mandatory true; - } - container from-oper-data { - presence "Resolve subjects for endpoint gorup pairs based on operational data."; - } - } - output { - list endpoint-group-pair-with-subject { - key "consumer-endpoint-group-id consumer-tenant-id provider-endpoint-group-id provider-tenant-id"; - uses consumer-endpoint-group-ref; - uses provider-endpoint-group-ref; - list ui-subject { - key "name"; - leaf name { - description "A name for the subject"; - type gbp-common:subject-name; - } - list ui-rule { - key "name"; - leaf name { - description "A name for the rule"; - type gbp-common:rule-name; - } - uses gbp-policy:has-classifier-refs; - uses gbp-policy:has-action-refs; - uses gbp-policy:has-order; - } - uses gbp-policy:has-order; - } - } - } - } - -}

Actions

Contract

Endpoint

Endpoint groups

Rule

Subject

Rules

Classifiers

Contracts

Docs

Endpoint

Endpoint groups

Health

L3 Prefix Endpoint

GBP

Tenants

Access model wizard

Tenant

Contracts

Endpoint groups

Action reference wizard