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

CA-162989: Container Management GUI use-ability/homogeneity fixes

Browse Source 
Implemented changes as follows (copied from ticket):
"I'd suggest the following use-ability/homogeneity fixes for the new container management tabs, if they are quick and easy:

    Combine "Docker Version" and "Docker Information" on the VM-General-tab into "Container Management - Docker Status" with the following fields only:
        API version
        Version
        Git Commit
        Driver
        Index Server Address
        Execution Driver
        IPv4 Forwarding
    In the "Processes" tab, change the name from "Docker Processes" to "Container Processes"
    In the "Details" tab, change the name from "Docker Detail" to "Container Details"
    In the "Details" tab, drop the top level element "docker_inspect" (XML requires a single root-node, afaik the Windows form treenode does not), or alternatively open the root node by default and rename it to "Inspect Result"
    In the "Details" tab, add the "Details"-headline in black on white - just like on the "Processes"-tab

Also, on the container's General tab, show Properties button disabled, instead on hiding it (to be consistent to other cases, e.g. disconnected servers)
"

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
This commit is contained in:
Gabor Apati-Nagy 2015-03-05 19:10:54 +00:00
parent 2b2cb9f9f4
commit 497afabcef
8 changed files with 142 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
XenAdmin/TabPages/DockerDetailsPage.Designer.cs generated
View File

@ -34,11 +34,14 @@ namespace XenAdmin.TabPages
this.ButtonPanel = new System.Windows.Forms.Panel(); this.ButtonPanel = new System.Windows.Forms.Panel();
this.RefreshTime = new System.Windows.Forms.Label(); this.RefreshTime = new System.Windows.Forms.Label();
this.TreePanel = new System.Windows.Forms.Panel(); this.TreePanel = new System.Windows.Forms.Panel();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.DetailtreeView = new System.Windows.Forms.TreeView(); this.DetailtreeView = new System.Windows.Forms.TreeView();
this.label1 = new System.Windows.Forms.Label();
this.RefreshTimer = new System.Windows.Forms.Timer(this.components); this.RefreshTimer = new System.Windows.Forms.Timer(this.components);
this.pageContainerPanel.SuspendLayout(); this.pageContainerPanel.SuspendLayout();
this.ButtonPanel.SuspendLayout(); this.ButtonPanel.SuspendLayout();
this.TreePanel.SuspendLayout(); this.TreePanel.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// pageContainerPanel // pageContainerPanel
@ -68,15 +71,27 @@ namespace XenAdmin.TabPages
// TreePanel // TreePanel
// //
resources.ApplyResources(this.TreePanel, "TreePanel"); resources.ApplyResources(this.TreePanel, "TreePanel");
this.TreePanel.Controls.Add(this.DetailtreeView); this.TreePanel.Controls.Add(this.tableLayoutPanel2);
this.TreePanel.Controls.Add(this.ButtonPanel); this.TreePanel.Controls.Add(this.ButtonPanel);
this.TreePanel.Name = "TreePanel"; this.TreePanel.Name = "TreePanel";
// //
// tableLayoutPanel2
//
resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2");
this.tableLayoutPanel2.Controls.Add(this.DetailtreeView, 0, 1);
this.tableLayoutPanel2.Controls.Add(this.label1, 0, 0);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
//
// DetailtreeView // DetailtreeView
// //
resources.ApplyResources(this.DetailtreeView, "DetailtreeView"); resources.ApplyResources(this.DetailtreeView, "DetailtreeView");
this.DetailtreeView.Name = "DetailtreeView"; this.DetailtreeView.Name = "DetailtreeView";
// //
// label1
//
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
//
// RefreshTimer // RefreshTimer
// //
this.RefreshTimer.Tick += new System.EventHandler(this.RefreshTimer_Tick); this.RefreshTimer.Tick += new System.EventHandler(this.RefreshTimer_Tick);
@ -91,6 +106,8 @@ namespace XenAdmin.TabPages
this.ButtonPanel.ResumeLayout(false); this.ButtonPanel.ResumeLayout(false);
this.ButtonPanel.PerformLayout(); this.ButtonPanel.PerformLayout();
this.TreePanel.ResumeLayout(false); this.TreePanel.ResumeLayout(false);
this.tableLayoutPanel2.ResumeLayout(false);
this.tableLayoutPanel2.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
@ -101,8 +118,10 @@ namespace XenAdmin.TabPages
private System.Windows.Forms.Panel TreePanel; private System.Windows.Forms.Panel TreePanel;
private System.Windows.Forms.Panel ButtonPanel; private System.Windows.Forms.Panel ButtonPanel;
private System.Windows.Forms.Label RefreshTime; private System.Windows.Forms.Label RefreshTime;
private System.Windows.Forms.TreeView DetailtreeView;
private System.Windows.Forms.Timer RefreshTimer; private System.Windows.Forms.Timer RefreshTimer;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
private System.Windows.Forms.TreeView DetailtreeView;
private System.Windows.Forms.Label label1;
} }
} }

29
XenAdmin/TabPages/DockerDetailsPage.cs
View File

@ -145,21 +145,34 @@ namespace XenAdmin.TabPages
{ {
if (cachedResult == currentResult) if (cachedResult == currentResult)
return; return;
cachedResult = currentResult; cachedResult = currentResult;
DetailtreeView.Nodes.Clear(); DetailtreeView.Nodes.Clear();
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.LoadXml(currentResult); doc.LoadXml(currentResult);
IEnumerator ienum = doc.GetEnumerator();
XmlNode docker_inspect; IEnumerator firstEnum = doc.GetEnumerator();
while (ienum.MoveNext()) XmlNode node;
while (firstEnum.MoveNext())
{ {
docker_inspect = (XmlNode) ienum.Current; node = (XmlNode)firstEnum.Current;
if (docker_inspect.NodeType != XmlNodeType.XmlDeclaration)
if (node.NodeType != XmlNodeType.XmlDeclaration)
{ {
TreeNode rootNode = new TreeNode(); //we are on the root element now (docker_inspect)
CreateTree(docker_inspect, rootNode); //using the following enumerator to iterate through the children nodes and to build related sub-trees
DetailtreeView.Nodes.Add(rootNode); //note that we are intentionally not adding the root node to the tree (UX decision)
var secondEnum = node.GetEnumerator();
while (secondEnum.MoveNext())
{
//recursively building the tree
TreeNode rootNode = new TreeNode();
CreateTree((XmlNode)secondEnum.Current, rootNode);
//adding the current sub-tree to the TreeView
DetailtreeView.Nodes.Add(rootNode);
}
} }
} }
} }

90
XenAdmin/TabPages/DockerDetailsPage.resx
View File

@ -125,18 +125,24 @@
<data name="TreePanel.AutoSize" type="System.Boolean, mscorlib"> <data name="TreePanel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
<data name="tableLayoutPanel2.ColumnCount" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="DetailtreeView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="DetailtreeView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="DetailtreeView.Location" type="System.Drawing.Point, System.Drawing"> <data name="DetailtreeView.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>7, 31</value>
</data>
<data name="DetailtreeView.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>7, 3, 9, 3</value>
</data> </data>
<data name="DetailtreeView.Size" type="System.Drawing.Size, System.Drawing"> <data name="DetailtreeView.Size" type="System.Drawing.Size, System.Drawing">
<value>816, 333</value> <value>803, 299</value>
</data> </data>
<data name="DetailtreeView.TabIndex" type="System.Int32, mscorlib"> <data name="DetailtreeView.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>1</value>
</data> </data>
<data name="&gt;&gt;DetailtreeView.Name" xml:space="preserve"> <data name="&gt;&gt;DetailtreeView.Name" xml:space="preserve">
<value>DetailtreeView</value> <value>DetailtreeView</value>
@ -145,11 +151,80 @@
<value>System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;DetailtreeView.Parent" xml:space="preserve"> <data name="&gt;&gt;DetailtreeView.Parent" xml:space="preserve">
<value>TreePanel</value> <value>tableLayoutPanel2</value>
</data> </data>
<data name="&gt;&gt;DetailtreeView.ZOrder" xml:space="preserve"> <data name="&gt;&gt;DetailtreeView.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label1.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 11.25pt</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value>
</data>
<data name="label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 0, 0, 2</value>
</data>
<data name="label1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 6, 10, 0</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 26</value>
</data>
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Details</value>
</data>
<data name="&gt;&gt;label1.Name" xml:space="preserve">
<value>label1</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>tableLayoutPanel2</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="tableLayoutPanel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="tableLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="tableLayoutPanel2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="tableLayoutPanel2.RowCount" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
<value>819, 333</value>
</data>
<data name="tableLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="&gt;&gt;tableLayoutPanel2.Name" xml:space="preserve">
<value>tableLayoutPanel2</value>
</data>
<data name="&gt;&gt;tableLayoutPanel2.Type" xml:space="preserve">
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tableLayoutPanel2.Parent" xml:space="preserve">
<value>TreePanel</value>
</data>
<data name="&gt;&gt;tableLayoutPanel2.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="DetailtreeView" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="RefreshTime.AutoSize" type="System.Boolean, mscorlib"> <data name="RefreshTime.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
@ -180,6 +255,9 @@
<data name="RefreshButton.Location" type="System.Drawing.Point, System.Drawing"> <data name="RefreshButton.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 7</value> <value>4, 7</value>
</data> </data>
<data name="RefreshButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>9, 3, 3, 3</value>
</data>
<data name="RefreshButton.Size" type="System.Drawing.Size, System.Drawing"> <data name="RefreshButton.Size" type="System.Drawing.Size, System.Drawing">
<value>74, 23</value> <value>74, 23</value>
</data> </data>
@ -208,7 +286,7 @@
<value>0, 333</value> <value>0, 333</value>
</data> </data>
<data name="ButtonPanel.Size" type="System.Drawing.Size, System.Drawing"> <data name="ButtonPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>816, 42</value> <value>819, 42</value>
</data> </data>
<data name="ButtonPanel.TabIndex" type="System.Int32, mscorlib"> <data name="ButtonPanel.TabIndex" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
@ -229,7 +307,7 @@
<value>3, 3</value> <value>3, 3</value>
</data> </data>
<data name="TreePanel.Size" type="System.Drawing.Size, System.Drawing"> <data name="TreePanel.Size" type="System.Drawing.Size, System.Drawing">
<value>816, 375</value> <value>819, 375</value>
</data> </data>
<data name="TreePanel.TabIndex" type="System.Int32, mscorlib"> <data name="TreePanel.TabIndex" type="System.Int32, mscorlib">
<value>3</value> <value>3</value>

2
XenAdmin/TabPages/DockerProcessPage.resx
View File

@ -448,7 +448,7 @@
<value>27</value> <value>27</value>
</data> </data>
<data name="TitleLabel.Text" xml:space="preserve"> <data name="TitleLabel.Text" xml:space="preserve">
<value>Docker Processes</value> <value>Container Processes</value>
</data> </data>
<data name="TitleLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> <data name="TitleLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value> <value>MiddleLeft</value>

49
XenAdmin/TabPages/GeneralTabPage.cs
View File

@ -383,7 +383,10 @@ namespace XenAdmin.TabPages
public void EnableDisableEdit() public void EnableDisableEdit()
{ {
buttonProperties.Enabled = xenObject != null && !xenObject.Locked && xenObject.Connection != null && xenObject.Connection.IsConnected; buttonProperties.Enabled = xenObject != null && !xenObject.Locked && xenObject.Connection != null && xenObject.Connection.IsConnected;
buttonProperties.Visible = !(xenObject is DockerContainer);
//keeping it seperate
if (xenObject is DockerContainer)
buttonProperties.Enabled = false;
} }
public void BuildList() public void BuildList()
@ -468,7 +471,6 @@ namespace XenAdmin.TabPages
generateMultipathBootBox(); generateMultipathBootBox();
generateVCPUsBox(); generateVCPUsBox();
generateDockerInfoBox(); generateDockerInfoBox();
generateDockerVersionBox();
generateReadCachingBox(); generateReadCachingBox();
} }
@ -1554,50 +1556,19 @@ namespace XenAdmin.TabPages
if (info == null) if (info == null)
return; return;
PDSection s = pdSectionDockerInfo;
addStringEntry(s, Messages.DOCKER_INFO_NGOROUTINES, info.NGoroutines);
addStringEntry(s, Messages.DOCKER_INFO_ROOT_DIR, info.DockerRootDir);
addStringEntry(s, Messages.DOCKER_INFO_DRIVER_STATUS, info.DriverStatus);
addStringEntry(s, Messages.OPERATING_SYSTEM, info.OperatingSystem); ;
addStringEntry(s, Messages.CONTAINER, info.Containers);
addStringEntry(s, Messages.MEMORY, Util.MemorySizeString(Convert.ToDouble(info.MemTotal)));
addStringEntry(s, Messages.DOCKER_INFO_DRIVER, info.Driver);
addStringEntry(s, Messages.DOCKER_INFO_INDEX_SERVER_ADDRESS, info.IndexServerAddress);
addStringEntry(s, Messages.DOCKER_INFO_INITIATE_PATH, info.InitPath);
addStringEntry(s, Messages.DOCKER_INFO_EXECUTION_DRIVER, info.ExecutionDriver);
addStringEntry(s, Messages.NAME, info.Name);
addStringEntry(s, Messages.DOCKER_INFO_NCPU, info.NCPU);
addStringEntry(s, Messages.DOCKER_INFO_DEBUG, info.Debug);
addStringEntry(s, Messages.ID, info.ID);
addStringEntry(s, Messages.DOCKER_INFO_IPV4_FORWARDING, info.IPv4Forwarding);
addStringEntry(s, Messages.DOCKER_INFO_KERNEL_VERSION, info.KernelVersion);
addStringEntry(s, Messages.DOCKER_INFO_NFD, info.NFd);
addStringEntry(s, Messages.DOCKER_INFO_INITIATE_SHA1, info.InitSha1);
addStringEntry(s, Messages.DOCKER_INFO_LABELS, info.Labels);
addStringEntry(s, Messages.DOCKER_INFO_MEMORY_LIMIT, Util.MemorySizeString(Convert.ToDouble(info.MemoryLimit)));
addStringEntry(s, Messages.DOCKER_INFO_SWAP_LIMIT, info.SwapLimit);
addStringEntry(s, Messages.CONTAINER_IMAGE, info.Images);
addStringEntry(s, Messages.DOCKER_INFO_NEVENT_LISTENER, info.NEventsListener);
}
private void generateDockerVersionBox()
{
VM vm = xenObject as VM;
if (vm == null)
return;
VM_Docker_Version version = vm.DockerVersion; VM_Docker_Version version = vm.DockerVersion;
if (version == null) if (version == null)
return; return;
PDSection s = pdSectionDockerVersion; PDSection s = pdSectionDockerInfo;
addStringEntry(s, Messages.DOCKER_INFO_KERNEL_VERSION, version.KernelVersion);
addStringEntry(s, Messages.DOCKER_INFO_ARCH, version.Arch);
addStringEntry(s, Messages.DOCKER_INFO_API_VERSION, version.ApiVersion); addStringEntry(s, Messages.DOCKER_INFO_API_VERSION, version.ApiVersion);
addStringEntry(s, Messages.DOCKER_INFO_VERSION, version.Version); addStringEntry(s, Messages.DOCKER_INFO_VERSION, version.Version);
addStringEntry(s, Messages.DOCKER_INFO_GIT_COMMIT, version.GitCommit); addStringEntry(s, Messages.DOCKER_INFO_GIT_COMMIT, version.GitCommit);
addStringEntry(s, Messages.OPERATING_SYSTEM, version.Os); addStringEntry(s, Messages.DOCKER_INFO_DRIVER, info.Driver);
addStringEntry(s, Messages.DOCKER_INFO_GO_VERSION, version.GoVersion); addStringEntry(s, Messages.DOCKER_INFO_INDEX_SERVER_ADDRESS, info.IndexServerAddress);
addStringEntry(s, Messages.DOCKER_INFO_EXECUTION_DRIVER, info.ExecutionDriver);
addStringEntry(s, Messages.DOCKER_INFO_IPV4_FORWARDING, info.IPv4Forwarding);
} }
private bool CPUsIdentical(IEnumerable<Host_cpu> cpus) private bool CPUsIdentical(IEnumerable<Host_cpu> cpus)

2
XenAdmin/TabPages/GeneralTabPage.resx
View File

@ -211,7 +211,7 @@
<value>1, 1, 1, 1</value> <value>1, 1, 1, 1</value>
</data> </data>
<data name="pdSectionDockerInfo.SectionTitle" xml:space="preserve"> <data name="pdSectionDockerInfo.SectionTitle" xml:space="preserve">
<value>Docker Information</value> <value>Container Management - Docker Status</value>
</data> </data>
<data name="pdSectionDockerInfo.Size" type="System.Drawing.Size, System.Drawing"> <data name="pdSectionDockerInfo.Size" type="System.Drawing.Size, System.Drawing">
<value>712, 34</value> <value>712, 34</value>

4
XenModel/Messages.Designer.cs generated
View File

@ -10491,7 +10491,7 @@ namespace XenAdmin {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Docker Detail. /// Looks up a localized string similar to Container Details.
/// </summary> /// </summary>
public static string DOCKER_DETAIL_TAB_TITLE { public static string DOCKER_DETAIL_TAB_TITLE {
get { get {
@ -10698,7 +10698,7 @@ namespace XenAdmin {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Docker Processes. /// Looks up a localized string similar to Container Processes.
/// </summary> /// </summary>
public static string DOCKER_PROCESS_TAB_TITLE { public static string DOCKER_PROCESS_TAB_TITLE {
get { get {

4
XenModel/Messages.resx
View File

@ -3731,10 +3731,10 @@ This will also delete its subfolders.</value>
<value>does not use</value> <value>does not use</value>
</data> </data>
<data name="DOCKER_DETAIL_TAB_TITLE" xml:space="preserve"> <data name="DOCKER_DETAIL_TAB_TITLE" xml:space="preserve">
<value>Docker Detail</value> <value>Container Details</value>
</data> </data>
<data name="DOCKER_PROCESS_TAB_TITLE" xml:space="preserve"> <data name="DOCKER_PROCESS_TAB_TITLE" xml:space="preserve">
<value>Docker Processes</value> <value>Container Processes</value>
</data> </data>
<data name="DOCKER_INFO_API_VERSION" xml:space="preserve"> <data name="DOCKER_INFO_API_VERSION" xml:space="preserve">
<value>Api Version</value> <value>Api Version</value>