Skip to content

Commit

Permalink
fix(graphCardSelectors): ent-3809 schema check for core hours (#628)
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdcabrera
cdcabrera committed Apr 22, 2021
1 parent bf4cbe3 commit a8a567b
Show file tree
Hide file tree
Showing 3 changed files with 131 additions and 27 deletions.
102 changes: 102 additions & 0 deletions src/redux/selectors/__tests__/__snapshots__/graphCardSelectors.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,32 @@ Object {
"y": 0,
},
],
"coreHours": Array [
Object {
"date": 2019-09-04T00:00:00.000Z,
"hasCloudigradeData": true,
"hasCloudigradeMismatch": true,
"hasData": true,
"x": 0,
"y": 0,
},
Object {
"date": 2019-09-05T00:00:00.000Z,
"hasCloudigradeData": true,
"hasCloudigradeMismatch": true,
"hasData": true,
"x": 1,
"y": 0,
},
Object {
"date": 2019-09-06T00:00:00.000Z,
"hasCloudigradeData": true,
"hasCloudigradeMismatch": true,
"hasData": true,
"x": 2,
"y": 0,
},
],
"cores": Array [
Object {
"date": 2019-09-04T00:00:00.000Z,
Expand Down Expand Up @@ -511,6 +537,16 @@ Object {
"y": 0,
},
],
"coreHours": Array [
Object {
"date": 2018-07-04T00:00:00.000Z,
"hasCloudigradeData": true,
"hasCloudigradeMismatch": true,
"hasData": true,
"x": 0,
"y": 0,
},
],
"cores": Array [
Object {
"date": 2018-07-04T00:00:00.000Z,
Expand Down Expand Up @@ -687,6 +723,16 @@ Object {
"y": 0,
},
],
"coreHours": Array [
Object {
"date": 2019-09-04T00:00:00.000Z,
"hasCloudigradeData": true,
"hasCloudigradeMismatch": true,
"hasData": true,
"x": 0,
"y": 0,
},
],
"cores": Array [
Object {
"date": 2019-09-04T00:00:00.000Z,
Expand Down Expand Up @@ -863,6 +909,16 @@ Object {
"y": 0,
},
],
"coreHours": Array [
Object {
"date": 2019-09-04T00:00:00.000Z,
"hasCloudigradeData": true,
"hasCloudigradeMismatch": true,
"hasData": true,
"x": 0,
"y": 0,
},
],
"cores": Array [
Object {
"date": 2019-09-04T00:00:00.000Z,
Expand Down Expand Up @@ -1039,6 +1095,16 @@ Object {
"y": 0,
},
],
"coreHours": Array [
Object {
"date": 2018-07-04T00:00:00.000Z,
"hasCloudigradeData": true,
"hasCloudigradeMismatch": true,
"hasData": true,
"x": 0,
"y": 0,
},
],
"cores": Array [
Object {
"date": 2018-07-04T00:00:00.000Z,
Expand Down Expand Up @@ -1263,6 +1329,32 @@ Object {
"y": 0,
},
],
"coreHours": Array [
Object {
"date": 2019-09-04T00:00:00.000Z,
"hasCloudigradeData": undefined,
"hasCloudigradeMismatch": undefined,
"hasData": undefined,
"x": 0,
"y": 0,
},
Object {
"date": 2019-09-05T00:00:00.000Z,
"hasCloudigradeData": undefined,
"hasCloudigradeMismatch": undefined,
"hasData": undefined,
"x": 1,
"y": 0,
},
Object {
"date": 2019-09-06T00:00:00.000Z,
"hasCloudigradeData": undefined,
"hasCloudigradeMismatch": undefined,
"hasData": undefined,
"x": 2,
"y": 0,
},
],
"cores": Array [
Object {
"date": 2019-09-04T00:00:00.000Z,
Expand Down Expand Up @@ -1741,6 +1833,16 @@ Object {
"y": 0,
},
],
"coreHours": Array [
Object {
"date": 2019-09-04T00:00:00.000Z,
"hasCloudigradeData": undefined,
"hasCloudigradeMismatch": undefined,
"hasData": undefined,
"x": 0,
"y": 0,
},
],
"cores": Array [
Object {
"date": 2019-09-04T00:00:00.000Z,
Expand Down
4 changes: 4 additions & 0 deletions src/types/__tests__/__snapshots__/index.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ Object {
"CLOUD_INSTANCES": "cloud_instance_count",
"CLOUD_SOCKETS": "cloud_sockets",
"CORES": "cores",
"CORE_HOURS": "core_hours",
"DATE": "date",
"HAS_CLOUDIGRADE_DATA": "has_cloudigrade_data",
"HAS_CLOUDIGRADE_MISMATCH": "has_cloudigrade_mismatch",
Expand Down Expand Up @@ -464,6 +465,7 @@ Object {
"CLOUD_INSTANCES": "cloud_instance_count",
"CLOUD_SOCKETS": "cloud_sockets",
"CORES": "cores",
"CORE_HOURS": "core_hours",
"DATE": "date",
"HAS_CLOUDIGRADE_DATA": "has_cloudigrade_data",
"HAS_CLOUDIGRADE_MISMATCH": "has_cloudigrade_mismatch",
Expand Down Expand Up @@ -700,6 +702,7 @@ Object {
"CLOUD_INSTANCES": "cloud_instance_count",
"CLOUD_SOCKETS": "cloud_sockets",
"CORES": "cores",
"CORE_HOURS": "core_hours",
"DATE": "date",
"HAS_CLOUDIGRADE_DATA": "has_cloudigrade_data",
"HAS_CLOUDIGRADE_MISMATCH": "has_cloudigrade_mismatch",
Expand Down Expand Up @@ -940,6 +943,7 @@ Object {
"CLOUD_INSTANCES": "cloud_instance_count",
"CLOUD_SOCKETS": "cloud_sockets",
"CORES": "cores",
"CORE_HOURS": "core_hours",
"DATE": "date",
"HAS_CLOUDIGRADE_DATA": "has_cloudigrade_data",
"HAS_CLOUDIGRADE_MISMATCH": "has_cloudigrade_mismatch",
Expand Down
52 changes: 25 additions & 27 deletions src/types/rhsmApiTypes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,14 @@ const RHSM_API_RESPONSE_PRODUCTS_DATA = 'data';
* Schema/map of expected Reporting/Tally DATA response properties.
*
* @type {{HYPERVISOR_SOCKETS: string, CORES: string, SOCKETS: string, CLOUD_CORES: string, HAS_DATA: string,
* PHYSICAL_SOCKETS: string, PHYSICAL_CORES: string, CLOUD_INSTANCES: string, DATE: string, CLOUD_SOCKETS: string,
* HAS_CLOUDIGRADE_DATA: string, HAS_CLOUDIGRADE_MISMATCH: string, HYPERVISOR_CORES: string}}
* PHYSICAL_SOCKETS: string, PHYSICAL_CORES: string, CLOUD_INSTANCES: string, DATE: string, CORE_HOURS: string,
* CLOUD_SOCKETS: string, HAS_CLOUDIGRADE_DATA: string, HAS_CLOUDIGRADE_MISMATCH: string, HYPERVISOR_CORES: string}}
*/
const RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES = {
CLOUD_CORES: 'cloud_cores',
CLOUD_INSTANCES: 'cloud_instance_count',
CLOUD_SOCKETS: 'cloud_sockets',
CORE_HOURS: 'core_hours',
CORES: 'cores',
DATE: 'date',
HYPERVISOR_CORES: 'hypervisor_cores',
Expand Down Expand Up @@ -388,41 +389,38 @@ const RHSM_API_QUERY_TYPES = {
* @type {{RHSM_API_QUERY_SET_INVENTORY_SUBSCRIPTIONS_TYPES: {UOM: string, USAGE: string, DIRECTION: string, SORT: string,
* OFFSET: string, SLA: string, LIMIT: string}, RHSM_API_RESPONSE_INVENTORY_SUBSCRIPTIONS_DATA_TYPES: {UOM: string,
* PHYSICAL_CAPACITY: string, USAGE: string, UPCOMING_EVENT_TYPE: string, UPCOMING_EVENT_DATE: string,
* SUBSCRIPTION_NUMBERS: string, VIRTUAL_CAPACITY: string, TOTAL_CAPACITY: string, SKU: string,
* SERVICE_LEVEL: string}, RHSM_API_RESPONSE_ERROR_DATA_CODE_TYPES: {GENERIC: string, OPTIN: string},
* RHSM_API_RESPONSE_INVENTORY_DATA: string, RHSM_API_RESPONSE_CAPACITY_DATA: string,
* RHSM_API_RESPONSE_ERROR_DATA_TYPES: {CODE: string, DETAIL: string},
* SUBSCRIPTION_NUMBERS: string, VIRTUAL_CAPACITY: string, TOTAL_CAPACITY: string, SKU: string, SERVICE_LEVEL: string},
* RHSM_API_RESPONSE_ERROR_DATA_CODE_TYPES: {GENERIC: string, OPTIN: string}, RHSM_API_RESPONSE_INVENTORY_DATA: string,
* RHSM_API_RESPONSE_CAPACITY_DATA: string, RHSM_API_RESPONSE_ERROR_DATA_TYPES: {CODE: string, DETAIL: string},
* RHSM_API_RESPONSE_CAPACITY_DATA_TYPES: {HYPERVISOR_SOCKETS: string, CORES: string, DATE: string, SOCKETS: string,
* PHYSICAL_SOCKETS: string, HYPERVISOR_CORES: string, HAS_INFINITE: string, PHYSICAL_CORES: string},
* RHSM_API_QUERY_SUBSCRIPTIONS_SORT_TYPES: {UOM: string, PHYSICAL_CAPACITY: string, USAGE: string,
* UPCOMING_EVENT_DATE: string, VIRTUAL_CAPACITY: string, TOTAL_CAPACITY: string, SKU: string, PRODUCT_NAME: string,
* SERVICE_LEVEL: string}, RHSM_API_RESPONSE_META_TYPES: string, RHSM_API_QUERY_GRANULARITY_TYPES: {WEEKLY: string,
* QUARTERLY: string, DAILY: string, MONTHLY: string}, RHSM_API_QUERY_SORT_DIRECTION_TYPES: {ASCENDING: string,
* DESCENDING: string}, RHSM_API_RESPONSE_PRODUCTS_DATA: string, RHSM_API_QUERY_TYPES: {GRANULARITY: string,
* TALLY_SYNC: string, DIRECTION: string, END_DATE: string, SLA: string, START_DATE: string, LIMIT: string,
* UOM: string, TALLY_REPORT: string, USAGE: string, SORT: string, OFFSET: string, CONDUIT_SYNC: string},
* TALLY_SYNC: string, DIRECTION: string, END_DATE: string, SLA: string, START_DATE: string, LIMIT: string, UOM: string,
* TALLY_REPORT: string, USAGE: string, SORT: string, OFFSET: string, CONDUIT_SYNC: string},
* RHSM_API_RESPONSE_LINKS: string, RHSM_API_QUERY_SET_INVENTORY_GUESTS_TYPES: {OFFSET: string, LIMIT: string},
* RHSM_API_PATH_ID_TYPES: {RHEL_ARM: string, SATELLITE: string, RHEL_WORKSTATION: string, RHEL_DESKTOP: string,
* RHEL: string, SATELLITE_CAPSULE: string, RHEL_SERVER: string, RHEL_IBM_Z: string, RHEL_COMPUTE_NODE: string,
* RHEL_IBM_POWER: string, RHEL_X86: string, OPENSHIFT: string},
* RHSM_API_QUERY_SET_OPTIN_TYPES: {TALLY_SYNC: string, TALLY_REPORT: string, CONDUIT_SYNC: string},
* RHSM_API_QUERY_USAGE_TYPES: {UNSPECIFIED: string, DISASTER: string, DEVELOPMENT: string, PRODUCTION: string},
* RHSM_API_QUERY_SLA_TYPES: {PREMIUM: string, SELF: string, NONE: string, STANDARD: string},
* RHSM_API_QUERY_SET_INVENTORY_TYPES: {UOM: string, USAGE: string, DIRECTION: string, SORT: string,
* OFFSET: string, SLA: string, LIMIT: string}, RHSM_API_QUERY_SORT_TYPES: {CORES: string, HARDWARE: string,
* RHSM_API_PATH_ID_TYPES: {RHEL_ARM: string, OPENSHIFT_METRICS: string, SATELLITE: string, RHEL_WORKSTATION: string,
* RHEL_COMPUTE_NODE: string, RHEL_X86: string, OPENSHIFT: string, SATELLITE_SERVER: string,
* OPENSHIFT_DEDICATED_METRICS: string, RHEL_DESKTOP: string, RHEL: string, SATELLITE_CAPSULE: string, RHEL_SERVER: string,
* RHEL_IBM_Z: string, RHEL_IBM_POWER: string}, RHSM_API_QUERY_SET_OPTIN_TYPES: {TALLY_SYNC: string, TALLY_REPORT: string,
* CONDUIT_SYNC: string}, RHSM_API_QUERY_USAGE_TYPES: {UNSPECIFIED: string, DISASTER: string, DEVELOPMENT: string,
* PRODUCTION: string}, RHSM_API_QUERY_SLA_TYPES: {PREMIUM: string, SELF: string, NONE: string, STANDARD: string},
* RHSM_API_QUERY_SET_INVENTORY_TYPES: {UOM: string, USAGE: string, DIRECTION: string, SORT: string, OFFSET: string,
* SLA: string, LIMIT: string}, RHSM_API_QUERY_SORT_TYPES: {CORES: string, CORE_HOURS: string, HARDWARE: string,
* SOCKETS: string, MEASUREMENT: string, LAST_SEEN: string, NAME: string},
* RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES: {HYPERVISOR_SOCKETS: string, CORES: string, SOCKETS: string,
* CLOUD_CORES: string, HAS_DATA: string, PHYSICAL_SOCKETS: string, PHYSICAL_CORES: string,
* CLOUD_INSTANCES: string, DATE: string, CLOUD_SOCKETS: string, HAS_CLOUDIGRADE_DATA: string,
* HAS_CLOUDIGRADE_MISMATCH: string, HYPERVISOR_CORES: string}, RHSM_API_QUERY_UOM_TYPES: {CORES: string,
* SOCKETS: string}, RHSM_API_RESPONSE_LINKS_TYPES: string,
* RHSM_API_RESPONSE_INVENTORY_GUESTS_DATA_TYPES: {SUBSCRIPTION_ID: string, ID: string, NAME: string,
* LAST_SEEN: string}, RHSM_API_RESPONSE_ERROR_DATA: string, RHSM_API_RESPONSE_META: string,
* RHSM_API_RESPONSE_INVENTORY_DATA_TYPES: {CORES: string, HARDWARE: string, SOCKETS: string,
* SUBSCRIPTION_ID: string, INVENTORY_ID: string, MEASUREMENT: string, ID: string, GUESTS: string,
* CLOUD_PROVIDER: string, LAST_SEEN: string, NAME: string},
* RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES: {GRANULARITY: string, USAGE: string, END_DATE: string, SLA: string,
* START_DATE: string}}}
* CLOUD_CORES: string, HAS_DATA: string, PHYSICAL_SOCKETS: string, PHYSICAL_CORES: string, CLOUD_INSTANCES: string,
* DATE: string, CORE_HOURS: string, CLOUD_SOCKETS: string, HAS_CLOUDIGRADE_DATA: string, HAS_CLOUDIGRADE_MISMATCH: string,
* HYPERVISOR_CORES: string}, RHSM_API_QUERY_UOM_TYPES: {CORES: string, SOCKETS: string},
* RHSM_API_RESPONSE_LINKS_TYPES: string, RHSM_API_RESPONSE_INVENTORY_GUESTS_DATA_TYPES: {SUBSCRIPTION_ID: string, ID: string,
* NAME: string, LAST_SEEN: string}, RHSM_API_RESPONSE_ERROR_DATA: string, RHSM_API_RESPONSE_META: string,
* RHSM_API_RESPONSE_INVENTORY_DATA_TYPES: {CORES: string, CORE_HOURS: string, HARDWARE: string, SOCKETS: string,
* SUBSCRIPTION_ID: string, INVENTORY_ID: string, MEASUREMENT: string, ID: string, GUESTS: string, CLOUD_PROVIDER: string,
* LAST_SEEN: string, NAME: string}, RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES: {GRANULARITY: string, USAGE: string,
* END_DATE: string, SLA: string, START_DATE: string}}}
*/
const rhsmApiTypes = {
RHSM_API_RESPONSE_ERROR_DATA,
Expand Down

0 comments on commit a8a567b

Please sign in to comment.