diff --git a/app/.vs/VSWorkspaceState.json b/app/.vs/VSWorkspaceState.json index 93ffcca..079caa0 100644 --- a/app/.vs/VSWorkspaceState.json +++ b/app/.vs/VSWorkspaceState.json @@ -11,6 +11,6 @@ "\\src\\assets\\i18n", "\\src\\assets\\i18n\\networking" ], - "SelectedNode": "\\src\\app\\instances\\instances.component.html", + "SelectedNode": "\\src\\app\\instances\\machines.component.html", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/app/src/app/app-routing.module.ts b/app/src/app/app-routing.module.ts index c041396..79e775e 100644 --- a/app/src/app/app-routing.module.ts +++ b/app/src/app/app-routing.module.ts @@ -13,7 +13,7 @@ const appRoutes: Routes = [ }, { path: 'machines', - loadChildren: () => import('./instances/instances.module').then(x => x.InstancesModule), + loadChildren: () => import('./machines/machines.module').then(x => x.MachinesModule), canActivate: [AuthGuardService], canLoad: [AuthGuardService], }, diff --git a/app/src/app/app.module.ts b/app/src/app/app.module.ts index 54e0890..8bcd416 100644 --- a/app/src/app/app.module.ts +++ b/app/src/app/app.module.ts @@ -14,7 +14,7 @@ import { SharedModule } from './shared.module'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; -import { DashboardComponent } from './pages/dashboard/dashboard.component'; +import { DashboardComponent } from './pages/machines/machines.component'; import { UnauthorizedComponent } from './pages/unauthorized/unauthorized.component'; import { NotFoundComponent } from './pages/not-found/not-found.component'; import { NavMenuComponent } from './components/nav-menu/nav-menu.component'; diff --git a/app/src/app/catalog/custom-image-editor/custom-image-editor.component.html b/app/src/app/catalog/custom-image-editor/custom-image-editor.component.html index 282bbf2..d7f30d3 100644 --- a/app/src/app/catalog/custom-image-editor/custom-image-editor.component.html +++ b/app/src/app/catalog/custom-image-editor/custom-image-editor.component.html @@ -7,7 +7,7 @@

Create image from machine

-

Fill in the name and version for a new image based on the "{{ instance.name }}" machine

+

Fill in the name and version for a new image based on the "{{ machine.name }}" machine

diff --git a/app/src/app/catalog/custom-image-editor/custom-image-editor.component.ts b/app/src/app/catalog/custom-image-editor/custom-image-editor.component.ts index edf2a95..8041db3 100644 --- a/app/src/app/catalog/custom-image-editor/custom-image-editor.component.ts +++ b/app/src/app/catalog/custom-image-editor/custom-image-editor.component.ts @@ -13,7 +13,7 @@ import { filter, takeUntil } from 'rxjs/operators'; export class CustomImageEditorComponent implements OnInit { @Input() - instance: any; + machine: any; save = new Subject(); editorForm: FormGroup; diff --git a/app/src/app/catalog/helpers/catalog.service.ts b/app/src/app/catalog/helpers/catalog.service.ts index 9066d0d..d3a3b22 100644 --- a/app/src/app/catalog/helpers/catalog.service.ts +++ b/app/src/app/catalog/helpers/catalog.service.ts @@ -129,12 +129,12 @@ export class CatalogService } // ---------------------------------------------------------------------------------------------------------------- - createImage(instanceId: string, name: string, version: string, + createImage(machineId: string, name: string, version: string, description?: string, homepage?: string, eula?: string, acl?: string, tags?: string): Observable { return this.httpClient.post(`/api/my/images`, { - machine: instanceId, + machine: machineId, name, version, description, diff --git a/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.html b/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.html new file mode 100644 index 0000000..381178e --- /dev/null +++ b/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.html @@ -0,0 +1,43 @@ + + +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + +
+
+
diff --git a/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.scss b/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.scss new file mode 100644 index 0000000..bcf57b6 --- /dev/null +++ b/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.scss @@ -0,0 +1,7 @@ +.form-control +{ + background: #0c1321; + border-color: #00e7ff; + border-radius: 3rem; + color: #ff9c07; +} diff --git a/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.spec.ts b/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.spec.ts new file mode 100644 index 0000000..ae2206b --- /dev/null +++ b/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AffinityRuleEditorComponent } from './affinity-rule-editor.component'; + +describe('AffinityRuleEditorComponent', () => { + let component: AffinityRuleEditorComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ AffinityRuleEditorComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(AffinityRuleEditorComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.ts b/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.ts new file mode 100644 index 0000000..da57a0f --- /dev/null +++ b/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.ts @@ -0,0 +1,144 @@ +import { Component, OnInit, OnDestroy, Input, Output, EventEmitter, ElementRef, HostListener } from '@angular/core'; +import { FormGroup, FormBuilder, Validators, AbstractControl, FormArray } from '@angular/forms'; +import { Subject } from 'rxjs'; +import { takeUntil } from 'rxjs/operators'; + +@Component({ + selector: 'app-affinity-rule-editor', + templateUrl: './affinity-rule-editor.component.html', + styleUrls: ['./affinity-rule-editor.component.scss'] +}) +export class AffinityRuleEditorComponent implements OnInit, OnDestroy +{ + @Input() + disabled: boolean; + + @Output() + saved = new EventEmitter(); + + editorVisible: boolean; + editorForm: FormGroup; + + private destroy$ = new Subject(); + + // -------------------------------------------------------------------------------------------------- + constructor(private readonly elementRef: ElementRef, + private readonly fb: FormBuilder) { } + + // ---------------------------------------------------------------------------------------------------------------- + private createForm() + { + this.editorForm = this.fb.group( + { + strict: [null, Validators.required], + operator: [null, Validators.required], + target: [null, Validators.required], + tagName: [null], + value: [null, Validators.required] + }); + + this.editorForm.get('target').valueChanges + .pipe(takeUntil(this.destroy$)) + .subscribe(target => + { + if (target === 'tagName') + this.editorForm.get('tagName').setValidators(Validators.required); + else + this.editorForm.get('tagName').clearValidators(); + }); + } + + // -------------------------------------------------------------------------------------------------- + showEditor() + { + if (this.disabled) return; + + this.editorVisible = true; + + addEventListener('click', this.onDocumentClick.bind(this)); + } + + // -------------------------------------------------------------------------------------------------- + saveChanges() + { + event.preventDefault(); + event.stopPropagation(); + + this.editorVisible = false; + + this.removeEventListeners(); + + let rule: string; + + if (this.editorForm.get('target').value === 'machine') + rule = `machine${this.editorForm.get('operator').value}${this.editorForm.get('strict').value}${this.editorForm.get('value').value}`; + else + rule = `${this.editorForm.get('tagName').value}${this.editorForm.get('operator').value}${this.editorForm.get('strict').value}${this.editorForm.get('value').value}`; + + this.saved.emit({ + strict: this.editorForm.get('strict').value === '=', + closeTo: this.editorForm.get('operator').value === '=', + targetMachine: this.editorForm.get('target').value === 'machine', + tagName: this.editorForm.get('tagName').value, + value: this.editorForm.get('value').value, + rule + }); + + this.resetForm(); + } + + // -------------------------------------------------------------------------------------------------- + cancelChanges() + { + this.editorVisible = false; + + this.removeEventListeners(); + + this.resetForm(); + } + + // -------------------------------------------------------------------------------------------------- + private resetForm() + { + this.editorForm.get('strict').setValue(null); + this.editorForm.get('operator').setValue(null); + this.editorForm.get('target').setValue(null); + this.editorForm.get('tagName').setValue(null); + this.editorForm.get('value').setValue(null); + } + + // -------------------------------------------------------------------------------------------------- + @HostListener('document:keydown.escape', ['$event']) + escapePressed(event) + { + this.cancelChanges(); + } + + // -------------------------------------------------------------------------------------------------- + protected onDocumentClick(event: MouseEvent) + { + if (!this.elementRef.nativeElement.contains(event.target)) + this.cancelChanges(); + } + + // -------------------------------------------------------------------------------------------------- + private removeEventListeners() + { + removeEventListener('click', this.onDocumentClick); + removeEventListener('document:keydown.escape', this.escapePressed); + } + + // -------------------------------------------------------------------------------------------------- + ngOnInit(): void + { + this.createForm(); + } + + // -------------------------------------------------------------------------------------------------- + ngOnDestroy() + { + this.removeEventListeners(); + + this.destroy$.next(); + } +} diff --git a/app/src/app/components/inline-editor/inline-editor.component.ts b/app/src/app/components/inline-editor/inline-editor.component.ts index a95bf33..27594da 100644 --- a/app/src/app/components/inline-editor/inline-editor.component.ts +++ b/app/src/app/components/inline-editor/inline-editor.component.ts @@ -102,9 +102,8 @@ export class InlineEditorComponent implements OnInit, OnDestroy else this.saved.emit(this.editorForm.get('key').value); - this.editorForm.get('key').setValue(null); - this.editorForm.get('value').setValue(null); - } + this.resetForm(); + } // -------------------------------------------------------------------------------------------------- cancelChanges() @@ -113,6 +112,12 @@ export class InlineEditorComponent implements OnInit, OnDestroy this.removeEventListeners(); + this.resetForm(); + } + + // -------------------------------------------------------------------------------------------------- + private resetForm() + { this.editorForm.get('key').setValue(null); this.editorForm.get('value').setValue(null); } diff --git a/app/src/app/components/nav-menu/nav-menu.component.html b/app/src/app/components/nav-menu/nav-menu.component.html index 302c68f..ea9bc6c 100644 --- a/app/src/app/components/nav-menu/nav-menu.component.html +++ b/app/src/app/components/nav-menu/nav-menu.component.html @@ -3,7 +3,7 @@
  • - {{ 'navbar.menu.instances' | translate }} + {{ 'navbar.menu.machines' | translate }}
  • diff --git a/app/src/app/directives/alpha-only.directive.spec.ts b/app/src/app/directives/alpha-only.directive.spec.ts index 2c00a14..2709416 100644 --- a/app/src/app/directives/alpha-only.directive.spec.ts +++ b/app/src/app/directives/alpha-only.directive.spec.ts @@ -1,7 +1,7 @@ import { AlphaOnlyDirective } from './alpha-only.directive'; describe('AlphaOnlyDirective', () => { - it('should create an instance', () => { + it('should create an machine', () => { const directive = new AlphaOnlyDirective(); expect(directive).toBeTruthy(); }); diff --git a/app/src/app/directives/autofocus.directive.spec.ts b/app/src/app/directives/autofocus.directive.spec.ts index 67b0120..04accbd 100644 --- a/app/src/app/directives/autofocus.directive.spec.ts +++ b/app/src/app/directives/autofocus.directive.spec.ts @@ -1,7 +1,7 @@ import { AutofocusDirective } from './autofocus.directive'; describe('AutofocusDirective', () => { - it('should create an instance', () => { + it('should create an machine', () => { const directive = new AutofocusDirective(); expect(directive).toBeTruthy(); }); diff --git a/app/src/app/directives/lazy-load.directive.spec.ts b/app/src/app/directives/lazy-load.directive.spec.ts index 230c2a7..6550501 100644 --- a/app/src/app/directives/lazy-load.directive.spec.ts +++ b/app/src/app/directives/lazy-load.directive.spec.ts @@ -1,7 +1,7 @@ import { LazyLoadDirective } from './lazy-load.directive'; describe('LazyLoadDirective', () => { - it('should create an instance', () => { + it('should create an machine', () => { const directive = new LazyLoadDirective(); expect(directive).toBeTruthy(); }); diff --git a/app/src/app/help/help/help.component.ts b/app/src/app/help/help/help.component.ts index 158217f..5ab9773 100644 --- a/app/src/app/help/help/help.component.ts +++ b/app/src/app/help/help/help.component.ts @@ -15,11 +15,11 @@ export class HelpComponent implements OnInit contentUrl: './assets/help/account-info.html' }, { - title: 'Provisioning compute instance', + title: 'Provisioning compute machine', contentUrl: '' }, { - title: 'Managing instances with Triton CLI', + title: 'Managing machines with Triton CLI', contentUrl: '' } ]; diff --git a/app/src/app/instances/instance-snapshots/instance-snapshots.component.spec.ts b/app/src/app/instances/instance-snapshots/instance-snapshots.component.spec.ts deleted file mode 100644 index 30ba416..0000000 --- a/app/src/app/instances/instance-snapshots/instance-snapshots.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { InstanceSnapshotsComponent } from './instance-snapshots.component'; - -describe('InstanceSnapshotsComponent', () => { - let component: InstanceSnapshotsComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ InstanceSnapshotsComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(InstanceSnapshotsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/app/src/app/instances/instance-tag-editor/instance-tag-editor.component.spec.ts b/app/src/app/instances/instance-tag-editor/instance-tag-editor.component.spec.ts deleted file mode 100644 index bf09982..0000000 --- a/app/src/app/instances/instance-tag-editor/instance-tag-editor.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { InstanceTagEditorComponent } from './instance-tag-editor.component'; - -describe('InstanceTagEditorComponent', () => { - let component: InstanceTagEditorComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ InstanceTagEditorComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(InstanceTagEditorComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/app/src/app/instances/helpers/instances.service.spec.ts b/app/src/app/machines/helpers/machines.service.spec.ts similarity index 53% rename from app/src/app/instances/helpers/instances.service.spec.ts rename to app/src/app/machines/helpers/machines.service.spec.ts index 2b7d2c2..29f4d6d 100644 --- a/app/src/app/instances/helpers/instances.service.spec.ts +++ b/app/src/app/machines/helpers/machines.service.spec.ts @@ -1,13 +1,13 @@ import { TestBed } from '@angular/core/testing'; -import { InstancesService } from './instances.service'; +import { MachinesService } from './machines.service'; -describe('InstancesService', () => { - let service: InstancesService; +describe('MachinesService', () => { + let service: MachinesService; beforeEach(() => { TestBed.configureTestingModule({}); - service = TestBed.inject(InstancesService); + service = TestBed.inject(MachinesService); }); it('should be created', () => { diff --git a/app/src/app/instances/helpers/instances.service.ts b/app/src/app/machines/helpers/machines.service.ts similarity index 58% rename from app/src/app/instances/helpers/instances.service.ts rename to app/src/app/machines/helpers/machines.service.ts index 7b93cae..7279792 100644 --- a/app/src/app/instances/helpers/instances.service.ts +++ b/app/src/app/machines/helpers/machines.service.ts @@ -1,45 +1,45 @@ import { Injectable } from '@angular/core'; import { forkJoin, from, Observable, Subject } from 'rxjs'; import { HttpClient } from '@angular/common/http'; -import { Instance } from '../models/instance'; +import { Machine } from '../models/machine'; import { concatMap, delay, filter, map, repeatWhen, take, tap } from 'rxjs/operators'; -import { InstanceRequest } from '../models/instance'; +import { MachineRequest } from '../models/machine'; import { Cacheable } from 'ts-cacheable'; import { volumesCacheBuster$ } from '../../volumes/helpers/volumes.service'; -const instancesCacheBuster$ = new Subject(); +const machinesCacheBuster$ = new Subject(); @Injectable({ providedIn: 'root' }) -export class InstancesService +export class MachinesService { // ---------------------------------------------------------------------------------------------------------------- constructor(private readonly httpClient: HttpClient) { } // ---------------------------------------------------------------------------------------------------------------- @Cacheable({ - cacheBusterObserver: instancesCacheBuster$ + cacheBusterObserver: machinesCacheBuster$ }) - get(): Observable + get(): Observable { - return this.httpClient.get(`/api/my/machines`); + return this.httpClient.get(`/api/my/machines`); } // ---------------------------------------------------------------------------------------------------------------- @Cacheable({ - cacheBusterObserver: instancesCacheBuster$ + cacheBusterObserver: machinesCacheBuster$ }) - getById(instanceId: string): Observable + getById(machineId: string): Observable { - return this.httpClient.get(`/api/my/machines/${instanceId}`); + return this.httpClient.get(`/api/my/machines/${machineId}`); } // ---------------------------------------------------------------------------------------------------------------- - getInstanceUntilExpectedState(instance: Instance, expectedStates: string[], callbackFn?: InstanceCallbackFunction, maxRetries = 30): Observable + getMachineUntilExpectedState(machine: Machine, expectedStates: string[], callbackFn?: MachineCallbackFunction, maxRetries = 30): Observable { - // Keep polling the instance until it reaches the expected state - return this.httpClient.get(`/api/my/machines/${instance.id}`) + // Keep polling the machine until it reaches the expected state + return this.httpClient.get(`/api/my/machines/${machine.id}`) .pipe( tap(x => callbackFn && callbackFn(x)), repeatWhen(x => @@ -51,7 +51,7 @@ export class InstancesService map(y => { if (retries++ === maxRetries) - throw { error: `Failed to retrieve the current status for machine "${instance.name}"` }; + throw { error: `Failed to retrieve the current status for machine "${machine.name}"` }; return y; })); @@ -62,14 +62,14 @@ export class InstancesService } // ---------------------------------------------------------------------------------------------------------------- - getInstanceUntilNicRemoved(instance: any, networkName: string, callbackFn?: InstanceCallbackFunction, maxRetries = 30): Observable + getMachineUntilNicRemoved(machine: any, networkName: string, callbackFn?: MachineCallbackFunction, maxRetries = 30): Observable { networkName = networkName.toLocaleLowerCase(); - // Keep polling the instance until it reaches the expected state - return this.httpClient.get(`/api/my/machines/${instance.id}`) + // Keep polling the machine until it reaches the expected state + return this.httpClient.get(`/api/my/machines/${machine.id}`) .pipe( - tap(instance => callbackFn && callbackFn(instance)), + tap(machine => callbackFn && callbackFn(machine)), repeatWhen(x => { let retries = 0; @@ -79,7 +79,7 @@ export class InstancesService map(() => { if (retries++ === maxRetries) - throw { error: `Failed to retrieve the current status for machine "${instance.name}"` }; + throw { error: `Failed to retrieve the current status for machine "${machine.name}"` }; }) ); }), @@ -90,144 +90,144 @@ export class InstancesService if (callbackFn) callbackFn(x); - return instance; + return machine; }) ); } // ---------------------------------------------------------------------------------------------------------------- - add(instance: InstanceRequest): Observable + add(machine: MachineRequest): Observable { - return this.httpClient.post(`/api/my/machines`, instance) + return this.httpClient.post(`/api/my/machines`, machine) .pipe(tap(() => { - instancesCacheBuster$.next(); + machinesCacheBuster$.next(); - if (instance.volumes?.length) + if (machine.volumes?.length) volumesCacheBuster$.next(); })); } // ---------------------------------------------------------------------------------------------------------------- - delete(instanceId: string): Observable + delete(machineId: string): Observable { - return this.httpClient.delete(`/api/my/machines/${instanceId}`) - .pipe(tap(() => instancesCacheBuster$.next())); + return this.httpClient.delete(`/api/my/machines/${machineId}`) + .pipe(tap(() => machinesCacheBuster$.next())); } // ---------------------------------------------------------------------------------------------------------------- - start(instanceId: string): Observable + start(machineId: string): Observable { - return this.httpClient.post(`/api/my/machines/${instanceId}?action=start`, {}) - .pipe(tap(() => instancesCacheBuster$.next())); + return this.httpClient.post(`/api/my/machines/${machineId}?action=start`, {}) + .pipe(tap(() => machinesCacheBuster$.next())); } // ---------------------------------------------------------------------------------------------------------------- - stop(instanceId: string): Observable + stop(machineId: string): Observable { - return this.httpClient.post(`/api/my/machines/${instanceId}?action=stop`, {}) - .pipe(tap(() => instancesCacheBuster$.next())); + return this.httpClient.post(`/api/my/machines/${machineId}?action=stop`, {}) + .pipe(tap(() => machinesCacheBuster$.next())); } // ---------------------------------------------------------------------------------------------------------------- - reboot(instanceId: string): Observable + reboot(machineId: string): Observable { - return this.httpClient.post(`/api/my/machines/${instanceId}?action=reboot`, {}) - .pipe(tap(() => instancesCacheBuster$.next())); + return this.httpClient.post(`/api/my/machines/${machineId}?action=reboot`, {}) + .pipe(tap(() => machinesCacheBuster$.next())); } // ---------------------------------------------------------------------------------------------------------------- - resize(instanceId: string, packageId: string): Observable + resize(machineId: string, packageId: string): Observable { - return this.httpClient.post(`/api/my/machines/${instanceId}?action=resize&package=${packageId}`, {}) - .pipe(tap(() => instancesCacheBuster$.next())); + return this.httpClient.post(`/api/my/machines/${machineId}?action=resize&package=${packageId}`, {}) + .pipe(tap(() => machinesCacheBuster$.next())); } // ---------------------------------------------------------------------------------------------------------------- - rename(instanceId: string, name: string): Observable + rename(machineId: string, name: string): Observable { if (!name) throw 'Name cannot be empty'; - return this.httpClient.post(`/api/my/machines/${instanceId}?action=rename&name=${name}`, {}) - .pipe(tap(() => instancesCacheBuster$.next())); + return this.httpClient.post(`/api/my/machines/${machineId}?action=rename&name=${name}`, {}) + .pipe(tap(() => machinesCacheBuster$.next())); } // ---------------------------------------------------------------------------------------------------------------- - toggleFirewall(instanceId: string, enable: boolean): Observable + toggleFirewall(machineId: string, enable: boolean): Observable { - return this.httpClient.post(`/api/my/machines/${instanceId}?action=${enable ? 'enable' : 'disable'}_firewall`, {}); + return this.httpClient.post(`/api/my/machines/${machineId}?action=${enable ? 'enable' : 'disable'}_firewall`, {}); } // ---------------------------------------------------------------------------------------------------------------- - toggleDeletionProtection(instanceId: string, enable: boolean): Observable + toggleDeletionProtection(machineId: string, enable: boolean): Observable { - return this.httpClient.post(`/api/my/machines/${instanceId}?action=${enable ? 'enable' : 'disable'}_deletion_protection`, {}); + return this.httpClient.post(`/api/my/machines/${machineId}?action=${enable ? 'enable' : 'disable'}_deletion_protection`, {}); } // ---------------------------------------------------------------------------------------------------------------- - getTags(instanceId: string): Observable + getTags(machineId: string): Observable { - return this.httpClient.get(`/api/my/machines/${instanceId}/tags`); + return this.httpClient.get(`/api/my/machines/${machineId}/tags`); } // ---------------------------------------------------------------------------------------------------------------- - getTag(instanceId: string, key: string): Observable + getTag(machineId: string, key: string): Observable { - return this.httpClient.get(`/api/my/machines/${instanceId}/tags/${key}`); + return this.httpClient.get(`/api/my/machines/${machineId}/tags/${key}`); } // ---------------------------------------------------------------------------------------------------------------- - addTags(instanceId: string, tags: any): Observable + addTags(machineId: string, tags: any): Observable { - return this.httpClient.post(`/api/my/machines/${instanceId}/tags`, tags); + return this.httpClient.post(`/api/my/machines/${machineId}/tags`, tags); } // ---------------------------------------------------------------------------------------------------------------- - replaceTags(instanceId: string, tags: any): Observable + replaceTags(machineId: string, tags: any): Observable { - return this.httpClient.put(`/api/my/machines/${instanceId}/tags`, tags); + return this.httpClient.put(`/api/my/machines/${machineId}/tags`, tags); } // ---------------------------------------------------------------------------------------------------------------- - deleteAllTags(instanceId: string): Observable + deleteAllTags(machineId: string): Observable { - return this.httpClient.delete(`/api/my/machines/${instanceId}/tags`); + return this.httpClient.delete(`/api/my/machines/${machineId}/tags`); } // ---------------------------------------------------------------------------------------------------------------- - deleteTag(instanceId: string, key: string): Observable + deleteTag(machineId: string, key: string): Observable { - return this.httpClient.delete(`/api/my/machines/${instanceId}/tags/${key}`); + return this.httpClient.delete(`/api/my/machines/${machineId}/tags/${key}`); } // ---------------------------------------------------------------------------------------------------------------- - getMetadata(instanceId: string): Observable + getMetadata(machineId: string): Observable { - return this.httpClient.get(`/api/my/machines/${instanceId}/metadata`); + return this.httpClient.get(`/api/my/machines/${machineId}/metadata`); } // ---------------------------------------------------------------------------------------------------------------- - getMetadataValue(instanceId: string, key: string): Observable + getMetadataValue(machineId: string, key: string): Observable { - return this.httpClient.get(`/api/my/machines/${instanceId}/metadata/${key}`); + return this.httpClient.get(`/api/my/machines/${machineId}/metadata/${key}`); } // ---------------------------------------------------------------------------------------------------------------- - replaceMetadata(instanceId: string, metadata: any): Observable + replaceMetadata(machineId: string, metadata: any): Observable { // First retrieve current metadata - return this.httpClient.get(`/api/my/machines/${instanceId}/metadata`) + return this.httpClient.get(`/api/my/machines/${machineId}/metadata`) .pipe(concatMap(existingMetadata => { // Compute which metadata the user chose to remove const obsoleteMetadata: Observable[] = []; for (const key of Object.keys(existingMetadata)) if (!metadata.hasOwnProperty(key) && key !== 'root_authorized_keys') // root_authorized_keys is readonly - obsoleteMetadata.push(this.httpClient.delete(`/api/my/machines/${instanceId}/metadata/${key}`)); + obsoleteMetadata.push(this.httpClient.delete(`/api/my/machines/${machineId}/metadata/${key}`)); // Any metadata keys passed in here are created if they do not exist, and overwritten if they do. - const metadataToUpsert = this.httpClient.post(`/api/my/machines/${instanceId}/metadata`, metadata); + const metadataToUpsert = this.httpClient.post(`/api/my/machines/${machineId}/metadata`, metadata); if (obsoleteMetadata.length) { @@ -240,15 +240,15 @@ export class InstancesService } // ---------------------------------------------------------------------------------------------------------------- - deleteAllMetadata(instanceId: string): Observable + deleteAllMetadata(machineId: string): Observable { - return this.httpClient.delete(`/api/my/machines/${instanceId}/metadata`); + return this.httpClient.delete(`/api/my/machines/${machineId}/metadata`); } // ---------------------------------------------------------------------------------------------------------------- - getAudit(instanceId: string): Observable + getAudit(machineId: string): Observable { - return this.httpClient.get(`/api/my/machines/${instanceId}/audit`); + return this.httpClient.get(`/api/my/machines/${machineId}/audit`); } // ---------------------------------------------------------------------------------------------------------------- @@ -268,8 +268,8 @@ export class InstancesService // ---------------------------------------------------------------------------------------------------------------- clearCache() { - instancesCacheBuster$.next(); + machinesCacheBuster$.next(); } } -export type InstanceCallbackFunction = ((instance: Instance) => void); +export type MachineCallbackFunction = ((machine: Machine) => void); diff --git a/app/src/app/instances/helpers/migrations.service.spec.ts b/app/src/app/machines/helpers/migrations.service.spec.ts similarity index 100% rename from app/src/app/instances/helpers/migrations.service.spec.ts rename to app/src/app/machines/helpers/migrations.service.spec.ts diff --git a/app/src/app/instances/helpers/migrations.service.ts b/app/src/app/machines/helpers/migrations.service.ts similarity index 73% rename from app/src/app/instances/helpers/migrations.service.ts rename to app/src/app/machines/helpers/migrations.service.ts index a660ccb..cee1e88 100644 --- a/app/src/app/instances/helpers/migrations.service.ts +++ b/app/src/app/machines/helpers/migrations.service.ts @@ -27,30 +27,30 @@ export class MigrationsService @Cacheable({ cacheBusterObserver: cacheBuster$ }) - getMigration(instanceId: string, migrationId: string): Observable + getMigration(machineId: string, migrationId: string): Observable { return this.httpClient.get(`/api/my/migrations/${migrationId}`); } // ---------------------------------------------------------------------------------------------------------------- - migrate(instanceId: string): Observable + migrate(machineId: string): Observable { // https://apidocs.Spearhead.com/cloudapi/#Migrate - return this.httpClient.post(`/api/my/machines/${instanceId}/migrate`, { action: 'begin | sync | switch | automatic | pause | abort | watch', affinity: [] }) + return this.httpClient.post(`/api/my/machines/${machineId}/migrate`, { action: 'begin | sync | switch | automatic | pause | abort | watch', affinity: [] }) .pipe(tap(() => cacheBuster$.next())); } // ---------------------------------------------------------------------------------------------------------------- - getMigrationProgress(instanceId: string): Observable + getMigrationProgress(machineId: string): Observable { // https://apidocs.Spearhead.com/cloudapi/#Migrate - return this.httpClient.get(`/api/my/machines/${instanceId}/migrate?action=watch`); + return this.httpClient.get(`/api/my/machines/${machineId}/migrate?action=watch`); } // ---------------------------------------------------------------------------------------------------------------- - finalizeMigration(instanceId: string): Observable + finalizeMigration(machineId: string): Observable { - return this.httpClient.post(`/api/my/machines/${instanceId}/migrate?action=finalize`, {}) + return this.httpClient.post(`/api/my/machines/${machineId}/migrate?action=finalize`, {}) .pipe(tap(() => cacheBuster$.next())); } } diff --git a/app/src/app/instances/helpers/snapshots.service.spec.ts b/app/src/app/machines/helpers/snapshots.service.spec.ts similarity index 100% rename from app/src/app/instances/helpers/snapshots.service.spec.ts rename to app/src/app/machines/helpers/snapshots.service.spec.ts diff --git a/app/src/app/instances/helpers/snapshots.service.ts b/app/src/app/machines/helpers/snapshots.service.ts similarity index 64% rename from app/src/app/instances/helpers/snapshots.service.ts rename to app/src/app/machines/helpers/snapshots.service.ts index 548acb3..204fc19 100644 --- a/app/src/app/instances/helpers/snapshots.service.ts +++ b/app/src/app/machines/helpers/snapshots.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { Snapshot } from '../models/snapshot'; -import { Instance } from '../models/instance'; +import { Machine } from '../models/machine'; import { delay, filter, map, repeatWhen, take, tap } from 'rxjs/operators'; import { Cacheable } from 'ts-cacheable'; @@ -20,25 +20,25 @@ export class SnapshotsService @Cacheable({ cacheBusterObserver: cacheBuster$ }) - getSnapshots(instanceId: string): Observable + getSnapshots(machineId: string): Observable { - return this.httpClient.get(`/api/my/machines/${instanceId}/snapshots`); + return this.httpClient.get(`/api/my/machines/${machineId}/snapshots`); } // ---------------------------------------------------------------------------------------------------------------- @Cacheable({ cacheBusterObserver: cacheBuster$ }) - getSnapshot(instanceId: string, snapshotName: string): Observable + getSnapshot(machineId: string, snapshotName: string): Observable { - return this.httpClient.get(`/api/my/machines/${instanceId}/snapshots/${encodeURIComponent(snapshotName)}`); + return this.httpClient.get(`/api/my/machines/${machineId}/snapshots/${encodeURIComponent(snapshotName)}`); } // ---------------------------------------------------------------------------------------------------------------- - getSnapshotUntilExpectedState(instance: Instance, snapshot: Snapshot, expectedStates: string[], maxRetries = 10): Observable + getSnapshotUntilExpectedState(machine: Machine, snapshot: Snapshot, expectedStates: string[], maxRetries = 10): Observable { // Keep polling the snapshot until it reaches the expected state - return this.httpClient.get(`/api/my/machines/${instance.id}/snapshots/${encodeURIComponent(snapshot.name)}`) + return this.httpClient.get(`/api/my/machines/${machine.id}/snapshots/${encodeURIComponent(snapshot.name)}`) .pipe( tap(x => { @@ -65,23 +65,23 @@ export class SnapshotsService } // ---------------------------------------------------------------------------------------------------------------- - createSnapshot(instanceId: string, snapshotName: string): Observable + createSnapshot(machineId: string, snapshotName: string): Observable { - return this.httpClient.post(`/api/my/machines/${instanceId}/snapshots?name=${encodeURIComponent(snapshotName)}`, {}) + return this.httpClient.post(`/api/my/machines/${machineId}/snapshots?name=${encodeURIComponent(snapshotName)}`, {}) .pipe(tap(() => cacheBuster$.next())); } // ---------------------------------------------------------------------------------------------------------------- - deleteSnapshot(instanceId: string, snapshotName: string): Observable + deleteSnapshot(machineId: string, snapshotName: string): Observable { - return this.httpClient.delete(`/api/my/machines/${instanceId}/snapshots/${encodeURIComponent(snapshotName)}`) + return this.httpClient.delete(`/api/my/machines/${machineId}/snapshots/${encodeURIComponent(snapshotName)}`) .pipe(tap(() => cacheBuster$.next())); } // ---------------------------------------------------------------------------------------------------------------- - startFromSnapshot(instanceId: string, snapshotName: string): Observable + startFromSnapshot(machineId: string, snapshotName: string): Observable { - return this.httpClient.post(`/api/my/machines/${instanceId}/snapshots/${encodeURIComponent(snapshotName)}`, {}) + return this.httpClient.post(`/api/my/machines/${machineId}/snapshots/${encodeURIComponent(snapshotName)}`, {}) .pipe(tap(() => cacheBuster$.next())); } } diff --git a/app/src/app/instances/instance-history/instance-history.component.html b/app/src/app/machines/machine-history/machine-history.component.html similarity index 100% rename from app/src/app/instances/instance-history/instance-history.component.html rename to app/src/app/machines/machine-history/machine-history.component.html diff --git a/app/src/app/instances/instance-history/instance-history.component.scss b/app/src/app/machines/machine-history/machine-history.component.scss similarity index 100% rename from app/src/app/instances/instance-history/instance-history.component.scss rename to app/src/app/machines/machine-history/machine-history.component.scss diff --git a/app/src/app/machines/machine-history/machine-history.component.spec.ts b/app/src/app/machines/machine-history/machine-history.component.spec.ts new file mode 100644 index 0000000..a7dd6bf --- /dev/null +++ b/app/src/app/machines/machine-history/machine-history.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MachineHistoryComponent } from './machine-history.component'; + +describe('MachineHistoryComponent', () => { + let component: MachineHistoryComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ MachineHistoryComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(MachineHistoryComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/app/src/app/instances/instance-history/instance-history.component.ts b/app/src/app/machines/machine-history/machine-history.component.ts similarity index 79% rename from app/src/app/instances/instance-history/instance-history.component.ts rename to app/src/app/machines/machine-history/machine-history.component.ts index 9b11085..8a223d8 100644 --- a/app/src/app/instances/instance-history/instance-history.component.ts +++ b/app/src/app/machines/machine-history/machine-history.component.ts @@ -3,19 +3,19 @@ import { BsModalRef } from 'ngx-bootstrap/modal'; import { NavigationStart, Router } from '@angular/router'; import { Subject } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; -import { Instance } from '../models/instance'; -import { InstancesService } from '../helpers/instances.service'; +import { Machine } from '../models/machine'; +import { MachinesService } from '../helpers/machines.service'; import { ToastrService } from 'ngx-toastr'; @Component({ - selector: 'app-instance-history', - templateUrl: './instance-history.component.html', - styleUrls: ['./instance-history.component.scss'] + selector: 'app-machine-history', + templateUrl: './machine-history.component.html', + styleUrls: ['./machine-history.component.scss'] }) -export class InstanceHistoryComponent implements OnInit, OnDestroy +export class MachineHistoryComponent implements OnInit, OnDestroy { @Input() - instance: Instance; + machine: Machine; loading: boolean; history: any[]; @@ -25,7 +25,7 @@ export class InstanceHistoryComponent implements OnInit, OnDestroy // ---------------------------------------------------------------------------------------------------------------- constructor(private readonly modalRef: BsModalRef, private readonly router: Router, - private readonly instancesService: InstancesService, + private readonly machinesService: MachinesService, private readonly toastr: ToastrService) { // When the user navigates away from this route, hide the modal @@ -48,7 +48,7 @@ export class InstanceHistoryComponent implements OnInit, OnDestroy { this.loading = true; - this.instancesService.getAudit(this.instance.id) + this.machinesService.getAudit(this.machine.id) .subscribe(x => { this.history = x; diff --git a/app/src/app/instances/instance-info/instance-info.component.html b/app/src/app/machines/machine-info/machine-info.component.html similarity index 71% rename from app/src/app/instances/instance-info/instance-info.component.html rename to app/src/app/machines/machine-info/machine-info.component.html index f7e3cd6..e2ab5aa 100644 --- a/app/src/app/instances/instance-info/instance-info.component.html +++ b/app/src/app/machines/machine-info/machine-info.component.html @@ -1,19 +1,19 @@
    • Machine identifier
    • - {{ instance.id }} + {{ machine.id }}
    • DNS list
    • + *ngFor="let keyValue of machine.dnsList | keyvalue; let index = index">
      - -
      +
      -
      -
      - -
      -
      - -
      -
      - -
      -
      - +
      +
      +
      + + + {{ (affinityRule.value.description.strict ? 'affinityRuleEditor.strict' : 'affinityRuleEditor.optional') | translate }} + + + {{ (affinityRule.value.description.closeTo ? 'affinityRuleEditor.closeTo' : 'affinityRuleEditor.farFrom') | translate }} + + + {{ (affinityRule.value.description.targetMachine ? 'affinityRuleEditor.namedLike' : 'affinityRuleEditor.taggedWith') | translate }} + + + {{ affinityRule.value.description.tagName }}={{ affinityRule.value.description.value }} + + + {{ affinityRule.value.description.value }} + + + + +
      +
      diff --git a/app/src/app/instances/instance-wizard/instance-wizard.component.scss b/app/src/app/machines/machine-wizard/machine-wizard.component.scss similarity index 100% rename from app/src/app/instances/instance-wizard/instance-wizard.component.scss rename to app/src/app/machines/machine-wizard/machine-wizard.component.scss diff --git a/app/src/app/instances/instance-wizard/instance-wizard.component.spec.ts b/app/src/app/machines/machine-wizard/machine-wizard.component.spec.ts similarity index 52% rename from app/src/app/instances/instance-wizard/instance-wizard.component.spec.ts rename to app/src/app/machines/machine-wizard/machine-wizard.component.spec.ts index 04e6156..94e6759 100644 --- a/app/src/app/instances/instance-wizard/instance-wizard.component.spec.ts +++ b/app/src/app/machines/machine-wizard/machine-wizard.component.spec.ts @@ -1,20 +1,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { InstanceWizardComponent } from './instance-wizard.component'; +import { MachineWizardComponent } from './machine-wizard.component'; -describe('InstanceWizardComponent', () => { - let component: InstanceWizardComponent; - let fixture: ComponentFixture; +describe('MachineWizardComponent', () => { + let component: MachineWizardComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ InstanceWizardComponent ] + declarations: [ MachineWizardComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(InstanceWizardComponent); + fixture = TestBed.createComponent(MachineWizardComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/app/src/app/instances/instance-wizard/instance-wizard.component.ts b/app/src/app/machines/machine-wizard/machine-wizard.component.ts similarity index 85% rename from app/src/app/instances/instance-wizard/instance-wizard.component.ts rename to app/src/app/machines/machine-wizard/machine-wizard.component.ts index f7282bd..9f6832f 100644 --- a/app/src/app/instances/instance-wizard/instance-wizard.component.ts +++ b/app/src/app/machines/machine-wizard/machine-wizard.component.ts @@ -2,11 +2,11 @@ import { Component, OnInit, Input, Output, EventEmitter, OnDestroy } from '@angu import { BsModalRef } from 'ngx-bootstrap/modal'; import { combineLatest, forkJoin, Subject } from 'rxjs'; import { FormGroup, FormBuilder, Validators, AbstractControl, FormArray, ValidatorFn, ValidationErrors } from '@angular/forms'; -import { Instance } from '../models/instance'; +import { Machine } from '../models/machine'; import { filter, takeUntil, startWith, distinctUntilChanged } from 'rxjs/operators'; import { NavigationStart, Router } from '@angular/router'; import { FileSizePipe } from '../../pipes/file-size.pipe'; -import { InstancesService } from '../helpers/instances.service'; +import { MachinesService } from '../helpers/machines.service'; import { CatalogService } from '../../catalog/helpers/catalog.service'; import { NetworkingService } from '../../networking/helpers/networking.service'; import { ToastrService } from 'ngx-toastr'; @@ -16,11 +16,11 @@ import { TranslateService } from '@ngx-translate/core'; import { CatalogImageType } from '../../catalog/models/image'; @Component({ - selector: 'app-instance-wizard', - templateUrl: './instance-wizard.component.html', - styleUrls: ['./instance-wizard.component.scss'] + selector: 'app-machine-wizard', + templateUrl: './machine-wizard.component.html', + styleUrls: ['./machine-wizard.component.scss'] }) -export class InstanceWizardComponent implements OnInit, OnDestroy +export class MachineWizardComponent implements OnInit, OnDestroy { @Input() add: boolean; @@ -29,7 +29,7 @@ export class InstanceWizardComponent implements OnInit, OnDestroy imageType = 1; @Input() - instance: Instance; + machine: Machine; private images: any[]; imageList: any[]; @@ -39,12 +39,12 @@ export class InstanceWizardComponent implements OnInit, OnDestroy packageList: any[]; packageGroups: any[]; - instances: Instance[]; + machines: Machine[]; dataCenters: any[]; loadingIndicator: boolean; loadingPackages: boolean; - save = new Subject(); + save = new Subject(); working: boolean; editorForm: FormGroup; currentStep = 1; @@ -63,7 +63,7 @@ export class InstanceWizardComponent implements OnInit, OnDestroy private readonly fb: FormBuilder, private readonly fileSizePipe: FileSizePipe, private readonly authService: AuthService, - private readonly instancesService: InstancesService, + private readonly machinesService: MachinesService, private readonly catalogService: CatalogService, private readonly networkingService: NetworkingService, private readonly volumesService: VolumesService, @@ -109,15 +109,15 @@ export class InstanceWizardComponent implements OnInit, OnDestroy // ---------------------------------------------------------------------------------------------------------------- private createForm() { - const tags = this.fb.array(this.instance - ? Object.keys(this.instance.tags) - .map(key => this.fb.group({ key, value: this.instance.tags[key] })) + const tags = this.fb.array(this.machine + ? Object.keys(this.machine.tags) + .map(key => this.fb.group({ key, value: this.machine.tags[key] })) : []); - const metadata = this.fb.array(this.instance - ? Object.keys(this.instance.metadata) + const metadata = this.fb.array(this.machine + ? Object.keys(this.machine.metadata) .filter(key => key !== 'root_authorized_keys') // This shouldn't be cloned - .map(key => this.fb.group({ key, value: this.instance.metadata[key] })) + .map(key => this.fb.group({ key, value: this.machine.metadata[key] })) : []); this.editorForm = this.fb.group( @@ -129,14 +129,9 @@ export class InstanceWizardComponent implements OnInit, OnDestroy name: [null, Validators.required], networks: this.fb.array([], { validators: this.atLeastOneSelectionValidator.bind(this) }), firewallRules: this.fb.array([]), - cloudFirewall: [this.instance?.firewall_enabled], + cloudFirewall: [this.machine?.firewall_enabled], volumes: this.fb.array([]), - affinity: this.fb.group( - { - strict: [{ value: false, disabled: true }], - closeTo: [], - farFrom: [] - }), + affinityRules: this.fb.array([]), dataCenter: [], tags, metadata, @@ -281,14 +276,6 @@ export class InstanceWizardComponent implements OnInit, OnDestroy this.computeEstimatedCost(); }); - this.editorForm.get(['affinity', 'farFrom']).valueChanges.pipe(startWith(null)) - .pipe(takeUntil(this.destroy$)) - .subscribe(this.setAffinity.bind(this)); - - this.editorForm.get(['affinity', 'closeTo']).valueChanges.pipe(startWith(null)) - .pipe(takeUntil(this.destroy$)) - .subscribe(this.setAffinity.bind(this)); - this.editorForm.get('estimatedMinutesRan').valueChanges .pipe(takeUntil(this.destroy$)) .subscribe(this.computeEstimatedCost.bind(this)); @@ -325,15 +312,6 @@ export class InstanceWizardComponent implements OnInit, OnDestroy return null; } - // ---------------------------------------------------------------------------------------------------------------- - private setAffinity(affinity) - { - if (affinity) - this.editorForm.get(['affinity', 'strict']).enable(); - else - this.editorForm.get(['affinity', 'strict']).disable(); - } - // ---------------------------------------------------------------------------------------------------------------- close() { @@ -347,22 +325,22 @@ export class InstanceWizardComponent implements OnInit, OnDestroy const changes = this.editorForm.getRawValue(); - const instance: any = {}; - instance.name = changes.name; - instance.image = changes.image.id; - instance.package = changes.package.id; - //instance.brand = changes.package.brand; - instance.networks = changes.networks.filter(x => x.selected).map(x => x.id); - instance.firewall_enabled = !!changes.cloudFirewall; + const machine: any = {}; + machine.name = changes.name; + machine.image = changes.image.id; + machine.package = changes.package.id; + //machine.brand = changes.package.brand; + machine.networks = changes.networks.filter(x => x.selected).map(x => x.id); + machine.firewall_enabled = !!changes.cloudFirewall; for (const tag of changes.tags) - instance[`tag.${tag.key}`] = tag.value; + machine[`tag.${tag.key}`] = tag.value; for (const metadata of changes.metadata) - instance[`metadata.${metadata.key}`] = metadata.value; + machine[`metadata.${metadata.key}`] = metadata.value; if (!this.kvmRequired) - instance.volumes = changes.volumes + machine.volumes = changes.volumes .filter(x => x.mount) .map(volume => ({ @@ -372,9 +350,9 @@ export class InstanceWizardComponent implements OnInit, OnDestroy mountpoint: volume.mountpoint })); - console.log(this.editorForm.get('affinity')); + machine.affinity = changes.affinityRules.map(x => x.rule); - this.instancesService.add(instance) + this.machinesService.add(machine) .subscribe(x => { this.working = false; @@ -406,10 +384,10 @@ export class InstanceWizardComponent implements OnInit, OnDestroy if (this.currentStep < this.steps.length) return; - this.readyText = this.translateService.instant('dashboard.wizard.ready', { + this.readyText = this.translateService.instant('machines.wizard.ready', { imageType: this.editorForm.get('imageType').value == 1 - ? this.translateService.instant('dashboard.wizard.readyImageTypeContainer') - : this.translateService.instant('dashboard.wizard.readyImageTypeVm'), + ? this.translateService.instant('machines.wizard.readyImageTypeContainer') + : this.translateService.instant('machines.wizard.readyImageTypeVm'), packageDescription: this.editorForm.get('package').value.description || `${this.editorForm.get('package').value.vcpus || 1} vCPUs, ` + `${this.fileSizePipe.transform(this.editorForm.get('package').value.memory * 1024 * 1024)} RAM, ` + @@ -427,7 +405,7 @@ export class InstanceWizardComponent implements OnInit, OnDestroy this.editorForm.get('package').setValue(selection); - if (this.instance) + if (this.machine) this.nextStep(); } @@ -469,6 +447,25 @@ export class InstanceWizardComponent implements OnInit, OnDestroy array.removeAt(index); } + // ---------------------------------------------------------------------------------------------------------------- + addAffinityRule(affinityRule) + { + const array = this.editorForm.get('affinityRules') as FormArray; + + array.push(this.fb.group({ + description: [affinityRule], + rule: [affinityRule.rule] + })); + } + + // ---------------------------------------------------------------------------------------------------------------- + removeAffinityRule(index) + { + const array = this.editorForm.get('affinityRules') as FormArray; + + array.removeAt(index); + } + // ---------------------------------------------------------------------------------------------------------------- private getImages() { @@ -482,9 +479,9 @@ export class InstanceWizardComponent implements OnInit, OnDestroy // Set the default image type (this will trigger a series of events) this.editorForm.get('imageType').setValue(this.imageType); - if (this.instance) + if (this.machine) { - const image = this.images.find(x => x.id === this.instance.image); + const image = this.images.find(x => x.id === this.machine.image); this.editorForm.get('image').setValue(image); } @@ -528,18 +525,18 @@ export class InstanceWizardComponent implements OnInit, OnDestroy } // ---------------------------------------------------------------------------------------------------------------- - private getInstancesAndDataCenters() + private getMachinesAndDataCenters() { - if (this.instances || this.dataCenters) + if (this.machines || this.dataCenters) return; - forkJoin( - this.instancesService.get(), + forkJoin([ + this.machinesService.get(), this.catalogService.getDataCenters() - ) + ]) .subscribe(response => { - this.instances = response[0]; + this.machines = response[0]; this.dataCenters = Object.keys(response[1]); @@ -596,18 +593,18 @@ export class InstanceWizardComponent implements OnInit, OnDestroy this.getNetworksAndFirewallRules(); - this.getInstancesAndDataCenters(); + this.getMachinesAndDataCenters(); this.getVolumes(); - if (this.instance) + if (this.machine) { - if (this.instance.type === 'smartmachine') + if (this.machine.type === 'smartmachine') this.imageType = 1; - else if (this.instance.type === 'virtualmachine') + else if (this.machine.type === 'virtualmachine') this.imageType = 2; - this.preselectedPackage = this.instance.package; + this.preselectedPackage = this.machine.package; this.nextStep(); } diff --git a/app/src/app/instances/instances.component.html b/app/src/app/machines/machines.component.html similarity index 68% rename from app/src/app/instances/instances.component.html rename to app/src/app/machines/machines.component.html index 3cfd595..8dc7952 100644 --- a/app/src/app/instances/instances.component.html +++ b/app/src/app/machines/machines.component.html @@ -9,7 +9,7 @@ - +
      @@ -85,61 +85,61 @@
      -

      - {{ 'dashboard.list.noResults' | translate }} +

      + {{ 'machines.list.noResults' | translate }}

      - -
      -
      + (canLoad)="machine.loading = false" (unload)="machine.loading = true" + (load)="loadMachineDetails(machine)"> +
      -
      - {{ instance.name }} + {{ machine.name }}
      -
      -
      - {{ instance.imageDetails.name }}, v{{ instance.imageDetails.version }} + {{ machine.imageDetails.name }}, v{{ machine.imageDetails.version }}
      -
      -
      +
      @@ -147,35 +147,35 @@
      - + - + - + - +
      - -
      - - @@ -186,51 +186,51 @@
      - - + + Info
      - - + +
      - + Network
      - - + +
      - + Snapshots
      - - + +
      - + Migrations @@ -239,8 +239,8 @@
      - + Volumes @@ -248,7 +248,7 @@
      • + *ngFor="let volume of machine.volumes">
        @@ -275,57 +275,57 @@
        -
        {{ 'dashboard.list.filterByState' | translate }}
        +
        {{ 'machines.list.filterByState' | translate }}
        -
        {{ 'dashboard.list.filterByMemory' | translate }}
        +
        {{ 'machines.list.filterByMemory' | translate }}
         -
        {{ 'dashboard.list.filterByDisk' | translate }}
        +
        {{ 'machines.list.filterByDisk' | translate }}
                 @@ -333,7 +333,7 @@
        @@ -344,66 +344,66 @@
      - + diff --git a/app/src/app/instances/instances.component.scss b/app/src/app/machines/machines.component.scss similarity index 100% rename from app/src/app/instances/instances.component.scss rename to app/src/app/machines/machines.component.scss diff --git a/app/src/app/instances/instances.component.spec.ts b/app/src/app/machines/machines.component.spec.ts similarity index 55% rename from app/src/app/instances/instances.component.spec.ts rename to app/src/app/machines/machines.component.spec.ts index 6782877..bacd64c 100644 --- a/app/src/app/instances/instances.component.spec.ts +++ b/app/src/app/machines/machines.component.spec.ts @@ -1,20 +1,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { InstancesComponent } from './instances.component'; +import { MachinesComponent } from './machines.component'; -describe('InstancesComponent', () => { - let component: InstancesComponent; - let fixture: ComponentFixture; +describe('MachinesComponent', () => { + let component: MachinesComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ InstancesComponent ] + declarations: [ MachinesComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(InstancesComponent); + fixture = TestBed.createComponent(MachinesComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/app/src/app/instances/instances.component.ts b/app/src/app/machines/machines.component.ts similarity index 67% rename from app/src/app/instances/instances.component.ts rename to app/src/app/machines/machines.component.ts index 20a0864..1305a7d 100644 --- a/app/src/app/instances/instances.component.ts +++ b/app/src/app/machines/machines.component.ts @@ -1,17 +1,17 @@ import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core'; -import { InstancesService } from './helpers/instances.service'; +import { MachinesService } from './helpers/machines.service'; import { BsModalService } from 'ngx-bootstrap/modal'; import { debounceTime, delay, distinctUntilChanged, first, map, switchMap, takeUntil, tap } from 'rxjs/operators'; -import { InstanceWizardComponent } from './instance-wizard/instance-wizard.component'; -import { Instance } from './models/instance'; +import { MachineWizardComponent } from './machine-wizard/machine-wizard.component'; +import { Machine } from './models/machine'; import { forkJoin, Subject } from 'rxjs'; import { ToastrService } from 'ngx-toastr'; import { CatalogService } from '../catalog/helpers/catalog.service'; import { PackageSelectorComponent } from './package-selector/package-selector.component'; import { PromptDialogComponent } from '../components/prompt-dialog/prompt-dialog.component'; -import { InstanceTagEditorComponent } from './instance-tag-editor/instance-tag-editor.component'; +import { MachineTagEditorComponent } from './machine-tag-editor/machine-tag-editor.component'; import { ConfirmationDialogComponent } from '../components/confirmation-dialog/confirmation-dialog.component'; -import { InstanceHistoryComponent } from './instance-history/instance-history.component'; +import { MachineHistoryComponent } from './machine-history/machine-history.component'; import { CustomImageEditorComponent } from '../catalog/custom-image-editor/custom-image-editor.component'; import { VirtualScrollerComponent } from 'ngx-virtual-scroller'; import { FormGroup, FormBuilder } from '@angular/forms'; @@ -24,18 +24,18 @@ import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; @Component({ - selector: 'app-instances', - templateUrl: './instances.component.html', - styleUrls: ['./instances.component.scss'] + selector: 'app-machines', + templateUrl: './machines.component.html', + styleUrls: ['./machines.component.scss'] }) -export class InstancesComponent implements OnInit, OnDestroy +export class MachinesComponent implements OnInit, OnDestroy { @ViewChild(VirtualScrollerComponent) private virtualScroller: VirtualScrollerComponent; loadingIndicator = true; - instances: Instance[] = []; - listItems: Instance[]; + machines: Machine[] = []; + listItems: Machine[]; images = []; packages = []; volumes = []; @@ -44,9 +44,9 @@ export class InstancesComponent implements OnInit, OnDestroy editorForm: FormGroup; showMachineDetails: boolean; fullDetailsTwoColumns: boolean; - runningInstanceCount = 0; - stoppedInstanceCount = 0; - instanceStateArray: string[] = []; + runningMachineCount = 0; + stoppedMachineCount = 0; + machineStateArray: string[] = []; memoryFilterOptions: Options = { animate: false, stepsArray: [], @@ -68,7 +68,7 @@ export class InstancesComponent implements OnInit, OnDestroy private readonly fuseJsOptions: {}; // ---------------------------------------------------------------------------------------------------------------- - constructor(private readonly instancesService: InstancesService, + constructor(private readonly machinesService: MachinesService, private readonly catalogService: CatalogService, private readonly volumesService: VolumesService, private readonly modalService: BsModalService, @@ -78,7 +78,7 @@ export class InstancesComponent implements OnInit, OnDestroy private readonly titleService: Title, private readonly translationService: TranslateService) { - translationService.get('dashboard.title').pipe(first()).subscribe(x => titleService.setTitle(`Spearhead - ${x}`)); + translationService.get('machines.title').pipe(first()).subscribe(x => titleService.setTitle(`Spearhead - ${x}`)); this.lazyLoadDelay = this.minimumLazyLoadDelay; @@ -109,7 +109,7 @@ export class InstancesComponent implements OnInit, OnDestroy { const formattedValue = this.fileSizePipe.transform(value * 1024 * 1024); - if (this.instances.length === 1) + if (this.machines.length === 1) return formattedValue; switch (label) @@ -124,28 +124,28 @@ export class InstancesComponent implements OnInit, OnDestroy } // ---------------------------------------------------------------------------------------------------------------- - private getInstances() + private getMachines() { - this.instancesService.get() - .subscribe(instances => + this.machinesService.get() + .subscribe(machines => { //// DEMO ONLY !!!!! //const arr = new Array(200); //for (let j = 0; j < 200; j++) //{ - // const el = { ...instances[0] }; + // const el = { ...machines[0] }; // el.name = this.dummyNames[j]; // arr[j] = el; //}/**/ //// DEMO ONLY !!!!! - this.instances = instances.map(instance => + this.machines = machines.map(machine => { - instance.metadataKeys = Object.keys(instance.metadata); - instance.tagKeys = Object.keys(instance.tags); + machine.metadataKeys = Object.keys(machine.metadata); + machine.tagKeys = Object.keys(machine.tags); - instance.loading = true; // Required for improved scrolling experience - return instance; + machine.loading = true; // Required for improved scrolling experience + return machine; }); this.getImagesPackagesAndVolumes(); @@ -172,8 +172,8 @@ export class InstancesComponent implements OnInit, OnDestroy this.packages = response.packages; this.volumes = response.volumes; - for (const instance of this.instances) - this.fillInInstanceDetails(instance); + for (const machine of this.machines) + this.fillInMachineDetails(machine); }); } @@ -191,7 +191,7 @@ export class InstancesComponent implements OnInit, OnDestroy typeFilter: [], memoryFilter: [[0, 0]], diskFilter: [[0, 0]], - imageFilter: [], // instances provisioned with a certain image + imageFilter: [], // machines provisioned with a certain image }), filtersActive: [false], showMachineDetails: [this.showMachineDetails], @@ -255,18 +255,18 @@ export class InstancesComponent implements OnInit, OnDestroy // ---------------------------------------------------------------------------------------------------------------- private applyFiltersAndSort() { - let listItems: Instance[] = null; + let listItems: Machine[] = null; const searchTerm = this.editorForm.get('searchTerm').value; if (searchTerm.length >= 2) { - const fuse = new Fuse(this.instances, this.fuseJsOptions); + const fuse = new Fuse(this.machines, this.fuseJsOptions); const fuseResults = fuse.search(searchTerm); listItems = fuseResults.map(x => x.item); } if (!listItems) - listItems = [...this.instances]; + listItems = [...this.machines]; const stateFilter = this.editorForm.get(['filters', 'stateFilter']).value; if (stateFilter) @@ -326,43 +326,43 @@ export class InstancesComponent implements OnInit, OnDestroy } // ---------------------------------------------------------------------------------------------------------------- - prepareForLoading(instances: Instance[]) + prepareForLoading(machines: Machine[]) { - for (const instance of instances) - instance.loading = true; + for (const machine of machines) + machine.loading = true; - return instances; + return machines; } // ---------------------------------------------------------------------------------------------------------------- - trackByFunction = (index: number, instance: Instance) => instance.name; + trackByFunction = (index: number, machine: Machine) => machine.name; // ---------------------------------------------------------------------------------------------------------------- private computeFiltersOptions(computeOnlyState = false) { - this.runningInstanceCount = 0; - this.stoppedInstanceCount = 0; - this.instanceStateArray = []; + this.runningMachineCount = 0; + this.stoppedMachineCount = 0; + this.machineStateArray = []; const memoryValues = {}; const diskValues = {}; - for (const instance of this.instances) + for (const machine of this.machines) { - if (instance.state === 'running') - this.runningInstanceCount++; + if (machine.state === 'running') + this.runningMachineCount++; - if (instance.state === 'stopped') - this.stoppedInstanceCount++; + if (machine.state === 'stopped') + this.stoppedMachineCount++; - if (!~this.instanceStateArray.indexOf(instance.state)) - this.instanceStateArray.push(instance.state); + if (!~this.machineStateArray.indexOf(machine.state)) + this.machineStateArray.push(machine.state); - if (!computeOnlyState && !memoryValues[instance.memory]) - memoryValues[instance.memory] = true; + if (!computeOnlyState && !memoryValues[machine.memory]) + memoryValues[machine.memory] = true; - if (!computeOnlyState && !diskValues[instance.disk]) - diskValues[instance.disk] = true; + if (!computeOnlyState && !diskValues[machine.disk]) + diskValues[machine.disk] = true; } if (computeOnlyState) @@ -386,21 +386,21 @@ export class InstancesComponent implements OnInit, OnDestroy } // ---------------------------------------------------------------------------------------------------------------- - startMachine(instance: Instance) + startMachine(machine: Machine) { - if (instance.state !== 'stopped') + if (machine.state !== 'stopped') return; - instance.working = true; - this.toastr.info(`Starting machine "${instance.name}"...`); + machine.working = true; + this.toastr.info(`Starting machine "${machine.name}"...`); - this.instancesService.start(instance.id) + this.machinesService.start(machine.id) .pipe( delay(1000), switchMap(() => - this.instancesService.getInstanceUntilExpectedState(instance, ['running'], x => + this.machinesService.getMachineUntilExpectedState(machine, ['running'], x => { - instance.state = x.state; + machine.state = x.state; this.computeFiltersOptions(); }) @@ -411,32 +411,32 @@ export class InstancesComponent implements OnInit, OnDestroy { this.computeFiltersOptions(); - instance.working = false; - this.toastr.info(`The machine "${instance.name}" has been started`); + machine.working = false; + this.toastr.info(`The machine "${machine.name}" has been started`); }, err => { this.computeFiltersOptions(); - instance.working = false; - this.toastr.error(`Machine "${instance.name}" error: ${err.error.message}`); + machine.working = false; + this.toastr.error(`Machine "${machine.name}" error: ${err.error.message}`); }); } // ---------------------------------------------------------------------------------------------------------------- - restartMachine(instance: Instance) + restartMachine(machine: Machine) { - if (instance.state !== 'running') + if (machine.state !== 'running') return; - instance.working = true; - this.toastr.info(`Restarting machine "${instance.name}"...`); + machine.working = true; + this.toastr.info(`Restarting machine "${machine.name}"...`); - this.instancesService.reboot(instance.id) + this.machinesService.reboot(machine.id) .pipe( delay(1000), - switchMap(() => this.instancesService.getInstanceUntilExpectedState(instance, ['running'], x => + switchMap(() => this.machinesService.getMachineUntilExpectedState(machine, ['running'], x => { - instance.state = x.state; + machine.state = x.state; this.computeFiltersOptions(); }) @@ -447,33 +447,33 @@ export class InstancesComponent implements OnInit, OnDestroy { this.computeFiltersOptions(); - instance.working = false; + machine.working = false; - this.toastr.info(`The machine "${instance.name}" has been restarted`); + this.toastr.info(`The machine "${machine.name}" has been restarted`); }, err => { this.computeFiltersOptions(); - instance.working = false; - this.toastr.error(`Machine "${instance.name}" error: ${err.error.message}`); + machine.working = false; + this.toastr.error(`Machine "${machine.name}" error: ${err.error.message}`); }); } // ---------------------------------------------------------------------------------------------------------------- - stopMachine(instance: Instance) + stopMachine(machine: Machine) { - if (instance.state !== 'running') + if (machine.state !== 'running') return; - instance.working = true; - this.toastr.info(`Stopping machine "${instance.name}"`); + machine.working = true; + this.toastr.info(`Stopping machine "${machine.name}"`); - this.instancesService.stop(instance.id) + this.machinesService.stop(machine.id) .pipe( delay(1000), - switchMap(() => this.instancesService.getInstanceUntilExpectedState(instance, ['stopped'], x => + switchMap(() => this.machinesService.getMachineUntilExpectedState(machine, ['stopped'], x => { - instance.state = x.state; + machine.state = x.state; this.computeFiltersOptions(); }) @@ -484,25 +484,25 @@ export class InstancesComponent implements OnInit, OnDestroy { this.computeFiltersOptions(); - instance.working = false; - this.toastr.info(`The machine "${instance.name}" has been stopped`); + machine.working = false; + this.toastr.info(`The machine "${machine.name}" has been stopped`); }, err => { this.computeFiltersOptions(); - instance.working = false; - this.toastr.error(`Machine "${instance.name}" error: ${err.error.message}`); + machine.working = false; + this.toastr.error(`Machine "${machine.name}" error: ${err.error.message}`); }); } // ---------------------------------------------------------------------------------------------------------------- - resizeMachine(instance: Instance) + resizeMachine(machine: Machine) { const modalConfig = { ignoreBackdropClick: true, keyboard: false, animated: true, - initialState: { instance } + initialState: { machine } }; const modalRef = this.modalService.show(PackageSelectorComponent, modalConfig); @@ -512,43 +512,43 @@ export class InstancesComponent implements OnInit, OnDestroy .pipe( tap(() => { - this.toastr.info(`Changing specifications for machine "${instance.name}"...`); - instance.working = true; + this.toastr.info(`Changing specifications for machine "${machine.name}"...`); + machine.working = true; }), first(), - switchMap(pkg => this.instancesService.resize(instance.id, pkg.id).pipe(map(() => pkg))) + switchMap(pkg => this.machinesService.resize(machine.id, pkg.id).pipe(map(() => pkg))) ) .subscribe(pkg => { - instance.package = pkg.name; - instance.memory = pkg.memory; - instance.disk = pkg.disk; + machine.package = pkg.name; + machine.memory = pkg.memory; + machine.disk = pkg.disk; - this.fillInInstanceDetails(instance); + this.fillInMachineDetails(machine); this.computeFiltersOptions(); - instance.working = false; - this.toastr.info(`The specifications for machine "${instance.name}" have been changed`); + machine.working = false; + this.toastr.info(`The specifications for machine "${machine.name}" have been changed`); }, err => { - instance.working = false; + machine.working = false; const errorDetails = err.error?.message ? `(${err.error.message})` : ''; - this.toastr.error(`Couldn't change the specifications for machine "${instance.name}" ${errorDetails}`); + this.toastr.error(`Couldn't change the specifications for machine "${machine.name}" ${errorDetails}`); }); } // ---------------------------------------------------------------------------------------------------------------- - renameMachine(instance: Instance) + renameMachine(machine: Machine) { - const instanceName = instance.name; + const machineName = machine.name; const modalConfig = { ignoreBackdropClick: true, keyboard: false, animated: true, initialState: { - value: instanceName, + value: machineName, required: true, title: 'Rename machine', prompt: 'Type in the new name for your machine', @@ -561,68 +561,68 @@ export class InstancesComponent implements OnInit, OnDestroy modalRef.content.save.pipe(first()).subscribe(name => { - if (name === instanceName) + if (name === machineName) { - this.toastr.warning(`You provided the same name for machine "${instanceName}"`); + this.toastr.warning(`You provided the same name for machine "${machineName}"`); return; } - instance.working = true; + machine.working = true; - this.instancesService.rename(instance.id, name) + this.machinesService.rename(machine.id, name) .subscribe(() => { - instance.name = name; + machine.name = name; this.applyFiltersAndSort(); - this.toastr.info(`The "${instanceName}" machine has been renamed to "${instance.name}"`); - instance.working = false; + this.toastr.info(`The "${machineName}" machine has been renamed to "${machine.name}"`); + machine.working = false; }, err => { const errorDetails = err.error?.message ? `(${err.error.message})` : ''; - this.toastr.error(`Couldn't rename the "${instanceName}" machine ${errorDetails}`); - instance.working = false; + this.toastr.error(`Couldn't rename the "${machineName}" machine ${errorDetails}`); + machine.working = false; }); }); } // ---------------------------------------------------------------------------------------------------------------- - showTagEditor(instance: Instance, showMetadata = false) + showTagEditor(machine: Machine, showMetadata = false) { const modalConfig = { ignoreBackdropClick: true, keyboard: false, animated: true, - initialState: { instance, showMetadata } + initialState: { machine, showMetadata } }; - const modalRef = this.modalService.show(InstanceTagEditorComponent, modalConfig); + const modalRef = this.modalService.show(MachineTagEditorComponent, modalConfig); modalRef.setClass('modal-lg'); modalRef.content.save.pipe(first()).subscribe(x => { - instance[showMetadata ? 'metadata' : 'tags'] = x; + machine[showMetadata ? 'metadata' : 'tags'] = x; }); } // ---------------------------------------------------------------------------------------------------------------- - createImageFromMachine(instance: Instance) + createImageFromMachine(machine: Machine) { const modalConfig = { ignoreBackdropClick: true, keyboard: false, animated: true, - initialState: { instance } + initialState: { machine } }; const modalRef = this.modalService.show(CustomImageEditorComponent, modalConfig); modalRef.content.save.pipe(first()).subscribe(x => { - this.toastr.info(`Creating a new image based on the "${instance.name}" machine...`); + this.toastr.info(`Creating a new image based on the "${machine.name}" machine...`); - this.catalogService.createImage(instance.id, x.name, x.version, x.description) + this.catalogService.createImage(machine.id, x.name, x.version, x.description) .pipe( delay(1000), switchMap(image => this.catalogService.getImageUntilExpectedState(image, ['active', 'failed']) @@ -632,28 +632,28 @@ export class InstancesComponent implements OnInit, OnDestroy .subscribe(image => { if (image.state === 'active') - this.toastr.info(`A new image "${x.name}" based on the "${instance.name}" machine has been created`); + this.toastr.info(`A new image "${x.name}" based on the "${machine.name}" machine has been created`); else - this.toastr.error(`Failed to create an image based on the "${instance.name}" machine`); + this.toastr.error(`Failed to create an image based on the "${machine.name}" machine`); }, err => { const errorDetails = err.error?.message ? `(${err.error.message})` : ''; - this.toastr.error(`Failed to create an image based on the "${instance.name}" machine ${errorDetails}`); + this.toastr.error(`Failed to create an image based on the "${machine.name}" machine ${errorDetails}`); }); }); } // ---------------------------------------------------------------------------------------------------------------- - createMachine(instance?: Instance) + createMachine(machine?: Machine) { const modalConfig = { ignoreBackdropClick: true, keyboard: false, animated: true, - initialState: { instance } + initialState: { machine } }; - const modalRef = this.modalService.show(InstanceWizardComponent, modalConfig); + const modalRef = this.modalService.show(MachineWizardComponent, modalConfig); modalRef.setClass('modal-xl'); modalRef.content.save.pipe(first()).subscribe(x => @@ -662,23 +662,23 @@ export class InstancesComponent implements OnInit, OnDestroy x.working = true; - this.fillInInstanceDetails(x); + this.fillInMachineDetails(x); - this.instances.push(x); + this.machines.push(x); this.computeFiltersOptions(); }); } // ---------------------------------------------------------------------------------------------------------------- - deleteMachine(instance: Instance) + deleteMachine(machine: Machine) { const modalConfig = { ignoreBackdropClick: true, keyboard: false, animated: true, initialState: { - prompt: `Are you sure you wish to permanently delete the "${instance.name}" machine?`, + prompt: `Are you sure you wish to permanently delete the "${machine.name}" machine?`, confirmButtonText: 'Yes, delete this machine', declineButtonText: 'No, keep it', confirmByDefault: false @@ -689,123 +689,123 @@ export class InstancesComponent implements OnInit, OnDestroy modalRef.content.confirm.pipe(first()).subscribe(() => { - instance.working = true; + machine.working = true; - this.toastr.info(`Removing machine "${instance.name}"...`); + this.toastr.info(`Removing machine "${machine.name}"...`); - this.instancesService.delete(instance.id) + this.machinesService.delete(machine.id) .subscribe(() => { - const index = this.instances.findIndex(i => i.id === instance.id); + const index = this.machines.findIndex(i => i.id === machine.id); if (index < 0) return; - this.instances.splice(index, 1); + this.machines.splice(index, 1); this.computeFiltersOptions(); - this.toastr.info(`The machine "${instance.name}" has been removed`); + this.toastr.info(`The machine "${machine.name}" has been removed`); }, err => { - instance.working = false; - this.toastr.error(`Machine "${instance.name}" error: ${err.error.message}`); + machine.working = false; + this.toastr.error(`Machine "${machine.name}" error: ${err.error.message}`); }); }); } // ---------------------------------------------------------------------------------------------------------------- - showMachineHistory(instance: Instance) + showMachineHistory(machine: Machine) { const modalConfig = { ignoreBackdropClick: true, keyboard: false, animated: true, - initialState: { instance } + initialState: { machine } }; - const modalRef = this.modalService.show(InstanceHistoryComponent, modalConfig); + const modalRef = this.modalService.show(MachineHistoryComponent, modalConfig); modalRef.setClass('modal-lg'); } // ---------------------------------------------------------------------------------------------------------------- - tabChanged(event, instance: Instance) + tabChanged(event, machine: Machine) { if (event.id.endsWith('info')) - instance.shouldLoadInfo = this.editorForm.get('showMachineDetails').value; + machine.shouldLoadInfo = this.editorForm.get('showMachineDetails').value; else if (event.id.endsWith('snapshots')) - instance.shouldLoadSnapshots = this.editorForm.get('showMachineDetails').value; + machine.shouldLoadSnapshots = this.editorForm.get('showMachineDetails').value; else if (event.id.endsWith('networks')) - instance.shouldLoadNetworks = this.editorForm.get('showMachineDetails').value; + machine.shouldLoadNetworks = this.editorForm.get('showMachineDetails').value; else if (event.id.endsWith('volumes')) { - //instance.shouldLoadVolumes = this.editorForm.get('showMachineDetails').value; + //machine.shouldLoadVolumes = this.editorForm.get('showMachineDetails').value; } else if (event.id.endsWith('migrations')) { - //instance.shouldLoadMigrations = this.editorForm.get('showMachineDetails').value; + //machine.shouldLoadMigrations = this.editorForm.get('showMachineDetails').value; } } // ---------------------------------------------------------------------------------------------------------------- - loadInstanceDetails(instance: Instance): any + loadMachineDetails(machine: Machine): any { - instance.loading = false; + machine.loading = false; - instance.working = !this.stableStates.includes(instance.state); + machine.working = !this.stableStates.includes(machine.state); - // Keep polling the instances that are not in a "stable" state - if (instance.working) - this.instancesService.getInstanceUntilExpectedState(instance, this.stableStates, x => + // Keep polling the machines that are not in a "stable" state + if (machine.working) + this.machinesService.getMachineUntilExpectedState(machine, this.stableStates, x => { - instance.state = x.state; + machine.state = x.state; // This allows us to trigger later on when the state changes to a something stable - instance.shouldLoadInfo = false; + machine.shouldLoadInfo = false; this.computeFiltersOptions(true); }) .pipe(takeUntil(this.destroy$)) .subscribe(x => { - instance.working = false; + machine.working = false; - // Update the instance with what we got from the server - Object.assign(instance, x); + // Update the machine with what we got from the server + Object.assign(machine, x); - instance.shouldLoadInfo = this.editorForm.get('showMachineDetails').value; + machine.shouldLoadInfo = this.editorForm.get('showMachineDetails').value; this.computeFiltersOptions(); }, err => { if (err.status === 410) { - const index = this.instances.findIndex(i => i.id === instance.id); + const index = this.machines.findIndex(i => i.id === machine.id); if (index >= 0) { - this.instances.splice(index, 1); + this.machines.splice(index, 1); this.computeFiltersOptions(); - this.toastr.error(`The machine "${instance.name}" has been removed`); + this.toastr.error(`The machine "${machine.name}" has been removed`); } } else - this.toastr.error(`Machine "${instance.name}" error: ${err.error.message}`); + this.toastr.error(`Machine "${machine.name}" error: ${err.error.message}`); - instance.working = false; + machine.working = false; }); - instance.shouldLoadInfo = this.editorForm.get('showMachineDetails').value; + machine.shouldLoadInfo = this.editorForm.get('showMachineDetails').value; } // ---------------------------------------------------------------------------------------------------------------- - watchInstanceState(instance: Instance) + watchMachineState(machine: Machine) { - instance.working = true; + machine.working = true; - this.instancesService.getInstanceUntilExpectedState(instance, ['running'], x => + this.machinesService.getMachineUntilExpectedState(machine, ['running'], x => { - instance.state = x.state; + machine.state = x.state; this.computeFiltersOptions(true); }) @@ -814,49 +814,49 @@ export class InstancesComponent implements OnInit, OnDestroy takeUntil(this.destroy$) ).subscribe(() => { }, err => { - instance.working = false; + machine.working = false; }); } // ---------------------------------------------------------------------------------------------------------------- - updateInstance(instance: Instance, updates: Instance) + updateMachine(machine: Machine, updates: Machine) { - instance.refreshInfo = instance.state !== updates.state; - instance.state = updates.state; + machine.refreshInfo = machine.state !== updates.state; + machine.state = updates.state; } // ---------------------------------------------------------------------------------------------------------------- - setInstanceInfo(instance: Instance, dnsList) + setMachineInfo(machine: Machine, dnsList) { - // Update the instance as a result of the info panel's "load" event. We do this because the intances are (un)loaded + // Update the machine as a result of the info panel's "load" event. We do this because the intances are (un)loaded // from the viewport as the user scrolls through the page, to optimize memory consumption. - instance.dnsList = dnsList; - instance.infoLoaded = true; + machine.dnsList = dnsList; + machine.infoLoaded = true; } // ---------------------------------------------------------------------------------------------------------------- - setInstanceNetworks(instance: Instance, nics) + setMachineNetworks(machine: Machine, nics) { - // Update the instance as a result of the networks panel's "load" event. We do this because the intances are (un)loaded + // Update the machine as a result of the networks panel's "load" event. We do this because the intances are (un)loaded // from the viewport as the user scrolls through the page, to optimize memory consumption. - instance.nics = nics; - instance.networksLoaded = true; + machine.nics = nics; + machine.networksLoaded = true; } // ---------------------------------------------------------------------------------------------------------------- - setInstanceSnapshots(instance: Instance, snapshots) + setMachineSnapshots(machine: Machine, snapshots) { - // Update the instance as a result of the snapshots panel's "load" event. We do this because the intances are (un)loaded + // Update the machine as a result of the snapshots panel's "load" event. We do this because the intances are (un)loaded // from the viewport as the user scrolls through the page, to optimize memory consumption. - instance.snapshots = snapshots; - instance.snapshotsLoaded = true; + machine.snapshots = snapshots; + machine.snapshotsLoaded = true; } // ---------------------------------------------------------------------------------------------------------------- - refreshInstanceDnsList(instance: Instance) + refreshMachineDnsList(machine: Machine) { - instance.working = false; - instance.refreshInfo = true; + machine.working = false; + machine.refreshInfo = true; } // ---------------------------------------------------------------------------------------------------------------- @@ -867,17 +867,17 @@ export class InstancesComponent implements OnInit, OnDestroy } // ---------------------------------------------------------------------------------------------------------------- - private fillInInstanceDetails(instance: Instance) + private fillInMachineDetails(machine: Machine) { - const imageDetails = this.images.find(i => i.id === instance.image); + const imageDetails = this.images.find(i => i.id === machine.image); if (imageDetails) - instance.imageDetails = imageDetails; + machine.imageDetails = imageDetails; - const packageDetails = this.packages.find(p => p.name === instance.package); + const packageDetails = this.packages.find(p => p.name === machine.package); if (packageDetails) - instance.packageDetails = packageDetails; + machine.packageDetails = packageDetails; - instance.volumes = this.volumes.filter(i => i.refs && i.refs.includes(instance.id)); + machine.volumes = this.volumes.filter(i => i.refs && i.refs.includes(machine.id)); } // ---------------------------------------------------------------------------------------------------------------- @@ -890,7 +890,7 @@ export class InstancesComponent implements OnInit, OnDestroy // ---------------------------------------------------------------------------------------------------------------- ngOnInit(): void { - this.getInstances(); + this.getMachines(); } // ---------------------------------------------------------------------------------------------------------------- diff --git a/app/src/app/instances/instances.module.ts b/app/src/app/machines/machines.module.ts similarity index 55% rename from app/src/app/instances/instances.module.ts rename to app/src/app/machines/machines.module.ts index e0fbaac..df27859 100644 --- a/app/src/app/instances/instances.module.ts +++ b/app/src/app/machines/machines.module.ts @@ -9,49 +9,49 @@ import { WebpackTranslateLoader } from '../helpers/webpack-translate-loader.serv import { TranslateCompiler } from '@ngx-translate/core'; import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler'; -import { InstancesComponent } from './instances.component'; -import { InstanceWizardComponent } from './instance-wizard/instance-wizard.component'; +import { MachinesComponent } from './machines.component'; +import { MachineWizardComponent } from './machine-wizard/machine-wizard.component'; import { PackageSelectorComponent } from './package-selector/package-selector.component'; -import { InstanceSnapshotsComponent } from './instance-snapshots/instance-snapshots.component'; -import { InstanceNetworksComponent } from './instance-networks/instance-networks.component'; -import { InstanceSecurityComponent } from './instance-security/instance-security.component'; -import { InstanceTagEditorComponent } from './instance-tag-editor/instance-tag-editor.component'; -import { InstanceHistoryComponent } from './instance-history/instance-history.component'; +import { MachineSnapshotsComponent } from './machine-snapshots/machine-snapshots.component'; +import { MachineNetworksComponent } from './machine-networks/machine-networks.component'; +import { MachineSecurityComponent } from './machine-security/machine-security.component'; +import { MachineTagEditorComponent } from './machine-tag-editor/machine-tag-editor.component'; +import { MachineHistoryComponent } from './machine-history/machine-history.component'; import { CustomImageEditorComponent } from '../catalog/custom-image-editor/custom-image-editor.component'; -import { InstanceInfoComponent } from './instance-info/instance-info.component'; +import { MachineInfoComponent } from './machine-info/machine-info.component'; @NgModule({ declarations: [ - InstancesComponent, - InstanceWizardComponent, + MachinesComponent, + MachineWizardComponent, PackageSelectorComponent, - InstanceSnapshotsComponent, - InstanceNetworksComponent, - InstanceSecurityComponent, - InstanceTagEditorComponent, - InstanceHistoryComponent, - InstanceInfoComponent, + MachineSnapshotsComponent, + MachineNetworksComponent, + MachineSecurityComponent, + MachineTagEditorComponent, + MachineHistoryComponent, + MachineInfoComponent, ], imports: [ SharedModule, RouterModule.forChild([ { path: '', - component: InstancesComponent, + component: MachinesComponent, data: { - title: 'instances.title', - subTitle: 'instances.subTitle', + title: 'machines.title', + subTitle: 'machines.subTitle', icon: 'server' }, children: [ { path: 'wizard', - component: InstanceWizardComponent, + component: MachineWizardComponent, data: { - title: 'instances.wizard.title', - subTitle: 'instances.wizard.subTitle', + title: 'machines.wizard.title', + subTitle: 'machines.wizard.subTitle', icon: 'hat-wizard' } } @@ -62,7 +62,7 @@ import { InstanceInfoComponent } from './instance-info/instance-info.component'; loader: { provide: TranslateLoader, //useClass: WebpackTranslateLoader - useFactory: () => new WebpackTranslateLoader('dashboard') + useFactory: () => new WebpackTranslateLoader('machines') }, compiler: { provide: TranslateCompiler, @@ -72,15 +72,15 @@ import { InstanceInfoComponent } from './instance-info/instance-info.component'; }) ], entryComponents: [ - InstanceWizardComponent, + MachineWizardComponent, PackageSelectorComponent, - InstanceTagEditorComponent, - InstanceHistoryComponent, + MachineTagEditorComponent, + MachineHistoryComponent, CustomImageEditorComponent ] }) -export class InstancesModule +export class MachinesModule { constructor(private readonly translate: TranslateService) { diff --git a/app/src/app/instances/models/instance-disk.ts b/app/src/app/machines/models/machine-disk.ts similarity index 72% rename from app/src/app/instances/models/instance-disk.ts rename to app/src/app/machines/models/machine-disk.ts index e7b3782..cd88502 100644 --- a/app/src/app/instances/models/instance-disk.ts +++ b/app/src/app/machines/models/machine-disk.ts @@ -1,4 +1,4 @@ -export class InstanceDisk +export class MachineDisk { id: string; boot: boolean; diff --git a/app/src/app/instances/models/instance-volume.ts b/app/src/app/machines/models/machine-volume.ts similarity index 82% rename from app/src/app/instances/models/instance-volume.ts rename to app/src/app/machines/models/machine-volume.ts index c849fe1..4aea902 100644 --- a/app/src/app/instances/models/instance-volume.ts +++ b/app/src/app/machines/models/machine-volume.ts @@ -1,4 +1,4 @@ -export class InstanceVolume +export class MachineVolume { name: string; type: string; // "tritonnfs" diff --git a/app/src/app/instances/models/instance.ts b/app/src/app/machines/models/machine.ts similarity index 72% rename from app/src/app/instances/models/instance.ts rename to app/src/app/machines/models/machine.ts index 0943f20..7f73805 100644 --- a/app/src/app/instances/models/instance.ts +++ b/app/src/app/machines/models/machine.ts @@ -1,11 +1,11 @@ import { Network } from '../../networking/models/network'; -import { InstanceDisk } from './instance-disk'; +import { MachineDisk } from './machine-disk'; import { Nic } from './nic'; -import { InstanceVolume } from './instance-volume'; +import { MachineVolume } from './machine-volume'; import { CatalogImage } from '../../catalog/models/image'; import { CatalogPackage } from '../../catalog/models/package'; -export class InstanceRequest +export class MachineRequest { id: string; name: string; @@ -19,14 +19,14 @@ export class InstanceRequest firewall_enabled: boolean; deletion_protection: boolean; allow_shared_images: boolean; // Whether to allow provisioning from a shared image. - volumes: InstanceVolume[]; // list of objects representing volumes to mount when the newly created machine boots - disks: InstanceDisk[]; // An array of disk objects to be created (bhyve) + volumes: MachineVolume[]; // list of objects representing volumes to mount when the newly created machine boots + disks: MachineDisk[]; // An array of disk objects to be created (bhyve) disk: number; - encrypted: boolean; // Place this instance into an encrypted server. Optional. + encrypted: boolean; // Place this machine into an encrypted server. Optional. visible: boolean; } -export class Instance extends InstanceRequest +export class Machine extends MachineRequest { nics: Nic[]; imageDetails: CatalogImage; diff --git a/app/src/app/instances/models/nic.ts b/app/src/app/machines/models/nic.ts similarity index 100% rename from app/src/app/instances/models/nic.ts rename to app/src/app/machines/models/nic.ts diff --git a/app/src/app/instances/models/snapshot.ts b/app/src/app/machines/models/snapshot.ts similarity index 100% rename from app/src/app/instances/models/snapshot.ts rename to app/src/app/machines/models/snapshot.ts diff --git a/app/src/app/instances/package-selector/package-selector.component.html b/app/src/app/machines/package-selector/package-selector.component.html similarity index 85% rename from app/src/app/instances/package-selector/package-selector.component.html rename to app/src/app/machines/package-selector/package-selector.component.html index 5e51b38..420c853 100644 --- a/app/src/app/instances/package-selector/package-selector.component.html +++ b/app/src/app/machines/package-selector/package-selector.component.html @@ -9,10 +9,10 @@

      Pick the package that best suits your requirements

      - +
      - This machine's current package is: {{ instance.package }} + This machine's current package is: {{ machine.package }}

      diff --git a/app/src/app/instances/package-selector/package-selector.component.scss b/app/src/app/machines/package-selector/package-selector.component.scss similarity index 100% rename from app/src/app/instances/package-selector/package-selector.component.scss rename to app/src/app/machines/package-selector/package-selector.component.scss diff --git a/app/src/app/instances/package-selector/package-selector.component.spec.ts b/app/src/app/machines/package-selector/package-selector.component.spec.ts similarity index 100% rename from app/src/app/instances/package-selector/package-selector.component.spec.ts rename to app/src/app/machines/package-selector/package-selector.component.spec.ts diff --git a/app/src/app/instances/package-selector/package-selector.component.ts b/app/src/app/machines/package-selector/package-selector.component.ts similarity index 98% rename from app/src/app/instances/package-selector/package-selector.component.ts rename to app/src/app/machines/package-selector/package-selector.component.ts index 2471d36..a9c5f50 100644 --- a/app/src/app/instances/package-selector/package-selector.component.ts +++ b/app/src/app/machines/package-selector/package-selector.component.ts @@ -14,7 +14,7 @@ import { CatalogPackage } from '../../catalog/models/package'; export class PackageSelectorComponent implements OnInit { @Input() - instance: any; + machine: any; save = new Subject(); imageType: number; @@ -67,7 +67,7 @@ export class PackageSelectorComponent implements OnInit // ---------------------------------------------------------------------------------------------------------------- ngOnInit(): void { - switch (this.instance.type) + switch (this.machine.type) { case 'virtualmachine': this.imageType = 1; diff --git a/app/src/app/networking/firewall-editor/firewall-editor.component.html b/app/src/app/networking/firewall-editor/firewall-editor.component.html index e8e06a7..aa886b6 100644 --- a/app/src/app/networking/firewall-editor/firewall-editor.component.html +++ b/app/src/app/networking/firewall-editor/firewall-editor.component.html @@ -64,7 +64,7 @@

      {{ control.value.type }} - {{ instances[control.value.config] || control.value.config }} + {{ machines[control.value.config] || control.value.config }}