diff --git a/awx/ui/client/src/network-ui/network.ui.controller.js b/awx/ui/client/src/network-ui/network.ui.controller.js
index a8e1430673..a945aee033 100644
--- a/awx/ui/client/src/network-ui/network.ui.controller.js
+++ b/awx/ui/client/src/network-ui/network.ui.controller.js
@@ -24,13 +24,26 @@ var keybindings = require('./keybindings.fsm.js');
var details_panel_fsm = require('./details.panel.fsm.js');
var svg_crowbar = require('./svg-crowbar.js');
var ReconnectingWebSocket = require('reconnectingwebsocket');
+var nunjucks = require('nunjucks');
-var NetworkUIController = function($scope, $document, $location, $window, $http,
- $q, $state, ProcessErrors, ConfigService, rbacUiControlService) {
+var NetworkUIController = function($scope,
+ $document,
+ $location,
+ $window,
+ $http,
+ $q,
+ $state,
+ ProcessErrors,
+ ConfigService,
+ rbacUiControlService,
+ HostsService,
+ GroupsService) {
window.scope = $scope;
var i = 0;
+ $scope.nunjucks = nunjucks;
+
$scope.http = $http;
$scope.api_token = '';
@@ -123,12 +136,14 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
$scope.current_tests = [];
$scope.current_test = null;
$scope.testing = false;
+ $scope.template_building = false;
$scope.version = null;
$scope.test_events = [];
$scope.test_results = [];
$scope.test_errors = [];
$scope.streams = [];
$scope.animations = [];
+ $scope.sequences = {};
$scope.view_port = {'x': 0,
'y': 0,
'width': 0,
@@ -260,25 +275,44 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
//Inventory Toolbox Setup
$scope.inventory_toolbox = new models.ToolBox(0, 'Inventory', 'device', 0, toolboxTopMargin, 200, toolboxHeight);
if (!$scope.disconnected) {
- console.log($location.protocol() + "://" + $location.host() + ':' + $location.port());
- console.log($scope.my_location);
$http.get('/api/v2/inventories/' + $scope.inventory_id + '/hosts/')
.then(function(response) {
+ var devices_by_name = {};
+ var i = 0;
+ for (i = 0; i < $scope.devices.length; i++) {
+ devices_by_name[$scope.devices[i].name] = $scope.devices[i];
+ }
let hosts = response.data.results;
- for(var i = 0; i {
- console.log([data, status]);
ProcessErrors($scope, data, status, null, { hdr: 'Error!', msg: 'Failed to get host data: ' + status });
});
}
@@ -744,7 +777,7 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
};
- $scope.onRenameContextButton = function (button) {
+ $scope.onRenameContextButton = function () {
$scope.removeContextMenu();
$scope.first_channel.send("LabelEdit", {});
};
@@ -819,7 +852,8 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
group.y1,
group.x2,
group.y2,
- group.name));
+ group.name,
+ group.group_id));
}
if($scope.current_scale <= 0.5){
@@ -849,7 +883,7 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
}
};
- $scope.onDeleteContextMenu = function($event){
+ $scope.onDeleteContextMenu = function(){
$scope.removeContextMenu();
if($scope.selected_devices.length === 1){
$scope.deleteDevice();
@@ -860,7 +894,7 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
};
// Button Event Handlers
- $scope.onToggleToolboxButtonLeft = function (button) {
+ $scope.onToggleToolboxButtonLeft = function () {
$scope.first_channel.send("ToggleToolbox", {});
$scope.action_icons[0].fsm.handle_message("Disable", {});
$scope.action_icons[1].fsm.handle_message("Enable", {});
@@ -868,7 +902,7 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
$scope.$emit('overall_toolbox_collapsed');
};
- $scope.onToggleToolboxButtonRight = function (button) {
+ $scope.onToggleToolboxButtonRight = function () {
$scope.first_channel.send("ToggleToolbox", {});
$scope.action_icons[0].fsm.handle_message("Enable", {});
$scope.action_icons[1].fsm.handle_message("Disable", {});
@@ -890,7 +924,6 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
$scope.$on('search', function(e, device){
- var num_frames = 30;
var searched;
for(var i = 0; i < $scope.devices.length; i++){
if(Number(device.id) === $scope.devices[i].id){
@@ -899,22 +932,18 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
}
searched.selected = true;
$scope.selected_devices.push(searched);
- //console.log(searched);
$scope.jump_to_animation(searched.x, searched.y, 1.0);
});
$scope.jump_to_animation = function(jump_to_x, jump_to_y, jump_to_scale, updateZoom) {
$scope.cancel_animations();
var v_center = $scope.to_virtual_coordinates($scope.graph.width/2, $scope.graph.height/2);
- //console.log({v_center: v_center});
$scope.jump.from_x = v_center.x;
$scope.jump.from_y = v_center.y;
$scope.jump.to_x = jump_to_x;
$scope.jump.to_y = jump_to_y;
var distance = util.distance(v_center.x, v_center.y, jump_to_x, jump_to_y);
- //console.log({distance: distance});
var num_frames = 30 * Math.floor((1 + 4 * distance / (distance + 3000)));
- //console.log({num_frames: num_frames});
var scale_animation = new models.Animation($scope.animation_id_seq(),
num_frames,
{
@@ -964,19 +993,19 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
$scope.$on('zoom', (e, zoomPercent) => {
let v_center = $scope.to_virtual_coordinates($scope.graph.width/2, $scope.graph.height/2);
- let scale = Math.pow(10, (zoomPercent - 120) / 40)
+ let scale = Math.pow(10, (zoomPercent - 120) / 40);
$scope.jump_to_animation(v_center.x, v_center.y, scale, false);
});
- $scope.onDeployButton = function (button) {
+ $scope.onDeployButton = function () {
$scope.send_control_message(new messages.Deploy($scope.client_id));
};
- $scope.onDestroyButton = function (button) {
+ $scope.onDestroyButton = function () {
$scope.send_control_message(new messages.Destroy($scope.client_id));
};
- $scope.onRecordButton = function (button) {
+ $scope.onRecordButton = function () {
$scope.recording = ! $scope.recording;
if ($scope.recording) {
$scope.trace_id = $scope.trace_id_seq();
@@ -1007,7 +1036,7 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
}
};
- $scope.onExportButton = function (button) {
+ $scope.onExportButton = function () {
$scope.cursor.hidden = true;
$scope.debug.hidden = true;
$scope.hide_buttons = true;
@@ -1019,34 +1048,10 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
}, 1000);
};
- $scope.onLayoutButton = function (button) {
+ $scope.onLayoutButton = function () {
$scope.send_control_message(new messages.Layout($scope.client_id));
};
- $scope.onDiscoverButton = function (button) {
- var xhr = new XMLHttpRequest();
- xhr.open("POST", "http://" + window.location.host + "/api/v1/job_templates/7/launch/", true);
- xhr.onload = function () {
- console.log(xhr.readyState);
- };
- xhr.onerror = function () {
- console.error(xhr.statusText);
- };
- xhr.send();
- };
-
- $scope.onConfigureButton = function (button) {
- var xhr = new XMLHttpRequest();
- xhr.open("POST", "http://" + window.location.host + "/api/v1/job_templates/9/launch/", true);
- xhr.onload = function () {
- console.log(xhr.readyState);
- };
- xhr.onerror = function () {
- console.error(xhr.statusText);
- };
- xhr.send();
- };
-
$scope.onTogglePhysical = function () {
$scope.hide_links = false;
};
@@ -1065,7 +1070,7 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
};
- $scope.onExportYamlButton = function (button) {
+ $scope.onExportYamlButton = function () {
$window.open('/network_ui/topology.yaml?topology_id=' + $scope.topology_id , '_blank');
};
@@ -1088,27 +1093,55 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
new models.ActionIcon("chevron-right", 15, actionIconVerticalOffset, 16, $scope.onToggleToolboxButtonRight, false, $scope)
];
- $scope.onDownloadTraceButton = function (button) {
+ $scope.onDownloadTraceButton = function () {
window.open("/network_ui/download_trace?topology_id=" + $scope.topology_id + "&trace_id=" + $scope.trace_id + "&client_id=" + $scope.client_id);
};
- $scope.onDownloadRecordingButton = function (button) {
+ $scope.onDownloadRecordingButton = function () {
window.open("/network_ui/download_recording?topology_id=" + $scope.topology_id + "&trace_id=" + $scope.trace_id + "&client_id=" + $scope.client_id);
};
- $scope.onUploadTestButton = function (button) {
+ $scope.onUploadTestButton = function () {
window.open("/network_ui/upload_test", "_top");
};
- $scope.onRunTestsButton = function (button) {
+ $scope.onRunTestsButton = function () {
$scope.test_results = [];
$scope.current_tests = $scope.tests.slice();
$scope.first_channel.send("EnableTest", new messages.EnableTest());
};
- // Buttons
- var button_offset = 200;
+ $scope.onCompileVariablesButton = function () {
+
+
+ function noop (response) {
+ console.log(response);
+ }
+
+ function error_handler (response) {
+
+ console.log(response);
+ }
+
+ var i = 0;
+ var variables = null;
+ for(i = 0; i < $scope.devices.length; i++) {
+ variables = $scope.devices[i].compile_variables();
+ if ($scope.devices[i].host_id !== 0) {
+ $http.put('/api/v2/hosts/' + $scope.devices[i].host_id + '/variable_data/', JSON.stringify(variables)).then(noop).catch(error_handler);
+ }
+ }
+
+ for(i = 0; i < $scope.groups.length; i++) {
+ variables = $scope.groups[i].compile_variables();
+ if ($scope.groups[i].group_id !== 0) {
+ $http.put('/api/v2/groups/' + $scope.groups[i].group_id + '/variable_data/', JSON.stringify(variables)).then(noop).catch(error_handler);
+ }
+
+ }
+ };
+
$scope.buttons = [
// new models.Button("DEPLOY", button_offset + 10, 48, 70, 30, $scope.onDeployButton, $scope),
@@ -1193,6 +1226,7 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
return null;
};
+
$scope.getDeviceInterface = function(device_name, interface_name) {
var i = 0;
@@ -1209,11 +1243,157 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
return null;
};
+ $scope.create_template_sequences = function (sequences, template, template_context) {
+ var i = 0;
+ var template_variables = util.nunjucks_find_variables(template);
+ for (i = 0; i < template_variables.length; i++) {
+ if (template_context[template_variables[i]] === undefined) {
+ if (sequences[template_variables[i]] === undefined) {
+ sequences[template_variables[i]] = util.natural_numbers(0);
+ }
+ template_context[template_variables[i]] = sequences[template_variables[i]]();
+ }
+ }
+ };
+
+ $scope.create_inventory_host = function (device) {
+ if ($scope.template_building || device.template) {
+ return;
+ }
+ console.log(device);
+
+ function update_inventory () {
+ HostsService.post({inventory: $scope.inventory_id,
+ name: device.name,
+ variables: JSON.stringify({awx: {name: device.name,
+ type: device.type}})})
+ .then(function (res) {
+ console.log(res);
+ device.host_id = res.data.id;
+ device.variables = util.parse_variables(res.data.variables);
+ $scope.send_control_message(new messages.DeviceInventoryUpdate($scope.client_id,
+ device.id,
+ device.host_id));
+ })
+ .catch(function (res) {
+ console.log(res);
+ });
+ }
+
+ return HostsService.get({inventory: $scope.inventory_id,
+ name: device.name})
+ .then(function (res) {
+ console.log(res);
+ if (res.data.count === 0) {
+ update_inventory();
+ } else if (res.data.count === 1) {
+ device.host_id = res.data.results[0].id;
+ device.variables = util.parse_variables(res.data.results[0].variables);
+ $scope.send_control_message(new messages.DeviceInventoryUpdate($scope.client_id,
+ device.id,
+ device.host_id));
+ }
+ })
+ .catch(function (res) {
+ console.log(res);
+ });
+
+ };
+
+ $scope.create_inventory_group = function (group) {
+ if ($scope.template_building || group.template) {
+ return;
+ }
+ console.log(group);
+ function update_inventory () {
+ GroupsService.post({inventory: $scope.inventory_id,
+ name: group.name,
+ variables: JSON.stringify({awx: {name: group.name,
+ type: group.type}})})
+ .then(function (res) {
+ console.log(res);
+ group.group_id = res.data.id;
+ group.variables = util.parse_variables(res.data.variables);
+ $scope.send_control_message(new messages.GroupInventoryUpdate($scope.client_id,
+ group.id,
+ group.group_id));
+ })
+ .catch(function (res) {
+ console.log(res);
+ });
+ }
+ return GroupsService.get({inventory: $scope.inventory_id,
+ name: group.name})
+ .then(function (res) {
+ console.log(res);
+ if (res.data.count === 0) {
+ update_inventory();
+ } else if (res.data.count === 1) {
+ group.group_id = res.data.results[0].id;
+ group.variables = util.parse_variables(res.data.results[0].variables);
+ $scope.send_control_message(new messages.GroupInventoryUpdate($scope.client_id,
+ group.id,
+ group.group_id));
+ }
+ })
+ .catch(function (res) {
+ console.log(res);
+ });
+
+ };
+
+ $scope.create_group_association = function (group, devices) {
+ if ($scope.template_building || group.template) {
+ return;
+ }
+
+ console.log(['create_group_association', group, devices]);
+
+ function noop (response) {
+ console.log(response);
+ }
+
+ function error_handler (response) {
+ console.log(response);
+ }
+
+ var i = 0;
+ for (i = 0; i < devices.length; i ++) {
+ if (!devices[i].template) {
+ $http.post('/api/v2/groups/' + group.group_id + '/hosts/', JSON.stringify({name: devices[i].name})).then(noop).catch(error_handler);
+ }
+ }
+ };
+
+ $scope.delete_group_association = function (group, devices) {
+ if ($scope.template_building || group.template) {
+ return;
+ }
+
+ console.log(['delete_group_association', group, devices]);
+
+ function noop (response) {
+ console.log(response);
+ }
+
+ function error_handler (response) {
+ console.log(response);
+ }
+
+ var i = 0;
+ for (i = 0; i < devices.length; i ++) {
+ if (!devices[i].template) {
+ GroupsService.disassociateHost(devices[i].host_id, group.group_id).then(noop).catch(error_handler);
+ }
+ }
+ };
+
$scope.onDeviceCreate = function(data) {
$scope.create_device(data);
};
$scope.create_device = function(data) {
+ console.log(data);
var device = new models.Device(data.id,
data.name,
data.x,
@@ -1591,7 +1771,7 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
$scope.onToolboxItem = function (data) {
if (data.toolbox_name === "Site") {
- var site = JSON.parse(data.data);
+ var site = util.parse_variables(data.data);
var i = 0;
var j = 0;
var site_copy = new models.Group(site.id,
@@ -1727,8 +1907,15 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
device.name,
device.x,
device.y,
- device.type,
+ device.device_type,
device.host_id);
+
+ for (j=0; j < $scope.inventory_toolbox.items.length; j++) {
+ if($scope.inventory_toolbox.items[j].name === device.name) {
+ $scope.inventory_toolbox.items.splice(j, 1);
+ break;
+ }
+ }
new_device.interface_seq = util.natural_numbers(device.interface_id_seq);
new_device.process_id_seq = util.natural_numbers(device.process_id_seq);
$scope.devices.push(new_device);
@@ -1738,7 +1925,7 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
process = device.processes[j];
new_process = (new models.Process(process.id,
process.name,
- process.type,
+ process.process_type,
0,
0));
new_process.device = new_device;
@@ -1795,12 +1982,13 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
}
new_group = new models.Group(group.id,
group.name,
- group.type,
+ group.group_type,
group.x1,
group.y1,
group.x2,
group.y2,
false);
+ new_group.group_id = group.inventory_group_id;
if (group.members !== undefined) {
for (j=0; j < group.members.length; j++) {
new_group.devices.push(device_map[group.members[j]]);
@@ -1859,6 +2047,36 @@ var NetworkUIController = function($scope, $document, $location, $window, $http,
$scope.updateInterfaceDots();
$scope.$emit('instatiateSelect', $scope.devices);
$scope.$emit('awxNet-breadcrumbGroups', $scope.breadcrumbGroups());
+ $scope.update_device_variables();
+ };
+
+ $scope.update_device_variables = function () {
+
+ var hosts_by_id = {};
+ var i = 0;
+ for (i = 0; i < $scope.devices.length; i++) {
+ hosts_by_id[$scope.devices[i].host_id] = $scope.devices[i];
+ }
+
+ $http.get('/api/v2/inventories/' + $scope.inventory_id + '/hosts/')
+ .then(function(response) {
+ let hosts = response.data.results;
+ for(var i = 0; i {
+ console.log([data, status]);
+ ProcessErrors($scope, data, status, null, { hdr: 'Error!', msg: 'Failed to get host data: ' + status });
+ });
+
};
$scope.updateInterfaceDots = function() {
diff --git a/awx/ui/client/src/network-ui/network_ui.partial.svg b/awx/ui/client/src/network-ui/network_ui.partial.svg
index c82ce3020e..47a8f52003 100644
--- a/awx/ui/client/src/network-ui/network_ui.partial.svg
+++ b/awx/ui/client/src/network-ui/network_ui.partial.svg
@@ -106,5 +106,6 @@
+ TEMPLATE BUILDING
diff --git a/awx/ui/client/src/network-ui/rack.fsm.js b/awx/ui/client/src/network-ui/rack.fsm.js
index d28b12c6d7..33400c6334 100644
--- a/awx/ui/client/src/network-ui/rack.fsm.js
+++ b/awx/ui/client/src/network-ui/rack.fsm.js
@@ -3,6 +3,7 @@ var inherits = require('inherits');
var fsm = require('./fsm.js');
var models = require('./models.js');
var messages = require('./messages.js');
+var nunjucks = require('nunjucks');
function _State () {
}
@@ -95,6 +96,9 @@ _Ready.prototype.onPasteRack = function (controller, msg_type, message) {
var top_left_x, top_left_y;
var device_map = {};
var c_messages = [];
+ var rack_template_context = null;
+ var device_template_context = null;
+ var promises = [];
scope.hide_groups = false;
scope.pressedX = scope.mouseX;
@@ -113,6 +117,18 @@ _Ready.prototype.onPasteRack = function (controller, msg_type, message) {
top_left_y + message.group.y2,
false);
+ if (!controller.scope.template_building && message.group.template) {
+ try {
+ rack_template_context = {};
+ rack_template_context.id = group.id;
+ controller.scope.create_template_sequences(controller.scope.sequences, group.name, rack_template_context);
+ group.name = nunjucks.renderString(group.name, rack_template_context);
+ promises.push(scope.create_inventory_group(group));
+ } catch (err) {
+ console.log(err);
+ }
+ }
+
c_messages.push(new messages.GroupCreate(scope.client_id,
group.id,
group.x1,
@@ -120,10 +136,19 @@ _Ready.prototype.onPasteRack = function (controller, msg_type, message) {
group.x2,
group.y2,
group.name,
- group.type));
+ group.type,
+ 0));
scope.groups.push(group);
+ if (!controller.scope.template_building && message.group.template) {
+ device_template_context = Object.assign({}, rack_template_context);
+ device_template_context.rack_id = group.id;
+ for(i=0; i