You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ro...@apache.org on 2020/08/24 16:15:02 UTC
[trafficcontrol] branch master updated: Fix traffic_ops/client
changed symbols (#4971)
This is an automated email from the ASF dual-hosted git repository.
rob pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 55b3b03 Fix traffic_ops/client changed symbols (#4971)
55b3b03 is described below
commit 55b3b034514b58341d52bea450c444fea6aa0fab
Author: Srijeet Chatterjee <30...@users.noreply.github.com>
AuthorDate: Mon Aug 24 10:14:51 2020 -0600
Fix traffic_ops/client changed symbols (#4971)
* Initial checkin to change client function signatures
* Adding deprecation notices
* Fix deprecation notices
---
infrastructure/cdn-in-a-box/enroller/enroller.go | 24 +--
.../testing/api/v3/cachegroups_parameters_test.go | 10 +-
traffic_ops/testing/api/v3/cachegroups_test.go | 52 +++----
.../api/v3/cachegroupsdeliveryservices_test.go | 10 +-
traffic_ops/testing/api/v3/capabilities_test.go | 6 +-
traffic_ops/testing/api/v3/cdn_domains_test.go | 4 +-
traffic_ops/testing/api/v3/cdnfederations_test.go | 10 +-
traffic_ops/testing/api/v3/cdns_test.go | 16 +-
traffic_ops/testing/api/v3/cookie_test.go | 4 +-
traffic_ops/testing/api/v3/coordinates_test.go | 16 +-
traffic_ops/testing/api/v3/crconfig_test.go | 8 +-
.../v3/deliveryservice_request_comments_test.go | 20 +--
.../api/v3/deliveryservice_requests_test.go | 24 +--
.../deliveryservices_required_capabilities_test.go | 16 +-
.../testing/api/v3/deliveryservices_test.go | 40 ++---
.../testing/api/v3/deliveryserviceservers_test.go | 22 +--
.../api/v3/deliveryservicesideligible_test.go | 6 +-
.../testing/api/v3/deliveryservicesregexes_test.go | 8 +-
traffic_ops/testing/api/v3/divisions_test.go | 18 +--
.../testing/api/v3/federation_resolvers_test.go | 14 +-
.../testing/api/v3/federation_users_test.go | 22 +--
traffic_ops/testing/api/v3/federations_test.go | 12 +-
traffic_ops/testing/api/v3/iso_test.go | 2 +-
traffic_ops/testing/api/v3/jobs_test.go | 10 +-
traffic_ops/testing/api/v3/loginfail_test.go | 2 +-
traffic_ops/testing/api/v3/parameters_test.go | 16 +-
traffic_ops/testing/api/v3/phys_locations_test.go | 20 +--
.../testing/api/v3/profile_parameters_test.go | 12 +-
traffic_ops/testing/api/v3/profiles_test.go | 32 ++--
.../testing/api/v3/readonlycannotmodify_test.go | 2 +-
traffic_ops/testing/api/v3/regions_test.go | 18 +--
traffic_ops/testing/api/v3/roles_test.go | 20 +--
.../testing/api/v3/servercapabilities_test.go | 6 +-
traffic_ops/testing/api/v3/servers_test.go | 48 +++---
.../servers_to_deliveryservice_assignment_test.go | 20 +--
.../testing/api/v3/serverservercapability_test.go | 18 +--
.../testing/api/v3/serverupdatestatus_test.go | 28 ++--
.../testing/api/v3/servicecategories_test.go | 6 +-
.../testing/api/v3/staticdnsentries_test.go | 22 +--
traffic_ops/testing/api/v3/statuses_test.go | 16 +-
traffic_ops/testing/api/v3/steering_test.go | 2 +-
traffic_ops/testing/api/v3/steeringtargets_test.go | 20 +--
traffic_ops/testing/api/v3/tenants_test.go | 32 ++--
traffic_ops/testing/api/v3/topologies_test.go | 2 +-
traffic_ops/testing/api/v3/types_test.go | 18 +--
traffic_ops/testing/api/v3/user_test.go | 42 +++---
traffic_ops/v3-client/cachegroup.go | 49 +++++--
traffic_ops/v3-client/cachegroup_parameters.go | 27 +++-
traffic_ops/v3-client/capability.go | 18 ++-
traffic_ops/v3-client/cdn.go | 34 ++++-
traffic_ops/v3-client/cdn_domains.go | 7 +-
traffic_ops/v3-client/cdnfederations.go | 14 +-
traffic_ops/v3-client/coordinate.go | 25 +++-
traffic_ops/v3-client/deliveryservice.go | 161 ++++++++++++++-------
.../v3-client/deliveryservice_request_comments.go | 18 ++-
traffic_ops/v3-client/deliveryservice_requests.go | 43 ++++--
.../deliveryservices_required_capabilities.go | 11 +-
traffic_ops/v3-client/deliveryserviceserver.go | 29 +++-
traffic_ops/v3-client/division.go | 27 +++-
traffic_ops/v3-client/federation.go | 39 ++++-
traffic_ops/v3-client/federation_resolver.go | 38 +++--
traffic_ops/v3-client/origin.go | 10 +-
traffic_ops/v3-client/parameter.go | 60 ++++++--
traffic_ops/v3-client/phys_location.go | 29 +++-
traffic_ops/v3-client/profile.go | 56 +++++--
traffic_ops/v3-client/profile_parameter.go | 18 ++-
traffic_ops/v3-client/region.go | 29 +++-
traffic_ops/v3-client/role.go | 50 +++++--
traffic_ops/v3-client/server.go | 97 +++++++++----
.../v3-client/server_server_capabilities.go | 11 +-
traffic_ops/v3-client/servercapability.go | 18 ++-
traffic_ops/v3-client/session.go | 23 +--
traffic_ops/v3-client/staticdnsentry.go | 35 +++--
traffic_ops/v3-client/status.go | 27 +++-
traffic_ops/v3-client/steering.go | 7 +-
traffic_ops/v3-client/tenant.go | 31 +++-
traffic_ops/v3-client/topology.go | 18 ++-
traffic_ops/v3-client/type.go | 36 ++++-
traffic_ops/v3-client/user.go | 45 ++++--
traffic_ops_ort/atstccfg/toreqnew/toreqnew.go | 6 +-
80 files changed, 1232 insertions(+), 690 deletions(-)
diff --git a/infrastructure/cdn-in-a-box/enroller/enroller.go b/infrastructure/cdn-in-a-box/enroller/enroller.go
index 0beecb6..4d627c9 100644
--- a/infrastructure/cdn-in-a-box/enroller/enroller.go
+++ b/infrastructure/cdn-in-a-box/enroller/enroller.go
@@ -49,10 +49,10 @@ func newSession(reqTimeout time.Duration, toURL string, toUser string, toPass st
return session{s}, err
}
-func (s session) getParameter(m tc.Parameter) (tc.Parameter, error) {
+func (s session) getParameter(m tc.Parameter, header http.Header) (tc.Parameter, error) {
// TODO: s.GetParameterByxxx() does not seem to work with values with spaces --
// doing this the hard way for now
- parameters, _, err := s.GetParameters(nil)
+ parameters, _, err := s.GetParametersWithHdr(header)
if err != nil {
return m, err
}
@@ -65,7 +65,7 @@ func (s session) getParameter(m tc.Parameter) (tc.Parameter, error) {
}
func (s session) getDeliveryServiceIDByXMLID(n string) (int, error) {
- dses, _, err := s.GetDeliveryServiceByXMLIDNullable(url.QueryEscape(n), nil)
+ dses, _, err := s.GetDeliveryServiceByXMLIDNullable(url.QueryEscape(n))
if err != nil {
return -1, err
}
@@ -222,7 +222,7 @@ func enrollDeliveryServiceServer(toSession *session, r io.Reader) error {
return err
}
- dses, _, err := toSession.GetDeliveryServiceByXMLIDNullable(dss.XmlId, nil)
+ dses, _, err := toSession.GetDeliveryServiceByXMLIDNullable(dss.XmlId)
if err != nil {
return err
}
@@ -238,7 +238,7 @@ func enrollDeliveryServiceServer(toSession *session, r io.Reader) error {
var serverIDs []int
for _, sn := range dss.ServerNames {
params.Set("hostName", sn)
- servers, _, err := toSession.GetServers(params, nil)
+ servers, _, err := toSession.GetServers(params)
if err != nil {
return err
}
@@ -317,7 +317,7 @@ func enrollParameter(toSession *session, r io.Reader) error {
}
for _, p := range params {
- eparam, err := toSession.getParameter(p)
+ eparam, err := toSession.getParameter(p, nil)
var alerts tc.Alerts
if err == nil {
// existing param -- update
@@ -332,7 +332,7 @@ func enrollParameter(toSession *session, r io.Reader) error {
log.Infof("error creating parameter: %s from %+v\n", err.Error(), p)
return err
}
- eparam, err = toSession.getParameter(p)
+ eparam, err = toSession.getParameter(p, nil)
if err != nil {
return err
}
@@ -348,7 +348,7 @@ func enrollParameter(toSession *session, r io.Reader) error {
}
for _, n := range profiles {
- profiles, _, err := toSession.GetProfileByName(n, nil)
+ profiles, _, err := toSession.GetProfileByName(n)
if err != nil {
return err
}
@@ -525,7 +525,7 @@ func enrollProfile(toSession *session, r io.Reader) error {
return errors.New("missing name on profile")
}
- profiles, _, err := toSession.GetProfileByName(profile.Name, nil)
+ profiles, _, err := toSession.GetProfileByName(profile.Name)
createProfile := false
if err != nil || len(profiles) == 0 {
@@ -547,7 +547,7 @@ func enrollProfile(toSession *session, r io.Reader) error {
log.Infof("error creating profile from %+v: %s\n", profile, err.Error())
}
}
- profiles, _, err = toSession.GetProfileByName(profile.Name, nil)
+ profiles, _, err = toSession.GetProfileByName(profile.Name)
if err != nil {
log.Infof("error getting profile ID from %+v: %s\n", profile, err.Error())
}
@@ -579,7 +579,7 @@ func enrollProfile(toSession *session, r io.Reader) error {
value = *p.Value
}
param := tc.Parameter{ConfigFile: configFile, Name: name, Value: value, Secure: secure}
- eparam, err := toSession.getParameter(param)
+ eparam, err := toSession.getParameter(param, nil)
if err != nil {
// create it
log.Infof("creating param %+v\n", param)
@@ -588,7 +588,7 @@ func enrollProfile(toSession *session, r io.Reader) error {
log.Infof("can't create parameter %+v: %s\n", param, err.Error())
continue
}
- eparam, err = toSession.getParameter(param)
+ eparam, err = toSession.getParameter(param, nil)
if err != nil {
log.Infof("error getting new parameter %+v: \n", param)
log.Infof(err.Error())
diff --git a/traffic_ops/testing/api/v3/cachegroups_parameters_test.go b/traffic_ops/testing/api/v3/cachegroups_parameters_test.go
index 3004fa5..3e9e822 100644
--- a/traffic_ops/testing/api/v3/cachegroups_parameters_test.go
+++ b/traffic_ops/testing/api/v3/cachegroups_parameters_test.go
@@ -35,7 +35,7 @@ func TestCacheGroupParameters(t *testing.T) {
func CreateTestCacheGroupParameters(t *testing.T) {
// Get Cache Group to assign parameter to
firstCacheGroup := testData.CacheGroups[0]
- cacheGroupResp, _, err := TOSession.GetCacheGroupNullableByName(*firstCacheGroup.Name, nil)
+ cacheGroupResp, _, err := TOSession.GetCacheGroupNullableByName(*firstCacheGroup.Name)
if err != nil {
t.Errorf("cannot GET Cache Group by name: %v - %v", firstCacheGroup.Name, err)
}
@@ -45,7 +45,7 @@ func CreateTestCacheGroupParameters(t *testing.T) {
// Get Parameter to assign to Cache Group
firstParameter := testData.Parameters[0]
- paramResp, _, err := TOSession.GetParameterByName(firstParameter.Name, nil)
+ paramResp, _, err := TOSession.GetParameterByName(firstParameter.Name)
if err != nil {
t.Errorf("cannot GET Parameter by name: %v - %v", firstParameter.Name, err)
}
@@ -68,7 +68,7 @@ func CreateTestCacheGroupParameters(t *testing.T) {
func GetTestCacheGroupParameters(t *testing.T) {
for _, cgp := range testData.CacheGroupParameterRequests {
- resp, _, err := TOSession.GetCacheGroupParameters(cgp.CacheGroupID, nil)
+ resp, _, err := TOSession.GetCacheGroupParameters(cgp.CacheGroupID)
if err != nil {
t.Errorf("cannot GET Parameter by cache group: %v - %v", err, resp)
}
@@ -85,7 +85,7 @@ func GetTestCacheGroupParametersIMS(t *testing.T) {
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
for _, cgp := range testData.CacheGroupParameterRequests {
- _, reqInf, err := TOSession.GetCacheGroupParameters(cgp.CacheGroupID, header)
+ _, reqInf, err := TOSession.GetCacheGroupParametersWithHdr(cgp.CacheGroupID, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -111,7 +111,7 @@ func DeleteTestCacheGroupParameter(t *testing.T, cgp tc.CacheGroupParameterReque
// Retrieve the Cache Group Parameter to see if it got deleted
queryParams := fmt.Sprintf("?parameterId=%d", cgp.ParameterID)
- parameters, _, err := TOSession.GetCacheGroupParametersByQueryParams(cgp.CacheGroupID, queryParams, nil)
+ parameters, _, err := TOSession.GetCacheGroupParametersByQueryParams(cgp.CacheGroupID, queryParams)
if err != nil {
t.Errorf("error deleting Parameter name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/cachegroups_test.go b/traffic_ops/testing/api/v3/cachegroups_test.go
index 2bf84fe..58326b2 100644
--- a/traffic_ops/testing/api/v3/cachegroups_test.go
+++ b/traffic_ops/testing/api/v3/cachegroups_test.go
@@ -48,7 +48,7 @@ func TestCacheGroups(t *testing.T) {
}
func GetTestCacheGroupsAfterChangeIMS(t *testing.T, header http.Header) {
- _, reqInf, err := TOSession.GetCacheGroupsByQueryParams(url.Values{}, header)
+ _, reqInf, err := TOSession.GetCacheGroupsByQueryParamsWithHdr(url.Values{}, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -59,7 +59,7 @@ func GetTestCacheGroupsAfterChangeIMS(t *testing.T, header http.Header) {
currentTime = currentTime.Add(1 * time.Second)
timeStr := currentTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, timeStr)
- _, reqInf, err = TOSession.GetCacheGroupsByQueryParams(url.Values{}, header)
+ _, reqInf, err = TOSession.GetCacheGroupsByQueryParamsWithHdr(url.Values{}, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -75,7 +75,7 @@ func GetTestCacheGroupsByShortNameIMS(t *testing.T) {
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
for _, cg := range testData.CacheGroups {
- _, reqInf, err := TOSession.GetCacheGroupNullableByShortName(*cg.ShortName, header)
+ _, reqInf, err := TOSession.GetCacheGroupNullableByShortNameWithHdr(*cg.ShortName, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -92,7 +92,7 @@ func GetTestCacheGroupsByNameIMS(t *testing.T) {
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
for _, cg := range testData.CacheGroups {
- _, reqInf, err := TOSession.GetCacheGroupNullableByName(*cg.Name, header)
+ _, reqInf, err := TOSession.GetCacheGroupNullableByNameWithHdr(*cg.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -108,7 +108,7 @@ func GetTestCacheGroupsIMS(t *testing.T) {
futureTime := time.Now().AddDate(0, 0, 1)
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
- _, reqInf, err := TOSession.GetCacheGroupsByQueryParams(url.Values{}, header)
+ _, reqInf, err := TOSession.GetCacheGroupsByQueryParamsWithHdr(url.Values{}, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -151,7 +151,7 @@ func CreateTestCacheGroups(t *testing.T) {
}
func GetTestCacheGroups(t *testing.T) {
- resp, _, err := TOSession.GetCacheGroupsByQueryParams(url.Values{}, nil)
+ resp, _, err := TOSession.GetCacheGroupsByQueryParams(url.Values{})
if err != nil {
t.Errorf("cannot GET CacheGroups %v - %v", err, resp)
}
@@ -174,7 +174,7 @@ func GetTestCacheGroups(t *testing.T) {
func GetTestCacheGroupsByName(t *testing.T) {
for _, cg := range testData.CacheGroups {
- resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name, nil)
+ resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name)
if err != nil {
t.Errorf("cannot GET CacheGroup by name: %v - %v", err, resp)
}
@@ -186,7 +186,7 @@ func GetTestCacheGroupsByName(t *testing.T) {
func GetTestCacheGroupsByShortName(t *testing.T) {
for _, cg := range testData.CacheGroups {
- resp, _, err := TOSession.GetCacheGroupNullableByShortName(*cg.ShortName, nil)
+ resp, _, err := TOSession.GetCacheGroupNullableByShortName(*cg.ShortName)
if err != nil {
t.Errorf("cannot GET CacheGroup by shortName: %v - %v", err, resp)
}
@@ -200,7 +200,7 @@ func GetTestCacheGroupsByTopology(t *testing.T) {
for _, top := range testData.Topologies {
qparams := url.Values{}
qparams.Set("topology", top.Name)
- resp, _, err := TOSession.GetCacheGroupsByQueryParams(qparams, nil)
+ resp, _, err := TOSession.GetCacheGroupsByQueryParams(qparams)
if err != nil {
t.Errorf("cannot GET CacheGroups by topology: %v - %v", err, resp)
}
@@ -223,7 +223,7 @@ func topologyCachegroups(top tc.Topology) map[string]struct{} {
func UpdateTestCacheGroups(t *testing.T) {
firstCG := testData.CacheGroups[0]
- resp, _, err := TOSession.GetCacheGroupNullableByName(*firstCG.Name, nil)
+ resp, _, err := TOSession.GetCacheGroupNullableByName(*firstCG.Name)
if err != nil {
t.Errorf("cannot GET CACHEGROUP by name: %v - %v", *firstCG.Name, err)
}
@@ -232,7 +232,7 @@ func UpdateTestCacheGroups(t *testing.T) {
cg.ShortName = &expectedShortName
// fix the type id for test
- typeResp, _, err := TOSession.GetTypeByID(*cg.TypeID, nil)
+ typeResp, _, err := TOSession.GetTypeByID(*cg.TypeID)
if err != nil {
t.Error("could not lookup a typeID for this cachegroup")
}
@@ -261,7 +261,7 @@ func UpdateTestCacheGroups(t *testing.T) {
}
// Retrieve the CacheGroup to check CacheGroup name got updated
- resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID, nil)
+ resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID)
if err != nil {
t.Errorf("cannot GET CacheGroup by name: '%s', %v", *firstCG.Name, err)
}
@@ -280,7 +280,7 @@ func UpdateTestCacheGroups(t *testing.T) {
t.Errorf("cannot UPDATE CacheGroup by id: %v - %v", err, updResp)
}
- resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID, nil)
+ resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID)
if err != nil {
t.Errorf("cannot GET CacheGroup by id: '%d', %v", *cg.ID, err)
}
@@ -300,7 +300,7 @@ func UpdateTestCacheGroups(t *testing.T) {
t.Errorf("cannot UPDATE CacheGroup by id: %v - %v", err, updResp)
}
- resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID, nil)
+ resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID)
if err != nil {
t.Errorf("cannot GET CacheGroup by id: '%d', %v", *cg.ID, err)
}
@@ -313,7 +313,7 @@ func UpdateTestCacheGroups(t *testing.T) {
// Retrieve the CacheGroup to check CacheGroup name got updated
firstEdgeCGName := "cachegroup1"
- resp, _, err = TOSession.GetCacheGroupNullableByName(firstEdgeCGName, nil)
+ resp, _, err = TOSession.GetCacheGroupNullableByName(firstEdgeCGName)
if err != nil {
t.Errorf("cannot GET CacheGroup by name: '$%s', %v", firstEdgeCGName, err)
}
@@ -330,7 +330,7 @@ func UpdateTestCacheGroups(t *testing.T) {
t.Errorf("cannot UPDATE CacheGroup by id: %v - %v", err, updResp)
}
- resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID, nil)
+ resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID)
if err != nil {
t.Errorf("cannot GET CacheGroup by id: '%d', %v", *cg.ID, err)
}
@@ -347,7 +347,7 @@ func UpdateTestCacheGroups(t *testing.T) {
t.Errorf("cannot UPDATE CacheGroup by id: %v - %v)", err, updResp)
}
- resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID, nil)
+ resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID)
if err != nil {
t.Errorf("cannot GET CacheGroup by id: '%d', %v", *cg.ID, err)
}
@@ -364,7 +364,7 @@ func UpdateTestCacheGroups(t *testing.T) {
t.Errorf("cannot UPDATE CacheGroup by id: %v - %v", err, updResp)
}
- resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID, nil)
+ resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID)
if err != nil {
t.Errorf("cannot GET CacheGroup by id: '%d', %v", *cg.ID, err)
}
@@ -380,7 +380,7 @@ func DeleteTestCacheGroups(t *testing.T) {
// delete the edge caches.
for _, cg := range testData.CacheGroups {
// Retrieve the CacheGroup by name so we can get the id for the Update
- resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name, nil)
+ resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name)
if err != nil {
t.Errorf("cannot GET CacheGroup by name: %v - %v", *cg.Name, err)
}
@@ -399,7 +399,7 @@ func DeleteTestCacheGroups(t *testing.T) {
t.Errorf("cannot DELETE CacheGroup by name: '%s' %v", *respCG.Name, err)
}
// Retrieve the CacheGroup to see if it got deleted
- cgs, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name, nil)
+ cgs, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name)
if err != nil {
t.Errorf("error deleting CacheGroup by name: %s", err.Error())
}
@@ -412,7 +412,7 @@ func DeleteTestCacheGroups(t *testing.T) {
// now delete the parentless cachegroups
for _, cg := range parentlessCacheGroups {
// Retrieve the CacheGroup by name so we can get the id for the Update
- resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name, nil)
+ resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name)
if err != nil {
t.Errorf("cannot GET CacheGroup by name: %v - %v", *cg.Name, err)
}
@@ -424,7 +424,7 @@ func DeleteTestCacheGroups(t *testing.T) {
}
// Retrieve the CacheGroup to see if it got deleted
- cgs, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name, nil)
+ cgs, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name)
if err != nil {
t.Errorf("error deleting CacheGroup name: %s", err.Error())
}
@@ -440,7 +440,7 @@ func CheckCacheGroupsAuthentication(t *testing.T) {
cg := testData.CacheGroups[0]
- resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name, nil)
+ resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name)
if err != nil {
t.Errorf("cannot GET CacheGroup by name: %v - %v", *cg.Name, err)
}
@@ -449,13 +449,13 @@ func CheckCacheGroupsAuthentication(t *testing.T) {
if _, _, err = NoAuthTOSession.CreateCacheGroupNullable(cg); err == nil {
t.Error(fmt.Errorf(errFormat, "CreateCacheGroup"))
}
- if _, _, err = NoAuthTOSession.GetCacheGroupsNullable(nil); err == nil {
+ if _, _, err = NoAuthTOSession.GetCacheGroupsNullable(); err == nil {
t.Error(fmt.Errorf(errFormat, "GetCacheGroups"))
}
- if _, _, err = NoAuthTOSession.GetCacheGroupNullableByName(*cg.Name, nil); err == nil {
+ if _, _, err = NoAuthTOSession.GetCacheGroupNullableByName(*cg.Name); err == nil {
t.Error(fmt.Errorf(errFormat, "GetCacheGroupByName"))
}
- if _, _, err = NoAuthTOSession.GetCacheGroupNullableByID(*cg.ID, nil); err == nil {
+ if _, _, err = NoAuthTOSession.GetCacheGroupNullableByID(*cg.ID); err == nil {
t.Error(fmt.Errorf(errFormat, "GetCacheGroupByID"))
}
if _, _, err = NoAuthTOSession.UpdateCacheGroupNullableByID(*cg.ID, cg); err == nil {
diff --git a/traffic_ops/testing/api/v3/cachegroupsdeliveryservices_test.go b/traffic_ops/testing/api/v3/cachegroupsdeliveryservices_test.go
index 5189342..63ca685 100644
--- a/traffic_ops/testing/api/v3/cachegroupsdeliveryservices_test.go
+++ b/traffic_ops/testing/api/v3/cachegroupsdeliveryservices_test.go
@@ -32,7 +32,7 @@ func TestCacheGroupsDeliveryServices(t *testing.T) {
const TestEdgeServerCacheGroupName = "cachegroup3"
func CreateTestCachegroupsDeliveryServices(t *testing.T) {
- dss, _, err := TOSession.GetDeliveryServiceServers(nil)
+ dss, _, err := TOSession.GetDeliveryServiceServers()
if err != nil {
t.Fatalf("cannot GET DeliveryServiceServers: %v", err)
}
@@ -40,12 +40,12 @@ func CreateTestCachegroupsDeliveryServices(t *testing.T) {
t.Fatalf("cannot test cachegroups delivery services: expected no initial delivery service servers, actual %v", len(dss.Response))
}
- dses, _, err := TOSession.GetDeliveryServicesV30(nil, nil)
+ dses, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, nil)
if err != nil {
t.Fatalf("cannot GET DeliveryServices: %v - %v", err, dses)
}
- clientCGs, _, err := TOSession.GetCacheGroupNullableByName(TestEdgeServerCacheGroupName, nil)
+ clientCGs, _, err := TOSession.GetCacheGroupNullableByName(TestEdgeServerCacheGroupName)
if err != nil {
t.Fatalf("getting cachegroup: %v", err)
}
@@ -107,7 +107,7 @@ func CreateTestCachegroupsDeliveryServices(t *testing.T) {
params := url.Values{}
for _, serverName := range resp.Response.ServerNames {
params.Set("hostName", string(serverName))
- resp, _, err := TOSession.GetServers(¶ms, nil)
+ resp, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Fatalf("getting server: %v", err)
}
@@ -151,7 +151,7 @@ func DeleteTestCachegroupsDeliveryServices(t *testing.T) {
}
}
- dss, _, err = TOSession.GetDeliveryServiceServers(nil)
+ dss, _, err = TOSession.GetDeliveryServiceServers()
if err != nil {
t.Errorf("cannot GET DeliveryServiceServers: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/capabilities_test.go b/traffic_ops/testing/api/v3/capabilities_test.go
index 112b780..6161bea 100644
--- a/traffic_ops/testing/api/v3/capabilities_test.go
+++ b/traffic_ops/testing/api/v3/capabilities_test.go
@@ -91,7 +91,7 @@ func GetTestCapabilitiesIMS(t *testing.T) {
for _, c := range testData.Capabilities {
capMap[c.Name] = c.Description
- _, reqInf, err := TOSession.GetCapability(c.Name, header)
+ _, reqInf, err := TOSession.GetCapabilityWithHdr(c.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -107,7 +107,7 @@ func GetTestCapabilities(t *testing.T) {
for _, c := range testData.Capabilities {
capMap[c.Name] = c.Description
- cap, _, err := TOSession.GetCapability(c.Name, nil)
+ cap, _, err := TOSession.GetCapability(c.Name)
if err != nil {
t.Errorf("could not get capability '%s': %v", c.Name, err)
continue
@@ -126,7 +126,7 @@ func GetTestCapabilities(t *testing.T) {
capMap[c.Name] = c.Description
}
- caps, _, err := TOSession.GetCapabilities(nil)
+ caps, _, err := TOSession.GetCapabilities()
if err != nil {
t.Fatalf("could not get all capabilities: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/cdn_domains_test.go b/traffic_ops/testing/api/v3/cdn_domains_test.go
index eba8c5c..4da7496 100644
--- a/traffic_ops/testing/api/v3/cdn_domains_test.go
+++ b/traffic_ops/testing/api/v3/cdn_domains_test.go
@@ -23,7 +23,7 @@ import (
)
func GetTestDomains(t *testing.T) {
- resp, _, err := TOSession.GetDomains(nil)
+ resp, _, err := TOSession.GetDomains()
t.Log("Response: ", resp)
if err != nil {
t.Errorf("could not GET domains: %v", err)
@@ -36,7 +36,7 @@ func GetTestDomainsIMS(t *testing.T) {
futureTime := time.Now().AddDate(0, 0, 1)
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
- _, reqInf, err := TOSession.GetDomains(header)
+ _, reqInf, err := TOSession.GetDomainsWithHdr(header)
if err != nil {
t.Fatalf("could not GET domains: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/cdnfederations_test.go b/traffic_ops/testing/api/v3/cdnfederations_test.go
index 1fb40d5..6945144 100644
--- a/traffic_ops/testing/api/v3/cdnfederations_test.go
+++ b/traffic_ops/testing/api/v3/cdnfederations_test.go
@@ -67,7 +67,7 @@ func CreateTestCDNFederations(t *testing.T) {
func UpdateTestCDNFederations(t *testing.T) {
for _, id := range fedIDs {
- fed, _, err := TOSession.GetCDNFederationsByID("foo", id, nil)
+ fed, _, err := TOSession.GetCDNFederationsByID("foo", id)
if err != nil {
t.Errorf("cannot GET federation by id: %v", err)
}
@@ -81,7 +81,7 @@ func UpdateTestCDNFederations(t *testing.T) {
bytes, _ := json.Marshal(resp)
t.Logf("PUT Response: %s\n", bytes)
- resp2, _, err := TOSession.GetCDNFederationsByID("foo", id, nil)
+ resp2, _, err := TOSession.GetCDNFederationsByID("foo", id)
if err != nil {
t.Errorf("cannot GET federation by id after PUT: %v", err)
}
@@ -105,7 +105,7 @@ func GetTestCDNFederations(t *testing.T) {
// clean up fedIDs connection?)
for _, id := range fedIDs {
- data, _, err := TOSession.GetCDNFederationsByID("foo", id, nil)
+ data, _, err := TOSession.GetCDNFederationsByID("foo", id)
if err != nil {
t.Errorf("could not GET federations: " + err.Error())
}
@@ -125,7 +125,7 @@ func AssignTestFederationFederationResolvers(t *testing.T) {
t.Fatal("not enough federation resolvers to test")
}
- frs, _, err := TOSession.GetFederationResolvers(nil)
+ frs, _, err := TOSession.GetFederationResolvers()
if err != nil {
t.Fatalf("Unexpected error getting Federation Resolvers: %v", err)
}
@@ -233,7 +233,7 @@ func DeleteTestCDNFederations(t *testing.T) {
bytes, err := json.Marshal(resp)
t.Logf("DELETE Response: %s\n", bytes)
- data, _, err := TOSession.GetCDNFederationsByID("foo", id, nil)
+ data, _, err := TOSession.GetCDNFederationsByID("foo", id)
if len(data.Response) != 0 {
t.Error("expected federation to be deleted")
}
diff --git a/traffic_ops/testing/api/v3/cdns_test.go b/traffic_ops/testing/api/v3/cdns_test.go
index d41acf1..89a577a 100644
--- a/traffic_ops/testing/api/v3/cdns_test.go
+++ b/traffic_ops/testing/api/v3/cdns_test.go
@@ -40,7 +40,7 @@ func TestCDNs(t *testing.T) {
func GetTestCDNsIMSAfterChange(t *testing.T, header http.Header) {
for _, cdn := range testData.CDNs {
- _, reqInf, err := TOSession.GetCDNByName(cdn.Name, header)
+ _, reqInf, err := TOSession.GetCDNByNameWithHdr(cdn.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -53,7 +53,7 @@ func GetTestCDNsIMSAfterChange(t *testing.T, header http.Header) {
timeStr := currentTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, timeStr)
for _, cdn := range testData.CDNs {
- _, reqInf, err := TOSession.GetCDNByName(cdn.Name, header)
+ _, reqInf, err := TOSession.GetCDNByNameWithHdr(cdn.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -70,7 +70,7 @@ func GetTestCDNsIMS(t *testing.T) {
futureTime := time.Now().AddDate(0, 0, 1)
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
- _, reqInf, err := TOSession.GetCDNByName(cdn.Name, header)
+ _, reqInf, err := TOSession.GetCDNByNameWithHdr(cdn.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -96,7 +96,7 @@ func UpdateTestCDNs(t *testing.T) {
firstCDN := testData.CDNs[0]
// Retrieve the CDN by name so we can get the id for the Update
- resp, _, err := TOSession.GetCDNByName(firstCDN.Name, nil)
+ resp, _, err := TOSession.GetCDNByName(firstCDN.Name)
if err != nil {
t.Errorf("cannot GET CDN by name: '%s', %v", firstCDN.Name, err)
}
@@ -110,7 +110,7 @@ func UpdateTestCDNs(t *testing.T) {
}
// Retrieve the CDN to check CDN name got updated
- resp, _, err = TOSession.GetCDNByID(remoteCDN.ID, nil)
+ resp, _, err = TOSession.GetCDNByID(remoteCDN.ID)
if err != nil {
t.Errorf("cannot GET CDN by name: '$%s', %v", firstCDN.Name, err)
}
@@ -124,7 +124,7 @@ func UpdateTestCDNs(t *testing.T) {
func GetTestCDNs(t *testing.T) {
for _, cdn := range testData.CDNs {
- resp, _, err := TOSession.GetCDNByName(cdn.Name, nil)
+ resp, _, err := TOSession.GetCDNByName(cdn.Name)
if err != nil {
t.Errorf("cannot GET CDN by name: %v - %v", err, resp)
}
@@ -135,7 +135,7 @@ func DeleteTestCDNs(t *testing.T) {
for _, cdn := range testData.CDNs {
// Retrieve the CDN by name so we can get the id for the Update
- resp, _, err := TOSession.GetCDNByName(cdn.Name, nil)
+ resp, _, err := TOSession.GetCDNByName(cdn.Name)
if err != nil {
t.Errorf("cannot GET CDN by name: %v - %v", cdn.Name, err)
}
@@ -148,7 +148,7 @@ func DeleteTestCDNs(t *testing.T) {
}
// Retrieve the CDN to see if it got deleted
- cdns, _, err := TOSession.GetCDNByName(cdn.Name, nil)
+ cdns, _, err := TOSession.GetCDNByName(cdn.Name)
if err != nil {
t.Errorf("error deleting CDN name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/cookie_test.go b/traffic_ops/testing/api/v3/cookie_test.go
index c193e95..b3526d4 100644
--- a/traffic_ops/testing/api/v3/cookie_test.go
+++ b/traffic_ops/testing/api/v3/cookie_test.go
@@ -43,7 +43,7 @@ func CookiesTest(t *testing.T) {
t.Fatal("unable to json marshal login credentials")
}
path := TestAPIBase + "/user/login"
- loginResp, _, err := s.RawRequest(http.MethodPost, path, js, nil)
+ loginResp, _, err := s.RawRequest(http.MethodPost, path, js)
if err != nil {
t.Fatal("unable to request POST /user/login")
}
@@ -54,7 +54,7 @@ func CookiesTest(t *testing.T) {
}
ensureCookie(loginResp, t)
- cdnResp, _, err := s.RawRequest(http.MethodGet, TestAPIBase+"/cdns", nil, nil)
+ cdnResp, _, err := s.RawRequest(http.MethodGet, TestAPIBase+"/cdns", nil)
if err != nil {
t.Fatal("unable to request GET /cdns")
}
diff --git a/traffic_ops/testing/api/v3/coordinates_test.go b/traffic_ops/testing/api/v3/coordinates_test.go
index 34a56d0..6dcd8a3 100644
--- a/traffic_ops/testing/api/v3/coordinates_test.go
+++ b/traffic_ops/testing/api/v3/coordinates_test.go
@@ -40,7 +40,7 @@ func TestCoordinates(t *testing.T) {
func GetTestCoordinatesIMSAfterChange(t *testing.T, header http.Header) {
for _, coord := range testData.Coordinates {
- _, reqInf, err := TOSession.GetCoordinateByName(coord.Name, header)
+ _, reqInf, err := TOSession.GetCoordinateByNameWithHdr(coord.Name, header)
if err != nil {
t.Fatalf("could not GET coordinates: %v", err)
}
@@ -53,7 +53,7 @@ func GetTestCoordinatesIMSAfterChange(t *testing.T, header http.Header) {
timeStr := currentTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, timeStr)
for _, coord := range testData.Coordinates {
- _, reqInf, err := TOSession.GetCoordinateByName(coord.Name, header)
+ _, reqInf, err := TOSession.GetCoordinateByNameWithHdr(coord.Name, header)
if err != nil {
t.Fatalf("could not GET coordinates: %v", err)
}
@@ -70,7 +70,7 @@ func GetTestCoordinatesIMS(t *testing.T) {
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
for _, coord := range testData.Coordinates {
- _, reqInf, err := TOSession.GetCoordinateByName(coord.Name, header)
+ _, reqInf, err := TOSession.GetCoordinateByNameWithHdr(coord.Name, header)
if err != nil {
t.Fatalf("No error expected, but got: %v", err)
}
@@ -92,7 +92,7 @@ func CreateTestCoordinates(t *testing.T) {
func GetTestCoordinates(t *testing.T) {
for _, coord := range testData.Coordinates {
- resp, _, err := TOSession.GetCoordinateByName(coord.Name, nil)
+ resp, _, err := TOSession.GetCoordinateByName(coord.Name)
if err != nil {
t.Errorf("cannot GET Coordinate: %v - %v", err, resp)
}
@@ -101,7 +101,7 @@ func GetTestCoordinates(t *testing.T) {
func UpdateTestCoordinates(t *testing.T) {
firstCoord := testData.Coordinates[0]
- resp, _, err := TOSession.GetCoordinateByName(firstCoord.Name, nil)
+ resp, _, err := TOSession.GetCoordinateByName(firstCoord.Name)
if err != nil {
t.Errorf("cannot GET Coordinate by name: %v - %v", firstCoord.Name, err)
}
@@ -116,7 +116,7 @@ func UpdateTestCoordinates(t *testing.T) {
}
// Retrieve the Coordinate to check Coordinate name got updated
- resp, _, err = TOSession.GetCoordinateByID(coord.ID, nil)
+ resp, _, err = TOSession.GetCoordinateByID(coord.ID)
if err != nil {
t.Errorf("cannot GET Coordinate by name: '$%s', %v", firstCoord.Name, err)
}
@@ -129,7 +129,7 @@ func UpdateTestCoordinates(t *testing.T) {
func DeleteTestCoordinates(t *testing.T) {
for _, coord := range testData.Coordinates {
// Retrieve the Coordinate by name so we can get the id for the Update
- resp, _, err := TOSession.GetCoordinateByName(coord.Name, nil)
+ resp, _, err := TOSession.GetCoordinateByName(coord.Name)
if err != nil {
t.Errorf("cannot GET Coordinate by name: %v - %v", coord.Name, err)
}
@@ -140,7 +140,7 @@ func DeleteTestCoordinates(t *testing.T) {
t.Errorf("cannot DELETE Coordinate by name: '%s' %v", respCoord.Name, err)
}
// Retrieve the Coordinate to see if it got deleted
- coords, _, err := TOSession.GetCoordinateByName(coord.Name, nil)
+ coords, _, err := TOSession.GetCoordinateByName(coord.Name)
if err != nil {
t.Errorf("error deleting Coordinate name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/crconfig_test.go b/traffic_ops/testing/api/v3/crconfig_test.go
index 11247ce..5a88c33 100644
--- a/traffic_ops/testing/api/v3/crconfig_test.go
+++ b/traffic_ops/testing/api/v3/crconfig_test.go
@@ -51,7 +51,7 @@ func UpdateTestCRConfigSnapshot(t *testing.T) {
}
// create an ANY_MAP DS assignment to verify that it doesn't show up in the CRConfig
- resp, _, err := TOSession.GetServers(nil, nil)
+ resp, _, err := TOSession.GetServers(nil)
if err != nil {
t.Fatalf("GetServers err expected nil, actual %+v", err)
}
@@ -66,7 +66,7 @@ func UpdateTestCRConfigSnapshot(t *testing.T) {
if serverID == 0 {
t.Errorf("GetServers expected EDGE server in cdn1, actual: %+v", servers)
}
- res, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("anymap-ds", nil)
+ res, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("anymap-ds")
if err != nil {
t.Errorf("GetDeliveryServiceByXMLIDNullable err expected nil, actual %+v", err)
}
@@ -125,7 +125,7 @@ func UpdateTestCRConfigSnapshot(t *testing.T) {
t.Errorf("GetCRConfig crc.Stats.Path expected: '"+tmURLExpected+"', actual: %+v", *crc.Stats.TMHost)
}
- paramResp, _, err := TOSession.GetParameterByName(tmURLParamName, nil)
+ paramResp, _, err := TOSession.GetParameterByName(tmURLParamName)
if err != nil {
t.Fatalf("cannot GET Parameter by name: %v - %v", tmURLParamName, err)
}
@@ -162,7 +162,7 @@ func SnapshotTestCDNbyID(t *testing.T) {
firstCDN := testData.CDNs[0]
// Retrieve the CDN by name so we can get the id for the snapshot
- resp, _, err := TOSession.GetCDNByName(firstCDN.Name, nil)
+ resp, _, err := TOSession.GetCDNByName(firstCDN.Name)
if err != nil {
t.Errorf("cannot GET CDN by name: '%s', %v", firstCDN.Name, err)
}
diff --git a/traffic_ops/testing/api/v3/deliveryservice_request_comments_test.go b/traffic_ops/testing/api/v3/deliveryservice_request_comments_test.go
index d7ea146..8d604c3 100644
--- a/traffic_ops/testing/api/v3/deliveryservice_request_comments_test.go
+++ b/traffic_ops/testing/api/v3/deliveryservice_request_comments_test.go
@@ -39,7 +39,7 @@ func TestDeliveryServiceRequestComments(t *testing.T) {
}
func GetTestDeliveryServiceRequestCommentsIMSAfterChange(t *testing.T, header http.Header) {
- _, reqInf, err := TOSession.GetDeliveryServiceRequestComments(header)
+ _, reqInf, err := TOSession.GetDeliveryServiceRequestCommentsWithHdr(header)
if err != nil {
t.Fatalf("could not GET delivery service request comments: %v", err)
}
@@ -50,7 +50,7 @@ func GetTestDeliveryServiceRequestCommentsIMSAfterChange(t *testing.T, header ht
futureTime := time.Now().AddDate(0, 0, 1)
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
- _, reqInf, err = TOSession.GetDeliveryServiceRequestComments(header)
+ _, reqInf, err = TOSession.GetDeliveryServiceRequestCommentsWithHdr(header)
if err != nil {
t.Fatalf("could not GET delivery service request comments: %v", err)
}
@@ -64,7 +64,7 @@ func CreateTestDeliveryServiceRequestComments(t *testing.T) {
// Retrieve a delivery service request by xmlId so we can get the ID needed to create a dsr comment
dsr := testData.DeliveryServiceRequests[0].DeliveryService
- resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.XMLID, nil)
+ resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.XMLID)
if err != nil {
t.Errorf("cannot GET delivery service request by xml id: %v - %v", dsr.XMLID, err)
}
@@ -86,7 +86,7 @@ func CreateTestDeliveryServiceRequestComments(t *testing.T) {
func UpdateTestDeliveryServiceRequestComments(t *testing.T) {
- comments, _, err := TOSession.GetDeliveryServiceRequestComments(nil)
+ comments, _, err := TOSession.GetDeliveryServiceRequestComments()
firstComment := comments[0]
newFirstCommentValue := "new comment value"
@@ -99,7 +99,7 @@ func UpdateTestDeliveryServiceRequestComments(t *testing.T) {
}
// Retrieve the delivery service request comment to check that the value got updated
- resp, _, err := TOSession.GetDeliveryServiceRequestCommentByID(firstComment.ID, nil)
+ resp, _, err := TOSession.GetDeliveryServiceRequestCommentByID(firstComment.ID)
if err != nil {
t.Errorf("cannot GET delivery service request comment by id: '$%d', %v", firstComment.ID, err)
}
@@ -116,7 +116,7 @@ func GetTestDeliveryServiceRequestCommentsIMS(t *testing.T) {
futureTime := time.Now().AddDate(0, 0, 1)
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
- _, reqInf, err := TOSession.GetDeliveryServiceRequestComments(header)
+ _, reqInf, err := TOSession.GetDeliveryServiceRequestCommentsWithHdr(header)
if err != nil {
t.Fatalf("could not GET delivery service request comments: %v", err)
}
@@ -127,10 +127,10 @@ func GetTestDeliveryServiceRequestCommentsIMS(t *testing.T) {
func GetTestDeliveryServiceRequestComments(t *testing.T) {
- comments, _, _ := TOSession.GetDeliveryServiceRequestComments(nil)
+ comments, _, _ := TOSession.GetDeliveryServiceRequestComments()
for _, comment := range comments {
- resp, _, err := TOSession.GetDeliveryServiceRequestCommentByID(comment.ID, nil)
+ resp, _, err := TOSession.GetDeliveryServiceRequestCommentByID(comment.ID)
if err != nil {
t.Errorf("cannot GET delivery service request comment by id: %v - %v", err, resp)
}
@@ -139,7 +139,7 @@ func GetTestDeliveryServiceRequestComments(t *testing.T) {
func DeleteTestDeliveryServiceRequestComments(t *testing.T) {
- comments, _, _ := TOSession.GetDeliveryServiceRequestComments(nil)
+ comments, _, _ := TOSession.GetDeliveryServiceRequestComments()
for _, comment := range comments {
_, _, err := TOSession.DeleteDeliveryServiceRequestCommentByID(comment.ID)
@@ -148,7 +148,7 @@ func DeleteTestDeliveryServiceRequestComments(t *testing.T) {
}
// Retrieve the delivery service request comment to see if it got deleted
- comments, _, err := TOSession.GetDeliveryServiceRequestCommentByID(comment.ID, nil)
+ comments, _, err := TOSession.GetDeliveryServiceRequestCommentByID(comment.ID)
if err != nil {
t.Errorf("error deleting delivery service request comment: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/deliveryservice_requests_test.go b/traffic_ops/testing/api/v3/deliveryservice_requests_test.go
index b41d450..285bd6f 100644
--- a/traffic_ops/testing/api/v3/deliveryservice_requests_test.go
+++ b/traffic_ops/testing/api/v3/deliveryservice_requests_test.go
@@ -49,7 +49,7 @@ func TestDeliveryServiceRequests(t *testing.T) {
func GetTestDeliveryServiceRequestsIMSAfterChange(t *testing.T, header http.Header) {
dsr := testData.DeliveryServiceRequests[dsrGood]
- _, reqInf, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, header)
+ _, reqInf, err := TOSession.GetDeliveryServiceRequestByXMLIDWithHdr(dsr.DeliveryService.XMLID, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -60,7 +60,7 @@ func GetTestDeliveryServiceRequestsIMSAfterChange(t *testing.T, header http.Head
currentTime = currentTime.Add(1 * time.Second)
timeStr := currentTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, timeStr)
- _, reqInf, err = TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, header)
+ _, reqInf, err = TOSession.GetDeliveryServiceRequestByXMLIDWithHdr(dsr.DeliveryService.XMLID, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -133,7 +133,7 @@ func TestDeliveryServiceRequestTypeFields(t *testing.T) {
utils.Compare(t, expected, alerts.ToStrings())
- dsrs, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, nil)
+ dsrs, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID)
if len(dsrs) != 1 {
t.Errorf("expected 1 deliveryservice_request with XMLID %s; got %d", dsr.DeliveryService.XMLID, len(dsrs))
}
@@ -169,7 +169,7 @@ func TestDeliveryServiceRequestBad(t *testing.T) {
func TestDeliveryServiceRequestWorkflow(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Parameters, Tenants}, func() {
// test empty request table
- dsrs, _, err := TOSession.GetDeliveryServiceRequests(nil)
+ dsrs, _, err := TOSession.GetDeliveryServiceRequests()
if err != nil {
t.Errorf("Error getting empty list of DeliveryServiceRequests %v++", err)
}
@@ -200,7 +200,7 @@ func TestDeliveryServiceRequestWorkflow(t *testing.T) {
expected = []string{`An active request exists for delivery service 'test-transitions'`}
utils.Compare(t, expected, alerts.ToStrings())
- dsrs, _, err = TOSession.GetDeliveryServiceRequestByXMLID(`test-transitions`, nil)
+ dsrs, _, err = TOSession.GetDeliveryServiceRequestByXMLID(`test-transitions`)
if len(dsrs) != 1 {
t.Errorf("Expected 1 deliveryServiceRequest -- got %d", len(dsrs))
if len(dsrs) == 0 {
@@ -231,7 +231,7 @@ func updateDeliveryServiceRequestStatus(t *testing.T, dsr tc.DeliveryServiceRequ
return alerts, dsr
}
- d, _, err := TOSession.GetDeliveryServiceRequestByID(ID, nil)
+ d, _, err := TOSession.GetDeliveryServiceRequestByID(ID)
if err != nil {
t.Errorf("Error updating deliveryservice_request %d: %v", ID, err)
return alerts, dsr
@@ -250,7 +250,7 @@ func GetTestDeliveryServiceRequestsIMS(t *testing.T) {
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
dsr := testData.DeliveryServiceRequests[dsrGood]
- _, reqInf, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, header)
+ _, reqInf, err := TOSession.GetDeliveryServiceRequestByXMLIDWithHdr(dsr.DeliveryService.XMLID, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -261,7 +261,7 @@ func GetTestDeliveryServiceRequestsIMS(t *testing.T) {
func GetTestDeliveryServiceRequests(t *testing.T) {
dsr := testData.DeliveryServiceRequests[dsrGood]
- resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, nil)
+ resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID)
if err != nil {
t.Errorf("cannot GET DeliveryServiceRequest by XMLID: %v - %v", err, resp)
}
@@ -271,7 +271,7 @@ func UpdateTestDeliveryServiceRequests(t *testing.T) {
// Retrieve the DeliveryServiceRequest by name so we can get the id for the Update
dsr := testData.DeliveryServiceRequests[dsrGood]
- resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, nil)
+ resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID)
if err != nil {
t.Errorf("cannot GET DeliveryServiceRequest by name: %v - %v", dsr.DeliveryService.XMLID, err)
}
@@ -290,7 +290,7 @@ func UpdateTestDeliveryServiceRequests(t *testing.T) {
}
// Retrieve the DeliveryServiceRequest to check DeliveryServiceRequest name got updated
- resp, _, err = TOSession.GetDeliveryServiceRequestByID(respDSR.ID, nil)
+ resp, _, err = TOSession.GetDeliveryServiceRequestByID(respDSR.ID)
if err != nil {
t.Errorf("cannot GET DeliveryServiceRequest by name: %v - %v", respDSR.ID, err)
} else {
@@ -306,7 +306,7 @@ func DeleteTestDeliveryServiceRequests(t *testing.T) {
// Retrieve the DeliveryServiceRequest by name so we can get the id for the Update
dsr := testData.DeliveryServiceRequests[dsrGood]
- resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, nil)
+ resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID)
if err != nil {
t.Errorf("cannot GET DeliveryServiceRequest by id: %v - %v", dsr.DeliveryService.XMLID, err)
}
@@ -318,7 +318,7 @@ func DeleteTestDeliveryServiceRequests(t *testing.T) {
}
// Retrieve the DeliveryServiceRequest to see if it got deleted
- dsrs, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, nil)
+ dsrs, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID)
if err != nil {
t.Errorf("error deleting DeliveryServiceRequest name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/deliveryservices_required_capabilities_test.go b/traffic_ops/testing/api/v3/deliveryservices_required_capabilities_test.go
index 45b2efe..afb9091 100644
--- a/traffic_ops/testing/api/v3/deliveryservices_required_capabilities_test.go
+++ b/traffic_ops/testing/api/v3/deliveryservices_required_capabilities_test.go
@@ -80,7 +80,7 @@ func GetTestDeliveryServicesRequiredCapabilitiesIMSAfterChange(t *testing.T, hea
for _, tc := range testCases {
t.Run(tc.description, func(t *testing.T) {
- _, reqInf, err := TOSession.GetDeliveryServicesRequiredCapabilities(tc.capability.DeliveryServiceID, tc.capability.XMLID, tc.capability.RequiredCapability, header)
+ _, reqInf, err := TOSession.GetDeliveryServicesRequiredCapabilitiesWithHdr(tc.capability.DeliveryServiceID, tc.capability.XMLID, tc.capability.RequiredCapability, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -95,7 +95,7 @@ func GetTestDeliveryServicesRequiredCapabilitiesIMSAfterChange(t *testing.T, hea
header.Set(rfc.IfModifiedSince, timeStr)
for _, tc := range testCases {
t.Run(tc.description, func(t *testing.T) {
- _, reqInf, err := TOSession.GetDeliveryServicesRequiredCapabilities(tc.capability.DeliveryServiceID, tc.capability.XMLID, tc.capability.RequiredCapability, header)
+ _, reqInf, err := TOSession.GetDeliveryServicesRequiredCapabilitiesWithHdr(tc.capability.DeliveryServiceID, tc.capability.XMLID, tc.capability.RequiredCapability, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -144,7 +144,7 @@ func GetTestDeliveryServicesRequiredCapabilities(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.description, func(t *testing.T) {
- capabilities, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(tc.capability.DeliveryServiceID, tc.capability.XMLID, tc.capability.RequiredCapability, nil)
+ capabilities, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(tc.capability.DeliveryServiceID, tc.capability.XMLID, tc.capability.RequiredCapability)
if err != nil {
t.Fatalf("%s; got err= %v; expected err= nil", tc.description, err)
}
@@ -198,7 +198,7 @@ func GetTestDeliveryServicesRequiredCapabilitiesIMS(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.description, func(t *testing.T) {
- _, reqInf, err := TOSession.GetDeliveryServicesRequiredCapabilities(tc.capability.DeliveryServiceID, tc.capability.XMLID, tc.capability.RequiredCapability, header)
+ _, reqInf, err := TOSession.GetDeliveryServicesRequiredCapabilitiesWithHdr(tc.capability.DeliveryServiceID, tc.capability.XMLID, tc.capability.RequiredCapability, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -301,7 +301,7 @@ func InvalidDeliveryServicesRequiredCapabilityAddition(t *testing.T) {
// Tests that a capability cannot be made required if the DS's services do not have it assigned
// Get Delivery Capability for a DS
- capabilities, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, util.StrPtr("ds1"), nil, nil)
+ capabilities, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, util.StrPtr("ds1"), nil)
if err != nil {
t.Fatalf("cannot GET delivery service required capabilities: %v", err)
}
@@ -313,7 +313,7 @@ func InvalidDeliveryServicesRequiredCapabilityAddition(t *testing.T) {
// TODO: DON'T hard-code hostnames!
params := url.Values{}
params.Add("hostName", "atlanta-edge-01")
- resp, _, err := TOSession.GetServers(¶ms, nil)
+ resp, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Fatalf("cannot GET Server by hostname: %v", err)
}
@@ -389,7 +389,7 @@ func InvalidDeliveryServicesRequiredCapabilityAddition(t *testing.T) {
func DeleteTestDeliveryServicesRequiredCapabilities(t *testing.T) {
// Get Required Capabilities to delete them
- capabilities, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, nil, nil, nil)
+ capabilities, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, nil, nil)
if err != nil {
t.Fatalf(err.Error())
}
@@ -445,7 +445,7 @@ func helperGetDeliveryServiceID(t *testing.T, xmlID *string) *int {
if xmlID == nil {
t.Fatal("xml id must not be nil")
}
- ds, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(*xmlID, nil)
+ ds, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(*xmlID)
if err != nil {
t.Fatal(err)
}
diff --git a/traffic_ops/testing/api/v3/deliveryservices_test.go b/traffic_ops/testing/api/v3/deliveryservices_test.go
index 8ea06c4..ac9c6b9 100644
--- a/traffic_ops/testing/api/v3/deliveryservices_test.go
+++ b/traffic_ops/testing/api/v3/deliveryservices_test.go
@@ -56,7 +56,7 @@ func TestDeliveryServices(t *testing.T) {
}
func GetTestDeliveryServicesIMSAfterChange(t *testing.T, header http.Header) {
- _, reqInf, err := TOSession.GetDeliveryServicesV30(header, nil)
+ _, reqInf, err := TOSession.GetDeliveryServicesV30WithHdr(header, nil)
if err != nil {
t.Fatalf("could not GET Delivery Services: %v", err)
}
@@ -67,7 +67,7 @@ func GetTestDeliveryServicesIMSAfterChange(t *testing.T, header http.Header) {
currentTime = currentTime.Add(1 * time.Second)
timeStr := currentTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, timeStr)
- _, reqInf, err = TOSession.GetDeliveryServicesV30(header, nil)
+ _, reqInf, err = TOSession.GetDeliveryServicesV30WithHdr(header, nil)
if err != nil {
t.Fatalf("could not GET Delivery Services: %v", err)
}
@@ -114,7 +114,7 @@ func GetTestDeliveryServicesIMS(t *testing.T) {
futureTime := time.Now().AddDate(0, 0, 1)
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
- _, reqInf, err := TOSession.GetDeliveryServicesV30(header, nil)
+ _, reqInf, err := TOSession.GetDeliveryServicesV30WithHdr(header, nil)
if err != nil {
t.Fatalf("could not GET Delivery Services: %v", err)
}
@@ -124,7 +124,7 @@ func GetTestDeliveryServicesIMS(t *testing.T) {
}
func GetTestDeliveryServices(t *testing.T) {
- actualDSes, _, err := TOSession.GetDeliveryServicesV30(nil, nil)
+ actualDSes, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, nil)
if err != nil {
t.Errorf("cannot GET DeliveryServices: %v - %v", err, actualDSes)
}
@@ -153,7 +153,7 @@ func GetTestDeliveryServices(t *testing.T) {
func UpdateTestDeliveryServices(t *testing.T) {
firstDS := testData.DeliveryServices[0]
- dses, _, err := TOSession.GetDeliveryServicesV30(nil, nil)
+ dses, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, nil)
if err != nil {
t.Errorf("cannot GET Delivery Services: %v", err)
}
@@ -186,7 +186,7 @@ func UpdateTestDeliveryServices(t *testing.T) {
// Retrieve the server to check rack and interfaceName values were updated
params := url.Values{}
params.Set("id", strconv.Itoa(*remoteDS.ID))
- apiResp, _, err := TOSession.GetDeliveryServicesV30(nil, params)
+ apiResp, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, params)
if err != nil {
t.Fatalf("cannot GET Delivery Service by ID: %v - %v", remoteDS.XMLID, err)
}
@@ -205,7 +205,7 @@ func UpdateTestDeliveryServices(t *testing.T) {
func UpdateNullableTestDeliveryServices(t *testing.T) {
firstDS := testData.DeliveryServices[0]
- dses, _, err := TOSession.GetDeliveryServicesV30(nil, nil)
+ dses, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, nil)
if err != nil {
t.Fatalf("cannot GET Delivery Services: %v", err)
}
@@ -237,7 +237,7 @@ func UpdateNullableTestDeliveryServices(t *testing.T) {
params := url.Values{}
params.Set("id", strconv.Itoa(*remoteDS.ID))
- apiResp, _, err := TOSession.GetDeliveryServicesV30(nil, params)
+ apiResp, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, params)
if err != nil {
t.Fatalf("cannot GET Delivery Service by ID: %v - %v", remoteDS.XMLID, err)
}
@@ -259,7 +259,7 @@ func UpdateNullableTestDeliveryServices(t *testing.T) {
// UpdateDeliveryServiceWithInvalidTopology ensures that a topology cannot be assigned to (CLIENT_)STEERING delivery services.
func UpdateDeliveryServiceWithInvalidTopology(t *testing.T) {
- dses, _, err := TOSession.GetDeliveryServicesV30(nil, nil)
+ dses, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, nil)
if err != nil {
t.Fatalf("cannot GET Delivery Services: %v", err)
}
@@ -282,7 +282,7 @@ func UpdateDeliveryServiceWithInvalidTopology(t *testing.T) {
// UpdateDeliveryServiceTopologyHeaderRewriteFields ensures that a delivery service can only use firstHeaderRewrite,
// innerHeaderRewrite, or lastHeadeRewrite if a topology is assigned.
func UpdateDeliveryServiceTopologyHeaderRewriteFields(t *testing.T) {
- dses, _, err := TOSession.GetDeliveryServicesV30(nil, nil)
+ dses, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, nil)
if err != nil {
t.Fatalf("cannot GET Delivery Services: %v", err)
}
@@ -323,7 +323,7 @@ func UpdateDeliveryServiceTopologyHeaderRewriteFields(t *testing.T) {
func UpdateDeliveryServiceWithInvalidRemapText(t *testing.T) {
firstDS := testData.DeliveryServices[0]
- dses, _, err := TOSession.GetDeliveryServicesV30(nil, nil)
+ dses, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, nil)
if err != nil {
t.Fatalf("cannot GET Delivery Services: %v", err)
}
@@ -366,7 +366,7 @@ func UpdateDeliveryServiceWithInvalidSliceRangeRequest(t *testing.T) {
t.Fatal("no HTTP or DNS Delivery Services to test with")
}
- dses, _, err := TOSession.GetDeliveryServicesV30(nil, nil)
+ dses, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, nil)
if err != nil {
t.Fatalf("cannot GET Delivery Services: %v", err)
}
@@ -455,7 +455,7 @@ func GetAccessibleToTest(t *testing.T) {
}
//First and only child tenant, no access to root
- childTenant, _, err := TOSession.TenantByName("tenant1", nil)
+ childTenant, _, err := TOSession.TenantByName("tenant1")
if err != nil {
t.Fatal("unable to get tenant " + err.Error())
}
@@ -473,7 +473,7 @@ func GetAccessibleToTest(t *testing.T) {
func getByTenants(tenantID int, expectedCount int) error {
params := url.Values{}
params.Set("accessibleTo", strconv.Itoa(tenantID))
- deliveryServices, _, err := TOSession.GetDeliveryServicesV30(nil, params)
+ deliveryServices, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, params)
if err != nil {
return err
}
@@ -484,7 +484,7 @@ func getByTenants(tenantID int, expectedCount int) error {
}
func DeleteTestDeliveryServices(t *testing.T) {
- dses, _, err := TOSession.GetDeliveryServicesV30(nil, nil)
+ dses, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, nil)
if err != nil {
t.Errorf("cannot GET deliveryservices: %v", err)
}
@@ -512,7 +512,7 @@ func DeleteTestDeliveryServices(t *testing.T) {
// Retrieve the Server to see if it got deleted
params := url.Values{}
params.Set("id", strconv.Itoa(*ds.ID))
- foundDS, _, err := TOSession.GetDeliveryServicesV30(nil, params)
+ foundDS, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, params)
if err != nil {
t.Errorf("Unexpected error deleting Delivery Service '%s': %v", *ds.XMLID, err)
}
@@ -522,7 +522,7 @@ func DeleteTestDeliveryServices(t *testing.T) {
}
// clean up parameter created in CreateTestDeliveryServices()
- params, _, err := TOSession.GetParameterByNameAndConfigFile("location", "remap.config", nil)
+ params, _, err := TOSession.GetParameterByNameAndConfigFile("location", "remap.config")
for _, param := range params {
deleted, _, err := TOSession.DeleteParameterByID(param.ID)
if err != nil {
@@ -543,7 +543,7 @@ func DeliveryServiceMinorVersionsTest(t *testing.T) {
t.Errorf("expected XMLID: ds-test-minor-versions, actual: %s", *testDS.XMLID)
}
- dses, _, err := TOSession.GetDeliveryServicesV30(nil, nil)
+ dses, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, nil)
if err != nil {
t.Errorf("cannot GET DeliveryServices: %v - %v", err, dses)
}
@@ -616,7 +616,7 @@ func DeliveryServiceMinorVersionsTest(t *testing.T) {
}
func DeliveryServiceTenancyTest(t *testing.T) {
- dses, _, err := TOSession.GetDeliveryServicesV30(nil, nil)
+ dses, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, nil)
if err != nil {
t.Errorf("cannot GET deliveryservices: %v", err)
}
@@ -638,7 +638,7 @@ func DeliveryServiceTenancyTest(t *testing.T) {
t.Fatalf("failed to log in with tenant4user: %v", err.Error())
}
- dsesReadableByTenant4, _, err := tenant4TOClient.GetDeliveryServicesNullable(nil)
+ dsesReadableByTenant4, _, err := tenant4TOClient.GetDeliveryServicesNullable()
if err != nil {
t.Error("tenant4user cannot GET deliveryservices")
}
diff --git a/traffic_ops/testing/api/v3/deliveryserviceservers_test.go b/traffic_ops/testing/api/v3/deliveryserviceservers_test.go
index 8818252..0a6d235 100644
--- a/traffic_ops/testing/api/v3/deliveryserviceservers_test.go
+++ b/traffic_ops/testing/api/v3/deliveryserviceservers_test.go
@@ -43,7 +43,7 @@ func TestDeliveryServiceServersWithRequiredCapabilities(t *testing.T) {
func AssignServersToTopologyBasedDeliveryService(t *testing.T) {
params := url.Values{}
params.Set("xmlId", "ds-top")
- ds, _, err := TOSession.GetDeliveryServicesV30(nil, params)
+ ds, _, err := TOSession.GetDeliveryServicesV30WithHdr(nil, params)
if err != nil {
t.Fatalf("cannot GET delivery service 'ds-top': %s", err.Error())
}
@@ -53,7 +53,7 @@ func AssignServersToTopologyBasedDeliveryService(t *testing.T) {
if ds[0].Topology == nil {
t.Fatal("expected delivery service: 'ds-top' to have a non-nil Topology, actual: nil")
}
- serversResp, _, err := TOSession.GetServers(nil, nil)
+ serversResp, _, err := TOSession.GetServers(nil)
servers := []tc.ServerNullable{}
for _, s := range serversResp.Response {
if s.CDNID != nil && *s.CDNID == *ds[0].CDNID && s.Type == tc.CacheTypeEdge.String() {
@@ -125,7 +125,7 @@ func CreateTestDeliveryServiceServersWithRequiredCapabilities(t *testing.T) {
t.Run(ctc.description, func(t *testing.T) {
params := url.Values{}
params.Add("hostName", ctc.serverName)
- resp, _, err := TOSession.GetServers(¶ms, nil)
+ resp, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Fatalf("cannot GET Server by hostname: %v", err)
}
@@ -160,7 +160,7 @@ func CreateTestDeliveryServiceServersWithRequiredCapabilities(t *testing.T) {
}
func CreateTestMSODSServerWithReqCap(t *testing.T) {
- dsReqCap, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, util.StrPtr("msods1"), nil, nil)
+ dsReqCap, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, util.StrPtr("msods1"), nil)
if err != nil {
t.Fatalf("GET delivery service required capabilites: %v", err)
}
@@ -173,7 +173,7 @@ func CreateTestMSODSServerWithReqCap(t *testing.T) {
// TODO: DON'T hard-code server hostnames!
params := url.Values{}
params.Add("hostName", "denver-mso-org-01")
- resp, _, err := TOSession.GetServers(¶ms, nil)
+ resp, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Fatalf("GET server denver-mso-org-01: %v", err)
}
@@ -188,7 +188,7 @@ func CreateTestMSODSServerWithReqCap(t *testing.T) {
}
// Make sure server has no caps to ensure test correctness
- sccs, _, err := TOSession.GetServerServerCapabilities(s.ID, nil, nil, nil)
+ sccs, _, err := TOSession.GetServerServerCapabilities(s.ID, nil, nil)
if err != nil {
t.Fatalf("GET server server capabilities for denver-mso-org-01: %v", err)
}
@@ -197,7 +197,7 @@ func CreateTestMSODSServerWithReqCap(t *testing.T) {
}
// Is origin included in eligible servers even though it doesnt have required capability
- eServers, _, err := TOSession.GetDeliveryServicesEligible(*dsReqCap[0].DeliveryServiceID, nil)
+ eServers, _, err := TOSession.GetDeliveryServicesEligible(*dsReqCap[0].DeliveryServiceID)
if err != nil {
t.Fatalf("GET delivery service msods1 eligible servers: %v", err)
}
@@ -254,7 +254,7 @@ func DeleteTestDeliveryServiceServers(t *testing.T) {
t.Errorf("POST delivery service servers: %v", err)
}
- dsServers, _, err := TOSession.GetDeliveryServiceServers(nil)
+ dsServers, _, err := TOSession.GetDeliveryServiceServers()
if err != nil {
t.Errorf("GET delivery service servers: %v", err)
}
@@ -274,7 +274,7 @@ func DeleteTestDeliveryServiceServers(t *testing.T) {
t.Errorf("DELETE delivery service server: %v", err)
}
- dsServers, _, err = TOSession.GetDeliveryServiceServers(nil)
+ dsServers, _, err = TOSession.GetDeliveryServiceServers()
if err != nil {
t.Errorf("GET delivery service servers: %v", err)
}
@@ -292,7 +292,7 @@ func DeleteTestDeliveryServiceServers(t *testing.T) {
}
func getServerAndDSofSameCDN(t *testing.T) (tc.DeliveryServiceNullable, tc.ServerNullable) {
- dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
+ dses, _, err := TOSession.GetDeliveryServicesNullable()
if err != nil {
t.Fatalf("cannot GET DeliveryServices: %v", err)
}
@@ -300,7 +300,7 @@ func getServerAndDSofSameCDN(t *testing.T) (tc.DeliveryServiceNullable, tc.Serve
t.Fatal("GET DeliveryServices returned no dses, must have at least 1 to test ds-servers")
}
- resp, _, err := TOSession.GetServers(nil, nil)
+ resp, _, err := TOSession.GetServers(nil)
if err != nil {
t.Fatalf("cannot GET Servers: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/deliveryservicesideligible_test.go b/traffic_ops/testing/api/v3/deliveryservicesideligible_test.go
index 8158617..92d6ab6 100644
--- a/traffic_ops/testing/api/v3/deliveryservicesideligible_test.go
+++ b/traffic_ops/testing/api/v3/deliveryservicesideligible_test.go
@@ -35,7 +35,7 @@ func GetTestDeliveryServicesEligibleIMS(t *testing.T) {
futureTime := time.Now().AddDate(0, 0, 1)
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
- _, reqInf, err := TOSession.GetDeliveryServicesNullable(header)
+ _, reqInf, err := TOSession.GetDeliveryServicesNullableWithHdr(header)
if err != nil {
t.Fatalf("could not GET eligible delivery services: %v", err)
}
@@ -45,7 +45,7 @@ func GetTestDeliveryServicesEligibleIMS(t *testing.T) {
}
func GetTestDeliveryServicesEligible(t *testing.T) {
- dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
+ dses, _, err := TOSession.GetDeliveryServicesNullable()
if err != nil {
t.Errorf("cannot GET DeliveryServices: %v", err)
}
@@ -53,7 +53,7 @@ func GetTestDeliveryServicesEligible(t *testing.T) {
t.Error("GET DeliveryServices returned no delivery services, need at least 1 to test")
}
dsID := dses[0].ID
- servers, _, err := TOSession.GetDeliveryServicesEligible(*dsID, nil)
+ servers, _, err := TOSession.GetDeliveryServicesEligible(*dsID)
if err != nil {
t.Errorf("getting delivery services eligible: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/deliveryservicesregexes_test.go b/traffic_ops/testing/api/v3/deliveryservicesregexes_test.go
index e41a4d6..fc58337 100644
--- a/traffic_ops/testing/api/v3/deliveryservicesregexes_test.go
+++ b/traffic_ops/testing/api/v3/deliveryservicesregexes_test.go
@@ -98,7 +98,7 @@ func DeleteTestDeliveryServicesRegexes(t *testing.T) {
}
func loadDSRegexIDs(t *testing.T, test *tc.DeliveryServiceRegexesTest) {
- dsTypes, _, err := TOSession.GetTypeByName(test.TypeName, nil)
+ dsTypes, _, err := TOSession.GetTypeByName(test.TypeName)
if err != nil {
t.Fatalf("unable to get type by name %v: %v", test.TypeName, err)
}
@@ -107,7 +107,7 @@ func loadDSRegexIDs(t *testing.T, test *tc.DeliveryServiceRegexesTest) {
}
test.Type = dsTypes[0].ID
- dses, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(test.DSName, nil)
+ dses, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(test.DSName)
if err != nil {
t.Fatalf("unable to ds by xmlid %v: %v", test.DSName, err)
}
@@ -123,7 +123,7 @@ func QueryDSRegexTestIMS(t *testing.T) {
futureTime := time.Now().AddDate(0, 0, 1)
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
- _, reqInf, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds1", header)
+ _, reqInf, err := TOSession.GetDeliveryServiceByXMLIDNullableWithHdr("ds1", header)
if err != nil {
t.Fatalf("could not GET delivery services regex: %v", err)
}
@@ -133,7 +133,7 @@ func QueryDSRegexTestIMS(t *testing.T) {
}
func QueryDSRegexTest(t *testing.T) {
- ds, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds1", nil)
+ ds, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds1")
if err != nil {
t.Fatalf("unable to get ds ds1: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/divisions_test.go b/traffic_ops/testing/api/v3/divisions_test.go
index 038f84b..72f3655 100644
--- a/traffic_ops/testing/api/v3/divisions_test.go
+++ b/traffic_ops/testing/api/v3/divisions_test.go
@@ -42,7 +42,7 @@ func TestDivisions(t *testing.T) {
func GetTestDivisionsIMSAfterChange(t *testing.T, header http.Header) {
for _, division := range testData.Divisions {
- _, reqInf, err := TOSession.GetDivisionByName(division.Name, header)
+ _, reqInf, err := TOSession.GetDivisionByNameWithHdr(division.Name, header)
if err != nil {
t.Fatalf("could not GET divisions: %v", err)
}
@@ -55,7 +55,7 @@ func GetTestDivisionsIMSAfterChange(t *testing.T, header http.Header) {
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
for _, division := range testData.Divisions {
- _, reqInf, err := TOSession.GetDivisionByName(division.Name, header)
+ _, reqInf, err := TOSession.GetDivisionByNameWithHdr(division.Name, header)
if err != nil {
t.Fatalf("could not GET divisions: %v", err)
}
@@ -72,7 +72,7 @@ func GetTestDivisionsIMS(t *testing.T) {
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
for _, division := range testData.Divisions {
- _, reqInf, err := TOSession.GetDivisionByName(division.Name, header)
+ _, reqInf, err := TOSession.GetDivisionByNameWithHdr(division.Name, header)
if err != nil {
t.Fatalf("could not GET divisions: %v", err)
}
@@ -85,7 +85,7 @@ func GetTestDivisionsIMS(t *testing.T) {
func TryToDeleteDivision(t *testing.T) {
division := testData.Divisions[0]
- resp, _, err := TOSession.GetDivisionByName(division.Name, nil)
+ resp, _, err := TOSession.GetDivisionByName(division.Name)
if err != nil {
t.Errorf("cannot GET Division by name: %v - %v", division.Name, err)
}
@@ -123,7 +123,7 @@ func UpdateTestDivisions(t *testing.T) {
firstDivision := testData.Divisions[0]
// Retrieve the Division by division so we can get the id for the Update
- resp, _, err := TOSession.GetDivisionByName(firstDivision.Name, nil)
+ resp, _, err := TOSession.GetDivisionByName(firstDivision.Name)
if err != nil {
t.Errorf("cannot GET Division by division: %v - %v", firstDivision.Name, err)
}
@@ -137,7 +137,7 @@ func UpdateTestDivisions(t *testing.T) {
}
// Retrieve the Division to check division got updated
- resp, _, err = TOSession.GetDivisionByID(remoteDivision.ID, nil)
+ resp, _, err = TOSession.GetDivisionByID(remoteDivision.ID)
if err != nil {
t.Errorf("cannot GET Division by division: %v - %v", firstDivision.Name, err)
}
@@ -157,7 +157,7 @@ func UpdateTestDivisions(t *testing.T) {
func GetTestDivisions(t *testing.T) {
for _, division := range testData.Divisions {
- resp, _, err := TOSession.GetDivisionByName(division.Name, nil)
+ resp, _, err := TOSession.GetDivisionByName(division.Name)
if err != nil {
t.Errorf("cannot GET Division by division: %v - %v", err, resp)
}
@@ -168,7 +168,7 @@ func DeleteTestDivisions(t *testing.T) {
for _, division := range testData.Divisions {
// Retrieve the Division by name so we can get the id
- resp, _, err := TOSession.GetDivisionByName(division.Name, nil)
+ resp, _, err := TOSession.GetDivisionByName(division.Name)
if err != nil {
t.Errorf("cannot GET Division by name: %v - %v", division.Name, err)
}
@@ -180,7 +180,7 @@ func DeleteTestDivisions(t *testing.T) {
}
// Retrieve the Division to see if it got deleted
- divisionResp, _, err := TOSession.GetDivisionByName(division.Name, nil)
+ divisionResp, _, err := TOSession.GetDivisionByName(division.Name)
if err != nil {
t.Errorf("error deleting Division division: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/federation_resolvers_test.go b/traffic_ops/testing/api/v3/federation_resolvers_test.go
index f83a392..13303d1 100644
--- a/traffic_ops/testing/api/v3/federation_resolvers_test.go
+++ b/traffic_ops/testing/api/v3/federation_resolvers_test.go
@@ -40,7 +40,7 @@ func GetTestFederationResolversIMS(t *testing.T) {
futureTime := time.Now().AddDate(0, 0, 1)
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
- _, reqInf, err := TOSession.GetFederationResolvers(header)
+ _, reqInf, err := TOSession.GetFederationResolversWithHdr(header)
if err != nil {
t.Fatalf("could not GET Federation resolvers: %v", err)
}
@@ -55,7 +55,7 @@ func GetTestFederationResolvers(t *testing.T) {
t.Fatal("no federation resolvers test data")
}
- frs, _, err := TOSession.GetFederationResolvers(nil)
+ frs, _, err := TOSession.GetFederationResolvers()
if err != nil {
t.Errorf("Unexpected error getting Federation Resolvers: %v", err)
}
@@ -75,7 +75,7 @@ func GetTestFederationResolvers(t *testing.T) {
func getFRByIDTest(testFr tc.FederationResolver) func(*testing.T) {
return func(t *testing.T) {
- fr, _, err := TOSession.GetFederationResolverByID(*testFr.ID, nil)
+ fr, _, err := TOSession.GetFederationResolverByID(*testFr.ID)
if err != nil {
t.Fatalf("Unexpected error getting Federation Resolver by ID %d: %v", *testFr.ID, err)
}
@@ -87,7 +87,7 @@ func getFRByIDTest(testFr tc.FederationResolver) func(*testing.T) {
func getFRByIPTest(testFr tc.FederationResolver) func(*testing.T) {
return func(t *testing.T) {
- fr, _, err := TOSession.GetFederationResolverByIPAddress(*testFr.IPAddress, nil)
+ fr, _, err := TOSession.GetFederationResolverByIPAddress(*testFr.IPAddress)
if err != nil {
t.Fatalf("Unexpected error getting Federation Resolver by IP %s: %v", *testFr.IPAddress, err)
}
@@ -99,7 +99,7 @@ func getFRByIPTest(testFr tc.FederationResolver) func(*testing.T) {
func getFRByTypeTest(testFr tc.FederationResolver) func(*testing.T) {
return func(t *testing.T) {
- frs, _, err := TOSession.GetFederationResolversByType(*testFr.Type, nil)
+ frs, _, err := TOSession.GetFederationResolversByType(*testFr.Type)
if err != nil {
t.Fatalf("Unexpected error getting Federation Resolvers by Type %s: %v", *testFr.Type, err)
}
@@ -150,7 +150,7 @@ func CreateTestFederationResolvers(t *testing.T) {
t.Fatal("testData Federation Resolver has nil Type")
}
- tid, _, err := TOSession.GetTypeByName(*fr.Type, nil)
+ tid, _, err := TOSession.GetTypeByName(*fr.Type)
if err != nil {
t.Fatalf("Couldn't get an ID for type %s", *fr.Type)
}
@@ -202,7 +202,7 @@ func CreateTestFederationResolvers(t *testing.T) {
}
func DeleteTestFederationResolvers(t *testing.T) {
- frs, _, err := TOSession.GetFederationResolvers(nil)
+ frs, _, err := TOSession.GetFederationResolvers()
if err != nil {
t.Errorf("Unexpected error getting Federation Resolvers: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/federation_users_test.go b/traffic_ops/testing/api/v3/federation_users_test.go
index 03e5be9..2bd295b 100644
--- a/traffic_ops/testing/api/v3/federation_users_test.go
+++ b/traffic_ops/testing/api/v3/federation_users_test.go
@@ -37,7 +37,7 @@ func TestFederationUsers(t *testing.T) {
}
func GetTestValidFederationIDUsersIMSAfterChange(t *testing.T, header http.Header) {
- _, reqInf, err := TOSession.GetFederationUsers(fedIDs[0], header)
+ _, reqInf, err := TOSession.GetFederationUsersWithHdr(fedIDs[0], header)
if err != nil {
t.Fatalf("No error expected, but got: %v", err)
}
@@ -48,7 +48,7 @@ func GetTestValidFederationIDUsersIMSAfterChange(t *testing.T, header http.Heade
currentTime = currentTime.Add(1 * time.Second)
timeStr := currentTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, timeStr)
- _, reqInf, err = TOSession.GetFederationUsers(fedIDs[0], header)
+ _, reqInf, err = TOSession.GetFederationUsersWithHdr(fedIDs[0], header)
if err != nil {
t.Fatalf("No error expected, but got: %v", err)
}
@@ -65,7 +65,7 @@ func CreateTestFederationUsers(t *testing.T) {
fedID := fedIDs[0]
// Get Users
- users, _, err := TOSession.GetUsers(nil)
+ users, _, err := TOSession.GetUsers()
if err != nil {
t.Fatalf("getting users: " + err.Error())
}
@@ -83,7 +83,7 @@ func CreateTestFederationUsers(t *testing.T) {
t.Fatalf("assigning users %v to federation %v: %v", []int{*u1}, fedID, err.Error())
}
- fedUsers, _, err := TOSession.GetFederationUsers(fedID, nil)
+ fedUsers, _, err := TOSession.GetFederationUsers(fedID)
if err != nil {
t.Fatalf("gettings users for federation %v: %v", fedID, err.Error())
}
@@ -97,7 +97,7 @@ func CreateTestFederationUsers(t *testing.T) {
t.Fatalf("assigning users %v to federation %v: %v", []int{*u2, *u3}, fedID, err.Error())
}
- fedUsers, _, err = TOSession.GetFederationUsers(fedID, nil)
+ fedUsers, _, err = TOSession.GetFederationUsers(fedID)
if err != nil {
t.Fatalf("gettings users for federation %v: %v", fedID, err.Error())
}
@@ -111,7 +111,7 @@ func CreateTestFederationUsers(t *testing.T) {
t.Fatalf("assigning users %v to federation %v: %v", []int{*u1}, fedID, err.Error())
}
- fedUsers, _, err = TOSession.GetFederationUsers(fedID, nil)
+ fedUsers, _, err = TOSession.GetFederationUsers(fedID)
if err != nil {
t.Fatalf("gettings users for federation %v: %v", fedID, err.Error())
}
@@ -121,7 +121,7 @@ func CreateTestFederationUsers(t *testing.T) {
}
func GetTestInvalidFederationIDUsers(t *testing.T) {
- _, _, err := TOSession.GetFederationUsers(-1, nil)
+ _, _, err := TOSession.GetFederationUsers(-1)
if err == nil {
t.Fatalf("expected to get an error when requesting federation users for a non-existent federation")
}
@@ -135,7 +135,7 @@ func CreateTestValidFederationUsers(t *testing.T) {
fedID := fedIDs[0]
// Get Users
- users, _, err := TOSession.GetUsers(nil)
+ users, _, err := TOSession.GetUsers()
if err != nil {
t.Fatalf("getting users: " + err.Error())
}
@@ -157,7 +157,7 @@ func CreateTestInvalidFederationUsers(t *testing.T) {
fedID := fedIDs[0]
// Get Users
- users, _, err := TOSession.GetUsers(nil)
+ users, _, err := TOSession.GetUsers()
if err != nil {
t.Fatalf("getting users: " + err.Error())
}
@@ -185,7 +185,7 @@ func DeleteTestFederationUsers(t *testing.T) {
fedID := fedIDs[0]
- fedUsers, _, err := TOSession.GetFederationUsers(fedID, nil)
+ fedUsers, _, err := TOSession.GetFederationUsers(fedID)
if err != nil {
t.Fatalf("gettings users for federation %v: %v", fedID, err.Error())
}
@@ -200,7 +200,7 @@ func DeleteTestFederationUsers(t *testing.T) {
}
}
- fedUsers, _, err = TOSession.GetFederationUsers(fedID, nil)
+ fedUsers, _, err = TOSession.GetFederationUsers(fedID)
if err != nil {
t.Fatalf("gettings users for federation %v: %v", fedID, err.Error())
}
diff --git a/traffic_ops/testing/api/v3/federations_test.go b/traffic_ops/testing/api/v3/federations_test.go
index 8b16a06..5496918 100644
--- a/traffic_ops/testing/api/v3/federations_test.go
+++ b/traffic_ops/testing/api/v3/federations_test.go
@@ -46,7 +46,7 @@ func GetTestFederationsIMS(t *testing.T) {
t.Error("no federations test data")
}
- _, reqInf, err := TOSession.AllFederations(header)
+ _, reqInf, err := TOSession.AllFederationsWithHdr(header)
if err != nil {
t.Fatalf("No error expected, but got: %v", err)
}
@@ -60,7 +60,7 @@ func GetTestFederations(t *testing.T) {
t.Error("no federations test data")
}
- feds, _, err := TOSession.AllFederations(nil)
+ feds, _, err := TOSession.AllFederations()
if err != nil {
t.Errorf("getting federations: " + err.Error())
}
@@ -106,7 +106,7 @@ func GetTestFederations(t *testing.T) {
}
func createFederationToDeliveryServiceAssociation() (int, tc.DeliveryServiceNullable, tc.DeliveryServiceNullable, error) {
- dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
+ dses, _, err := TOSession.GetDeliveryServicesNullable()
if err != nil {
return -1, tc.DeliveryServiceNullable{}, tc.DeliveryServiceNullable{}, fmt.Errorf("cannot GET DeliveryServices: %v - %v", err, dses)
}
@@ -137,7 +137,7 @@ func PostDeleteTestFederationsDeliveryServices(t *testing.T) {
}
// Test get created Federation Delivery Services
- fedDSes, _, err := TOSession.GetFederationDeliveryServices(fedID, nil)
+ fedDSes, _, err := TOSession.GetFederationDeliveryServices(fedID)
if err != nil {
t.Fatalf("cannot GET Federation DeliveryServices: %v", err)
}
@@ -154,7 +154,7 @@ func PostDeleteTestFederationsDeliveryServices(t *testing.T) {
// Make sure it is deleted
// Test get created Federation Delivery Services
- fedDSes, _, err = TOSession.GetFederationDeliveryServices(fedID, nil)
+ fedDSes, _, err = TOSession.GetFederationDeliveryServices(fedID)
if err != nil {
t.Fatalf("cannot GET Federation DeliveryServices: %v", err)
}
@@ -202,7 +202,7 @@ func AddFederationResolversForCurrentUserTest(t *testing.T) {
}
// need to assign myself the federation to set its mappings
- me, _, err := TOSession.GetUserCurrent(nil)
+ me, _, err := TOSession.GetUserCurrent()
if err != nil {
t.Fatalf("Couldn't figure out who I am: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/iso_test.go b/traffic_ops/testing/api/v3/iso_test.go
index 79e265e..26c0074 100644
--- a/traffic_ops/testing/api/v3/iso_test.go
+++ b/traffic_ops/testing/api/v3/iso_test.go
@@ -81,7 +81,7 @@ func TestGetOSVersions(t *testing.T) {
}
// Cleanup DB entry
defer func() {
- resp, _, err := TOSession.GetParameterByNameAndConfigFileAndValue(p.Name, p.ConfigFile, p.Value, nil)
+ resp, _, err := TOSession.GetParameterByNameAndConfigFileAndValue(p.Name, p.ConfigFile, p.Value)
if err != nil {
t.Fatalf("cannot GET Parameter by name: %v - %v\n", p.Name, err)
}
diff --git a/traffic_ops/testing/api/v3/jobs_test.go b/traffic_ops/testing/api/v3/jobs_test.go
index f1b8585..bb5d983 100644
--- a/traffic_ops/testing/api/v3/jobs_test.go
+++ b/traffic_ops/testing/api/v3/jobs_test.go
@@ -37,7 +37,7 @@ func TestJobs(t *testing.T) {
}
func CreateTestJobs(t *testing.T) {
- toDSes, _, err := TOSession.GetDeliveryServicesNullable(nil)
+ toDSes, _, err := TOSession.GetDeliveryServicesNullable()
if err != nil {
t.Fatalf("cannot GET DeliveryServices: %v - %v", err, toDSes)
}
@@ -65,7 +65,7 @@ func CreateTestJobs(t *testing.T) {
}
func CreateTestInvalidationJobs(t *testing.T) {
- toDSes, _, err := TOSession.GetDeliveryServicesNullable(nil)
+ toDSes, _, err := TOSession.GetDeliveryServicesNullable()
if err != nil {
t.Fatalf("cannot GET Delivery Services: %v - %v", err, toDSes)
}
@@ -86,7 +86,7 @@ func CreateTestInvalidationJobs(t *testing.T) {
}
func CreateTestInvalidJob(t *testing.T) {
- toDSes, _, err := TOSession.GetDeliveryServicesNullable(nil)
+ toDSes, _, err := TOSession.GetDeliveryServicesNullable()
if err != nil {
t.Fatalf("cannot GET Delivery Services: %v - %v", err, toDSes)
}
@@ -153,7 +153,7 @@ func GetTestJobs(t *testing.T) {
t.Fatalf("error getting jobs: %v", err)
}
- toDSes, _, err := TOSession.GetDeliveryServicesNullable(nil)
+ toDSes, _, err := TOSession.GetDeliveryServicesNullable()
if err != nil {
t.Fatalf("cannot GET DeliveryServices: %v - %v", err, toDSes)
}
@@ -202,7 +202,7 @@ func GetTestInvalidationJobs(t *testing.T) {
t.Fatalf("error getting invalidation jobs: %v", err)
}
- toDSes, _, err := TOSession.GetDeliveryServicesNullable(nil)
+ toDSes, _, err := TOSession.GetDeliveryServicesNullable()
if err != nil {
t.Fatalf("cannot GET DeliveryServices: %v - %v", err, toDSes)
}
diff --git a/traffic_ops/testing/api/v3/loginfail_test.go b/traffic_ops/testing/api/v3/loginfail_test.go
index db65180..52ef0a5 100644
--- a/traffic_ops/testing/api/v3/loginfail_test.go
+++ b/traffic_ops/testing/api/v3/loginfail_test.go
@@ -50,7 +50,7 @@ func PostTestLoginFail(t *testing.T) {
t.Fatal("cannot test login: must have at least 1 test data cdn")
}
expectedCDN := testData.CDNs[0]
- actualCDNs, _, err := uninitializedTOClient.GetCDNByName(expectedCDN.Name, nil)
+ actualCDNs, _, err := uninitializedTOClient.GetCDNByName(expectedCDN.Name)
if err != nil {
t.Fatalf("GetCDNByName err expected nil, actual '%+v'", err)
}
diff --git a/traffic_ops/testing/api/v3/parameters_test.go b/traffic_ops/testing/api/v3/parameters_test.go
index b3bcdf2..0c8160a 100644
--- a/traffic_ops/testing/api/v3/parameters_test.go
+++ b/traffic_ops/testing/api/v3/parameters_test.go
@@ -45,7 +45,7 @@ func TestParameters(t *testing.T) {
func GetTestParametersIMSAfterChange(t *testing.T, header http.Header) {
for _, pl := range testData.Parameters {
- _, reqInf, err := TOSession.GetParameterByName(pl.Name, header)
+ _, reqInf, err := TOSession.GetParameterByNameWithHdr(pl.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -58,7 +58,7 @@ func GetTestParametersIMSAfterChange(t *testing.T, header http.Header) {
timeStr := currentTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, timeStr)
for _, pl := range testData.Parameters {
- _, reqInf, err := TOSession.GetParameterByName(pl.Name, header)
+ _, reqInf, err := TOSession.GetParameterByNameWithHdr(pl.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -84,7 +84,7 @@ func UpdateTestParameters(t *testing.T) {
firstParameter := testData.Parameters[0]
// Retrieve the Parameter by name so we can get the id for the Update
- resp, _, err := TOSession.GetParameterByName(firstParameter.Name, nil)
+ resp, _, err := TOSession.GetParameterByName(firstParameter.Name)
if err != nil {
t.Errorf("cannot GET Parameter by name: %v - %v", firstParameter.Name, err)
}
@@ -98,7 +98,7 @@ func UpdateTestParameters(t *testing.T) {
}
// Retrieve the Parameter to check Parameter name got updated
- resp, _, err = TOSession.GetParameterByID(remoteParameter.ID, nil)
+ resp, _, err = TOSession.GetParameterByID(remoteParameter.ID)
if err != nil {
t.Errorf("cannot GET Parameter by name: %v - %v", firstParameter.Name, err)
}
@@ -116,7 +116,7 @@ func GetTestParametersIMS(t *testing.T) {
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
for _, pl := range testData.Parameters {
- _, reqInf, err := TOSession.GetParameterByName(pl.Name, header)
+ _, reqInf, err := TOSession.GetParameterByNameWithHdr(pl.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -129,7 +129,7 @@ func GetTestParametersIMS(t *testing.T) {
func GetTestParameters(t *testing.T) {
for _, pl := range testData.Parameters {
- resp, _, err := TOSession.GetParameterByName(pl.Name, nil)
+ resp, _, err := TOSession.GetParameterByName(pl.Name)
if err != nil {
t.Errorf("cannot GET Parameter by name: %v - %v", err, resp)
}
@@ -161,7 +161,7 @@ func DeleteTestParameters(t *testing.T) {
func DeleteTestParameter(t *testing.T, pl tc.Parameter) {
// Retrieve the Parameter by name so we can get the id for the Update
- resp, _, err := TOSession.GetParameterByNameAndConfigFile(pl.Name, pl.ConfigFile, nil)
+ resp, _, err := TOSession.GetParameterByNameAndConfigFile(pl.Name, pl.ConfigFile)
if err != nil {
t.Errorf("cannot GET Parameter by name: %v - %v", pl.Name, err)
}
@@ -180,7 +180,7 @@ func DeleteTestParameter(t *testing.T, pl tc.Parameter) {
}
// Retrieve the Parameter to see if it got deleted
- pls, _, err := TOSession.GetParameterByID(pl.ID, nil)
+ pls, _, err := TOSession.GetParameterByID(pl.ID)
if err != nil {
t.Errorf("error deleting Parameter name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/phys_locations_test.go b/traffic_ops/testing/api/v3/phys_locations_test.go
index 3aba385..5283c56 100644
--- a/traffic_ops/testing/api/v3/phys_locations_test.go
+++ b/traffic_ops/testing/api/v3/phys_locations_test.go
@@ -48,7 +48,7 @@ func GetTestPhysLocationsIMS(t *testing.T) {
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
for _, cdn := range testData.PhysLocations {
- _, reqInf, err := TOSession.GetPhysLocationByName(cdn.Name, header)
+ _, reqInf, err := TOSession.GetPhysLocationByNameWithHdr(cdn.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -61,7 +61,7 @@ func GetTestPhysLocationsIMS(t *testing.T) {
func GetTestPhysLocationsIMSAfterChange(t *testing.T, header http.Header) {
for _, cdn := range testData.PhysLocations {
- _, reqInf, err := TOSession.GetPhysLocationByName(cdn.Name, header)
+ _, reqInf, err := TOSession.GetPhysLocationByNameWithHdr(cdn.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -74,7 +74,7 @@ func GetTestPhysLocationsIMSAfterChange(t *testing.T, header http.Header) {
timeStr := currentTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, timeStr)
for _, cdn := range testData.PhysLocations {
- _, reqInf, err := TOSession.GetPhysLocationByName(cdn.Name, header)
+ _, reqInf, err := TOSession.GetPhysLocationByNameWithHdr(cdn.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -99,7 +99,7 @@ func UpdateTestPhysLocations(t *testing.T) {
firstPhysLocation := testData.PhysLocations[0]
// Retrieve the PhysLocation by name so we can get the id for the Update
- resp, _, err := TOSession.GetPhysLocationByName(firstPhysLocation.Name, nil)
+ resp, _, err := TOSession.GetPhysLocationByName(firstPhysLocation.Name)
if err != nil {
t.Errorf("cannot GET PhysLocation by name: '%s', %v", firstPhysLocation.Name, err)
}
@@ -113,7 +113,7 @@ func UpdateTestPhysLocations(t *testing.T) {
}
// Retrieve the PhysLocation to check PhysLocation name got updated
- resp, _, err = TOSession.GetPhysLocationByID(remotePhysLocation.ID, nil)
+ resp, _, err = TOSession.GetPhysLocationByID(remotePhysLocation.ID)
if err != nil {
t.Errorf("cannot GET PhysLocation by name: '$%s', %v", firstPhysLocation.Name, err)
}
@@ -127,7 +127,7 @@ func UpdateTestPhysLocations(t *testing.T) {
func GetTestPhysLocations(t *testing.T) {
for _, cdn := range testData.PhysLocations {
- resp, _, err := TOSession.GetPhysLocationByName(cdn.Name, nil)
+ resp, _, err := TOSession.GetPhysLocationByName(cdn.Name)
if err != nil {
t.Errorf("cannot GET PhysLocation by name: %v - %v", err, resp)
}
@@ -136,7 +136,7 @@ func GetTestPhysLocations(t *testing.T) {
}
func GetSortPhysLocationsTest(t *testing.T) {
- resp, _, err := TOSession.GetPhysLocations(map[string]string{"orderby": "id"}, nil)
+ resp, _, err := TOSession.GetPhysLocations(map[string]string{"orderby": "id"})
if err != nil {
t.Error(err.Error())
}
@@ -149,7 +149,7 @@ func GetSortPhysLocationsTest(t *testing.T) {
}
func GetDefaultSortPhysLocationsTest(t *testing.T) {
- resp, _, err := TOSession.GetPhysLocations(nil, nil)
+ resp, _, err := TOSession.GetPhysLocations(nil)
if err != nil {
t.Error(err.Error())
}
@@ -165,7 +165,7 @@ func DeleteTestPhysLocations(t *testing.T) {
for _, cdn := range testData.PhysLocations {
// Retrieve the PhysLocation by name so we can get the id for the Update
- resp, _, err := TOSession.GetPhysLocationByName(cdn.Name, nil)
+ resp, _, err := TOSession.GetPhysLocationByName(cdn.Name)
if err != nil {
t.Errorf("cannot GET PhysLocation by name: %v - %v", cdn.Name, err)
}
@@ -178,7 +178,7 @@ func DeleteTestPhysLocations(t *testing.T) {
}
// Retrieve the PhysLocation to see if it got deleted
- cdns, _, err := TOSession.GetPhysLocationByName(cdn.Name, nil)
+ cdns, _, err := TOSession.GetPhysLocationByName(cdn.Name)
if err != nil {
t.Errorf("error deleting PhysLocation name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/profile_parameters_test.go b/traffic_ops/testing/api/v3/profile_parameters_test.go
index f45701e..891a100 100644
--- a/traffic_ops/testing/api/v3/profile_parameters_test.go
+++ b/traffic_ops/testing/api/v3/profile_parameters_test.go
@@ -43,7 +43,7 @@ func GetTestProfileParametersIMS(t *testing.T) {
header.Set(rfc.IfModifiedSince, time)
for _, pp := range testData.ProfileParameters {
queryParams := fmt.Sprintf(queryParamFormat, pp.ProfileID, pp.ParameterID)
- _, reqInf, err := TOSession.GetProfileParameterByQueryParams(queryParams, header)
+ _, reqInf, err := TOSession.GetProfileParameterByQueryParamsWithHdr(queryParams, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -56,13 +56,13 @@ func GetTestProfileParametersIMS(t *testing.T) {
func CreateTestProfileParameters(t *testing.T) {
firstProfile := testData.Profiles[0]
- profileResp, _, err := TOSession.GetProfileByName(firstProfile.Name, nil)
+ profileResp, _, err := TOSession.GetProfileByName(firstProfile.Name)
if err != nil {
t.Errorf("cannot GET Profile by name: %v - %v", firstProfile.Name, err)
}
firstParameter := testData.Parameters[0]
- paramResp, _, err := TOSession.GetParameterByName(firstParameter.Name, nil)
+ paramResp, _, err := TOSession.GetParameterByName(firstParameter.Name)
if err != nil {
t.Errorf("cannot GET Parameter by name: %v - %v", firstParameter.Name, err)
}
@@ -86,7 +86,7 @@ func GetTestProfileParameters(t *testing.T) {
for _, pp := range testData.ProfileParameters {
queryParams := fmt.Sprintf(queryParamFormat, pp.ProfileID, pp.ParameterID)
- resp, _, err := TOSession.GetProfileParameterByQueryParams(queryParams, nil)
+ resp, _, err := TOSession.GetProfileParameterByQueryParams(queryParams)
if err != nil {
t.Errorf("cannot GET Parameter by name: %v - %v", err, resp)
}
@@ -119,7 +119,7 @@ func DeleteTestProfileParameter(t *testing.T, pp tc.ProfileParameter) {
queryParams := fmt.Sprintf(queryParamFormat, pp.ProfileID, pp.ParameterID)
// Retrieve the PtofileParameter by profile so we can get the id for the Update
- resp, _, err := TOSession.GetProfileParameterByQueryParams(queryParams, nil)
+ resp, _, err := TOSession.GetProfileParameterByQueryParams(queryParams)
if err != nil {
t.Errorf("cannot GET Parameter by profile: %v - %v", pp.Profile, err)
}
@@ -132,7 +132,7 @@ func DeleteTestProfileParameter(t *testing.T, pp tc.ProfileParameter) {
}
// Retrieve the Parameter to see if it got deleted
- pps, _, err := TOSession.GetProfileParameterByQueryParams(queryParams, nil)
+ pps, _, err := TOSession.GetProfileParameterByQueryParams(queryParams)
if err != nil {
t.Errorf("error deleting Parameter name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/profiles_test.go b/traffic_ops/testing/api/v3/profiles_test.go
index f9f3ca3..b745372 100644
--- a/traffic_ops/testing/api/v3/profiles_test.go
+++ b/traffic_ops/testing/api/v3/profiles_test.go
@@ -45,14 +45,14 @@ func GetTestProfilesIMS(t *testing.T) {
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
for _, pr := range testData.Profiles {
- _, reqInf, err := TOSession.GetProfileByName(pr.Name, header)
+ _, reqInf, err := TOSession.GetProfileByNameWithHdr(pr.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
if reqInf.StatusCode != http.StatusNotModified {
t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
}
- _, reqInf, err = TOSession.GetProfileByParameter(pr.Parameter, header)
+ _, reqInf, err = TOSession.GetProfileByParameterWithHdr(pr.Parameter, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -140,7 +140,7 @@ func CopyProfile(t *testing.T) {
// Cleanup profiles
for _, name := range newProfileNames {
- profiles, _, err := TOSession.GetProfileByName(name, nil)
+ profiles, _, err := TOSession.GetProfileByName(name)
if err != nil {
t.Fatalf("got err= %s; expected err= nil", err)
}
@@ -163,7 +163,7 @@ func CreateTestProfiles(t *testing.T) {
if err != nil {
t.Errorf("could not CREATE profiles with name: %s %v", pr.Name, err)
}
- profiles, _, err := TOSession.GetProfileByName(pr.Name, nil)
+ profiles, _, err := TOSession.GetProfileByName(pr.Name)
if err != nil {
t.Errorf("could not GET profile with name: %s %v", pr.Name, err)
}
@@ -185,7 +185,7 @@ func CreateTestProfiles(t *testing.T) {
continue
}
}
- p, _, err := TOSession.GetParameterByNameAndConfigFileAndValue(*param.Name, *param.ConfigFile, *param.Value, nil)
+ p, _, err := TOSession.GetParameterByNameAndConfigFileAndValue(*param.Name, *param.ConfigFile, *param.Value)
if err != nil {
t.Errorf("could not GET parameter %+v: %s", param, err.Error())
}
@@ -205,7 +205,7 @@ func UpdateTestProfiles(t *testing.T) {
firstProfile := testData.Profiles[0]
// Retrieve the Profile by name so we can get the id for the Update
- resp, _, err := TOSession.GetProfileByName(firstProfile.Name, nil)
+ resp, _, err := TOSession.GetProfileByName(firstProfile.Name)
if err != nil {
t.Errorf("cannot GET Profile by name: %v - %v", firstProfile.Name, err)
}
@@ -219,7 +219,7 @@ func UpdateTestProfiles(t *testing.T) {
}
// Retrieve the Profile to check Profile name got updated
- resp, _, err = TOSession.GetProfileByID(remoteProfile.ID, nil)
+ resp, _, err = TOSession.GetProfileByID(remoteProfile.ID)
if err != nil {
t.Errorf("cannot GET Profile by name: %v - %v", firstProfile.Name, err)
}
@@ -233,18 +233,18 @@ func UpdateTestProfiles(t *testing.T) {
func GetTestProfiles(t *testing.T) {
for _, pr := range testData.Profiles {
- resp, _, err := TOSession.GetProfileByName(pr.Name, nil)
+ resp, _, err := TOSession.GetProfileByName(pr.Name)
if err != nil {
t.Errorf("cannot GET Profile by name: %v - %v", err, resp)
}
profileID := resp[0].ID
- resp, _, err = TOSession.GetProfileByParameter(pr.Parameter, nil)
+ resp, _, err = TOSession.GetProfileByParameter(pr.Parameter)
if err != nil {
t.Errorf("cannot GET Profile by param: %v - %v", err, resp)
}
- resp, _, err = TOSession.GetProfileByCDNID(pr.CDNID, nil)
+ resp, _, err = TOSession.GetProfileByCDNID(pr.CDNID)
if err != nil {
t.Errorf("cannot GET Profile by cdn: %v - %v", err, resp)
}
@@ -262,7 +262,7 @@ func GetTestProfiles(t *testing.T) {
func ImportProfile(t *testing.T) {
// Get ID of Profile to export
- resp, _, err := TOSession.GetProfileByName(testData.Profiles[0].Name, nil)
+ resp, _, err := TOSession.GetProfileByName(testData.Profiles[0].Name)
if err != nil {
t.Fatalf("cannot GET Profile by name: %v - %v", err, resp)
}
@@ -325,7 +325,7 @@ func ImportProfile(t *testing.T) {
func GetTestProfilesWithParameters(t *testing.T) {
firstProfile := testData.Profiles[0]
- resp, _, err := TOSession.GetProfileByName(firstProfile.Name, nil)
+ resp, _, err := TOSession.GetProfileByName(firstProfile.Name)
if err != nil {
t.Errorf("cannot GET Profile by name: %v - %v", err, resp)
return
@@ -336,7 +336,7 @@ func GetTestProfilesWithParameters(t *testing.T) {
}
respProfile := resp[0]
// query by name does not retrieve associated parameters. But query by id does.
- resp, _, err = TOSession.GetProfileByID(respProfile.ID, nil)
+ resp, _, err = TOSession.GetProfileByID(respProfile.ID)
if err != nil {
t.Errorf("cannot GET Profile by name: %v - %v", err, resp)
}
@@ -353,7 +353,7 @@ func DeleteTestProfiles(t *testing.T) {
for _, pr := range testData.Profiles {
// Retrieve the Profile by name so we can get the id for the Update
- resp, _, err := TOSession.GetProfileByName(pr.Name, nil)
+ resp, _, err := TOSession.GetProfileByName(pr.Name)
if err != nil {
t.Errorf("cannot GET Profile by name: %s - %v", pr.Name, err)
continue
@@ -365,7 +365,7 @@ func DeleteTestProfiles(t *testing.T) {
profileID := resp[0].ID
// query by name does not retrieve associated parameters. But query by id does.
- resp, _, err = TOSession.GetProfileByID(profileID, nil)
+ resp, _, err = TOSession.GetProfileByID(profileID)
if err != nil {
t.Errorf("cannot GET Profile by id: %v - %v", err, resp)
}
@@ -384,7 +384,7 @@ func DeleteTestProfiles(t *testing.T) {
//time.Sleep(1 * time.Second)
// Retrieve the Profile to see if it got deleted
- prs, _, err := TOSession.GetProfileByName(pr.Name, nil)
+ prs, _, err := TOSession.GetProfileByName(pr.Name)
if err != nil {
t.Errorf("error deleting Profile name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/readonlycannotmodify_test.go b/traffic_ops/testing/api/v3/readonlycannotmodify_test.go
index 9d92c77..eec7222 100644
--- a/traffic_ops/testing/api/v3/readonlycannotmodify_test.go
+++ b/traffic_ops/testing/api/v3/readonlycannotmodify_test.go
@@ -62,7 +62,7 @@ func CreateTestCDNWithReadOnlyUser(t *testing.T) {
}
}
- cdns, _, _ := TOSession.GetCDNByName(cdn.Name, nil)
+ cdns, _, _ := TOSession.GetCDNByName(cdn.Name)
if len(cdns) > 0 {
t.Errorf("readonlyuser getting created cdn, len(cdns) expected: 0, actual: %+v %+v", len(cdns), cdns)
}
diff --git a/traffic_ops/testing/api/v3/regions_test.go b/traffic_ops/testing/api/v3/regions_test.go
index 3f6b201..398dec7 100644
--- a/traffic_ops/testing/api/v3/regions_test.go
+++ b/traffic_ops/testing/api/v3/regions_test.go
@@ -47,7 +47,7 @@ func GetTestRegionsIMS(t *testing.T) {
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
for _, region := range testData.Regions {
- _, reqInf, err := TOSession.GetRegionByName(region.Name, header)
+ _, reqInf, err := TOSession.GetRegionByNameWithHdr(region.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -59,7 +59,7 @@ func GetTestRegionsIMS(t *testing.T) {
func GetTestRegionsIMSAfterChange(t *testing.T, header http.Header) {
for _, region := range testData.Regions {
- _, reqInf, err := TOSession.GetRegionByName(region.Name, header)
+ _, reqInf, err := TOSession.GetRegionByNameWithHdr(region.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -72,7 +72,7 @@ func GetTestRegionsIMSAfterChange(t *testing.T, header http.Header) {
timeStr := currentTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, timeStr)
for _, region := range testData.Regions {
- _, reqInf, err := TOSession.GetRegionByName(region.Name, header)
+ _, reqInf, err := TOSession.GetRegionByNameWithHdr(region.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -97,7 +97,7 @@ func UpdateTestRegions(t *testing.T) {
firstRegion := testData.Regions[0]
// Retrieve the Region by region so we can get the id for the Update
- resp, _, err := TOSession.GetRegionByName(firstRegion.Name, nil)
+ resp, _, err := TOSession.GetRegionByName(firstRegion.Name)
if err != nil {
t.Errorf("cannot GET Region by region: %v - %v", firstRegion.Name, err)
}
@@ -111,7 +111,7 @@ func UpdateTestRegions(t *testing.T) {
}
// Retrieve the Region to check region got updated
- resp, _, err = TOSession.GetRegionByID(remoteRegion.ID, nil)
+ resp, _, err = TOSession.GetRegionByID(remoteRegion.ID)
if err != nil {
t.Errorf("cannot GET Region by region: %v - %v", firstRegion.Name, err)
}
@@ -131,7 +131,7 @@ func UpdateTestRegions(t *testing.T) {
func GetTestRegions(t *testing.T) {
for _, region := range testData.Regions {
- resp, _, err := TOSession.GetRegionByName(region.Name, nil)
+ resp, _, err := TOSession.GetRegionByName(region.Name)
if err != nil {
t.Errorf("cannot GET Region by region: %v - %v", err, resp)
}
@@ -157,7 +157,7 @@ func DeleteTestRegionsByName(t *testing.T) {
}
// Retrieve the Region to see if it got deleted
- regionResp, _, err := TOSession.GetRegionByName(region.Name, nil)
+ regionResp, _, err := TOSession.GetRegionByName(region.Name)
if err != nil {
t.Errorf("error deleting Region region: %s", err.Error())
}
@@ -173,7 +173,7 @@ func DeleteTestRegions(t *testing.T) {
for _, region := range testData.Regions {
// Retrieve the Region by name so we can get the id
- resp, _, err := TOSession.GetRegionByName(region.Name, nil)
+ resp, _, err := TOSession.GetRegionByName(region.Name)
if err != nil {
t.Errorf("cannot GET Region by name: %v - %v", region.Name, err)
}
@@ -185,7 +185,7 @@ func DeleteTestRegions(t *testing.T) {
}
// Retrieve the Region to see if it got deleted
- regionResp, _, err := TOSession.GetRegionByName(region.Name, nil)
+ regionResp, _, err := TOSession.GetRegionByName(region.Name)
if err != nil {
t.Errorf("error deleting Region region: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/roles_test.go b/traffic_ops/testing/api/v3/roles_test.go
index 2e93a53..e03fb80 100644
--- a/traffic_ops/testing/api/v3/roles_test.go
+++ b/traffic_ops/testing/api/v3/roles_test.go
@@ -49,7 +49,7 @@ func TestRoles(t *testing.T) {
func GetTestRolesIMSAfterChange(t *testing.T, header http.Header) {
role := testData.Roles[roleGood]
- _, reqInf, _, err := TOSession.GetRoleByName(*role.Name, header)
+ _, reqInf, _, err := TOSession.GetRoleByNameWithHdr(*role.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -60,7 +60,7 @@ func GetTestRolesIMSAfterChange(t *testing.T, header http.Header) {
currentTime = currentTime.Add(1 * time.Second)
timeStr := currentTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, timeStr)
- _, reqInf, _, err = TOSession.GetRoleByName(*role.Name, header)
+ _, reqInf, _, err = TOSession.GetRoleByNameWithHdr(*role.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -76,7 +76,7 @@ func GetTestRolesIMS(t *testing.T) {
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
role := testData.Roles[roleGood]
- _, reqInf, _, err := TOSession.GetRoleByName(*role.Name, header)
+ _, reqInf, _, err := TOSession.GetRoleByNameWithHdr(*role.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -107,7 +107,7 @@ func UpdateTestRoles(t *testing.T) {
t.Logf("testData.Roles contains: %+v\n", testData.Roles)
firstRole := testData.Roles[0]
// Retrieve the Role by role so we can get the id for the Update
- resp, _, status, err := TOSession.GetRoleByName(*firstRole.Name, nil)
+ resp, _, status, err := TOSession.GetRoleByName(*firstRole.Name)
t.Log("Status Code: ", status)
if err != nil {
t.Errorf("cannot GET Role by role: %v - %v", firstRole.Name, err)
@@ -124,7 +124,7 @@ func UpdateTestRoles(t *testing.T) {
}
// Retrieve the Role to check role got updated
- resp, _, status, err = TOSession.GetRoleByID(*remoteRole.ID, nil)
+ resp, _, status, err = TOSession.GetRoleByID(*remoteRole.ID)
t.Log("Status Code: ", status)
if err != nil {
t.Errorf("cannot GET Role by role: %v - %v", firstRole.Name, err)
@@ -146,7 +146,7 @@ func UpdateTestRoles(t *testing.T) {
func GetTestRoles(t *testing.T) {
role := testData.Roles[roleGood]
- resp, _, status, err := TOSession.GetRoleByName(*role.Name, nil)
+ resp, _, status, err := TOSession.GetRoleByName(*role.Name)
t.Log("Status Code: ", status)
if err != nil {
t.Errorf("cannot GET Role by role: %v - %v", err, resp)
@@ -159,13 +159,13 @@ func VerifyGetRolesOrder(t *testing.T) {
"orderby": "name",
"sortOrder": "desc",
}
- descResp, _, status, err := TOSession.GetRoleByQueryParams(params, nil)
+ descResp, _, status, err := TOSession.GetRoleByQueryParams(params)
t.Log("Status Code: ", status)
if err != nil {
t.Errorf("cannot GET Role by role: %v - %v", err, descResp)
}
params["sortOrder"] = "asc"
- ascResp, _, status, err := TOSession.GetRoleByQueryParams(params, nil)
+ ascResp, _, status, err := TOSession.GetRoleByQueryParams(params)
t.Log("Status Code: ", status)
if err != nil {
t.Errorf("cannot GET Role by role: %v - %v", err, ascResp)
@@ -188,7 +188,7 @@ func DeleteTestRoles(t *testing.T) {
role := testData.Roles[roleGood]
// Retrieve the Role by name so we can get the id
- resp, _, status, err := TOSession.GetRoleByName(*role.Name, nil)
+ resp, _, status, err := TOSession.GetRoleByName(*role.Name)
t.Log("Status Code: ", status)
if err != nil {
t.Errorf("cannot GET Role by name: %v - %v", role.Name, err)
@@ -203,7 +203,7 @@ func DeleteTestRoles(t *testing.T) {
}
// Retrieve the Role to see if it got deleted
- roleResp, _, status, err := TOSession.GetRoleByName(*role.Name, nil)
+ roleResp, _, status, err := TOSession.GetRoleByName(*role.Name)
t.Log("Status Code: ", status)
if err != nil {
diff --git a/traffic_ops/testing/api/v3/servercapabilities_test.go b/traffic_ops/testing/api/v3/servercapabilities_test.go
index 6a9417a..24730b4 100644
--- a/traffic_ops/testing/api/v3/servercapabilities_test.go
+++ b/traffic_ops/testing/api/v3/servercapabilities_test.go
@@ -42,7 +42,7 @@ func CreateTestServerCapabilities(t *testing.T) {
func GetTestServerCapabilities(t *testing.T) {
for _, sc := range testData.ServerCapabilities {
- resp, _, err := TOSession.GetServerCapability(sc.Name, nil)
+ resp, _, err := TOSession.GetServerCapability(sc.Name)
if err != nil {
t.Errorf("cannot GET server capability: %v - %v", err, resp)
} else if resp == nil {
@@ -50,7 +50,7 @@ func GetTestServerCapabilities(t *testing.T) {
}
}
- resp, _, err := TOSession.GetServerCapabilities(nil)
+ resp, _, err := TOSession.GetServerCapabilities()
if err != nil {
t.Errorf("cannot GET server capabilities: %v", err)
}
@@ -74,7 +74,7 @@ func DeleteTestServerCapabilities(t *testing.T) {
t.Errorf("cannot DELETE server capability: %v - %v", err, delResp)
}
- serverCapability, _, err := TOSession.GetServerCapability(sc.Name, nil)
+ serverCapability, _, err := TOSession.GetServerCapability(sc.Name)
if err == nil {
t.Errorf("expected error trying to GET deleted server capability: %s, actual: nil", sc.Name)
}
diff --git a/traffic_ops/testing/api/v3/servers_test.go b/traffic_ops/testing/api/v3/servers_test.go
index 41291df..7bf0342 100644
--- a/traffic_ops/testing/api/v3/servers_test.go
+++ b/traffic_ops/testing/api/v3/servers_test.go
@@ -53,7 +53,7 @@ func GetTestServersIMSAfterChange(t *testing.T, header http.Header) {
continue
}
params.Set("hostName", *server.HostName)
- _, reqInf, err := TOSession.GetServers(¶ms, header)
+ _, reqInf, err := TOSession.GetServersWithHdr(¶ms, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -71,7 +71,7 @@ func GetTestServersIMSAfterChange(t *testing.T, header http.Header) {
continue
}
params.Set("hostName", *server.HostName)
- _, reqInf, err := TOSession.GetServers(¶ms, header)
+ _, reqInf, err := TOSession.GetServersWithHdr(¶ms, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -94,7 +94,7 @@ func GetTestServersIMS(t *testing.T) {
continue
}
params.Set("hostName", *server.HostName)
- _, reqInf, err := TOSession.GetServers(¶ms, header)
+ _, reqInf, err := TOSession.GetServersWithHdr(¶ms, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -127,7 +127,7 @@ func GetTestServers(t *testing.T) {
continue
}
params.Set("hostName", *server.HostName)
- resp, _, err := TOSession.GetServers(¶ms, nil)
+ resp, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Errorf("cannot GET Server by name '%s': %v - %v", *server.HostName, err, resp.Alerts)
} else if resp.Summary.Count != 1 {
@@ -143,7 +143,7 @@ func GetTestServersDetails(t *testing.T) {
t.Errorf("found server with nil hostname: %+v", server)
continue
}
- resp, _, err := TOSession.GetServerDetailsByHostName(*server.HostName, nil)
+ resp, _, err := TOSession.GetServerDetailsByHostName(*server.HostName)
if err != nil {
t.Errorf("cannot GET Server Details by name: %v - %v", err, resp)
}
@@ -151,7 +151,7 @@ func GetTestServersDetails(t *testing.T) {
}
func GetTestServersQueryParameters(t *testing.T) {
- dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
+ dses, _, err := TOSession.GetDeliveryServicesNullable()
if err != nil {
t.Fatalf("Failed to get Delivery Services: %v", err)
}
@@ -166,7 +166,7 @@ func GetTestServersQueryParameters(t *testing.T) {
params := url.Values{}
params.Add("dsId", strconv.Itoa(*ds.ID))
- _, _, err = TOSession.GetServers(¶ms, nil)
+ _, _, err = TOSession.GetServers(¶ms)
if err != nil {
t.Fatalf("Failed to get server by Delivery Service ID: %v", err)
}
@@ -176,14 +176,14 @@ func GetTestServersQueryParameters(t *testing.T) {
var header http.Header
header = make(map[string][]string)
header.Set(rfc.IfModifiedSince, time)
- _, reqInf, _ := TOSession.GetServers(¶ms, header)
+ _, reqInf, _ := TOSession.GetServersWithHdr(¶ms, header)
if reqInf.StatusCode != http.StatusNotModified {
t.Errorf("Expected a status code of 304, got %v", reqInf.StatusCode)
}
params.Del("dsId")
- resp, _, err := TOSession.GetServers(nil, nil)
+ resp, _, err := TOSession.GetServers(nil)
if err != nil {
t.Fatalf("Failed to get servers: %v", err)
}
@@ -195,7 +195,7 @@ func GetTestServersQueryParameters(t *testing.T) {
s := resp.Response[0]
params.Add("type", s.Type)
- if _, _, err := TOSession.GetServers(¶ms, nil); err != nil {
+ if _, _, err := TOSession.GetServers(¶ms); err != nil {
t.Errorf("Error getting servers by type: %v", err)
}
params.Del("type")
@@ -204,7 +204,7 @@ func GetTestServersQueryParameters(t *testing.T) {
t.Error("Found server with no Cache Group ID")
} else {
params.Add("cachegroup", strconv.Itoa(*s.CachegroupID))
- if _, _, err := TOSession.GetServers(¶ms, nil); err != nil {
+ if _, _, err := TOSession.GetServers(¶ms); err != nil {
t.Errorf("Error getting servers by Cache Group ID: %v", err)
}
params.Del("cachegroup")
@@ -214,7 +214,7 @@ func GetTestServersQueryParameters(t *testing.T) {
t.Error("Found server with no status")
} else {
params.Add("status", *s.Status)
- if _, _, err := TOSession.GetServers(¶ms, nil); err != nil {
+ if _, _, err := TOSession.GetServers(¶ms); err != nil {
t.Errorf("Error getting servers by status: %v", err)
}
params.Del("status")
@@ -224,13 +224,13 @@ func GetTestServersQueryParameters(t *testing.T) {
t.Error("Found server with no Profile ID")
} else {
params.Add("profileId", strconv.Itoa(*s.ProfileID))
- if _, _, err := TOSession.GetServers(¶ms, nil); err != nil {
+ if _, _, err := TOSession.GetServers(¶ms); err != nil {
t.Errorf("Error getting servers by Profile ID: %v", err)
}
params.Del("profileId")
}
- cgs, _, err := TOSession.GetCacheGroupsNullable(nil)
+ cgs, _, err := TOSession.GetCacheGroupsNullable()
if err != nil {
t.Fatalf("Failed to get Cache Groups: %v", err)
}
@@ -242,14 +242,14 @@ func GetTestServersQueryParameters(t *testing.T) {
}
params.Add("parentCacheGroup", strconv.Itoa(*cgs[0].ID))
- if _, _, err = TOSession.GetServers(¶ms, nil); err != nil {
+ if _, _, err = TOSession.GetServers(¶ms); err != nil {
t.Errorf("Error getting servers by parentCacheGroup: %v", err)
}
params.Del("parentCacheGroup")
}
func UniqueIPProfileTestServers(t *testing.T) {
- serversResp, _, err := TOSession.GetServers(nil, nil)
+ serversResp, _, err := TOSession.GetServers(nil)
if err != nil {
t.Fatal(err)
}
@@ -286,7 +286,7 @@ func UniqueIPProfileTestServers(t *testing.T) {
// Cleanup, don't want to break other tests
pathParams := url.Values{}
pathParams.Add("xmppid", xmppId)
- server, _, err := TOSession.GetServers(&pathParams, nil)
+ server, _, err := TOSession.GetServers(&pathParams)
if err != nil {
t.Fatal(err)
}
@@ -331,7 +331,7 @@ func UpdateTestServers(t *testing.T) {
params.Add("hostName", hostName)
// Retrieve the server by hostname so we can get the id for the Update
- resp, _, err := TOSession.GetServers(¶ms, nil)
+ resp, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Fatalf("cannot GET Server by hostname '%s': %v - %v", hostName, err, resp.Alerts)
}
@@ -379,7 +379,7 @@ func UpdateTestServers(t *testing.T) {
}
// Retrieve the server to check rack, interfaceName, hostName values were updated
- resp, _, err = TOSession.GetServers(&idParam, nil)
+ resp, _, err = TOSession.GetServers(&idParam)
if err != nil {
t.Errorf("cannot GET Server by ID: %v - %v", *remoteServer.HostName, err)
}
@@ -434,13 +434,13 @@ func UpdateTestServers(t *testing.T) {
if err != nil {
t.Fatalf("cannot UPDATE Server by ID %d (hostname '%s'): %v - %v", *remoteServer.ID, hostName, err, alert)
}
- resp, _, err = TOSession.GetServers(¶ms, nil)
+ resp, _, err = TOSession.GetServers(¶ms)
if err != nil {
t.Errorf("cannot GET Server by hostName: %v - %v", originalHostname, err)
}
// Assign server to DS and then attempt to update to a different type
- dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
+ dses, _, err := TOSession.GetDeliveryServicesNullable()
if err != nil {
t.Fatalf("cannot GET DeliveryServices: %v", err)
}
@@ -448,7 +448,7 @@ func UpdateTestServers(t *testing.T) {
t.Fatal("GET DeliveryServices returned no dses, must have at least 1 to test invalid type server update")
}
- serverTypes, _, err := TOSession.GetTypes(nil, "server")
+ serverTypes, _, err := TOSession.GetTypes("server")
if err != nil {
t.Fatalf("cannot GET Server Types: %v", err)
}
@@ -488,7 +488,7 @@ func DeleteTestServers(t *testing.T) {
params.Set("hostName", *server.HostName)
- resp, _, err := TOSession.GetServers(¶ms, nil)
+ resp, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Errorf("cannot GET Server by hostname '%s': %v - %v", *server.HostName, err, resp.Alerts)
continue
@@ -512,7 +512,7 @@ func DeleteTestServers(t *testing.T) {
}
// Retrieve the Server to see if it got deleted
- resp, _, err := TOSession.GetServers(¶ms, nil)
+ resp, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Errorf("error deleting Server hostname '%s': %v - %v", *server.HostName, err, resp.Alerts)
}
diff --git a/traffic_ops/testing/api/v3/servers_to_deliveryservice_assignment_test.go b/traffic_ops/testing/api/v3/servers_to_deliveryservice_assignment_test.go
index 5e8510a..5a16d75 100644
--- a/traffic_ops/testing/api/v3/servers_to_deliveryservice_assignment_test.go
+++ b/traffic_ops/testing/api/v3/servers_to_deliveryservice_assignment_test.go
@@ -45,7 +45,7 @@ func AssignTestDeliveryService(t *testing.T) {
params := url.Values{}
params.Add("hostName", *server.HostName)
- rs, _, err := TOSession.GetServers(¶ms, nil)
+ rs, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Fatalf("Failed to fetch server information: %v", err)
} else if len(rs.Response) == 0 {
@@ -56,7 +56,7 @@ func AssignTestDeliveryService(t *testing.T) {
t.Fatalf("Server '%s' had nil ID", *server.HostName)
}
- rd, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(*testData.DeliveryServices[0].XMLID, nil)
+ rd, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(*testData.DeliveryServices[0].XMLID)
if err != nil {
t.Fatalf("Failed to fetch DS information: %v", err)
} else if len(rd) == 0 {
@@ -73,7 +73,7 @@ func AssignTestDeliveryService(t *testing.T) {
}
t.Logf("alerts: %+v", alerts)
- response, _, err := TOSession.GetServerIDDeliveryServices(*firstServer.ID, nil)
+ response, _, err := TOSession.GetServerIDDeliveryServices(*firstServer.ID)
t.Logf("response: %+v", response)
if err != nil {
t.Fatalf("Couldn't get Delivery Services assigned to Server '%+v': %v", firstServer, err)
@@ -96,7 +96,7 @@ func AssignTestDeliveryService(t *testing.T) {
var header http.Header
header = make(map[string][]string)
header.Set(rfc.IfModifiedSince, time)
- _, reqInf, _ := TOSession.GetServerIDDeliveryServices(*firstServer.ID, header)
+ _, reqInf, _ := TOSession.GetServerIDDeliveryServicesWithHdr(*firstServer.ID, header)
if reqInf.StatusCode != http.StatusNotModified {
t.Errorf("Expected a status code of 304, got %v", reqInf.StatusCode)
}
@@ -120,7 +120,7 @@ func AssignIncorrectTestDeliveryService(t *testing.T) {
params := url.Values{}
params.Add("hostName", hostname)
- rs, _, err := TOSession.GetServers(¶ms, nil)
+ rs, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Fatalf("Failed to fetch server information: %v - %v", err, rs.Alerts)
} else if len(rs.Response) == 0 {
@@ -131,7 +131,7 @@ func AssignIncorrectTestDeliveryService(t *testing.T) {
t.Fatalf("Server '%s' has nil ID", hostname)
}
- rd, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(*testData.DeliveryServices[0].XMLID, nil)
+ rd, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(*testData.DeliveryServices[0].XMLID)
if err != nil {
t.Fatalf("Failed to fetch DS information: %v", err)
} else if len(rd) == 0 {
@@ -147,7 +147,7 @@ func AssignIncorrectTestDeliveryService(t *testing.T) {
t.Errorf("Expected bad assignment to fail, but it didn't! (alerts: %v)", alerts)
}
- response, _, err := TOSession.GetServerIDDeliveryServices(*server.ID, nil)
+ response, _, err := TOSession.GetServerIDDeliveryServices(*server.ID)
t.Logf("response: %+v", response)
if err != nil {
t.Fatalf("Couldn't get Delivery Services assigned to Server '%+v': %v", *server, err)
@@ -181,7 +181,7 @@ func AssignTopologyBasedDeliveryService(t *testing.T) {
params := url.Values{}
params.Add("hostName", *server.HostName)
- rs, _, err := TOSession.GetServers(¶ms, nil)
+ rs, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Fatalf("Failed to fetch server information: %v", err)
} else if len(rs.Response) == 0 {
@@ -192,7 +192,7 @@ func AssignTopologyBasedDeliveryService(t *testing.T) {
t.Fatal("Server had nil ID")
}
- rd, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds-top", nil)
+ rd, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds-top")
if err != nil {
t.Fatalf("Failed to fetch DS information: %v", err)
} else if len(rd) == 0 {
@@ -211,7 +211,7 @@ func AssignTopologyBasedDeliveryService(t *testing.T) {
t.Fatalf("assigning Topology-based delivery service to server - expected: non-error status code, actual: %d", reqInf.StatusCode)
}
- response, _, err := TOSession.GetServerIDDeliveryServices(*server.ID, nil)
+ response, _, err := TOSession.GetServerIDDeliveryServices(*server.ID)
t.Logf("response: %+v", response)
if err != nil {
t.Fatalf("Couldn't get Delivery Services assigned to Server '%+v': %v", *server, err)
diff --git a/traffic_ops/testing/api/v3/serverservercapability_test.go b/traffic_ops/testing/api/v3/serverservercapability_test.go
index 8ab8bf6..c419422 100644
--- a/traffic_ops/testing/api/v3/serverservercapability_test.go
+++ b/traffic_ops/testing/api/v3/serverservercapability_test.go
@@ -39,7 +39,7 @@ func GetTestServerServerCapabilitiesIMS(t *testing.T) {
futureTime := time.Now().AddDate(0, 0, 1)
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
- _, reqInf, err := TOSession.GetServerServerCapabilities(nil, nil, nil, header)
+ _, reqInf, err := TOSession.GetServerServerCapabilitiesWithHdr(nil, nil, nil, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -58,7 +58,7 @@ func CreateTestServerServerCapabilities(t *testing.T) {
t.Fatalf("server-server-capability structure had nil server")
}
params.Set("hostName", *ssc.Server)
- resp, _, err := TOSession.GetServers(¶ms, nil)
+ resp, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Fatalf("cannot GET Server by hostname '%s': %v - %v", *ssc.Server, err, resp.Alerts)
}
@@ -126,7 +126,7 @@ func CreateTestServerServerCapabilities(t *testing.T) {
// Attempt to assign a server capability to a non MID/EDGE server
// TODO: DON'T hard-code server hostnames!
params.Set("hostName", "riak")
- resp, _, err := TOSession.GetServers(¶ms, nil)
+ resp, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Fatalf("cannot GET Server by hostname 'riak': %v - %v", err, resp.Alerts)
}
@@ -147,7 +147,7 @@ func CreateTestServerServerCapabilities(t *testing.T) {
func GetTestServerServerCapabilities(t *testing.T) {
// Get All Server Capabilities
- sscs, _, err := TOSession.GetServerServerCapabilities(nil, nil, nil, nil)
+ sscs, _, err := TOSession.GetServerServerCapabilities(nil, nil, nil)
if err != nil {
t.Fatalf("cannot GET server capabilities assigned to servers: %v", err)
}
@@ -169,20 +169,20 @@ func GetTestServerServerCapabilities(t *testing.T) {
for _, ssc := range sscs {
// Get assigned Server Capabilities by server id
- sscs, _, err := TOSession.GetServerServerCapabilities(ssc.ServerID, nil, nil, nil)
+ sscs, _, err := TOSession.GetServerServerCapabilities(ssc.ServerID, nil, nil)
if err != nil {
t.Fatalf("cannot GET server capabilities assigned to servers by server ID %v: %v", *ssc.ServerID, err)
}
checkResp(t, sscs)
// Get assigned Server Capabilities by host name
- sscs, _, err = TOSession.GetServerServerCapabilities(nil, ssc.Server, nil, nil)
+ sscs, _, err = TOSession.GetServerServerCapabilities(nil, ssc.Server, nil)
if err != nil {
t.Fatalf("cannot GET server capabilities assigned to servers by server host name %v: %v", *ssc.Server, err)
}
checkResp(t, sscs)
// Get assigned Server Capabilities by server capability
- sscs, _, err = TOSession.GetServerServerCapabilities(nil, nil, ssc.ServerCapability, nil)
+ sscs, _, err = TOSession.GetServerServerCapabilities(nil, nil, ssc.ServerCapability)
if err != nil {
t.Fatalf("cannot GET server capabilities assigned to servers by server capability %v: %v", *ssc.ServerCapability, err)
}
@@ -192,7 +192,7 @@ func GetTestServerServerCapabilities(t *testing.T) {
func DeleteTestServerServerCapabilities(t *testing.T) {
// Get Server Capabilities to delete them
- sscs, _, err := TOSession.GetServerServerCapabilities(nil, nil, nil, nil)
+ sscs, _, err := TOSession.GetServerServerCapabilities(nil, nil, nil)
if err != nil {
t.Fatalf("cannot GET server capabilities assigned to servers: %v", err)
}
@@ -205,7 +205,7 @@ func DeleteTestServerServerCapabilities(t *testing.T) {
dsServers := []tc.DeliveryServiceServer{}
for _, ssc := range sscs {
- dsReqCapResp, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, nil, ssc.ServerCapability, nil)
+ dsReqCapResp, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, nil, ssc.ServerCapability)
if err != nil {
t.Fatalf("cannot GET delivery service required capabilities: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/serverupdatestatus_test.go b/traffic_ops/testing/api/v3/serverupdatestatus_test.go
index 6238c98..661c94c 100644
--- a/traffic_ops/testing/api/v3/serverupdatestatus_test.go
+++ b/traffic_ops/testing/api/v3/serverupdatestatus_test.go
@@ -60,7 +60,7 @@ func TestServerUpdateStatus(t *testing.T) {
},
} {
params.Set("hostName", s.name)
- resp, _, err := TOSession.GetServers(¶ms, nil)
+ resp, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Errorf("cannot GET Server by hostname '%s': %v - %v", s.name, err, resp.Alerts)
}
@@ -130,7 +130,7 @@ func TestServerUpdateStatus(t *testing.T) {
}
// update status of MID server to OFFLINE via status ID
- status, _, err := TOSession.GetStatusByName("OFFLINE", nil)
+ status, _, err := TOSession.GetStatusByName("OFFLINE")
if err != nil {
t.Fatalf("cannot GET status by name: %v", err)
}
@@ -209,7 +209,7 @@ func TestServerQueueUpdate(t *testing.T) {
var s tc.ServerNullable
params := url.Values{}
params.Add("hostName", serverName)
- resp, _, err := TOSession.GetServers(¶ms, nil)
+ resp, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Fatalf("failed to GET Server by hostname '%s': %v - %v", serverName, err, resp.Alerts)
}
@@ -249,7 +249,7 @@ func TestServerQueueUpdate(t *testing.T) {
}
// assert that the server has updates queued
- resp, _, err = TOSession.GetServers(¶ms, nil)
+ resp, _, err = TOSession.GetServers(¶ms)
if err != nil {
t.Fatalf("failed to GET Server by hostname '%s': %v - %v", serverName, err, resp.Alerts)
}
@@ -285,7 +285,7 @@ func TestServerQueueUpdate(t *testing.T) {
// TODO: don't construct URLs like this, nor use "RawRequest"
path := fmt.Sprintf(TestAPIBase+"/servers/%d/queue_update", *s.ID)
- httpResp, _, err := TOSession.RawRequest(http.MethodPost, path, req, nil)
+ httpResp, _, err := TOSession.RawRequest(http.MethodPost, path, req)
if err != nil {
t.Fatalf("POST request failed: %v", err)
}
@@ -309,7 +309,7 @@ func TestSetServerUpdateStatuses(t *testing.T) {
params := url.Values{}
params.Add("hostName", *testServer.HostName)
testVals := func(queue *bool, reval *bool) {
- resp, _, err := TOSession.GetServers(¶ms, nil)
+ resp, _, err := TOSession.GetServers(¶ms)
if err != nil {
t.Errorf("cannot GET Server by name '%s': %v - %v", *testServer.HostName, err, resp.Alerts)
} else if len(resp.Response) != 1 {
@@ -329,7 +329,7 @@ func TestSetServerUpdateStatuses(t *testing.T) {
t.Fatalf("UpdateServerStatuses error expected: nil, actual: %v", err)
}
- resp, _, err = TOSession.GetServers(¶ms, nil)
+ resp, _, err = TOSession.GetServers(¶ms)
if err != nil {
t.Errorf("cannot GET Server by name '%s': %v - %v", *testServer.HostName, err, resp.Alerts)
} else if len(resp.Response) != 1 {
@@ -391,7 +391,7 @@ func TestSetTopologiesServerUpdateStatuses(t *testing.T) {
cachesByCacheGroup := map[string]tc.ServerNullable{}
updateStatusByCacheGroup := map[string]tc.ServerUpdateStatus{}
- forkedTopology, _, err := TOSession.GetTopology(topologyName, nil)
+ forkedTopology, _, err := TOSession.GetTopology(topologyName)
if err != nil {
t.Fatalf("topology %s was not found", topologyName)
}
@@ -407,7 +407,7 @@ func TestSetTopologiesServerUpdateStatuses(t *testing.T) {
t.Fatalf("unable to find topology node with cachegroup %s", cacheGroupName)
}
- cacheGroups, _, err := TOSession.GetCacheGroupNullableByName(cacheGroupName, nil)
+ cacheGroups, _, err := TOSession.GetCacheGroupNullableByName(cacheGroupName)
if err != nil {
t.Fatalf("unable to get cachegroup %s: %s", cacheGroupName, err.Error())
}
@@ -417,7 +417,7 @@ func TestSetTopologiesServerUpdateStatuses(t *testing.T) {
cacheGroup := cacheGroups[0]
params := url.Values{"cachegroup": []string{strconv.Itoa(*cacheGroup.ID)}}
- cachesByCacheGroup[cacheGroupName], _, err = TOSession.GetFirstServer(¶ms, nil)
+ cachesByCacheGroup[cacheGroupName], _, err = TOSession.GetFirstServer(¶ms)
if err != nil {
t.Fatalf("unable to get a server from cachegroup %s: %s", cacheGroupName, err.Error())
}
@@ -433,13 +433,13 @@ func TestSetTopologiesServerUpdateStatuses(t *testing.T) {
for _, cacheGroupName := range cacheGroupNames {
params := url.Values{"cachegroup": []string{strconv.Itoa(*cachesByCacheGroup[cacheGroupName].CachegroupID)}}
- cachesByCacheGroup[cacheGroupName], _, err = TOSession.GetFirstServer(¶ms, nil)
+ cachesByCacheGroup[cacheGroupName], _, err = TOSession.GetFirstServer(¶ms)
if err != nil {
t.Fatalf("unable to get a server from cachegroup %s: %s", cacheGroupName, err.Error())
}
}
for _, cacheGroupName := range cacheGroupNames {
- updateStatusByCacheGroup[cacheGroupName], _, err = TOSession.GetServerUpdateStatus(*cachesByCacheGroup[cacheGroupName].HostName, nil)
+ updateStatusByCacheGroup[cacheGroupName], _, err = TOSession.GetServerUpdateStatus(*cachesByCacheGroup[cacheGroupName].HostName)
if err != nil {
t.Fatalf("unable to get a server from cachegroup %s: %s", cacheGroupName, err.Error())
}
@@ -468,7 +468,7 @@ func TestSetTopologiesServerUpdateStatuses(t *testing.T) {
t.Fatalf("cannot update server status on %s: %s", *cachesByCacheGroup[midCacheGroup].HostName, err.Error())
}
for _, cacheGroupName := range cacheGroupNames {
- updateStatusByCacheGroup[cacheGroupName], _, err = TOSession.GetServerUpdateStatus(*cachesByCacheGroup[cacheGroupName].HostName, nil)
+ updateStatusByCacheGroup[cacheGroupName], _, err = TOSession.GetServerUpdateStatus(*cachesByCacheGroup[cacheGroupName].HostName)
if err != nil {
t.Fatalf("unable to get a server from cachegroup %s: %s", cacheGroupName, err.Error())
}
@@ -490,7 +490,7 @@ func TestSetTopologiesServerUpdateStatuses(t *testing.T) {
t.Fatalf("unable to update %s's hostname to %s: %s", edgeHostName, *cachesByCacheGroup[midCacheGroup].HostName, err)
}
- _, _, err = TOSession.GetServerUpdateStatus(*cachesByCacheGroup[midCacheGroup].HostName, nil)
+ _, _, err = TOSession.GetServerUpdateStatus(*cachesByCacheGroup[midCacheGroup].HostName)
if err != nil {
t.Fatalf("expected no error getting server updates for a non-unique hostname %s, got %s", *cachesByCacheGroup[midCacheGroup].HostName, err)
}
diff --git a/traffic_ops/testing/api/v3/servicecategories_test.go b/traffic_ops/testing/api/v3/servicecategories_test.go
index beacdd2..e0ae96c 100644
--- a/traffic_ops/testing/api/v3/servicecategories_test.go
+++ b/traffic_ops/testing/api/v3/servicecategories_test.go
@@ -35,7 +35,7 @@ func TestServiceCategories(t *testing.T) {
func CreateTestServiceCategories(t *testing.T) {
// loop through service categories, assign FKs and create
for _, sc := range testData.ServiceCategories {
- tenant, _, err := TOSession.TenantByName(sc.TenantName, nil)
+ tenant, _, err := TOSession.TenantByName(sc.TenantName)
sc.TenantID = tenant.ID
resp, _, err := TOSession.CreateServiceCategory(sc)
if err != nil {
@@ -64,7 +64,7 @@ func UpdateTestServiceCategories(t *testing.T) {
t.Fatalf("cannot UPDATE Service Category, test data does not have service categories")
}
- tenants, _, err := TOSession.Tenants(nil)
+ tenants, _, err := TOSession.Tenants()
if err != nil {
t.Fatalf("Failed to get tenants: %v", err)
}
@@ -129,7 +129,7 @@ func UpdateTestServiceCategories(t *testing.T) {
func ServiceCategoryTenancyTest(t *testing.T) {
var alert tc.Alerts
- tenant3, _, err := TOSession.TenantByName("tenant3", nil)
+ tenant3, _, err := TOSession.TenantByName("tenant3")
if err != nil {
t.Errorf("cannot GET Tenant3: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/staticdnsentries_test.go b/traffic_ops/testing/api/v3/staticdnsentries_test.go
index 46d7149..bc1f134 100644
--- a/traffic_ops/testing/api/v3/staticdnsentries_test.go
+++ b/traffic_ops/testing/api/v3/staticdnsentries_test.go
@@ -43,7 +43,7 @@ func TestStaticDNSEntries(t *testing.T) {
func GetTestStaticDNSEntriesIMSAfterChange(t *testing.T, header http.Header) {
for _, staticDNSEntry := range testData.StaticDNSEntries {
- _, reqInf, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host, header)
+ _, reqInf, err := TOSession.GetStaticDNSEntriesByHostWithHdr(staticDNSEntry.Host, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -56,7 +56,7 @@ func GetTestStaticDNSEntriesIMSAfterChange(t *testing.T, header http.Header) {
timeStr := currentTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, timeStr)
for _, staticDNSEntry := range testData.StaticDNSEntries {
- _, reqInf, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host, header)
+ _, reqInf, err := TOSession.GetStaticDNSEntriesByHostWithHdr(staticDNSEntry.Host, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -74,7 +74,7 @@ func GetTestStaticDNSEntriesIMS(t *testing.T) {
header.Set(rfc.IfModifiedSince, time)
for _, staticDNSEntry := range testData.StaticDNSEntries {
- _, reqInf, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host, header)
+ _, reqInf, err := TOSession.GetStaticDNSEntriesByHostWithHdr(staticDNSEntry.Host, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -99,7 +99,7 @@ func UpdateTestStaticDNSEntries(t *testing.T) {
firstStaticDNSEntry := testData.StaticDNSEntries[0]
// Retrieve the StaticDNSEntries by name so we can get the id for the Update
- resp, _, err := TOSession.GetStaticDNSEntriesByHost(firstStaticDNSEntry.Host, nil)
+ resp, _, err := TOSession.GetStaticDNSEntriesByHost(firstStaticDNSEntry.Host)
if err != nil {
t.Errorf("cannot GET StaticDNSEntries by name: '%s', %v", firstStaticDNSEntry.Host, err)
}
@@ -115,7 +115,7 @@ func UpdateTestStaticDNSEntries(t *testing.T) {
}
// Retrieve the StaticDNSEntries to check StaticDNSEntries name got updated
- resp, _, err = TOSession.GetStaticDNSEntryByID(remoteStaticDNSEntry.ID, nil)
+ resp, _, err = TOSession.GetStaticDNSEntryByID(remoteStaticDNSEntry.ID)
if err != nil {
t.Errorf("cannot GET StaticDNSEntries by name: '$%s', %v", firstStaticDNSEntry.Host, err)
}
@@ -137,7 +137,7 @@ func UpdateTestStaticDNSEntriesInvalidAddress(t *testing.T) {
// A_RECORD
firstStaticDNSEntry := testData.StaticDNSEntries[0]
// Retrieve the StaticDNSEntries by name so we can get the id for the Update
- resp, _, err := TOSession.GetStaticDNSEntriesByHost(firstStaticDNSEntry.Host, nil)
+ resp, _, err := TOSession.GetStaticDNSEntriesByHost(firstStaticDNSEntry.Host)
if err != nil {
t.Errorf("cannot GET StaticDNSEntries by name: '%s', %v", firstStaticDNSEntry.Host, err)
}
@@ -158,7 +158,7 @@ func UpdateTestStaticDNSEntriesInvalidAddress(t *testing.T) {
// CNAME_RECORD
secondStaticDNSEntry := testData.StaticDNSEntries[1]
// Retrieve the StaticDNSEntries by name so we can get the id for the Update
- resp, _, err = TOSession.GetStaticDNSEntriesByHost(secondStaticDNSEntry.Host, nil)
+ resp, _, err = TOSession.GetStaticDNSEntriesByHost(secondStaticDNSEntry.Host)
if err != nil {
t.Errorf("cannot GET StaticDNSEntries by name: '%s', %v", secondStaticDNSEntry.Host, err)
}
@@ -189,7 +189,7 @@ func UpdateTestStaticDNSEntriesInvalidAddress(t *testing.T) {
// AAAA_RECORD
thirdStaticDNSEntry := testData.StaticDNSEntries[2]
// Retrieve the StaticDNSEntries by name so we can get the id for the Update
- resp, _, err = TOSession.GetStaticDNSEntriesByHost(thirdStaticDNSEntry.Host, nil)
+ resp, _, err = TOSession.GetStaticDNSEntriesByHost(thirdStaticDNSEntry.Host)
if err != nil {
t.Errorf("cannot GET StaticDNSEntries by name: '%s', %v", thirdStaticDNSEntry.Host, err)
}
@@ -209,7 +209,7 @@ func UpdateTestStaticDNSEntriesInvalidAddress(t *testing.T) {
func GetTestStaticDNSEntries(t *testing.T) {
for _, staticDNSEntry := range testData.StaticDNSEntries {
- resp, _, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host, nil)
+ resp, _, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host)
if err != nil {
t.Errorf("cannot GET StaticDNSEntries by name: %v - %v", err, resp)
}
@@ -220,7 +220,7 @@ func DeleteTestStaticDNSEntries(t *testing.T) {
for _, staticDNSEntry := range testData.StaticDNSEntries {
// Retrieve the StaticDNSEntries by name so we can get the id for the Update
- resp, _, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host, nil)
+ resp, _, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host)
if err != nil {
t.Errorf("cannot GET StaticDNSEntries by name: %v - %v", staticDNSEntry.Host, err)
}
@@ -233,7 +233,7 @@ func DeleteTestStaticDNSEntries(t *testing.T) {
}
// Retrieve the StaticDNSEntry to see if it got deleted
- staticDNSEntries, _, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host, nil)
+ staticDNSEntries, _, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host)
if err != nil {
t.Errorf("error deleting StaticDNSEntrie name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/statuses_test.go b/traffic_ops/testing/api/v3/statuses_test.go
index bfc7d1e..201e88a 100644
--- a/traffic_ops/testing/api/v3/statuses_test.go
+++ b/traffic_ops/testing/api/v3/statuses_test.go
@@ -43,7 +43,7 @@ func GetTestStatusesIMSAfterChange(t *testing.T, header http.Header) {
if status.Name == nil {
t.Fatal("cannot get ftest statuses: test data statuses must have names")
}
- _, reqInf, err := TOSession.GetStatusByName(*status.Name, header)
+ _, reqInf, err := TOSession.GetStatusByNameWithHdr(*status.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -59,7 +59,7 @@ func GetTestStatusesIMSAfterChange(t *testing.T, header http.Header) {
if status.Name == nil {
t.Fatal("cannot get ftest statuses: test data statuses must have names")
}
- _, reqInf, err := TOSession.GetStatusByName(*status.Name, header)
+ _, reqInf, err := TOSession.GetStatusByNameWithHdr(*status.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -79,7 +79,7 @@ func GetTestStatusesIMS(t *testing.T) {
if status.Name == nil {
t.Fatal("cannot get ftest statuses: test data statuses must have names")
}
- _, reqInf, err := TOSession.GetStatusByName(*status.Name, header)
+ _, reqInf, err := TOSession.GetStatusByNameWithHdr(*status.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -109,7 +109,7 @@ func UpdateTestStatuses(t *testing.T) {
}
// Retrieve the Status by name so we can get the id for the Update
- resp, _, err := TOSession.GetStatusByName(*firstStatus.Name, nil)
+ resp, _, err := TOSession.GetStatusByName(*firstStatus.Name)
if err != nil {
t.Errorf("cannot GET Status by name: %v - %v", firstStatus.Name, err)
}
@@ -123,7 +123,7 @@ func UpdateTestStatuses(t *testing.T) {
}
// Retrieve the Status to check Status name got updated
- resp, _, err = TOSession.GetStatusByID(remoteStatus.ID, nil)
+ resp, _, err = TOSession.GetStatusByID(remoteStatus.ID)
if err != nil {
t.Errorf("cannot GET Status by ID: %v - %v", firstStatus.Description, err)
}
@@ -140,7 +140,7 @@ func GetTestStatuses(t *testing.T) {
if status.Name == nil {
t.Fatal("cannot get ftest statuses: test data statuses must have names")
}
- resp, _, err := TOSession.GetStatusByName(*status.Name, nil)
+ resp, _, err := TOSession.GetStatusByName(*status.Name)
if err != nil {
t.Errorf("cannot GET Status by name: %v - %v", err, resp)
}
@@ -155,7 +155,7 @@ func DeleteTestStatuses(t *testing.T) {
}
// Retrieve the Status by name so we can get the id for the Update
- resp, _, err := TOSession.GetStatusByName(*status.Name, nil)
+ resp, _, err := TOSession.GetStatusByName(*status.Name)
if err != nil {
t.Errorf("cannot GET Status by name: %v - %v", status.Name, err)
}
@@ -167,7 +167,7 @@ func DeleteTestStatuses(t *testing.T) {
}
// Retrieve the Status to see if it got deleted
- types, _, err := TOSession.GetStatusByName(*status.Name, nil)
+ types, _, err := TOSession.GetStatusByName(*status.Name)
if err != nil {
t.Errorf("error deleting Status name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/steering_test.go b/traffic_ops/testing/api/v3/steering_test.go
index 7f6c47d..2baefee 100644
--- a/traffic_ops/testing/api/v3/steering_test.go
+++ b/traffic_ops/testing/api/v3/steering_test.go
@@ -34,7 +34,7 @@ func GetTestSteering(t *testing.T) {
t.Error("get steering: test data missing ds")
}
- steerings, _, err := TOSession.Steering(nil)
+ steerings, _, err := TOSession.Steering()
if err != nil {
t.Errorf("steering get: getting steering: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/steeringtargets_test.go b/traffic_ops/testing/api/v3/steeringtargets_test.go
index d2f28c4..fa4b477 100644
--- a/traffic_ops/testing/api/v3/steeringtargets_test.go
+++ b/traffic_ops/testing/api/v3/steeringtargets_test.go
@@ -51,7 +51,7 @@ func GetTestSteeringTargetsIMSAfterChange(t *testing.T, header http.Header) {
if st.DeliveryService == nil {
t.Fatal("updating steering target: test data missing ds")
}
- _, reqInf, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService), header)
+ _, reqInf, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullableWithHdr(string(*st.DeliveryService), header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -62,7 +62,7 @@ func GetTestSteeringTargetsIMSAfterChange(t *testing.T, header http.Header) {
currentTime = currentTime.Add(1 * time.Second)
timeStr := currentTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, timeStr)
- _, reqInf, err = SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService), header)
+ _, reqInf, err = SteeringUserSession.GetDeliveryServiceByXMLIDNullableWithHdr(string(*st.DeliveryService), header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -84,7 +84,7 @@ func GetTestSteeringTargetsIMS(t *testing.T) {
futureTime := time.Now().AddDate(0, 0, 1)
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
- _, reqInf, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService), header)
+ _, reqInf, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullableWithHdr(string(*st.DeliveryService), header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -120,7 +120,7 @@ func CreateTestSteeringTargets(t *testing.T) {
}
{
- respTypes, _, err := SteeringUserSession.GetTypeByName(*st.Type, nil)
+ respTypes, _, err := SteeringUserSession.GetTypeByName(*st.Type)
if err != nil {
t.Fatalf("creating steering target: getting type: %v", err)
} else if len(respTypes) < 1 {
@@ -129,7 +129,7 @@ func CreateTestSteeringTargets(t *testing.T) {
st.TypeID = util.IntPtr(respTypes[0].ID)
}
{
- respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService), nil)
+ respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService))
if err != nil {
t.Fatalf("creating steering target: getting ds: %v", err)
} else if len(respDS) < 1 {
@@ -141,7 +141,7 @@ func CreateTestSteeringTargets(t *testing.T) {
st.DeliveryServiceID = &dsID
}
{
- respTarget, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.Target), nil)
+ respTarget, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.Target))
if err != nil {
t.Fatalf("creating steering target: getting target ds: %v", err)
} else if len(respTarget) < 1 {
@@ -173,7 +173,7 @@ func UpdateTestSteeringTargets(t *testing.T) {
t.Fatal("updating steering target: test data missing target")
}
- respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService), nil)
+ respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService))
if err != nil {
t.Fatalf("updating steering target: getting ds: %v", err)
}
@@ -260,7 +260,7 @@ func GetTestSteeringTargets(t *testing.T) {
t.Fatal("updating steering target: test data missing ds")
}
- respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService), nil)
+ respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService))
if err != nil {
t.Fatalf("creating steering target: getting ds: %v", err)
} else if len(respDS) < 1 {
@@ -319,7 +319,7 @@ func DeleteTestSteeringTargets(t *testing.T) {
t.Fatal("deleting steering target: test data missing target")
}
- respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService), nil)
+ respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService))
if err != nil {
t.Fatalf("deleting steering target: getting ds: %v", err)
} else if len(respDS) < 1 {
@@ -332,7 +332,7 @@ func DeleteTestSteeringTargets(t *testing.T) {
dsIDs = append(dsIDs, dsID)
- respTarget, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.Target), nil)
+ respTarget, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.Target))
if err != nil {
t.Fatalf("deleting steering target: getting target ds: %v", err)
} else if len(respTarget) < 1 {
diff --git a/traffic_ops/testing/api/v3/tenants_test.go b/traffic_ops/testing/api/v3/tenants_test.go
index d575afe..33d8666 100644
--- a/traffic_ops/testing/api/v3/tenants_test.go
+++ b/traffic_ops/testing/api/v3/tenants_test.go
@@ -52,7 +52,7 @@ func CreateTestTenants(t *testing.T) {
}
func GetTestTenants(t *testing.T) {
- resp, _, err := TOSession.Tenants(nil)
+ resp, _, err := TOSession.Tenants()
if err != nil {
t.Errorf("cannot GET all tenants: %v - %v", err, resp)
return
@@ -83,12 +83,12 @@ func UpdateTestTenants(t *testing.T) {
// Retrieve the Tenant by name so we can get the id for the Update
name := "tenant2"
parentName := "tenant1"
- modTenant, _, err := TOSession.TenantByName(name, nil)
+ modTenant, _, err := TOSession.TenantByName(name)
if err != nil {
t.Errorf("cannot GET Tenant by name: %s - %v", name, err)
}
- newParent, _, err := TOSession.TenantByName(parentName, nil)
+ newParent, _, err := TOSession.TenantByName(parentName)
if err != nil {
t.Errorf("cannot GET Tenant by name: %s - %v", parentName, err)
}
@@ -100,7 +100,7 @@ func UpdateTestTenants(t *testing.T) {
}
// Retrieve the Tenant to check Tenant parent name got updated
- respTenant, _, err := TOSession.Tenant(strconv.Itoa(modTenant.ID), nil)
+ respTenant, _, err := TOSession.Tenant(strconv.Itoa(modTenant.ID))
if err != nil {
t.Errorf("cannot GET Tenant by name: %v - %v", name, err)
}
@@ -113,7 +113,7 @@ func UpdateTestTenants(t *testing.T) {
func DeleteTestTenants(t *testing.T) {
t1 := "tenant1"
- tenant1, _, err := TOSession.TenantByName(t1, nil)
+ tenant1, _, err := TOSession.TenantByName(t1)
if err != nil {
t.Errorf("cannot GET Tenant by name: %v - %v", t1, err)
@@ -147,7 +147,7 @@ func DeleteTestTenants(t *testing.T) {
continue
}
- toTenant, _, err := TOSession.TenantByName(tn.Name, nil)
+ toTenant, _, err := TOSession.TenantByName(tn.Name)
if err != nil {
t.Fatalf("getting tenant %s: %v", tn.Name, err)
}
@@ -174,7 +174,7 @@ func ExtractXMLID(ds *tc.DeliveryServiceNullable) string {
}
func UpdateTestTenantsActive(t *testing.T) {
- originalTenants, _, err := TOSession.Tenants(nil)
+ originalTenants, _, err := TOSession.Tenants()
if err != nil {
t.Fatalf("getting tenants error expected: nil, actual: %+v", err)
}
@@ -184,7 +184,7 @@ func UpdateTestTenantsActive(t *testing.T) {
setTenantActive(t, "tenant3", false)
// ds3 has tenant3. Even though tenant3 is inactive, we should still be able to get it, because our user is tenant1, which is active.
- dses, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds3", nil)
+ dses, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds3")
if err != nil {
t.Fatal("failed to get delivery service, when the DS's tenant was inactive (even though our user's tenant was active)")
} else if len(dses) != 1 {
@@ -196,7 +196,7 @@ func UpdateTestTenantsActive(t *testing.T) {
setTenantActive(t, "tenant3", true)
// ds3 has tenant3. Even though tenant3's parent, tenant2, is inactive, we should still be able to get it, because our user is tenant1, which is active.
- _, _, err = TOSession.GetDeliveryServiceByXMLIDNullable("ds3", nil)
+ _, _, err = TOSession.GetDeliveryServiceByXMLIDNullable("ds3")
if err != nil {
t.Fatal("failed to get delivery service, when a parent tenant was inactive (even though our user's tenant was active)")
}
@@ -213,7 +213,7 @@ func UpdateTestTenantsActive(t *testing.T) {
}
// tenant3user with tenant3 has no access to ds3 with tenant3 when parent tenant2 is inactive
- dses, _, err = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3", nil)
+ dses, _, err = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3")
for _, ds := range dses {
t.Errorf("tenant3user got delivery service %+v with tenant3 but tenant3 parent tenant2 is inactive, expected: no ds", ExtractXMLID(&ds))
}
@@ -223,7 +223,7 @@ func UpdateTestTenantsActive(t *testing.T) {
setTenantActive(t, "tenant3", false)
// tenant3user with tenant3 has no access to ds3 with tenant3 when tenant3 is inactive
- dses, _, err = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3", nil)
+ dses, _, err = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3")
for _, ds := range dses {
t.Errorf("tenant3user got delivery service %+v with tenant3 but tenant3 is inactive, expected: no ds", ExtractXMLID(&ds))
}
@@ -233,7 +233,7 @@ func UpdateTestTenantsActive(t *testing.T) {
setTenantActive(t, "tenant3", true)
// tenant3user with tenant3 has access to ds3 with tenant3
- dses, _, err = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3", nil)
+ dses, _, err = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3")
if err != nil {
t.Errorf("tenant3user getting delivery service ds3 error expected: nil, actual: %+v", err)
} else if len(dses) == 0 {
@@ -244,7 +244,7 @@ func UpdateTestTenantsActive(t *testing.T) {
// 2. tenant3user has tenant3.
// 3. tenant2 is not a child of tenant3 (tenant3 is a child of tenant2)
// 4. Therefore, tenant3user should not have access to ds2
- dses, _, _ = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds2", nil)
+ dses, _, _ = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds2")
for _, ds := range dses {
t.Errorf("tenant3user got delivery service %+v with tenant2, expected: no ds", ExtractXMLID(&ds))
}
@@ -253,13 +253,13 @@ func UpdateTestTenantsActive(t *testing.T) {
// 2. tenant4user has tenant4.
// 3. tenant1 is not a child of tenant4 (tenant4 is unrelated to tenant1)
// 4. Therefore, tenant4user should not have access to ds1
- dses, _, _ = tenant4Session.GetDeliveryServiceByXMLIDNullable("ds1", nil)
+ dses, _, _ = tenant4Session.GetDeliveryServiceByXMLIDNullable("ds1")
for _, ds := range dses {
t.Errorf("tenant4user got delivery service %+v with tenant1, expected: no ds", ExtractXMLID(&ds))
}
setTenantActive(t, "tenant3", false)
- dses, _, _ = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3", nil)
+ dses, _, _ = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3")
for _, ds := range dses {
t.Errorf("tenant3user was inactive, but got delivery service %+v with tenant3, expected: no ds", ExtractXMLID(&ds))
}
@@ -275,7 +275,7 @@ func UpdateTestTenantsActive(t *testing.T) {
}
func setTenantActive(t *testing.T, name string, active bool) {
- tn, _, err := TOSession.TenantByName(name, nil)
+ tn, _, err := TOSession.TenantByName(name)
if err != nil {
t.Fatalf("cannot GET Tenant by name: %s - %v", name, err)
}
diff --git a/traffic_ops/testing/api/v3/topologies_test.go b/traffic_ops/testing/api/v3/topologies_test.go
index 75c4ecf..774b1c7 100644
--- a/traffic_ops/testing/api/v3/topologies_test.go
+++ b/traffic_ops/testing/api/v3/topologies_test.go
@@ -191,7 +191,7 @@ func DeleteTestTopologies(t *testing.T) {
t.Errorf("topology deletion audit log entry - expected: message containing topology name '%s', actual: %s", top.Name, *deleteLog[0].Message)
}
- topology, _, err := TOSession.GetTopology(top.Name, nil)
+ topology, _, err := TOSession.GetTopology(top.Name)
if err == nil {
t.Fatalf("expected error trying to GET deleted topology: %s, actual: nil", top.Name)
}
diff --git a/traffic_ops/testing/api/v3/types_test.go b/traffic_ops/testing/api/v3/types_test.go
index 26f3ced..b9b1215 100644
--- a/traffic_ops/testing/api/v3/types_test.go
+++ b/traffic_ops/testing/api/v3/types_test.go
@@ -41,7 +41,7 @@ func TestTypes(t *testing.T) {
func GetTestTypesIMSAfterChange(t *testing.T, header http.Header) {
for _, typ := range testData.Types {
- _, reqInf, err := TOSession.GetTypeByName(typ.Name, header)
+ _, reqInf, err := TOSession.GetTypeByNameWithHdr(typ.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -54,7 +54,7 @@ func GetTestTypesIMSAfterChange(t *testing.T, header http.Header) {
timeStr := currentTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, timeStr)
for _, typ := range testData.Types {
- _, reqInf, err := TOSession.GetTypeByName(typ.Name, header)
+ _, reqInf, err := TOSession.GetTypeByNameWithHdr(typ.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -73,7 +73,7 @@ func GetTestTypesIMS(t *testing.T) {
t.Log("---- GetTestTypes ----")
for _, typ := range testData.Types {
- _, reqInf, err := TOSession.GetTypeByName(typ.Name, header)
+ _, reqInf, err := TOSession.GetTypeByNameWithHdr(typ.Name, header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -99,7 +99,7 @@ func CreateTestTypes(t *testing.T) {
dbQueryTemplate := "INSERT INTO type (name, description, use_in_table) VALUES ('%v', '%v', '%v');"
for _, typ := range testData.Types {
- foundTypes, _, err := TOSession.GetTypeByName(typ.Name, nil)
+ foundTypes, _, err := TOSession.GetTypeByName(typ.Name)
if err == nil && len(foundTypes) > 0 {
t.Logf("Type %v already exists (%v match(es))", typ.Name, len(foundTypes))
continue
@@ -123,7 +123,7 @@ func UpdateTestTypes(t *testing.T) {
for i, typ := range testData.Types {
expectedTypeName := fmt.Sprintf("testType%v", i)
originalType := typ
- resp, _, err := TOSession.GetTypeByName(originalType.Name, nil)
+ resp, _, err := TOSession.GetTypeByName(originalType.Name)
if err != nil {
t.Fatalf("cannot GET Type by name: %v - %v", originalType.Name, err)
}
@@ -148,7 +148,7 @@ func UpdateTestTypes(t *testing.T) {
}
// Retrieve the Type to check Type name got updated
- resp, _, err = TOSession.GetTypeByID(remoteType.ID, nil)
+ resp, _, err = TOSession.GetTypeByID(remoteType.ID)
if err != nil {
t.Fatalf("cannot GET Type by ID: %v - %v", originalType.ID, err)
}
@@ -173,7 +173,7 @@ func GetTestTypes(t *testing.T) {
t.Log("---- GetTestTypes ----")
for _, typ := range testData.Types {
- resp, _, err := TOSession.GetTypeByName(typ.Name, nil)
+ resp, _, err := TOSession.GetTypeByName(typ.Name)
if err != nil {
t.Errorf("cannot GET Type by name: %v - %v", err, resp)
@@ -200,7 +200,7 @@ func DeleteTestTypes(t *testing.T) {
for _, typ := range testData.Types {
// Retrieve the Type by name so we can get the id for the Update
- resp, _, err := TOSession.GetTypeByName(typ.Name, nil)
+ resp, _, err := TOSession.GetTypeByName(typ.Name)
if err != nil || len(resp) == 0 {
t.Fatalf("cannot GET Type by name: %v - %v", typ.Name, err)
}
@@ -219,7 +219,7 @@ func DeleteTestTypes(t *testing.T) {
}
// Retrieve the Type to see if it got deleted
- types, _, err := TOSession.GetTypeByName(typ.Name, nil)
+ types, _, err := TOSession.GetTypeByName(typ.Name)
if err != nil {
t.Errorf("error deleting Type name: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/user_test.go b/traffic_ops/testing/api/v3/user_test.go
index ee8449d..8616d3d 100644
--- a/traffic_ops/testing/api/v3/user_test.go
+++ b/traffic_ops/testing/api/v3/user_test.go
@@ -54,7 +54,7 @@ func TestUsers(t *testing.T) {
}
func GetTestUsersIMSAfterChange(t *testing.T, header http.Header) {
- _, reqInf, err := TOSession.GetUsers(header)
+ _, reqInf, err := TOSession.GetUsersWithHdr(header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -65,7 +65,7 @@ func GetTestUsersIMSAfterChange(t *testing.T, header http.Header) {
currentTime = currentTime.Add(1 * time.Second)
timeStr := currentTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, timeStr)
- _, reqInf, err = TOSession.GetUsers(header)
+ _, reqInf, err = TOSession.GetUsersWithHdr(header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -82,7 +82,7 @@ func GetTestUsersIMS(t *testing.T) {
futureTime := time.Now().AddDate(0, 0, 1)
time := futureTime.Format(time.RFC1123)
header.Set(rfc.IfModifiedSince, time)
- _, reqInf, err := TOSession.GetUsers(header)
+ _, reqInf, err := TOSession.GetUsersWithHdr(header)
if err != nil {
t.Fatalf("Expected no error, but got %v", err.Error())
}
@@ -104,7 +104,7 @@ func CreateTestUsers(t *testing.T) {
func RolenameCapitalizationTest(t *testing.T) {
- roles, _, _, err := TOSession.GetRoles(nil)
+ roles, _, _, err := TOSession.GetRoles()
if err != nil {
t.Errorf("could not get roles: %v", err)
}
@@ -112,7 +112,7 @@ func RolenameCapitalizationTest(t *testing.T) {
t.Fatal("there should be at least one role to test the user")
}
- tenants, _, err := TOSession.Tenants(nil)
+ tenants, _, err := TOSession.Tenants()
if err != nil {
t.Errorf("could not get tenants: %v", err)
}
@@ -168,7 +168,7 @@ func OpsUpdateAdminTest(t *testing.T) {
t.Fatalf("failed to get log in with opsuser: %v", err.Error())
}
- resp, _, err := TOSession.GetUserByUsername("admin", nil)
+ resp, _, err := TOSession.GetUserByUsername("admin")
if err != nil {
t.Errorf("cannot GET user by name: 'admin', %v", err)
}
@@ -189,7 +189,7 @@ func UserRegistrationTest(t *testing.T) {
ForceDeleteTestUsers(t)
var emails []string
for _, user := range testData.Users {
- tenant, _, err := TOSession.TenantByName(*user.Tenant, nil)
+ tenant, _, err := TOSession.TenantByName(*user.Tenant)
if err != nil {
t.Fatalf("could not get tenant %v: %v", *user.Tenant, err)
}
@@ -219,7 +219,7 @@ func UserSelfUpdateTest(t *testing.T) {
t.Fatalf("failed to get log in with opsuser: %v", err.Error())
}
- resp, _, err := TOSession.GetUserByUsername("opsuser", nil)
+ resp, _, err := TOSession.GetUserByUsername("opsuser")
if err != nil {
t.Fatalf("cannot GET user by name: 'opsuser', %v\n", err)
}
@@ -242,7 +242,7 @@ func UserSelfUpdateTest(t *testing.T) {
}
// Make sure it got updated
- resp2, _, err := TOSession.GetUserByID(*user.ID, nil)
+ resp2, _, err := TOSession.GetUserByID(*user.ID)
if err != nil {
t.Fatalf("cannot GET user by id: '%d', %v\n", *user.ID, err)
}
@@ -272,7 +272,7 @@ func UserSelfUpdateTest(t *testing.T) {
}
// Make sure it got updated
- resp2, _, err = TOSession.GetUserByID(*user.ID, nil)
+ resp2, _, err = TOSession.GetUserByID(*user.ID)
if err != nil {
t.Fatalf("error getting user #%d: %v", *user.ID, err)
}
@@ -302,7 +302,7 @@ func UserSelfUpdateTest(t *testing.T) {
}
// Ensure it wasn't actually updated
- resp2, _, err = TOSession.GetUserByID(*user.ID, nil)
+ resp2, _, err = TOSession.GetUserByID(*user.ID)
if err != nil {
t.Fatalf("error getting user #%d: %v", *user.ID, err)
}
@@ -319,7 +319,7 @@ func UserSelfUpdateTest(t *testing.T) {
}
func UserUpdateOwnRoleTest(t *testing.T) {
- resp, _, err := TOSession.GetUserByUsername(SessionUserName, nil)
+ resp, _, err := TOSession.GetUserByUsername(SessionUserName)
if err != nil {
t.Errorf("cannot GET user by name: '%s', %v", SessionUserName, err)
}
@@ -334,7 +334,7 @@ func UserUpdateOwnRoleTest(t *testing.T) {
func UpdateTestUsers(t *testing.T) {
firstUsername := *testData.Users[0].Username
- resp, _, err := TOSession.GetUserByUsername(firstUsername, nil)
+ resp, _, err := TOSession.GetUserByUsername(firstUsername)
if err != nil {
t.Errorf("cannot GET user by name: '%s', %v", firstUsername, err)
}
@@ -349,7 +349,7 @@ func UpdateTestUsers(t *testing.T) {
}
// Make sure it got updated
- resp2, _, err := TOSession.GetUserByID(*user.ID, nil)
+ resp2, _, err := TOSession.GetUserByID(*user.ID)
if err != nil {
t.Errorf("cannot GET user by id: '%d', %v", *user.ID, err)
}
@@ -360,14 +360,14 @@ func UpdateTestUsers(t *testing.T) {
}
func GetTestUsers(t *testing.T) {
- _, _, err := TOSession.GetUsers(nil)
+ _, _, err := TOSession.GetUsers()
if err != nil {
t.Errorf("cannot GET users: %v", err)
}
}
func GetTestUserCurrent(t *testing.T) {
- user, _, err := TOSession.GetUserCurrent(nil)
+ user, _, err := TOSession.GetUserCurrent()
if err != nil {
t.Errorf("cannot GET current user: %v", err)
}
@@ -380,7 +380,7 @@ func GetTestUserCurrent(t *testing.T) {
}
func UserTenancyTest(t *testing.T) {
- users, _, err := TOSession.GetUsers(nil)
+ users, _, err := TOSession.GetUsers()
if err != nil {
t.Errorf("cannot GET users: %v", err)
}
@@ -412,7 +412,7 @@ func UserTenancyTest(t *testing.T) {
t.Fatalf("failed to log in with tenant4user: %v", err.Error())
}
- usersReadableByTenant4, _, err := tenant4TOClient.GetUsers(nil)
+ usersReadableByTenant4, _, err := tenant4TOClient.GetUsers()
if err != nil {
t.Error("tenant4user cannot GET users")
}
@@ -438,7 +438,7 @@ func UserTenancyTest(t *testing.T) {
}
// assert that tenant4user cannot create a user outside of its tenant
- rootTenant, _, err := TOSession.TenantByName("root", nil)
+ rootTenant, _, err := TOSession.TenantByName("root")
if err != nil {
t.Error("expected to be able to GET the root tenant")
}
@@ -485,7 +485,7 @@ func ForceDeleteTestUsers(t *testing.T) {
func DeleteTestUsers(t *testing.T) {
for _, user := range testData.Users {
- resp, _, err := TOSession.GetUserByUsername(*user.Username, nil)
+ resp, _, err := TOSession.GetUserByUsername(*user.Username)
if err != nil {
t.Errorf("cannot GET user by name: %v - %v", *user.Username, err)
}
@@ -499,7 +499,7 @@ func DeleteTestUsers(t *testing.T) {
}
// Make sure it got deleted
- resp, _, err := TOSession.GetUserByUsername(*user.Username, nil)
+ resp, _, err := TOSession.GetUserByUsername(*user.Username)
if err != nil {
t.Errorf("error deleting user by name: %s", err.Error())
}
diff --git a/traffic_ops/v3-client/cachegroup.go b/traffic_ops/v3-client/cachegroup.go
index 260ffa6..08f3f2a 100644
--- a/traffic_ops/v3-client/cachegroup.go
+++ b/traffic_ops/v3-client/cachegroup.go
@@ -35,7 +35,7 @@ const (
// Create a CacheGroup.
func (to *Session) CreateCacheGroupNullable(cachegroup tc.CacheGroupNullable) (*tc.CacheGroupDetailResponse, ReqInf, error) {
if cachegroup.TypeID == nil && cachegroup.Type != nil {
- ty, _, err := to.GetTypeByName(*cachegroup.Type, nil)
+ ty, _, err := to.GetTypeByName(*cachegroup.Type)
if err != nil {
return nil, ReqInf{}, err
}
@@ -46,7 +46,7 @@ func (to *Session) CreateCacheGroupNullable(cachegroup tc.CacheGroupNullable) (*
}
if cachegroup.ParentCachegroupID == nil && cachegroup.ParentName != nil {
- p, _, err := to.GetCacheGroupNullableByName(*cachegroup.ParentName, nil)
+ p, _, err := to.GetCacheGroupNullableByName(*cachegroup.ParentName)
if err != nil {
return nil, ReqInf{}, err
}
@@ -57,7 +57,7 @@ func (to *Session) CreateCacheGroupNullable(cachegroup tc.CacheGroupNullable) (*
}
if cachegroup.SecondaryParentCachegroupID == nil && cachegroup.SecondaryParentName != nil {
- p, _, err := to.GetCacheGroupNullableByName(*cachegroup.SecondaryParentName, nil)
+ p, _, err := to.GetCacheGroupNullableByName(*cachegroup.SecondaryParentName)
if err != nil {
return nil, ReqInf{}, err
}
@@ -109,8 +109,7 @@ func (to *Session) UpdateCacheGroupNullableByID(id int, cachegroup tc.CacheGroup
return &cachegroupResp, reqInf, nil
}
-// Returns a list of CacheGroups.
-func (to *Session) GetCacheGroupsNullable(header http.Header) ([]tc.CacheGroupNullable, ReqInf, error) {
+func (to *Session) GetCacheGroupsNullableWithHdr(header http.Header) ([]tc.CacheGroupNullable, ReqInf, error) {
resp, remoteAddr, err := to.request(http.MethodGet, API_CACHEGROUPS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
@@ -125,8 +124,13 @@ func (to *Session) GetCacheGroupsNullable(header http.Header) ([]tc.CacheGroupNu
return data.Response, reqInf, nil
}
-// GET a CacheGroup by the CacheGroup ID.
-func (to *Session) GetCacheGroupNullableByID(id int, header http.Header) ([]tc.CacheGroupNullable, ReqInf, error) {
+// Returns a list of CacheGroups.
+// Deprecated: GetCacheGroupsNullable will be removed in 6.0. Use GetCacheGroupsNullableWithHdr.
+func (to *Session) GetCacheGroupsNullable() ([]tc.CacheGroupNullable, ReqInf, error) {
+ return to.GetCacheGroupsNullableWithHdr(nil)
+}
+
+func (to *Session) GetCacheGroupNullableByIDWithHdr(id int, header http.Header) ([]tc.CacheGroupNullable, ReqInf, error) {
route := fmt.Sprintf("%s?id=%v", API_CACHEGROUPS, id)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -143,8 +147,13 @@ func (to *Session) GetCacheGroupNullableByID(id int, header http.Header) ([]tc.C
return data.Response, reqInf, nil
}
-// GET a CacheGroup by the CacheGroup name.
-func (to *Session) GetCacheGroupNullableByName(name string, header http.Header) ([]tc.CacheGroupNullable, ReqInf, error) {
+// GET a CacheGroup by the CacheGroup ID.
+// Deprecated: GetCacheGroupNullableByID will be removed in 6.0. Use GetCacheGroupNullableByIDWithHdr.
+func (to *Session) GetCacheGroupNullableByID(id int) ([]tc.CacheGroupNullable, ReqInf, error) {
+ return to.GetCacheGroupNullableByIDWithHdr(id, nil)
+}
+
+func (to *Session) GetCacheGroupNullableByNameWithHdr(name string, header http.Header) ([]tc.CacheGroupNullable, ReqInf, error) {
route := fmt.Sprintf("%s?name=%s", API_CACHEGROUPS, url.QueryEscape(name))
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -167,8 +176,13 @@ func (to *Session) GetCacheGroupNullableByName(name string, header http.Header)
return data.Response, reqInf, nil
}
-// GET a CacheGroup by the CacheGroup short name.
-func (to *Session) GetCacheGroupNullableByShortName(shortName string, header http.Header) ([]tc.CacheGroupNullable, ReqInf, error) {
+// GET a CacheGroup by the CacheGroup name.
+// Deprecated: GetCacheGroupNullableByName will be removed in 6.0. Use GetCacheGroupNullableByNameWithHdr.
+func (to *Session) GetCacheGroupNullableByName(name string) ([]tc.CacheGroupNullable, ReqInf, error) {
+ return to.GetCacheGroupNullableByNameWithHdr(name, nil)
+}
+
+func (to *Session) GetCacheGroupNullableByShortNameWithHdr(shortName string, header http.Header) ([]tc.CacheGroupNullable, ReqInf, error) {
route := fmt.Sprintf("%s?shortName=%s", API_CACHEGROUPS, url.QueryEscape(shortName))
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -191,6 +205,12 @@ func (to *Session) GetCacheGroupNullableByShortName(shortName string, header htt
return data.Response, reqInf, nil
}
+// GET a CacheGroup by the CacheGroup short name.
+// Deprecated: GetCacheGroupNullableByShortName will be removed in 6.0. Use GetCacheGroupNullableByShortNameWithHdr.
+func (to *Session) GetCacheGroupNullableByShortName(shortName string) ([]tc.CacheGroupNullable, ReqInf, error) {
+ return to.GetCacheGroupNullableByShortNameWithHdr(shortName, nil)
+}
+
// DELETE a CacheGroup by ID.
func (to *Session) DeleteCacheGroupByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d", API_CACHEGROUPS, id)
@@ -208,7 +228,12 @@ func (to *Session) DeleteCacheGroupByID(id int) (tc.Alerts, ReqInf, error) {
}
// GetCacheGroupsByQueryParams gets cache groups by the given query parameters.
-func (to *Session) GetCacheGroupsByQueryParams(qparams url.Values, header http.Header) ([]tc.CacheGroupNullable, ReqInf, error) {
+// Deprecated: GetCacheGroupsByQueryParams will be removed in 6.0. Use GetCacheGroupsByQueryParamsWithHdr.
+func (to *Session) GetCacheGroupsByQueryParams(qparams url.Values) ([]tc.CacheGroupNullable, ReqInf, error) {
+ return to.GetCacheGroupsByQueryParamsWithHdr(qparams, nil)
+}
+
+func (to *Session) GetCacheGroupsByQueryParamsWithHdr(qparams url.Values, header http.Header) ([]tc.CacheGroupNullable, ReqInf, error) {
route := API_CACHEGROUPS
if len(qparams) > 0 {
route += "?" + qparams.Encode()
diff --git a/traffic_ops/v3-client/cachegroup_parameters.go b/traffic_ops/v3-client/cachegroup_parameters.go
index fe26fa7..dd970f1 100644
--- a/traffic_ops/v3-client/cachegroup_parameters.go
+++ b/traffic_ops/v3-client/cachegroup_parameters.go
@@ -27,18 +27,28 @@ const (
API_CACHEGROUPPARAMETERS = apiBase + "/cachegroupparameters"
)
-// GetCacheGroupParameters Gets a Cache Group's Parameters
-func (to *Session) GetCacheGroupParameters(cacheGroupID int, header http.Header) ([]tc.CacheGroupParameter, ReqInf, error) {
+func (to *Session) GetCacheGroupParametersWithHdr(cacheGroupID int, header http.Header) ([]tc.CacheGroupParameter, ReqInf, error) {
route := fmt.Sprintf("%s/%d/parameters", API_CACHEGROUPS, cacheGroupID)
return to.getCacheGroupParameters(route, "", header)
}
-// GetCacheGroupParametersByQueryParams Gets a Cache Group's Parameters with query parameters
-func (to *Session) GetCacheGroupParametersByQueryParams(cacheGroupID int, queryParams string, header http.Header) ([]tc.CacheGroupParameter, ReqInf, error) {
+// GetCacheGroupParameters Gets a Cache Group's Parameters
+// Deprecated: GetCacheGroupParameters will be removed in 6.0. Use GetCacheGroupParametersWithHdr.
+func (to *Session) GetCacheGroupParameters(cacheGroupID int) ([]tc.CacheGroupParameter, ReqInf, error) {
+ return to.GetCacheGroupParametersWithHdr(cacheGroupID, nil)
+}
+
+func (to *Session) GetCacheGroupParametersByQueryParamsWithHdr(cacheGroupID int, queryParams string, header http.Header) ([]tc.CacheGroupParameter, ReqInf, error) {
route := fmt.Sprintf("%s/%d/parameters", API_CACHEGROUPS, cacheGroupID)
return to.getCacheGroupParameters(route, queryParams, header)
}
+// GetCacheGroupParametersByQueryParams Gets a Cache Group's Parameters with query parameters
+// Deprecated: GetCacheGroupParametersByQueryParams will be removed in 6.0. Use GetCacheGroupParametersByQueryParamsWithHdr.
+func (to *Session) GetCacheGroupParametersByQueryParams(cacheGroupID int, queryParams string) ([]tc.CacheGroupParameter, ReqInf, error) {
+ return to.GetCacheGroupParametersByQueryParamsWithHdr(cacheGroupID, queryParams, nil)
+}
+
func (to *Session) getCacheGroupParameters(route, queryParams string, header http.Header) ([]tc.CacheGroupParameter, ReqInf, error) {
r := fmt.Sprintf("%s%s", route, queryParams)
resp, remoteAddr, err := to.request(http.MethodGet, r, nil, header)
@@ -61,8 +71,7 @@ func (to *Session) getCacheGroupParameters(route, queryParams string, header htt
return data.Response, reqInf, nil
}
-// GetAllCacheGroupParameters Gets all Cachegroup Parameter associations
-func (to *Session) GetAllCacheGroupParameters(header http.Header) ([]tc.CacheGroupParametersResponseNullable, ReqInf, error) {
+func (to *Session) GetAllCacheGroupParametersWithHdr(header http.Header) ([]tc.CacheGroupParametersResponseNullable, ReqInf, error) {
route := fmt.Sprintf("%s/", API_CACHEGROUPPARAMETERS)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -78,6 +87,12 @@ func (to *Session) GetAllCacheGroupParameters(header http.Header) ([]tc.CacheGro
return data.Response.CacheGroupParameters, reqInf, nil
}
+// GetAllCacheGroupParameters Gets all Cachegroup Parameter associations
+// Deprecated: GetAllCacheGroupParameters will be removed in 6.0. Use GetAllCacheGroupParametersWithHdr.
+func (to *Session) GetAllCacheGroupParameters() ([]tc.CacheGroupParametersResponseNullable, ReqInf, error) {
+ return to.GetAllCacheGroupParametersWithHdr(nil)
+}
+
// DeleteCacheGroupParameter Deassociates a Parameter with a Cache Group
func (to *Session) DeleteCacheGroupParameter(cacheGroupID, parameterID int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d/%d", API_CACHEGROUPPARAMETERS, cacheGroupID, parameterID)
diff --git a/traffic_ops/v3-client/capability.go b/traffic_ops/v3-client/capability.go
index 04f37ef..0bd6070 100644
--- a/traffic_ops/v3-client/capability.go
+++ b/traffic_ops/v3-client/capability.go
@@ -23,8 +23,7 @@ import "github.com/apache/trafficcontrol/lib/go-tc"
const API_CAPABILITIES = apiBase + "/capabilities"
-// GetCapabilities retrieves all capabilities.
-func (to *Session) GetCapabilities(header http.Header) ([]tc.Capability, ReqInf, error) {
+func (to *Session) GetCapabilitiesWithHdr(header http.Header) ([]tc.Capability, ReqInf, error) {
resp, remoteAddr, err := to.request(http.MethodGet, API_CAPABILITIES, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
@@ -43,8 +42,13 @@ func (to *Session) GetCapabilities(header http.Header) ([]tc.Capability, ReqInf,
return data.Response, reqInf, err
}
-// GetCapability retrieves only the capability named 'c'.
-func (to *Session) GetCapability(c string, header http.Header) (tc.Capability, ReqInf, error) {
+// GetCapabilities retrieves all capabilities.
+// Deprecated: GetCapabilities will be removed in 6.0. Use GetCapabilitiesWithHdr.
+func (to *Session) GetCapabilities() ([]tc.Capability, ReqInf, error) {
+ return to.GetCapabilitiesWithHdr(nil)
+}
+
+func (to *Session) GetCapabilityWithHdr(c string, header http.Header) (tc.Capability, ReqInf, error) {
v := url.Values{}
v.Add("name", c)
endpoint := API_CAPABILITIES + "?" + v.Encode()
@@ -71,3 +75,9 @@ func (to *Session) GetCapability(c string, header http.Header) (tc.Capability, R
return data.Response[0], reqInf, nil
}
+
+// GetCapability retrieves only the capability named 'c'.
+// Deprecated: GetCapability will be removed in 6.0. Use GetCapabilityWithHdr.
+func (to *Session) GetCapability(c string) (tc.Capability, ReqInf, error) {
+ return to.GetCapabilityWithHdr(c, nil)
+}
diff --git a/traffic_ops/v3-client/cdn.go b/traffic_ops/v3-client/cdn.go
index ede4b3f..a60036f 100644
--- a/traffic_ops/v3-client/cdn.go
+++ b/traffic_ops/v3-client/cdn.go
@@ -68,8 +68,7 @@ func (to *Session) UpdateCDNByID(id int, cdn tc.CDN) (tc.Alerts, ReqInf, error)
return alerts, reqInf, nil
}
-// GetCDNs eturns a list of CDNs.
-func (to *Session) GetCDNs(header http.Header) ([]tc.CDN, ReqInf, error) {
+func (to *Session) GetCDNsWithHdr(header http.Header) ([]tc.CDN, ReqInf, error) {
resp, remoteAddr, err := to.request(http.MethodGet, API_CDNS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
@@ -88,8 +87,13 @@ func (to *Session) GetCDNs(header http.Header) ([]tc.CDN, ReqInf, error) {
return data.Response, reqInf, nil
}
-// GetCDNByID a CDN by the CDN ID.
-func (to *Session) GetCDNByID(id int, header http.Header) ([]tc.CDN, ReqInf, error) {
+// GetCDNs eturns a list of CDNs.
+// Deprecated: GetCDNs will be removed in 6.0. Use GetCDNsWithHdr.
+func (to *Session) GetCDNs() ([]tc.CDN, ReqInf, error) {
+ return to.GetCDNsWithHdr(nil)
+}
+
+func (to *Session) GetCDNByIDWithHdr(id int, header http.Header) ([]tc.CDN, ReqInf, error) {
route := fmt.Sprintf("%s?id=%v", API_CDNS, id)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -112,8 +116,13 @@ func (to *Session) GetCDNByID(id int, header http.Header) ([]tc.CDN, ReqInf, err
return data.Response, reqInf, nil
}
-// GetCDNByName gets a CDN by the CDN name.
-func (to *Session) GetCDNByName(name string, header http.Header) ([]tc.CDN, ReqInf, error) {
+// GetCDNByID a CDN by the CDN ID.
+// Deprecated: GetCDNByID will be removed in 6.0. Use GetCDNByIDWithHdr.
+func (to *Session) GetCDNByID(id int) ([]tc.CDN, ReqInf, error) {
+ return to.GetCDNByIDWithHdr(id, nil)
+}
+
+func (to *Session) GetCDNByNameWithHdr(name string, header http.Header) ([]tc.CDN, ReqInf, error) {
url := fmt.Sprintf("%s?name=%s", API_CDNS, url.QueryEscape(name))
resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -136,6 +145,12 @@ func (to *Session) GetCDNByName(name string, header http.Header) ([]tc.CDN, ReqI
return data.Response, reqInf, nil
}
+// GetCDNByName gets a CDN by the CDN name.
+// Deprecated: GetCDNByName will be removed in 6.0. Use GetCDNByNameWithHdr.
+func (to *Session) GetCDNByName(name string) ([]tc.CDN, ReqInf, error) {
+ return to.GetCDNByNameWithHdr(name, nil)
+}
+
// DeleteCDNByID deletes a CDN by ID.
func (to *Session) DeleteCDNByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d", API_CDNS, id)
@@ -150,7 +165,7 @@ func (to *Session) DeleteCDNByID(id int) (tc.Alerts, ReqInf, error) {
return alerts, reqInf, nil
}
-func (to *Session) GetCDNSSLKeys(name string, header http.Header) ([]tc.CDNSSLKeys, ReqInf, error) {
+func (to *Session) GetCDNSSLKeysWithHdr(name string, header http.Header) ([]tc.CDNSSLKeys, ReqInf, error) {
url := fmt.Sprintf("%s/name/%s/sslkeys", API_CDNS, name)
resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -172,3 +187,8 @@ func (to *Session) GetCDNSSLKeys(name string, header http.Header) ([]tc.CDNSSLKe
return data.Response, reqInf, nil
}
+
+// Deprecated: GetCDNSSLKeys will be removed in 6.0. Use GetCDNSSLKeysWithHdr.
+func (to *Session) GetCDNSSLKeys(name string) ([]tc.CDNSSLKeys, ReqInf, error) {
+ return to.GetCDNSSLKeysWithHdr(name, nil)
+}
diff --git a/traffic_ops/v3-client/cdn_domains.go b/traffic_ops/v3-client/cdn_domains.go
index a3f84bc..e1c66ac 100644
--- a/traffic_ops/v3-client/cdn_domains.go
+++ b/traffic_ops/v3-client/cdn_domains.go
@@ -20,7 +20,7 @@ import (
limitations under the License.
*/
-func (to *Session) GetDomains(header http.Header) ([]tc.Domain, ReqInf, error) {
+func (to *Session) GetDomainsWithHdr(header http.Header) ([]tc.Domain, ReqInf, error) {
var data tc.DomainsResponse
inf, err := get(to, apiBase+"/cdns/domains", &data, header)
if err != nil {
@@ -28,3 +28,8 @@ func (to *Session) GetDomains(header http.Header) ([]tc.Domain, ReqInf, error) {
}
return data.Response, inf, nil
}
+
+// Deprecated: GetDomains will be removed in 6.0. Use GetDomainsWithHdr.
+func (to *Session) GetDomains() ([]tc.Domain, ReqInf, error) {
+ return to.GetDomainsWithHdr(nil)
+}
diff --git a/traffic_ops/v3-client/cdnfederations.go b/traffic_ops/v3-client/cdnfederations.go
index e276e02..12dd46c 100644
--- a/traffic_ops/v3-client/cdnfederations.go
+++ b/traffic_ops/v3-client/cdnfederations.go
@@ -40,20 +40,30 @@ func (to *Session) CreateCDNFederationByName(f tc.CDNFederation, CDNName string)
return &data, inf, err
}
-func (to *Session) GetCDNFederationsByName(CDNName string, header http.Header) (*tc.CDNFederationResponse, ReqInf, error) {
+func (to *Session) GetCDNFederationsByNameWithHdr(CDNName string, header http.Header) (*tc.CDNFederationResponse, ReqInf, error) {
data := tc.CDNFederationResponse{}
url := fmt.Sprintf("%s/cdns/%s/federations", apiBase, CDNName)
inf, err := get(to, url, &data, header)
return &data, inf, err
}
-func (to *Session) GetCDNFederationsByID(CDNName string, ID int, header http.Header) (*tc.CDNFederationResponse, ReqInf, error) {
+// Deprecated: GetCDNFederationsByName will be removed in 6.0. Use GetCDNFederationsByNameWithHdr.
+func (to *Session) GetCDNFederationsByName(CDNName string) (*tc.CDNFederationResponse, ReqInf, error) {
+ return to.GetCDNFederationsByNameWithHdr(CDNName, nil)
+}
+
+func (to *Session) GetCDNFederationsByIDWithHdr(CDNName string, ID int, header http.Header) (*tc.CDNFederationResponse, ReqInf, error) {
data := tc.CDNFederationResponse{}
url := fmt.Sprintf("%s/cdns/%s/federations?id=%v", apiBase, CDNName, ID)
inf, err := get(to, url, &data, header)
return &data, inf, err
}
+// Deprecated: GetCDNFederationsByID will be removed in 6.0. Use GetCDNFederationsByIDWithHdr.
+func (to *Session) GetCDNFederationsByID(CDNName string, ID int) (*tc.CDNFederationResponse, ReqInf, error) {
+ return to.GetCDNFederationsByIDWithHdr(CDNName, ID, nil)
+}
+
func (to *Session) UpdateCDNFederationsByID(f tc.CDNFederation, CDNName string, ID int) (*tc.UpdateCDNFederationResponse, ReqInf, error) {
jsonReq, err := json.Marshal(f)
if err != nil { //There is no remoteAddr for ReqInf at this point
diff --git a/traffic_ops/v3-client/coordinate.go b/traffic_ops/v3-client/coordinate.go
index 2e65988..dd47316 100644
--- a/traffic_ops/v3-client/coordinate.go
+++ b/traffic_ops/v3-client/coordinate.go
@@ -67,8 +67,7 @@ func (to *Session) UpdateCoordinateByID(id int, coordinate tc.Coordinate) (tc.Al
return alerts, reqInf, nil
}
-// Returns a list of Coordinates
-func (to *Session) GetCoordinates(header http.Header) ([]tc.Coordinate, ReqInf, error) {
+func (to *Session) GetCoordinatesWithHdr(header http.Header) ([]tc.Coordinate, ReqInf, error) {
resp, remoteAddr, err := to.request(http.MethodGet, API_COORDINATES, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
@@ -87,8 +86,13 @@ func (to *Session) GetCoordinates(header http.Header) ([]tc.Coordinate, ReqInf,
return data.Response, reqInf, nil
}
-// GET a Coordinate by the Coordinate id
-func (to *Session) GetCoordinateByID(id int, header http.Header) ([]tc.Coordinate, ReqInf, error) {
+// Returns a list of Coordinates
+// Deprecated: GetCoordinates will be removed in 6.0. Use GetCoordinatesWithHdr.
+func (to *Session) GetCoordinates() ([]tc.Coordinate, ReqInf, error) {
+ return to.GetCoordinatesWithHdr(nil)
+}
+
+func (to *Session) GetCoordinateByIDWithHdr(id int, header http.Header) ([]tc.Coordinate, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_COORDINATES, id)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -111,8 +115,19 @@ func (to *Session) GetCoordinateByID(id int, header http.Header) ([]tc.Coordinat
return data.Response, reqInf, nil
}
+// GET a Coordinate by the Coordinate id
+// Deprecated: GetCoordinateByID will be removed in 6.0. Use GetCoordinateByIDWithHdr.
+func (to *Session) GetCoordinateByID(id int) ([]tc.Coordinate, ReqInf, error) {
+ return to.GetCoordinateByIDWithHdr(id, nil)
+}
+
// GET a Coordinate by the Coordinate name
-func (to *Session) GetCoordinateByName(name string, header http.Header) ([]tc.Coordinate, ReqInf, error) {
+// Deprecated: GetCoordinateByName will be removed in 6.0. Use GetCoordinateByNameWithHdr.
+func (to *Session) GetCoordinateByName(name string) ([]tc.Coordinate, ReqInf, error) {
+ return to.GetCoordinateByNameWithHdr(name, nil)
+}
+
+func (to *Session) GetCoordinateByNameWithHdr(name string, header http.Header) ([]tc.Coordinate, ReqInf, error) {
url := fmt.Sprintf("%s?name=%s", API_COORDINATES, name)
resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
diff --git a/traffic_ops/v3-client/deliveryservice.go b/traffic_ops/v3-client/deliveryservice.go
index 1e1cec5..86a499e 100644
--- a/traffic_ops/v3-client/deliveryservice.go
+++ b/traffic_ops/v3-client/deliveryservice.go
@@ -112,12 +112,9 @@ const (
API_DELIVERY_SERVICES_SERVERS = apiBase + "/deliveryservices/%s/servers"
)
-// GetDeliveryServicesByServerV30 returns all of the (tenant-visible) Delivery
-// Services to which the server identified by the integral, unique identifier
-// 'id' is assigned.
-func (to *Session) GetDeliveryServicesByServerV30(id int) ([]tc.DeliveryServiceNullableV30, ReqInf, error) {
+func (to *Session) GetDeliveryServicesByServerV30WithHdr(id int, header http.Header) ([]tc.DeliveryServiceNullableV30, ReqInf, error) {
var data tc.DeliveryServicesResponseV30
- reqInf, err := get(to, fmt.Sprintf(API_SERVER_DELIVERY_SERVICES, id), &data, nil)
+ reqInf, err := get(to, fmt.Sprintf(API_SERVER_DELIVERY_SERVICES, id), &data, header)
return data.Response, reqInf, err
}
@@ -128,11 +125,15 @@ func (to *Session) GetDeliveryServicesByServerV30(id int) ([]tc.DeliveryServiceN
//
// Deprecated: Please used versioned library imports in the future, and
// versioned methods, specifically, for API v3.0 - in this case,
-// GetDeliveryServicesByServerV30.
+// GetDeliveryServicesByServerV30WithHdr.
func (to *Session) GetDeliveryServicesByServer(id int) ([]tc.DeliveryServiceNullable, ReqInf, error) {
+ return to.GetDeliveryServicesByServerWithHdr(id, nil)
+}
+
+func (to *Session) GetDeliveryServicesByServerWithHdr(id int, header http.Header) ([]tc.DeliveryServiceNullable, ReqInf, error) {
var data tc.DeliveryServicesNullableResponse
- reqInf, err := get(to, fmt.Sprintf(API_SERVER_DELIVERY_SERVICES, id), &data, nil)
+ reqInf, err := get(to, fmt.Sprintf(API_SERVER_DELIVERY_SERVICES, id), &data, header)
if err != nil {
return nil, reqInf, err
}
@@ -140,10 +141,10 @@ func (to *Session) GetDeliveryServicesByServer(id int) ([]tc.DeliveryServiceNull
return data.Response, reqInf, nil
}
-// GetDeliveryServicesV30 returns all (tenant-visible) Delivery Services that
+// GetDeliveryServicesV30WithHdr returns all (tenant-visible) Delivery Services that
// satisfy the passed query string parameters. See the API documentation for
// information on the available parameters.
-func (to *Session) GetDeliveryServicesV30(header http.Header, params url.Values) ([]tc.DeliveryServiceNullableV30, ReqInf, error) {
+func (to *Session) GetDeliveryServicesV30WithHdr(header http.Header, params url.Values) ([]tc.DeliveryServiceNullableV30, ReqInf, error) {
uri := API_DELIVERY_SERVICES
if params != nil {
uri += "?" + params.Encode()
@@ -155,14 +156,7 @@ func (to *Session) GetDeliveryServicesV30(header http.Header, params url.Values)
return data.Response, reqInf, err
}
-// GetDeliveryServicesNullable returns a slice of Delivery Services.
-//
-// Warning: This method coerces its returned data into an APIv1.5 format.
-//
-// Deprecated: Please used versioned library imports in the future, and
-// versioned methods, specifically, for API v3.0 - in this case,
-// GetDeliveryServicesV30.
-func (to *Session) GetDeliveryServicesNullable(header http.Header) ([]tc.DeliveryServiceNullable, ReqInf, error) {
+func (to *Session) GetDeliveryServicesNullableWithHdr(header http.Header) ([]tc.DeliveryServiceNullable, ReqInf, error) {
data := struct {
Response []tc.DeliveryServiceNullable `json:"response"`
}{}
@@ -173,15 +167,18 @@ func (to *Session) GetDeliveryServicesNullable(header http.Header) ([]tc.Deliver
return data.Response, reqInf, nil
}
-// GetDeliveryServicesByCDNID returns the (tenant-visible) Delivery Services within the CDN identified
-// by the integral, unique identifier 'cdnID'.
+// GetDeliveryServicesNullable returns a slice of Delivery Services.
//
// Warning: This method coerces its returned data into an APIv1.5 format.
//
// Deprecated: Please used versioned library imports in the future, and
// versioned methods, specifically, for API v3.0 - in this case,
-// GetDeliveryServicesV30.
-func (to *Session) GetDeliveryServicesByCDNID(cdnID int, header http.Header) ([]tc.DeliveryServiceNullable, ReqInf, error) {
+// GetDeliveryServicesV30WithHdr.
+func (to *Session) GetDeliveryServicesNullable() ([]tc.DeliveryServiceNullable, ReqInf, error) {
+ return to.GetDeliveryServicesNullableWithHdr(nil)
+}
+
+func (to *Session) GetDeliveryServicesByCDNIDWithHdr(cdnID int, header http.Header) ([]tc.DeliveryServiceNullable, ReqInf, error) {
data := struct {
Response []tc.DeliveryServiceNullable `json:"response"`
}{}
@@ -192,15 +189,19 @@ func (to *Session) GetDeliveryServicesByCDNID(cdnID int, header http.Header) ([]
return data.Response, reqInf, nil
}
-// GetDeliveryServiceNullable returns the Delivery Service identified by the integral, unique identifier
-// 'id' (which must be passed as a string).
+// GetDeliveryServicesByCDNID returns the (tenant-visible) Delivery Services within the CDN identified
+// by the integral, unique identifier 'cdnID'.
//
// Warning: This method coerces its returned data into an APIv1.5 format.
//
// Deprecated: Please used versioned library imports in the future, and
// versioned methods, specifically, for API v3.0 - in this case,
-// GetDeliveryServicesV30.
-func (to *Session) GetDeliveryServiceNullable(id string, header http.Header) (*tc.DeliveryServiceNullable, ReqInf, error) {
+// GetDeliveryServicesV30WithHdr.
+func (to *Session) GetDeliveryServicesByCDNID(cdnID int) ([]tc.DeliveryServiceNullable, ReqInf, error) {
+ return to.GetDeliveryServicesByCDNIDWithHdr(cdnID, nil)
+}
+
+func (to *Session) GetDeliveryServiceNullableWithHdr(id string, header http.Header) (*tc.DeliveryServiceNullable, ReqInf, error) {
data := struct {
Response []tc.DeliveryServiceNullable `json:"response"`
}{}
@@ -214,16 +215,19 @@ func (to *Session) GetDeliveryServiceNullable(id string, header http.Header) (*t
return &data.Response[0], reqInf, nil
}
-// GetDeliveryServiceByXMLIDNullable returns the Delivery Service identified by the passed XMLID.
-// The length of the returned slice should always be 1 when the request is succesful - if it isn't
-// something very wicked has happened to Traffic Ops.
+// GetDeliveryServiceNullable returns the Delivery Service identified by the integral, unique identifier
+// 'id' (which must be passed as a string).
//
// Warning: This method coerces its returned data into an APIv1.5 format.
//
// Deprecated: Please used versioned library imports in the future, and
// versioned methods, specifically, for API v3.0 - in this case,
-// GetDeliveryServicesV30.
-func (to *Session) GetDeliveryServiceByXMLIDNullable(XMLID string, header http.Header) ([]tc.DeliveryServiceNullable, ReqInf, error) {
+// GetDeliveryServicesV30WithHdr.
+func (to *Session) GetDeliveryServiceNullable(id string) (*tc.DeliveryServiceNullable, ReqInf, error) {
+ return to.GetDeliveryServiceNullableWithHdr(id, nil)
+}
+
+func (to *Session) GetDeliveryServiceByXMLIDNullableWithHdr(XMLID string, header http.Header) ([]tc.DeliveryServiceNullable, ReqInf, error) {
var data tc.DeliveryServicesNullableResponse
reqInf, err := get(to, API_DELIVERY_SERVICES+"?xmlId="+XMLID, &data, header)
if err != nil {
@@ -233,11 +237,24 @@ func (to *Session) GetDeliveryServiceByXMLIDNullable(XMLID string, header http.H
return data.Response, reqInf, nil
}
+// GetDeliveryServiceByXMLIDNullable returns the Delivery Service identified by the passed XMLID.
+// The length of the returned slice should always be 1 when the request is succesful - if it isn't
+// something very wicked has happened to Traffic Ops.
+//
+// Warning: This method coerces its returned data into an APIv1.5 format.
+//
+// Deprecated: Please used versioned library imports in the future, and
+// versioned methods, specifically, for API v3.0 - in this case,
+// GetDeliveryServicesV30WithHdr.
+func (to *Session) GetDeliveryServiceByXMLIDNullable(XMLID string) ([]tc.DeliveryServiceNullable, ReqInf, error) {
+ return to.GetDeliveryServiceByXMLIDNullableWithHdr(XMLID, nil)
+}
+
// CreateDeliveryServiceV30 creates the Delivery Service it's passed.
func (to *Session) CreateDeliveryServiceV30(ds tc.DeliveryServiceNullableV30) (tc.DeliveryServiceNullableV30, ReqInf, error) {
var reqInf ReqInf
if ds.TypeID == nil && ds.Type != nil {
- ty, _, err := to.GetTypeByName(ds.Type.String(), nil)
+ ty, _, err := to.GetTypeByName(ds.Type.String())
if err != nil {
return tc.DeliveryServiceNullableV30{}, reqInf, err
}
@@ -248,7 +265,7 @@ func (to *Session) CreateDeliveryServiceV30(ds tc.DeliveryServiceNullableV30) (t
}
if ds.CDNID == nil && ds.CDNName != nil {
- cdns, _, err := to.GetCDNByName(*ds.CDNName, nil)
+ cdns, _, err := to.GetCDNByName(*ds.CDNName)
if err != nil {
return tc.DeliveryServiceNullableV30{}, reqInf, err
}
@@ -259,7 +276,7 @@ func (to *Session) CreateDeliveryServiceV30(ds tc.DeliveryServiceNullableV30) (t
}
if ds.ProfileID == nil && ds.ProfileName != nil {
- profiles, _, err := to.GetProfileByName(*ds.ProfileName, nil)
+ profiles, _, err := to.GetProfileByName(*ds.ProfileName)
if err != nil {
return tc.DeliveryServiceNullableV30{}, reqInf, err
}
@@ -270,7 +287,7 @@ func (to *Session) CreateDeliveryServiceV30(ds tc.DeliveryServiceNullableV30) (t
}
if ds.TenantID == nil && ds.Tenant != nil {
- ten, _, err := to.TenantByName(*ds.Tenant, nil)
+ ten, _, err := to.TenantByName(*ds.Tenant)
if err != nil {
return tc.DeliveryServiceNullableV30{}, reqInf, err
}
@@ -304,7 +321,7 @@ func (to *Session) CreateDeliveryServiceV30(ds tc.DeliveryServiceNullableV30) (t
// CreateDeliveryServiceV30.
func (to *Session) CreateDeliveryServiceNullable(ds *tc.DeliveryServiceNullable) (*tc.CreateDeliveryServiceNullableResponse, error) {
if ds.TypeID == nil && ds.Type != nil {
- ty, _, err := to.GetTypeByName(ds.Type.String(), nil)
+ ty, _, err := to.GetTypeByName(ds.Type.String())
if err != nil {
return nil, err
}
@@ -315,7 +332,7 @@ func (to *Session) CreateDeliveryServiceNullable(ds *tc.DeliveryServiceNullable)
}
if ds.CDNID == nil && ds.CDNName != nil {
- cdns, _, err := to.GetCDNByName(*ds.CDNName, nil)
+ cdns, _, err := to.GetCDNByName(*ds.CDNName)
if err != nil {
return nil, err
}
@@ -326,7 +343,7 @@ func (to *Session) CreateDeliveryServiceNullable(ds *tc.DeliveryServiceNullable)
}
if ds.ProfileID == nil && ds.ProfileName != nil {
- profiles, _, err := to.GetProfileByName(*ds.ProfileName, nil)
+ profiles, _, err := to.GetProfileByName(*ds.ProfileName)
if err != nil {
return nil, err
}
@@ -337,7 +354,7 @@ func (to *Session) CreateDeliveryServiceNullable(ds *tc.DeliveryServiceNullable)
}
if ds.TenantID == nil && ds.Tenant != nil {
- ten, _, err := to.TenantByName(*ds.Tenant, nil)
+ ten, _, err := to.TenantByName(*ds.Tenant)
if err != nil {
return nil, err
}
@@ -412,9 +429,7 @@ func (to *Session) DeleteDeliveryService(id string) (*tc.DeleteDeliveryServiceRe
return &data, nil
}
-// GetDeliveryServiceHealth gets the 'health' of the Delivery Service identified by the
-// integral, unique identifier 'id' (which must be passed as a string).
-func (to *Session) GetDeliveryServiceHealth(id string, header http.Header) (*tc.DeliveryServiceHealth, ReqInf, error) {
+func (to *Session) GetDeliveryServiceHealthWithHdr(id string, header http.Header) (*tc.DeliveryServiceHealth, ReqInf, error) {
var data tc.DeliveryServiceHealthResponse
reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICE_HEALTH, id), &data, nil)
if err != nil {
@@ -424,9 +439,14 @@ func (to *Session) GetDeliveryServiceHealth(id string, header http.Header) (*tc.
return &data.Response, reqInf, nil
}
-// GetDeliveryServiceCapacity gets the 'capacity' of the Delivery Service identified by the
+// GetDeliveryServiceHealth gets the 'health' of the Delivery Service identified by the
// integral, unique identifier 'id' (which must be passed as a string).
-func (to *Session) GetDeliveryServiceCapacity(id string, header http.Header) (*tc.DeliveryServiceCapacity, ReqInf, error) {
+// Deprecated: GetDeliveryServiceHealth will be removed in 6.0. Use GetDeliveryServiceHealthWithHdr.
+func (to *Session) GetDeliveryServiceHealth(id string) (*tc.DeliveryServiceHealth, ReqInf, error) {
+ return to.GetDeliveryServiceHealthWithHdr(id, nil)
+}
+
+func (to *Session) GetDeliveryServiceCapacityWithHdr(id string, header http.Header) (*tc.DeliveryServiceCapacity, ReqInf, error) {
var data tc.DeliveryServiceCapacityResponse
reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICE_CAPACITY, id), &data, header)
if err != nil {
@@ -436,9 +456,21 @@ func (to *Session) GetDeliveryServiceCapacity(id string, header http.Header) (*t
return &data.Response, reqInf, nil
}
+// GetDeliveryServiceCapacity gets the 'capacity' of the Delivery Service identified by the
+// integral, unique identifier 'id' (which must be passed as a string).
+// Deprecated: GetDeliveryServiceCapacity will be removed in 6.0. Use GetDeliveryServiceCapacityWithHdr.
+func (to *Session) GetDeliveryServiceCapacity(id string) (*tc.DeliveryServiceCapacity, ReqInf, error) {
+ return to.GetDeliveryServiceCapacityWithHdr(id, nil)
+}
+
// GetDeliveryServiceServer returns associations between Delivery Services and servers using the
// provided pagination controls.
-func (to *Session) GetDeliveryServiceServer(page, limit string, header http.Header) ([]tc.DeliveryServiceServer, ReqInf, error) {
+// Deprecated: GetDeliveryServiceServer will be removed in 6.0. Use GetDeliveryServiceServerWithHdr.
+func (to *Session) GetDeliveryServiceServer(page, limit string) ([]tc.DeliveryServiceServer, ReqInf, error) {
+ return to.GetDeliveryServiceServerWithHdr(page, limit, nil)
+}
+
+func (to *Session) GetDeliveryServiceServerWithHdr(page, limit string, header http.Header) ([]tc.DeliveryServiceServer, ReqInf, error) {
var data tc.DeliveryServiceServerResponse
reqInf, err := get(to, API_DELIVERY_SERVICE_SERVER+"?page="+page+"&limit="+limit, &data, header)
if err != nil {
@@ -450,7 +482,12 @@ func (to *Session) GetDeliveryServiceServer(page, limit string, header http.Head
// GetDeliveryServiceRegexes returns the "Regexes" (Regular Expressions) used by all (tenant-visible)
// Delivery Services.
-func (to *Session) GetDeliveryServiceRegexes(header http.Header) ([]tc.DeliveryServiceRegexes, ReqInf, error) {
+// Deprecated: GetDeliveryServiceRegexes will be removed in 6.0. Use GetDeliveryServiceRegexesWithHdr.
+func (to *Session) GetDeliveryServiceRegexes() ([]tc.DeliveryServiceRegexes, ReqInf, error) {
+ return to.GetDeliveryServiceRegexesWithHdr(nil)
+}
+
+func (to *Session) GetDeliveryServiceRegexesWithHdr(header http.Header) ([]tc.DeliveryServiceRegexes, ReqInf, error) {
var data tc.DeliveryServiceRegexResponse
reqInf, err := get(to, API_DELIVERY_SERVICES_REGEXES, &data, header)
if err != nil {
@@ -462,7 +499,12 @@ func (to *Session) GetDeliveryServiceRegexes(header http.Header) ([]tc.DeliveryS
// GetDeliveryServiceSSLKeysByID returns information about the SSL Keys used by the Delivery
// Service identified by the passed XMLID.
-func (to *Session) GetDeliveryServiceSSLKeysByID(XMLID string, header http.Header) (*tc.DeliveryServiceSSLKeys, ReqInf, error) {
+// Deprecated: GetDeliveryServiceSSLKeysByID will be removed in 6.0. Use GetDeliveryServiceSSLKeysByIDWithHdr.
+func (to *Session) GetDeliveryServiceSSLKeysByID(XMLID string) (*tc.DeliveryServiceSSLKeys, ReqInf, error) {
+ return to.GetDeliveryServiceSSLKeysByIDWithHdr(XMLID, nil)
+}
+
+func (to *Session) GetDeliveryServiceSSLKeysByIDWithHdr(XMLID string, header http.Header) (*tc.DeliveryServiceSSLKeys, ReqInf, error) {
var data tc.DeliveryServiceSSLKeysResponse
reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICE_XMLID_SSL_KEYS, XMLID), &data, header)
if err != nil {
@@ -472,9 +514,7 @@ func (to *Session) GetDeliveryServiceSSLKeysByID(XMLID string, header http.Heade
return &data.Response, reqInf, nil
}
-// GetDeliveryServicesEligible returns the servers eligible for assignment to the Delivery
-// Service identified by the integral, unique identifier 'dsID'.
-func (to *Session) GetDeliveryServicesEligible(dsID int, header http.Header) ([]tc.DSServer, ReqInf, error) {
+func (to *Session) GetDeliveryServicesEligibleWithHdr(dsID int, header http.Header) ([]tc.DSServer, ReqInf, error) {
resp := struct {
Response []tc.DSServer `json:"response"`
}{Response: []tc.DSServer{}}
@@ -486,9 +526,21 @@ func (to *Session) GetDeliveryServicesEligible(dsID int, header http.Header) ([]
return resp.Response, reqInf, nil
}
+// GetDeliveryServicesEligible returns the servers eligible for assignment to the Delivery
+// Service identified by the integral, unique identifier 'dsID'.
+// Deprecated: GetDeliveryServicesEligible will be removed in 6.0. Use GetDeliveryServicesEligibleWithHdr.
+func (to *Session) GetDeliveryServicesEligible(dsID int) ([]tc.DSServer, ReqInf, error) {
+ return to.GetDeliveryServicesEligibleWithHdr(dsID, nil)
+}
+
// GetDeliveryServiceURLSigKeys returns the URL-signing keys used by the Delivery Service
// identified by the XMLID 'dsName'.
-func (to *Session) GetDeliveryServiceURLSigKeys(dsName string, header http.Header) (tc.URLSigKeys, ReqInf, error) {
+// Deprecated: GetDeliveryServiceURLSigKeys will be removed in 6.0. Use GetDeliveryServiceURLSigKeysWithHdr.
+func (to *Session) GetDeliveryServiceURLSigKeys(dsName string) (tc.URLSigKeys, ReqInf, error) {
+ return to.GetDeliveryServiceURLSigKeysWithHdr(dsName, nil)
+}
+
+func (to *Session) GetDeliveryServiceURLSigKeysWithHdr(dsName string, header http.Header) (tc.URLSigKeys, ReqInf, error) {
data := struct {
Response tc.URLSigKeys `json:"response"`
}{}
@@ -500,9 +552,14 @@ func (to *Session) GetDeliveryServiceURLSigKeys(dsName string, header http.Heade
return data.Response, reqInf, nil
}
+// Deprecated: GetDeliveryServiceURISigningKeys will be removed in 6.0. Use GetDeliveryServiceURISigningKeysWithHdr.
+func (to *Session) GetDeliveryServiceURISigningKeys(dsName string) ([]byte, ReqInf, error) {
+ return to.GetDeliveryServiceURISigningKeysWithHdr(dsName, nil)
+}
+
// GetDeliveryServiceURISigningKeys returns the URI-signing keys used by the Delivery Service
// identified by the XMLID 'dsName'. The result is not parsed.
-func (to *Session) GetDeliveryServiceURISigningKeys(dsName string, header http.Header) ([]byte, ReqInf, error) {
+func (to *Session) GetDeliveryServiceURISigningKeysWithHdr(dsName string, header http.Header) ([]byte, ReqInf, error) {
data := json.RawMessage{}
reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICES_URI_SIGNING_KEYS, dsName), &data, header)
if err != nil {
@@ -564,7 +621,7 @@ func (to *Session) UpdateDeliveryServiceSafe(id int, ds tc.DeliveryServiceSafeUp
//
// Deprecated: Please used versioned library imports in the future, and
// versioned methods, specifically, for API v3.0 - in this case,
-// GetDeliveryServicesV30.
+// GetDeliveryServicesV30WithHdr.
func (to *Session) GetAccessibleDeliveryServicesByTenant(tenantId int) ([]tc.DeliveryServiceNullable, ReqInf, error) {
data := tc.DeliveryServicesNullableResponse{}
reqInf, err := get(to, fmt.Sprintf("%v?accessibleTo=%v", API_DELIVERY_SERVICES, tenantId), &data, nil)
diff --git a/traffic_ops/v3-client/deliveryservice_request_comments.go b/traffic_ops/v3-client/deliveryservice_request_comments.go
index 82b39cd..34b2ca9 100644
--- a/traffic_ops/v3-client/deliveryservice_request_comments.go
+++ b/traffic_ops/v3-client/deliveryservice_request_comments.go
@@ -68,8 +68,7 @@ func (to *Session) UpdateDeliveryServiceRequestCommentByID(id int, comment tc.De
return alerts, reqInf, nil
}
-// Returns a list of delivery service request comments
-func (to *Session) GetDeliveryServiceRequestComments(header http.Header) ([]tc.DeliveryServiceRequestComment, ReqInf, error) {
+func (to *Session) GetDeliveryServiceRequestCommentsWithHdr(header http.Header) ([]tc.DeliveryServiceRequestComment, ReqInf, error) {
resp, remoteAddr, err := to.request(http.MethodGet, API_DELIVERY_SERVICE_REQUEST_COMMENTS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
@@ -88,8 +87,13 @@ func (to *Session) GetDeliveryServiceRequestComments(header http.Header) ([]tc.D
return data.Response, reqInf, nil
}
-// GET a delivery service request comment by ID
-func (to *Session) GetDeliveryServiceRequestCommentByID(id int, header http.Header) ([]tc.DeliveryServiceRequestComment, ReqInf, error) {
+// Returns a list of delivery service request comments
+// Deprecated: GetDeliveryServiceRequestComments will be removed in 6.0. Use GetDeliveryServiceRequestCommentsWithHdr.
+func (to *Session) GetDeliveryServiceRequestComments() ([]tc.DeliveryServiceRequestComment, ReqInf, error) {
+ return to.GetDeliveryServiceRequestCommentsWithHdr(nil)
+}
+
+func (to *Session) GetDeliveryServiceRequestCommentByIDWithHdr(id int, header http.Header) ([]tc.DeliveryServiceRequestComment, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_DELIVERY_SERVICE_REQUEST_COMMENTS, id)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -112,6 +116,12 @@ func (to *Session) GetDeliveryServiceRequestCommentByID(id int, header http.Head
return data.Response, reqInf, nil
}
+// GET a delivery service request comment by ID
+// Deprecated: GetDeliveryServiceRequestCommentByID will be removed in 6.0. Use GetDeliveryServiceRequestCommentByIDWithHdr.
+func (to *Session) GetDeliveryServiceRequestCommentByID(id int) ([]tc.DeliveryServiceRequestComment, ReqInf, error) {
+ return to.GetDeliveryServiceRequestCommentByIDWithHdr(id, nil)
+}
+
// DELETE a delivery service request comment by ID
func (to *Session) DeleteDeliveryServiceRequestCommentByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_DELIVERY_SERVICE_REQUEST_COMMENTS, id)
diff --git a/traffic_ops/v3-client/deliveryservice_requests.go b/traffic_ops/v3-client/deliveryservice_requests.go
index 862536d..8125c8d 100644
--- a/traffic_ops/v3-client/deliveryservice_requests.go
+++ b/traffic_ops/v3-client/deliveryservice_requests.go
@@ -36,7 +36,7 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
var alerts tc.Alerts
var remoteAddr net.Addr
if dsr.AssigneeID == 0 && dsr.Assignee != "" {
- res, reqInf, err := to.GetUserByUsername(dsr.Assignee, nil)
+ res, reqInf, err := to.GetUserByUsername(dsr.Assignee)
if err != nil {
return alerts, reqInf, err
}
@@ -47,7 +47,7 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
}
if dsr.AuthorID == 0 && dsr.Author != "" {
- res, reqInf, err := to.GetUserByUsername(dsr.Author, nil)
+ res, reqInf, err := to.GetUserByUsername(dsr.Author)
if err != nil {
return alerts, reqInf, err
}
@@ -58,7 +58,7 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
}
if dsr.DeliveryService.TypeID == 0 && dsr.DeliveryService.Type.String() != "" {
- ty, reqInf, err := to.GetTypeByName(dsr.DeliveryService.Type.String(), nil)
+ ty, reqInf, err := to.GetTypeByName(dsr.DeliveryService.Type.String())
if err != nil || len(ty) == 0 {
return alerts, reqInf, errors.New("no type named " + dsr.DeliveryService.Type.String())
}
@@ -66,7 +66,7 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
}
if dsr.DeliveryService.CDNID == 0 && dsr.DeliveryService.CDNName != "" {
- cdns, reqInf, err := to.GetCDNByName(dsr.DeliveryService.CDNName, nil)
+ cdns, reqInf, err := to.GetCDNByName(dsr.DeliveryService.CDNName)
if err != nil || len(cdns) == 0 {
return alerts, reqInf, errors.New("no CDN named " + dsr.DeliveryService.CDNName)
}
@@ -74,7 +74,7 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
}
if dsr.DeliveryService.ProfileID == 0 && dsr.DeliveryService.ProfileName != "" {
- profiles, reqInf, err := to.GetProfileByName(dsr.DeliveryService.ProfileName, nil)
+ profiles, reqInf, err := to.GetProfileByName(dsr.DeliveryService.ProfileName)
if err != nil || len(profiles) == 0 {
return alerts, reqInf, errors.New("no Profile named " + dsr.DeliveryService.ProfileName)
}
@@ -82,7 +82,7 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
}
if dsr.DeliveryService.TenantID == 0 && dsr.DeliveryService.Tenant != "" {
- ten, reqInf, err := to.TenantByName(dsr.DeliveryService.Tenant, nil)
+ ten, reqInf, err := to.TenantByName(dsr.DeliveryService.Tenant)
if err != nil || ten == nil {
return alerts, reqInf, errors.New("no Tenant named " + dsr.DeliveryService.Tenant)
}
@@ -94,7 +94,7 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
if err != nil {
return alerts, reqInf, err
}
- resp, remoteAddr, err := to.RawRequest(http.MethodPost, API_DS_REQUESTS, reqBody, nil)
+ resp, remoteAddr, err := to.RawRequest(http.MethodPost, API_DS_REQUESTS, reqBody)
defer resp.Body.Close()
if err == nil {
@@ -110,8 +110,7 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
return alerts, reqInf, err
}
-// GetDeliveryServiceRequests retrieves all deliveryservices available to session user.
-func (to *Session) GetDeliveryServiceRequests(header http.Header) ([]tc.DeliveryServiceRequest, ReqInf, error) {
+func (to *Session) GetDeliveryServiceRequestsWithHdr(header http.Header) ([]tc.DeliveryServiceRequest, ReqInf, error) {
resp, remoteAddr, err := to.request(http.MethodGet, API_DS_REQUESTS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -136,8 +135,13 @@ func (to *Session) GetDeliveryServiceRequests(header http.Header) ([]tc.Delivery
return data.Response, reqInf, nil
}
-// GET a DeliveryServiceRequest by the DeliveryServiceRequest XMLID
-func (to *Session) GetDeliveryServiceRequestByXMLID(XMLID string, header http.Header) ([]tc.DeliveryServiceRequest, ReqInf, error) {
+// GetDeliveryServiceRequests retrieves all deliveryservices available to session user.
+// Deprecated: GetDeliveryServiceRequests will be removed in 6.0. Use GetDeliveryServiceRequestsWithHdr.
+func (to *Session) GetDeliveryServiceRequests() ([]tc.DeliveryServiceRequest, ReqInf, error) {
+ return to.GetDeliveryServiceRequestsWithHdr(nil)
+}
+
+func (to *Session) GetDeliveryServiceRequestByXMLIDWithHdr(XMLID string, header http.Header) ([]tc.DeliveryServiceRequest, ReqInf, error) {
route := fmt.Sprintf("%s?xmlId=%s", API_DS_REQUESTS, url.QueryEscape(XMLID))
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
@@ -163,8 +167,13 @@ func (to *Session) GetDeliveryServiceRequestByXMLID(XMLID string, header http.He
return data.Response, reqInf, nil
}
-// GET a DeliveryServiceRequest by the DeliveryServiceRequest id
-func (to *Session) GetDeliveryServiceRequestByID(id int, header http.Header) ([]tc.DeliveryServiceRequest, ReqInf, error) {
+// GET a DeliveryServiceRequest by the DeliveryServiceRequest XMLID
+// Deprecated: GetDeliveryServiceRequestByXMLID will be removed in 6.0. Use GetDeliveryServiceRequestByXMLIDWithHdr.
+func (to *Session) GetDeliveryServiceRequestByXMLID(XMLID string) ([]tc.DeliveryServiceRequest, ReqInf, error) {
+ return to.GetDeliveryServiceRequestByXMLIDWithHdr(XMLID, nil)
+}
+
+func (to *Session) GetDeliveryServiceRequestByIDWithHdr(id int, header http.Header) ([]tc.DeliveryServiceRequest, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_DS_REQUESTS, id)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -189,6 +198,12 @@ func (to *Session) GetDeliveryServiceRequestByID(id int, header http.Header) ([]
return data.Response, reqInf, nil
}
+// GET a DeliveryServiceRequest by the DeliveryServiceRequest id
+// Deprecated: GetDeliveryServiceRequestByID will be removed in 6.0. Use GetDeliveryServiceRequestByIDWithHdr.
+func (to *Session) GetDeliveryServiceRequestByID(id int) ([]tc.DeliveryServiceRequest, ReqInf, error) {
+ return to.GetDeliveryServiceRequestByIDWithHdr(id, nil)
+}
+
// Update a DeliveryServiceRequest by ID
func (to *Session) UpdateDeliveryServiceRequestByID(id int, dsr tc.DeliveryServiceRequest) (tc.Alerts, ReqInf, error) {
@@ -213,7 +228,7 @@ func (to *Session) UpdateDeliveryServiceRequestByID(id int, dsr tc.DeliveryServi
// DELETE a DeliveryServiceRequest by DeliveryServiceRequest assignee
func (to *Session) DeleteDeliveryServiceRequestByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_DS_REQUESTS, id)
- resp, remoteAddr, err := to.RawRequest(http.MethodDelete, route, nil, nil)
+ resp, remoteAddr, err := to.RawRequest(http.MethodDelete, route, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/v3-client/deliveryservices_required_capabilities.go b/traffic_ops/v3-client/deliveryservices_required_capabilities.go
index 163fe84..a75b7f3 100644
--- a/traffic_ops/v3-client/deliveryservices_required_capabilities.go
+++ b/traffic_ops/v3-client/deliveryservices_required_capabilities.go
@@ -54,9 +54,7 @@ func (to *Session) DeleteDeliveryServicesRequiredCapability(deliveryserviceID in
return alerts, reqInf, err
}
-// GetDeliveryServicesRequiredCapabilities retrieves a list of Required Capabilities that are assigned to a Delivery Service
-// Callers can filter the results by delivery service id, xml id and/or required capability via the optional parameters
-func (to *Session) GetDeliveryServicesRequiredCapabilities(deliveryServiceID *int, xmlID, capability *string, header http.Header) ([]tc.DeliveryServicesRequiredCapability, ReqInf, error) {
+func (to *Session) GetDeliveryServicesRequiredCapabilitiesWithHdr(deliveryServiceID *int, xmlID, capability *string, header http.Header) ([]tc.DeliveryServicesRequiredCapability, ReqInf, error) {
param := url.Values{}
if deliveryServiceID != nil {
param.Add("deliveryServiceID", strconv.Itoa(*deliveryServiceID))
@@ -82,3 +80,10 @@ func (to *Session) GetDeliveryServicesRequiredCapabilities(deliveryServiceID *in
}
return resp.Response, reqInf, nil
}
+
+// GetDeliveryServicesRequiredCapabilities retrieves a list of Required Capabilities that are assigned to a Delivery Service
+// Callers can filter the results by delivery service id, xml id and/or required capability via the optional parameters
+// Deprecated: GetDeliveryServicesRequiredCapabilities will be removed in 6.0. Use GetDeliveryServicesRequiredCapabilitiesWithHdr.
+func (to *Session) GetDeliveryServicesRequiredCapabilities(deliveryServiceID *int, xmlID, capability *string) ([]tc.DeliveryServicesRequiredCapability, ReqInf, error) {
+ return to.GetDeliveryServicesRequiredCapabilitiesWithHdr(deliveryServiceID, xmlID, capability, nil)
+}
diff --git a/traffic_ops/v3-client/deliveryserviceserver.go b/traffic_ops/v3-client/deliveryserviceserver.go
index 975eb9c..bcc753f 100644
--- a/traffic_ops/v3-client/deliveryserviceserver.go
+++ b/traffic_ops/v3-client/deliveryserviceserver.go
@@ -87,19 +87,27 @@ func (to *Session) AssignServersToDeliveryService(servers []string, xmlId string
return resp, reqInf, nil
}
-// GetDeliveryServiceServers gets all delivery service servers, with the default API limit.
-func (to *Session) GetDeliveryServiceServers(h http.Header) (tc.DeliveryServiceServerResponse, ReqInf, error) {
+func (to *Session) GetDeliveryServiceServersWithHdr(h http.Header) (tc.DeliveryServiceServerResponse, ReqInf, error) {
return to.getDeliveryServiceServers(url.Values{}, h)
}
+// GetDeliveryServiceServers gets all delivery service servers, with the default API limit.
+// Deprecated: GetDeliveryServiceServers will be removed in 6.0. Use GetDeliveryServiceServersWithHdr.
+func (to *Session) GetDeliveryServiceServers() (tc.DeliveryServiceServerResponse, ReqInf, error) {
+ return to.GetDeliveryServiceServersWithHdr(nil)
+}
+
+func (to *Session) GetDeliveryServiceServersNWithHdr(n int, header http.Header) (tc.DeliveryServiceServerResponse, ReqInf, error) {
+ return to.getDeliveryServiceServers(url.Values{"limit": []string{strconv.Itoa(n)}}, header)
+}
+
// GetDeliveryServiceServersN gets all delivery service servers, with a limit of n.
+// Deprecated: GetDeliveryServiceServersN will be removed in 6.0. Use GetDeliveryServiceServersNWithHdr.
func (to *Session) GetDeliveryServiceServersN(n int) (tc.DeliveryServiceServerResponse, ReqInf, error) {
- return to.getDeliveryServiceServers(url.Values{"limit": []string{strconv.Itoa(n)}}, nil)
+ return to.GetDeliveryServiceServersNWithHdr(n, nil)
}
-// GetDeliveryServiceServersWithLimits gets all delivery service servers, allowing specifying the limit of mappings to return, the delivery services to return, and the servers to return.
-// The limit may be 0, in which case the default limit will be applied. The deliveryServiceIDs and serverIDs may be nil or empty, in which case all delivery services and/or servers will be returned.
-func (to *Session) GetDeliveryServiceServersWithLimits(limit int, deliveryServiceIDs []int, serverIDs []int) (tc.DeliveryServiceServerResponse, ReqInf, error) {
+func (to *Session) GetDeliveryServiceServersWithLimitsWithHdr(limit int, deliveryServiceIDs []int, serverIDs []int, header http.Header) (tc.DeliveryServiceServerResponse, ReqInf, error) {
vals := url.Values{}
if limit != 0 {
vals.Set("limit", strconv.Itoa(limit))
@@ -121,7 +129,14 @@ func (to *Session) GetDeliveryServiceServersWithLimits(limit int, deliveryServic
vals.Set("serverids", strings.Join(serverIDStrs, ","))
}
- return to.getDeliveryServiceServers(vals, nil)
+ return to.getDeliveryServiceServers(vals, header)
+}
+
+// GetDeliveryServiceServersWithLimits gets all delivery service servers, allowing specifying the limit of mappings to return, the delivery services to return, and the servers to return.
+// The limit may be 0, in which case the default limit will be applied. The deliveryServiceIDs and serverIDs may be nil or empty, in which case all delivery services and/or servers will be returned.
+// Deprecated: GetDeliveryServiceServersWithLimits will be removed in 6.0. Use GetDeliveryServiceServersWithLimitsWithHdr.
+func (to *Session) GetDeliveryServiceServersWithLimits(limit int, deliveryServiceIDs []int, serverIDs []int) (tc.DeliveryServiceServerResponse, ReqInf, error) {
+ return to.GetDeliveryServiceServersWithLimitsWithHdr(limit, deliveryServiceIDs, serverIDs, nil)
}
func (to *Session) getDeliveryServiceServers(urlQuery url.Values, h http.Header) (tc.DeliveryServiceServerResponse, ReqInf, error) {
diff --git a/traffic_ops/v3-client/division.go b/traffic_ops/v3-client/division.go
index 7bf36d1..ac9c064 100644
--- a/traffic_ops/v3-client/division.go
+++ b/traffic_ops/v3-client/division.go
@@ -67,8 +67,7 @@ func (to *Session) UpdateDivisionByID(id int, division tc.Division) (tc.Alerts,
return alerts, reqInf, nil
}
-// Returns a list of Divisions
-func (to *Session) GetDivisions(header http.Header) ([]tc.Division, ReqInf, error) {
+func (to *Session) GetDivisionsWithHdr(header http.Header) ([]tc.Division, ReqInf, error) {
resp, remoteAddr, err := to.request(http.MethodGet, API_DIVISIONS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
@@ -87,8 +86,13 @@ func (to *Session) GetDivisions(header http.Header) ([]tc.Division, ReqInf, erro
return data.Response, reqInf, nil
}
-// GET a Division by the Division id
-func (to *Session) GetDivisionByID(id int, header http.Header) ([]tc.Division, ReqInf, error) {
+// Returns a list of Divisions
+// Deprecated: GetDivisions will be removed in 6.0. Use GetDivisionsWithHdr.
+func (to *Session) GetDivisions() ([]tc.Division, ReqInf, error) {
+ return to.GetDivisionsWithHdr(nil)
+}
+
+func (to *Session) GetDivisionByIDWithHdr(id int, header http.Header) ([]tc.Division, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_DIVISIONS, id)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -111,8 +115,13 @@ func (to *Session) GetDivisionByID(id int, header http.Header) ([]tc.Division, R
return data.Response, reqInf, nil
}
-// GET a Division by the Division name
-func (to *Session) GetDivisionByName(name string, header http.Header) ([]tc.Division, ReqInf, error) {
+// GET a Division by the Division id
+// Deprecated: GetDivisionByID will be removed in 6.0. Use GetDivisionByIDWithHdr.
+func (to *Session) GetDivisionByID(id int) ([]tc.Division, ReqInf, error) {
+ return to.GetDivisionByIDWithHdr(id, nil)
+}
+
+func (to *Session) GetDivisionByNameWithHdr(name string, header http.Header) ([]tc.Division, ReqInf, error) {
url := fmt.Sprintf("%s?name=%s", API_DIVISIONS, name)
resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -135,6 +144,12 @@ func (to *Session) GetDivisionByName(name string, header http.Header) ([]tc.Divi
return data.Response, reqInf, nil
}
+// GET a Division by the Division name
+// Deprecated: GetDivisionByName will be removed in 6.0. Use GetDivisionByNameWithHdr.
+func (to *Session) GetDivisionByName(name string) ([]tc.Division, ReqInf, error) {
+ return to.GetDivisionByNameWithHdr(name, nil)
+}
+
// DELETE a Division by Division id
func (to *Session) DeleteDivisionByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d", API_DIVISIONS, id)
diff --git a/traffic_ops/v3-client/federation.go b/traffic_ops/v3-client/federation.go
index 4ceb4cc..ab42a1a 100644
--- a/traffic_ops/v3-client/federation.go
+++ b/traffic_ops/v3-client/federation.go
@@ -25,7 +25,7 @@ import (
"github.com/apache/trafficcontrol/lib/go-tc"
)
-func (to *Session) Federations(header http.Header) ([]tc.AllDeliveryServiceFederationsMapping, ReqInf, error) {
+func (to *Session) FederationsWithHdr(header http.Header) ([]tc.AllDeliveryServiceFederationsMapping, ReqInf, error) {
type FederationResponse struct {
Response []tc.AllDeliveryServiceFederationsMapping `json:"response"`
}
@@ -34,7 +34,12 @@ func (to *Session) Federations(header http.Header) ([]tc.AllDeliveryServiceFeder
return data.Response, inf, err
}
-func (to *Session) AllFederations(header http.Header) ([]tc.AllDeliveryServiceFederationsMapping, ReqInf, error) {
+// Deprecated: Federations will be removed in 6.0. Use FederationsWithHdr.
+func (to *Session) Federations() ([]tc.AllDeliveryServiceFederationsMapping, ReqInf, error) {
+ return to.FederationsWithHdr(nil)
+}
+
+func (to *Session) AllFederationsWithHdr(header http.Header) ([]tc.AllDeliveryServiceFederationsMapping, ReqInf, error) {
type FederationResponse struct {
Response []tc.AllDeliveryServiceFederationsMapping `json:"response"`
}
@@ -43,7 +48,12 @@ func (to *Session) AllFederations(header http.Header) ([]tc.AllDeliveryServiceFe
return data.Response, inf, err
}
-func (to *Session) AllFederationsForCDN(cdnName string, header http.Header) ([]tc.AllDeliveryServiceFederationsMapping, ReqInf, error) {
+// Deprecated: AllFederations will be removed in 6.0. Use AllFederationsWithHdr.
+func (to *Session) AllFederations() ([]tc.AllDeliveryServiceFederationsMapping, ReqInf, error) {
+ return to.AllFederationsWithHdr(nil)
+}
+
+func (to *Session) AllFederationsForCDNWithHdr(cdnName string, header http.Header) ([]tc.AllDeliveryServiceFederationsMapping, ReqInf, error) {
// because the Federations JSON array is heterogeneous (array members may be a AllFederation or AllFederationCDN), we have to try decoding each separately.
type FederationResponse struct {
Response []json.RawMessage `json:"response"`
@@ -69,6 +79,11 @@ func (to *Session) AllFederationsForCDN(cdnName string, header http.Header) ([]t
return feds, inf, nil
}
+// Deprecated: AllFederationsForCDN will be removed in 6.0. Use AllFederationsForCDNWithHdr.
+func (to *Session) AllFederationsForCDN(cdnName string) ([]tc.AllDeliveryServiceFederationsMapping, ReqInf, error) {
+ return to.AllFederationsForCDNWithHdr(cdnName, nil)
+}
+
func (to *Session) CreateFederationDeliveryServices(federationID int, deliveryServiceIDs []int, replace bool) (ReqInf, error) {
req := tc.FederationDSPost{DSIDs: deliveryServiceIDs, Replace: &replace}
jsonReq, err := json.Marshal(req)
@@ -80,8 +95,7 @@ func (to *Session) CreateFederationDeliveryServices(federationID int, deliverySe
return inf, err
}
-// GetFederationDeliveryServices Returns a given Federation's Delivery Services
-func (to *Session) GetFederationDeliveryServices(federationID int, header http.Header) ([]tc.FederationDeliveryServiceNullable, ReqInf, error) {
+func (to *Session) GetFederationDeliveryServicesWithHdr(federationID int, header http.Header) ([]tc.FederationDeliveryServiceNullable, ReqInf, error) {
type FederationDSesResponse struct {
Response []tc.FederationDeliveryServiceNullable `json:"response"`
}
@@ -90,6 +104,12 @@ func (to *Session) GetFederationDeliveryServices(federationID int, header http.H
return data.Response, inf, err
}
+// GetFederationDeliveryServices Returns a given Federation's Delivery Services
+// Deprecated: GetFederationDeliveryServices will be removed in 6.0. Use GetFederationDeliveryServicesWithHdr.
+func (to *Session) GetFederationDeliveryServices(federationID int) ([]tc.FederationDeliveryServiceNullable, ReqInf, error) {
+ return to.GetFederationDeliveryServicesWithHdr(federationID, nil)
+}
+
// DeleteFederationDeliveryService Deletes a given Delivery Service from a Federation
func (to *Session) DeleteFederationDeliveryService(federationID, deliveryServiceID int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/federations/%v/deliveryservices/%v", apiBase, federationID, deliveryServiceID)
@@ -118,8 +138,7 @@ func (to *Session) CreateFederationUsers(federationID int, userIDs []int, replac
return alerts, inf, err
}
-// GetFederationUsers Returns a given Federation's Users
-func (to *Session) GetFederationUsers(federationID int, header http.Header) ([]tc.FederationUser, ReqInf, error) {
+func (to *Session) GetFederationUsersWithHdr(federationID int, header http.Header) ([]tc.FederationUser, ReqInf, error) {
type FederationUsersResponse struct {
Response []tc.FederationUser `json:"response"`
}
@@ -128,6 +147,12 @@ func (to *Session) GetFederationUsers(federationID int, header http.Header) ([]t
return data.Response, inf, err
}
+// GetFederationUsers Returns a given Federation's Users
+// Deprecated: GetFederationUsers will be removed in 6.0. Use GetFederationUsersWithHdr.
+func (to *Session) GetFederationUsers(federationID int) ([]tc.FederationUser, ReqInf, error) {
+ return to.GetFederationUsersWithHdr(federationID, nil)
+}
+
// DeleteFederationUser Deletes a given User from a Federation
func (to *Session) DeleteFederationUser(federationID, userID int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/federations/%v/users/%v", apiBase, federationID, userID)
diff --git a/traffic_ops/v3-client/federation_resolver.go b/traffic_ops/v3-client/federation_resolver.go
index 5eca513..9a9def8 100644
--- a/traffic_ops/v3-client/federation_resolver.go
+++ b/traffic_ops/v3-client/federation_resolver.go
@@ -45,13 +45,17 @@ func (to *Session) getFederationResolvers(id *uint, ip *string, t *string, heade
return data.Response, inf, err
}
-// GetFederationResolvers retrieves all Federation Resolvers from Traffic Ops
-func (to *Session) GetFederationResolvers(header http.Header) ([]tc.FederationResolver, ReqInf, error) {
+func (to *Session) GetFederationResolversWithHdr(header http.Header) ([]tc.FederationResolver, ReqInf, error) {
return to.getFederationResolvers(nil, nil, nil, header)
}
-// GetFederationResolverByID retrieves a single Federation Resolver identified by ID.
-func (to *Session) GetFederationResolverByID(ID uint, header http.Header) (tc.FederationResolver, ReqInf, error) {
+// GetFederationResolvers retrieves all Federation Resolvers from Traffic Ops
+// Deprecated: GetFederationResolvers will be removed in 6.0. Use GetFederationResolversWithHdr.
+func (to *Session) GetFederationResolvers() ([]tc.FederationResolver, ReqInf, error) {
+ return to.GetFederationResolversWithHdr(nil)
+}
+
+func (to *Session) GetFederationResolverByIDWithHdr(ID uint, header http.Header) (tc.FederationResolver, ReqInf, error) {
var fr tc.FederationResolver
frs, inf, err := to.getFederationResolvers(&ID, nil, nil, header)
if len(frs) > 0 {
@@ -60,9 +64,13 @@ func (to *Session) GetFederationResolverByID(ID uint, header http.Header) (tc.Fe
return fr, inf, err
}
-// GetFederationResolverByIPAddress retrieves the Federation Resolver that uses the IP address or
-// CIDR-notation subnet 'ip'.
-func (to *Session) GetFederationResolverByIPAddress(ip string, header http.Header) (tc.FederationResolver, ReqInf, error) {
+// GetFederationResolverByID retrieves a single Federation Resolver identified by ID.
+// Deprecated: GetFederationResolverByID will be removed in 6.0. Use GetFederationResolverByIDWithHdr.
+func (to *Session) GetFederationResolverByID(ID uint) (tc.FederationResolver, ReqInf, error) {
+ return to.GetFederationResolverByIDWithHdr(ID, nil)
+}
+
+func (to *Session) GetFederationResolverByIPAddressWithHdr(ip string, header http.Header) (tc.FederationResolver, ReqInf, error) {
var fr tc.FederationResolver
frs, inf, err := to.getFederationResolvers(nil, &ip, nil, header)
if len(frs) > 0 {
@@ -71,11 +79,23 @@ func (to *Session) GetFederationResolverByIPAddress(ip string, header http.Heade
return fr, inf, err
}
-// GetFederationResolversByType gets all Federation Resolvers that are of the Type named 't'.
-func (to *Session) GetFederationResolversByType(t string, header http.Header) ([]tc.FederationResolver, ReqInf, error) {
+// GetFederationResolverByIPAddress retrieves the Federation Resolver that uses the IP address or
+// CIDR-notation subnet 'ip'.
+// Deprecated: GetFederationResolverByIPAddress will be removed in 6.0. Use GetFederationResolverByIPAddressWithHdr.
+func (to *Session) GetFederationResolverByIPAddress(ip string) (tc.FederationResolver, ReqInf, error) {
+ return to.GetFederationResolverByIPAddressWithHdr(ip, nil)
+}
+
+func (to *Session) GetFederationResolversByTypeWithHdr(t string, header http.Header) ([]tc.FederationResolver, ReqInf, error) {
return to.getFederationResolvers(nil, nil, &t, header)
}
+// GetFederationResolversByType gets all Federation Resolvers that are of the Type named 't'.
+// Deprecated: GetFederationResolversByType will be removed in 6.0. Use GetFederationResolversByTypeWithHdr.
+func (to *Session) GetFederationResolversByType(t string) ([]tc.FederationResolver, ReqInf, error) {
+ return to.GetFederationResolversByTypeWithHdr(t, nil)
+}
+
// CreateFederationResolver creates the Federation Resolver 'fr'.
func (to *Session) CreateFederationResolver(fr tc.FederationResolver) (tc.Alerts, ReqInf, error) {
var reqInf = ReqInf{CacheHitStatus: CacheHitStatusMiss}
diff --git a/traffic_ops/v3-client/origin.go b/traffic_ops/v3-client/origin.go
index b9732c8..17d446c 100644
--- a/traffic_ops/v3-client/origin.go
+++ b/traffic_ops/v3-client/origin.go
@@ -32,7 +32,7 @@ const (
func originIDs(to *Session, origin *tc.Origin) error {
if origin.CachegroupID == nil && origin.Cachegroup != nil {
- p, _, err := to.GetCacheGroupNullableByName(*origin.Cachegroup, nil)
+ p, _, err := to.GetCacheGroupNullableByName(*origin.Cachegroup)
if err != nil {
return err
}
@@ -43,7 +43,7 @@ func originIDs(to *Session, origin *tc.Origin) error {
}
if origin.DeliveryServiceID == nil && origin.DeliveryService != nil {
- dses, _, err := to.GetDeliveryServiceByXMLIDNullable(*origin.DeliveryService, nil)
+ dses, _, err := to.GetDeliveryServiceByXMLIDNullable(*origin.DeliveryService)
if err != nil {
return err
}
@@ -54,7 +54,7 @@ func originIDs(to *Session, origin *tc.Origin) error {
}
if origin.ProfileID == nil && origin.Profile != nil {
- profiles, _, err := to.GetProfileByName(*origin.Profile, nil)
+ profiles, _, err := to.GetProfileByName(*origin.Profile)
if err != nil {
return err
}
@@ -65,7 +65,7 @@ func originIDs(to *Session, origin *tc.Origin) error {
}
if origin.CoordinateID == nil && origin.Coordinate != nil {
- coordinates, _, err := to.GetCoordinateByName(*origin.Coordinate, nil)
+ coordinates, _, err := to.GetCoordinateByName(*origin.Coordinate)
if err != nil {
return err
}
@@ -76,7 +76,7 @@ func originIDs(to *Session, origin *tc.Origin) error {
}
if origin.TenantID == nil && origin.Tenant != nil {
- tenant, _, err := to.TenantByName(*origin.Tenant, nil)
+ tenant, _, err := to.TenantByName(*origin.Tenant)
if err != nil {
return err
}
diff --git a/traffic_ops/v3-client/parameter.go b/traffic_ops/v3-client/parameter.go
index 2824eeb..9578b5a 100644
--- a/traffic_ops/v3-client/parameter.go
+++ b/traffic_ops/v3-client/parameter.go
@@ -87,8 +87,7 @@ func (to *Session) UpdateParameterByID(id int, pl tc.Parameter) (tc.Alerts, ReqI
return alerts, reqInf, nil
}
-// GetParameters returns a list of Parameters.
-func (to *Session) GetParameters(header http.Header) ([]tc.Parameter, ReqInf, error) {
+func (to *Session) GetParametersWithHdr(header http.Header) ([]tc.Parameter, ReqInf, error) {
resp, remoteAddr, err := to.request(http.MethodGet, API_PARAMETERS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
@@ -107,8 +106,13 @@ func (to *Session) GetParameters(header http.Header) ([]tc.Parameter, ReqInf, er
return data.Response, reqInf, nil
}
-// GetParameterByID GETs a Parameter by the Parameter ID.
-func (to *Session) GetParameterByID(id int, header http.Header) ([]tc.Parameter, ReqInf, error) {
+// GetParameters returns a list of Parameters.
+// Deprecated: GetParameters will be removed in 6.0. Use GetParametersWithHdr.
+func (to *Session) GetParameters() ([]tc.Parameter, ReqInf, error) {
+ return to.GetParametersWithHdr(nil)
+}
+
+func (to *Session) GetParameterByIDWithHdr(id int, header http.Header) ([]tc.Parameter, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_PARAMETERS, id)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -131,8 +135,13 @@ func (to *Session) GetParameterByID(id int, header http.Header) ([]tc.Parameter,
return data.Response, reqInf, nil
}
-// GetParameterByName GETs a Parameter by the Parameter name.
-func (to *Session) GetParameterByName(name string, header http.Header) ([]tc.Parameter, ReqInf, error) {
+// GetParameterByID GETs a Parameter by the Parameter ID.
+// Deprecated: GetParameterByID will be removed in 6.0. Use GetParameterByIDWithHdr.
+func (to *Session) GetParameterByID(id int) ([]tc.Parameter, ReqInf, error) {
+ return to.GetParameterByIDWithHdr(id, nil)
+}
+
+func (to *Session) GetParameterByNameWithHdr(name string, header http.Header) ([]tc.Parameter, ReqInf, error) {
URI := API_PARAMETERS + "?name=" + url.QueryEscape(name)
resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -155,8 +164,13 @@ func (to *Session) GetParameterByName(name string, header http.Header) ([]tc.Par
return data.Response, reqInf, nil
}
-// GetParameterByConfigFile GETs a Parameter by the Parameter ConfigFile.
-func (to *Session) GetParameterByConfigFile(configFile string, header http.Header) ([]tc.Parameter, ReqInf, error) {
+// GetParameterByName GETs a Parameter by the Parameter name.
+// Deprecated: GetParameterByName will be removed in 6.0. Use GetParameterByNameWithHdr.
+func (to *Session) GetParameterByName(name string) ([]tc.Parameter, ReqInf, error) {
+ return to.GetParameterByNameWithHdr(name, nil)
+}
+
+func (to *Session) GetParameterByConfigFileWithHdr(configFile string, header http.Header) ([]tc.Parameter, ReqInf, error) {
URI := API_PARAMETERS + "?configFile=" + url.QueryEscape(configFile)
resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -179,8 +193,13 @@ func (to *Session) GetParameterByConfigFile(configFile string, header http.Heade
return data.Response, reqInf, nil
}
-// GetParameterByNameAndConfigFile GETs a Parameter by the Parameter Name and ConfigFile.
-func (to *Session) GetParameterByNameAndConfigFile(name string, configFile string, header http.Header) ([]tc.Parameter, ReqInf, error) {
+// GetParameterByConfigFile GETs a Parameter by the Parameter ConfigFile.
+// Deprecated: GetParameterByConfigFile will be removed in 6.0. Use GetParameterByConfigFileWithHdr.
+func (to *Session) GetParameterByConfigFile(configFile string) ([]tc.Parameter, ReqInf, error) {
+ return to.GetParameterByConfigFileWithHdr(configFile, nil)
+}
+
+func (to *Session) GetParameterByNameAndConfigFileWithHdr(name string, configFile string, header http.Header) ([]tc.Parameter, ReqInf, error) {
URI := fmt.Sprintf("%s?name=%s&configFile=%s", API_PARAMETERS, url.QueryEscape(name), url.QueryEscape(configFile))
resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -203,11 +222,14 @@ func (to *Session) GetParameterByNameAndConfigFile(name string, configFile strin
return data.Response, reqInf, nil
}
-// GetParameterByNameAndConfigFileAndValue GETs a Parameter by the Parameter Name and ConfigFile and Value.
-// TODO: API should support all 3, but does not support filter by value
-// currently. Until then, loop through hits until you find one with that value.
-func (to *Session) GetParameterByNameAndConfigFileAndValue(name, configFile, value string, header http.Header) ([]tc.Parameter, ReqInf, error) {
- params, reqInf, err := to.GetParameterByNameAndConfigFile(name, configFile, header)
+// GetParameterByNameAndConfigFile GETs a Parameter by the Parameter Name and ConfigFile.
+// Deprecated: GetParameterByNameAndConfigFile will be removed in 6.0. Use GetParameterByNameAndConfigFileWithHdr.
+func (to *Session) GetParameterByNameAndConfigFile(name string, configFile string) ([]tc.Parameter, ReqInf, error) {
+ return to.GetParameterByNameAndConfigFileWithHdr(name, configFile, nil)
+}
+
+func (to *Session) GetParameterByNameAndConfigFileAndValueWithHdr(name, configFile, value string, header http.Header) ([]tc.Parameter, ReqInf, error) {
+ params, reqInf, err := to.GetParameterByNameAndConfigFileWithHdr(name, configFile, header)
if reqInf.StatusCode == http.StatusNotModified {
return []tc.Parameter{}, reqInf, nil
}
@@ -222,6 +244,14 @@ func (to *Session) GetParameterByNameAndConfigFileAndValue(name, configFile, val
return nil, reqInf, err
}
+// GetParameterByNameAndConfigFileAndValue GETs a Parameter by the Parameter Name and ConfigFile and Value.
+// TODO: API should support all 3, but does not support filter by value
+// currently. Until then, loop through hits until you find one with that value.
+// Deprecated: GetParameterByNameAndConfigFileAndValue will be removed in 6.0. Use GetParameterByNameAndConfigFileAndValueWithHdr.
+func (to *Session) GetParameterByNameAndConfigFileAndValue(name, configFile, value string) ([]tc.Parameter, ReqInf, error) {
+ return to.GetParameterByNameAndConfigFileAndValueWithHdr(name, configFile, value, nil)
+}
+
// DeleteParameterByID DELETEs a Parameter by ID.
func (to *Session) DeleteParameterByID(id int) (tc.Alerts, ReqInf, error) {
URI := fmt.Sprintf("%s/%d", API_PARAMETERS, id)
diff --git a/traffic_ops/v3-client/phys_location.go b/traffic_ops/v3-client/phys_location.go
index da3346f..daf5c9a 100644
--- a/traffic_ops/v3-client/phys_location.go
+++ b/traffic_ops/v3-client/phys_location.go
@@ -33,7 +33,7 @@ const (
// CreatePhysLocation creates a PhysLocation.
func (to *Session) CreatePhysLocation(pl tc.PhysLocation) (tc.Alerts, ReqInf, error) {
if pl.RegionID == 0 && pl.RegionName != "" {
- regions, _, err := to.GetRegionByName(pl.RegionName, nil)
+ regions, _, err := to.GetRegionByName(pl.RegionName)
if err != nil {
return tc.Alerts{}, ReqInf{}, err
}
@@ -78,8 +78,7 @@ func (to *Session) UpdatePhysLocationByID(id int, pl tc.PhysLocation) (tc.Alerts
return alerts, reqInf, nil
}
-// Returns a list of PhysLocations with optional query parameters applied
-func (to *Session) GetPhysLocations(params map[string]string, header http.Header) ([]tc.PhysLocation, ReqInf, error) {
+func (to *Session) GetPhysLocationsWithHdr(params map[string]string, header http.Header) ([]tc.PhysLocation, ReqInf, error) {
path := API_PHYS_LOCATIONS + mapToQueryParameters(params)
resp, remoteAddr, err := to.request(http.MethodGet, path, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -99,8 +98,13 @@ func (to *Session) GetPhysLocations(params map[string]string, header http.Header
return data.Response, reqInf, nil
}
-// GET a PhysLocation by the PhysLocation ID
-func (to *Session) GetPhysLocationByID(id int, header http.Header) ([]tc.PhysLocation, ReqInf, error) {
+// Returns a list of PhysLocations with optional query parameters applied
+// Deprecated: GetPhysLocations will be removed in 6.0. Use GetPhysLocationsWithHdr.
+func (to *Session) GetPhysLocations(params map[string]string) ([]tc.PhysLocation, ReqInf, error) {
+ return to.GetPhysLocationsWithHdr(params, nil)
+}
+
+func (to *Session) GetPhysLocationByIDWithHdr(id int, header http.Header) ([]tc.PhysLocation, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_PHYS_LOCATIONS, id)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -123,8 +127,13 @@ func (to *Session) GetPhysLocationByID(id int, header http.Header) ([]tc.PhysLoc
return data.Response, reqInf, nil
}
-// GET a PhysLocation by the PhysLocation name
-func (to *Session) GetPhysLocationByName(name string, header http.Header) ([]tc.PhysLocation, ReqInf, error) {
+// GET a PhysLocation by the PhysLocation ID
+// Deprecated: GetPhysLocationByID will be removed in 6.0. Use GetPhysLocationByIDWithHdr.
+func (to *Session) GetPhysLocationByID(id int) ([]tc.PhysLocation, ReqInf, error) {
+ return to.GetPhysLocationByIDWithHdr(id, nil)
+}
+
+func (to *Session) GetPhysLocationByNameWithHdr(name string, header http.Header) ([]tc.PhysLocation, ReqInf, error) {
url := fmt.Sprintf("%s?name=%s", API_PHYS_LOCATIONS, url.QueryEscape(name))
resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -147,6 +156,12 @@ func (to *Session) GetPhysLocationByName(name string, header http.Header) ([]tc.
return data.Response, reqInf, nil
}
+// GET a PhysLocation by the PhysLocation name
+// Deprecated: GetPhysLocationByName will be removed in 6.0. Use GetPhysLocationByNameWithHdr.
+func (to *Session) GetPhysLocationByName(name string) ([]tc.PhysLocation, ReqInf, error) {
+ return to.GetPhysLocationByNameWithHdr(name, nil)
+}
+
// DELETE a PhysLocation by ID
func (to *Session) DeletePhysLocationByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d", API_PHYS_LOCATIONS, id)
diff --git a/traffic_ops/v3-client/profile.go b/traffic_ops/v3-client/profile.go
index f9afeb1..b9a54a0 100644
--- a/traffic_ops/v3-client/profile.go
+++ b/traffic_ops/v3-client/profile.go
@@ -35,7 +35,7 @@ func (to *Session) CreateProfile(pl tc.Profile) (tc.Alerts, ReqInf, error) {
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss}
if pl.CDNID == 0 && pl.CDNName != "" {
- cdns, _, err := to.GetCDNByName(pl.CDNName, nil)
+ cdns, _, err := to.GetCDNByName(pl.CDNName)
if err != nil {
return tc.Alerts{}, ReqInf{}, err
}
@@ -95,8 +95,7 @@ func (to *Session) UpdateProfileByID(id int, pl tc.Profile) (tc.Alerts, ReqInf,
return alerts, reqInf, err
}
-// GetParametersByProfileName gets all of the Parameters assigned to the Profile named 'profileName'.
-func (to *Session) GetParametersByProfileName(profileName string, header http.Header) ([]tc.Parameter, ReqInf, error) {
+func (to *Session) GetParametersByProfileNameWithHdr(profileName string, header http.Header) ([]tc.Parameter, ReqInf, error) {
url := fmt.Sprintf(API_PROFILES_NAME_PARAMETERS, profileName)
resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -119,8 +118,13 @@ func (to *Session) GetParametersByProfileName(profileName string, header http.He
return data.Response, reqInf, nil
}
-// GetProfiles returns a list of Profiles.
-func (to *Session) GetProfiles(header http.Header) ([]tc.Profile, ReqInf, error) {
+// GetParametersByProfileName gets all of the Parameters assigned to the Profile named 'profileName'.
+// Deprecated: GetParametersByProfileName will be removed in 6.0. Use GetParametersByProfileNameWithHdr.
+func (to *Session) GetParametersByProfileName(profileName string) ([]tc.Parameter, ReqInf, error) {
+ return to.GetParametersByProfileNameWithHdr(profileName, nil)
+}
+
+func (to *Session) GetProfilesWithHdr(header http.Header) ([]tc.Profile, ReqInf, error) {
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss}
resp, remoteAddr, err := to.request(http.MethodGet, API_PROFILES, nil, header)
@@ -142,8 +146,13 @@ func (to *Session) GetProfiles(header http.Header) ([]tc.Profile, ReqInf, error)
return data.Response, reqInf, err
}
-// GetProfileByID GETs a Profile by the Profile ID.
-func (to *Session) GetProfileByID(id int, header http.Header) ([]tc.Profile, ReqInf, error) {
+// GetProfiles returns a list of Profiles.
+// Deprecated: GetProfiles will be removed in 6.0. Use GetProfilesWithHdr.
+func (to *Session) GetProfiles() ([]tc.Profile, ReqInf, error) {
+ return to.GetProfilesWithHdr(nil)
+}
+
+func (to *Session) GetProfileByIDWithHdr(id int, header http.Header) ([]tc.Profile, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_PROFILES, id)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -164,8 +173,13 @@ func (to *Session) GetProfileByID(id int, header http.Header) ([]tc.Profile, Req
return data.Response, reqInf, err
}
-// GetProfileByName GETs a Profile by the Profile name.
-func (to *Session) GetProfileByName(name string, header http.Header) ([]tc.Profile, ReqInf, error) {
+// GetProfileByID GETs a Profile by the Profile ID.
+// Deprecated: GetProfileByID will be removed in 6.0. Use GetProfileByIDWithHdr.
+func (to *Session) GetProfileByID(id int) ([]tc.Profile, ReqInf, error) {
+ return to.GetProfileByIDWithHdr(id, nil)
+}
+
+func (to *Session) GetProfileByNameWithHdr(name string, header http.Header) ([]tc.Profile, ReqInf, error) {
URI := fmt.Sprintf("%s?name=%s", API_PROFILES, url.QueryEscape(name))
resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -186,8 +200,13 @@ func (to *Session) GetProfileByName(name string, header http.Header) ([]tc.Profi
return data.Response, reqInf, err
}
-// GetProfileByParameter GETs a Profile by the Profile "param".
-func (to *Session) GetProfileByParameter(param string, header http.Header) ([]tc.Profile, ReqInf, error) {
+// GetProfileByName GETs a Profile by the Profile name.
+// Deprecated: GetProfileByName will be removed in 6.0. Use GetProfileByNameWithHdr.
+func (to *Session) GetProfileByName(name string) ([]tc.Profile, ReqInf, error) {
+ return to.GetProfileByNameWithHdr(name, nil)
+}
+
+func (to *Session) GetProfileByParameterWithHdr(param string, header http.Header) ([]tc.Profile, ReqInf, error) {
URI := fmt.Sprintf("%s?param=%s", API_PROFILES, url.QueryEscape(param))
resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -208,8 +227,13 @@ func (to *Session) GetProfileByParameter(param string, header http.Header) ([]tc
return data.Response, reqInf, err
}
-// GetProfileByCDNID GETs a Profile by the Profile CDN ID.
-func (to *Session) GetProfileByCDNID(cdnID int, header http.Header) ([]tc.Profile, ReqInf, error) {
+// GetProfileByParameter GETs a Profile by the Profile "param".
+// Deprecated: GetProfileByParameter will be removed in 6.0. Use GetProfileByParameterWithHdr.
+func (to *Session) GetProfileByParameter(param string) ([]tc.Profile, ReqInf, error) {
+ return to.GetProfileByParameterWithHdr(param, nil)
+}
+
+func (to *Session) GetProfileByCDNIDWithHdr(cdnID int, header http.Header) ([]tc.Profile, ReqInf, error) {
URI := fmt.Sprintf("%s?cdn=%s", API_PROFILES, strconv.Itoa(cdnID))
resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -230,6 +254,12 @@ func (to *Session) GetProfileByCDNID(cdnID int, header http.Header) ([]tc.Profil
return data.Response, reqInf, err
}
+// GetProfileByCDNID GETs a Profile by the Profile CDN ID.
+// Deprecated: GetProfileByCDNID will be removed in 6.0. Use GetProfileByCDNIDWithHdr.
+func (to *Session) GetProfileByCDNID(cdnID int) ([]tc.Profile, ReqInf, error) {
+ return to.GetProfileByCDNIDWithHdr(cdnID, nil)
+}
+
// DeleteProfileByID DELETEs a Profile by ID.
func (to *Session) DeleteProfileByID(id int) (tc.Alerts, ReqInf, error) {
URI := fmt.Sprintf("%s/%d", API_PROFILES, id)
diff --git a/traffic_ops/v3-client/profile_parameter.go b/traffic_ops/v3-client/profile_parameter.go
index 6a4b74d..6aab10c 100644
--- a/traffic_ops/v3-client/profile_parameter.go
+++ b/traffic_ops/v3-client/profile_parameter.go
@@ -68,8 +68,7 @@ func (to *Session) CreateMultipleProfileParameters(pps []tc.ProfileParameter) (t
return alerts, reqInf, nil
}
-// Returns a list of Profile Parameters
-func (to *Session) GetProfileParameters(header http.Header) ([]tc.ProfileParameter, ReqInf, error) {
+func (to *Session) GetProfileParametersWithHdr(header http.Header) ([]tc.ProfileParameter, ReqInf, error) {
resp, remoteAddr, err := to.request(http.MethodGet, API_PROFILE_PARAMETERS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
@@ -88,8 +87,13 @@ func (to *Session) GetProfileParameters(header http.Header) ([]tc.ProfileParamet
return data.Response, reqInf, nil
}
-// GET a Profile Parameter by the Parameter
-func (to *Session) GetProfileParameterByQueryParams(queryParams string, header http.Header) ([]tc.ProfileParameter, ReqInf, error) {
+// Returns a list of Profile Parameters
+// Deprecated: GetProfileParameters will be removed in 6.0. Use GetProfileParametersWithHdr.
+func (to *Session) GetProfileParameters() ([]tc.ProfileParameter, ReqInf, error) {
+ return to.GetProfileParametersWithHdr(nil)
+}
+
+func (to *Session) GetProfileParameterByQueryParamsWithHdr(queryParams string, header http.Header) ([]tc.ProfileParameter, ReqInf, error) {
URI := API_PROFILE_PARAMETERS + queryParams
resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -112,6 +116,12 @@ func (to *Session) GetProfileParameterByQueryParams(queryParams string, header h
return data.Response, reqInf, nil
}
+// GET a Profile Parameter by the Parameter
+// Deprecated: GetProfileParameterByQueryParams will be removed in 6.0. Use GetProfileParameterByQueryParamsWithHdr.
+func (to *Session) GetProfileParameterByQueryParams(queryParams string) ([]tc.ProfileParameter, ReqInf, error) {
+ return to.GetProfileParameterByQueryParamsWithHdr(queryParams, nil)
+}
+
// DELETE a Parameter by Parameter
func (to *Session) DeleteParameterByProfileParameter(profile int, parameter int) (tc.Alerts, ReqInf, error) {
URI := fmt.Sprintf("%s/%d/%d", API_PROFILE_PARAMETERS, profile, parameter)
diff --git a/traffic_ops/v3-client/region.go b/traffic_ops/v3-client/region.go
index 53c3bed..ba59444 100644
--- a/traffic_ops/v3-client/region.go
+++ b/traffic_ops/v3-client/region.go
@@ -34,7 +34,7 @@ const (
// CreateRegion creates a Region.
func (to *Session) CreateRegion(region tc.Region) (tc.Alerts, ReqInf, error) {
if region.Division == 0 && region.DivisionName != "" {
- divisions, _, err := to.GetDivisionByName(region.DivisionName, nil)
+ divisions, _, err := to.GetDivisionByName(region.DivisionName)
if err != nil {
return tc.Alerts{}, ReqInf{}, err
}
@@ -80,8 +80,7 @@ func (to *Session) UpdateRegionByID(id int, region tc.Region) (tc.Alerts, ReqInf
return alerts, reqInf, nil
}
-// GetRegions returns a list of regions.
-func (to *Session) GetRegions(header http.Header) ([]tc.Region, ReqInf, error) {
+func (to *Session) GetRegionsWithHdr(header http.Header) ([]tc.Region, ReqInf, error) {
resp, remoteAddr, err := to.request(http.MethodGet, API_REGIONS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
@@ -100,8 +99,13 @@ func (to *Session) GetRegions(header http.Header) ([]tc.Region, ReqInf, error) {
return data.Response, reqInf, nil
}
-// GetRegionByID GETs a Region by the Region ID.
-func (to *Session) GetRegionByID(id int, header http.Header) ([]tc.Region, ReqInf, error) {
+// GetRegions returns a list of regions.
+// Deprecated: GetRegions will be removed in 6.0. Use GetRegionsWithHdr.
+func (to *Session) GetRegions() ([]tc.Region, ReqInf, error) {
+ return to.GetRegionsWithHdr(nil)
+}
+
+func (to *Session) GetRegionByIDWithHdr(id int, header http.Header) ([]tc.Region, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_REGIONS, id)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -124,8 +128,13 @@ func (to *Session) GetRegionByID(id int, header http.Header) ([]tc.Region, ReqIn
return data.Response, reqInf, nil
}
-// GetRegionByName GETs a Region by the Region name.
-func (to *Session) GetRegionByName(name string, header http.Header) ([]tc.Region, ReqInf, error) {
+// GetRegionByID GETs a Region by the Region ID.
+// Deprecated: GetRegionByID will be removed in 6.0. Use GetRegionByIDWithHdr.
+func (to *Session) GetRegionByID(id int) ([]tc.Region, ReqInf, error) {
+ return to.GetRegionByIDWithHdr(id, nil)
+}
+
+func (to *Session) GetRegionByNameWithHdr(name string, header http.Header) ([]tc.Region, ReqInf, error) {
url := fmt.Sprintf("%s?name=%s", API_REGIONS, url.QueryEscape(name))
resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -148,6 +157,12 @@ func (to *Session) GetRegionByName(name string, header http.Header) ([]tc.Region
return data.Response, reqInf, nil
}
+// GetRegionByName GETs a Region by the Region name.
+// Deprecated: GetRegionByName will be removed in 6.0. Use GetRegionByNameHdr.
+func (to *Session) GetRegionByName(name string) ([]tc.Region, ReqInf, error) {
+ return to.GetRegionByNameWithHdr(name, nil)
+}
+
// DeleteRegionByID DELETEs a Region by ID.
func (to *Session) DeleteRegionByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_REGIONS, id)
diff --git a/traffic_ops/v3-client/role.go b/traffic_ops/v3-client/role.go
index 3ce2035..4696357 100644
--- a/traffic_ops/v3-client/role.go
+++ b/traffic_ops/v3-client/role.go
@@ -38,7 +38,7 @@ func (to *Session) CreateRole(region tc.Role) (tc.Alerts, ReqInf, int, error) {
if err != nil {
return tc.Alerts{}, reqInf, 0, err
}
- resp, remoteAddr, errClient := to.RawRequest(http.MethodPost, API_ROLES, reqBody, nil)
+ resp, remoteAddr, errClient := to.RawRequest(http.MethodPost, API_ROLES, reqBody)
if resp != nil {
defer resp.Body.Close()
var alerts tc.Alerts
@@ -60,7 +60,7 @@ func (to *Session) UpdateRoleByID(id int, region tc.Role) (tc.Alerts, ReqInf, in
return tc.Alerts{}, reqInf, 0, err
}
route := fmt.Sprintf("%s/?id=%d", API_ROLES, id)
- resp, remoteAddr, errClient := to.RawRequest(http.MethodPut, route, reqBody, nil)
+ resp, remoteAddr, errClient := to.RawRequest(http.MethodPut, route, reqBody)
if resp != nil {
defer resp.Body.Close()
var alerts tc.Alerts
@@ -72,9 +72,8 @@ func (to *Session) UpdateRoleByID(id int, region tc.Role) (tc.Alerts, ReqInf, in
return tc.Alerts{}, reqInf, 0, errClient
}
-// GetRoles returns a list of roles.
-func (to *Session) GetRoles(header http.Header) ([]tc.Role, ReqInf, int, error) {
- resp, remoteAddr, errClient := to.RawRequest(http.MethodGet, API_ROLES, nil, header)
+func (to *Session) GetRolesWithHdr(header http.Header) ([]tc.Role, ReqInf, int, error) {
+ resp, remoteAddr, errClient := to.RawRequestWithHdr(http.MethodGet, API_ROLES, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
reqInf.StatusCode = resp.StatusCode
@@ -94,10 +93,15 @@ func (to *Session) GetRoles(header http.Header) ([]tc.Role, ReqInf, int, error)
return []tc.Role{}, reqInf, 0, errClient
}
-// GetRoleByID GETs a Role by the Role ID.
-func (to *Session) GetRoleByID(id int, header http.Header) ([]tc.Role, ReqInf, int, error) {
+// GetRoles returns a list of roles.
+// Deprecated: GetRoles will be removed in 6.0. Use GetRolesWithHdr.
+func (to *Session) GetRoles() ([]tc.Role, ReqInf, int, error) {
+ return to.GetRolesWithHdr(nil)
+}
+
+func (to *Session) GetRoleByIDWithHdr(id int, header http.Header) ([]tc.Role, ReqInf, int, error) {
route := fmt.Sprintf("%s/?id=%d", API_ROLES, id)
- resp, remoteAddr, errClient := to.RawRequest(http.MethodGet, route, nil, header)
+ resp, remoteAddr, errClient := to.RawRequestWithHdr(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
reqInf.StatusCode = resp.StatusCode
@@ -117,10 +121,15 @@ func (to *Session) GetRoleByID(id int, header http.Header) ([]tc.Role, ReqInf, i
return []tc.Role{}, reqInf, 0, errClient
}
-// GetRoleByName GETs a Role by the Role name.
-func (to *Session) GetRoleByName(name string, header http.Header) ([]tc.Role, ReqInf, int, error) {
+// GetRoleByID GETs a Role by the Role ID.
+// Deprecated: GetRoleByID will be removed in 6.0. Use GetRoleByIDWithHdr.
+func (to *Session) GetRoleByID(id int) ([]tc.Role, ReqInf, int, error) {
+ return to.GetRoleByIDWithHdr(id, nil)
+}
+
+func (to *Session) GetRoleByNameWithHdr(name string, header http.Header) ([]tc.Role, ReqInf, int, error) {
route := fmt.Sprintf("%s?name=%s", API_ROLES, url.QueryEscape(name))
- resp, remoteAddr, errClient := to.RawRequest(http.MethodGet, route, nil, header)
+ resp, remoteAddr, errClient := to.RawRequestWithHdr(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
reqInf.StatusCode = resp.StatusCode
@@ -140,13 +149,18 @@ func (to *Session) GetRoleByName(name string, header http.Header) ([]tc.Role, Re
return []tc.Role{}, reqInf, 0, errClient
}
-// GetRoleByQueryParams gets a Role by the Role query parameters.
-func (to *Session) GetRoleByQueryParams(queryParams map[string]string, header http.Header) ([]tc.Role, ReqInf, int, error) {
+// GetRoleByName GETs a Role by the Role name.
+// Deprecated: GetRoleByName will be removed in 6.0. Use GetRoleByNameWithHdr.
+func (to *Session) GetRoleByName(name string) ([]tc.Role, ReqInf, int, error) {
+ return to.GetRoleByNameWithHdr(name, nil)
+}
+
+func (to *Session) GetRoleByQueryParamsWithHdr(queryParams map[string]string, header http.Header) ([]tc.Role, ReqInf, int, error) {
route := fmt.Sprintf("%s?", API_ROLES)
for param, val := range queryParams {
route += fmt.Sprintf("%s=%s&", url.QueryEscape(param), url.QueryEscape(val))
}
- resp, remoteAddr, errClient := to.RawRequest(http.MethodGet, route, nil, header)
+ resp, remoteAddr, errClient := to.RawRequestWithHdr(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
reqInf.StatusCode = resp.StatusCode
@@ -166,10 +180,16 @@ func (to *Session) GetRoleByQueryParams(queryParams map[string]string, header ht
return []tc.Role{}, reqInf, 0, errClient
}
+// GetRoleByQueryParams gets a Role by the Role query parameters.
+// Deprecated: GetRoleByQueryParams will be removed in 6.0. Use GetRoleByQueryParamsWithHdr.
+func (to *Session) GetRoleByQueryParams(queryParams map[string]string) ([]tc.Role, ReqInf, int, error) {
+ return to.GetRoleByQueryParamsWithHdr(queryParams, nil)
+}
+
// DeleteRoleByID DELETEs a Role by ID.
func (to *Session) DeleteRoleByID(id int) (tc.Alerts, ReqInf, int, error) {
route := fmt.Sprintf("%s/?id=%d", API_ROLES, id)
- resp, remoteAddr, errClient := to.RawRequest(http.MethodDelete, route, nil, nil)
+ resp, remoteAddr, errClient := to.RawRequest(http.MethodDelete, route, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
defer resp.Body.Close()
diff --git a/traffic_ops/v3-client/server.go b/traffic_ops/v3-client/server.go
index ee1f612..2e2b8d8 100644
--- a/traffic_ops/v3-client/server.go
+++ b/traffic_ops/v3-client/server.go
@@ -46,7 +46,7 @@ func (to *Session) CreateServer(server tc.ServerNullable) (tc.Alerts, ReqInf, er
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if needAndCanFetch(server.CachegroupID, server.Cachegroup) {
- cg, _, err := to.GetCacheGroupNullableByName(*server.Cachegroup, nil)
+ cg, _, err := to.GetCacheGroupNullableByName(*server.Cachegroup)
if err != nil {
return alerts, reqInf, fmt.Errorf("no cachegroup named %s: %v", *server.Cachegroup, err)
}
@@ -59,7 +59,7 @@ func (to *Session) CreateServer(server tc.ServerNullable) (tc.Alerts, ReqInf, er
server.CachegroupID = cg[0].ID
}
if needAndCanFetch(server.CDNID, server.CDNName) {
- c, _, err := to.GetCDNByName(*server.CDNName, nil)
+ c, _, err := to.GetCDNByName(*server.CDNName)
if err != nil {
return alerts, reqInf, fmt.Errorf("no CDN named %s: %v", *server.CDNName, err)
}
@@ -69,7 +69,7 @@ func (to *Session) CreateServer(server tc.ServerNullable) (tc.Alerts, ReqInf, er
server.CDNID = &c[0].ID
}
if needAndCanFetch(server.PhysLocationID, server.PhysLocation) {
- ph, _, err := to.GetPhysLocationByName(*server.PhysLocation, nil)
+ ph, _, err := to.GetPhysLocationByName(*server.PhysLocation)
if err != nil {
return alerts, reqInf, fmt.Errorf("no physlocation named %s: %v", *server.PhysLocation, err)
}
@@ -79,7 +79,7 @@ func (to *Session) CreateServer(server tc.ServerNullable) (tc.Alerts, ReqInf, er
server.PhysLocationID = &ph[0].ID
}
if needAndCanFetch(server.ProfileID, server.Profile) {
- pr, _, err := to.GetProfileByName(*server.Profile, nil)
+ pr, _, err := to.GetProfileByName(*server.Profile)
if err != nil {
return alerts, reqInf, fmt.Errorf("no profile named %s: %v", *server.Profile, err)
}
@@ -89,7 +89,7 @@ func (to *Session) CreateServer(server tc.ServerNullable) (tc.Alerts, ReqInf, er
server.ProfileID = &pr[0].ID
}
if needAndCanFetch(server.StatusID, server.Status) {
- st, _, err := to.GetStatusByName(*server.Status, nil)
+ st, _, err := to.GetStatusByName(*server.Status)
if err != nil {
return alerts, reqInf, fmt.Errorf("no status named %s: %v", *server.Status, err)
}
@@ -99,7 +99,7 @@ func (to *Session) CreateServer(server tc.ServerNullable) (tc.Alerts, ReqInf, er
server.StatusID = &st[0].ID
}
if (server.TypeID == nil || *server.TypeID == 0) && server.Type != "" {
- ty, _, err := to.GetTypeByName(server.Type, nil)
+ ty, _, err := to.GetTypeByName(server.Type)
if err != nil {
return alerts, reqInf, fmt.Errorf("no type named %s: %v", server.Type, err)
}
@@ -148,12 +148,7 @@ func (to *Session) UpdateServerByID(id int, server tc.ServerNullable) (tc.Alerts
return alerts, reqInf, err
}
-// GetServers returns a list of Servers.
-// The 'params' parameter can be used to optionally pass URL "query string
-// parameters" in the request.
-// It returns, in order, the API response that Traffic Ops returned, a request
-// info object, and any error that occurred.
-func (to *Session) GetServers(params *url.Values, header http.Header) (tc.ServersV3Response, ReqInf, error) {
+func (to *Session) GetServersWithHdr(params *url.Values, header http.Header) (tc.ServersV3Response, ReqInf, error) {
route := API_SERVERS
if params != nil {
route += "?" + params.Encode()
@@ -178,14 +173,18 @@ func (to *Session) GetServers(params *url.Values, header http.Header) (tc.Server
return data, reqInf, err
}
-// GetFirstServer returns the first server in a servers GET response.
-// If no servers match, an error is returned.
+// GetServers returns a list of Servers.
// The 'params' parameter can be used to optionally pass URL "query string
// parameters" in the request.
// It returns, in order, the API response that Traffic Ops returned, a request
// info object, and any error that occurred.
-func (to *Session) GetFirstServer(params *url.Values, header http.Header) (tc.ServerNullable, ReqInf, error) {
- serversResponse, reqInf, err := to.GetServers(params, header)
+// Deprecated: GetServers will be removed in 6.0. Use GetServersWithHdr.
+func (to *Session) GetServers(params *url.Values) (tc.ServersV3Response, ReqInf, error) {
+ return to.GetServersWithHdr(params, nil)
+}
+
+func (to *Session) GetFirstServerWithHdr(params *url.Values, header http.Header) (tc.ServerNullable, ReqInf, error) {
+ serversResponse, reqInf, err := to.GetServers(params)
var firstServer tc.ServerNullable
if err != nil || reqInf.StatusCode == http.StatusNotModified {
return firstServer, reqInf, err
@@ -198,8 +197,18 @@ func (to *Session) GetFirstServer(params *url.Values, header http.Header) (tc.Se
return firstServer, reqInf, err
}
-// GetServerDetailsByHostName GETs Servers by the Server hostname.
-func (to *Session) GetServerDetailsByHostName(hostName string, header http.Header) ([]tc.ServerDetailV30, ReqInf, error) {
+// GetFirstServer returns the first server in a servers GET response.
+// If no servers match, an error is returned.
+// The 'params' parameter can be used to optionally pass URL "query string
+// parameters" in the request.
+// It returns, in order, the API response that Traffic Ops returned, a request
+// info object, and any error that occurred.
+// Deprecated: GetFirstServer will be removed in 6.0. Use GetFirstServerWithHdr.
+func (to *Session) GetFirstServer(params *url.Values) (tc.ServerNullable, ReqInf, error) {
+ return to.GetFirstServerWithHdr(params, nil)
+}
+
+func (to *Session) GetServerDetailsByHostNameWithHdr(hostName string, header http.Header) ([]tc.ServerDetailV30, ReqInf, error) {
v := url.Values{}
v.Add("hostName", hostName)
url := API_SERVERS_DETAILS + "?" + v.Encode()
@@ -225,6 +234,12 @@ func (to *Session) GetServerDetailsByHostName(hostName string, header http.Heade
return data.Response, reqInf, nil
}
+// GetServerDetailsByHostName GETs Servers by the Server hostname.
+// Deprecated: GetServerDetailsByHostName will be removed in 6.0. Use GetServerDetailsByHostNameWithHdr.
+func (to *Session) GetServerDetailsByHostName(hostName string) ([]tc.ServerDetailV30, ReqInf, error) {
+ return to.GetServerDetailsByHostNameWithHdr(hostName, nil)
+}
+
// DeleteServerByID DELETEs a Server by ID.
func (to *Session) DeleteServerByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d", API_SERVERS, id)
@@ -239,14 +254,12 @@ func (to *Session) DeleteServerByID(id int) (tc.Alerts, ReqInf, error) {
return alerts, reqInf, nil
}
-// GetServerFQDN returns the Fully Qualified Domain Name (FQDN) of the first
-// server found to have the Host Name 'n'.
-func (to *Session) GetServerFQDN(n string, header http.Header) (string, tc.Alerts, ReqInf, error) {
+func (to *Session) GetServerFQDNWithHdr(n string, header http.Header) (string, tc.Alerts, ReqInf, error) {
// TODO fix to only request one server
params := url.Values{}
params.Add("hostName", n)
- resp, reqInf, err := to.GetServers(¶ms, header)
+ resp, reqInf, err := to.GetServers(¶ms)
if err != nil {
return "", resp.Alerts, reqInf, err
}
@@ -265,11 +278,16 @@ func (to *Session) GetServerFQDN(n string, header http.Header) (string, tc.Alert
return fdn, resp.Alerts, reqInf, err
}
-// GetServersShortNameSearch returns all of the Host Names of servers that
-// contain 'shortname'.
-func (to *Session) GetServersShortNameSearch(shortname string, header http.Header) ([]string, tc.Alerts, ReqInf, error) {
+// GetServerFQDN returns the Fully Qualified Domain Name (FQDN) of the first
+// server found to have the Host Name 'n'.
+// Deprecated: GetServerFQDN will be removed in 6.0. Use GetServerFQDNWithHdr.
+func (to *Session) GetServerFQDN(n string) (string, tc.Alerts, ReqInf, error) {
+ return to.GetServerFQDNWithHdr(n, nil)
+}
+
+func (to *Session) GetServersShortNameSearchWithHdr(shortname string, header http.Header) ([]string, tc.Alerts, ReqInf, error) {
var serverlst []string
- resp, reqInf, err := to.GetServers(nil, header)
+ resp, reqInf, err := to.GetServers(nil)
if err != nil {
return serverlst, resp.Alerts, reqInf, err
}
@@ -287,6 +305,13 @@ func (to *Session) GetServersShortNameSearch(shortname string, header http.Heade
return serverlst, resp.Alerts, reqInf, err
}
+// GetServersShortNameSearch returns all of the Host Names of servers that
+// contain 'shortname'.
+// Deprecated: GetServersShortNameSearch will be removed in 6.0. Use GetServersShortNameSearchWithHdr.
+func (to *Session) GetServersShortNameSearch(shortname string) ([]string, tc.Alerts, ReqInf, error) {
+ return to.GetServersShortNameSearchWithHdr(shortname, nil)
+}
+
// AssignDeliveryServiceIDsToServerID assigns a set of Delivery Services to a
// single server, optionally replacing any and all existing assignments.
// 'server' should be the requested server's ID, 'dsIDs' should be a slice of
@@ -319,9 +344,7 @@ func (to *Session) AssignDeliveryServiceIDsToServerID(server int, dsIDs []int, r
return alerts, reqInf, err
}
-// GetServerIDDeliveryServices returns all of the Delivery Services assigned to the server identified
-// by the integral, unique identifier 'server'.
-func (to *Session) GetServerIDDeliveryServices(server int, header http.Header) ([]tc.DeliveryServiceNullable, ReqInf, error) {
+func (to *Session) GetServerIDDeliveryServicesWithHdr(server int, header http.Header) ([]tc.DeliveryServiceNullable, ReqInf, error) {
endpoint := fmt.Sprintf(API_SERVER_DELIVERY_SERVICES, server)
resp, remoteAddr, err := to.request(http.MethodGet, endpoint, nil, header)
@@ -339,8 +362,14 @@ func (to *Session) GetServerIDDeliveryServices(server int, header http.Header) (
return data.Response, reqInf, err
}
-// GetServerUpdateStatus GETs the Server Update Status by the Server hostname.
-func (to *Session) GetServerUpdateStatus(hostName string, header http.Header) (tc.ServerUpdateStatus, ReqInf, error) {
+// GetServerIDDeliveryServices returns all of the Delivery Services assigned to the server identified
+// by the integral, unique identifier 'server'.
+// Deprecated: GetServerIDDeliveryServices will be removed in 6.0. Use GetServerIDDeliveryServicesWithHdr.
+func (to *Session) GetServerIDDeliveryServices(server int) ([]tc.DeliveryServiceNullable, ReqInf, error) {
+ return to.GetServerIDDeliveryServicesWithHdr(server, nil)
+}
+
+func (to *Session) GetServerUpdateStatusWithHdr(hostName string, header http.Header) (tc.ServerUpdateStatus, ReqInf, error) {
path := API_SERVERS + `/` + hostName + `/update_status`
resp, remoteAddr, err := to.request(http.MethodGet, path, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -358,3 +387,9 @@ func (to *Session) GetServerUpdateStatus(hostName string, header http.Header) (t
}
return data[0], reqInf, nil
}
+
+// GetServerUpdateStatus GETs the Server Update Status by the Server hostname.
+// Deprecated: GetServerUpdateStatus will be removed in 6.0. Use GetServerUpdateStatusWithHdr.
+func (to *Session) GetServerUpdateStatus(hostName string) (tc.ServerUpdateStatus, ReqInf, error) {
+ return to.GetServerUpdateStatusWithHdr(hostName, nil)
+}
diff --git a/traffic_ops/v3-client/server_server_capabilities.go b/traffic_ops/v3-client/server_server_capabilities.go
index d7f48a6..10e9385 100644
--- a/traffic_ops/v3-client/server_server_capabilities.go
+++ b/traffic_ops/v3-client/server_server_capabilities.go
@@ -55,9 +55,7 @@ func (to *Session) DeleteServerServerCapability(serverID int, serverCapability s
return alerts, reqInf, err
}
-// GetServerServerCapabilities retrieves a list of Server Capabilities that are assigned to a Server
-// Callers can filter the results by server id, server host name and/or server capability via the optional parameters
-func (to *Session) GetServerServerCapabilities(serverID *int, serverHostName, serverCapability *string, header http.Header) ([]tc.ServerServerCapability, ReqInf, error) {
+func (to *Session) GetServerServerCapabilitiesWithHdr(serverID *int, serverHostName, serverCapability *string, header http.Header) ([]tc.ServerServerCapability, ReqInf, error) {
v := url.Values{}
if serverID != nil {
v.Add("serverId", strconv.Itoa(*serverID))
@@ -82,3 +80,10 @@ func (to *Session) GetServerServerCapabilities(serverID *int, serverHostName, se
}
return resp.Response, reqInf, nil
}
+
+// GetServerServerCapabilities retrieves a list of Server Capabilities that are assigned to a Server
+// Callers can filter the results by server id, server host name and/or server capability via the optional parameters
+// Deprecated: GetServerServerCapabilities will be removed in 6.0. Use GetServerServerCapabilitiesWithHdr.
+func (to *Session) GetServerServerCapabilities(serverID *int, serverHostName, serverCapability *string) ([]tc.ServerServerCapability, ReqInf, error) {
+ return to.GetServerServerCapabilitiesWithHdr(serverID, serverHostName, serverCapability, nil)
+}
diff --git a/traffic_ops/v3-client/servercapability.go b/traffic_ops/v3-client/servercapability.go
index 4952a97..0593708 100644
--- a/traffic_ops/v3-client/servercapability.go
+++ b/traffic_ops/v3-client/servercapability.go
@@ -49,8 +49,7 @@ func (to *Session) CreateServerCapability(sc tc.ServerCapability) (*tc.ServerCap
return &scResp, reqInf, nil
}
-// GetServerCapabilities returns all the server capabilities.
-func (to *Session) GetServerCapabilities(header http.Header) ([]tc.ServerCapability, ReqInf, error) {
+func (to *Session) GetServerCapabilitiesWithHdr(header http.Header) ([]tc.ServerCapability, ReqInf, error) {
resp, remoteAddr, err := to.request(http.MethodGet, API_SERVER_CAPABILITIES, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
@@ -72,8 +71,13 @@ func (to *Session) GetServerCapabilities(header http.Header) ([]tc.ServerCapabil
return data.Response, reqInf, nil
}
-// GetServerCapability returns the given server capability by name.
-func (to *Session) GetServerCapability(name string, header http.Header) (*tc.ServerCapability, ReqInf, error) {
+// GetServerCapabilities returns all the server capabilities.
+// Deprecated: GetServerCapabilities will be removed in 6.0. Use GetServerCapabilitiesWithHdr.
+func (to *Session) GetServerCapabilities() ([]tc.ServerCapability, ReqInf, error) {
+ return to.GetServerCapabilitiesWithHdr(nil)
+}
+
+func (to *Session) GetServerCapabilityWithHdr(name string, header http.Header) (*tc.ServerCapability, ReqInf, error) {
reqUrl := fmt.Sprintf("%s?name=%s", API_SERVER_CAPABILITIES, url.QueryEscape(name))
resp, remoteAddr, err := to.request(http.MethodGet, reqUrl, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -99,6 +103,12 @@ func (to *Session) GetServerCapability(name string, header http.Header) (*tc.Ser
return nil, reqInf, fmt.Errorf("expected one server capability in response, instead got: %+v", data.Response)
}
+// GetServerCapability returns the given server capability by name.
+// Deprecated: GetServerCapability will be removed in 6.0. Use GetServerCapabilityWithHdr.
+func (to *Session) GetServerCapability(name string) (*tc.ServerCapability, ReqInf, error) {
+ return to.GetServerCapabilityWithHdr(name, nil)
+}
+
// DeleteServerCapability deletes the given server capability by name.
func (to *Session) DeleteServerCapability(name string) (tc.Alerts, ReqInf, error) {
reqUrl := fmt.Sprintf("%s?name=%s", API_SERVER_CAPABILITIES, url.QueryEscape(name))
diff --git a/traffic_ops/v3-client/session.go b/traffic_ops/v3-client/session.go
index ef09324..632020d 100644
--- a/traffic_ops/v3-client/session.go
+++ b/traffic_ops/v3-client/session.go
@@ -124,7 +124,7 @@ func (to *Session) login() (net.Addr, error) {
}
path := apiBase + "/user/login"
- resp, remoteAddr, err := to.RawRequest("POST", path, credentials, nil)
+ resp, remoteAddr, err := to.RawRequest("POST", path, credentials)
resp, remoteAddr, err = to.ErrUnlessOKOrNotModified(resp, remoteAddr, err, path)
if err != nil {
return remoteAddr, errors.New("requesting: " + err.Error())
@@ -153,7 +153,7 @@ func (to *Session) login() (net.Addr, error) {
func (to *Session) loginWithToken(token []byte) (net.Addr, error) {
path := apiBase + "/user/login/token"
- resp, remoteAddr, err := to.RawRequest(http.MethodPost, path, token, nil)
+ resp, remoteAddr, err := to.RawRequest(http.MethodPost, path, token)
resp, remoteAddr, err = to.ErrUnlessOKOrNotModified(resp, remoteAddr, err, path)
if err != nil {
return remoteAddr, fmt.Errorf("requesting: %v", err)
@@ -182,7 +182,7 @@ func (to *Session) logout() (net.Addr, error) {
}
path := apiBase + "/user/logout"
- resp, remoteAddr, err := to.RawRequest("POST", path, credentials, nil)
+ resp, remoteAddr, err := to.RawRequest("POST", path, credentials)
resp, remoteAddr, err = to.ErrUnlessOKOrNotModified(resp, remoteAddr, err, path)
if err != nil {
return remoteAddr, errors.New("requesting: " + err.Error())
@@ -337,7 +337,7 @@ func (to *Session) getURL(path string) string { return to.URL + path }
// Returns the response, the remote address of the Traffic Ops instance used, and any error.
// The returned net.Addr is guaranteed to be either nil or valid, even if the returned error is not nil. Callers are encouraged to check and use the net.Addr if an error is returned, and use the remote address in their own error messages. This violates the Go idiom that a non-nil error implies all other values are undefined, but it's more straightforward than alternatives like typecasting.
func (to *Session) request(method, path string, body []byte, header http.Header) (*http.Response, net.Addr, error) {
- r, remoteAddr, err := to.RawRequest(method, path, body, header)
+ r, remoteAddr, err := to.RawRequestWithHdr(method, path, body, header)
if err != nil {
return r, remoteAddr, err
}
@@ -349,14 +349,11 @@ func (to *Session) request(method, path string, body []byte, header http.Header)
}
// return second request, even if it's another Unauthorized or Forbidden.
- r, remoteAddr, err = to.RawRequest(method, path, body, header)
+ r, remoteAddr, err = to.RawRequestWithHdr(method, path, body, header)
return to.ErrUnlessOKOrNotModified(r, remoteAddr, err, path)
}
-// RawRequest performs the actual HTTP request to Traffic Ops, simply, without trying to refresh the cookie if an Unauthorized code is returned.
-// Returns the response, the remote address of the Traffic Ops instance used, and any error.
-// The returned net.Addr is guaranteed to be either nil or valid, even if the returned error is not nil. Callers are encouraged to check and use the net.Addr if an error is returned, and use the remote address in their own error messages. This violates the Go idiom that a non-nil error implies all other values are undefined, but it's more straightforward than alternatives like typecasting.
-func (to *Session) RawRequest(method, path string, body []byte, header http.Header) (*http.Response, net.Addr, error) {
+func (to *Session) RawRequestWithHdr(method, path string, body []byte, header http.Header) (*http.Response, net.Addr, error) {
url := to.getURL(path)
var req *http.Request
@@ -397,6 +394,14 @@ func (to *Session) RawRequest(method, path string, body []byte, header http.Head
return resp, remoteAddr, nil
}
+// RawRequest performs the actual HTTP request to Traffic Ops, simply, without trying to refresh the cookie if an Unauthorized code is returned.
+// Returns the response, the remote address of the Traffic Ops instance used, and any error.
+// The returned net.Addr is guaranteed to be either nil or valid, even if the returned error is not nil. Callers are encouraged to check and use the net.Addr if an error is returned, and use the remote address in their own error messages. This violates the Go idiom that a non-nil error implies all other values are undefined, but it's more straightforward than alternatives like typecasting.
+// Deprecated: RawRequest will be removed in 6.0. Use RawRequestWithHdr.
+func (to *Session) RawRequest(method, path string, body []byte) (*http.Response, net.Addr, error) {
+ return to.RawRequestWithHdr(method, path, body, nil)
+}
+
type ReqInf struct {
CacheHitStatus CacheHitStatus
RemoteAddr net.Addr
diff --git a/traffic_ops/v3-client/staticdnsentry.go b/traffic_ops/v3-client/staticdnsentry.go
index 79a719d..3e470f9 100644
--- a/traffic_ops/v3-client/staticdnsentry.go
+++ b/traffic_ops/v3-client/staticdnsentry.go
@@ -31,7 +31,7 @@ const (
func staticDNSEntryIDs(to *Session, sdns *tc.StaticDNSEntry) error {
if sdns.CacheGroupID == 0 && sdns.CacheGroupName != "" {
- p, _, err := to.GetCacheGroupNullableByName(sdns.CacheGroupName, nil)
+ p, _, err := to.GetCacheGroupNullableByName(sdns.CacheGroupName)
if err != nil {
return err
}
@@ -45,7 +45,7 @@ func staticDNSEntryIDs(to *Session, sdns *tc.StaticDNSEntry) error {
}
if sdns.DeliveryServiceID == 0 && sdns.DeliveryService != "" {
- dses, _, err := to.GetDeliveryServiceByXMLIDNullable(sdns.DeliveryService, nil)
+ dses, _, err := to.GetDeliveryServiceByXMLIDNullable(sdns.DeliveryService)
if err != nil {
return err
}
@@ -59,7 +59,7 @@ func staticDNSEntryIDs(to *Session, sdns *tc.StaticDNSEntry) error {
}
if sdns.TypeID == 0 && sdns.Type != "" {
- types, _, err := to.GetTypeByName(sdns.Type, nil)
+ types, _, err := to.GetTypeByName(sdns.Type)
if err != nil {
return err
}
@@ -103,7 +103,7 @@ func (to *Session) UpdateStaticDNSEntryByID(id int, sdns tc.StaticDNSEntry) (tc.
return tc.Alerts{}, reqInf, 0, err
}
route := fmt.Sprintf("%s?id=%d", API_STATIC_DNS_ENTRIES, id)
- resp, remoteAddr, errClient := to.RawRequest(http.MethodPut, route, reqBody, nil)
+ resp, remoteAddr, errClient := to.RawRequest(http.MethodPut, route, reqBody)
if resp != nil {
defer resp.Body.Close()
var alerts tc.Alerts
@@ -115,8 +115,7 @@ func (to *Session) UpdateStaticDNSEntryByID(id int, sdns tc.StaticDNSEntry) (tc.
return tc.Alerts{}, reqInf, 0, errClient
}
-// GetStaticDNSEntries returns a list of Static DNS Entrys.
-func (to *Session) GetStaticDNSEntries(header http.Header) ([]tc.StaticDNSEntry, ReqInf, error) {
+func (to *Session) GetStaticDNSEntriesWithHdr(header http.Header) ([]tc.StaticDNSEntry, ReqInf, error) {
resp, remoteAddr, err := to.request(http.MethodGet, API_STATIC_DNS_ENTRIES, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
@@ -135,8 +134,13 @@ func (to *Session) GetStaticDNSEntries(header http.Header) ([]tc.StaticDNSEntry,
return data.Response, reqInf, nil
}
-// GetStaticDNSEntryByID GETs a Static DNS Entry by the Static DNS Entry's ID.
-func (to *Session) GetStaticDNSEntryByID(id int, header http.Header) ([]tc.StaticDNSEntry, ReqInf, error) {
+// GetStaticDNSEntries returns a list of Static DNS Entrys.
+// Deprecated: GetStaticDNSEntries will be removed in 6.0. Use GetStaticDNSEntriesWithHdr.
+func (to *Session) GetStaticDNSEntries() ([]tc.StaticDNSEntry, ReqInf, error) {
+ return to.GetStaticDNSEntriesWithHdr(nil)
+}
+
+func (to *Session) GetStaticDNSEntryByIDWithHdr(id int, header http.Header) ([]tc.StaticDNSEntry, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_STATIC_DNS_ENTRIES, id)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -159,8 +163,13 @@ func (to *Session) GetStaticDNSEntryByID(id int, header http.Header) ([]tc.Stati
return data.Response, reqInf, nil
}
-// GetStaticDNSEntriesByHost GETs a Static DNS Entry by the Static DNS Entry's host.
-func (to *Session) GetStaticDNSEntriesByHost(host string, header http.Header) ([]tc.StaticDNSEntry, ReqInf, error) {
+// GetStaticDNSEntryByID GETs a Static DNS Entry by the Static DNS Entry's ID.
+// Deprecated: GetStaticDNSEntryByID will be removed in 6.0. Use GetStaticDNSEntryByIDWithHdr.
+func (to *Session) GetStaticDNSEntryByID(id int) ([]tc.StaticDNSEntry, ReqInf, error) {
+ return to.GetStaticDNSEntryByIDWithHdr(id, nil)
+}
+
+func (to *Session) GetStaticDNSEntriesByHostWithHdr(host string, header http.Header) ([]tc.StaticDNSEntry, ReqInf, error) {
url := fmt.Sprintf("%s?host=%s", API_STATIC_DNS_ENTRIES, host)
resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -183,6 +192,12 @@ func (to *Session) GetStaticDNSEntriesByHost(host string, header http.Header) ([
return data.Response, reqInf, nil
}
+// GetStaticDNSEntriesByHost GETs a Static DNS Entry by the Static DNS Entry's host.
+// Deprecated: GetStaticDNSEntriesByHost will be removed in 6.0. Use GetStaticDNSEntriesByHostWithHdr.
+func (to *Session) GetStaticDNSEntriesByHost(host string) ([]tc.StaticDNSEntry, ReqInf, error) {
+ return to.GetStaticDNSEntriesByHostWithHdr(host, nil)
+}
+
// DeleteStaticDNSEntryByID DELETEs a Static DNS Entry by ID.
func (to *Session) DeleteStaticDNSEntryByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_STATIC_DNS_ENTRIES, id)
diff --git a/traffic_ops/v3-client/status.go b/traffic_ops/v3-client/status.go
index 4012cda..5324d70 100644
--- a/traffic_ops/v3-client/status.go
+++ b/traffic_ops/v3-client/status.go
@@ -67,8 +67,7 @@ func (to *Session) UpdateStatusByID(id int, status tc.Status) (tc.Alerts, ReqInf
return alerts, reqInf, nil
}
-// GetStatuses returns a list of Statuses.
-func (to *Session) GetStatuses(header http.Header) ([]tc.Status, ReqInf, error) {
+func (to *Session) GetStatusesWithHdr(header http.Header) ([]tc.Status, ReqInf, error) {
resp, remoteAddr, err := to.request(http.MethodGet, API_STATUSES, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
@@ -87,8 +86,13 @@ func (to *Session) GetStatuses(header http.Header) ([]tc.Status, ReqInf, error)
return data.Response, reqInf, nil
}
-// GetStatusByID GETs a Status by the Status ID.
-func (to *Session) GetStatusByID(id int, header http.Header) ([]tc.Status, ReqInf, error) {
+// GetStatuses returns a list of Statuses.
+// Deprecated: GetStatuses will be removed in 6.0. Use GetStatusesWithHdr.
+func (to *Session) GetStatuses() ([]tc.Status, ReqInf, error) {
+ return to.GetStatusesWithHdr(nil)
+}
+
+func (to *Session) GetStatusByIDWithHdr(id int, header http.Header) ([]tc.Status, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_STATUSES, id)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -111,8 +115,13 @@ func (to *Session) GetStatusByID(id int, header http.Header) ([]tc.Status, ReqIn
return data.Response, reqInf, nil
}
-// GetStatusByName GETs a Status by the Status name.
-func (to *Session) GetStatusByName(name string, header http.Header) ([]tc.Status, ReqInf, error) {
+// GetStatusByID GETs a Status by the Status ID.
+// Deprecated: GetStatusByID will be removed in 6.0. Use GetStatusByIDWithHdr.
+func (to *Session) GetStatusByID(id int) ([]tc.Status, ReqInf, error) {
+ return to.GetStatusByIDWithHdr(id, nil)
+}
+
+func (to *Session) GetStatusByNameWithHdr(name string, header http.Header) ([]tc.Status, ReqInf, error) {
url := fmt.Sprintf("%s?name=%s", API_STATUSES, name)
resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -135,6 +144,12 @@ func (to *Session) GetStatusByName(name string, header http.Header) ([]tc.Status
return data.Response, reqInf, nil
}
+// GetStatusByName GETs a Status by the Status name.
+// Deprecated: GetStatusByName will be removed in 6.0. Use GetStatusByNameWithHdr.
+func (to *Session) GetStatusByName(name string) ([]tc.Status, ReqInf, error) {
+ return to.GetStatusByNameWithHdr(name, nil)
+}
+
// DeleteStatusByID DELETEs a Status by ID.
func (to *Session) DeleteStatusByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d", API_STATUSES, id)
diff --git a/traffic_ops/v3-client/steering.go b/traffic_ops/v3-client/steering.go
index 658e1d4..9966a70 100644
--- a/traffic_ops/v3-client/steering.go
+++ b/traffic_ops/v3-client/steering.go
@@ -22,7 +22,7 @@ import (
"github.com/apache/trafficcontrol/lib/go-tc"
)
-func (to *Session) Steering(header http.Header) ([]tc.Steering, ReqInf, error) {
+func (to *Session) SteeringWithHdr(header http.Header) ([]tc.Steering, ReqInf, error) {
resp, remoteAddr, err := to.request(http.MethodGet, apiBase+`/steering`, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
@@ -42,3 +42,8 @@ func (to *Session) Steering(header http.Header) ([]tc.Steering, ReqInf, error) {
err = json.NewDecoder(resp.Body).Decode(&data)
return data.Response, reqInf, err
}
+
+// Deprecated: Steering will be removed in 6.0. Use SteeringWithHdr.
+func (to *Session) Steering() ([]tc.Steering, ReqInf, error) {
+ return to.SteeringWithHdr(nil)
+}
diff --git a/traffic_ops/v3-client/tenant.go b/traffic_ops/v3-client/tenant.go
index 3265e6a..d2b2162 100644
--- a/traffic_ops/v3-client/tenant.go
+++ b/traffic_ops/v3-client/tenant.go
@@ -28,8 +28,7 @@ import (
const API_TENANTS = apiBase + "/tenants"
const API_TENANT_ID = API_TENANTS + "/%v"
-// Tenants gets an array of Tenants.
-func (to *Session) Tenants(header http.Header) ([]tc.Tenant, ReqInf, error) {
+func (to *Session) TenantsWithHdr(header http.Header) ([]tc.Tenant, ReqInf, error) {
var data tc.GetTenantsResponse
reqInf, err := get(to, API_TENANTS, &data, header)
if reqInf.StatusCode == http.StatusNotModified {
@@ -42,9 +41,13 @@ func (to *Session) Tenants(header http.Header) ([]tc.Tenant, ReqInf, error) {
return data.Response, reqInf, nil
}
-// Tenant gets the Tenant identified by the passed integral, unique identifer - which
-// must be passed as a string.
-func (to *Session) Tenant(id string, header http.Header) (*tc.Tenant, ReqInf, error) {
+// Tenants gets an array of Tenants.
+// Deprecated: Tenants will be removed in 6.0. Use TenantsWithHdr.
+func (to *Session) Tenants() ([]tc.Tenant, ReqInf, error) {
+ return to.TenantsWithHdr(nil)
+}
+
+func (to *Session) TenantWithHdr(id string, header http.Header) (*tc.Tenant, ReqInf, error) {
var data tc.GetTenantsResponse
reqInf, err := get(to, fmt.Sprintf("%s?id=%v", API_TENANTS, id), &data, header)
if reqInf.StatusCode == http.StatusNotModified {
@@ -57,8 +60,14 @@ func (to *Session) Tenant(id string, header http.Header) (*tc.Tenant, ReqInf, er
return &data.Response[0], reqInf, nil
}
-// TenantByName gets the Tenant with the name it's passed.
-func (to *Session) TenantByName(name string, header http.Header) (*tc.Tenant, ReqInf, error) {
+// Tenant gets the Tenant identified by the passed integral, unique identifer - which
+// must be passed as a string.
+// Deprecated: Tenant will be removed in 6.0. Use TenantWithHdr.
+func (to *Session) Tenant(id string) (*tc.Tenant, ReqInf, error) {
+ return to.TenantWithHdr(id, nil)
+}
+
+func (to *Session) TenantByNameWithHdr(name string, header http.Header) (*tc.Tenant, ReqInf, error) {
var data tc.GetTenantsResponse
query := API_TENANTS + "?name=" + url.QueryEscape(name)
reqInf, err := get(to, query, &data, header)
@@ -78,10 +87,16 @@ func (to *Session) TenantByName(name string, header http.Header) (*tc.Tenant, Re
return ten, reqInf, err
}
+// TenantByName gets the Tenant with the name it's passed.
+// Deprecated: TenantByName will be removed in 6.0. Use TenantByNameWithHdr.
+func (to *Session) TenantByName(name string) (*tc.Tenant, ReqInf, error) {
+ return to.TenantByNameWithHdr(name, nil)
+}
+
// CreateTenant creates the Tenant it's passed.
func (to *Session) CreateTenant(t *tc.Tenant) (*tc.TenantResponse, error) {
if t.ParentID == 0 && t.ParentName != "" {
- tenant, _, err := to.TenantByName(t.ParentName, nil)
+ tenant, _, err := to.TenantByName(t.ParentName)
if err != nil {
return nil, err
}
diff --git a/traffic_ops/v3-client/topology.go b/traffic_ops/v3-client/topology.go
index c01f3cf..2a139c1 100644
--- a/traffic_ops/v3-client/topology.go
+++ b/traffic_ops/v3-client/topology.go
@@ -51,8 +51,7 @@ func (to *Session) CreateTopology(top tc.Topology) (*tc.TopologyResponse, ReqInf
return &topResp, reqInf, nil
}
-// GetTopologies returns all topologies.
-func (to *Session) GetTopologies(header http.Header) ([]tc.Topology, ReqInf, error) {
+func (to *Session) GetTopologiesWithHdr(header http.Header) ([]tc.Topology, ReqInf, error) {
resp, remoteAddr, err := to.request(http.MethodGet, ApiTopologies, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
@@ -71,8 +70,13 @@ func (to *Session) GetTopologies(header http.Header) ([]tc.Topology, ReqInf, err
return data.Response, reqInf, nil
}
-// GetTopology returns the given topology by name.
-func (to *Session) GetTopology(name string, header http.Header) (*tc.Topology, ReqInf, error) {
+// GetTopologies returns all topologies.
+// Deprecated: GetTopologies will be removed in 6.0. Use GetTopologiesWithHdr.
+func (to *Session) GetTopologies() ([]tc.Topology, ReqInf, error) {
+ return to.GetTopologiesWithHdr(nil)
+}
+
+func (to *Session) GetTopologyWithHdr(name string, header http.Header) (*tc.Topology, ReqInf, error) {
reqUrl := fmt.Sprintf("%s?name=%s", ApiTopologies, url.QueryEscape(name))
resp, remoteAddr, err := to.request(http.MethodGet, reqUrl, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -95,6 +99,12 @@ func (to *Session) GetTopology(name string, header http.Header) (*tc.Topology, R
return nil, reqInf, fmt.Errorf("expected one topology in response, instead got: %+v", data.Response)
}
+// GetTopology returns the given topology by name.
+// Deprecated: GetTopology will be removed in 6.0. Use GetTopologyWithHdr.
+func (to *Session) GetTopology(name string) (*tc.Topology, ReqInf, error) {
+ return to.GetTopologyWithHdr(name, nil)
+}
+
// UpdateTopology updates a Topology by name.
func (to *Session) UpdateTopology(name string, t tc.Topology) (*tc.TopologyResponse, ReqInf, error) {
var remoteAddr net.Addr
diff --git a/traffic_ops/v3-client/type.go b/traffic_ops/v3-client/type.go
index 0be0145..fe32257 100644
--- a/traffic_ops/v3-client/type.go
+++ b/traffic_ops/v3-client/type.go
@@ -68,10 +68,11 @@ func (to *Session) UpdateTypeByID(id int, typ tc.Type) (tc.Alerts, ReqInf, error
return alerts, reqInf, nil
}
-// GetTypes returns a list of Types. If a 'useInTable' parameter is passed, the returned Types
-// are restricted to those with that exact 'useInTable' property. Only exactly 1 or exactly 0
-// 'useInTable' parameters may be passed; passing more will result in an error being returned.
-func (to *Session) GetTypes(header http.Header, useInTable ...string) ([]tc.Type, ReqInf, error) {
+// GetTypesWithHdr returns a list of Types, with an http header and 'useInTable' parameters.
+// If a 'useInTable' parameter is passed, the returned Types are restricted to those with
+// that exact 'useInTable' property. Only exactly 1 or exactly 0 'useInTable' parameters may
+// be passed; passing more will result in an error being returned.
+func (to *Session) GetTypesWithHdr(header http.Header, useInTable []string) ([]tc.Type, ReqInf, error) {
if len(useInTable) > 1 {
return nil, ReqInf{}, errors.New("Please pass in a single value for the 'useInTable' parameter")
}
@@ -108,8 +109,16 @@ func (to *Session) GetTypes(header http.Header, useInTable ...string) ([]tc.Type
return types, reqInf, nil
}
-// GetTypeByID GETs a Type by the Type ID.
-func (to *Session) GetTypeByID(id int, header http.Header) ([]tc.Type, ReqInf, error) {
+// GetTypes returns a list of Types. If a 'useInTable' parameter is passed, the returned Types
+// are restricted to those with that exact 'useInTable' property. Only exactly 1 or exactly 0
+// 'useInTable' parameters may be passed; passing more will result in an error being returned.
+// Deprecated: GetTypes will be removed in 6.0. Use GetTypesWithHdr.
+func (to *Session) GetTypes(useInTable ...string) ([]tc.Type, ReqInf, error) {
+ return to.GetTypesWithHdr(nil, useInTable)
+}
+
+// GetTypeByID GETs a Type by the Type ID, and filters by http header params in the request.
+func (to *Session) GetTypeByIDWithHdr(id int, header http.Header) ([]tc.Type, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_TYPES, id)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -132,8 +141,13 @@ func (to *Session) GetTypeByID(id int, header http.Header) ([]tc.Type, ReqInf, e
return data.Response, reqInf, nil
}
-// GetTypeByName GET a Type by the Type name.
-func (to *Session) GetTypeByName(name string, header http.Header) ([]tc.Type, ReqInf, error) {
+// GetTypeByID GETs a Type by the Type ID.
+// Deprecated: GetTypeByID will be removed in 6.0. Use GetTypeByIDWithHdr.
+func (to *Session) GetTypeByID(id int) ([]tc.Type, ReqInf, error) {
+ return to.GetTypeByIDWithHdr(id, nil)
+}
+
+func (to *Session) GetTypeByNameWithHdr(name string, header http.Header) ([]tc.Type, ReqInf, error) {
url := fmt.Sprintf("%s?name=%s", API_TYPES, name)
resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
@@ -156,6 +170,12 @@ func (to *Session) GetTypeByName(name string, header http.Header) ([]tc.Type, Re
return data.Response, reqInf, nil
}
+// GetTypeByName GETs a Type by the Type name.
+// Deprecated: GetTypeByName will be removed in 6.0. Use GetTypeByNameWithHdr.
+func (to *Session) GetTypeByName(name string) ([]tc.Type, ReqInf, error) {
+ return to.GetTypeByNameWithHdr(name, nil)
+}
+
// DeleteTypeByID DELETEs a Type by ID.
func (to *Session) DeleteTypeByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d", API_TYPES, id)
diff --git a/traffic_ops/v3-client/user.go b/traffic_ops/v3-client/user.go
index 39a1124..2dc5d71 100644
--- a/traffic_ops/v3-client/user.go
+++ b/traffic_ops/v3-client/user.go
@@ -28,38 +28,57 @@ import (
"github.com/apache/trafficcontrol/lib/go-tc"
)
-// GetUsers returns all users accessible from current user
-func (to *Session) GetUsers(header http.Header) ([]tc.User, ReqInf, error) {
+func (to *Session) GetUsersWithHdr(header http.Header) ([]tc.User, ReqInf, error) {
data := tc.UsersResponse{}
route := fmt.Sprintf("%s/users", apiBase)
inf, err := get(to, route, &data, header)
return data.Response, inf, err
}
-// GetUsersByRole returns all users accessible from current user for a given role
-func (to *Session) GetUsersByRole(roleName string, header http.Header) ([]tc.User, ReqInf, error) {
+// GetUsers returns all users accessible from current user
+// Deprecated: GetUsers will be removed in 6.0. Use GetUsersWithHdr.
+func (to *Session) GetUsers() ([]tc.User, ReqInf, error) {
+ return to.GetUsersWithHdr(nil)
+}
+
+func (to *Session) GetUsersByRoleWithHdr(roleName string, header http.Header) ([]tc.User, ReqInf, error) {
data := tc.UsersResponse{}
route := fmt.Sprintf("%s/users?role=%s", apiBase, url.QueryEscape(roleName))
inf, err := get(to, route, &data, header)
return data.Response, inf, err
}
-func (to *Session) GetUserByID(id int, header http.Header) ([]tc.User, ReqInf, error) {
+// GetUsersByRole returns all users accessible from current user for a given role
+// Deprecated: GetUsersByRole will be removed in 6.0. Use GetUsersByRoleWithHdr.
+func (to *Session) GetUsersByRole(roleName string) ([]tc.User, ReqInf, error) {
+ return to.GetUsersByRoleWithHdr(roleName, nil)
+}
+
+func (to *Session) GetUserByIDWithHdr(id int, header http.Header) ([]tc.User, ReqInf, error) {
data := tc.UsersResponse{}
route := fmt.Sprintf("%s/users/%d", apiBase, id)
inf, err := get(to, route, &data, header)
return data.Response, inf, err
}
-func (to *Session) GetUserByUsername(username string, header http.Header) ([]tc.User, ReqInf, error) {
+// Deprecated: GetUserByID will be removed in 6.0. Use GetUserByIDWithHdr.
+func (to *Session) GetUserByID(id int) ([]tc.User, ReqInf, error) {
+ return to.GetUserByIDWithHdr(id, nil)
+}
+
+func (to *Session) GetUserByUsernameWithHdr(username string, header http.Header) ([]tc.User, ReqInf, error) {
data := tc.UsersResponse{}
route := fmt.Sprintf("%s/users?username=%s", apiBase, username)
inf, err := get(to, route, &data, header)
return data.Response, inf, err
}
-// GetUserCurrent gets information about the current user
-func (to *Session) GetUserCurrent(header http.Header) (*tc.UserCurrent, ReqInf, error) {
+// Deprecated: GetUserByUsername will be removed in 6.0. Use GetUserByUsernameWithHdr.
+func (to *Session) GetUserByUsername(username string) ([]tc.User, ReqInf, error) {
+ return to.GetUserByUsernameWithHdr(username, nil)
+}
+
+func (to *Session) GetUserCurrentWithHdr(header http.Header) (*tc.UserCurrent, ReqInf, error) {
route := apiBase + `/user/current`
resp := tc.UserCurrentResponse{}
reqInf, err := get(to, route, &resp, header)
@@ -69,6 +88,12 @@ func (to *Session) GetUserCurrent(header http.Header) (*tc.UserCurrent, ReqInf,
return &resp.Response, reqInf, nil
}
+// GetUserCurrent gets information about the current user
+// Deprecated: GetUserCurrent will be removed in 6.0. Use GetUserCurrentWithHdr.
+func (to *Session) GetUserCurrent() (*tc.UserCurrent, ReqInf, error) {
+ return to.GetUserCurrentWithHdr(nil)
+}
+
// UpdateCurrentUser replaces the current user data with the provided tc.User structure.
func (to *Session) UpdateCurrentUser(u tc.User) (*tc.UpdateUserResponse, ReqInf, error) {
var a net.Addr
@@ -97,7 +122,7 @@ func (to *Session) UpdateCurrentUser(u tc.User) (*tc.UpdateUserResponse, ReqInf,
// CreateUser creates a user
func (to *Session) CreateUser(user *tc.User) (*tc.CreateUserResponse, ReqInf, error) {
if user.TenantID == nil && user.Tenant != nil {
- tenant, _, err := to.TenantByName(*user.Tenant, nil)
+ tenant, _, err := to.TenantByName(*user.Tenant)
if err != nil {
return nil, ReqInf{}, err
}
@@ -111,7 +136,7 @@ func (to *Session) CreateUser(user *tc.User) (*tc.CreateUserResponse, ReqInf, er
}
if user.RoleName != nil && *user.RoleName != "" {
- roles, _, _, err := to.GetRoleByName(*user.RoleName, nil)
+ roles, _, _, err := to.GetRoleByName(*user.RoleName)
if err != nil {
return nil, ReqInf{}, err
}
diff --git a/traffic_ops_ort/atstccfg/toreqnew/toreqnew.go b/traffic_ops_ort/atstccfg/toreqnew/toreqnew.go
index fdf64da..e6dd91e 100644
--- a/traffic_ops_ort/atstccfg/toreqnew/toreqnew.go
+++ b/traffic_ops_ort/atstccfg/toreqnew/toreqnew.go
@@ -78,7 +78,7 @@ func (cl *TOClient) GetCDNDeliveryServices(cdnID int) ([]tc.DeliveryServiceNulla
err := torequtil.GetRetry(cl.NumRetries, "cdn_"+strconv.Itoa(cdnID)+"_deliveryservices", &deliveryServices, func(obj interface{}) error {
params := url.Values{}
params.Set("cdn", strconv.Itoa(cdnID))
- toDSes, reqInf, err := cl.C.GetDeliveryServicesV30(nil, params)
+ toDSes, reqInf, err := cl.C.GetDeliveryServicesV30WithHdr(nil, params)
if err != nil {
if IsUnsupportedErr(err) {
unsupported = true
@@ -103,7 +103,7 @@ func (cl *TOClient) GetTopologies() ([]tc.Topology, bool, error) {
topologies := []tc.Topology{}
unsupported := false
err := torequtil.GetRetry(cl.NumRetries, "topologies", &topologies, func(obj interface{}) error {
- toTopologies, reqInf, err := cl.C.GetTopologies(nil)
+ toTopologies, reqInf, err := cl.C.GetTopologies()
if err != nil {
if IsUnsupportedErr(err) {
unsupported = true
@@ -128,7 +128,7 @@ func (cl *TOClient) GetServerUpdateStatus(cacheHostName tc.CacheName) (tc.Server
status := tc.ServerUpdateStatus{}
unsupported := false
err := torequtil.GetRetry(cl.NumRetries, "server_update_status_"+string(cacheHostName), &status, func(obj interface{}) error {
- toStatus, reqInf, err := cl.C.GetServerUpdateStatus(string(cacheHostName), nil)
+ toStatus, reqInf, err := cl.C.GetServerUpdateStatus(string(cacheHostName))
if err != nil {
if IsUnsupportedErr(err) {
unsupported = true