luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Only count the scheduled allocs on the topo viz node stats bar

Browse source
This commit is contained in:
Michael Lange 2021-01-25 11:29:01 -08:00
parent 5859ecd806
commit 93195f8e12
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ui/app/components/topo-viz/node.js
View file

@ -51,7 +51,7 @@ export default class TopoVizNode extends Component {
} }
get count() { get count() {
return this.args.node.allocations.length; return this.allocations.length;
} }
get allocations() { get allocations() {

29
ui/tests/integration/components/topo-viz/node-test.js
View file

@ -23,15 +23,15 @@ const nodeGen = (name, datacenter, memory, cpu, flags = {}) => ({
}, },
}); });
const allocGen = (node, memory, cpu, isSelected) => ({ const allocGen = (node, memory, cpu, isScheduled = true) => ({
memory, memory,
cpu, cpu,
isSelected, isSelected: false,
memoryPercent: memory / node.memory, memoryPercent: memory / node.memory,
cpuPercent: cpu / node.cpu, cpuPercent: cpu / node.cpu,
allocation: { allocation: {
id: faker.random.uuid(), id: faker.random.uuid(),
isScheduled: true, isScheduled,
}, },
}); });
@ -66,7 +66,11 @@ module('Integration | Component | TopoViz::Node', function(hooks) {
props({ props({
node: { node: {
...node, ...node,
allocations: [allocGen(node, 100, 100), allocGen(node, 250, 250)], allocations: [
allocGen(node, 100, 100),
allocGen(node, 250, 250),
allocGen(node, 300, 300, false),
],
}, },
}) })
); );
@ -74,7 +78,10 @@ module('Integration | Component | TopoViz::Node', function(hooks) {
await this.render(commonTemplate); await this.render(commonTemplate);
assert.ok(TopoVizNode.isPresent); assert.ok(TopoVizNode.isPresent);
assert.ok(TopoVizNode.memoryRects.length); assert.equal(
TopoVizNode.memoryRects.length,
this.node.allocations.filterBy('allocation.isScheduled').length
);
assert.ok(TopoVizNode.cpuRects.length); assert.ok(TopoVizNode.cpuRects.length);
await componentA11yAudit(this.element, assert); await componentA11yAudit(this.element, assert);
@ -86,7 +93,11 @@ module('Integration | Component | TopoViz::Node', function(hooks) {
props({ props({
node: { node: {
...node, ...node,
allocations: [allocGen(node, 100, 100), allocGen(node, 250, 250)], allocations: [
allocGen(node, 100, 100),
allocGen(node, 250, 250),
allocGen(node, 300, 300, false),
],
}, },
}) })
); );
@ -94,7 +105,11 @@ module('Integration | Component | TopoViz::Node', function(hooks) {
await this.render(commonTemplate); await this.render(commonTemplate);
assert.ok(TopoVizNode.label.includes(node.node.name)); 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.allocations.filterBy('allocation.isScheduled').length} Allocs`
)
);
assert.ok(TopoVizNode.label.includes(`${this.node.memory} MiB`)); 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`));
}); });