serenc
3e9e2609e8
CP-25565: Update XenCenter API binding
...
Signed-off-by: serenc <seren.corbett@citrix.com>
2017-11-23 11:06:37 +00:00
serenc
c4b228e8da
CP-25551: Change Type page, Add provisioning page
...
Signed-off-by: serenc <seren.corbett@citrix.com>
2017-11-23 10:59:15 +00:00
Mihaela Stoica
d182041718
Merge pull request #1826 from GaborApatiNagy/master_gfs2
...
CP-25257: Resurrect old code for GFS2 SR
2017-10-24 15:28:15 +01:00
Gabor Apati-Nagy
59b904eb2d
CP-17098: Integrate gfs2 in New SR wizard for HBA and FCOE SRs
...
Fix earlier resolved conflicts
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-10-24 14:55:07 +01:00
Gabor Apati-Nagy
033e7df8af
CP-17098: Integrate gfs2 in New SR wizard for HBA and FCOE SRs
...
Fix earlier resolved conflicts
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-10-23 15:05:25 +01:00
Mihaela Stoica
304b2c9fab
CP-17098: Integrate gfs2 in New SR wizard for HBA and FCOE SRs
...
Changes following code review
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-10-20 11:06:16 +01:00
Mihaela Stoica
6249663ae2
CP-17098: Integrate gfs2 in New SR wizard for HBA and FCOE SRs
...
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
Conflicts:
XenAdmin/Wizards/NewSRWizard.cs
XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs
XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs
XenAdmin/Wizards/NewSRWizard_Pages/SrWizardType.cs
2017-10-20 11:05:45 +01:00
Mihaela Stoica
3bab5186f8
CP-16484: Integrate gfs2 in New SR wizard for iSCSI SRs
...
Rename SrWizardType
2017-10-20 10:42:54 +01:00
Mihaela Stoica
a56338861c
CP-16484: Integrate gfs2 in New SR wizard for iSCSI SRs
...
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
Conflicts:
XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoISCSI.cs
XenAdmin/Wizards/NewSRWizard_Pages/SrWizardType.cs
XenAdmin/XenAdmin.csproj
2017-10-20 10:42:35 +01:00
Mihaela Stoica
b23ec8136a
CP-16480: Add gfs2 to the list of XenCenter known sr types
...
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
Conflicts:
XenModel/FriendlyNames.Designer.cs
XenModel/FriendlyNames.resx
XenModel/XenAPI-Extensions/SR.cs
2017-10-20 10:34:56 +01: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
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
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
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
Mihaela Stoica
20d79ad6f4
Merge remote-tracking branch 'upstream/REQ-67'
...
Conflicts:
XenModel/Messages.Designer.cs
2017-10-04 14:40:01 +01:00
Mihaela Stoica
d2c80cddbc
Merge pull request #1799 from jijiang/master
...
CA-267553: Fix offline XC showing up to date bug
2017-10-03 20:33:18 +01:00
Ji Jiang
2f41bbfde1
CA-267553: Fix offline XC showing up to date bug
...
Refactor the code.
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-03 18:00:48 +01:00
Mihaela Stoica
a62c04a3a9
Merge pull request #1798 from GaborApatiNagy/master_CA-266911
...
CA-266911: Exported data from Notification->updates page having incorrect values for "Web page"column
2017-10-03 17:57:26 +01:00
Mihaela Stoica
e6a6a9cc83
Merge pull request #1790 from jijiang/master
...
CA-267553: Fix offline XC showing up to date bug
2017-10-03 17:52:35 +01:00
Gabor Apati-Nagy
b49c14fd92
CA-266911: Exported data from Notification->updates page having incorrect values for "Web page"column
...
Displaying the full "Go to web page" URLs in the exported csv file
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-10-03 16:42:48 +01:00
Ji Jiang
7fa784ba96
CA-267553: Fix offline XC showing up to date bug
...
Fix comments about considering whether XS version is found in updates XML file.
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-03 15:32:57 +01:00