Resolve Allow Virtualbox, VMware and Docker templates to be created issue but not fully tested

This commit is contained in:
Rajnikant Lodhi 2022-06-20 18:05:34 +05:30
parent b430ab9a1c
commit 1d75fefb68
8 changed files with 21 additions and 8 deletions

View File

@ -1,4 +1,5 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { environment } from 'environments/environment';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { DockerImage } from '../models/docker/docker-image'; import { DockerImage } from '../models/docker/docker-image';
import { Server } from '../models/server'; import { Server } from '../models/server';
@ -18,7 +19,7 @@ export class DockerService {
} }
getImages(server: Server): Observable<DockerImage[]> { getImages(server: Server): Observable<DockerImage[]> {
return this.httpServer.get<DockerImage[]>(server, '/compute/docker/images') as Observable<DockerImage[]>; return this.httpServer.get<DockerImage[]>(server, `/computes/${environment.compute_id}/docker/images`) as Observable<DockerImage[]>;
} }
addTemplate(server: Server, dockerTemplate: any): Observable<any> { addTemplate(server: Server, dockerTemplate: any): Observable<any> {

View File

@ -1,4 +1,5 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { environment } from 'environments/environment';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { Server } from '../models/server'; import { Server } from '../models/server';
import { VirtualBoxTemplate } from '../models/templates/virtualbox-template'; import { VirtualBoxTemplate } from '../models/templates/virtualbox-template';
@ -37,6 +38,6 @@ export class VirtualBoxService {
} }
getVirtualMachines(server: Server): Observable<VirtualBoxVm[]> { getVirtualMachines(server: Server): Observable<VirtualBoxVm[]> {
return this.httpServer.get<VirtualBoxVm[]>(server, '/compute/virtualbox/vms') as Observable<VirtualBoxVm[]>; return this.httpServer.get<VirtualBoxVm[]>(server, `/computes/${environment.compute_id}/virtualbox/vms`) as Observable<VirtualBoxVm[]>;
} }
} }

View File

@ -1,4 +1,5 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { environment } from 'environments/environment';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { Server } from '../models/server'; import { Server } from '../models/server';
import { VmwareTemplate } from '../models/templates/vmware-template'; import { VmwareTemplate } from '../models/templates/vmware-template';
@ -30,6 +31,6 @@ export class VmwareService {
} }
getVirtualMachines(server: Server): Observable<VmwareVm[]> { getVirtualMachines(server: Server): Observable<VmwareVm[]> {
return this.httpServer.get<VmwareVm[]>(server, '/compute/vmware/vms') as Observable<VmwareVm[]>; return this.httpServer.get<VmwareVm[]>(server, `/computes/${environment.vm_compute_id}/vmware/vms`) as Observable<VmwareVm[]>;
} }
} }

View File

@ -2,5 +2,7 @@ export const environment = {
solarputty_download_url: '', solarputty_download_url: '',
production: true, production: true,
electron: true, electron: true,
current_version:'v3' current_version:'v3',
compute_id:'local',
vm_compute_id:'vm'
}; };

View File

@ -2,5 +2,7 @@ export const environment = {
production: false, production: false,
electron: true, electron: true,
solarputty_download_url: '', solarputty_download_url: '',
current_version:'v3' current_version:'v3',
compute_id:'local',
vm_compute_id:'vm'
}; };

View File

@ -3,5 +3,7 @@ export const environment = {
electron: false, electron: false,
githubio: true, githubio: true,
solarputty_download_url: '', solarputty_download_url: '',
current_version:'v3' current_version:'v3',
compute_id:'local',
vm_compute_id:'vm'
}; };

View File

@ -3,5 +3,7 @@ export const environment = {
electron: false, electron: false,
githubio: false, githubio: false,
solarputty_download_url: '', solarputty_download_url: '',
current_version:'v3' current_version:'v3',
compute_id:'local',
vm_compute_id:'vm'
}; };

View File

@ -7,7 +7,9 @@ export const environment = {
electron: false, electron: false,
githubio: false, githubio: false,
solarputty_download_url: '', solarputty_download_url: '',
current_version:'v3' current_version:'v3',
compute_id:'local',
vm_compute_id:'vm'
}; };
/* /*