From 6a9505fc0abc47f92e741a50eb753f0fad95f929 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 22 Feb 2025 16:51:23 +1000 Subject: [PATCH 1/4] Allow users to compute Idle-PC values --- src/app/app.module.ts | 6 +- .../idle-pc-action.component.html | 8 +++ .../idle-pc-action.component.ts | 28 ++++++++ .../context-menu/context-menu.component.html | 5 ++ .../idle-pc-dialog.component.html | 23 +++++++ .../idle-pc-dialog.component.scss | 5 ++ .../idle-pc-dialog.component.spec.ts | 0 .../idle-pc-dialog.component.ts | 66 +++++++++++++++++++ .../choose-name-dialog.component.ts | 2 +- src/app/services/node.service.ts | 8 +++ 10 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 src/app/components/project-map/context-menu/actions/idle-pc-action/idle-pc-action.component.html create mode 100644 src/app/components/project-map/context-menu/actions/idle-pc-action/idle-pc-action.component.ts create mode 100644 src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.html create mode 100644 src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.scss create mode 100644 src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.spec.ts create mode 100644 src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 1df168e3..e2640885 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -119,6 +119,7 @@ import { EditTextActionComponent } from './components/project-map/context-menu/a import { ExportConfigActionComponent } from './components/project-map/context-menu/actions/export-config/export-config-action.component'; import { HttpConsoleNewTabActionComponent } from './components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component'; import { HttpConsoleActionComponent } from './components/project-map/context-menu/actions/http-console/http-console-action.component'; +import { IdlePcActionComponent } from "./components/project-map/context-menu/actions/idle-pc-action/idle-pc-action.component"; import { ImportConfigActionComponent } from './components/project-map/context-menu/actions/import-config/import-config-action.component'; import { LockActionComponent } from './components/project-map/context-menu/actions/lock-action/lock-action.component'; import { MoveLayerDownActionComponent } from './components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component'; @@ -134,11 +135,12 @@ import { StartNodeActionComponent } from './components/project-map/context-menu/ import { StopCaptureActionComponent } from './components/project-map/context-menu/actions/stop-capture/stop-capture-action.component'; import { IsolateNodeActionComponent } from './components/project-map/context-menu/actions/isolate-node-action/isolate-node-action.component'; import { UnisolateNodeActionComponent } from './components/project-map/context-menu/actions/unisolate-node-action/unisolate-node-action.component'; -import {StopNodeActionComponent } from './components/project-map/context-menu/actions/stop-node-action/stop-node-action.component'; +import { StopNodeActionComponent } from './components/project-map/context-menu/actions/stop-node-action/stop-node-action.component'; import { SuspendLinkActionComponent } from './components/project-map/context-menu/actions/suspend-link/suspend-link-action.component'; import { SuspendNodeActionComponent } from './components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component'; import { ContextMenuComponent } from './components/project-map/context-menu/context-menu.component'; import { ConfigDialogComponent } from './components/project-map/context-menu/dialogs/config-dialog/config-dialog.component'; +import { IdlePCDialogComponent } from "./components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component"; import { DrawLinkToolComponent } from './components/project-map/draw-link-tool/draw-link-tool.component'; import { StyleEditorDialogComponent } from './components/project-map/drawings-editors/style-editor/style-editor.component'; import { LinkStyleEditorDialogComponent } from './components/project-map/drawings-editors/link-style-editor/link-style-editor.component'; @@ -494,6 +496,7 @@ import { DeleteResourceConfirmationDialogComponent } from './components/resource AlignVerticallyActionComponent, ConfirmationBottomSheetComponent, ConfigDialogComponent, + IdlePCDialogComponent, ImportApplianceComponent, DirectLinkComponent, SystemStatusComponent, @@ -501,6 +504,7 @@ import { DeleteResourceConfirmationDialogComponent } from './components/resource StatusChartComponent, OpenFileExplorerActionComponent, HttpConsoleActionComponent, + IdlePcActionComponent, WebConsoleComponent, ConsoleWrapperComponent, HttpConsoleNewTabActionComponent, diff --git a/src/app/components/project-map/context-menu/actions/idle-pc-action/idle-pc-action.component.html b/src/app/components/project-map/context-menu/actions/idle-pc-action/idle-pc-action.component.html new file mode 100644 index 00000000..7d62bcfb --- /dev/null +++ b/src/app/components/project-map/context-menu/actions/idle-pc-action/idle-pc-action.component.html @@ -0,0 +1,8 @@ + diff --git a/src/app/components/project-map/context-menu/actions/idle-pc-action/idle-pc-action.component.ts b/src/app/components/project-map/context-menu/actions/idle-pc-action/idle-pc-action.component.ts new file mode 100644 index 00000000..040f0461 --- /dev/null +++ b/src/app/components/project-map/context-menu/actions/idle-pc-action/idle-pc-action.component.ts @@ -0,0 +1,28 @@ +import { Component, Input } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { Node } from '../../../../../cartography/models/node'; +import { Controller } from '../../../../../models/controller'; +import { IdlePCDialogComponent } from "@components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component"; +import { NodeService } from "@services/node.service"; + +@Component({ + selector: 'app-idle-pc-action', + templateUrl: './idle-pc-action.component.html', +}) +export class IdlePcActionComponent { + @Input() controller:Controller ; + @Input() node: Node; + + constructor(private nodeService: NodeService, private dialog: MatDialog) {} + + idlePC() { + const dialogRef = this.dialog.open(IdlePCDialogComponent, { + width: '500px', + autoFocus: false, + disableClose: true, + }); + let instance = dialogRef.componentInstance; + instance.controller = this.controller; + instance.node = this.node; + } +} diff --git a/src/app/components/project-map/context-menu/context-menu.component.html b/src/app/components/project-map/context-menu/context-menu.component.html index 5d51d8b2..f26dfd80 100644 --- a/src/app/components/project-map/context-menu/context-menu.component.html +++ b/src/app/components/project-map/context-menu/context-menu.component.html @@ -94,6 +94,11 @@ [controller]="controller" [node]="nodes[0]" > + +
Computing Idle-PC values, please wait...
+
+ +
+ +
+

Choose an Idle-PC value

+ + + {{ idlepc.name }} + + +
+
+ + + +
diff --git a/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.scss b/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.scss new file mode 100644 index 00000000..add91a3f --- /dev/null +++ b/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.scss @@ -0,0 +1,5 @@ +.container { + width: 100%; + display: flex; + justify-content: space-between; +} diff --git a/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.spec.ts b/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.spec.ts new file mode 100644 index 00000000..e69de29b diff --git a/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.ts b/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.ts new file mode 100644 index 00000000..c6b64968 --- /dev/null +++ b/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.ts @@ -0,0 +1,66 @@ +import {ChangeDetectorRef, Component, Inject, Input, OnInit} from '@angular/core'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {Controller} from "@models/controller"; +import {Node} from '../../../../../cartography/models/node'; +import {NodeService} from "@services/node.service"; +import {ToasterService} from "@services/toaster.service"; + +@Component({ + selector: 'app-idle-pc-dialog', + templateUrl: './idle-pc-dialog.component.html', + styleUrls: ['./idle-pc-dialog.component.scss'], +}) +export class IdlePCDialogComponent implements OnInit { + @Input() controller: Controller; + @Input() node: Node; + + idlepcs = []; + idlePC: string = ''; + isComputing: boolean = false; + + constructor( + private nodeService: NodeService, + public dialogRef: MatDialogRef, + private toasterService: ToasterService) {} + + ngOnInit() { + this.onCompute(); + } + + onCompute() { + this.isComputing = true; + this.nodeService.getIdlePCProposals(this.controller, this.node).subscribe((idlepcs: any) => { + let idlepcs_values = []; + for (let value of idlepcs) { + // validate idle-pc format, e.g. 0x60c09aa0 + const match = value.match(/^(0x[0-9a-f]{8})\s+\[(\d+)\]$/); + if (match) { + const idlepc = match[1]; + const count = parseInt(match[2], 10); + if (50 <= count && count <= 60) { + value += "*"; + } + idlepcs_values.push({'key': idlepc, 'name': value}) + } + } + this.idlepcs = idlepcs_values; + if (this.idlepcs.length > 0) { + this.idlePC = this.idlepcs[0].key; + } + this.isComputing = false; + }); + } + + onClose() { + this.dialogRef.close(); + } + + onApply() { + if (this.idlePC && this.idlePC !== '0x0') { + this.node.properties.idlepc = this.idlePC; + this.nodeService.updateNode(this.controller, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated with idle-PC value ${this.idlePC}`); + }); + } + } +} diff --git a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts index cd80f331..cbdd8de5 100644 --- a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts +++ b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts @@ -10,7 +10,7 @@ import { ProjectService } from '../../../services/project.service'; styleUrls: ['./choose-name-dialog.component.scss'], }) export class ChooseNameDialogComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; name: string; diff --git a/src/app/services/node.service.ts b/src/app/services/node.service.ts index 1ad20419..b5785baa 100644 --- a/src/app/services/node.service.ts +++ b/src/app/services/node.service.ts @@ -232,4 +232,12 @@ export class NodeService { return this.httpController.post(controller, urlPath, configuration); } + + getIdlePCProposals(controller:Controller, node: Node) { + return this.httpController.get(controller, `/projects/${node.project_id}/nodes/${node.node_id}/dynamips/idlepc_proposals`); + } + + getAutoIdlePC(controller:Controller, node: Node) { + return this.httpController.get(controller, `/projects/${node.project_id}/nodes/${node.node_id}/dynamips/auto_idlepc`); + } } From aeb26b0f17817742aa1c80933a040d8accb8f1db Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 22 Feb 2025 18:59:57 +1000 Subject: [PATCH 2/4] Add tooltip for idle-pc dialog and implement auto idle-pc action --- src/app/app.module.ts | 2 ++ .../auto-idle-pc-action.component.html | 9 +++++ .../auto-idle-pc-action.component.ts | 36 +++++++++++++++++++ .../context-menu/context-menu.component.html | 5 +++ .../idle-pc-dialog.component.html | 2 ++ .../idle-pc-dialog.component.scss | 6 ++++ .../idle-pc-dialog.component.ts | 12 +++++-- 7 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.html create mode 100644 src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e2640885..6fad9e1d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -120,6 +120,7 @@ import { ExportConfigActionComponent } from './components/project-map/context-me import { HttpConsoleNewTabActionComponent } from './components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component'; import { HttpConsoleActionComponent } from './components/project-map/context-menu/actions/http-console/http-console-action.component'; import { IdlePcActionComponent } from "./components/project-map/context-menu/actions/idle-pc-action/idle-pc-action.component"; +import { AutoIdlePcActionComponent } from "./components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component"; import { ImportConfigActionComponent } from './components/project-map/context-menu/actions/import-config/import-config-action.component'; import { LockActionComponent } from './components/project-map/context-menu/actions/lock-action/lock-action.component'; import { MoveLayerDownActionComponent } from './components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component'; @@ -505,6 +506,7 @@ import { DeleteResourceConfirmationDialogComponent } from './components/resource OpenFileExplorerActionComponent, HttpConsoleActionComponent, IdlePcActionComponent, + AutoIdlePcActionComponent, WebConsoleComponent, ConsoleWrapperComponent, HttpConsoleNewTabActionComponent, diff --git a/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.html b/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.html new file mode 100644 index 00000000..8e5e2dcf --- /dev/null +++ b/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.html @@ -0,0 +1,9 @@ + + diff --git a/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.ts b/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.ts new file mode 100644 index 00000000..e32c7a1b --- /dev/null +++ b/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.ts @@ -0,0 +1,36 @@ +import { Component, Input } from '@angular/core'; +import { Node } from '../../../../../cartography/models/node'; +import { Controller } from '../../../../../models/controller'; +import { NodeService } from "@services/node.service"; +import { ToasterService } from "@services/toaster.service"; +import { ProgressService } from "../../../../../common/progress/progress.service"; + +@Component({ + selector: 'app-auto-idle-pc-action', + templateUrl: './auto-idle-pc-action.component.html', +}) +export class AutoIdlePcActionComponent { + @Input() controller:Controller ; + @Input() node: Node; + + constructor( + private nodeService: NodeService, + private toasterService: ToasterService, + private progressService: ProgressService, + ) {} + + autoIdlePC() { + this.progressService.activate(); + this.nodeService.getAutoIdlePC(this.controller, this.node).subscribe((result: any) => { + this.progressService.deactivate(); + if (result.idlepc !== null) { + this.toasterService.success(`Node ${this.node.name} updated with idle-PC value ${result.idlepc}`); + } + }, + (error) => { + this.progressService.deactivate(); + this.toasterService.error(`Error while updating idle-PC value for node ${this.node.name}`); + } + ); + } +} diff --git a/src/app/components/project-map/context-menu/context-menu.component.html b/src/app/components/project-map/context-menu/context-menu.component.html index f26dfd80..cd3bcedc 100644 --- a/src/app/components/project-map/context-menu/context-menu.component.html +++ b/src/app/components/project-map/context-menu/context-menu.component.html @@ -99,6 +99,11 @@ [controller]="controller" [node]="nodes[0]" > + {{ idlepc.name }} diff --git a/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.scss b/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.scss index add91a3f..71573ef6 100644 --- a/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.scss +++ b/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.scss @@ -3,3 +3,9 @@ display: flex; justify-content: space-between; } + +.multiline-tooltip { + background-color: grey; + color: #ffffff; + white-space: pre-line; +} diff --git a/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.ts b/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.ts index c6b64968..6ad045bc 100644 --- a/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.ts +++ b/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.ts @@ -1,5 +1,5 @@ -import {ChangeDetectorRef, Component, Inject, Input, OnInit} from '@angular/core'; -import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {Component, Input, OnInit, ViewEncapsulation} from '@angular/core'; +import {MatDialogRef} from '@angular/material/dialog'; import {Controller} from "@models/controller"; import {Node} from '../../../../../cartography/models/node'; import {NodeService} from "@services/node.service"; @@ -9,6 +9,7 @@ import {ToasterService} from "@services/toaster.service"; selector: 'app-idle-pc-dialog', templateUrl: './idle-pc-dialog.component.html', styleUrls: ['./idle-pc-dialog.component.scss'], + encapsulation: ViewEncapsulation.None }) export class IdlePCDialogComponent implements OnInit { @Input() controller: Controller; @@ -21,12 +22,17 @@ export class IdlePCDialogComponent implements OnInit { constructor( private nodeService: NodeService, public dialogRef: MatDialogRef, - private toasterService: ToasterService) {} + private toasterService: ToasterService + ) {} ngOnInit() { this.onCompute(); } + getTooltip(){ + return "Best Idle-PC values are obtained when IOS is in idle state, after the 'Press RETURN to get started' message has appeared on the console, messages have finished displaying on the console and you have have actually pressed the RETURN key.\n\nFinding the right idle-pc value is a trial and error process, consisting of applying different Idle-PC values and monitoring the CPU usage.\n\nSelect each value that appears in the list and click Apply, and note the CPU usage a few moments later. When you have found the value that minimises the CPU usage, apply that value."; + } + onCompute() { this.isComputing = true; this.nodeService.getIdlePCProposals(this.controller, this.node).subscribe((idlepcs: any) => { From 4a34007cf410bc88af4abcbae6ce82e346b0abc4 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 22 Feb 2025 20:57:32 +1000 Subject: [PATCH 3/4] Implement Idle-PC finder for IOS templates --- .../ios-template-details.component.html | 1 + .../ios-template-details.component.scss | 3 +++ .../ios-template-details.component.ts | 25 ++++++++++++++++++- src/app/services/ios.service.ts | 5 ++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html index 34de0eba..bec81cf9 100644 --- a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html +++ b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html @@ -243,6 +243,7 @@ placeholder="Idle-PC" /> +

{ + this.progressService.deactivate(); + if (result.idlepc !== null) { + this.iosTemplate.idlepc = result.idlepc; + this.toasterService.success(`Idle-PC value found: ${result.idlepc}`); + } + }, + (error) => { + this.progressService.deactivate(); + this.toasterService.error(`Error while finding an idle-PC value`); + } + ); + } + fillSlotsData() { // load network adapters diff --git a/src/app/services/ios.service.ts b/src/app/services/ios.service.ts index f21ef7bc..43453345 100644 --- a/src/app/services/ios.service.ts +++ b/src/app/services/ios.service.ts @@ -37,4 +37,9 @@ export class IosService { iosTemplate ) as Observable; } + + findIdlePC(controller:Controller, body: any) { + return this.httpController.post(controller, `/computes/${environment.compute_id}/dynamips/auto_idlepc`, body); + } + } From 346e3d988f9e67099feaf64fb0003f767eabf148 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 22 Feb 2025 21:04:51 +1000 Subject: [PATCH 4/4] Fix tests --- .../ios-template-details.component.spec.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts index bed948fb..f5c70042 100644 --- a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts +++ b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts @@ -20,6 +20,8 @@ import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { IosTemplateDetailsComponent } from './ios-template-details.component'; +import { MockedProgressService } from "@components/project-map/project-map.component.spec"; +import {ProgressService} from "../../../../common/progress/progress.service"; export class MockedIosService { public getTemplate(controller:Controller , template_id: string) { @@ -38,6 +40,7 @@ describe('IosTemplateDetailsComponent', () => { let mockedControllerService = new MockedControllerService(); let mockedIosService = new MockedIosService(); let mockedToasterService = new MockedToasterService(); + let mockedProgressService = new MockedProgressService() let activatedRoute = new MockedActivatedRoute().get(); beforeEach(async() => { @@ -61,6 +64,7 @@ describe('IosTemplateDetailsComponent', () => { { provide: ControllerService, useValue: mockedControllerService }, { provide: IosService, useValue: mockedIosService }, { provide: ToasterService, useValue: mockedToasterService }, + { provide: ProgressService, useValue: mockedProgressService }, { provide: IosConfigurationService, useClass: IosConfigurationService }, ], declarations: [IosTemplateDetailsComponent],