Commit 2f557912 authored by Nikita Krishnia-INTERN's avatar Nikita Krishnia-INTERN Committed by Aaron Plattner

Modified logic to update status/messages on 'Manage License Page' and rename...

Modified logic to update status/messages on 'Manage License Page' and rename "Tesla(unlicensed)" string to "GRID Virtual Apps"

Details:
- From nvidia-gridd, fetching license state from the state machine. Sending this
  license state instead of license status to nvidia-settings.
- According to license state and featureType fetched from nvidia-gridd, setting
  license status on nvidia-settings side.
- Updated all license status messages to latest reviewed strings.
- Renamed "Tesla(unlicensed)" string to "GRID Virtual Apps".
parent 2fb5615f
This diff is collapsed.
......@@ -20,11 +20,6 @@
#ifndef __CTK_MANAGE_GRID_LICENSE_H__
#define __CTK_MANAGE_GRID_LICENSE_H__
// Licensed feature types
#define GRID_LICENSED_FEATURE_TYPE_TESLA 0
#define GRID_LICENSED_FEATURE_TYPE_VGPU 1
#define GRID_LICENSED_FEATURE_TYPE_GVW 2
G_BEGIN_DECLS
#define CTK_TYPE_MANAGE_GRID_LICENSE (ctk_manage_grid_license_get_type())
......@@ -66,11 +61,29 @@ struct _CtkManageGridLicense
DbusData *dbusData;
gint license_edition_state;
gint feature_type;
int license_status;
int license_feature_type;
gint feature_type; // Feature type from UI/gridd.conf.
int gridd_feature_type; // Feature type fetched from nvidia-gridd.
};
/*
* Status related to GRID licensing
*/
typedef enum
{
NV_GRID_UNLICENSED_VGPU = 0,
NV_GRID_UNLICENSED_VAPP,
NV_GRID_UNLICENSED_QDWS_SELECTED,
NV_GRID_LICENSE_ACQUIRED_VGPU,
NV_GRID_LICENSE_ACQUIRED_QDWS,
NV_GRID_LICENSE_REQUESTING_VGPU,
NV_GRID_LICENSE_REQUESTING_QDWS,
NV_GRID_LICENSE_FAILED_VGPU,
NV_GRID_LICENSE_FAILED_QDWS,
NV_GRID_LICENSE_EXPIRED_VGPU,
NV_GRID_LICENSE_EXPIRED_QDWS,
NV_GRID_LICENSE_RESTART_REQUIRED,
} licenseStatus;
struct _CtkManageGridLicenseClass
{
GtkVBoxClass parent_class;
......
......@@ -33,33 +33,27 @@
#define LICENSE_FEATURE_TYPE_REQUEST 3
/*
* List of grid license states
* GRID license states
*/
typedef enum
{
NV_GRID_UNLICENSED = 0, // Your system does not have a valid GPU license. Enter license server details and apply.
NV_GRID_UNLICENSED_VGPU, // Your system does not have a valid vGPU license. Enter license server details and apply.
NV_GRID_UNLICENSED_TESLA, // Your system is currently running on Tesla (unlicensed).
NV_GRID_UNLICENSED_GVW_SELECTED, // Your system is currently running on Tesla (unlicensed). Enter license server details and apply.
NV_GRID_LICENSE_ACQUIRED_VGPU, // Your system is licensed for GRID vGPU.
NV_GRID_LICENSE_ACQUIRED_GVW, // Your system is licensed for Quadro Virtual Datacenter Workstation Edition.
NV_GRID_LICENSE_REQUESTING_VGPU, // Acquiring license for GRID vGPU Edition. Your system does not have a valid GRID vGPU license.
NV_GRID_LICENSE_REQUESTING_GVW, // Acquiring license for Quadro Virtual Datacenter Workstation Edition. Your system does not have a valid Quadro Virtual Datacenter Workstation license.
NV_GRID_LICENSE_FAILED_VGPU, // Failed to acquire NVIDIA vGPU license.
NV_GRID_LICENSE_FAILED_GVW, // Failed to acquire NVIDIA Quadro Virtual Datacenter Workstation license.
NV_GRID_LICENSE_EXPIRED_VGPU, // Failed to renew license for GRID vGPU Edition. Your system does not have a valid GRID vGPU license.
NV_GRID_LICENSE_EXPIRED_GVW, // License for Quadro Virtual Datacenter Workstation has expired. Your system does not have a valid Quadro Virtual Datacenter Workstation license.
NV_GRID_LICENSE_RESTART_REQUIRED, // Restart your system for Tesla Edition. Your system is currently running Quadro Virtual Datacenter Workstation Edition.
} gridLicenseStatus;
NV_GRID_UNLICENSED = 0,
NV_GRID_LICENSE_REQUESTING,
NV_GRID_LICENSE_FAILED,
NV_GRID_LICENSED,
NV_GRID_LICENSE_RENEWING,
NV_GRID_LICENSE_RENEW_FAILED,
NV_GRID_LICENSE_EXPIRED,
} gridLicenseState;
/*
* List of grid license feature types
* GRID license feature types
*/
typedef enum
{
NV_GRID_LICENSED_FEATURE_TYPE_TESLA = 0,
NV_GRID_LICENSED_FEATURE_TYPE_VGPU,
NV_GRID_LICENSED_FEATURE_TYPE_GVW,
NV_GRID_LICENSE_FEATURE_TYPE_VAPP = 0,
NV_GRID_LICENSE_FEATURE_TYPE_VGPU,
NV_GRID_LICENSE_FEATURE_TYPE_QDWS,
} gridLicenseFeatureType;
#endif // _NVIDIA_NV_GRID_DBUS_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment