IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Web UI (topology graph): Show FQDN for nodes if they have no common DNS zone

Browse Source 
It allows to avoid confusion with identical short hostnames.

There are two cases implemented:
- no common DNS zone: graph shows FQDN for all nodes
- all nodes have one common DNS zone: graph shows DN relatively to the common zone

https://pagure.io/freeipa/issue/7206

Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
This commit is contained in:
Serhii Tsymbaliuk 2019-02-12 10:44:33 +01:00
parent 3ae38973c5
commit 133b199f61
No known key found for this signature in database
GPG Key ID: 632C7F5C1BC85519
6 changed files with 252 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
install/ui/src/freeipa/topology.js
View File

@ -1377,6 +1377,33 @@ topology.TopologyGraphWidget = declare([Stateful, Evented], {
return deferred.promise;
},
_find_common_domain: function(nodes) {
if (nodes.length < 2) {
return '';
}
var common_labels = null;
for (var i=0, l=nodes.length; i<l; i++) {
var node = nodes[i];
var labels = node.id.split('.').reverse();
if (common_labels === null) {
common_labels = labels;
continue;
}
for (var j=0; j<common_labels.length; j++) {
if (labels[j] !== common_labels[j]) {
common_labels = common_labels.slice(0, j);
break;
}
}
}
return common_labels.reverse().join('.');
},
/**
* @param {Object} size - dict contains height and width value. (optional)
*/
@ -1386,6 +1413,43 @@ topology.TopologyGraphWidget = declare([Stateful, Evented], {
if (IPA.domain_level < topology.required_domain_level) return;
when(this._get_data()).then(function(data) {
// remove common domain labels from node FQDN
// Example #1:
// nodes:
// - master.ipa.example.com
// - replica.ipa.example.com
// common domain: ipa.example.com
// captions: master, replica
//
// Example #2:
// nodes:
// - master.net1.example.com
// - replica.net1.example.com
// - replica.net2.example.com
// common domain: example.com
// captions: master.net1, replica.net1, replica.net2
//
var common_domain = this._find_common_domain(data.nodes);
if (this.parent) {
var title = this.parent.title;
if (common_domain) {
title += ' (' + common_domain + ')';
}
this.parent.header.title_widget.update({text: title});
}
for (var i=0,l=data.nodes.length; i<l; i++) {
var node = data.nodes[i];
if (l > 1 && common_domain.length > 0) {
node.caption = node.id.substring(
0, node.id.length - common_domain.length - 1
);
} else {
node.caption = node.id;
}
}
if (!this.graph) {
this.graph = new topology_graph.TopoGraph({
nodes: data.nodes,

3
install/ui/src/freeipa/topology_graph.js
View File

@ -180,7 +180,6 @@ topology_graph.TopoGraph = declare([Evented], {
this._target_node = null;
this.restart();
},
_create_svg: function(container) {
var self = this;
@ -804,7 +803,7 @@ topology_graph.TopoGraph = declare([Evented], {
.attr('class', 'id')
.attr('fill', '#002235')
.text(function(d) {
return d.id.split('.')[0];
return d.caption;
});
// remove old nodes

4
install/ui/test/all_tests.html
View File

@ -35,7 +35,8 @@
'test/utils_tests',
'test/build_tests',
'test/binding_tests',
], function(om, ipa, details, entity, as, cert, aci, wid, ip, ut, bt, bi){
'test/topology_tests',
], function(om, ipa, details, entity, as, cert, aci, wid, ip, ut, bt, bi, topo){
QUnit.start();
om();
ipa();
@ -49,6 +50,7 @@
ut();
bt();
bi();
topo();
});
</script>
</head>

1
install/ui/test/index.html
View File

@ -37,6 +37,7 @@
<li><a href="utils_tests.html">Utils Test Suite</a>
<li><a href="build_tests.html">Build Test Suite</a>
<li><a href="binding_tests.html">Binding Test Suite</a>
<li><a href="topology_tests.html">Topology Test Suite</a>
</ul>
</div>

25
install/ui/test/topology_tests.html Normal file
View File

@ -0,0 +1,25 @@
<!DOCTYPE html>
<html>
<head>
<title>Topology Test Suite</title>
<link rel="stylesheet" href="qunit.css" type="text/css" media="screen">
<script type="text/javascript" src="qunit.js"></script>
<script type="text/javascript" src="../js/libs/loader.js"></script>
<script type="text/javascript" src="../js/libs/jquery.js"></script>
<script type="text/javascript" src="../js/libs/jquery.ordered-map.js"></script>
<script type="text/javascript" src="config.js"></script>
<script type="text/javascript" src="../js/dojo/dojo.js"></script>
<script type="text/javascript">
require(['test/topology_tests'], function(tests){ tests() });
</script>
</head>
<body>
<h1 id="qunit-header">Topology Test Suite</h1>
<h2 id="qunit-banner"></h2>
<div id="qunit-testrunner-toolbar"></div>
<h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests"></ol>
<div id="qunit-fixture"></div>
</body>
</html>

158
install/ui/test/topology_tests.js Normal file
View File

@ -0,0 +1,158 @@
/**
* Copyright (C) 2019 FreeIPA Contributors see COPYING for license
*/
define([
'freeipa/ipa',
'freeipa/topology',
'freeipa/jquery'],
function(IPA, topology, $) {
return function() {
var widget;
function inject_data(widget, data) {
widget._get_data = function() {
return data;
};
}
QUnit.module('topology', {
beforeEach: function(assert) {
widget = new topology.TopologyGraphWidget(
topology.topology_graph_facet_spec
);
widget.render();
}
});
QUnit.test('Testing TopoGraph nodes', function(assert) {
var nodes = [
{ id: 'master.ipa.test' },
{ id: 'replica.ipa.test' }
];
var suffixes = [
{ cn: ['ca'] },
{ cn: ['domain'] }
];
inject_data(widget, { nodes: nodes, links: [], suffixes: suffixes });
widget.update();
assert.ok($('circle.node', widget.el).length === nodes.length,
'Checking rendered nodes count');
assert.ok($('text.id:eq(0)', widget.el).text() === 'master',
'Checking "master" node label');
assert.ok($('text.id:eq(1)', widget.el).text() === 'replica',
'Checking "replica" node label');
assert.ok($('text.suffix:eq(0)', widget.el).text() === 'ca',
'Checking "ca" suffix');
assert.ok($('text.suffix:eq(1)', widget.el).text() === 'domain',
'Checking "domain" suffix');
});
QUnit.test('Testing TopoGraph links', function(assert) {
var nodes = [
{ id: 'master.ipa.test', targets: { 'replica.ipa.test': [] } },
{ id: 'replica.ipa.test' }
];
var suffixes = [
{ cn: ['ca'] },
{ cn: ['domain'] }
];
var links = [{
source: 0,
target: 1,
left: false,
right: true,
suffix: suffixes[0]
}];
inject_data(widget, { nodes: nodes, links: links, suffixes: suffixes });
widget.update();
assert.ok($('circle.node', widget.el).length === nodes.length,
'Checking rendered nodes count');
var rendered_links = $('path.link', widget.el).not('.dragline');
assert.ok(rendered_links.length === 1,
'Checking right direction link is rendered');
var marker = rendered_links.first().css('marker-end');
assert.ok(marker && marker !== 'none',
'Checking right direction link has proper marker');
links.push({
source: 0,
target: 1,
left: true,
right: false,
suffix: suffixes[1]
})
inject_data(widget, {
nodes: nodes,
links: links,
suffixes: suffixes
});
widget.update();
rendered_links = $('path.link', widget.el).not('.dragline')
assert.ok(rendered_links.length === 2,
'Checking left direction link is rendered');
marker = rendered_links.last().css('marker-start');
assert.ok(marker && marker !== 'none',
'Checking left direction link has proper marker');
});
QUnit.test('Testing TopoGraph for multiple DNS zones', function(assert) {
var nodes = [
{ id: 'master.ipa.zone1' },
{ id: 'replica.ipa.zone1' },
{ id: 'master.ipa.zone2' },
{ id: 'master.ipa.zone1.common' },
{ id: 'replica.ipa.zone2.common' },
];
var suffixes = [
{ cn: ['ca'] },
{ cn: ['domain'] }
];
inject_data(widget, { nodes: nodes, links: [], suffixes: suffixes });
widget.update();
$('text.id', widget.el).each(function(i) {
assert.ok($(this).text() === nodes[i].id,
'Checking node label "' + $(this).text() + '" is FQDN');
});
nodes = nodes.filter(function(node) { return /\.common$/.test(node.id) });
inject_data(widget, { nodes: nodes, links: [], suffixes: suffixes });
widget.update();
$('text.id', widget.el).each(function(i) {
assert.ok($(this).text().indexOf('common') < 0,
'Checking node label "' + $(this).text() + '" is relative');
});
});
QUnit.test('Testing TopoGraph with one node', function(assert) {
var node = { id: 'master.ipa.test' };
inject_data(widget, { nodes: [node], links: [], suffixes: [] });
widget.update();
assert.ok($('text.id:eq(0)', widget.el).text() === node.id,
'Checking node label is FQDN');
});
};});