External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-22 21:46:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Adds inventory tracking and templating to network UI groups and hosts.

Browse Source 
* Adds group_id to Group table
* Adds inventory_group_id to Group table
* Adds creation of inventory hosts and groups from the network UI
* Changes network UI variables to be under awx key
* Fixes variables initial value
* Adds group membership association/disassociation
* Removes items from the inventory toolbar when loaded by a snaphot
* Adds nunjucks dependency to package.json
* Adds templating to hosts
* Adds templating for racks
* Adds site templating
* Adds group associations for sites
* Squashes migrations for network_ui
* Flake8 migrations
* Changes reserved field type to device_type, group_type, and process_type
* Allows blank values for all CharFields in network_ui models
* Changes reserved field type to device_type, group_type, and process_type
This commit is contained in:
Ben Thomasson
2018-02-22 19:35:06 -05:00
parent b7848ab4f6
commit f8d83638b0
79 changed files with 1471 additions and 1367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
awx/ui/client/src/network-ui/models.js
View File

@@ -29,6 +29,8 @@ function Device(id, name, x, y, type, host_id) {
this.process_id_seq = util.natural_numbers(0);
this.processes = [];
this.in_group = false;
this.template = false;
this.variables = {};
}
exports.Device = Device;
@@ -58,6 +60,29 @@ Device.prototype.is_selected = function (x, y) {
Device.prototype.describeArc = util.describeArc;
Device.prototype.compile_variables = function () {
var variables = JSON.parse(JSON.stringify(this.variables));
var awx_variables = {};
variables.awx = awx_variables;
awx_variables.name = this.name;
awx_variables.type = this.type;
awx_variables.interfaces = [];
var i = 0;
var intf = null;
for (i = 0; i < this.interfaces.length; i++) {
intf = {name: this.interfaces[i].name,
id: this.interfaces[i].id};
if (this.interfaces[i].link !== null) {
intf.link_id = this.interfaces[i].link.id;
intf.link_name = this.interfaces[i].link.name;
intf.remote_interface_name = this.interfaces[i].remote_interface().name;
intf.remote_device_name = this.interfaces[i].remote_interface().device.name;
}
awx_variables.interfaces.push(intf);
}
return variables;
};
function Interface(id, name) {
this.id = id;
this.name = name;
@@ -439,10 +464,20 @@ function Group(id, name, type, x1, y1, x2, y2, selected) {
this.links = [];
this.groups = [];
this.streams = [];
this.group_id = 0;
this.icon_size = type === 'site' ? 500 : 100;
this.template = false;
this.variables = {};
this.sequences = {};
}
exports.Group = Group;
Group.prototype.compile_variables = function () {
var variables = JSON.parse(JSON.stringify(this.variables));
return variables;
};
Group.prototype.toJSON = function () {
return {id: this.id,
@@ -634,7 +669,10 @@ Group.prototype.update_membership = function (devices, groups) {
var y2 = this.bottom_extent();
var x2 = this.right_extent();
var old_devices = this.devices;
var new_devices = [];
var removed_devices = old_devices.slice();
var device_ids = [];
var index = -1;
this.devices = [];
for (i = 0; i < devices.length; i++) {
if (devices[i].x > x1 &&
@@ -644,6 +682,12 @@ Group.prototype.update_membership = function (devices, groups) {
devices[i].in_group = true;
this.devices.push(devices[i]);
device_ids.push(devices[i].id);
index = removed_devices.indexOf(devices[i]);
if (index !== -1) {
removed_devices.splice(index, 1);
} else {
new_devices.push(devices[i]);
}
}
}
var old_groups = this.groups;
@@ -658,7 +702,7 @@ Group.prototype.update_membership = function (devices, groups) {
group_ids.push(groups[i].id);
}
}
return [old_devices, this.devices, device_ids, old_groups, this.groups, group_ids];
return [old_devices, this.devices, device_ids, old_groups, this.groups, group_ids, new_devices, removed_devices];
};
Group.prototype.is_in_breadcrumb = function(viewport){