Network handling and MacOS optimization
This commit is contained in:
@@ -123,6 +123,12 @@ class Program
|
||||
case "metrics":
|
||||
await ShowMetrics(arguments);
|
||||
break;
|
||||
case "network":
|
||||
await HandleNetworkCommandsAsync(arguments);
|
||||
break;
|
||||
case "port":
|
||||
await HandlePortCommandsAsync(arguments);
|
||||
break;
|
||||
case "exit":
|
||||
case "quit":
|
||||
System.Console.WriteLine("Goodbye!");
|
||||
@@ -159,6 +165,8 @@ class Program
|
||||
System.Console.WriteLine(" diagnose - Diagnose system and QEMU installation");
|
||||
System.Console.WriteLine(" monitor <name> [start|stop|status] - Performance monitoring");
|
||||
System.Console.WriteLine(" metrics <name> [current|history] - Show performance metrics");
|
||||
System.Console.WriteLine(" network <command> - Network management (bridge, interfaces)");
|
||||
System.Console.WriteLine(" port <command> - Port forwarding management");
|
||||
System.Console.WriteLine(" help - Show this help");
|
||||
System.Console.WriteLine(" exit/quit - Exit the application");
|
||||
}
|
||||
@@ -813,4 +821,467 @@ class Program
|
||||
var input = System.Console.ReadLine()?.Trim();
|
||||
return string.IsNullOrEmpty(input) ? defaultValue : input;
|
||||
}
|
||||
|
||||
static async Task HandleNetworkCommandsAsync(string[] arguments)
|
||||
{
|
||||
if (arguments.Length == 0)
|
||||
{
|
||||
System.Console.WriteLine("Network management commands:");
|
||||
System.Console.WriteLine(" network bridges - List available bridges");
|
||||
System.Console.WriteLine(" network interfaces - List network interfaces");
|
||||
System.Console.WriteLine(" network create <name> [interface] - Create a bridge");
|
||||
System.Console.WriteLine(" network delete <name> - Delete a bridge");
|
||||
System.Console.WriteLine(" network config <name> <ip> <mask> - Configure bridge IP");
|
||||
System.Console.WriteLine(" network vm <vm-name> bridge <name> - Configure VM for bridge networking");
|
||||
System.Console.WriteLine(" network vm <vm-name> user - Configure VM for user networking");
|
||||
return;
|
||||
}
|
||||
|
||||
var networkManager = new NetworkManager();
|
||||
var command = arguments[0].ToLower();
|
||||
|
||||
try
|
||||
{
|
||||
switch (command)
|
||||
{
|
||||
case "bridges":
|
||||
await ShowBridgesAsync(networkManager);
|
||||
break;
|
||||
|
||||
case "interfaces":
|
||||
await ShowInterfacesAsync(networkManager);
|
||||
break;
|
||||
|
||||
case "create":
|
||||
if (arguments.Length < 2)
|
||||
{
|
||||
System.Console.WriteLine("Usage: network create <bridge-name> [interface-name]");
|
||||
return;
|
||||
}
|
||||
await CreateBridgeAsync(networkManager, arguments[1], arguments.Length > 2 ? arguments[2] : null);
|
||||
break;
|
||||
|
||||
case "delete":
|
||||
if (arguments.Length < 2)
|
||||
{
|
||||
System.Console.WriteLine("Usage: network delete <bridge-name>");
|
||||
return;
|
||||
}
|
||||
await DeleteBridgeAsync(networkManager, arguments[1]);
|
||||
break;
|
||||
|
||||
case "config":
|
||||
if (arguments.Length < 4)
|
||||
{
|
||||
System.Console.WriteLine("Usage: network config <bridge-name> <ip-address> <netmask>");
|
||||
System.Console.WriteLine("Example: network config virbr0 192.168.122.1 24");
|
||||
return;
|
||||
}
|
||||
await ConfigureBridgeAsync(networkManager, arguments[1], arguments[2], arguments[3]);
|
||||
break;
|
||||
|
||||
case "vm":
|
||||
if (arguments.Length < 3)
|
||||
{
|
||||
System.Console.WriteLine("Usage: network vm <vm-name> <bridge|user> [bridge-name]");
|
||||
return;
|
||||
}
|
||||
await ConfigureVmNetworkAsync(arguments[1], arguments[2], arguments.Length > 3 ? arguments[3] : null);
|
||||
break;
|
||||
|
||||
default:
|
||||
System.Console.WriteLine($"Unknown network command: {command}");
|
||||
System.Console.WriteLine("Type 'network' for available network commands");
|
||||
break;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
System.Console.WriteLine($"Error: {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
static async Task ShowBridgesAsync(NetworkManager networkManager)
|
||||
{
|
||||
System.Console.WriteLine("=== Available Network Bridges ===");
|
||||
var bridges = await networkManager.GetAvailableBridgesAsync();
|
||||
|
||||
if (bridges.Any())
|
||||
{
|
||||
foreach (var bridge in bridges)
|
||||
{
|
||||
var ipAddress = await networkManager.GetBridgeIpAddressAsync(bridge);
|
||||
System.Console.WriteLine($" {bridge}: {ipAddress ?? "No IP configured"}");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Console.WriteLine("No bridges found");
|
||||
System.Console.WriteLine("Use 'network create <name>' to create a bridge");
|
||||
}
|
||||
}
|
||||
|
||||
static async Task ShowInterfacesAsync(NetworkManager networkManager)
|
||||
{
|
||||
System.Console.WriteLine("=== Available Network Interfaces ===");
|
||||
var interfaces = await networkManager.GetNetworkInterfacesAsync();
|
||||
|
||||
if (interfaces.Any())
|
||||
{
|
||||
foreach (var iface in interfaces)
|
||||
{
|
||||
System.Console.WriteLine($" {iface}");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Console.WriteLine("No network interfaces found");
|
||||
}
|
||||
}
|
||||
|
||||
static async Task CreateBridgeAsync(NetworkManager networkManager, string bridgeName, string? interfaceName)
|
||||
{
|
||||
System.Console.WriteLine($"Creating bridge '{bridgeName}'...");
|
||||
|
||||
if (!string.IsNullOrEmpty(interfaceName))
|
||||
{
|
||||
System.Console.WriteLine($"Adding interface '{interfaceName}' to bridge...");
|
||||
}
|
||||
|
||||
var success = await networkManager.CreateBridgeAsync(bridgeName, interfaceName);
|
||||
|
||||
if (success)
|
||||
{
|
||||
System.Console.WriteLine($"✅ Bridge '{bridgeName}' created successfully");
|
||||
if (!string.IsNullOrEmpty(interfaceName))
|
||||
{
|
||||
System.Console.WriteLine($"✅ Interface '{interfaceName}' added to bridge");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Console.WriteLine($"❌ Failed to create bridge '{bridgeName}'");
|
||||
System.Console.WriteLine("Note: Bridge creation may require root privileges");
|
||||
}
|
||||
}
|
||||
|
||||
static async Task DeleteBridgeAsync(NetworkManager networkManager, string bridgeName)
|
||||
{
|
||||
System.Console.WriteLine($"Deleting bridge '{bridgeName}'...");
|
||||
|
||||
var success = await networkManager.DeleteBridgeAsync(bridgeName);
|
||||
|
||||
if (success)
|
||||
{
|
||||
System.Console.WriteLine($"✅ Bridge '{bridgeName}' deleted successfully");
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Console.WriteLine($"❌ Failed to delete bridge '{bridgeName}'");
|
||||
System.Console.WriteLine("Note: Bridge deletion may require root privileges");
|
||||
}
|
||||
}
|
||||
|
||||
static async Task ConfigureBridgeAsync(NetworkManager networkManager, string bridgeName, string ipAddress, string netmask)
|
||||
{
|
||||
System.Console.WriteLine($"Configuring bridge '{bridgeName}' with IP {ipAddress}/{netmask}...");
|
||||
|
||||
var success = await networkManager.ConfigureBridgeAsync(bridgeName, ipAddress, netmask);
|
||||
|
||||
if (success)
|
||||
{
|
||||
System.Console.WriteLine($"✅ Bridge '{bridgeName}' configured successfully");
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Console.WriteLine($"❌ Failed to configure bridge '{bridgeName}'");
|
||||
System.Console.WriteLine("Note: Bridge configuration may require root privileges");
|
||||
}
|
||||
}
|
||||
|
||||
static async Task ConfigureVmNetworkAsync(string vmName, string networkType, string? bridgeName)
|
||||
{
|
||||
var vmService = new VmManagementService();
|
||||
var config = vmService.GetVmConfiguration(vmName);
|
||||
|
||||
if (config == null)
|
||||
{
|
||||
System.Console.WriteLine($"VM '{vmName}' not found");
|
||||
return;
|
||||
}
|
||||
|
||||
if (networkType == "bridge")
|
||||
{
|
||||
if (string.IsNullOrEmpty(bridgeName))
|
||||
{
|
||||
System.Console.WriteLine("Bridge name required for bridge networking");
|
||||
System.Console.WriteLine("Usage: network vm <vm-name> bridge <bridge-name>");
|
||||
return;
|
||||
}
|
||||
|
||||
// Configure for bridge networking
|
||||
config.Network.Interfaces.Clear();
|
||||
config.Network.Interfaces.Add(new NetworkInterfaceConfiguration
|
||||
{
|
||||
Type = "bridge",
|
||||
Model = "virtio-net-pci",
|
||||
Bridge = bridgeName
|
||||
});
|
||||
|
||||
System.Console.WriteLine($"✅ VM '{vmName}' configured for bridge networking on '{bridgeName}'");
|
||||
}
|
||||
else if (networkType == "user")
|
||||
{
|
||||
// Configure for user networking (NAT)
|
||||
config.Network.Interfaces.Clear();
|
||||
config.Network.Interfaces.Add(new NetworkInterfaceConfiguration
|
||||
{
|
||||
Type = "user",
|
||||
Model = "virtio-net-pci"
|
||||
});
|
||||
|
||||
System.Console.WriteLine($"✅ VM '{vmName}' configured for user networking (NAT)");
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Console.WriteLine($"Unknown network type: {networkType}");
|
||||
System.Console.WriteLine("Supported types: bridge, user");
|
||||
return;
|
||||
}
|
||||
|
||||
// Save the updated configuration
|
||||
await vmService.UpdateVmConfigurationAsync(vmName, config);
|
||||
System.Console.WriteLine($"Configuration saved for VM '{vmName}'");
|
||||
}
|
||||
|
||||
static async Task HandlePortCommandsAsync(string[] arguments)
|
||||
{
|
||||
if (arguments.Length == 0)
|
||||
{
|
||||
System.Console.WriteLine("Port forwarding commands:");
|
||||
System.Console.WriteLine(" port forward <vm-name> <host-port> <vm-port> [protocol] - Forward host port to VM");
|
||||
System.Console.WriteLine(" port list <vm-name> - List active port forwards");
|
||||
System.Console.WriteLine(" port remove <vm-name> <host-port> - Remove port forward");
|
||||
System.Console.WriteLine(" port status <vm-name> - Show port forwarding status");
|
||||
return;
|
||||
}
|
||||
|
||||
var command = arguments[0].ToLower();
|
||||
|
||||
try
|
||||
{
|
||||
switch (command)
|
||||
{
|
||||
case "forward":
|
||||
if (arguments.Length < 4)
|
||||
{
|
||||
System.Console.WriteLine("Usage: port forward <vm-name> <host-port> <vm-port> [protocol]");
|
||||
System.Console.WriteLine("Example: port forward ubuntu-desktop 8080 80 tcp");
|
||||
return;
|
||||
}
|
||||
await ForwardPortAsync(arguments[1], int.Parse(arguments[2]), int.Parse(arguments[3]),
|
||||
arguments.Length > 4 ? arguments[4] : "tcp");
|
||||
break;
|
||||
|
||||
case "list":
|
||||
if (arguments.Length < 2)
|
||||
{
|
||||
System.Console.WriteLine("Usage: port list <vm-name>");
|
||||
return;
|
||||
}
|
||||
await ListPortForwardsAsync(arguments[1]);
|
||||
break;
|
||||
|
||||
case "remove":
|
||||
if (arguments.Length < 3)
|
||||
{
|
||||
System.Console.WriteLine("Usage: port remove <vm-name> <host-port>");
|
||||
return;
|
||||
}
|
||||
await RemovePortForwardAsync(arguments[1], int.Parse(arguments[2]));
|
||||
break;
|
||||
|
||||
case "status":
|
||||
if (arguments.Length < 2)
|
||||
{
|
||||
System.Console.WriteLine("Usage: port status <vm-name>");
|
||||
return;
|
||||
}
|
||||
await ShowPortForwardStatusAsync(arguments[1]);
|
||||
break;
|
||||
|
||||
default:
|
||||
System.Console.WriteLine($"Unknown port command: {command}");
|
||||
System.Console.WriteLine("Type 'port' for available port commands");
|
||||
break;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
System.Console.WriteLine($"Error: {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
static async Task ForwardPortAsync(string vmName, int hostPort, int vmPort, string protocol)
|
||||
{
|
||||
var vmService = new VmManagementService();
|
||||
var config = vmService.GetVmConfiguration(vmName);
|
||||
|
||||
if (config == null)
|
||||
{
|
||||
System.Console.WriteLine($"VM '{vmName}' not found");
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
// Check if port is already in use
|
||||
if (IsPortInUse(hostPort))
|
||||
{
|
||||
System.Console.WriteLine($"❌ Port {hostPort} is already in use on the host");
|
||||
return;
|
||||
}
|
||||
|
||||
// Create port forward entry
|
||||
var portForward = new PortForward
|
||||
{
|
||||
VmName = vmName,
|
||||
HostPort = hostPort,
|
||||
VmPort = vmPort,
|
||||
Protocol = protocol.ToUpper(),
|
||||
Created = DateTime.UtcNow
|
||||
};
|
||||
|
||||
// Save port forward configuration
|
||||
await SavePortForwardAsync(portForward);
|
||||
|
||||
System.Console.WriteLine($"✅ Port forward created: {hostPort}:{vmPort} ({protocol})");
|
||||
System.Console.WriteLine($" Host: localhost:{hostPort} → VM: {vmName}:{vmPort}");
|
||||
|
||||
if (OperatingSystem.IsMacOS())
|
||||
{
|
||||
System.Console.WriteLine($" Note: On macOS, VMs use socket networking on ports 10000+");
|
||||
System.Console.WriteLine($" You may need to configure your application to listen on the socket port");
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
System.Console.WriteLine($"❌ Failed to create port forward: {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
static async Task ListPortForwardsAsync(string vmName)
|
||||
{
|
||||
var portForwards = await LoadPortForwardsAsync();
|
||||
var vmForwards = portForwards.Where(pf => pf.VmName == vmName).ToList();
|
||||
|
||||
if (vmForwards.Any())
|
||||
{
|
||||
System.Console.WriteLine($"=== Port Forwards for VM '{vmName}' ===");
|
||||
System.Console.WriteLine($"{"Host Port",-12} {"VM Port",-8} {"Protocol",-8} {"Status",-10}");
|
||||
System.Console.WriteLine(new string('-', 40));
|
||||
|
||||
foreach (var pf in vmForwards)
|
||||
{
|
||||
var status = IsPortInUse(pf.HostPort) ? "Active" : "Inactive";
|
||||
System.Console.WriteLine($"{pf.HostPort,-12} {pf.VmPort,-8} {pf.Protocol,-8} {status,-10}");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Console.WriteLine($"No port forwards configured for VM '{vmName}'");
|
||||
}
|
||||
}
|
||||
|
||||
static async Task RemovePortForwardAsync(string vmName, int hostPort)
|
||||
{
|
||||
var portForwards = await LoadPortForwardsAsync();
|
||||
var toRemove = portForwards.FirstOrDefault(pf => pf.VmName == vmName && pf.HostPort == hostPort);
|
||||
|
||||
if (toRemove != null)
|
||||
{
|
||||
portForwards.Remove(toRemove);
|
||||
await SavePortForwardsAsync(portForwards);
|
||||
System.Console.WriteLine($"✅ Port forward {hostPort} removed for VM '{vmName}'");
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Console.WriteLine($"Port forward {hostPort} not found for VM '{vmName}'");
|
||||
}
|
||||
}
|
||||
|
||||
static async Task ShowPortForwardStatusAsync(string vmName)
|
||||
{
|
||||
var portForwards = await LoadPortForwardsAsync();
|
||||
var vmForwards = portForwards.Where(pf => pf.VmName == vmName).ToList();
|
||||
|
||||
if (vmForwards.Any())
|
||||
{
|
||||
System.Console.WriteLine($"=== Port Forward Status for VM '{vmName}' ===");
|
||||
foreach (var pf in vmForwards)
|
||||
{
|
||||
var status = IsPortInUse(pf.HostPort) ? "✅ Active" : "❌ Inactive";
|
||||
System.Console.WriteLine($"Port {pf.HostPort}:{pf.VmPort} ({pf.Protocol}) - {status}");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Console.WriteLine($"No port forwards configured for VM '{vmName}'");
|
||||
}
|
||||
}
|
||||
|
||||
static bool IsPortInUse(int port)
|
||||
{
|
||||
try
|
||||
{
|
||||
using var client = new System.Net.Sockets.TcpClient();
|
||||
client.Connect("127.0.0.1", port);
|
||||
return true;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
static async Task<List<PortForward>> LoadPortForwardsAsync()
|
||||
{
|
||||
var configFile = "port-forwards.json";
|
||||
if (File.Exists(configFile))
|
||||
{
|
||||
try
|
||||
{
|
||||
var json = await File.ReadAllTextAsync(configFile);
|
||||
return System.Text.Json.JsonSerializer.Deserialize<List<PortForward>>(json) ?? new List<PortForward>();
|
||||
}
|
||||
catch
|
||||
{
|
||||
return new List<PortForward>();
|
||||
}
|
||||
}
|
||||
return new List<PortForward>();
|
||||
}
|
||||
|
||||
static async Task SavePortForwardsAsync(List<PortForward> portForwards)
|
||||
{
|
||||
var configFile = "port-forwards.json";
|
||||
var json = System.Text.Json.JsonSerializer.Serialize(portForwards, new System.Text.Json.JsonSerializerOptions { WriteIndented = true });
|
||||
await File.WriteAllTextAsync(configFile, json);
|
||||
}
|
||||
|
||||
static async Task SavePortForwardAsync(PortForward portForward)
|
||||
{
|
||||
var portForwards = await LoadPortForwardsAsync();
|
||||
portForwards.Add(portForward);
|
||||
await SavePortForwardsAsync(portForwards);
|
||||
}
|
||||
}
|
||||
|
||||
public class PortForward
|
||||
{
|
||||
public string VmName { get; set; } = string.Empty;
|
||||
public int HostPort { get; set; }
|
||||
public int VmPort { get; set; }
|
||||
public string Protocol { get; set; } = "TCP";
|
||||
public DateTime Created { get; set; }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user