From 4fdd27859d3a9d3fdeea9b44c66d67cf1e857521 Mon Sep 17 00:00:00 2001 From: crusader Date: Tue, 5 Jun 2018 20:00:11 +0900 Subject: [PATCH] ing --- src/model/infra/InfraHost.ts | 2 +- src/model/infra/InfraOS.ts | 2 +- src/model/infra/InfraOSApplication.ts | 2 +- src/model/infra/InfraOSDaemon.ts | 2 +- src/model/infra/InfraOSPort.ts | 2 +- src/model/infra/InfraService.ts | 2 +- src/model/probe/ProbeHost.ts | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/model/infra/InfraHost.ts b/src/model/infra/InfraHost.ts index f955ee9..0df979b 100644 --- a/src/model/infra/InfraHost.ts +++ b/src/model/infra/InfraHost.ts @@ -2,7 +2,7 @@ import { InfraOS } from './InfraOS'; import { Infra } from './Infra'; export interface InfraHost extends Infra { - os?: InfraOS; + infraOS?: InfraOS; ipv4?: string; ipv6?: string; mac?: string; diff --git a/src/model/infra/InfraOS.ts b/src/model/infra/InfraOS.ts index 1fba9bd..dbc81e0 100644 --- a/src/model/infra/InfraOS.ts +++ b/src/model/infra/InfraOS.ts @@ -3,7 +3,7 @@ import { Infra } from './Infra'; import { MetaInfraVendor } from '../meta'; export interface InfraOS extends Infra { - machine?: InfraMachine; + infraMachine?: InfraMachine; meta?: string; metaInfraVendor?: MetaInfraVendor; } \ No newline at end of file diff --git a/src/model/infra/InfraOSApplication.ts b/src/model/infra/InfraOSApplication.ts index b60c9f2..996b8c2 100644 --- a/src/model/infra/InfraOSApplication.ts +++ b/src/model/infra/InfraOSApplication.ts @@ -2,6 +2,6 @@ import { InfraOS } from './InfraOS'; import { Infra } from './Infra'; export interface InfraOSApplication extends Infra { - os?: InfraOS; + infraOS?: InfraOS; name?: string; } \ No newline at end of file diff --git a/src/model/infra/InfraOSDaemon.ts b/src/model/infra/InfraOSDaemon.ts index 3659434..9773289 100644 --- a/src/model/infra/InfraOSDaemon.ts +++ b/src/model/infra/InfraOSDaemon.ts @@ -2,6 +2,6 @@ import { InfraOS } from './InfraOS'; import { Infra } from './Infra'; export interface InfraOSDaemon extends Infra { - os?: InfraOS; + infraOS?: InfraOS; name?: string; } \ No newline at end of file diff --git a/src/model/infra/InfraOSPort.ts b/src/model/infra/InfraOSPort.ts index ec57e78..7cda289 100644 --- a/src/model/infra/InfraOSPort.ts +++ b/src/model/infra/InfraOSPort.ts @@ -3,7 +3,7 @@ import { Infra } from './Infra'; import { MetaInfraVendor } from '../meta'; export interface InfraOSPort extends Infra { - os?: InfraOS; + infraOS?: InfraOS; port?: number; portType?: string; metaInfraVendor?: MetaInfraVendor; diff --git a/src/model/infra/InfraService.ts b/src/model/infra/InfraService.ts index 7950b71..73dec3f 100644 --- a/src/model/infra/InfraService.ts +++ b/src/model/infra/InfraService.ts @@ -3,7 +3,7 @@ import { Infra } from './Infra'; import { MetaInfraVendor } from '../meta'; export interface InfraService extends Infra { - host?: InfraHost; + infraHost?: InfraHost; portType?: string; port?: number; metaInfraVendor?: MetaInfraVendor; diff --git a/src/model/probe/ProbeHost.ts b/src/model/probe/ProbeHost.ts index 0f345db..8c002d4 100644 --- a/src/model/probe/ProbeHost.ts +++ b/src/model/probe/ProbeHost.ts @@ -4,5 +4,5 @@ import {InfraHost} from '../infra'; export interface ProbeHost { id?: number; probe?: Probe; - host?: InfraHost; + infraHost?: InfraHost; } \ No newline at end of file