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

CP-8868: Development for WLB Audit Report - XenCenter Part.

Browse Source 
Update code to address the review comments.

Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
This commit is contained in:
Hui Zhang 2014-08-06 20:46:53 +08:00
parent 826d594cca
commit f9d9198de2
13 changed files with 370 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
XenAdmin/Controls/Wlb/WlbReportView.Designer.cs generated
View File

@ -33,6 +33,7 @@ namespace XenAdmin.Controls.Wlb
this.labelHostCombo = new System.Windows.Forms.Label();
this.hostComboBox = new System.Windows.Forms.ComboBox();
this.btnRunReport = new System.Windows.Forms.Button();
this.btnLaterReport = new System.Windows.Forms.Button();
this.labelEndDate = new System.Windows.Forms.Label();
this.EndDatePicker = new System.Windows.Forms.DateTimePicker();
this.labelStartDate = new System.Windows.Forms.Label();
@ -51,7 +52,7 @@ namespace XenAdmin.Controls.Wlb
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel();
this.panelUsers = new System.Windows.Forms.Panel();
this.userComboBox = new System.Windows.Forms.ComboBox();
this.userComboBox = new XenAdmin.Controls.LongStringComboBox();
this.labelUsers = new System.Windows.Forms.Label();
this.panelObjects = new System.Windows.Forms.Panel();
this.labelObjects = new System.Windows.Forms.Label();
@ -88,6 +89,13 @@ namespace XenAdmin.Controls.Wlb
this.btnRunReport.UseVisualStyleBackColor = true;
this.btnRunReport.Click += new System.EventHandler(this.btnRunReport_Click);
//
// btnLaterReport
//
resources.ApplyResources(this.btnLaterReport, "btnLaterReport");
this.btnLaterReport.Name = "btnLaterReport";
this.btnLaterReport.UseVisualStyleBackColor = true;
this.btnLaterReport.Click += new System.EventHandler(this.btnLaterReport_Click);
//
// labelEndDate
//
resources.ApplyResources(this.labelEndDate, "labelEndDate");
@ -187,6 +195,7 @@ namespace XenAdmin.Controls.Wlb
this.flowLayoutPanelButtons.Controls.Add(this.btnClose);
this.flowLayoutPanelButtons.Controls.Add(this.btnSubscribe);
this.flowLayoutPanelButtons.Controls.Add(this.btnRunReport);
this.flowLayoutPanelButtons.Controls.Add(this.btnLaterReport);
this.flowLayoutPanelButtons.Name = "flowLayoutPanelButtons";
//
// flowLayoutPanel2
@ -280,6 +289,7 @@ namespace XenAdmin.Controls.Wlb
public System.Windows.Forms.Label labelHostCombo;
public System.Windows.Forms.ComboBox hostComboBox;
public System.Windows.Forms.Button btnRunReport;
public System.Windows.Forms.Button btnLaterReport;
private System.Windows.Forms.Label labelEndDate;
private System.Windows.Forms.DateTimePicker EndDatePicker;
private System.Windows.Forms.Label labelStartDate;
@ -299,7 +309,7 @@ namespace XenAdmin.Controls.Wlb
private System.Windows.Forms.ToolTip toolTip1;
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
private System.Windows.Forms.Panel panelUsers;
public System.Windows.Forms.ComboBox userComboBox;
public XenAdmin.Controls.LongStringComboBox userComboBox;
public System.Windows.Forms.Label labelUsers;
private System.Windows.Forms.Panel panelObjects;
private System.Windows.Forms.Label labelObjects;

135
XenAdmin/Controls/Wlb/WlbReportView.cs
View File

@ -77,6 +77,7 @@ namespace XenAdmin.Controls.Wlb
private int _currentOffsetMinutes;
private int _startLine;
private int _endLine;
private int _currentReportSection;
// To mitigate the WLB server memory pressure to generate pool audit trail report
// and decrease the latency to display the report results on XenCenter,
@ -524,6 +525,7 @@ namespace XenAdmin.Controls.Wlb
_isAuditReport = false;
}
this.btnLaterReport.Visible = false;
this.ViewerReportInfo = reportInfo;
if (ResetReportViewer == true)
@ -533,11 +535,11 @@ namespace XenAdmin.Controls.Wlb
// Enable the run and disable subscribe buttons
this.btnRunReport.Enabled = true;
this.btnLaterReport.Enabled = false;
this.btnSubscribe.Enabled = false;
// Set the run button text and make label invisible
// Set the run button text
this.btnRunReport.Text = Messages.RUN_REPORT;
this.lblExported.Visible = false;
// If host is a parameter for the selected report, show it
if (reportInfo.DisplayHosts == true)
@ -601,6 +603,7 @@ namespace XenAdmin.Controls.Wlb
// Fill user dropdown with user list retrieved from WLB server
string audit_users_string = reportInfo.ReportQueryParameterNames["AuditUser"].ToString();
string[] audit_users = audit_users_string.Length > 0 ? audit_users_string.Split(',') : (new string[0]);
Array.Sort(audit_users, StringComparer.InvariantCulture);
this.SetUserComboBox(audit_users);
_userComboSet = true;
}
@ -622,6 +625,7 @@ namespace XenAdmin.Controls.Wlb
// Fill object dropdown with object list retrieved from WLB server
string audit_objects_string = reportInfo.ReportQueryParameterNames["AuditObject"].ToString();
string[] audit_objects = audit_objects_string.Length > 0 ? audit_objects_string.Split(',') : (new string[0]);
Array.Sort(audit_objects, StringComparer.InvariantCulture);
this.SetObjectComboBox(audit_objects);
_objectComboSet = true;
}
@ -683,17 +687,16 @@ namespace XenAdmin.Controls.Wlb
{
if (_users != null)
{
// Add ALL in dropdown to represent all users
userComboBox.Items.Add(Messages.WLB_AUDIT_LOG_USER_OBJECT_ALL);
foreach (string user in _users)
{
userComboBox.Items.Add(user);
}
// Add ALL in dropdown to represent all users
userComboBox.Items.Add("ALL");
}
userComboBox.Sorted = true;
userComboBox.SelectedIndex = 0;
}
/// <summary>
@ -703,14 +706,15 @@ namespace XenAdmin.Controls.Wlb
{
if (_objects != null)
{
// Add ALL in dropdown to represent all objects
objectComboBox.Items.Add(Messages.WLB_AUDIT_LOG_USER_OBJECT_ALL);
foreach (string auditObject in _objects)
{
objectComboBox.Items.Add(auditObject);
}
// Add ALL in dropdown to represent all objects
objectComboBox.Items.Add("ALL");
}
objectComboBox.Sorted = true;
objectComboBox.SelectedIndex = 0;
}
@ -864,12 +868,30 @@ namespace XenAdmin.Controls.Wlb
break;
case "AuditUser":
paramValue = currentParams["AuditUser"].Values.Count == 0 ? userComboBox.SelectedItem.ToString(): currentParams["AuditUser"].Values[0];
if (userComboBox.SelectedIndex == 0)
{
// The first item is ALL in localized characters,
// set it as "ALL" so WLB server could recognize.
paramValue = "ALL";
}
else
{
paramValue = currentParams["AuditUser"].Values.Count == 0 ? userComboBox.SelectedItem.ToString(): currentParams["AuditUser"].Values[0];
}
addParam = true;
break;
case "AuditObject":
paramValue = currentParams["AuditObject"].Values.Count == 0 ? objectComboBox.SelectedItem.ToString(): currentParams["AuditObject"].Values[0];
if(objectComboBox.SelectedIndex == 0)
{
// The first item is ALL in localized characters,
// set it as "ALL" so WLB server could recognize.
paramValue = "ALL";
}
else
{
paramValue = currentParams["AuditObject"].Values.Count == 0 ? objectComboBox.SelectedItem.ToString(): currentParams["AuditObject"].Values[0];
}
addParam = true;
break;
@ -1017,25 +1039,45 @@ namespace XenAdmin.Controls.Wlb
if (cnt >= _lineLimit)
{
// If audit trail report from WLB server exceeds the line limit,
// update _startLine and _endLine for more report,
// change the run button text to "More",
// display the label to indicate there's more report.
_startLine += _lineLimit;
_endLine += _lineLimit;
this.btnRunReport.Text = Messages.RUN_MORE_REPORT;
this.lblExported.Text = Messages.WLB_MORE_REPORT_BANNER;
this.lblExported.Visible = true;
this.btnRunReport.Text = Messages.FETCH_EARLIER_DATA;
this.btnRunReport.Enabled = true;
}
else
{
// If audit trail report from WLB server doesn't exceed the line limit,
// reset _startLine, _endLine,
// and this is the first section of report,
// change the run button text back to "Run Report",
// Hide the label.
_startLine = 1;
_endLine = _lineLimit;
this.btnRunReport.Text = Messages.RUN_REPORT;
this.lblExported.Visible = false;
// or disable the run report button and just keep the later report button.
if(btnLaterReport.Visible == true)
{
this.btnRunReport.Enabled = false;
}
else
{
this.btnRunReport.Text = Messages.RUN_REPORT;
}
}
if(_currentReportSection > 1)
{
this.btnLaterReport.Visible = true;
this.btnLaterReport.Enabled = true;
}
else if (_currentReportSection == 1 &&
this.btnRunReport.Text == Messages.FETCH_EARLIER_DATA)
{
this.btnLaterReport.Visible = true;
this.btnLaterReport.Enabled = false;
}
else
{
this.btnLaterReport.Visible = false;
this.btnLaterReport.Enabled = false;
}
}
@ -1169,6 +1211,7 @@ namespace XenAdmin.Controls.Wlb
private void ReportView_Load(object sender, EventArgs e)
{
this.btnRunReport.Enabled = false;
this.btnLaterReport.Enabled = false;
this.btnSubscribe.Enabled = false;
this.hostComboBox.DropDownStyle = ComboBoxStyle.DropDownList;
@ -1224,12 +1267,52 @@ namespace XenAdmin.Controls.Wlb
/// <summary>
/// Event handler for the "Run Report" button
/// Event handler for the "Run Report"/"Next Section" button
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
internal void btnRunReport_Click(object sender, EventArgs e)
{
if(_isAuditReport && _isCreedenceOrLater)
{
// If the button displays "Run Report",
// that means the 1st report section is requested.
// Or else the button text is "Next Section",
// next report section is requested.
if(this.btnRunReport.Text == Messages.RUN_REPORT)
{
_currentReportSection = 1;
_startLine = 1;
_endLine = _lineLimit;
}
else
{
_currentReportSection += 1;
_startLine += _lineLimit;
_endLine += _lineLimit;
}
}
this.reportViewer1.Reset();
this.ExecuteReport();
}
/// <summary>
/// Event handler for the "Previous Section" button
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
internal void btnLaterReport_Click(object sender, EventArgs e)
{
if(_isAuditReport && _isCreedenceOrLater)
{
// The previous report section is requested.
_currentReportSection -= 1;
_startLine -= _lineLimit;
_endLine -= _lineLimit;
}
this.reportViewer1.Reset();
this.ExecuteReport();
}
@ -1451,8 +1534,10 @@ namespace XenAdmin.Controls.Wlb
_endTime = String.Empty;
_startLine = 1;
_endLine = _lineLimit;
_currentReportSection = 0;
btnRunReport.Enabled = true;
btnRunReport.Text = Messages.RUN_REPORT;
lblExported.Visible = false;
btnLaterReport.Visible = false;
}
}

60
XenAdmin/Controls/Wlb/WlbReportView.resx
View File

@ -130,7 +130,7 @@
<value>NoControl</value>
</data>
<data name="labelHostCombo.Location" type="System.Drawing.Point, System.Drawing">
<value>14, 4</value>
<value>6, 4</value>
</data>
<data name="labelHostCombo.Size" type="System.Drawing.Size, System.Drawing">
<value>33, 13</value>
@ -154,7 +154,7 @@
<value>1</value>
</data>
<data name="hostComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>52, 0</value>
<value>44, 0</value>
</data>
<data name="hostComboBox.MaxDropDownItems" type="System.Int32, mscorlib">
<value>20</value>
@ -207,6 +207,36 @@
<data name="&gt;&gt;btnRunReport.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="btnLaterReport.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
<data name="btnLaterReport.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnLaterReport.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
</data>
<data name="btnLaterReport.Size" type="System.Drawing.Size, System.Drawing">
<value>102, 23</value>
</data>
<data name="btnLaterReport.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="btnLaterReport.Text" xml:space="preserve">
<value>&amp;Previous Section</value>
</data>
<data name="&gt;&gt;btnLaterReport.Name" xml:space="preserve">
<value>btnLaterReport</value>
</data>
<data name="&gt;&gt;btnLaterReport.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnLaterReport.Parent" xml:space="preserve">
<value>flowLayoutPanelButtons</value>
</data>
<data name="&gt;&gt;btnLaterReport.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="labelEndDate.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -217,7 +247,7 @@
<value>NoControl</value>
</data>
<data name="labelEndDate.Location" type="System.Drawing.Point, System.Drawing">
<value>200, 7</value>
<value>190, 7</value>
</data>
<data name="labelEndDate.Size" type="System.Drawing.Size, System.Drawing">
<value>55, 13</value>
@ -244,7 +274,7 @@
<value>Tahoma, 8pt</value>
</data>
<data name="EndDatePicker.Location" type="System.Drawing.Point, System.Drawing">
<value>261, 4</value>
<value>251, 4</value>
</data>
<data name="EndDatePicker.Size" type="System.Drawing.Size, System.Drawing">
<value>102, 20</value>
@ -337,7 +367,7 @@
<value>844, 526</value>
</data>
<data name="reportViewer1.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
<value>15</value>
</data>
<data name="&gt;&gt;reportViewer1.Name" xml:space="preserve">
<value>reportViewer1</value>
@ -514,7 +544,7 @@
<value>GrowAndShrink</value>
</data>
<data name="flowLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>369, 1</value>
<value>359, 1</value>
</data>
<data name="flowLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>442, 30</value>
@ -580,7 +610,7 @@
<value>324, 29</value>
</data>
<data name="flowLayoutPanelButtons.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
<value>16</value>
</data>
<data name="&gt;&gt;flowLayoutPanelButtons.Name" xml:space="preserve">
<value>flowLayoutPanelButtons</value>
@ -670,13 +700,13 @@
<value>0</value>
</data>
<data name="objectComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>58, 0</value>
<value>50, 0</value>
</data>
<data name="objectComboBox.MaxDropDownItems" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="objectComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>95, 21</value>
<value>115, 21</value>
</data>
<data name="objectComboBox.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@ -715,13 +745,13 @@
<value>1</value>
</data>
<data name="flowLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
<value>369, 0</value>
<value>359, 0</value>
</data>
<data name="flowLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
<value>326, 30</value>
<value>370, 30</value>
</data>
<data name="flowLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
<value>16</value>
<value>14</value>
</data>
<data name="&gt;&gt;flowLayoutPanel2.Name" xml:space="preserve">
<value>flowLayoutPanel2</value>
@ -736,13 +766,13 @@
<value>0</value>
</data>
<data name="userComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>52, 0</value>
<value>42, 0</value>
</data>
<data name="userComboBox.MaxDropDownItems" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="userComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>123, 21</value>
<value>120, 21</value>
</data>
<data name="userComboBox.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -769,7 +799,7 @@
<value>NoControl</value>
</data>
<data name="labelUsers.Location" type="System.Drawing.Point, System.Drawing">
<value>14, 4</value>
<value>6, 4</value>
</data>
<data name="labelUsers.Size" type="System.Drawing.Size, System.Drawing">
<value>33, 13</value>

56
XenAdmin/Controls/Wlb/WlbReportView.zh-CN.resx
View File

@ -207,6 +207,36 @@
<data name="&gt;&gt;btnRunReport.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="btnLaterReport.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
<data name="btnLaterReport.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnLaterReport.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
</data>
<data name="btnLaterReport.Size" type="System.Drawing.Size, System.Drawing">
<value>102, 23</value>
</data>
<data name="btnLaterReport.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="btnLaterReport.Text" xml:space="preserve">
<value>前一段报告(&amp;P)</value>
</data>
<data name="&gt;&gt;btnLaterReport.Name" xml:space="preserve">
<value>btnLaterReport</value>
</data>
<data name="&gt;&gt;btnLaterReport.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnLaterReport.Parent" xml:space="preserve">
<value>flowLayoutPanelButtons</value>
</data>
<data name="&gt;&gt;btnLaterReport.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="labelEndDate.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -217,7 +247,7 @@
<value>NoControl</value>
</data>
<data name="labelEndDate.Location" type="System.Drawing.Point, System.Drawing">
<value>185, 7</value>
<value>184, 7</value>
</data>
<data name="labelEndDate.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 18</value>
@ -244,7 +274,7 @@
<value>Tahoma, 8pt</value>
</data>
<data name="EndDatePicker.Location" type="System.Drawing.Point, System.Drawing">
<value>261, 4</value>
<value>259, 4</value>
</data>
<data name="EndDatePicker.Size" type="System.Drawing.Size, System.Drawing">
<value>102, 20</value>
@ -301,7 +331,7 @@
<value>Tahoma, 8pt</value>
</data>
<data name="StartDatePicker.Location" type="System.Drawing.Point, System.Drawing">
<value>78, 3</value>
<value>77, 3</value>
</data>
<data name="StartDatePicker.Size" type="System.Drawing.Size, System.Drawing">
<value>102, 20</value>
@ -337,7 +367,7 @@
<value>844, 526</value>
</data>
<data name="reportViewer1.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
<value>15</value>
</data>
<data name="&gt;&gt;reportViewer1.Name" xml:space="preserve">
<value>reportViewer1</value>
@ -460,7 +490,7 @@
<value>GrowAndShrink</value>
</data>
<data name="panelHosts.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
<value>0, 3</value>
</data>
<data name="panelHosts.Size" type="System.Drawing.Size, System.Drawing">
<value>263, 24</value>
@ -514,7 +544,7 @@
<value>GrowAndShrink</value>
</data>
<data name="flowLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>369, 1</value>
<value>362, 1</value>
</data>
<data name="flowLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>442, 30</value>
@ -580,7 +610,7 @@
<value>324, 29</value>
</data>
<data name="flowLayoutPanelButtons.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
<value>16</value>
</data>
<data name="&gt;&gt;flowLayoutPanelButtons.Name" xml:space="preserve">
<value>flowLayoutPanelButtons</value>
@ -610,7 +640,7 @@
<value>GrowAndShrink</value>
</data>
<data name="panelUsers.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
<value>0, 3</value>
</data>
<data name="panelUsers.Size" type="System.Drawing.Size, System.Drawing">
<value>158, 24</value>
@ -670,13 +700,13 @@
<value>0</value>
</data>
<data name="objectComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>52, 0</value>
<value>48, 0</value>
</data>
<data name="objectComboBox.MaxDropDownItems" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="objectComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>95, 21</value>
<value>123, 21</value>
</data>
<data name="objectComboBox.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@ -715,13 +745,13 @@
<value>1</value>
</data>
<data name="flowLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
<value>369, 0</value>
<value>362, 0</value>
</data>
<data name="flowLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
<value>326, 30</value>
<value>370, 30</value>
</data>
<data name="flowLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
<value>16</value>
<value>14</value>
</data>
<data name="&gt;&gt;flowLayoutPanel2.Name" xml:space="preserve">
<value>flowLayoutPanel2</value>

16
XenAdmin/SettingsPanels/Wlb/WlbAdvancedSettingsPage.Designer.cs generated
View File

@ -70,6 +70,7 @@ namespace XenAdmin.SettingsPanels
this.sectionHeaderLabelAuditTrail = new XenAdmin.Controls.SectionHeaderLabel();
this.comboBoxPoolAuditTrailLevel = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.auditTrailPanel = new System.Windows.Forms.FlowLayoutPanel();
this.poolAuditTrailNote = new System.Windows.Forms.Label();
this.tableLayoutPanel1.SuspendLayout();
@ -88,9 +89,9 @@ namespace XenAdmin.SettingsPanels
// tableLayoutPanel1
//
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
this.tableLayoutPanel1.Controls.Add(this.labelAuditTrail, 0, 21);
this.tableLayoutPanel1.Controls.Add(this.sectionHeaderLabelAuditTrail, 0, 20);
this.tableLayoutPanel1.Controls.Add(this.label2, 0, 19);
this.tableLayoutPanel1.Controls.Add(this.labelAuditTrail, 0, 23);
this.tableLayoutPanel1.Controls.Add(this.sectionHeaderLabelAuditTrail, 0, 22);
this.tableLayoutPanel1.Controls.Add(this.label2, 0, 21);
this.tableLayoutPanel1.Controls.Add(this.sectionHeaderLabelRepSub, 0, 16);
this.tableLayoutPanel1.Controls.Add(this.sectionHeaderLabelHistData, 0, 13);
this.tableLayoutPanel1.Controls.Add(this.sectionHeaderLabelOptAgr, 0, 10);
@ -110,7 +111,8 @@ namespace XenAdmin.SettingsPanels
this.tableLayoutPanel1.Controls.Add(this.panelOptAgr, 0, 12);
this.tableLayoutPanel1.Controls.Add(this.panelHistData, 0, 15);
this.tableLayoutPanel1.Controls.Add(this.panelRepSub, 0, 18);
this.tableLayoutPanel1.Controls.Add(this.auditTrailPanel, 0, 22);
this.tableLayoutPanel1.Controls.Add(this.auditTrailPanel, 0, 24);
this.tableLayoutPanel1.Controls.Add(this.label3, 0, 20);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
//
// labelAuditTrail
@ -446,6 +448,11 @@ namespace XenAdmin.SettingsPanels
resources.ApplyResources(this.poolAuditTrailNote, "poolAuditTrailNote");
this.poolAuditTrailNote.ForeColor = System.Drawing.Color.Gray;
this.poolAuditTrailNote.Name = "poolAuditTrailNote";
// label3
//
this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
resources.ApplyResources(this.label3, "label3");
this.label3.Name = "label3";
//
// WlbAdvancedSettingsPage
//
@ -524,5 +531,6 @@ namespace XenAdmin.SettingsPanels
private System.Windows.Forms.FlowLayoutPanel auditTrailPanel;
private System.Windows.Forms.ComboBox comboBoxPoolAuditTrailLevel;
private System.Windows.Forms.Label poolAuditTrailNote;
private System.Windows.Forms.Label label3;
}
}

2
XenAdmin/SettingsPanels/Wlb/WlbAdvancedSettingsPage.cs
View File

@ -234,7 +234,7 @@ namespace XenAdmin.SettingsPanels
Dictionary<WlbAuditTrailLogGranularity, string> auditLogGranularity = new Dictionary<WlbAuditTrailLogGranularity, string>();
auditLogGranularity.Add(WlbAuditTrailLogGranularity.Minimum, Messages.WLB_AUDIT_LOG_MINIMUM);
auditLogGranularity.Add(WlbAuditTrailLogGranularity.Normal, Messages.WLB_AUDIT_LOG_NORMAL);
auditLogGranularity.Add(WlbAuditTrailLogGranularity.Medium, Messages.WLB_AUDIT_LOG_MEDIUM);
auditLogGranularity.Add(WlbAuditTrailLogGranularity.Maximum, Messages.WLB_AUDIT_LOG_MAXIMUM);
return auditLogGranularity;

72
XenAdmin/SettingsPanels/Wlb/WlbAdvancedSettingsPage.resx
View File

@ -139,19 +139,19 @@
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="labelAuditTrail.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 522</value>
<value>3, 542</value>
</data>
<data name="labelAuditTrail.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>15, 0, 4, 4</value>
</data>
<data name="labelAuditTrail.Size" type="System.Drawing.Size, System.Drawing">
<value>632, 17</value>
<value>632, 30</value>
</data>
<data name="labelAuditTrail.TabIndex" type="System.Int32, mscorlib">
<value>36</value>
</data>
<data name="labelAuditTrail.Text" xml:space="preserve">
<value>Select pool audit trail report granularity. Warning: Enabling Maximum would occupy more disk space and memory on WLB server.</value>
<value>Select the amount of data collected for the pool audit trail report. Note that the higher levels use more disk space and memory on the WLB server.</value>
</data>
<data name="&gt;&gt;labelAuditTrail.Name" xml:space="preserve">
<value>labelAuditTrail</value>
@ -211,7 +211,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="sectionHeaderLabelAuditTrail.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 505</value>
<value>3, 525</value>
</data>
<data name="sectionHeaderLabelAuditTrail.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>0, 14</value>
@ -222,6 +222,9 @@
<data name="sectionHeaderLabelAuditTrail.TabIndex" type="System.Int32, mscorlib">
<value>35</value>
</data>
<data name="sectionHeaderLabelAuditTrail.TabStop" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="sectionHeaderLabelAuditTrail.UseMnemonic" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -247,7 +250,7 @@
<value>NoControl</value>
</data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 479</value>
<value>0, 499</value>
</data>
<data name="label2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 10</value>
@ -259,7 +262,7 @@
<value>34</value>
</data>
<data name="label2.Text" xml:space="preserve">
<value>Specify advanced settings for pool audit trail report.</value>
<value>Specify advanced settings for the pool audit trail report.</value>
</data>
<data name="&gt;&gt;label2.Name" xml:space="preserve">
<value>label2</value>
@ -325,6 +328,9 @@
<data name="sectionHeaderLabelRepSub.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="sectionHeaderLabelRepSub.TabStop" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="sectionHeaderLabelRepSub.UseMnemonic" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -391,6 +397,9 @@
<data name="sectionHeaderLabelHistData.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="sectionHeaderLabelHistData.TabStop" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="sectionHeaderLabelHistData.UseMnemonic" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -466,6 +475,9 @@
<data name="sectionHeaderLabelOptAgr.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="sectionHeaderLabelOptAgr.TabStop" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="sectionHeaderLabelOptAgr.UseMnemonic" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -616,6 +628,9 @@
<data name="sectionHeaderLabelRecSev.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="sectionHeaderLabelRecSev.TabStop" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="sectionHeaderLabelRecSev.UseMnemonic" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -712,6 +727,9 @@
<data name="sectionHeaderLabelVmMigInt.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="sectionHeaderLabelVmMigInt.TabStop" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="sectionHeaderLabelVmMigInt.UseMnemonic" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -991,6 +1009,9 @@
<data name="sectionHeaderLabelRecCnt.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="sectionHeaderLabelRecCnt.TabStop" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="sectionHeaderLabelRecCnt.UseMnemonic" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -1523,7 +1544,7 @@
<value>0, 5, 0, 0</value>
</data>
<data name="poolAuditTrailNote.Size" type="System.Drawing.Size, System.Drawing">
<value>93, 18</value>
<value>101, 18</value>
</data>
<data name="poolAuditTrailNote.TabIndex" type="System.Int32, mscorlib">
<value>21</value>
@ -1544,7 +1565,7 @@
<value>1</value>
</data>
<data name="auditTrailPanel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 542</value>
<value>3, 575</value>
</data>
<data name="auditTrailPanel.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>45, 0, 0, 0</value>
@ -1567,6 +1588,33 @@
<data name="&gt;&gt;auditTrailPanel.ZOrder" xml:space="preserve">
<value>22</value>
</data>
<data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 489</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>632, 2</value>
</data>
<data name="label3.TabIndex" type="System.Int32, mscorlib">
<value>38</value>
</data>
<data name="label3.Text" xml:space="preserve">
<value>label3</value>
</data>
<data name="&gt;&gt;label3.Name" xml:space="preserve">
<value>label3</value>
</data>
<data name="&gt;&gt;label3.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;label3.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>23</value>
</data>
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@ -1574,10 +1622,10 @@
<value>0, 0</value>
</data>
<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
<value>19</value>
<value>21</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>638, 560</value>
<value>638, 607</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
@ -1595,7 +1643,7 @@
<value>0</value>
</data>
<data name="tableLayoutPanel1.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="labelAuditTrail" Row="21" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabelAuditTrail" Row="20" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label2" Row="19" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabelRepSub" Row="16" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabelHistData" Row="13" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabelOptAgr" Row="10" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelOptAgr" Row="11" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelHistData" Row="14" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabelRecSev" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelRepSub" Row="17" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabelVmMigInt" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelVmMigInt" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelRecSev" Row="8" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panelVmMigInt" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabelRecCnt" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelRecCnt" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panelRecCnt" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panelRecSev" Row="9" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panelOptAgr" Row="12" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panelHistData" Row="15" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panelRepSub" Row="18" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="auditTrailPanel" Row="22" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="labelAuditTrail" Row="23" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabelAuditTrail" Row="22" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label2" Row="21" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabelRepSub" Row="16" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabelHistData" Row="13" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabelOptAgr" Row="10" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelOptAgr" Row="11" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelHistData" Row="14" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabelRecSev" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelRepSub" Row="17" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabelVmMigInt" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelVmMigInt" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelRecSev" Row="8" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panelVmMigInt" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="sectionHeaderLabelRecCnt" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelRecCnt" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panelRecCnt" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panelRecSev" Row="9" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panelOptAgr" Row="12" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panelHistData" Row="15" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="panelRepSub" Row="18" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="auditTrailPanel" Row="24" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label3" Row="20" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,10,Absolute,10,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -1604,7 +1652,7 @@
<value>96, 96</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>638, 571</value>
<value>638, 607</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>WlbAdvancedSettingsPage</value>

29
XenAdmin/SettingsPanels/Wlb/WlbAdvancedSettingsPage.zh-CN.resx
View File

@ -151,7 +151,7 @@
<value>36</value>
</data>
<data name="labelAuditTrail.Text" xml:space="preserve">
<value>选择池审核追踪日志详细程度的级别。警告：开启"最大"将会消耗更多 WLB 服务器磁盘空间和内存。</value>
<value>选择池审核追踪日志详细程度的级别。请注意更高级别将消耗更多 WLB 服务器磁盘空间和内存。</value>
</data>
<data name="&gt;&gt;labelAuditTrail.Name" xml:space="preserve">
<value>labelAuditTrail</value>
@ -169,13 +169,13 @@
<value>Top</value>
</data>
<data name="comboBoxPoolAuditTrailLevel.Items" xml:space="preserve">
<value>Minimum</value>
<value>最小</value>
</data>
<data name="comboBoxPoolAuditTrailLevel.Items1" xml:space="preserve">
<value>Normal</value>
<value>中等</value>
</data>
<data name="comboBoxPoolAuditTrailLevel.Items2" xml:space="preserve">
<value>Maximum</value>
<value>最大</value>
</data>
<data name="comboBoxPoolAuditTrailLevel.Location" type="System.Drawing.Point, System.Drawing">
<value>48, 3</value>
@ -222,6 +222,9 @@
<data name="sectionHeaderLabelAuditTrail.TabIndex" type="System.Int32, mscorlib">
<value>35</value>
</data>
<data name="sectionHeaderLabelAuditTrail.TabStop" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="sectionHeaderLabelAuditTrail.UseMnemonic" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -325,6 +328,9 @@
<data name="sectionHeaderLabelRepSub.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="sectionHeaderLabelRepSub.TabStop" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="sectionHeaderLabelRepSub.UseMnemonic" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -391,6 +397,9 @@
<data name="sectionHeaderLabelHistData.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="sectionHeaderLabelHistData.TabStop" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="sectionHeaderLabelHistData.UseMnemonic" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -466,6 +475,9 @@
<data name="sectionHeaderLabelOptAgr.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="sectionHeaderLabelOptAgr.TabStop" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="sectionHeaderLabelOptAgr.UseMnemonic" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -616,6 +628,9 @@
<data name="sectionHeaderLabelRecSev.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="sectionHeaderLabelRecSev.TabStop" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="sectionHeaderLabelRecSev.UseMnemonic" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -712,6 +727,9 @@
<data name="sectionHeaderLabelVmMigInt.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="sectionHeaderLabelVmMigInt.TabStop" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="sectionHeaderLabelVmMigInt.UseMnemonic" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -991,6 +1009,9 @@
<data name="sectionHeaderLabelRecCnt.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="sectionHeaderLabelRecCnt.TabStop" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="sectionHeaderLabelRecCnt.UseMnemonic" type="System.Boolean, mscorlib">
<value>True</value>
</data>

2
XenAdmin/Wlb/WlbPoolConfiguration.cs
View File

@ -64,7 +64,7 @@ namespace XenAdmin.Wlb
public enum WlbAuditTrailLogGranularity
{
Minimum,
Normal,
Medium,
Maximum
}

1
XenAdmin/Wlb/WlbReports/WorkloadReports.cs
View File

@ -160,6 +160,7 @@ namespace XenAdmin
this.wlbReportView1.btnSubscribe.Visible = false;
}
this.wlbReportView1.btnLaterReport.Visible = false;
this.wlbReportView1.IsCreedenceOrLater = _isCreedenceOrLater;
PopulateTreeView();
}

87
XenModel/Messages.Designer.cs generated
View File

@ -13172,7 +13172,16 @@ namespace XenAdmin {
return ResourceManager.GetString("FEATURE_NOT_AVAILABLE_NEED_MR_PLURAL", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to fetch earlier data.
/// </summary>
public static string FETCH_EARLIER_DATA {
get {
return ResourceManager.GetString("FETCH_EARLIER_DATA", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to No LUNs were found. Please verify your hardware configuration..
/// </summary>
@ -26741,7 +26750,16 @@ namespace XenAdmin {
return ResourceManager.GetString("RUN_PRECHECKS_WITH_ACCESS_KEY", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to run report.
/// </summary>
public static string RUN_REPORT {
get {
return ResourceManager.GetString("RUN_REPORT", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Archiving.
/// </summary>
@ -33027,16 +33045,7 @@ namespace XenAdmin {
return ResourceManager.GetString("WLB_ADVANCED_CONFIGURATION_SUBTEXT", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Minimum.
/// </summary>
public static string WLB_AUDIT_LOG_MINIMUM {
get {
return ResourceManager.GetString("WLB_AUDIT_LOG_MINIMUM", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Maximum.
/// </summary>
@ -33045,16 +33054,34 @@ namespace XenAdmin {
return ResourceManager.GetString("WLB_AUDIT_LOG_MAXIMUM", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Normal.
/// Looks up a localized string similar to Medium.
/// </summary>
public static string WLB_AUDIT_LOG_NORMAL {
public static string WLB_AUDIT_LOG_MEDIUM {
get {
return ResourceManager.GetString("WLB_AUDIT_LOG_NORMAL", resourceCulture);
return ResourceManager.GetString("WLB_AUDIT_LOG_MEDIUM", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Minimum.
/// </summary>
public static string WLB_AUDIT_LOG_MINIMUM {
get {
return ResourceManager.GetString("WLB_AUDIT_LOG_MINIMUM", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to ALL.
/// </summary>
public static string WLB_AUDIT_LOG_USER_OBJECT_ALL {
get {
return ResourceManager.GetString("WLB_AUDIT_LOG_USER_OBJECT_ALL", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Automated optimizations.
/// </summary>
@ -35242,31 +35269,5 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to run report.
/// </summary>
public static string RUN_REPORT {
get {
return ResourceManager.GetString("RUN_REPORT", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to run more report.
/// </summary>
public static string RUN_MORE_REPORT {
get {
return ResourceManager.GetString("RUN_MORE_REPORT", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Click "More" for more report contents.
/// </summary>
public static string WLB_MORE_REPORT_BANNER {
get {
return ResourceManager.GetString("WLB_MORE_REPORT_BANNER", resourceCulture);
}
}
}
}

16
XenModel/Messages.resx
View File

@ -4628,6 +4628,9 @@ Would you like to eject these ISOs before continuing?</value>
<data name="FEATURE_NOT_AVAILABLE_NEED_MR_PLURAL" xml:space="preserve">
<value>{0} require XenServer 5.6 or later</value>
</data>
<data name="FETCH_EARLIER_DATA" xml:space="preserve">
<value>&amp;Next Section</value>
</data>
<data name="FIBRECHANNEL_NO_RESULTS" xml:space="preserve">
<value>No LUNs were found. Please verify your hardware configuration.</value>
</data>
@ -9298,9 +9301,6 @@ Upgrading VMs using StorageLink Gateway to XenServer 6.0 is only supported if th
<data name="RUNNING_SNAPSHOTS" xml:space="preserve">
<value>Taking snapshots</value>
</data>
<data name="RUN_MORE_REPORT" xml:space="preserve">
<value>&amp;More</value>
</data>
<data name="RUN_POLICY" xml:space="preserve">
<value>Running policy '{0}'</value>
</data>
@ -11468,11 +11468,14 @@ To learn more about the XenServer Dynamic Workload Balancing feature or to start
<data name="WLB_AUDIT_LOG_MAXIMUM" xml:space="preserve">
<value>Maximum</value>
</data>
<data name="WLB_AUDIT_LOG_MEDIUM" xml:space="preserve">
<value>Medium</value>
</data>
<data name="WLB_AUDIT_LOG_MINIMUM" xml:space="preserve">
<value>Minimum</value>
</data>
<data name="WLB_AUDIT_LOG_NORMAL" xml:space="preserve">
<value>Normal</value>
<data name="WLB_AUDIT_LOG_USER_OBJECT_ALL" xml:space="preserve">
<value>ALL</value>
</data>
<data name="WLB_AUTOMATION" xml:space="preserve">
<value>Automation</value>
@ -11639,9 +11642,6 @@ A {1} user cannot alter the Workload Balancing settings.</value>
<data name="WLB_METRIC_WEIGHTING_SUBTEXT" xml:space="preserve">
<value>Adjust the weighting of WLB metrics</value>
</data>
<data name="WLB_MORE_REPORT_BANNER" xml:space="preserve">
<value>Please click "More" for more report contents</value>
</data>
<data name="WLB_NEXT_OPT_MODE_SCHEDULE_FORMAT" xml:space="preserve">
<value>{0} at {1}</value>
</data>

13
XenModel/Messages.zh-CN.resx
View File

@ -4513,6 +4513,9 @@ XenServer 可以重新启动服务器并将服务器的 CPU 级别降至池中
<data name="FEATURE_NOT_AVAILABLE_NEED_MR_PLURAL" xml:space="preserve">
<value>{0} 需要使用 XenServer 5.6 或更高版本</value>
</data>
<data name="FETCH_EARLIER_DATA" xml:space="preserve">
<value>后一段报告(&amp;N)</value>
</data>
<data name="FIBRECHANNEL_NO_RESULTS" xml:space="preserve">
<value>未找到 LUN。请验证硬件配置。</value>
</data>
@ -11092,11 +11095,14 @@ XenServer 可以重新启动服务器并将其 CPU 降至主服务器的级别
<data name="WLB_AUDIT_LOG_MAXIMUM" xml:space="preserve">
<value>最大</value>
</data>
<data name="WLB_AUDIT_LOG_MEDIUM" xml:space="preserve">
<value>中等</value>
</data>
<data name="WLB_AUDIT_LOG_MINIMUM" xml:space="preserve">
<value>最小</value>
</data>
<data name="WLB_AUDIT_LOG_NORMAL" xml:space="preserve">
<value>常规</value>
<data name="WLB_AUDIT_LOG_USER_OBJECT_ALL" xml:space="preserve">
<value>全部</value>
</data>
<data name="WLB_AUTOMATION" xml:space="preserve">
<value>自动化</value>
@ -11263,9 +11269,6 @@ XenServer 可以重新启动服务器并将其 CPU 降至主服务器的级别
<data name="WLB_METRIC_WEIGHTING_SUBTEXT" xml:space="preserve">
<value>调整 WLB 指标的加权</value>
</data>
<data name="WLB_MORE_REPORT_BANNER" xml:space="preserve">
<value>请点击“更多报告”获取更多报告内容</value>
</data>
<data name="WLB_NEXT_OPT_MODE_SCHEDULE_FORMAT" xml:space="preserve">
<value>{0} {1}</value>
</data>