update TTL in deliveryserivce to be int instead of string, updated DeliveryService to use correct struct, removed unused struct
(cherry picked from commit 854401f55cf39ab5ce2603d6eab8764361dc1c6e) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/ca74c772 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/ca74c772 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/ca74c772 Branch: refs/heads/2.0.x Commit: ca74c772c71960ca69f8719d145d77b48355f8d7 Parents: 1ad290f Author: David Neuman <david.neuma...@gmail.com> Authored: Tue Mar 14 13:45:45 2017 -0600 Committer: Eric Friedrich <fri...@apache.org> Committed: Wed Mar 15 12:10:29 2017 -0400 ---------------------------------------------------------------------- traffic_monitor_golang/traffic_monitor/crconfig/data.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ca74c772/traffic_monitor_golang/traffic_monitor/crconfig/data.go ---------------------------------------------------------------------- diff --git a/traffic_monitor_golang/traffic_monitor/crconfig/data.go b/traffic_monitor_golang/traffic_monitor/crconfig/data.go index aaae7cc..ff60155 100644 --- a/traffic_monitor_golang/traffic_monitor/crconfig/data.go +++ b/traffic_monitor_golang/traffic_monitor/crconfig/data.go @@ -168,7 +168,7 @@ type DeliveryService struct { GeoLocationProviderTime time.Time `json:"-"` MatchSets []MatchSet `json:"matchSets,omitempty"` MatchSetsTime time.Time `json:"-"` - MissLocation *LatLon `json:"missLocation,omitempty"` + MissLocation *LatitudeLongitude `json:"missLocation,omitempty"` MissLocationTime time.Time `json:"-"` Protocol *DeliveryServiceProtocol `json:"protocol,omitempty"` ProtocolTime time.Time `json:"-"` @@ -180,7 +180,7 @@ type DeliveryService struct { SoaTime time.Time `json:"-"` SSLEnabled *bool `json:"sslEnabled,string,omitempty"` SSLEnabledTime time.Time `json:"-"` - TTL *int `json:"ttl,string,omitempty"` + TTL *int `json:"ttl,omitempty"` TTLTime time.Time `json:"-"` TTLs *TTL `json:"ttls,omitempty"` TTLsTime time.Time `json:"-"` @@ -189,10 +189,6 @@ type Dispersion struct { Limit int `json:"limit,omitempty"` Shuffled bool `json:"shuffled,string,omitempty"` } -type LatLon struct { - Lat float64 `json:"lat,string"` - Lon float64 `json:"lon,string"` -} type LatitudeLongitude struct { Lat float64 `json:"latitude"`