Commit Graph

4489 Commits

Author SHA1 Message Date
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
43a7533271 Merge pull request #1781 from MihaelaStoica/master
Sort Messages.resx
2017-09-23 02:20:30 +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
Mihaela Stoica
79f2662abe Merge pull request #1775 from jijiang/REQ-67-us
Merge master into REQ-67
2017-09-22 14:14:13 +01:00
Gabor Apati-Nagy
9fec33d892 Merge pull request #1777 from MihaelaStoica/master
CP-24806: Update the RPU hotfix to version 4
2017-09-22 13:58:34 +01:00
Mihaela Stoica
50623be97c CP-24806: Update the RPU hotfix to version 4
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-09-22 13:55:28 +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
Mihaela Stoica
c02298e161 Merge pull request #1770 from jijiang/REQ-534
Merge REQ-534 to master branch
2017-09-19 12:50:32 +01:00
Ji Jiang
8f03795797 Fix compilation error after rebase REQ-534 on master
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 17:11:43 +01:00
Ji Jiang
f6f17746db CA-265684: Fix bug of disabled "Export All" button
The bug is that "Export All" button is disabled when all hosts are up to
date.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 15:32:49 +01:00
Ji Jiang
026c2b8d47 CA-265410: Fix missing required updates
The bug is that required updates for slaves of pre-dundee pool don't show.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 15:32:48 +01:00
Ji Jiang
7fd18e99cf CP-24032: Updates page collapsing enhancement
Store the pool collapsing state and rebuild it after refresh.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 15:32:48 +01:00
Ji Jiang
41cec6e42b CP-23967: change two superclass to abstract class
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 15:32:48 +01:00
Ji Jiang
30400790c1 CP-24032: Updates page: collapsing funtionality
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 15:32:48 +01:00
Ji Jiang
17f76870b3 CP-23967: Fix and unify sorting in different views
The commit fixes bug and unify sorting rules in ManageUpdatesPage,
PatchingWizard_SelectServers and RollingUpgradeWizardSelectPool data
grid views.

The rules are:
1) Name column sorted purely by name.
2) Other columns sorted by string value, if the same, sorted by default,
which is still in order even in reverse direction.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 15:32:48 +01:00
Ji Jiang
880bde38f6 CP-23455: Add Update btn in Updates page "By Host"
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 15:32:48 +01:00
Ji Jiang
d8ca87cd15 CP-24210: fix the patch sorting in newer version
Keep order consistency with general tab for newer version servers.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 15:32:48 +01:00
Ji Jiang
1e335de316 CP-24210: Populate "By Host" view correctly
1) Show required updates in case of versions without minimal patches
2) Hide version text in installed updates when version is Ely or above

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 15:32:48 +01:00
Ji Jiang
0a33bf1448 Fix PatchingWizard_SelectServers version sorting
The problem is that pool and host rows are mixed when sorting by
version.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 15:32:48 +01:00
Ji Jiang
dfe7a2ea70 Refactoring RollingUpgradeWizardSelectPool sorting
Combine sorting by Description and by Version to a single class

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 15:32:48 +01:00
Ji Jiang
af9143d199 CP-23967: sort "By Host" view rows in Updates page
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 15:32:48 +01:00
Ji Jiang
b5a8282089 CP-23454: Export function in "By Host" view
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 15:32:47 +01:00
Ji Jiang
8b2bc83a12 CP-23453: Populate "By Host" view in Updates page
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 15:32:47 +01:00
Ji Jiang
66b1b52ad1 CP-23450: Add "View" btn in Updates page toolbar
1) View button has "By Update" and "By Host" options.
2) "By Host" view hides "Filter by Date", "Dismiss All" and "Restore
Dismissed Updates" buttons.
3) "By Host" view turns date filter OFF.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 14:58:04 +01:00
Mihaela Stoica
e788e4d106 Merge pull request #1763 from xenserver/REQ-230
Merge REQ-230 from feature branch to master
2017-09-18 14:40:10 +01:00
Mihaela Stoica
3028e5860b Merge pull request #1768 from jijiang/REQ-67
CP-24344: Fix REQ-67 test failure
2017-09-18 14:28:53 +01:00
Ji Jiang
d2d0c2cd09 CP-24344: Fix REQ-67 test failure
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-18 14:07:20 +01:00
Mihaela Stoica
d4c980dbfd Merge branch 'master' into REQ-230 2017-09-18 13:12:06 +01:00
Hui Zhang
80a7da6e5e CP-23604: Pick the latest XenAPI bindings.
Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
2017-09-18 13:11:06 +01:00
Hui Zhang
7298b085be CP-23604: Fix the comments to merge to XenAdmin master.
Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
2017-09-18 11:42:13 +01:00
Mihaela Stoica
3f40ccdd8c Merge pull request #1765 from jijiang/REQ-67
CP-24344: Fix the REQ-67 build failure
2017-09-18 09:56:34 +01:00
Ji Jiang
e3c869ccee CP-24344: Fix the REQ-67 build failure
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-15 12:27:15 +01:00
Mihaela Stoica
2cb3f99c7f Merge pull request #1758 from jijiang/REQ-67
CA-265029: Disable "Move VM" on CBT enabled VM
2017-09-14 09:35:08 +01:00
Mihaela Stoica
2e21b8ab91 Merge pull request #1760 from xenserver/REQ-420
Updated tests to reflect conversion of xenobject properties to methods.
2017-09-13 17:23:12 +01:00
Mihaela Stoica
9ccbf35224 Merge pull request #1759 from kc284/tests
Updated tests to reflect conversion of xenobject properties to methods.
2017-09-13 17:13:24 +01:00
Konstantina Chremmou
32fd3914da Updated tests to reflect conversion of xenobject properties to methods.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2017-09-13 14:46:58 +01:00
Ji Jiang
23c903af09 CA-265029: Disable "Move VM" on CBT enabled VM
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-13 14:32:16 +01:00
Mihaela Stoica
92b3dc8395 Merge pull request #1757 from xenserver/REQ-420
Merging REQ-420 into master
2017-09-13 12:35:50 +01:00
Mihaela Stoica
cb3da7eb07 Merge pull request #1749 from kc284/methods
REQ-420 Preliminary refactoring Pt2
2017-09-11 17:05:53 +01:00
Mihaela Stoica
ad85737f72 Merge pull request #1754 from jijiang/REQ-67
CP-24344 & CP-24343: Add CBT in XC
2017-09-11 14:48:12 +01:00
Ji Jiang
48afa741b1 CP-24344: Fix and refactor CBT implementation
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-09-11 14:41:36 +01:00
Mihaela Stoica
4e32f0efe3 Merge pull request #1755 from kc284/master
CA-265044: Updated test.
2017-09-11 13:53:16 +01:00