Skip to content
This repository was archived by the owner on Sep 1, 2024. It is now read-only.

Commit c6c470e

Browse files
ohadkorenohadkoren
authored
Merge pull request #125 from att/throughput_cloumn
Add the new columns for `throughput` metrics
2 parents e652bf6 + 99f1c1c commit c6c470e

File tree

20 files changed

+210
-125
lines changed

20 files changed

+210
-125
lines changed

‎portal/mock-server/src/test.json

+16-8
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
"iterations": 1000,
2222
"message_size": 1024,
2323
"results": {
24-
"averageCPU": 3.5,
25-
"averageMemory": 3
24+
"average_cpu": 3.5,
25+
"average_memory": 3,
26+
"bytes_throughput": 11,
27+
"request_throughput": 21
2628
}
2729
},
2830
{
@@ -31,8 +33,10 @@
3133
"iterations": 2000,
3234
"message_size": 2048,
3335
"results": {
34-
"averageCPU": 7.0,
35-
"averageMemory": 6
36+
"average_cpu": 7.0,
37+
"average_memory": 6,
38+
"bytes_throughput": 12,
39+
"request_throughput": 24
3640
}
3741
},
3842
{
@@ -41,8 +45,10 @@
4145
"iterations": 1000,
4246
"message_size": 1024,
4347
"results": {
44-
"averageCPU": 1.7,
45-
"averageMemory": 2
48+
"average_cpu": 1.7,
49+
"average_memory": 2,
50+
"bytes_throughput": 20,
51+
"request_throughput": 30
4652
}
4753
},
4854
{
@@ -51,8 +57,10 @@
5157
"iterations": 2000,
5258
"message_size": 1024,
5359
"results": {
54-
"averageCPU": 2.6,
55-
"averageMemory": 2
60+
"average_cpu": 2.6,
61+
"average_memory": 2,
62+
"bytes_throughput": 10,
63+
"request_throughput": 20
5664
}
5765
}
5866
]

‎portal/src/app/apis.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const testSuites = 'test_suites';
2-
2+
33
export const APIS: { [key in keyof typeof API_URLS]: string } = {
44
analyze: 'analyze',
55
algorithms: 'algorithms',

‎portal/src/app/components/dashboard/components/charts/BarChart/BarChart.test.tsx

+11-11
Original file line numberDiff line numberDiff line change
@@ -13,46 +13,46 @@ const data = [
1313
"algorithm": "Algorithm1",
1414
"iterations": 1,
1515
"results": {
16-
"averageCPU": 5,
17-
"averageMemory": 512,
16+
"average_cpu": 5,
17+
"average_memory": 512,
1818
}
1919
},
2020
{
2121
"algorithm": "Algorithm1",
2222
"iterations": 133,
2323
"results": {
24-
"averageCPU": 533,
25-
"averageMemory": 512,
24+
"average_cpu": 533,
25+
"average_memory": 512,
2626
}
2727
},
2828
{
2929
"algorithm": "Algorithm1",
3030
"iterations": 1000,
3131
"results": {
32-
"averageCPU": 25,
33-
"averageMemory": 512,
32+
"average_cpu": 25,
33+
"average_memory": 512,
3434
}
3535
},
3636
{
3737
"algorithm": "Algorithm2",
3838
"iterations": 2000,
3939
"results": {
40-
"averageCPU": 28,
41-
"averageMemory": 512,
40+
"average_cpu": 28,
41+
"average_memory": 512,
4242
}
4343
},
4444
{
4545
"algorithm": "Algorithm3",
4646
"iterations": 2000,
4747
"results": {
48-
"averageCPU": 28,
49-
"averageMemory": 512,
48+
"average_cpu": 28,
49+
"average_memory": 512,
5050
}
5151
}
5252
];
5353
describe('BarChart', () => {
5454
test('renders BarChart component', () => {
55-
const { getByTestId }: RenderResult = render(<BarChart labels={['Algorithm1', 'Algorithm1']} data={data} title={'chart'} keyOfData={'averageCPU'} tooltipKeys={tooltipKeys} tooltipLabels={tooltipLabels} />);
55+
const { getByTestId }: RenderResult = render(<BarChart labels={['Algorithm1', 'Algorithm1']} data={data} title={'chart'} keyOfData={'average_cpu'} tooltipKeys={tooltipKeys} tooltipLabels={tooltipLabels} />);
5656
const chartElement: HTMLElement = getByTestId('chart');
5757
expect(chartElement).toBeTruthy();
5858
});

‎portal/src/app/components/dashboard/components/charts/LineChart/LineChart.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const mockData = {
2424

2525
describe('LineChart', () => {
2626
test('renders LineChart', () => {
27-
const { getByTestId }: RenderResult = render(<LineChart data={mockData} title='title' tooltipLabel='averageCPU' />);
27+
const { getByTestId }: RenderResult = render(<LineChart data={mockData} title='title' tooltipLabel='average_cpu' />);
2828
const chartElement: HTMLElement = getByTestId('line2');
2929
expect(chartElement).toBeTruthy();
3030
});

‎portal/src/app/components/home/components/experiment/components/__mocks__/mocks.ts

+40-22
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ export const MOCK_DATA_FOR_EXPERIMENT: ITestRunResult = {
2525
message_size: 1024,
2626
results:
2727
{
28-
averageCPU: 25.5,
29-
averageMemory: 512,
28+
average_cpu: 25.5,
29+
average_memory: 512,
30+
bytes_throughput: 11,
31+
request_throughput: 21
3032
}
3133
},
3234
{
@@ -36,8 +38,10 @@ export const MOCK_DATA_FOR_EXPERIMENT: ITestRunResult = {
3638
message_size: 1024,
3739
results:
3840
{
39-
averageCPU: 25.5,
40-
averageMemory: 512,
41+
average_cpu: 25.5,
42+
average_memory: 512,
43+
bytes_throughput: 11,
44+
request_throughput: 21
4145
}
4246
},
4347
{
@@ -47,8 +51,10 @@ export const MOCK_DATA_FOR_EXPERIMENT: ITestRunResult = {
4751
message_size: 1024,
4852
results:
4953
{
50-
averageCPU: 2,
51-
averageMemory: 52,
54+
average_cpu: 2,
55+
average_memory: 52,
56+
bytes_throughput: 11,
57+
request_throughput: 21
5258
}
5359
}
5460
]
@@ -79,8 +85,10 @@ export const MOCK_DATA_FOR_EXPERIMENT_TABLE: ExperimentTableProps = {
7985
message_size: 1024,
8086
results:
8187
{
82-
averageCPU: 25.5,
83-
averageMemory: 512,
88+
average_cpu: 25.5,
89+
average_memory: 512,
90+
bytes_throughput: 11,
91+
request_throughput: 21
8492
}
8593
},
8694
{
@@ -90,8 +98,10 @@ export const MOCK_DATA_FOR_EXPERIMENT_TABLE: ExperimentTableProps = {
9098
message_size: 512,
9199
results:
92100
{
93-
averageCPU: 25.5,
94-
averageMemory: 512,
101+
average_cpu: 25.5,
102+
average_memory: 512,
103+
bytes_throughput: 11,
104+
request_throughput: 21
95105
}
96106
},
97107
{
@@ -101,8 +111,10 @@ export const MOCK_DATA_FOR_EXPERIMENT_TABLE: ExperimentTableProps = {
101111
message_size: 2048,
102112
results:
103113
{
104-
averageCPU: 2,
105-
averageMemory: 52,
114+
average_cpu: 2,
115+
average_memory: 52,
116+
bytes_throughput: 11,
117+
request_throughput: 21
106118
}
107119
}
108120
]
@@ -118,11 +130,11 @@ export const MOCK_DATA_FOR_EXPERIMENT_TABLE: ExperimentTableProps = {
118130
},
119131
{
120132
label: "Average CPU",
121-
value: "averageCPU",
133+
value: "average_cpu",
122134
},
123135
{
124136
label: "Average Memory",
125-
value: "averageMemory",
137+
value: "average_memory",
126138
},
127139
]
128140
};
@@ -157,11 +169,11 @@ export const MOCK_DATA_FOR_EXPERIMENT_WITH_NO_TEST_RUNS: ExperimentTableProps =
157169
},
158170
{
159171
label: "Average CPU",
160-
value: "averageCPU",
172+
value: "average_cpu",
161173
},
162174
{
163175
label: "Average Memory",
164-
value: "averageMemory",
176+
value: "average_memory",
165177
},
166178
]
167179
};
@@ -189,8 +201,10 @@ export const MOCK_SUB_HEADER: ITestRunResult = {
189201
iterations: 1000,
190202
message_size: 1024,
191203
results: {
192-
averageCPU: 3.5,
193-
averageMemory: 3
204+
average_cpu: 3.5,
205+
average_memory: 3,
206+
bytes_throughput: 11,
207+
request_throughput: 21
194208
}
195209
},
196210
],
@@ -203,8 +217,10 @@ export const CSV_MOCK: ITestRunResultData[] = [
203217
iterations: 1000,
204218
message_size: 1024,
205219
results: {
206-
averageCPU: 2000,
207-
averageMemory: 3000,
220+
average_cpu: 2000,
221+
average_memory: 3000,
222+
bytes_throughput: 11,
223+
request_throughput: 21
208224
},
209225
},
210226
{
@@ -213,8 +229,10 @@ export const CSV_MOCK: ITestRunResultData[] = [
213229
iterations: 4000,
214230
message_size: 2048,
215231
results: {
216-
averageCPU: 5000,
217-
averageMemory: 6000,
232+
average_cpu: 5000,
233+
average_memory: 6000,
234+
bytes_throughput: 11,
235+
request_throughput: 21
218236
},
219237
},
220238
];

‎portal/src/app/components/home/components/experiment/components/charts/__mocks__/mocks.ts

+17-11
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ export const MOCK_DATA_FOR_CHARTS: IExperimentData = {
2525
message_size: 1024,
2626
results:
2727
{
28-
averageCPU: 25.5,
29-
averageMemory: 512,
28+
average_cpu: 25.5,
29+
average_memory: 512,
30+
bytes_throughput: 11,
31+
request_throughput: 21
3032
}
3133
},
3234
{
@@ -36,8 +38,10 @@ export const MOCK_DATA_FOR_CHARTS: IExperimentData = {
3638
message_size: 512,
3739
results:
3840
{
39-
averageCPU: 25.5,
40-
averageMemory: 512,
41+
average_cpu: 25.5,
42+
average_memory: 512,
43+
bytes_throughput: 11,
44+
request_throughput: 21
4145
}
4246
},
4347
{
@@ -47,8 +51,10 @@ export const MOCK_DATA_FOR_CHARTS: IExperimentData = {
4751
message_size: 1024,
4852
results:
4953
{
50-
averageCPU: 2,
51-
averageMemory: 52,
54+
average_cpu: 2,
55+
average_memory: 52,
56+
bytes_throughput: 11,
57+
request_throughput: 21
5258
}
5359
}
5460
]
@@ -59,13 +65,13 @@ export const MOCK_DATA_FOR_BAR_CHART = [{
5965
algorithm: "Algorithm1",
6066
iterations: 100,
6167
results: {
62-
averageCPU: 2,
63-
averageMemory: 52,
68+
average_cpu: 2,
69+
average_memory: 52,
6470
},
6571
}];
6672

6773
export const MOCK_DATA_FOR_BAR_CHART_LABELS = ['Algorithm1'];
68-
export const MOCK_DATA_FOR_BAR_CHART_KEYS = ["averageCPU", "averageMemory", "errorRate", "bytesThroughput", "messagesThroughput", "averageTLSHandshakeTime"];
74+
export const MOCK_DATA_FOR_BAR_CHART_KEYS = ["average_cpu", "average_memory", "errorRate", "bytesThroughput", "messagesThroughput", "averageTLSHandshakeTime"];
6975
export const MOCK_DATA_FOR_LINE_CHART = {
7076
datasets: [{
7177
backgroundColor: "#05BBFF",
@@ -74,8 +80,8 @@ export const MOCK_DATA_FOR_LINE_CHART = {
7480
fill: false,
7581
label: "Algorithm1",
7682
data: {
77-
averageCPU: [2],
78-
averageMemory: [3],
83+
average_cpu: [2],
84+
average_memory: [3],
7985
}
8086
}],
8187
labels: [24, 104, 122, 124, 1024],

‎portal/src/app/components/home/components/experiment/components/charts/components/dynamic-chart/hooks/useDynamicChartData.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ describe('useDynamicChartData', () => {
77

88
const { result } = renderHook(() => useDynamicChartData(MOCK_DATA_FOR_EXPERIMENT));
99
act(() => {
10-
expect(result.current).toEqual( {yAxiosOptions: [{label: "Average CPU", value: "averageCPU"}, {label: "Average Memory", value: "averageMemory"}]});
10+
expect(result.current).toEqual( {yAxiosOptions: [{label: "Average Cpu", value: "average_cpu"}, {label: "Average Memory", value: "average_memory"}, {label: "Bytes Throughput", value: "bytes_throughput"}, {label: "Request Throughput", value: "request_throughput"}]});
1111
});
1212
});
1313
});

‎portal/src/app/components/home/components/experiment/components/charts/components/dynamic-chart/hooks/useDynamicChartData.ts

+4-9
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,8 @@ export function useDynamicChartData(chartData: ITestRunResult): IUseDynamicChart
2929
}
3030

3131
function convertLabelByCapitalLetter(str: string): string {
32-
let isFirstCapital = true;
33-
const result = str.replace(/([A-Z])/g, (match) => {
34-
if (isFirstCapital) {
35-
isFirstCapital = false;
36-
return ` ${match}`;
37-
}
38-
return match;
39-
}).trim();
40-
return result.charAt(0).toUpperCase() + result.slice(1);
32+
return str
33+
.split('_') // split the string by underscore
34+
.map(word => word.charAt(0).toUpperCase() + word.slice(1)) // capitalize the first letter of each word
35+
.join(' '); // join the words back together with a space
4136
}

0 commit comments

Comments
 (0)