zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-16 13:01:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactors network_ui_test out of network_ui

Browse Source 
* Separates test messages from application messages
* Removes test runner and groups, processes, and streams from network_ui
* Adds network_ui_test
* Fixes routing for network_ui_test
* Removes coverage_report tool from network_ui
* Fixes network_ui_test test workflow
* Sets width and height of the page during tests
This commit is contained in:
Ben Thomasson
2018-03-15 13:09:23 -04:00
parent b29a605800
commit 766bee3753
29 changed files with 920 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

435
awx/ui/client/src/network-ui/network.ui.controller.js
View File

@@ -1,7 +1,6 @@
/* Copyright (c) 2017 Red Hat, Inc. */
var angular = require('angular');
var fsm = require('./fsm.js');
var null_fsm = require('./null.fsm.js');
var mode_fsm = require('./mode.fsm.js');
var hotkeys = require('./hotkeys.fsm.js');
var toolbox_fsm = require('./toolbox.fsm.js');
@@ -57,6 +56,9 @@ var NetworkUIController = function($scope,
$scope.control_socket = new ReconnectingWebSocket(protocol + "://" + window.location.host + "/network_ui/topology?inventory_id=" + $scope.inventory_id,
null,
{debug: false, reconnectInterval: 300});
$scope.test_socket = new ReconnectingWebSocket(protocol + "://" + window.location.host + "/network_ui/test?inventory_id=" + $scope.inventory_id,
null,
{debug: false, reconnectInterval: 300});
} else {
$scope.control_socket = {
on_message: util.noop
@@ -65,6 +67,7 @@ var NetworkUIController = function($scope,
$scope.my_location = $location.protocol() + "://" + $location.host() + ':' + $location.port();
$scope.history = [];
$scope.client_id = 0;
$scope.test_client_id = 0;
$scope.onMouseDownResult = "";
$scope.onMouseUpResult = "";
$scope.onMouseEnterResult = "";
@@ -91,7 +94,6 @@ var NetworkUIController = function($scope,
$scope.selected_items = [];
$scope.new_link = null;
$scope.new_stream = null;
$scope.new_group_type = null;
$scope.last_key = "";
$scope.last_key_code = null;
$scope.last_event = null;
@@ -108,9 +110,7 @@ var NetworkUIController = function($scope,
$scope.MIN_ZOOM = 0.1;
$scope.device_id_seq = util.natural_numbers(0);
$scope.link_id_seq = util.natural_numbers(0);
$scope.group_id_seq = util.natural_numbers(0);
$scope.message_id_seq = util.natural_numbers(0);
$scope.stream_id_seq = util.natural_numbers(0);
$scope.test_result_id_seq = util.natural_numbers(0);
$scope.animation_id_seq = util.natural_numbers(0);
$scope.overall_toolbox_collapsed = false;
@@ -180,13 +180,13 @@ var NetworkUIController = function($scope,
if (!$scope.recording) {
return;
}
message.sender = $scope.client_id;
message.sender = $scope.test_client_id;
message.trace_id = $scope.trace_id;
message.message_id = $scope.message_id_seq();
var data = messages.serialize(message);
if (!$scope.disconnected) {
try {
$scope.control_socket.send(data);
$scope.test_socket.send(data);
}
catch(err) {
$scope.initial_messages.push(message);
@@ -196,15 +196,15 @@ var NetworkUIController = function($scope,
$scope.onKeyDown = function ($event) {
if ($scope.recording) {
$scope.send_control_message(new messages.KeyEvent($scope.client_id,
$event.key,
$event.keyCode,
$event.type,
$event.altKey,
$event.shiftKey,
$event.ctrlKey,
$event.metaKey,
$scope.trace_id));
$scope.send_test_message(new messages.KeyEvent($scope.test_client_id,
$event.key,
$event.keyCode,
$event.type,
$event.altKey,
$event.shiftKey,
$event.ctrlKey,
$event.metaKey,
$scope.trace_id));
}
$scope.last_event = $event;
$scope.last_key = $event.key;
@@ -215,7 +215,6 @@ var NetworkUIController = function($scope,
};
//Define the FSMs
$scope.null_controller = new fsm.FSMController($scope, "null_fsm", null_fsm.Start, $scope);
$scope.hotkeys_controller = new fsm.FSMController($scope, "hotkeys_fsm", hotkeys.Start, $scope);
$scope.keybindings_controller = new fsm.FSMController($scope, "keybindings_fsm", keybindings.Start, $scope);
$scope.view_controller = new fsm.FSMController($scope, "view_fsm", view.Start, $scope);
@@ -325,9 +324,13 @@ var NetworkUIController = function($scope,
$scope.first_channel = new fsm.Channel(null,
$scope.test_controller,
$scope.mode_controller,
$scope);
$scope.test_channel = new fsm.Channel(null,
$scope.test_controller,
$scope);
var getMouseEventResult = function (mouseEvent) {
return "(" + mouseEvent.x + ", " + mouseEvent.y + ")";
};
@@ -508,7 +511,7 @@ var NetworkUIController = function($scope,
$scope.onMouseDown = function ($event) {
$scope.normalize_mouse_event($event);
if ($scope.recording) {
$scope.send_control_message(new messages.MouseEvent($scope.client_id, $event.x, $event.y, $event.type, $scope.trace_id));
$scope.send_test_message(new messages.MouseEvent($scope.test_client_id, $event.x, $event.y, $event.type, $scope.trace_id));
}
$scope.last_event = $event;
$scope.first_channel.send('MouseDown', $event);
@@ -519,7 +522,7 @@ var NetworkUIController = function($scope,
$scope.onMouseUp = function ($event) {
$scope.normalize_mouse_event($event);
if ($scope.recording) {
$scope.send_control_message(new messages.MouseEvent($scope.client_id, $event.x, $event.y, $event.type, $scope.trace_id));
$scope.send_test_message(new messages.MouseEvent($scope.test_client_id, $event.x, $event.y, $event.type, $scope.trace_id));
}
$scope.last_event = $event;
$scope.first_channel.send('MouseUp', $event);
@@ -530,7 +533,7 @@ var NetworkUIController = function($scope,
$scope.onMouseLeave = function ($event) {
$scope.normalize_mouse_event($event);
if ($scope.recording) {
$scope.send_control_message(new messages.MouseEvent($scope.client_id, $event.x, $event.y, $event.type, $scope.trace_id));
$scope.send_test_message(new messages.MouseEvent($scope.test_client_id, $event.x, $event.y, $event.type, $scope.trace_id));
}
$scope.onMouseLeaveResult = getMouseEventResult($event);
$scope.cursor.hidden = true;
@@ -540,7 +543,7 @@ var NetworkUIController = function($scope,
$scope.onMouseMove = function ($event) {
$scope.normalize_mouse_event($event);
if ($scope.recording) {
$scope.send_control_message(new messages.MouseEvent($scope.client_id, $event.x, $event.y, $event.type, $scope.trace_id));
$scope.send_test_message(new messages.MouseEvent($scope.test_client_id, $event.x, $event.y, $event.type, $scope.trace_id));
}
//var coords = getCrossBrowserElementCoords($event);
$scope.cursor.hidden = false;
@@ -557,7 +560,7 @@ var NetworkUIController = function($scope,
$scope.onMouseOver = function ($event) {
$scope.normalize_mouse_event($event);
if ($scope.recording) {
$scope.send_control_message(new messages.MouseEvent($scope.client_id, $event.x, $event.y, $event.type, $scope.trace_id));
$scope.send_test_message(new messages.MouseEvent($scope.test_client_id, $event.x, $event.y, $event.type, $scope.trace_id));
}
$scope.onMouseOverResult = getMouseEventResult($event);
$scope.cursor.hidden = false;
@@ -572,7 +575,7 @@ var NetworkUIController = function($scope,
var deltaX = $event.deltaX;
var deltaY = $event.deltaY;
if ($scope.recording) {
$scope.send_control_message(new messages.MouseWheelEvent($scope.client_id, delta, deltaX, deltaY, $event.type, $event.originalEvent.metaKey, $scope.trace_id));
$scope.send_test_message(new messages.MouseWheelEvent($scope.test_client_id, delta, deltaX, deltaY, $event.type, $event.originalEvent.metaKey, $scope.trace_id));
}
$scope.last_event = $event;
$scope.first_channel.send('MouseWheel', [$event, delta, deltaX, deltaY]);
@@ -679,12 +682,12 @@ var NetworkUIController = function($scope,
links[i].remote_selected = false;
$scope.links.splice(index, 1);
$scope.send_control_message(new messages.LinkDestroy($scope.client_id,
links[i].id,
links[i].from_device.id,
links[i].to_device.id,
links[i].from_interface.id,
links[i].to_interface.id,
links[i].name));
links[i].id,
links[i].from_device.id,
links[i].to_device.id,
links[i].from_interface.id,
links[i].to_interface.id,
links[i].name));
}
}
for (i = 0; i < devices.length; i++) {
@@ -693,12 +696,12 @@ var NetworkUIController = function($scope,
$scope.devices.splice(index, 1);
$scope.$emit('removeSearchOption', devices[i]);
$scope.send_control_message(new messages.DeviceDestroy($scope.client_id,
devices[i].id,
devices[i].x,
devices[i].y,
devices[i].name,
devices[i].type,
devices[i].host_id));
devices[i].id,
devices[i].x,
devices[i].y,
devices[i].name,
devices[i].type,
devices[i].host_id));
}
for (j = 0; j < all_links.length; j++) {
if (all_links[j].to_device === devices[i] ||
@@ -823,38 +826,30 @@ var NetworkUIController = function($scope,
$scope.jump_to_animation(v_center.x, v_center.y, scale, false);
});
$scope.onDeployButton = function () {
$scope.send_control_message(new messages.Deploy($scope.client_id));
};
$scope.onDestroyButton = function () {
$scope.send_control_message(new messages.Destroy($scope.client_id));
};
$scope.onRecordButton = function () {
$scope.recording = ! $scope.recording;
if ($scope.recording) {
$scope.trace_id = $scope.trace_id_seq();
$scope.send_control_message(new messages.MultipleMessage($scope.client_id,
[new messages.StartRecording($scope.client_id, $scope.trace_id),
new messages.ViewPort($scope.client_id,
$scope.current_scale,
$scope.panX,
$scope.panY,
$scope.trace_id),
new messages.Snapshot($scope.client_id,
$scope.devices,
$scope.links,
0,
$scope.trace_id)]));
$scope.send_test_message(new messages.MultipleMessage($scope.test_client_id,
[new messages.StartRecording($scope.test_client_id, $scope.trace_id),
new messages.ViewPort($scope.test_client_id,
$scope.current_scale,
$scope.panX,
$scope.panY,
$scope.trace_id),
new messages.Snapshot($scope.test_client_id,
$scope.devices,
$scope.links,
0,
$scope.trace_id)]));
} else {
$scope.send_control_message(new messages.MultipleMessage($scope.client_id,
[new messages.Snapshot($scope.client_id,
$scope.devices,
$scope.links,
1,
$scope.trace_id),
new messages.StopRecording($scope.client_id, $scope.trace_id)]));
$scope.send_test_message(new messages.MultipleMessage($scope.test_client_id,
[new messages.Snapshot($scope.test_client_id,
$scope.devices,
$scope.links,
1,
$scope.trace_id),
new messages.StopRecording($scope.test_client_id, $scope.trace_id)]));
}
};
@@ -909,7 +904,7 @@ var NetworkUIController = function($scope,
$scope.test_results = [];
$scope.current_tests = $scope.tests.slice();
$scope.first_channel.send("EnableTest", new messages.EnableTest());
$scope.test_channel.send("EnableTest", new messages.EnableTest());
};
$scope.all_buttons = [];
@@ -961,35 +956,6 @@ var NetworkUIController = function($scope,
$scope.devices.push(device);
};
$scope.onGroupCreate = function(data) {
$scope.create_group(data);
};
$scope.create_group = function(data) {
var group = new models.Group(data.id,
data.name,
data.type,
data.x1,
data.y1,
data.x2,
data.y2,
false);
$scope.group_id_seq = util.natural_numbers(data.id);
$scope.groups.push(group);
};
$scope.breadcrumbGroups = function(){
let breadcrumbGroups = [];
for(var i = 0; i < $scope.groups.length; i++){
let group = $scope.groups[i];
if(group.is_in_breadcrumb($scope.view_port)){
group.distance = util.distance(group.x1, group.y1, group.x2, group.y2);
breadcrumbGroups.push(group);
}
}
return breadcrumbGroups;
};
$scope.forDevice = function(device_id, data, fn) {
var i = 0;
for (i = 0; i < $scope.devices.length; i++) {
@@ -1025,16 +991,6 @@ var NetworkUIController = function($scope,
}
};
$scope.forGroup = function(group_id, data, fn) {
var i = 0;
for (i = 0; i < $scope.groups.length; i++) {
if ($scope.groups[i].id === group_id) {
fn($scope.groups[i], data);
break;
}
}
};
$scope.onDeviceLabelEdit = function(data) {
$scope.edit_device_label(data);
};
@@ -1201,88 +1157,6 @@ var NetworkUIController = function($scope,
}
};
$scope.onGroupLabelEdit = function(data) {
$scope.edit_group_label(data);
};
$scope.edit_group_label = function(data) {
$scope.forGroup(data.id, data, function(group, data) {
group.name = data.name;
});
};
$scope.redo = function(type_data) {
var type = type_data[0];
var data = type_data[1];
if (type === "DeviceMove") {
$scope.move_device(data);
}
if (type === "DeviceCreate") {
$scope.create_device(data);
}
if (type === "DeviceDestroy") {
$scope.destroy_device(data);
}
if (type === "DeviceLabelEdit") {
$scope.edit_device_label(data);
}
if (type === "LinkCreate") {
$scope.create_link(data);
}
if (type === "LinkDestroy") {
$scope.destroy_link(data);
}
};
$scope.undo = function(type_data) {
var type = type_data[0];
var data = type_data[1];
var inverted_data;
if (type === "DeviceMove") {
inverted_data = angular.copy(data);
inverted_data.x = data.previous_x;
inverted_data.y = data.previous_y;
$scope.move_device(inverted_data);
}
if (type === "DeviceCreate") {
$scope.destroy_device(data);
}
if (type === "DeviceDestroy") {
inverted_data = new messages.DeviceCreate(data.sender,
data.id,
data.previous_x,
data.previous_y,
data.previous_name,
data.previous_type,
data.previous_host_id);
$scope.create_device(inverted_data);
}
if (type === "DeviceLabelEdit") {
inverted_data = angular.copy(data);
inverted_data.name = data.previous_name;
$scope.edit_device_label(inverted_data);
}
if (type === "LinkCreate") {
$scope.destroy_link(data);
}
if (type === "LinkDestroy") {
$scope.create_link(data);
}
};
$scope.onClientId = function(data) {
$scope.client_id = data;
$scope.send_initial_messages();
@@ -1295,7 +1169,6 @@ var NetworkUIController = function($scope,
$scope.current_scale = data.scale;
$scope.$emit('awxNet-UpdateZoomWidget', $scope.current_scale, true);
$scope.link_id_seq = util.natural_numbers(data.link_id_seq);
$scope.group_id_seq = util.natural_numbers(data.group_id_seq);
$scope.device_id_seq = util.natural_numbers(data.device_id_seq);
};
@@ -1326,99 +1199,11 @@ var NetworkUIController = function($scope,
}
};
$scope.onToolboxItem = function (data) {
if (data.toolbox_name === "Site") {
var site = util.parse_variables(data.data);
var i = 0;
var j = 0;
var site_copy = new models.Group(site.id,
site.name,
site.type,
site.x1,
site.y1,
site.x2,
site.y2,
false);
var device, device_copy;
var process, process_copy;
var intf, intf_copy;
var device_map = {};
for (i = 0; i < site.devices.length; i++) {
device = site.devices[i];
device_copy = new models.Device(device.id,
device.name,
device.x,
device.y,
device.type);
device_map[device.id] = device_copy;
device_copy.interface_map = {};
site_copy.devices.push(device_copy);
for(j=0; j < device.interfaces.length; j++) {
intf = device.interfaces[j];
intf_copy = new models.Interface(intf.id, intf.name);
intf_copy.device = device_copy;
device_copy.interfaces.push(intf_copy);
device_copy.interface_map[intf.id] = intf_copy;
}
for(j=0; j < device.processes.length; j++) {
process = device.processes[j];
process_copy = new models.Process(process.id,
process.name,
process.type,
process.x,
process.y);
process_copy.device = device;
device_copy.processes.push(process_copy);
}
}
var group, group_copy;
for (i = 0; i < site.groups.length; i++) {
group = site.groups[i];
group_copy = new models.Group(group.id,
group.name,
group.type,
group.x1,
group.y1,
group.x2,
group.y2,
false);
site_copy.groups.push(group_copy);
}
var link, link_copy;
for (i = 0; i < site.links.length; i++) {
link = site.links[i];
link_copy = new models.Link(link.id,
device_map[link.from_device_id],
device_map[link.to_device_id],
device_map[link.from_device_id].interface_map[link.from_interface_id],
device_map[link.to_device_id].interface_map[link.to_interface_id]);
link_copy.name = link.name;
device_map[link.from_device_id].interface_map[link.from_interface_id].link = link_copy;
device_map[link.to_device_id].interface_map[link.to_interface_id].link = link_copy;
site_copy.links.push(link_copy);
}
var stream, stream_copy;
for(i = 0; i < site.streams.length;i++) {
stream = site.streams[i];
stream_copy = new models.Stream(stream.id,
device_map[stream.from_device],
device_map[stream.to_device],
stream.label);
site_copy.streams.push(stream_copy);
}
$scope.site_toolbox.items.push(site_copy);
}
};
$scope.onSnapshot = function (data) {
//Erase the existing state
$scope.devices = [];
$scope.links = [];
$scope.groups = [];
$scope.streams = [];
var device_map = {};
var device_interface_map = {};
@@ -1430,17 +1215,11 @@ var NetworkUIController = function($scope,
var new_intf = null;
var max_device_id = null;
var max_link_id = null;
var max_group_id = null;
var max_stream_id = null;
var min_x = null;
var min_y = null;
var max_x = null;
var max_y = null;
var new_link = null;
var new_group = null;
var process = null;
var new_process = null;
var new_stream = null;
//Build the devices
for (i = 0; i < data.devices.length; i++) {
@@ -1478,16 +1257,6 @@ var NetworkUIController = function($scope,
$scope.devices.push(new_device);
device_map[device.id] = new_device;
device_interface_map[device.id] = {};
for (j = 0; j < device.processes.length; j++) {
process = device.processes[j];
new_process = (new models.Process(process.id,
process.name,
process.process_type,
0,
0));
new_process.device = new_device;
new_device.processes.push(new_process);
}
for (j = 0; j < device.interfaces.length; j++) {
intf = device.interfaces[j];
new_intf = (new models.Interface(intf.id,
@@ -1516,50 +1285,6 @@ var NetworkUIController = function($scope,
device_interface_map[link.to_device_id][link.to_interface_id].link = new_link;
}
//Build the streams
var stream = null;
for (i = 0; i < data.streams.length; i++) {
stream = data.streams[i];
if (max_stream_id === null || stream.id > max_stream_id) {
max_stream_id = stream.id;
}
new_stream = new models.Stream(stream.id,
device_map[stream.from_id],
device_map[stream.to_id],
stream.label);
$scope.streams.push(new_stream);
}
//Build the groups
var group = null;
for (i = 0; i < data.groups.length; i++) {
group = data.groups[i];
if (max_group_id === null || group.id > max_group_id) {
max_group_id = group.id;
}
new_group = new models.Group(group.id,
group.name,
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]]);
}
}
$scope.groups.push(new_group);
}
//Update group membership
for (i = 0; i < $scope.groups.length; i++) {
$scope.groups[i].update_membership($scope.devices, $scope.groups);
}
var diff_x;
var diff_y;
@@ -1592,18 +1317,9 @@ var NetworkUIController = function($scope,
if (max_link_id !== null) {
$scope.link_id_seq = util.natural_numbers(max_link_id);
}
//Update the stream_id_seq to be greater than all stream ids to prevent duplicate ids.
if (max_stream_id !== null) {
$scope.stream_id_seq = util.natural_numbers(max_stream_id);
}
//Update the group_id_seq to be greater than all group ids to prevent duplicate ids.
if (max_group_id !== null) {
$scope.group_id_seq = util.natural_numbers(max_group_id);
}
$scope.updateInterfaceDots();
$scope.$emit('instatiateSelect', $scope.devices);
$scope.$emit('awxNet-breadcrumbGroups', $scope.breadcrumbGroups());
$scope.update_device_variables();
};
@@ -1656,6 +1372,15 @@ var NetworkUIController = function($scope,
//ignore
};
$scope.test_socket.onmessage = function(message) {
$scope.test_channel.send('Message', message);
$scope.$apply();
};
$scope.test_socket.onopen = function() {
//ignore
};
$scope.send_initial_messages = function() {
var i = 0;
var messages_to_send = $scope.initial_messages;
@@ -1664,9 +1389,9 @@ var NetworkUIController = function($scope,
$scope.initial_messages = [];
for(i = 0; i < messages_to_send.length; i++) {
message = messages_to_send[i];
message.sender = $scope.client_id;
message.sender = $scope.test_client_id;
data = messages.serialize(message);
$scope.control_socket.send(data);
$scope.test_socket.send(data);
}
};
@@ -1674,6 +1399,25 @@ var NetworkUIController = function($scope,
if ($scope.control_socket.readyState === WebSocket.OPEN) {
$scope.control_socket.onopen();
}
// Call onopen directly if $scope.test_socket is already open
if ($scope.test_socket.readyState === WebSocket.OPEN) {
$scope.test_socket.onopen();
}
$scope.send_test_message = function (message) {
var i = 0;
message.sender = $scope.test_client_id;
message.message_id = $scope.message_id_seq();
if (message.constructor.name === "MultipleMessage") {
for (i=0; i < message.messages.length; i++) {
message.messages[i].message_id = $scope.message_id_seq();
}
}
var data = messages.serialize(message);
if (!$scope.disconnected) {
$scope.test_socket.send(data);
}
};
$scope.send_control_message = function (message) {
var i = 0;
@@ -1811,13 +1555,10 @@ var NetworkUIController = function($scope,
$scope.hide_buttons = false;
$scope.hide_links = false;
$scope.hide_interfaces = false;
$scope.hide_groups = false;
};
$scope.reset_fsm_state = function () {
$scope.null_controller.state = null_fsm.Start;
$scope.null_controller.state.start($scope.null_controller);
$scope.hotkeys_controller.state = hotkeys.Start;
$scope.hotkeys_controller.state.start($scope.hotkeys_controller);
$scope.keybindings_controller.state = keybindings.Start;