From fc4a5e60d0579e7ea1ba316551237143c72b9019 Mon Sep 17 00:00:00 2001 From: geek Date: Fri, 15 Jun 2018 13:10:12 +0900 Subject: [PATCH] ing --- model/infra/InfraHost.go | 4 +--- model/infra/InfraHostMachine.go | 1 - model/infra/InfraHostOS.go | 1 - model/infra/InfraHostPort.go | 2 +- model/infra/InfraService.go | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/model/infra/InfraHost.go b/model/infra/InfraHost.go index 6779684..83d975f 100644 --- a/model/infra/InfraHost.go +++ b/model/infra/InfraHost.go @@ -11,7 +11,5 @@ type InfraHost struct { InfraHostMachine *InfraHostMachine `json:"infraHostMachine,omitempty"` InfraHostOS *InfraHostOS `json:"infraHostOS,omitempty"` InfraHostIPs []*InfraHostIP `json:"infraHostIPs,omitempty"` - InfraHostPorts []*InfraHostPort `json:"infraHostPorts,omitempty"` - InfraHostApplications []*InfraHostApplication `json:"infraHostApplications,omitempty"` - InfraHostDaemons []*InfraHostDaemon `json:"infraHostDaemons,omitempty"` + ContainerInfraHost *InfraHost `json:"containerInfraHost,omitempty"` } diff --git a/model/infra/InfraHostMachine.go b/model/infra/InfraHostMachine.go index 3a6ac1e..7f1d17f 100644 --- a/model/infra/InfraHostMachine.go +++ b/model/infra/InfraHostMachine.go @@ -8,7 +8,6 @@ import ( type InfraHostMachine struct { ID json.Number `json:"id,Number,omitempty"` - InfraHost *InfraHost `json:"infraHost,omitempty"` Meta string `json:"meta,omitempty"` CreateDate *util.Timestamp `json:"createDate,omitempty"` } diff --git a/model/infra/InfraHostOS.go b/model/infra/InfraHostOS.go index 281cc7b..b629cf6 100644 --- a/model/infra/InfraHostOS.go +++ b/model/infra/InfraHostOS.go @@ -8,7 +8,6 @@ import ( type InfraHostOS struct { ID json.Number `json:"id,Number,omitempty"` - InfraHost *InfraHost `json:"infraHost,omitempty"` Name string `json:"name,omitempty"` OS string `json:"os,omitempty"` Platform string `json:"platform,omitempty"` diff --git a/model/infra/InfraHostPort.go b/model/infra/InfraHostPort.go index 584a2d0..52cf2fd 100644 --- a/model/infra/InfraHostPort.go +++ b/model/infra/InfraHostPort.go @@ -9,7 +9,7 @@ import ( type InfraHostPort struct { ID json.Number `json:"id,Number,omitempty"` - InfraHost *InfraHost `json:"infraHost,omitempty"` + InfraHostIP *InfraHostIP `json:"infraHostIP,omitempty"` MetaPortType *meta.MetaPortType `json:"metaPortType,omitempty"` Port json.Number `json:"port,Number,omitempty"` CreateDate *util.Timestamp `json:"createDate,omitempty"` diff --git a/model/infra/InfraService.go b/model/infra/InfraService.go index eab46d7..ae7dc8e 100644 --- a/model/infra/InfraService.go +++ b/model/infra/InfraService.go @@ -5,7 +5,6 @@ import "git.loafle.net/overflow/commons-go/model/meta" type InfraService struct { Infra MetaTargetServiceType *meta.MetaTargetServiceType `json:"metaTargetServiceType,omitempty"` - InfraHostIP *InfraHostIP `json:"infraHostIP,omitempty"` InfraHostPort *InfraHostPort `json:"infraHostPort,omitempty"` MetaCryptoType *meta.MetaCryptoType `json:"metaCryptoType,omitempty"` }