Commit Graph

51 Commits

Author SHA1 Message Date
Gabor Apati-Nagy
efe9c807b3 Merge pull request #827 from MihaelaStoica/rename
CP-16012: Rename branding variables
2016-02-10 15:19:29 +00:00
Gabor Apati-Nagy
b211ab4a09 Merge pull request #821 from MihaelaStoica/CA-197388
CA-197388: Fix error where License Manager displays "Standard feature…
2016-02-10 15:18:23 +00:00
Mihaela Stoica
9f99c37f83 CP-16012: Rename branding variables
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-10 11:52:30 +00:00
Mihaela Stoica
acd2a52823 Fix null reference exception that can occur when running the tests
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-10 10:48:08 +00:00
Mihaela Stoica
7b2a0c6922 CA-197388: Fix error where License Manager displays "Standard features only" for Premium edition
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-08 10:10:01 +00:00
Mihaela Stoica
fc5ebd2d40 CP-15401: Move HiddenFeatures to a new class
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-01-28 21:43:15 +00:00
Mihaela Stoica
f12b4765b6 CP-15409: Add read-only mode to License manager
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-26 14:49:02 +00:00
Gabor Apati-Nagy
04e5820db2 Merge pull request #776 from MihaelaStoica/CP-14472
CP-14472: Remove the lock in the License Manager and ensure that all the updates are done on the main thread.
2016-01-20 12:19:07 +00:00
Cheng Zhang
08741a1fa0 CP-15398: Make texture company name rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:54 +08:00
Cheng Zhang
4f0270d049 CP-15398: Make texture XenServer Host rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:52 +08:00
Mihaela Stoica
11362f22d2 CP-14472: Remove the lock in the License Manager and ensure that all the updates are done on the main thread.
- changed the licenseStatus_ItemUpdated event handler to invoke on the main thread, as this is the only case when a background thread needs to update the storedRows list..All the other reads and writes are taken place on the main (UI) thread
- removed the storedRowsLock as it is not needed since we do all the updates to storedRows on one thread.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-14 16:22:13 +00:00
Stephen Turner
f2f590e3e7 CP-14647: More changes after read-through, including getting rid of OEM edition 2015-11-08 16:31:48 +00:00
Stephen Turner
b587ab832e CP-14647: Intermediate check-in #1 2015-11-08 11:27:56 +00:00
Gabor Apati-Nagy
aefed11165 Revert "CA-149867: Invoke on MainWindow instead of various controls"
This reverts commit 92f0499911.
2015-04-16 14:17:02 +01:00
Gabor Apati-Nagy
92f0499911 CA-149867: Invoke on MainWindow instead of various controls
We observed that some threads can reach deadlock-ish state after they have Invoked into a control's UI thread. When it happens they are all in a waiting for join or in sleep state for very long time, although there should not be any deadlock situations.
It seems this has something to do with multiple parent controls and with which control we invoked on. This should not make a difference, because we have got one UI thread (for MainWindow) they should wait for, but we have seen it does.

The solution that fixed this issue was to invoke on the MainWindow instead of various controls (see a4fe507adf ).

This changeset is changing all our Invokes to invoke into MainWindow
instead of a control itself. (MainWindow's UI thread is the only UI thread
all Control is using in XenCenter)
This changeset should be in place until we have found the root cause or the exact reason for the above.
2015-04-08 15:16:10 +01:00
Mihaela Stoica
f9d14a8155 CP-10833: New licensing text in XenCenter
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2015-01-21 17:27:38 +00:00
Mihaela Stoica
3faa6bedf7 CP-10454: XenCenter work for the latest changes in licensing
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-12-08 14:29:54 +00:00
Mihaela Stoica
a50451d4a7 Merge branch 'master' of ssh://hg.uk.xensource.com/carbon/cre-l/xenadmin 2014-11-26 09:54:11 +00:00
Mihaela Stoica
66a3755a57 Merge branch 'xs64bit' of https://github.com/xenserver/xenadmin 2014-11-25 16:56:20 +00:00
Mihaela Stoica
65b4ef1f37 CA-152052: Fix the issue where the License Manager showed the wrong state when assigning/releasing license from pool
The problem was that the License Manager was listening to PropertyChanged events on the master only, not on slaves.
When the master's properties change (e.g. edition) we update the row in the license manager; but in some cases a slave (or more) hasn't been updated yet (as it may be updated in another event.from) and we think that the pool is partially updated.
Our solution is to listen to Host BatchCollectionChanged event, which is triggered once per cache update for the host collection (it any property changed for any of the hosts).
The sleep in the ApplyLicenseEditionAction is not needed anymore, nor is the extra call to update the cell after the action is completed, because the cell is getting updated correctly on the BatchCollectionChanged event.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-11-24 16:57:42 +00:00
sriharshak
d5fb469e24 CA-149870: Issue fixed by adjusyting the size for ZHCN 2014-11-17 12:23:55 +05:30
Mihaela Stoica
9d9e7b2f24 CP-10334: XenCenter work for the new changes in licensing
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-11-14 17:29:01 +00:00
Mihaela Stoica
4ee51e7ed3 CP-10178: Add link to the license server web console on General tab and License Manager
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-10-31 15:06:35 +00:00
Mihaela Stoica
9aaba04d37 CA-150413: Pre-select current edition in Assign license dialog
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-10-31 12:14:01 +00:00
Mihaela Stoica
218f2007e3 CP-10079: Implement new licensing requirements in XenCenter
Changes to the License Manager dialog:
- Summary panel: show smaller icons for warning and information messages
- Summary panel: show license entitlements for all Creedence hosts (not eligible for support, eligible for support, enterprise features enabled, etc)
- for free Creedence or Clearwater hosts, the license status is Free (it used to be Expired for ClearwaterOrGreater)
and the text displayed is "Unlicensed" for Creedence and "Unsupported" for Clearwater;
the warning message is "Not eligible for support" (instead of "Your support and maintenance has expired")

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-10-28 17:02:55 +00:00
Mihaela Stoica
571ed9241a CP-10079: Implement new licensing requirements in XenCenter
- new license types
- new options in the license manager

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-10-28 16:42:27 +00:00
Gabor Apati-Nagy
466dd48c2f Merge pull request #220 from xenserver/xs64bit
Merging xs64bit into Creedence-ln
2014-09-22 16:45:58 +01:00
Gabor Apati-Nagy
c068c56a23 CA-139588: Uncaught exception in License Manager 2014-09-22 15:38:01 +01:00
Gabor Apati-Nagy
01ba7e04da CA-145686: (Fix for) Deadlock in license manager
Revert "CA-139588: Try to prevent Index was out of range exception by invoking on the event thread"

This reverts commit eeb86b7956.
2014-09-22 13:53:54 +01:00
vetrivelc
2ab95c7899 CreedenceLN: Updated the language resource files
New translation checki-ns and language file additions
2014-09-18 15:03:24 +05:30
Mihaela Stoica
eeb86b7956 CA-139588: Try to prevent Index was out of range exception by invoking on the event thread
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-07-09 14:55:19 +01:00
Mihaela Stoica
8e19193a2a CA-137470: Fixed unhandled exception raised by pressing space key on gridview of License Manager.
- Added a 'refresh grid' parameter to UpdateRow() which indicates if a sort and refresh of the grid is necessary.
- A sort and refresh is not needed when the user selects a server by pressing the space key or by mouse, but it is needed when the information displayed has changed, for example when the license has changed.
- Also solved a possible null reference exception in CheckableDataGridViewController.ReplaceStoredRow(), by returning -1 if the index is not within the rows range.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-07-04 11:10:46 +01:00
Stephen Turner
75bb8fa8f0 [CA-115256] Add null check as suggested by code review 2014-04-16 09:13:20 +01:00
Stephen Turner
75464110de Improvement to check-in for [CA-115256]: remove unused dependency 2014-04-15 17:49:03 +01:00
Stephen Turner
5d722be866 Improvement to check-in for [CA-115256]: move logic out of the display into the LicenseRow 2014-04-15 17:46:56 +01:00
Stephen Turner
afbfbaf803 [CA-115256] Don't show the Buy Licenses link for pre-Clearwater servers 2014-04-15 17:07:21 +01:00
Konstantina Chremmou
f5bee7102c Refactored MainWindow to derive from IMainWindow rather than implement a field deriving
from this interface.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2014-01-22 12:39:32 +00:00
Konstantina Chremmou
98e124a98e CP-6317: Importing from branch clearwater-ln.
# HG changeset patch
# User Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
# Date 1377019978 -3600
# Node ID 7674677d207c53d4a1207a88d0f1aa82c68b22fe
# Parent  a1940814a129b5fd75703a5aa541783a73b7cca5
CA-112234: Layout corrections on the LicenseManager. Increased dialog height in
the SC version to avoid control overlappin on the Summary panel.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2013-09-26 14:39:02 +01:00
Konstantina Chremmou
22098bb757 CP-6317: Importing from branch clearwater-ln.
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1374503232 -19800
# Node ID 90776ba30a9e56cb3c07d32066c6a0dd0ad638de
# Parent  755b1cdd3b8340b677fd505b439710115697461f
Fix for Bugs#CA-111874,CA-111873

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2013-09-26 13:24:48 +01:00
Konstantina Chremmou
a437f4c630 CP-6317: Importing from branch clearwater-ln.
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1374488169 -19800
# Node ID 755b1cdd3b8340b677fd505b439710115697461f
# Parent  f600c04441cfccca80a82c2aeca47c220c7428db
Bug fix : CA-111760,CA-111753.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2013-09-26 13:23:28 +01:00
Konstantina Chremmou
6e9e053dea CA-115431: Disable the "apply activation key" MenuItem and show a reason if there
are more than one hosts selected.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2013-09-24 15:58:33 +01:00
Konstantina Chremmou
44aed3cb7b CA-115257: Handle the LinkLabel.LinkClicked event instead of LinkLabel.Click so
the LinkLabelcan be accessible by using both the mouse and the keyboard.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2013-09-12 00:06:43 +01:00
Konstantina Chremmou
a134e1bb86 CA-113430: Importing from clearwater-lcm-staging: corrected the calculation of
the time remaining to the licence expiry date.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2013-08-28 15:11:12 +01:00
Konstantina Chremmou
58e9b1c822 CA-113431: Display a warning when a pool has a mixture of free hosts with license
expiry dates that are more than 30 days apart (not ideal, but safest solution for
the case of a mixture of free and free but expiring soon hosts.)

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2013-08-09 17:18:15 +01:00
Konstantina Chremmou
35226d65dd CA-113319: LicenseManager was showing confusing licensing information.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2013-08-09 17:17:24 +01:00
Konstantina Chremmou
accf445584 CA-112931: Fixed issue where the "Activate Free XenServer” button was disabled
when selecting multiple hosts on the Licence manager.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2013-08-05 17:46:05 +01:00
Mihaela Stoica
bec2117a2a CA-110610: It should be possible to apply a free license to a 6.1 or earlier pool if the pool has two or more servers in it.
- Changed the condition under which we show pool members as individual hosts in the License Manager dialog, from ALL to ANY,
meaning that if any of the pool members can be activated, then we split the pool.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-07-22 14:07:47 +01:00
Mihaela Stoica
31fb3218b0 CA-110610: It should be possible to apply a free license to a 6.1 or earlier pool if the pool has two or more servers in it.
- split the pool members out when they're free, as the activation keys can only be applied to one XenServer host at a time

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-07-16 11:46:18 +01:00
Mihaela Stoica
978c9679c3 CA-107923: Display the correct pool license edition in License Manager and
in the General Tab.

When master and slave(s) are licensed with different editions, the pool
license edition is not the master's edition, but the lowest license in the
pool.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-07-01 14:03:35 +01:00
Mihaela Stoica
4d638c4f65 CA-109483: Show correct licence status in the Licence manager for licensed XenServer hosts version 6.1.0 and earlier
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-27 14:40:11 +01:00