overflow_cloud/member_webapp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
insanity 2018-06-22 11:44:36 +09:00
parent 674b6860b3
commit 32b83f52a4
5 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
@overflow/discovery/component/discovery-infra-tree.component.ts
View File

@ -360,7 +360,7 @@ export class DiscoveryInfraTreeComponent implements OnChanges {
saveTargets() {
this.pending$ = of(true);
const targets: Target[] = [];
const infraIDs: number[] = [];
this.selectedItems.forEach(node => {
let infraID = node.data.infraID;
if (null === infraID) { // 새로 발견된 Host or Service
@ -389,19 +389,12 @@ export class DiscoveryInfraTreeComponent implements OnChanges {
console.log('INFRA ID not found.');
return;
}
const target: Target = {
infra: {
id: infraID
},
name: node.label,
sensorCount: 0,
};
targets.push(target);
infraIDs.push(infraID);
});
console.log(targets);
console.log(infraIDs);
this.targetService.registAll(targets, this.probeHost.probe.id)
this.targetService.registAll(infraIDs, this.probeHost.probe.id)
.pipe(
tap(() => {
}),

6
@overflow/probe/component/probe-detail.component.html
View File

@ -3,11 +3,11 @@
<p-panel *ngIf="probeHost" #content [showHeader]="false" class="block-panel">
<of-probe-general [probe]="probeHost.probe" (modified)="modifiedGeneral($event)"></of-probe-general>
<of-probe-host [infraHost]="probeHost.infraHost"></of-probe-host>
<of-probe-host *ngIf="probeHost.infraHost" [infraHost]="probeHost.infraHost"></of-probe-host>
<div class="ui-g" dir="rtl">
<button class="ui-button-danger ui-button-width-fit" [disabled]="true" type="button" label="Remove this Probe" icon="ui-icon-close" pButton
(click)="remove(probeHost)"></button>
<button class="ui-button-danger ui-button-width-fit" [disabled]="true" type="button" label="Remove this Probe" icon="ui-icon-close"
pButton (click)="remove(probeHost)"></button>
<button class="ui-button-width-fit" type="button" label="Discovery" icon="ui-icon-search" pButton (click)="discovery.emit(probeHost.id)"></button>
</div>
</p-panel>

14
@overflow/probe/component/probe-host.component.html
View File

@ -18,15 +18,15 @@
<p-panel [showHeader]="false">
<div *ngIf="infraHost">
<div class="ui-g">
<div class="ui-g-12 ui-md-6 ui-key-value">
<div class="ui-g-12 ui-md-6 ui-key-value" *ngIf="infraHost.infraZone">
<of-key-value [key]="'IP ver'" [value]="infraHost.infraZone.metaIPType.name"></of-key-value>
</div>
<div class="ui-g-12 ui-md-6 ui-key-value">
<div class="ui-g-12 ui-md-6 ui-key-value" *ngIf="infraHost.infraZone">
<of-key-value [key]="'CIDR'" [value]="infraHost.infraZone.network"></of-key-value>
</div>
<div class="ui-g-12 ui-md-6 ui-key-value">
<div class="ui-g-12 ui-md-6 ui-key-value" *ngIf="infraHost.infraZone">
<of-key-value [key]="'Interface'" [value]="infraHost.infraZone.iface"></of-key-value>
</div>
@ -34,15 +34,15 @@
<of-key-value [key]="'Host Type'" [value]="infraHost.metaTargetHostType.name"></of-key-value>
</div>
<div class="ui-g-12 ui-md-6 ui-key-value">
<of-key-value [key]="'Host IP'" [value]="infraHost.infraZone.address"></of-key-value>
<div class="ui-g-12 ui-md-6 ui-key-value" *ngIf="infraHost.infraHostIPs">
<of-key-value [key]="'Host IP'" [value]="infraHost.infraHostIPs[0].address"></of-key-value>
</div>
<div class="ui-g-12 ui-md-6 ui-key-value">
<div class="ui-g-12 ui-md-6 ui-key-value" *ngIf="infraHost.infraZone">
<of-key-value [key]="'Host Mac'" [value]="infraHost.infraZone.mac"></of-key-value>
</div>
<div class="ui-g-12 ui-md-6 ui-key-value">
<div class="ui-g-12 ui-md-6 ui-key-value" *ngIf="infraHost.infraHostOS">
<of-key-value [key]="'Host OS'" [value]="infraHost.infraHostOS.name"></of-key-value>
</div>

8
@overflow/probe/component/probe-list.component.html
View File

@ -22,12 +22,12 @@
<td>{{probeHost.probe.name}}</td>
<td>{{getUptime(probeHost.probe)}}</td>
<td>{{probeHost.probe.cidr}}</td>
<td>{{probeHost.infraHost.infraHostIPs[0].address}}</td>
<td>{{probeHost.infraHost.infraHostOS.name}}</td>
<td>{{probeHost.infraHost.infraZone.iface}}</td>
<td>{{probeHost.infraHost.infraHostIPs ? probeHost.infraHost.infraHostIPs[0].address : ''}}</td>
<td>{{probeHost.infraHost.infraHostOS ? probeHost.infraHost.infraHostOS.name : '' }}</td>
<td>{{probeHost.infraHost.infraZone ? probeHost.infraHost.infraZone.iface : ''}}</td>
<td>{{probeHost.probe.targetCount}}</td>
<td>{{probeHost.probe.authorizeDate | date: 'dd.MM.yyyy'}}</td>
<td>{{probeHost.probe.authorizeMember.name}}</td>
<td>{{probeHost.probe.authorizeMember.name || ''}}</td>
</tr>
</ng-template>
</p-table>

4
@overflow/target/service/target.service.ts
View File

@ -19,8 +19,8 @@ export class TargetService {
return this.rpcService.call<Target>('TargetService.regist', target, probeID);
}
public registAll(targets: Target[], probeID: number): Observable<Target[]> {
return this.rpcService.call<Target[]>('TargetService.registAll', targets, probeID);
public registAll(infraIDs: number[], probeID: number): Observable<Target[]> {
return this.rpcService.call<Target[]>('TargetService.registAll', infraIDs, probeID);
}
public remove(id: number, probeID: number) {