Commit Graph

1636 Commits

Author SHA1 Message Date
Mihaela Stoica
8e5b40b84c Update XenAPI based on XS/master
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-11-17 10:52:02 +00:00
Gabor Apati-Nagy
0a8f9b8aa1
Merge pull request #1855 from serencorbett1/master
CA-273674 Added warning when shutting down pool master
2017-11-17 10:43:53 +00:00
Mihaela Stoica
6ab0fb7ba5 CA-266926: Change the description of the LICENSE_EXPIRES_SOON alert message
... to avoid descriptions like "The license on host 'A' will expire at Never"

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-11-13 17:09:36 +00:00
serenc
e041b2d2b9 CA-273674 Added warning when shutting down pool master
Signed-off-by: serenc <seren.corbett@citrix.com>
2017-11-13 15:07:32 +00:00
Vetrivel Chinnasamy
6a7e911eea L10N: Translation Checkins 2017-11-13 15:44:08 +05:30
Mihaela Stoica
53a4593394
Merge pull request #1847 from serencorbett1/master
CA-271883 - Corrected order of Licenses
2017-11-10 12:43:37 +00:00
serenc
6398c94383 CA-271883 - Corrected order of Licenses
Signed-off-by: serenc <seren.corbett@citrix.com>
2017-11-10 11:38:11 +00:00
Mihaela Stoica
7ac856943e CA-272143: Import wizard stuck in "Waiting for Import template wizard to complete" when importing a default template
When trying to import a default template from xva, xapi notices that it is a default template, finds an existing one on the host and returns that one.
With these changes, XenCenter handles this case and displays an error, instead of waiting for the returned VM to be linked to the import task (which never happens).

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-11-09 11:31:00 +00:00
Vetrivel Chinnasamy
282ea74224 L10N:CA-270723 Translation Checkins 2017-11-03 16:42:41 +05:30
Michael Zhao
df92e2ee9b CP-25375: Remove double quotation marks around string USB_DEVICE_VENDOR_PRODUCT. 2017-11-01 15:06:35 +08:00
Gabor Apati-Nagy
93935e5e48
Merge pull request #1833 from jijiang/master
CA-270505: Use generic msg if VM migr not allowed
2017-10-31 14:18:46 +00:00
Mihaela Stoica
de32523d04 Merge pull request #1834 from vetrivelc/master
L10N: Fixed [XenServer] fix in zh-CN resource
2017-10-25 09:38:35 +01:00
vetrivelc
06e11b5852 L10N: Fixed [XenServer] fix in zh-CN resource 2017-10-25 14:03:27 +05:30
Mihaela Stoica
95323239a0 Merge pull request #1827 from vetrivelc/master
L10N:Translation Updates
2017-10-25 08:48:23 +01:00
Ji Jiang
92db28f62a CA-270505: Use generic msg if VM migr not allowed
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-24 15:08:35 +01:00
Michael Zhao
b093082bcd REQ-158: Merge master to fix conflicts. 2017-10-24 18:51:24 +08:00
Ji Jiang
0390bc3f6e CA-265405: Fix string bug in vmss history dialog
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-24 10:40:46 +01:00
vetrivelc
d05fd0efd3 L10N:Translation Updates 2017-10-23 19:01:14 +05:30
Kun Ma
1889cbafbd CP-25329: Refine API reference for PUSB & VUSB in xenadmin
Signed-off-by: Kun Ma <kun.ma@citrix.com>
2017-10-20 17:30:21 +08:00
Michael
a375c8a119 CP-25081: Set platform parameters. (#1820)
* CP-25081: Set platform parameters.

* Optimize qemu-upstream handling code.

* Support Enter/Esc keyboard handling in AttachUsbDialog.

* Fix a logic error in showing qemu-upstream warning.

* Update bindings from REQ-158 XenServer build 129.
2017-10-18 12:52:53 +01:00
Joey
2dc9c00e41 Merge pull request #1817 from GaborApatiNagy/master_new
CA-267330: [Update Wizard Improvements] The Update wizard: block the installation of an update on slaves if a reboot or a toolstack restart is pending on master
2017-10-18 09:53:51 +01:00
Ji Jiang
5fb9442632 Update XC XenAPI binding based on XS master
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-17 11:37:37 +01:00
Michael
16b52d1c3f CP-25081: UI improvements for USB passthrough (#1811)
* CP-25081: UI improvements for USB passthrough

* CP-25081: Show text when AttachUsbDialog list is empty.

* Fix comments.

* Improve the presentation of warnings in USBEditPage.

* Update warning text of attach usb dialog.

* Simplify the layout of Attach USB Dialog.

* Check if USB devices plugged before showing UI.

* Fix comments.

* Fix comments.

* Improve code.
2017-10-17 09:57:50 +01:00
Gabor Apati-Nagy
b589d0dd9e CA-267330: [Update Wizard Improvements] The Update wizard: block the installation of an update on slaves if a reboot or a toolstack restart is pending on master
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-10-13 13:55:19 +01:00
Mihaela Stoica
4a6b860f3d CA-268975: Do not allow multiple hosts to join the pool if the new pool size will exceed the max size
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-10-13 10:14:00 +01:00
Ji Jiang
be5aeae819 CA-249852: Add license status in pool general tab
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-12 13:50:24 +01:00
Mihaela Stoica
8fbfe4c060 Merge branch 'REQ-528' into master
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

Conflicts:
	XenAdmin/MainWindow.Designer.cs
2017-10-12 11:39:19 +01:00
Ji Jiang
225474f913 CA-268683: Turn on disable HA on unlicensed pool
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-11 14:58:10 +01:00
Michael
e8cb4ad7d6 CP-24412 & CP-24333: USB device list filter in Attach dialog. (#1789)
* CP-24412: Apply a filter before adding USBs to candidate list in Attach Dialog.

* CP-24333: Apply HA restraint.

* CP-24412: Fix a merge error.

* CP-24412: implement actions to attach/detach/passthrough.

* CP-24412: Add license check before making UI components visible.

* CP-24412: Change layout of new components to Dpi.

* Fixed all comments.

* Fix comments.

* fixed comments
2017-10-10 09:05:22 +01:00
Ji Jiang
89bc74583f CP-266755 & CA-266843: Fix XC brand string
Following pattern would be caught when using "XenCenter" "XenServer" and
"Citrix":
1) not "[" or "/" or """ on left of the brand string
2) brand string followed by space followed by not "p", and optional letter
3) optional letter followed by space followed by the brand string
4) brand string followed by "," and optional letter
5) begin with the brand string
6) end with the brand string

tested with all .resx files

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-06 13:30:31 +01:00
Mihaela Stoica
20d79ad6f4 Merge remote-tracking branch 'upstream/REQ-67'
Conflicts:
	XenModel/Messages.Designer.cs
2017-10-04 14:40:01 +01:00
Gabor Apati-Nagy
c00439bef4 CP-24818: [Update Wizard Improvements] Show the progress of the download in Automated mode
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-10-02 16:35:10 +01:00
Gabor Apati-Nagy
a8db7bfae9 Merge remote-tracking branch 'github_xenadmin/REQ-411' into master_REQ-411_merge
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

Conflicts:
	XenAdmin/Core/Updates.cs
	XenAdmin/TabPages/ManageUpdatesPage.cs
	XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.cs
	XenModel/Messages.Designer.cs
2017-09-29 11:56:46 +01:00
Gabor Apati-Nagy
0cc907bb14 CP-24709: Add a warning in the New VM wizard and Import wizard if the pool is licensed using XD/XA entitlement (#1791)
* CP-24709: Add a warning in the New VM wizard and Import wizard if the pool is licensed using XD/XA entitlement

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24709: Add a warning in the New VM wizard and Import wizard if the pool is licensed using XD/XA entitlement

Fixed unintended designer code additions/changes

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-09-29 11:05:57 +01:00
Gabor Apati-Nagy
39026f300e CP-24707: Add license status information to the title bar for pool and hosts (#1783)
* CP-24707: Add license status information to the title bar for pool and hosts

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24707: Add license status information to the title bar for pool and hosts

Show expired licenses as Unlicensed in the Header

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24707: Add license status information to the title bar for pool and hosts

Improvements, fixes following the code review

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24707: Add license status information to the title bar for pool and hosts

More code to make it nicer

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

* CP-24707: Add license status information to the title bar for pool and hosts

More code to make it even more nicer

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-09-28 16:10:41 +01:00
Ji Jiang
268b19421f REQ-534: Fix some UI text display
Based on comments from doc team:
1) Column title "Patching Status" should be replaced by "Status" in csv file
2) In View dropdown, "By Host" should be replaced by "By Server"

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-27 15:14:15 +01:00
kunm
912475a4eb CP-24331 & CP-24135: Add UI support for usb-passthrough on both Host & VM (#1766)
* CP-24331: Add UI for UsbTab and VM Usb Property

Signed-off-by: Kun Ma <kun.ma@citrix.com>

* CP-24331: Update XenAPI reference

Signed-off-by: Kun Ma <kun.ma@citrix.com>

* CP-24331: Add AttachUsbDialog

Signed-off-by: Kun Ma <kun.ma@citrix.com>

* CP-24331: Refine UI changes

Signed-off-by: Kun Ma <kun.ma@citrix.com>

* CP-24331: Discard UsbList and little refining to code

Signed-off-by: Kun Ma <kun.ma@citrix.com>

* CP-24331: Refine UI code

Signed-off-by: Kun Ma <kun.ma@citrix.com>

* CP-24331: Refine USBEditPage

Signed-off-by: Kun Ma <kun.ma@citrix.com>

* CP-24331: Refine USBEditPage

Signed-off-by: Kun Ma <kun.ma@citrix.com>
2017-09-27 13:37:17 +01:00
Ji Jiang
41df6e5c35 Fix alert message based on comments
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-27 12:57:25 +01:00
Ji Jiang
d0687e5ae3 CP-24708: Show different unlicensed pool/host icon
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-27 11:30:12 +01:00
Mihaela Stoica
8464712335 CP-24498: RPU wizard to block the selection of unlicensed hosts
Changes following code review

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-09-26 15:01:35 +01:00
Ji Jiang
37499d81b6 CP-24477: Add licence check for CBT feature
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-25 18:19:15 +01:00
Ji Jiang
cb97e3788e CP-24405: Add message alert for CBT error msg
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-25 15:14:53 +01:00
Ji Jiang
a63ca0a030 CP-24344: Add HelpID and warning when disable CBT
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-25 15:14:09 +01:00
Mihaela Stoica
0e5f1335d4 CP-24498: RPU wizard to block the selection of unlicensed hosts
Also includes some improvements to the Select Pools page of the RPU wizard
- do not show the checkbox if the item is disabled
- show the icon for the pool items, not only for hosts (making this consistent with the similar page in the Update Wizard)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-09-25 13:27:06 +01:00
Mihaela Stoica
f32e0a710b Merge pull request #1780 from jijiang/CP-24704
CP-24704: Add pool size license check
2017-09-25 12:18:14 +01:00
Ji Jiang
0018981782 CP-24704: Add pool size license check
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-25 09:53:37 +01:00
Mihaela Stoica
ee61818f5e Sort Messages.resx
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-09-23 02:07:33 +01:00
Ji Jiang
806c3a5852 Update XC XenAPI to XS/feature/CBT branch
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-22 14:28:06 +01:00
Ji Jiang
152c25d2f2 Fix compilation error after merging
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-22 11:07:56 +01:00
Ji Jiang
fce3a725cd Merge 'upstream/master' into REQ-67-us
Conflicts:
	XenAdmin/Commands/MigrateVirtualDiskCommand.cs
	XenAdmin/Commands/MoveVirtualDiskCommand.cs
	XenAdmin/TabPages/SrStoragePage.cs
	XenModel/Messages.resx

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-22 11:02:51 +01:00