Commit Graph

3340 Commits

Author SHA1 Message Date
Callum McIntyre
7d7a040335 [CA-211267] Add a null check, use Run() to stop child classes directly calling InitialiseTicker()
TickUntilCompletion() is now a static method and again takes an ApplianceAction parameter. It does a null check on each while iteration to handle the case where another thread nulls the action. Also added Run() method to ApplianceAction which initialises the ticker (now a private method), and let child classes call Run() instead.
2016-10-24 11:59:28 +01:00
Callum McIntyre
15b4705942 [CA-211267] Move the sleep time into a const int of the class. Also removed the ApplianceAction parameter from TickUntilCompletion (it behaved like a static method), to make it more similar to TaskPoller.PollToCompletion 2016-10-24 10:06:59 +01:00
Callum McIntyre
de43761039 [CA-211267] Add a lightweight polling mechanism to the appliance tasks, to provide an accurate timer
For other actions we get a ticking timer in the Events view because they use PollToCompletion, which calls their Changed event every 900ms. These actions don't use PollToCompletion, and didn't regularly call their Changed event - so their timer didn't tick regularly. This change adds a lightweight mechanism to call their changed event every 900ms until they complete. This allows the events page timer to tick every second in the same way as it does for other actions.
2016-10-24 09:56:09 +01:00
Callum McIntyre
5cb4cc8ba1 Add the branding for 6.0 to branding.sh and re-branding.sh 2016-10-21 10:58:32 +01:00
Callum McIntyre
d7fde3866e [CA-226012] Use branding version in the SERVER_TOO_OLD message
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
2016-10-20 10:43:39 +01:00
Mihaela Stoica
1040027a6d Merge pull request #1223 from mcintyre94/master_dotnetupgrade
[DotNet Upgrade] Revert the temporary change to use the local .net installer, get .net 4.6 from dotnetpackages again
2016-10-20 10:09:48 +01:00
Mihaela Stoica
49ba853958 Merge pull request #1218 from mcintyre94/CA-225062
[CA-225062] For Ely and greater hosts, don't check for IO tools when activating/deactivating (this covers detatch + delete too in UI) a VBD
2016-10-19 13:19:22 +01:00
Mihaela Stoica
2c0d830754 Merge pull request #1221 from sriharshak/master
L10N:TRanslations check-ins
2016-10-19 13:17:47 +01:00
sri harsha tagore k
1e8791fb38 L10N:TRanslations check-ins 2016-10-19 16:37:43 +05:30
Callum McIntyre
239c2e8b9d [DotNet Upgrade] Revert the temporary change to use the local .net installer, get .net 4.6 from dotnetpackages again
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
2016-10-19 09:38:18 +01:00
Mihaela Stoica
9de2dae4a1 Merge pull request #1219 from sriharshak/master
L10N:TRanslations check-ins
2016-10-18 17:57:42 +01:00
sri harsha tagore k
529cddb035 L10N:TRanslations check-ins 2016-10-18 22:16:57 +05:30
mcintyre94
284afe255e Merge pull request #1210 from kc284/CA-150412
CA-150412: OtherConfigAndTagsWatcher deliberately throws exceptions
2016-10-18 17:11:28 +01:00
Mihaela Stoica
045db14381 Merge pull request #1191 from mcintyre94/master_dotnetupgrade
[Dotnet upgrade] Upgrade XenCenter to .net 4.6
2016-10-18 16:57:18 +01:00
Mihaela Stoica
b7d963cfa2 Merge pull request #1217 from sriharshak/master
L10N:TRanslations check-ins
2016-10-18 16:52:41 +01:00
Callum McIntyre
2ad99b06d4 [CA-225062] For Ely and greater hosts, don't check for IO tools when activating/deactivating (this covers detatch + delete too in UI) a VBD
Instead we use the vbd.allowed_operations list, and check for the plug/unplug operation respectively.

Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
2016-10-18 16:48:05 +01:00
sri harsha tagore k
63387232b9 L10N:TRanslations check-ins 2016-10-18 20:45:24 +05:30
Gabor Apati-Nagy
06de296c62 Merge pull request #1216 from MihaelaStoica/master
Merge branch 'CAR-2184' to master
2016-10-18 11:29:33 +01:00
Mihaela Stoica
329f084a7e Merge branch 'CAR-2184' to master
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

Conflicts:
	XenModel/XenAPI-Extensions/SR.cs
2016-10-18 10:18:47 +01:00
Callum McIntyre
fd14e4205c [DotNet Upgrade] Use REPO_CITRITE_HOST in WEB_HOTFIXES_ROOT
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
2016-10-18 10:14:51 +01:00
Konstantina Chremmou
5bb7e3bac5 CA-157786: Updated tests.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2016-10-18 08:53:23 +01:00
Mihaela Stoica
7ec3881e05 Merge pull request #1212 from kc284/CA-157786
CA-157786: General tab for VDIs.
2016-10-18 08:01:57 +01:00
Konstantina Chremmou
c7ea650cf6 CA-157786: Use NameWithLocation to display the name of the VDI's SR. Also, removed
unconventionally named method which did not offer much to code legibility.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2016-10-17 23:26:13 +01:00
Konstantina Chremmou
38bf5b86d3 Merge pull request #1208 from MihaelaStoica/CA-224567
CA-224567: PVS Site renaming plus some other improvements
2016-10-17 22:06:48 +01:00
Mihaela Stoica
15344401c0 CA-224567: Correction in the text on the PVS Cache configuration page
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-10-17 16:00:28 +01:00
mcintyre94
e8152cef5d Merge pull request #1214 from MihaelaStoica/CA-225708
CA-225708: Can not increase dom0 Memory multiple times
2016-10-17 15:20:57 +01:00
Mihaela Stoica
18243b229f CA-225708: Can not increase dom0 Memory multiple times
- take the already assigned dom0 memory into account when calculating maximum memory available

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-10-17 14:23:50 +01:00
Callum McIntyre
8d9007205f (TEMPORARY) Swap .net installer for a local copy of the 4.6 one, for
testing

Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
2016-10-17 14:16:09 +01:00
Callum McIntyre
dfe627b5ee [DotNet upgrade] Use executables from WIX_BIN instead of the default Wix candle/lit/light exes (which may not be the WIX_BIN ones), to guarantee using the patched+built 3.10 exes
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
2016-10-17 14:16:08 +01:00
Callum McIntyre
574c7ed221 [DotNet upgrade] Update wix patches for 3.10, to address changes in the source files
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
2016-10-17 14:16:07 +01:00
Callum McIntyre
4b5e4ce11a [DotNet upgrade] Use Wix 3.10 binaries so that we can support .net 4.6 checks
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
2016-10-17 14:12:41 +01:00
Callum McIntyre
10d932fc76 [DotNet upgrade] Replace NETFRAMEWORK checks with WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED in Wix checks, which is the correct way to check for a 4.6+ install
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
2016-10-17 14:09:47 +01:00
Callum McIntyre
168dbe4c13 [DotNet upgrade] Upgrade the XenCenter installer to use .net 4.6
In the dotnet installers we now compare the Release Dword against the lowest 4.6 version, accepting anything >=. Build number from https://msdn.microsoft.com/en-us/library/hh925568(v=vs.110).aspx

Also updated the wix check and xe project, as was done in the similar .net 4.5 upgrade

Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
2016-10-17 14:09:08 +01:00
Gabor Apati-Nagy
feb3ca0df0 Merge pull request #1213 from kc284/master
Merged CAR-2226; undid change for CP-17750 as the latter is replaced by CP-18417.
2016-10-17 14:03:02 +01:00
Mihaela Stoica
e6fbcfdb5d CA-224567: PVS Site renaming plus some other improvements
- Correction in the text on the PVS Cache configuration page
- Added help IDs for all new dialogs and the PVS tab
- Help button on the Enable PVS read caching dialog, plus some adjustments in the controls sizes on this dialog
- Removed minimize and maximize buttons from the PVS servers dialog, and added the help button

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-10-17 13:02:59 +01:00
Konstantina Chremmou
08e1b2c1b7 CP-18417: Removed flag forbidding update; was added for CP-17750, but is no longer applicable.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2016-10-17 11:16:16 +01:00
Konstantina Chremmou
cff98908b3 Merge remote-tracking branch 'upstream/CAR-2226' 2016-10-17 11:07:15 +01:00
Gabor Apati-Nagy
2bf2f4fcf0 Merge pull request #1206 from MihaelaStoica/CAR-2184
CA-224666: Things in PVS tab constantly refreshing
2016-10-14 16:36:55 +01:00
Konstantina Chremmou
7a74096d3b CA-157786: Added general tab for VDIs.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2016-10-14 13:51:51 +01:00
Konstantina Chremmou
0b3d3abfcc Code repetition.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2016-10-14 12:21:59 +01:00
Konstantina Chremmou
082e4693a8 CA-150412: Removed invocation of XenConnections_CollectionChanged with null parameters;
the objective is to mark the events as ready to fire, whcih can be done directly.
Also, added null checks where GetCollectionForType is used.
2016-10-14 10:32:20 +01:00
Konstantina Chremmou
bf08f9d875 Refactored old events which did not need to pass parameters when fired, but were
defined a long time ago, before C# obtained the Action delegates.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2016-10-13 22:59:06 +01:00
Konstantina Chremmou
fb281e65ac Merge pull request #1209 from MihaelaStoica/CA-225057
CA-225057: XenCenter throws an Exception when trying to copy somethin…
2016-10-13 19:28:34 +01:00
Mihaela Stoica
9ec9cf1aee CA-225057: Add a helper method for setting the Clipboard text and use in all places where Clipboard.SetText was used.
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-10-13 16:16:16 +01:00
Konstantina Chremmou
3788edad0c Merge pull request #1203 from MihaelaStoica/CA-225015
CA-225015: XenCenter Allows VM migration to MemorySR
2016-10-13 15:54:00 +01:00
Mihaela Stoica
387c28dadc CA-225057: XenCenter throws an Exception when trying to copy something to the clipboard on the Network page
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-10-13 13:14:37 +01:00
Mihaela Stoica
abde6e9641 CA-224567: PVS Site renaming plus some other improvements
- Renamed Add/Remove PVS Site buttons
- Added a note on the PVS Cache configuration page, regarding the recommended cache size and the allowed size for "memory only"
- Added a warning about the Site configuration not being complete until the PVS part is done as well (only visible if PVS_uuid is not set for a PVS_site)
-  Added PVS Read Caching status on the VM's general tab
- The absolute maximum allowed for a cache size is 2TB
- Changed the rubric on the Enable PVS read caching dialog

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-10-13 12:47:32 +01:00
Konstantina Chremmou
dc5318010c Merge pull request #1196 from mcintyre94/CA-114492
[CA-114492] Stop GroupBy buttons remaining overlapped…
2016-10-12 20:24:36 +01:00
Mihaela Stoica
be668850a4 CP-19086: In the PVS Cache configuration dialog, we shouldn't try to save a "not configured" site if it was "not configured" before
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-10-12 17:10:39 +01:00
Mihaela Stoica
af680eb6eb CA-224666: Things in PVS tab constantly refreshing
- instead of repopulating the whole grid when a proxy or a site changes, we now refresh just the row that needs refreshing, and when the refresh is indeed needed.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-10-12 16:59:46 +01:00