diff --git a/model/discovery/DiscoverHost.go b/model/discovery/DiscoverHost.go index 92429ef..95ca7dd 100644 --- a/model/discovery/DiscoverHost.go +++ b/model/discovery/DiscoverHost.go @@ -1,10 +1,15 @@ package discovery type DiscoverHost struct { - FirstScanRange string `json:"firstScanRange,omitempty"` - LastScanRange string `json:"lastScanRange,omitempty"` - ExcludeHosts []string `json:"excludeHosts,omitempty"` - IncludeHosts []string `json:"includeHosts,omitempty"` + FirstScanRangeV4 string `json:"firstScanRangev4,omitempty"` + LastScanRangeV4 string `json:"lastScanRangev4,omitempty"` + ExcludeHostsV4 []string `json:"excludeHostsv4,omitempty"` + IncludeHostsV4 []string `json:"includeHostsv4,omitempty"` + + FirstScanRangeV6 string `json:"firstScanRangev6,omitempty"` + LastScanRangeV6 string `json:"lastScanRangev6,omitempty"` + ExcludeHostsV6 []string `json:"excludeHostsv6,omitempty"` + IncludeHostsV6 []string `json:"includeHostsv6,omitempty"` DiscoverPort *DiscoverPort `json:"discoverPort,omitempty"` } diff --git a/model/discovery/Host.go b/model/discovery/Host.go index 4b32add..791d800 100644 --- a/model/discovery/Host.go +++ b/model/discovery/Host.go @@ -9,11 +9,11 @@ import ( type Host struct { Zone *Zone `json:"zone"` - ID json.Number `json:"id,Number,omitempty"` - IP4 string `json:"ip4,omitempty"` - IP6 string `json:"ip6,omitempty"` - Mac string `json:"mac,omitempty"` - OS string `json:"os,omitempty"` + ID json.Number `json:"id,Number,omitempty"` + IPV4 string `json:"ipv4,omitempty"` + IPV6 string `json:"ipv6,omitempty"` + Mac string `json:"mac,omitempty"` + OS string `json:"os,omitempty"` DiscoveredDate util.Timestamp `json:"discoveredDate,omitempty"` } diff --git a/model/discovery/Zone.go b/model/discovery/Zone.go index 0f9f103..9458087 100644 --- a/model/discovery/Zone.go +++ b/model/discovery/Zone.go @@ -10,8 +10,8 @@ import ( type Zone struct { ID json.Number `json:"id,Number,omitempty"` Network string `json:"network,omitempty"` - IP4 string `json:"ip4,omitempty"` - IP6 string `json:"ip6,omitempty"` + IPV4 string `json:"ipv4,omitempty"` + IPV6 string `json:"ipv6,omitempty"` Iface string `json:"iface,omitempty"` Mac string `json:"mac,omitempty"`