Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(config): sw-1692 activate rhel for x86 EUS #1216

Merged
merged 1 commit into from
Oct 17, 2023
Merged

feat(config): sw-1692 activate rhel for x86 EUS #1216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions public/locales/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
"legendTooltip_Sockets_hypervisor_RHEL for IBM Power": "$t(curiosity-graph.legendTooltip_Sockets_hypervisor_RHEL)",
"legendTooltip_Sockets_hypervisor_RHEL for IBM z": "$t(curiosity-graph.legendTooltip_Sockets_hypervisor_RHEL)",
"legendTooltip_Sockets_hypervisor_RHEL for x86": "$t(curiosity-graph.legendTooltip_Sockets_hypervisor_RHEL)",
"legendTooltip_Sockets_hypervisor_rhel-for-x86-eus": "$t(curiosity-graph.legendTooltip_Sockets_hypervisor_RHEL)",
"legendTooltip_Sockets_hypervisor_rhel-for-sap-x86": "$t(curiosity-graph.legendTooltip_Sockets_hypervisor_RHEL)",
"legendTooltip_Sockets_physical": "{{product}} CPU socket usage, per socket pair.",
"legendTooltip_Sockets_physical_rhel": "$t(curiosity-graph.legendTooltip_Sockets_physical_RHEL)",
Expand All @@ -131,6 +132,7 @@
"legendTooltip_Sockets_physical_RHEL for IBM Power": "$t(curiosity-graph.legendTooltip_Sockets_physical_RHEL)",
"legendTooltip_Sockets_physical_RHEL for IBM z": "$t(curiosity-graph.legendTooltip_Sockets_physical_RHEL)",
"legendTooltip_Sockets_physical_RHEL for x86": "$t(curiosity-graph.legendTooltip_Sockets_physical_RHEL)",
"legendTooltip_Sockets_physical_rhel-for-x86-eus": "$t(curiosity-graph.legendTooltip_Sockets_physical_RHEL)",
"legendTooltip_Sockets_physical_rhel-for-sap-x86": "$t(curiosity-graph.legendTooltip_Sockets_physical_RHEL)",
"legendTooltip_Sockets_virtual": "{{product}} CPU socket usage, per socket pair.",
"legendTooltip_Sockets_virtual_rhel": "$t(curiosity-graph.legendTooltip_Sockets_virtual_RHEL)",
Expand All @@ -139,6 +141,7 @@
"legendTooltip_Sockets_virtual_RHEL for IBM Power": "$t(curiosity-graph.legendTooltip_Sockets_virtual_RHEL)",
"legendTooltip_Sockets_virtual_RHEL for IBM z": "$t(curiosity-graph.legendTooltip_Sockets_virtual_RHEL)",
"legendTooltip_Sockets_virtual_RHEL for x86": "$t(curiosity-graph.legendTooltip_Sockets_virtual_RHEL)",
"legendTooltip_Sockets_virtual_rhel-for-x86-eus": "$t(curiosity-graph.legendTooltip_Sockets_virtual_RHEL)",
"legendTooltip_Sockets_virtual_rhel-for-sap-x86": "$t(curiosity-graph.legendTooltip_Sockets_virtual_RHEL)",
"legendTooltip_Storage-gibibytes": "Data storage usage",
"legendTooltip_Storage-gibibyte-months": "Data storage usage",
Expand All @@ -153,6 +156,7 @@
"legendTooltip_threshold_Sockets_RHEL for IBM Power": "$t(curiosity-graph.legendTooltip_threshold_Sockets_RHEL)",
"legendTooltip_threshold_Sockets_RHEL for IBM z": "$t(curiosity-graph.legendTooltip_threshold_Sockets_RHEL)",
"legendTooltip_threshold_Sockets_RHEL for x86": "$t(curiosity-graph.legendTooltip_threshold_Sockets_RHEL)",
"legendTooltip_threshold_Sockets_rhel-for-x86-eus": "$t(curiosity-graph.legendTooltip_threshold_Sockets_RHEL)",
"legendTooltip_threshold_Sockets_rhel-for-sap-x86": "$t(curiosity-graph.legendTooltip_threshold_Sockets_RHEL)",
"legendTooltip_Transfer-gibibytes": "Data transfer usage",
"tooltipSummary": "Your subscription data facets. With one level of column and row headers."
Expand All @@ -167,6 +171,7 @@
"tabInstances_RHEL for IBM Power": "$t(curiosity-inventory.tabInstances_RHEL)",
"tabInstances_RHEL for IBM z": "$t(curiosity-inventory.tabInstances_RHEL)",
"tabInstances_RHEL for x86": "$t(curiosity-inventory.tabInstances_RHEL)",
"tabInstances_rhel-for-x86-eus": "$t(curiosity-inventory.tabInstances_RHEL)",
"tabInstances_rhel-for-sap-x86": "$t(curiosity-inventory.tabInstances_RHEL)",
"tabInstances_OpenShift Container Platform": "$t(curiosity-inventory.tabInstances_RHEL)",
"tabInstances_Satellite": "$t(curiosity-inventory.tabInstances_RHEL)",
Expand Down Expand Up @@ -307,6 +312,7 @@
"label_groupVariant_RHEL for IBM Power": "RHEL for IBM Power",
"label_groupVariant_RHEL for IBM z": "RHEL for IBM z",
"label_groupVariant_RHEL for x86": "RHEL for x86",
"label_groupVariant_rhel-for-x86-eus": "RHEL for x86 EUS",
"label_groupVariant_rhel-for-sap-x86": "RHEL for SAP x86",
"label_groupVariant_rosa": "ROSA Hosted Control Planes",
"label_groupVariant_Satellite Capsule": "Satellite Capsule",
Expand Down Expand Up @@ -410,6 +416,9 @@
"title_RHEL for x86": "$t(curiosity-view.title_RHEL)",
"subtitle_RHEL for x86": "$t(curiosity-view.title_RHEL)",
"description_RHEL for x86": "$t(curiosity-view.description_RHEL)",
"title_rhel-for-x86-eus": "$t(curiosity-view.title_RHEL)",
"subtitle_rhel-for-x86-eus": "$t(curiosity-view.title_RHEL)",
"description_rhel-for-x86-eus": "$t(curiosity-view.description_RHEL)",
"title_rhel-for-sap-x86": "$t(curiosity-view.title_RHEL)",
"subtitle_rhel-for-sap-x86": "$t(curiosity-view.title_RHEL)",
"description_rhel-for-sap-x86": "$t(curiosity-view.description_RHEL)",
Expand Down
8 changes: 8 additions & 0 deletions src/services/rhsm/__tests__/__snapshots__/rhsmConstants.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ exports[`RHSM Constants should have specific properties: all exported constants
"RHEL_IBM_Z": "RHEL for IBM z",
"RHEL_WORKSTATION": "RHEL Workstation",
"RHEL_X86": "RHEL for x86",
"RHEL_X86_EUS": "rhel-for-x86-eus",
"RHEL_X86_SAP": "rhel-for-sap-x86",
"RHODS": "rhods",
"ROSA": "rosa",
Expand All @@ -33,6 +34,7 @@ exports[`RHSM Constants should have specific properties: all exported constants
"RHEL_IBM_POWER": "RHEL for IBM Power",
"RHEL_IBM_Z": "RHEL for IBM z",
"RHEL_X86": "RHEL for x86",
"RHEL_X86_EUS": "rhel-for-x86-eus",
"RHEL_X86_SAP": "rhel-for-sap-x86",
},
"RHSM_API_PATH_PRODUCT_VARIANT_SATELLITE_TYPES": {
Expand Down Expand Up @@ -278,6 +280,7 @@ exports[`RHSM Constants should have specific properties: all exported constants
"RHEL_IBM_Z": "RHEL for IBM z",
"RHEL_WORKSTATION": "RHEL Workstation",
"RHEL_X86": "RHEL for x86",
"RHEL_X86_EUS": "rhel-for-x86-eus",
"RHEL_X86_SAP": "rhel-for-sap-x86",
"RHODS": "rhods",
"ROSA": "rosa",
Expand All @@ -289,6 +292,7 @@ exports[`RHSM Constants should have specific properties: all exported constants
"RHEL_IBM_POWER": "RHEL for IBM Power",
"RHEL_IBM_Z": "RHEL for IBM z",
"RHEL_X86": "RHEL for x86",
"RHEL_X86_EUS": "rhel-for-x86-eus",
"RHEL_X86_SAP": "rhel-for-sap-x86",
},
"RHSM_API_PATH_PRODUCT_VARIANT_SATELLITE_TYPES": {
Expand Down Expand Up @@ -535,6 +539,7 @@ exports[`RHSM Constants should have specific properties: all exported constants
"RHEL_IBM_Z": "RHEL for IBM z",
"RHEL_WORKSTATION": "RHEL Workstation",
"RHEL_X86": "RHEL for x86",
"RHEL_X86_EUS": "rhel-for-x86-eus",
"RHEL_X86_SAP": "rhel-for-sap-x86",
"RHODS": "rhods",
"ROSA": "rosa",
Expand All @@ -546,6 +551,7 @@ exports[`RHSM Constants should have specific properties: all exported constants
"RHEL_IBM_POWER": "RHEL for IBM Power",
"RHEL_IBM_Z": "RHEL for IBM z",
"RHEL_X86": "RHEL for x86",
"RHEL_X86_EUS": "rhel-for-x86-eus",
"RHEL_X86_SAP": "rhel-for-sap-x86",
},
"RHSM_API_PATH_PRODUCT_VARIANT_SATELLITE_TYPES": {
Expand Down Expand Up @@ -796,6 +802,7 @@ exports[`RHSM Constants should have specific properties: specific constants 1`]
"RHEL_IBM_Z": "RHEL for IBM z",
"RHEL_WORKSTATION": "RHEL Workstation",
"RHEL_X86": "RHEL for x86",
"RHEL_X86_EUS": "rhel-for-x86-eus",
"RHEL_X86_SAP": "rhel-for-sap-x86",
"RHODS": "rhods",
"ROSA": "rosa",
Expand All @@ -807,6 +814,7 @@ exports[`RHSM Constants should have specific properties: specific constants 1`]
"RHEL_IBM_POWER": "RHEL for IBM Power",
"RHEL_IBM_Z": "RHEL for IBM z",
"RHEL_X86": "RHEL for x86",
"RHEL_X86_EUS": "rhel-for-x86-eus",
"RHEL_X86_SAP": "rhel-for-sap-x86",
},
"RHSM_API_PATH_PRODUCT_VARIANT_SATELLITE_TYPES": {
Expand Down
33 changes: 18 additions & 15 deletions src/services/rhsm/rhsmConstants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
/**
* RHSM path IDs for product RHEL variants.
*
* @type {{RHEL_ARM: string, RHEL_X86_SAP: string, RHEL_IBM_Z: string, RHEL_IBM_POWER: string, RHEL_X86: string}}
* @type {{RHEL_ARM: string, RHEL_X86_SAP: string, RHEL_IBM_Z: string, RHEL_IBM_POWER: string, RHEL_X86: string,
* RHEL_X86_EUS: string}}
*/
const RHSM_API_PATH_PRODUCT_VARIANT_RHEL_TYPES = {
RHEL_ARM: 'RHEL for ARM',
RHEL_IBM_POWER: 'RHEL for IBM Power',
RHEL_IBM_Z: 'RHEL for IBM z',
RHEL_X86: 'RHEL for x86',
RHEL_X86_EUS: 'rhel-for-x86-eus',
RHEL_X86_SAP: 'rhel-for-sap-x86'
};

Expand Down Expand Up @@ -235,7 +237,7 @@
const RHSM_API_RESPONSE_BILLING_PROVIDER_TYPES = {
RED_HAT: 'red hat',
AWS: 'aws'
// GCP: 'gcp',

Check warning on line 240 in src/services/rhsm/rhsmConstants.js

View workflow job for this annotation

GitHub Actions / Integration-checks (18.x) 

Expected a block comment instead of consecutive line comments

Check warning on line 240 in src/services/rhsm/rhsmConstants.js

View workflow job for this annotation

GitHub Actions / Integration-checks (20.x) 

Expected a block comment instead of consecutive line comments
// AZURE: 'azure',
// ORACLE: 'oracle',
// NONE: ''
Expand Down Expand Up @@ -438,20 +440,21 @@
* {GENERIC: string, OPTIN: string}, RHSM_API_QUERY_GRANULARITY_TYPES: {WEEKLY: string, QUARTERLY: string, DAILY:
* string, MONTHLY: string}, RHSM_API_RESPONSE_UOM_TYPES: {CORES: string, SOCKETS: string},
* RHSM_API_PATH_PRODUCT_VARIANT_RHEL_TYPES: {RHEL_ARM: string, RHEL_X86_SAP: string, RHEL_IBM_Z: string,
* RHEL_IBM_POWER: string, RHEL_X86: string}, RHSM_API_RESPONSE_SUBSCRIPTIONS_DATA_TYPES: {BILLING_ACCOUNT_ID:
* string, QUANTITY: string, SUBSCRIPTION_MANAGER_ID: string, INVENTORY_ID: string, NUMBER_OF_GUESTS: string,
* HAS_INFINITE_QUANTITY: string, TOTAL_CAPACITY: string, PRODUCT_NAME: string, SERVICE_LEVEL: string,
* DISPLAY_NAME: string, MEASUREMENTS: string, UOM: string, CATEGORY: string, NEXT_EVENT_DATE: string,
* BILLING_PROVIDER: string, LAST_SEEN: string}, RHSM_API_QUERY_INVENTORY_SORT_DIRECTION_TYPES: {ASCENDING: string,
* DESCENDING: string}, RHSM_API_RESPONSE_SUBSCRIPTION_TYPES: {ANNUAL: string, ON_DEMAND: string},
* RHSM_API_QUERY_INVENTORY_SORT_TYPES: {CORES: string, STORAGE_GIBIBYTES: string, CATEGORY: string, SOCKETS:
* string, INSTANCE_HOURS: string, NUMBER_OF_GUESTS: string, TRANSFER_GIBIBYTES: string, BILLING_PROVIDER: string,
* CORE_SECONDS: string, STORAGE_GIBIBYTE_MONTHS: string, LAST_SEEN: string, NAME: string},
* RHSM_API_PATH_PRODUCT_TYPES: {RHEL_ARM: string, OPENSHIFT_METRICS: string, RHEL_WORKSTATION: string, RHODS:
* string, ROSA: string, RHEL_X86: string, RHEL_COMPUTE_NODE: string, OPENSHIFT: string, SATELLITE_SERVER: string,
* OPENSHIFT_DEDICATED_METRICS: string, SATELLITE_CAPSULE: string, RHEL_IBM_Z: string, RHEL_IBM_POWER: string,
* RHACS: string}, RHSM_API_RESPONSE_BILLING_PROVIDER_TYPES: {AZURE: string, GCP: string, RED_HAT: string, NONE:
* string, AWS: string, ORACLE: string}, RHSM_API_RESPONSE_ERRORS_TYPES: {CODE: string},
* RHEL_IBM_POWER: string, RHEL_X86: string, RHEL_X86_EUS: string}, RHSM_API_RESPONSE_SUBSCRIPTIONS_DATA_TYPES:
* {BILLING_ACCOUNT_ID: string, QUANTITY: string, SUBSCRIPTION_MANAGER_ID: string, INVENTORY_ID: string,
* NUMBER_OF_GUESTS: string, HAS_INFINITE_QUANTITY: string, TOTAL_CAPACITY: string, PRODUCT_NAME: string,
* SERVICE_LEVEL: string, DISPLAY_NAME: string, MEASUREMENTS: string, UOM: string, CATEGORY: string,
* NEXT_EVENT_DATE: string, BILLING_PROVIDER: string, LAST_SEEN: string},
* RHSM_API_QUERY_INVENTORY_SORT_DIRECTION_TYPES: {ASCENDING: string, DESCENDING: string},
* RHSM_API_RESPONSE_SUBSCRIPTION_TYPES: {ANNUAL: string, ON_DEMAND: string}, RHSM_API_QUERY_INVENTORY_SORT_TYPES:
* {CORES: string, STORAGE_GIBIBYTES: string, CATEGORY: string, SOCKETS: string, INSTANCE_HOURS: string,
* NUMBER_OF_GUESTS: string, TRANSFER_GIBIBYTES: string, BILLING_PROVIDER: string, CORE_SECONDS: string,
* STORAGE_GIBIBYTE_MONTHS: string, LAST_SEEN: string, NAME: string}, RHSM_API_PATH_PRODUCT_TYPES: {RHEL_ARM:
* string, OPENSHIFT_METRICS: string, RHEL_WORKSTATION: string, RHODS: string, ROSA: string, RHEL_X86: string,
* RHEL_COMPUTE_NODE: string, OPENSHIFT: string, SATELLITE_SERVER: string, OPENSHIFT_DEDICATED_METRICS: string,
* SATELLITE_CAPSULE: string, RHEL_IBM_Z: string, RHEL_IBM_POWER: string, RHACS: string},
* RHSM_API_RESPONSE_BILLING_PROVIDER_TYPES: {AZURE: string, GCP: string, RED_HAT: string, NONE: string, AWS:
* string, ORACLE: string}, RHSM_API_RESPONSE_ERRORS_TYPES: {CODE: string},
* RHSM_API_RESPONSE_TALLY_CAPACITY_DATA_TYPES: {DATE: string, HAS_DATA: string, VALUE: string,
* HAS_INFINITE_QUANTITY: string}, RHSM_API_RESPONSE_TALLY_CAPACITY_META_TYPES: {TOTAL_MONTHLY: string, DATE:
* string, PRODUCT: string, HAS_CLOUDIGRADE_DATA: string, HAS_CLOUDIGRADE_MISMATCH: string, HAS_DATA: string,
Expand Down
13 changes: 13 additions & 0 deletions tests/__snapshots__/dist.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ exports[`Build distribution should have a predictable ephemeral navigation based
"RHEL for IBM Power",
"RHEL for IBM z",
"RHEL for x86",
"rhel-for-x86-eus",
"rhel-for-sap-x86",
"Satellite Capsule",
"Satellite Server",
Expand All @@ -233,6 +234,7 @@ exports[`Build distribution should have a predictable ephemeral navigation based
"RHEL for IBM Power",
"RHEL for IBM z",
"RHEL for x86",
"rhel-for-x86-eus",
"rhel-for-sap-x86",
"Satellite Capsule",
"Satellite Server",
Expand All @@ -253,6 +255,7 @@ exports[`Build distribution should have a predictable ephemeral navigation based
"RHEL for IBM Power",
"RHEL for IBM z",
"RHEL for x86",
"rhel-for-x86-eus",
"rhel-for-sap-x86",
"Satellite Capsule",
"Satellite Server",
Expand All @@ -273,6 +276,7 @@ exports[`Build distribution should have a predictable ephemeral navigation based
"RHEL for IBM Power",
"RHEL for IBM z",
"RHEL for x86",
"rhel-for-x86-eus",
"rhel-for-sap-x86",
"Satellite Capsule",
"Satellite Server",
Expand All @@ -293,6 +297,7 @@ exports[`Build distribution should have a predictable ephemeral navigation based
"RHEL for IBM Power",
"RHEL for IBM z",
"RHEL for x86",
"rhel-for-x86-eus",
"rhel-for-sap-x86",
"Satellite Capsule",
"Satellite Server",
Expand All @@ -313,6 +318,7 @@ exports[`Build distribution should have a predictable ephemeral navigation based
"RHEL for IBM Power",
"RHEL for IBM z",
"RHEL for x86",
"rhel-for-x86-eus",
"rhel-for-sap-x86",
"Satellite Capsule",
"Satellite Server",
Expand All @@ -333,6 +339,7 @@ exports[`Build distribution should have a predictable ephemeral navigation based
"RHEL for IBM Power",
"RHEL for IBM z",
"RHEL for x86",
"rhel-for-x86-eus",
"rhel-for-sap-x86",
"Satellite Capsule",
"Satellite Server",
Expand All @@ -353,6 +360,7 @@ exports[`Build distribution should have a predictable ephemeral navigation based
"RHEL for IBM Power",
"RHEL for IBM z",
"RHEL for x86",
"rhel-for-x86-eus",
"rhel-for-sap-x86",
"Satellite Capsule",
"Satellite Server",
Expand All @@ -373,6 +381,7 @@ exports[`Build distribution should have a predictable ephemeral navigation based
"RHEL for IBM Power",
"RHEL for IBM z",
"RHEL for x86",
"rhel-for-x86-eus",
"rhel-for-sap-x86",
"Satellite Capsule",
"Satellite Server",
Expand All @@ -393,6 +402,7 @@ exports[`Build distribution should have a predictable ephemeral navigation based
"RHEL for IBM Power",
"RHEL for IBM z",
"RHEL for x86",
"rhel-for-x86-eus",
"rhel-for-sap-x86",
"Satellite Capsule",
"Satellite Server",
Expand All @@ -413,6 +423,7 @@ exports[`Build distribution should have a predictable ephemeral navigation based
"RHEL for IBM Power",
"RHEL for IBM z",
"RHEL for x86",
"rhel-for-x86-eus",
"rhel-for-sap-x86",
"Satellite Capsule",
"Satellite Server",
Expand Down Expand Up @@ -504,6 +515,7 @@ exports[`Build distribution should have a predictable ephemeral navigation based
"RHEL for IBM Power",
"RHEL for IBM z",
"RHEL for x86",
"rhel-for-x86-eus",
"rhel-for-sap-x86",
"Satellite Capsule",
"Satellite Server",
Expand Down Expand Up @@ -559,6 +571,7 @@ exports[`Build distribution should have a predictable ephemeral navigation based
"RHEL for IBM Power",
"RHEL for IBM z",
"RHEL for x86",
"rhel-for-x86-eus",
"rhel-for-sap-x86",
"Satellite Capsule",
"Satellite Server",
Expand Down