diff --git a/ui/app/templates/components/primary-metric.hbs b/ui/app/templates/components/primary-metric.hbs index 81950e698..56aba2d74 100644 --- a/ui/app/templates/components/primary-metric.hbs +++ b/ui/app/templates/components/primary-metric.hbs @@ -19,7 +19,7 @@
{{#if (eq this.metric "cpu")}} - {{this.data.lastObject.used}} Mhz / {{this.reservedAmount}} Mhz reserved + {{this.data.lastObject.used}} MHz / {{this.reservedAmount}} MHz reserved {{else if (eq this.metric "memory")}} {{format-bytes this.data.lastObject.used}} / {{this.reservedAmount}} MiB reserved {{else}} diff --git a/ui/app/templates/components/topo-viz/datacenter.hbs b/ui/app/templates/components/topo-viz/datacenter.hbs index 582565d04..cf589c216 100644 --- a/ui/app/templates/components/topo-viz/datacenter.hbs +++ b/ui/app/templates/components/topo-viz/datacenter.hbs @@ -4,7 +4,7 @@ {{this.scheduledAllocations.length}} Allocs {{@datacenter.nodes.length}} Nodes {{this.aggregatedAllocationResources.memory}}/{{this.aggregatedNodeResources.memory}} MiB, - {{this.aggregatedAllocationResources.cpu}}/{{this.aggregatedNodeResources.cpu}} Mhz + {{this.aggregatedAllocationResources.cpu}}/{{this.aggregatedNodeResources.cpu}} MHz
diff --git a/ui/app/templates/components/topo-viz/node.hbs b/ui/app/templates/components/topo-viz/node.hbs index f3f7e43ad..409466caa 100644 --- a/ui/app/templates/components/topo-viz/node.hbs +++ b/ui/app/templates/components/topo-viz/node.hbs @@ -8,7 +8,7 @@ {{/if}} {{@node.node.name}} {{this.count}} Allocs - {{@node.memory}} MiB, {{@node.cpu}} Mhz + {{@node.memory}} MiB, {{@node.cpu}} MHz

{{/unless}}
-

{{this.nodeUtilization.totalCPU}} Mhz of CPU

+

{{this.nodeUtilization.totalCPU}} MHz of CPU

@@ -128,7 +128,7 @@
- {{this.nodeUtilization.totalReservedCPU}} Mhz / {{this.nodeUtilization.totalCPU}} Mhz reserved + {{this.nodeUtilization.totalReservedCPU}} MHz / {{this.nodeUtilization.totalCPU}} MHz reserved
{{/let}} @@ -201,7 +201,7 @@
-

{{this.totalCPU}} Mhz of CPU

+

{{this.totalCPU}} MHz of CPU

@@ -218,7 +218,7 @@
- {{this.totalReservedCPU}} Mhz / {{this.totalCPU}} Mhz reserved + {{this.totalReservedCPU}} MHz / {{this.totalCPU}} MHz reserved
{{/if}} diff --git a/ui/mirage/factories/job.js b/ui/mirage/factories/job.js index a15d99ce6..e7940461b 100644 --- a/ui/mirage/factories/job.js +++ b/ui/mirage/factories/job.js @@ -25,7 +25,7 @@ export default Factory.extend({ // When provided, the resourceSpec will inform how many task groups to create // and how much of each resource that task group reserves. // - // One task group, 256 MiB memory and 500 Mhz cpu + // One task group, 256 MiB memory and 500 MHz cpu // resourceSpec: ['M: 256, C: 500'] // // Two task groups diff --git a/ui/tests/integration/components/topo-viz/datacenter-test.js b/ui/tests/integration/components/topo-viz/datacenter-test.js index c505de8d4..52da79c89 100644 --- a/ui/tests/integration/components/topo-viz/datacenter-test.js +++ b/ui/tests/integration/components/topo-viz/datacenter-test.js @@ -108,7 +108,7 @@ module('Integration | Component | TopoViz::Datacenter', function(hooks) { assert.ok(TopoVizDatacenter.label.includes(`${this.datacenter.nodes.length} Nodes`)); assert.ok(TopoVizDatacenter.label.includes(`${allocs.length} Allocs`)); assert.ok(TopoVizDatacenter.label.includes(`${memoryReserved}/${memoryTotal} MiB`)); - assert.ok(TopoVizDatacenter.label.includes(`${cpuReserved}/${cpuTotal} Mhz`)); + assert.ok(TopoVizDatacenter.label.includes(`${cpuReserved}/${cpuTotal} MHz`)); }); test('when @isSingleColumn is true, the FlexMasonry layout gets one column, otherwise it gets two', async function(assert) { diff --git a/ui/tests/integration/components/topo-viz/node-test.js b/ui/tests/integration/components/topo-viz/node-test.js index a249074d5..c3ffe6675 100644 --- a/ui/tests/integration/components/topo-viz/node-test.js +++ b/ui/tests/integration/components/topo-viz/node-test.js @@ -96,7 +96,7 @@ module('Integration | Component | TopoViz::Node', function(hooks) { assert.ok(TopoVizNode.label.includes(node.node.name)); assert.ok(TopoVizNode.label.includes(`${this.node.allocations.length} Allocs`)); assert.ok(TopoVizNode.label.includes(`${this.node.memory} MiB`)); - assert.ok(TopoVizNode.label.includes(`${this.node.cpu} Mhz`)); + assert.ok(TopoVizNode.label.includes(`${this.node.cpu} MHz`)); }); test('the status icon indicates when the node is draining', async function(assert) {