Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CP-11957: ssh console: Add UI elements to launch ssh

Browse Source 
Refactored VIF to return a List<string> of IP addresses and to use this to return a concatenated string version
This commit is contained in:
Gabor Apati-Nagy 2015-05-07 12:41:12 +01:00
parent aca727f858
commit 33addb3afc
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Controls/NetworkingTab/NetworkList.cs
View File

@ -858,7 +858,7 @@ namespace XenAdmin.Controls.NetworkingTab
MacCell.Value = Helpers.GetMacString(Vif.MAC);
LimitCell.Value = Vif.qos_algorithm_type != ""? Vif.LimitString:"";
NetworkCell.Value = Vif.NetworkName();
IpCell.Value = Vif.IPAddress();
IpCell.Value = Vif.IPAddressesAsString();
AttachedCell.Value = Vif.currently_attached ? Messages.YES : Messages.NO;
}

34
XenModel/XenAPI-Extensions/VIF.cs
View File

@ -42,32 +42,13 @@ namespace XenAPI
public const string RATE_LIMIT_QOS_VALUE = "ratelimit";
public const string KBPS_QOS_PARAMS_KEY = "kbps";
public string IPAddress()
public string IPAddressesAsString()
{
VM vm = Connection.Resolve(this.VM);
if (vm != null && !vm.is_a_template)
{
VM_guest_metrics vmGuestMetrics = Connection.Resolve(vm.guest_metrics);
if (vmGuestMetrics != null)
{
// PR-1373 - VM_guest_metrics.networks is a dictionary of IP addresses in the format:
// [["0/ip", <IPv4 address>], ["0/ipv6/0", <IPv6 address>], ["0/ipv6/1", <IPv6 address>]]
List<string> addresses = (from network in vmGuestMetrics.networks
where network.Key.StartsWith(String.Format("{0}/ip", this.device))
orderby network.Key
select network.Value).ToList();
if (addresses.Count > 0)
return String.Join(", ", addresses.ToArray());
}
return Messages.IP_ADDRESS_UNKNOWN;
}
else
{
return Messages.IP_ADDRESS_UNKNOWN;
}
var addresses = IPAddresses;
if (addresses.Count > 0)
return String.Join(", ", addresses.ToArray());
return Messages.IP_ADDRESS_UNKNOWN;
}
public List<string> IPAddresses
@ -81,6 +62,9 @@ namespace XenAPI
if (vmGuestMetrics != null)
{
// PR-1373 - VM_guest_metrics.networks is a dictionary of IP addresses in the format:
// [["0/ip", <IPv4 address>], ["0/ipv6/0", <IPv6 address>], ["0/ipv6/1", <IPv6 address>]]
return
(from network in vmGuestMetrics.networks
where network.Key.StartsWith(string.Format("{0}/ip", this.device))