From 3edcb8985b632ddbcaa5903d9d1441d22af31d5a Mon Sep 17 00:00:00 2001 From: insanity Date: Fri, 28 Jul 2017 11:06:00 +0900 Subject: [PATCH] api model has changed. --- src/ts/@overflow/infra/api/model/Infra.ts | 4 ++++ src/ts/@overflow/infra/api/model/InfraMachine.ts | 3 --- src/ts/@overflow/probe/api/model/Probe.ts | 13 ++++++++++--- src/ts/@overflow/target/api/model/Target.ts | 4 ++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/ts/@overflow/infra/api/model/Infra.ts b/src/ts/@overflow/infra/api/model/Infra.ts index 7d1d5fd..7130112 100644 --- a/src/ts/@overflow/infra/api/model/Infra.ts +++ b/src/ts/@overflow/infra/api/model/Infra.ts @@ -1,11 +1,15 @@ import MetaInfraType from '@overflow/meta/api/model/MetaInfraType'; +import Probe from '@overflow/probe/api/model/Probe'; +import Target from '@overflow/target/api/model/Target'; interface Infra { id: number; type: MetaInfraType; childId: number; createDate: Date; + probe: Probe; + target: Target; } export default Infra; diff --git a/src/ts/@overflow/infra/api/model/InfraMachine.ts b/src/ts/@overflow/infra/api/model/InfraMachine.ts index bc317ea..1b9d570 100644 --- a/src/ts/@overflow/infra/api/model/InfraMachine.ts +++ b/src/ts/@overflow/infra/api/model/InfraMachine.ts @@ -1,9 +1,6 @@ -import Probe from '@overflow/probe/api/model/Probe'; - interface InfraMachine { id: number; - probe: Probe; meta: string; createDate: Date; } diff --git a/src/ts/@overflow/probe/api/model/Probe.ts b/src/ts/@overflow/probe/api/model/Probe.ts index 7746ae6..c3f53ba 100644 --- a/src/ts/@overflow/probe/api/model/Probe.ts +++ b/src/ts/@overflow/probe/api/model/Probe.ts @@ -1,16 +1,23 @@ import MetaProbeStatus from '@overflow/meta/api/model/MetaProbeStatus'; import Domain from '@overflow/domain/api/model/Domain'; +import Member from '@overflow/member/api/model/Member'; +import InfraHost from '@overflow/infra/api/model/InfraHost'; interface Probe { id?: number; - status: MetaProbeStatus; + status: MetaProbeStatus; // INITIAL / NORMAL description: string; createDate?: Date; - lastPollingDate?: Date; - nextPollingDate?: Date; domain?: Domain; probeKey: string; encryptionKey: string; + targetCount: number; + sensorCount: number; + displayName: string; + cidr: string; + authorizeDate: Date; + authorizeMember: Member; + host: InfraHost; } export default Probe; diff --git a/src/ts/@overflow/target/api/model/Target.ts b/src/ts/@overflow/target/api/model/Target.ts index 3dcd5ba..0f00459 100644 --- a/src/ts/@overflow/target/api/model/Target.ts +++ b/src/ts/@overflow/target/api/model/Target.ts @@ -4,8 +4,8 @@ import Infra from '@overflow/infra/api/model/Infra'; interface Target { id?: number; createDate?: Date; - probe: Probe; - infra: Infra; + displayName: string; + description: string; } export default Target;