Fixed linking of network interfaces. Only thing remaining is the swit…

…ch->router trunk connection. Everything else is using generic functions to achieve the result, except that part.

.gitignore

@@ -2,4 +2,6 @@
 **/*.snap*
 **/*.qcow2*
 **/*.raw*
+**/*.bak*
+**/*db.json
 **/*__pycache__

api_modules/interface.py

@@ -8,9 +8,9 @@ def get_overview():
 			'ip' : vmanager.nics[nic_name].ip,
 			'MAC' : vmanager.nics[nic_name].mac,
 			'state' : vmanager.nics[nic_name].state,
-			'gateway' : vmanager.nics[nic_name].ports['sink_name'],
-			'routes' : None,
-			'connected_to' : None
+			'gateway' : vmanager.nics[nic_name].gateway,
+			'routes' : vmanager.nics[nic_name].routes,
+			'connected_to' : vmanager.nics[nic_name].connected_to
 		}
 
 	for nic_name in vmanager.interfaces:
@@ -26,8 +26,6 @@ def get_overview():
 
 class parser():
 	def process(self, path, client, data, headers, fileno, addr, *args, **kwargs):
-		print('### nic ###\n', data, client)
-
 		if 'state' in data and 'target' in data:
 			if data['target'] in vmanager.nics:
 				if data['state']:
@@ -52,4 +50,15 @@ def process(self, path, client, data, headers, fileno, addr, *args, **kwargs):
 			else:
 				print(f'[N] Could not locate {data["target"]}')
 
+			return get_overview()
+
+		if 'connect_to' in data and 'target' in data:
+			if data['target'] in vmanager.nics:
+				vmanager.nics[data['target']].connect(data['connect_to'])
+			elif data['target'] in vmanager.interfaces:
+				vmanager.interfaces[data['target']].connect(data['connect_to'])
+			elif data['target'] in vmanager.routers:
+				vmanager.routers[data['target']].connect(data['connect_to'])
+			elif data['target'] in vmanager.switches:
+				vmanager.switches[data['target']].connect(data['connect_to'])
 			return get_overview()

api_modules/machines.py

@@ -26,8 +26,6 @@ def get_machine_info(target=None):
 
 class parser():
 	def process(self, path, client, data, headers, fileno, addr, *args, **kwargs):
-		print('### Machines ###\n', data, client)
-
 		if not 'machines' in data:
 			return get_overview()
 

api_modules/router.py

@@ -8,9 +8,9 @@ def get_overview():
 			'ip' : vmanager.nics[nic_name].ip,
 			'MAC' : vmanager.nics[nic_name].mac,
 			'state' : vmanager.nics[nic_name].state,
-			'gateway' : vmanager.nics[nic_name].ports['sink_name'],
-			'routes' : None,
-			'connected_to' : None
+			'gateway' : vmanager.nics[nic_name].gateway,
+			'routes' : vmanager.nics[nic_name].routes,
+			'connected_to' : vmanager.nics[nic_name].connected_to
 		}
 
 	for nic_name in vmanager.interfaces:
@@ -26,8 +26,6 @@ def get_overview():
 
 class parser():
 	def process(self, path, client, data, headers, fileno, addr, *args, **kwargs):
-		print('### router ###\n', data, client)
-
 		if 'new' in data:
 			vmanager.Router(trunk=data['new']['trunk'], ifname=data['new']['name'])
 

api_modules/switch.py

@@ -8,9 +8,9 @@ def get_overview():
 			'ip' : vmanager.nics[nic_name].ip,
 			'MAC' : vmanager.nics[nic_name].mac,
 			'state' : vmanager.nics[nic_name].state,
-			'gateway' : vmanager.nics[nic_name].ports['sink_name'],
-			'routes' : None,
-			'connected_to' : None
+			'gateway' : vmanager.nics[nic_name].gateway,
+			'routes' : vmanager.nics[nic_name].routes,
+			'connected_to' : vmanager.nics[nic_name].connected_to
 		}
 
 	for nic_name in vmanager.interfaces:
@@ -26,8 +26,6 @@ def get_overview():
 
 class parser():
 	def process(self, path, client, data, headers, fileno, addr, *args, **kwargs):
-		print('### switch ###\n', data, client)
-
 		if 'new' in data:
 			vmanager.Switch(data['new']['name'])
 

api_modules/virtualnic.py

@@ -8,9 +8,9 @@ def get_overview():
 			'ip' : vmanager.nics[nic_name].ip,
 			'MAC' : vmanager.nics[nic_name].mac,
 			'state' : vmanager.nics[nic_name].state,
-			'gateway' : vmanager.nics[nic_name].ports['sink_name'],
-			'routes' : None,
-			'connected_to' : None
+			'gateway' : vmanager.nics[nic_name].gateway,
+			'routes' : vmanager.nics[nic_name].routes,
+			'connected_to' : vmanager.nics[nic_name].connected_to
 		}
 
 	for nic_name in vmanager.interfaces:
@@ -26,9 +26,7 @@ def get_overview():
 
 class parser():
 	def process(self, path, client, data, headers, fileno, addr, *args, **kwargs):
-		print('### nic ###\n', data, client)
-
 		if 'new' in data:
-			vmanager.VirtualNic(data['new']['name'])
+			vmanager.VirtualNic(ifname=data['new']['name'])
 
 			return get_overview()

api_modules/virtualnics.py

@@ -8,9 +8,9 @@ def get_overview():
 			'ip' : vmanager.nics[nic_name].ip,
 			'MAC' : vmanager.nics[nic_name].mac,
 			'state' : vmanager.nics[nic_name].state,
-			'gateway' : vmanager.nics[nic_name].ports['sink_name'],
-			'routes' : None,
-			'connected_to' : None
+			'gateway' : vmanager.nics[nic_name].gateway,
+			'routes' : vmanager.nics[nic_name].routes,
+			'connected_to' : vmanager.nics[nic_name].connected_to
 		}
 
 	for nic_name in vmanager.interfaces:
@@ -29,7 +29,8 @@ def get_machine_info(target=None):
 
 class parser():
 	def process(self, path, client, data, headers, fileno, addr, *args, **kwargs):
-		print('### NICS ###\n', data, client)
+		if 'virtualnics' in data and ('refresh' in data['virtualnics'] or 'update' in data['virtualnics']):
+			vmanager.update_interface_cache()
 
 		if not 'target' in data:
 			return get_overview()

web_root/vmanager-gui.js

@@ -131,6 +131,7 @@ function connected_to(row, column, data) {
 	let dropdown = document.createElement('select');
 	dropdown.classList = 'dropdown';
 	dropdown.id = row+'_connect_to';
+	dropdown.setAttribute('nic', row);
 
 	let none = document.createElement('option');
 	none.classList = 'bold';
@@ -148,9 +149,20 @@ function connected_to(row, column, data) {
 				option.value = iface_name;
 				option.innerHTML = iface_name;
 				dropdown.appendChild(option);
+				if(data.indexOf(iface_name) >= 0)
+					dropdown.value = iface_name;
 			})
 		}
 	})
+
+	dropdown.addEventListener('change', (event) => {
+		socket.send({
+			'_module' : 'interface',
+			'target' : dropdown.getAttribute('nic'),
+			'connect_to' : dropdown.options[dropdown.selectedIndex].value
+		})
+	})
+
 	return dropdown;
 }
 
@@ -365,18 +377,20 @@ class networkinterfaces {
 	build() {
 		this.container.innerHTML = '';
 		socket.clear_subscribers();
-
 		this.main_area = create_html_obj('div', {'classList' : 'overview'}, this.container);
 		this.submenu = create_html_obj('div', {'classList' : 'submenu'}, this.main_area);
 		let add_interface = create_html_obj('div', {'classList' : 'button'}, this.submenu);
 		let add_switch = create_html_obj('div', {'classList' : 'button'}, this.submenu);
 		let add_router = create_html_obj('div', {'classList' : 'button'}, this.submenu);
+		let refresh_interfaces = create_html_obj('div', {'classList' : 'button'}, this.submenu);
 		let plus_icon = create_html_obj('i', {'classList' : 'fas fa-plus-square'}, add_interface);
+		let refresh_icon = create_html_obj('i', {'classList' : 'fas fa-sync-alt'}, refresh_interfaces);
 		plus_icon = create_html_obj('i', {'classList' : 'fas fa-plus-square'}, add_switch);
 		plus_icon = create_html_obj('i', {'classList' : 'fas fa-plus-square'}, add_router);
 		add_interface.innerHTML = add_interface.innerHTML + ' Add Virtual Interface';
-		add_switch.innerHTML = add_switch.innerHTML + ' Add Virtual Switch'
-		add_router.innerHTML = add_router.innerHTML + ' Add Virtual Router'
+		add_switch.innerHTML = add_switch.innerHTML + ' Add Virtual Switch';
+		add_router.innerHTML = add_router.innerHTML + ' Add Virtual Router';
+		refresh_interfaces.innerHTML = refresh_interfaces.innerHTML + ' Refresh interfaces';
 
 		add_interface.addEventListener('click', () => {
 			let popup_body = document.createElement('div');
@@ -451,6 +465,15 @@ class networkinterfaces {
 			});
 		})
 
+		refresh_interfaces.addEventListener('click', () => {
+			socket.send({
+				"_module": "virtualnics",
+				"virtualnics": {
+					"update" : true
+				}
+			})
+		})
+
 		socket.subscribe('vnics', (json_payload) => {
 			console.log(json_payload)
 
@@ -530,7 +553,7 @@ class networkinterfaces {
 
 				let routers_header = h3('Virtual Routers', {}, this.vnics);
 				let routers_list = table(
-					['NIC Name', 'IP(s)', 'MAC', 'State', 'Gateway', 'Routes', 'Input Link'],
+					['NIC Name', 'IP(s)', 'MAC', 'State', 'Gateway', 'Routes', 'Trunk Connection'],
 					json_payload['routers'],
 					{'classList' : 'table routers'}, this.vnics, (row) => {
 						view_router(row);