You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2018/09/10 15:26:55 UTC
[GitHub] dangogh closed pull request #2799: Fix TM tests for lib/tc version
changes
dangogh closed pull request #2799: Fix TM tests for lib/tc version changes
URL: https://github.com/apache/trafficcontrol/pull/2799
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/traffic_monitor/tmcheck/dsstats.go b/traffic_monitor/tmcheck/dsstats.go
index b914f361f..e5119f8f6 100644
--- a/traffic_monitor/tmcheck/dsstats.go
+++ b/traffic_monitor/tmcheck/dsstats.go
@@ -26,7 +26,7 @@ import (
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/traffic_monitor/dsdata"
- to "github.com/apache/trafficcontrol/traffic_ops/client/v13"
+ to "github.com/apache/trafficcontrol/traffic_ops/client"
)
// ValidateDSStates validates that all Delivery Services in the CRConfig exist in given Traffic Monitor's DSStats.
diff --git a/traffic_monitor/tmcheck/offlinestates.go b/traffic_monitor/tmcheck/offlinestates.go
index 95a1ed92f..b37017ed0 100644
--- a/traffic_monitor/tmcheck/offlinestates.go
+++ b/traffic_monitor/tmcheck/offlinestates.go
@@ -25,7 +25,7 @@ import (
"time"
"github.com/apache/trafficcontrol/lib/go-tc"
- to "github.com/apache/trafficcontrol/traffic_ops/client/v13"
+ to "github.com/apache/trafficcontrol/traffic_ops/client"
)
// ValidateOfflineStates validates that no OFFLINE or ADMIN_DOWN caches in the given Traffic Ops' CRConfig are marked Available in the given Traffic Monitor's CRStates.
diff --git a/traffic_monitor/tmcheck/peerpoller.go b/traffic_monitor/tmcheck/peerpoller.go
index 54927d420..5cad707d0 100644
--- a/traffic_monitor/tmcheck/peerpoller.go
+++ b/traffic_monitor/tmcheck/peerpoller.go
@@ -22,7 +22,7 @@ package tmcheck
import (
"fmt"
"github.com/apache/trafficcontrol/lib/go-tc"
- to "github.com/apache/trafficcontrol/traffic_ops/client/v13"
+ to "github.com/apache/trafficcontrol/traffic_ops/client"
"time"
)
diff --git a/traffic_monitor/tmcheck/queryinterval.go b/traffic_monitor/tmcheck/queryinterval.go
index f2c06cafa..bdcf678e9 100644
--- a/traffic_monitor/tmcheck/queryinterval.go
+++ b/traffic_monitor/tmcheck/queryinterval.go
@@ -24,7 +24,7 @@ import (
"time"
"github.com/apache/trafficcontrol/lib/go-tc"
- to "github.com/apache/trafficcontrol/traffic_ops/client/v13"
+ to "github.com/apache/trafficcontrol/traffic_ops/client"
)
const QueryIntervalMax = time.Duration(10) * time.Second
diff --git a/traffic_monitor/tmcheck/tmcheck.go b/traffic_monitor/tmcheck/tmcheck.go
index d703651d3..039ac88ff 100644
--- a/traffic_monitor/tmcheck/tmcheck.go
+++ b/traffic_monitor/tmcheck/tmcheck.go
@@ -29,10 +29,9 @@ import (
"time"
"github.com/apache/trafficcontrol/lib/go-tc"
- "github.com/apache/trafficcontrol/lib/go-tc/v13"
"github.com/apache/trafficcontrol/traffic_monitor/datareq"
"github.com/apache/trafficcontrol/traffic_monitor/dsdata"
- to "github.com/apache/trafficcontrol/traffic_ops/client/v13"
+ to "github.com/apache/trafficcontrol/traffic_ops/client"
)
const RequestTimeout = time.Second * time.Duration(30)
@@ -195,7 +194,7 @@ type CRConfigOrError struct {
Err error
}
-func GetMonitors(toClient *to.Session, includeOffline bool) ([]v13.Server, error) {
+func GetMonitors(toClient *to.Session, includeOffline bool) ([]tc.Server, error) {
trafficMonitorType := "RASCAL"
monitorTypeQuery := map[string][]string{"type": []string{trafficMonitorType}}
servers, _, err := toClient.GetServersByType(monitorTypeQuery)
@@ -261,8 +260,8 @@ func AllValidator(
}
// FilterOfflines returns only servers which are REPORTED or ONLINE
-func FilterOfflines(servers []v13.Server) []v13.Server {
- onlineServers := []v13.Server{}
+func FilterOfflines(servers []tc.Server) []tc.Server {
+ onlineServers := []tc.Server{}
for _, server := range servers {
status := tc.CacheStatusFromString(server.Status)
if status != tc.CacheStatusOnline && status != tc.CacheStatusReported {
@@ -273,7 +272,7 @@ func FilterOfflines(servers []v13.Server) []v13.Server {
return onlineServers
}
-func GetCDNs(servers []v13.Server) map[tc.CDNName]struct{} {
+func GetCDNs(servers []tc.Server) map[tc.CDNName]struct{} {
cdns := map[tc.CDNName]struct{}{}
for _, server := range servers {
cdns[tc.CDNName(server.CDNName)] = struct{}{}
diff --git a/traffic_monitor/tools/nagios-validate-deliveryservices/nagios-validate-deliveryservices.go b/traffic_monitor/tools/nagios-validate-deliveryservices/nagios-validate-deliveryservices.go
index 164cd1fa0..5d61aa824 100644
--- a/traffic_monitor/tools/nagios-validate-deliveryservices/nagios-validate-deliveryservices.go
+++ b/traffic_monitor/tools/nagios-validate-deliveryservices/nagios-validate-deliveryservices.go
@@ -25,7 +25,7 @@ import (
"github.com/apache/trafficcontrol/lib/go-nagios"
"github.com/apache/trafficcontrol/traffic_monitor/tmcheck"
- to "github.com/apache/trafficcontrol/traffic_ops/client/v13"
+ to "github.com/apache/trafficcontrol/traffic_ops/client"
)
const UserAgent = "tm-offline-validator/0.1"
diff --git a/traffic_monitor/tools/nagios-validate-offline/nagios-validate-offline.go b/traffic_monitor/tools/nagios-validate-offline/nagios-validate-offline.go
index a4fd2becc..afe1cbe5b 100644
--- a/traffic_monitor/tools/nagios-validate-offline/nagios-validate-offline.go
+++ b/traffic_monitor/tools/nagios-validate-offline/nagios-validate-offline.go
@@ -25,7 +25,7 @@ import (
"github.com/apache/trafficcontrol/lib/go-nagios"
"github.com/apache/trafficcontrol/traffic_monitor/tmcheck"
- to "github.com/apache/trafficcontrol/traffic_ops/client/v13"
+ to "github.com/apache/trafficcontrol/traffic_ops/client"
)
const UserAgent = "tm-offline-validator/0.1"
diff --git a/traffic_monitor/tools/nagios-validate-peerpoller/nagios-validate-peerpoller.go b/traffic_monitor/tools/nagios-validate-peerpoller/nagios-validate-peerpoller.go
index 4a6716464..c52e946a8 100644
--- a/traffic_monitor/tools/nagios-validate-peerpoller/nagios-validate-peerpoller.go
+++ b/traffic_monitor/tools/nagios-validate-peerpoller/nagios-validate-peerpoller.go
@@ -24,7 +24,7 @@ import (
"fmt"
"github.com/apache/trafficcontrol/lib/go-nagios"
"github.com/apache/trafficcontrol/traffic_monitor/tmcheck"
- to "github.com/apache/trafficcontrol/traffic_ops/client/v13"
+ to "github.com/apache/trafficcontrol/traffic_ops/client"
)
const UserAgent = "tm-peerpoller-validator/0.1"
diff --git a/traffic_monitor/tools/nagios-validate-queryinterval/nagios-validate-queryinterval.go b/traffic_monitor/tools/nagios-validate-queryinterval/nagios-validate-queryinterval.go
index 178a885af..90bf3ecc4 100644
--- a/traffic_monitor/tools/nagios-validate-queryinterval/nagios-validate-queryinterval.go
+++ b/traffic_monitor/tools/nagios-validate-queryinterval/nagios-validate-queryinterval.go
@@ -24,7 +24,7 @@ import (
"fmt"
"github.com/apache/trafficcontrol/lib/go-nagios"
"github.com/apache/trafficcontrol/traffic_monitor/tmcheck"
- to "github.com/apache/trafficcontrol/traffic_ops/client/v13"
+ to "github.com/apache/trafficcontrol/traffic_ops/client"
)
const UserAgent = "tm-queryinterval-validator/0.1"
diff --git a/traffic_monitor/tools/validator-service/validator-service.go b/traffic_monitor/tools/validator-service/validator-service.go
index a20f8492a..584f20025 100644
--- a/traffic_monitor/tools/validator-service/validator-service.go
+++ b/traffic_monitor/tools/validator-service/validator-service.go
@@ -26,7 +26,7 @@ import (
"fmt"
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/traffic_monitor/tmcheck"
- to "github.com/apache/trafficcontrol/traffic_ops/client/v13"
+ to "github.com/apache/trafficcontrol/traffic_ops/client"
"io"
"net/http"
"sort"
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services