Commit Graph

4616 Commits

Author SHA1 Message Date
Mihaela Stoica
b3312b6ed5 Merge pull request #1831 from michael2012z/REQ-158-merge
REQ-158: Merge latest master branch to fix conflicts.
2017-10-24 12:23:00 +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
Mihaela Stoica
d09f75feda Merge pull request #1828 from michael2012z/private/fengyangz/CA-270430
CA-270430: Hide USB property page when template or PV is selected.
2017-10-24 09:16:18 +01:00
Michael Zhao
8749e38732 CA-270430: Hide USB property page when template or PV is selected.
Signed-off-by: Michael Zhao <fengyang.zhao@citrix.com>
2017-10-24 14:23:55 +08:00
vetrivelc
d05fd0efd3 L10N:Translation Updates 2017-10-23 19:01:14 +05:30
Mihaela Stoica
70ccbd4884 Merge pull request #1824 from makunterry/private/kunm/CP-25329
CP-25329: Refine API reference for PUSB & VUSB in xenadmin
2017-10-23 13:00:54 +01:00
Kun Ma
f0722e7a65 CA-270408: Refine add child node order in AttachUsbDialog
Signed-off-by: Kun Ma <kun.ma@citrix.com>
2017-10-23 18:12:39 +08:00
Kun Ma
26aefe5a5d CP-25329: sanity check in UsbPage.cs for usbgroup
Signed-off-by: Kun Ma <kun.ma@citrix.com>
2017-10-23 15:33:10 +08:00
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
Mihaela Stoica
3eaa332bc3 Merge pull request #1822 from michael2012z/private/fengyangz/CA-269722
private/fengyangz/CA-269722: sync resource files for I18N
2017-10-19 09:41:19 +01:00
Michael Zhao
79703f40ff CA-269722: Sync resource files for I18N. 2017-10-19 11:24:20 +08:00
Gabor Apati-Nagy
4630994198 Merge pull request #1797 from mcintyre94/CP-24974
[CP-24974] Avoid calculatingVM agility/failure tolerance twice
2017-10-18 15:58:27 +01: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
Mihaela Stoica
08cce7cb1d Merge pull request #1821 from GaborApatiNagy/master_CA-265225
[SCTX-2608] Honolulu Update - Server is still booting error
2017-10-18 10:00:11 +01:00
Gabor Apati-Nagy
8297314499 [SCTX-2608] Honolulu Update - Server is still booting error
Increased the wait between host_enable attempts, allowing to wait more for the host to reboot.

This will affect Automated Updates and other normal Patching Wizard
operations as well.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-10-18 09:56:35 +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
Gabor Apati-Nagy
b795938b66 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
Moved some code that is only needed for pre-Ely hosts

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-10-18 09:36:35 +01:00
Mihaela Stoica
2b7c0acb04 Merge pull request #1819 from jijiang/master
Update XC XenAPI binding based on XS master
2017-10-17 11:40:01 +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
Mihaela Stoica
405ea9a9b1 Merge pull request #1818 from jijiang/master
CA-268557: Fix the hosts order in Patching Wizard
2017-10-17 08:41:54 +01:00
Ji Jiang
e4ee106366 CA-268557: Fix the hosts order in Patching Wizard
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-16 11:52:08 +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
Joey
2c2d5bf164 Merge pull request #1815 from MihaelaStoica/master
CA-268975: Do not allow multiple hosts to join the pool if the new po…
2017-10-13 12:23:23 +01:00
Mihaela Stoica
b2c779fb85 Merge pull request #1814 from jijiang/master
CA-267671: Fix Configure HA wizard display text
2017-10-13 11:40:50 +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
7c6b94d172 CA-267671: Fix Configure HA wizard display text
when the max tolerance is being calculated, the text and icon on top of HA
wizard is no longer visible after this fix.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-12 18:12:44 +01:00
Mihaela Stoica
3adb7b3f5c Merge pull request #1808 from jijiang/master
CA-249852: Add license status in pool general tab
2017-10-12 15:25:29 +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
Joey
e4e423a05c Merge pull request #1813 from MihaelaStoica/master
Merge REQ-528 into master
2017-10-12 12:09:42 +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
Mihaela Stoica
7ba7b70a2c Merge pull request #1804 from vetrivelc/master
L10N: CA-259356 Fixed button truncation in JA
2017-10-12 10:47:12 +01:00
Mihaela Stoica
3eed721f64 Merge pull request #1810 from jijiang/CA-268683
CA-268683: Turn on disable HA on unlicensed pool
2017-10-11 17:07:49 +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
Mihaela Stoica
3c284a463a Merge pull request #1809 from jijiang/CA-266843
CP-266755 & CA-266843: Fix XC brand string improve
2017-10-11 14:17:47 +01:00
Ji Jiang
ea16c33c0c CP-266755 & CA-266843: Fix XC brand string improve
Fix the comment about the repetitive script code.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-11 12:16:02 +01:00
Gabor Apati-Nagy
010a5189ac Merge pull request #1803 from jijiang/CA-266843
CP-266755 & CA-266843: Fix XC brand string
2017-10-11 12:00:52 +01:00
Gabor Apati-Nagy
4a574a8728 Merge pull request #1807 from MihaelaStoica/CA-266814
CA-266814: Fix the precheck that requires shared CDs to be ejected pr…
2017-10-10 14:09:03 +01:00
Mihaela Stoica
b505b2eee8 Merge pull request #1806 from makunterry/private/kunm/fix_building_error
CP-25081: Add missing resource files for USB controls
2017-10-10 11:15:00 +01:00
Kun Ma
1e2bc9a0c3 CP-25081: Add missing resource files for USB controls
Signed-off-by: Kun Ma <kun.ma@citrix.com>
2017-10-10 18:08:06 +08: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
Mihaela Stoica
be8f2c6897 CA-266842: Rebrand FriendlyErrorNames
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-10-09 16:56:59 +01:00
Mihaela Stoica
91de7501c4 CA-266814: Fix the precheck that requires shared CDs to be ejected prior to update installation 2017-10-09 16:34:59 +01:00
vetrivelc
795612720e L10N: CA-259356 Fixed button truncation in JA 2017-10-09 12:53:23 +05:30
Callum McIntyre
e77b8f9445 [CP-24974] Avoid calculatingVM agility/failure tolerance twice
This is caused by the `waitingNtolUpdate.waitOne()` call being at the end of the loop, not the beginning. The reason is that the `waitingNtolUpdate` is set during the first iteration (before the thread even gets loaded) - because the setter for Settings in this file sets it (and that's set by the setter for AssignPriorites.Connection, which is set in the HAWizard constructor). So when the thread first spawns we do the calculations, then get to the `waitOne` lock, which is set so we go back around the loop and calculate everything again before returning to the lock and waiting to be triggered. The correct behaviour is to trigger only once on the page load, and then only when re-triggered. To achieve that I've moved the `waitOne` call to the beginning of the loop, so that (assuming the `waitingNtolUpdate` lock is set before the thread is first started) we immediately run the calculations and then stop at the beginning of the loop waiting to be triggered again. This means that on page load (and after each re-trigger) we only calculate once.

The assumption that the lock is set before the thread is triggered is currently valid, because as mentioned above it's currently set by the setter for Settings which is indirectly called by the wizard constructor. I don't want to rely on that behaviour though because it's very indirect, so just to be safe I've added an explicit set just before the thread is triggered so that it's guaranteed to run the calculations the first time. This isn't strictly necessary but seems better than relying on the existing implicit setting. Since we use the same mechanism just in a different place, all the existing code that sets `waitingNtolUpdate` continues to trigger this thread as expected.
2017-10-06 14:07:31 +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
Gabor Apati-Nagy
9ddcdfa7d0 Merge pull request #1801 from MihaelaStoica/master
CA-268105: fix the bug where the pool item is disabled when an update…
2017-10-06 11:28:51 +01:00
Mihaela Stoica
b79d7923cc CA-268105: fix the bug where the pool item is disabled when an update is already installed on one host in the pool
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-10-04 16:48:58 +01:00
Mihaela Stoica
d2d7fbdaba Merge pull request #1800 from MihaelaStoica/master
Merge REQ-67 into master
2017-10-04 16:15:53 +01:00