You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2018/09/13 19:54:42 UTC
[trafficcontrol] branch master updated (0fac67f -> 5197a2d)
This is an automated email from the ASF dual-hosted git repository.
dewrich pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git.
from 0fac67f fixed compare.go compile error
new 65e27d2 Add TO Go cachegroups/id/deliveryservices
new 130baa8 Add TO Go cachegroups/dses API test, client funcs
new 5197a2d Remove TO unused func
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
lib/go-tc/deliveryservices.go | 15 ++
traffic_ops/client/asn.go | 32 +++
traffic_ops/client/coordinate.go | 23 ++
traffic_ops/client/deliveryserviceserver.go | 23 --
.../api/v13/cachegroupsdeliveryservices_test.go | 141 +++++++++++
.../testing/api/v13/deliveryserviceservers_test.go | 6 +-
.../traffic_ops_golang/cachegroup/dspost.go | 278 +++++++++++++++++++++
traffic_ops/traffic_ops_golang/routes.go | 1 +
8 files changed, 493 insertions(+), 26 deletions(-)
create mode 100644 traffic_ops/testing/api/v13/cachegroupsdeliveryservices_test.go
create mode 100644 traffic_ops/traffic_ops_golang/cachegroup/dspost.go
[trafficcontrol] 03/03: Remove TO unused func
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dewrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 5197a2da7e323976d5404ce135ff8c42cbed64ef
Author: Robert Butts <ro...@apache.org>
AuthorDate: Thu Sep 13 13:44:23 2018 -0600
Remove TO unused func
---
traffic_ops/traffic_ops_golang/cachegroup/dspost.go | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/traffic_ops/traffic_ops_golang/cachegroup/dspost.go b/traffic_ops/traffic_ops_golang/cachegroup/dspost.go
index 8ec3dee..5ab3bba 100644
--- a/traffic_ops/traffic_ops_golang/cachegroup/dspost.go
+++ b/traffic_ops/traffic_ops_golang/cachegroup/dspost.go
@@ -276,15 +276,3 @@ WHERE deliveryservice.id = ANY($1)
}
return tenantIDs, nil
}
-
-// FinishTx commits the transaction if commit is true when it's called, otherwise it rolls back the transaction. This is designed to be called in a defer.
-func FinishTx(tx *sql.Tx, commit *bool) {
- if tx == nil {
- return
- }
- if !*commit {
- tx.Rollback()
- return
- }
- tx.Commit()
-}
[trafficcontrol] 01/03: Add TO Go cachegroups/id/deliveryservices
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dewrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 65e27d2cb7c12b25c97bc98b09ffa6577bb6e1ff
Author: Robert Butts <ro...@apache.org>
AuthorDate: Fri May 18 17:52:02 2018 -0600
Add TO Go cachegroups/id/deliveryservices
---
.../traffic_ops_golang/cachegroup/dspost.go | 299 +++++++++++++++++++++
traffic_ops/traffic_ops_golang/routes.go | 1 +
2 files changed, 300 insertions(+)
diff --git a/traffic_ops/traffic_ops_golang/cachegroup/dspost.go b/traffic_ops/traffic_ops_golang/cachegroup/dspost.go
new file mode 100644
index 0000000..01ac0e9
--- /dev/null
+++ b/traffic_ops/traffic_ops_golang/cachegroup/dspost.go
@@ -0,0 +1,299 @@
+package cachegroup
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import (
+ "database/sql"
+ "encoding/json"
+ "errors"
+ "fmt"
+ "net/http"
+ "strconv"
+
+ "github.com/apache/trafficcontrol/lib/go-tc"
+ "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api"
+ "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth"
+ "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant"
+
+ "github.com/lib/pq"
+)
+
+type CachegroupPostDSReq struct {
+ DeliveryServices []int64 `json:"deliveryServices"`
+}
+
+func DSPostHandler(w http.ResponseWriter, r *http.Request) {
+ inf, userErr, sysErr, errCode := api.NewInfo(r, []string{"id"}, []string{"id"})
+ if userErr != nil || sysErr != nil {
+ api.HandleErr(w, r, inf.Tx.Tx, errCode, userErr, sysErr)
+ return
+ }
+ defer inf.Close()
+
+ req := CachegroupPostDSReq{}
+ if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+ api.HandleErr(w, r, inf.Tx.Tx, http.StatusBadRequest, errors.New("malformed JSON: "+err.Error()), nil)
+ return
+ }
+ vals := map[string]interface{}{
+ "alerts": tc.CreateAlerts(tc.SuccessLevel, "Delivery services successfully assigned to all the servers of cache group "+strconv.Itoa(inf.IntParams["id"])+".").Alerts,
+ }
+ api.RespWriterVals(w, r, inf.Tx.Tx, vals)(postDSes(inf.Tx.Tx, inf.User, int64(inf.IntParams["id"]), req.DeliveryServices))
+}
+
+type CacheGroupPostDSResp struct {
+ ID int64 `json:"id"`
+ ServerNames []tc.CacheName `json:"serverNames"`
+ DeliveryServices []int64 `json:"deliveryServices"`
+}
+
+func postDSes(tx *sql.Tx, user *auth.CurrentUser, cgID int64, dsIDs []int64) (CacheGroupPostDSResp, error) {
+ cdnName, err := getCachegroupCDN(tx, cgID)
+ if err != nil {
+ return CacheGroupPostDSResp{}, errors.New("getting cachegroup CDN: " + err.Error())
+ }
+
+ tenantIDs, err := getDSTenants(tx, dsIDs)
+ if err != nil {
+ return CacheGroupPostDSResp{}, errors.New("getting delivery service tennat IDs: " + err.Error())
+ }
+ for _, tenantID := range tenantIDs {
+ ok, err := tenant.IsResourceAuthorizedToUserTx(int(tenantID), user, tx)
+ if err != nil {
+ return CacheGroupPostDSResp{}, errors.New("checking tenancy: " + err.Error())
+ }
+ if !ok {
+ return CacheGroupPostDSResp{}, errors.New("not authorized for delivery service tenant " + strconv.FormatInt(tenantID, 10))
+ }
+ }
+
+ if err := verifyDSesCDN(tx, dsIDs, cdnName); err != nil {
+ return CacheGroupPostDSResp{}, errors.New("verifying delivery service CDNs match cachegroup server CDNs: " + err.Error())
+ }
+ cgServers, err := getCachegroupServers(tx, cgID)
+ if err != nil {
+ return CacheGroupPostDSResp{}, errors.New("getting cachegroup server names " + err.Error())
+ }
+ if err := insertCachegroupDSes(tx, cgID, dsIDs); err != nil {
+ return CacheGroupPostDSResp{}, errors.New("inserting cachegroup delivery services: " + err.Error())
+ }
+
+ if err := updateParams(tx, dsIDs); err != nil {
+ return CacheGroupPostDSResp{}, errors.New("updating delivery service parameters: " + err.Error())
+ }
+ api.CreateChangeLogRawTx(api.ApiChange, fmt.Sprintf("assign servers in cache group %v to deliveryservices %v", cgID, dsIDs), user, tx)
+ return CacheGroupPostDSResp{ID: cgID, ServerNames: cgServers, DeliveryServices: dsIDs}, nil
+}
+
+func insertCachegroupDSes(tx *sql.Tx, cgID int64, dsIDs []int64) error {
+ _, err := tx.Exec(`
+INSERT INTO deliveryservice_server (deliveryservice, server) (
+ SELECT unnest($1::int[]), server.id
+ FROM server
+ JOIN type on type.id = server.type
+ WHERE server.cachegroup = $2
+ AND (type.name LIKE 'EDGE%' OR type.name LIKE 'ORG%')
+) ON CONFLICT DO NOTHING
+`, pq.Array(dsIDs), cgID)
+ if err != nil {
+ return errors.New("inserting cachegroup servers: " + err.Error())
+ }
+ return nil
+}
+
+func getCachegroupServers(tx *sql.Tx, cgID int64) ([]tc.CacheName, error) {
+ q := `
+SELECT server.host_name FROM server
+JOIN type on type.id = server.type
+WHERE server.cachegroup = $1
+AND (type.name LIKE 'EDGE%' OR type.name LIKE 'ORG%')
+`
+ rows, err := tx.Query(q, cgID)
+ if err != nil {
+ return nil, errors.New("selecting cachegroup servers: " + err.Error())
+ }
+ defer rows.Close()
+ names := []tc.CacheName{}
+ for rows.Next() {
+ name := ""
+ if err := rows.Scan(&name); err != nil {
+ return nil, errors.New("querying cachegroup server names: " + err.Error())
+ }
+ names = append(names, tc.CacheName(name))
+ }
+ return names, nil
+}
+
+func verifyDSesCDN(tx *sql.Tx, dsIDs []int64, cdn string) error {
+ q := `
+SELECT count(cdn.name)
+FROM cdn
+JOIN deliveryservice as ds on ds.cdn_id = cdn.id
+WHERE ds.id = ANY($1::bigint[])
+AND cdn.name <> $2::text
+`
+ count := 0
+ if err := tx.QueryRow(q, pq.Array(dsIDs), cdn).Scan(&count); err != nil {
+ return errors.New("querying cachegroup CDNs: " + err.Error())
+ }
+ if count > 0 {
+ return errors.New("servers/deliveryservices do not belong to same cdn '" + cdn + "'")
+ }
+ return nil
+}
+
+func getCachegroupCDN(tx *sql.Tx, cgID int64) (string, error) {
+ q := `
+SELECT cdn.name
+FROM cdn
+JOIN server on server.cdn_id = cdn.id
+JOIN type on server.type = type.id
+WHERE server.cachegroup = $1
+AND (type.name LIKE 'EDGE%' OR type.name LIKE 'ORG%')
+`
+ rows, err := tx.Query(q, cgID)
+ if err != nil {
+ return "", errors.New("selecting cachegroup CDNs: " + err.Error())
+ }
+ defer rows.Close()
+ cdn := ""
+ for rows.Next() {
+ serverCDN := ""
+ if err := rows.Scan(&serverCDN); err != nil {
+ return "", errors.New("scanning cachegroup CDN: " + err.Error())
+ }
+ if cdn == "" {
+ cdn = serverCDN
+ }
+ if cdn != serverCDN {
+ return "", errors.New("cachegroup servers have different CDNs '" + cdn + "' and '" + serverCDN + "'")
+ }
+ }
+ if cdn == "" {
+ return "", errors.New("no edge or origin servers found on cachegroup " + strconv.FormatInt(cgID, 10))
+ }
+ return cdn, nil
+}
+
+// updateParams updated the header rewrite, cacheurl, and regex remap params for the given edge caches, on the given delivery services. NOTE it does not update Mid params.
+func updateParams(tx *sql.Tx, dsIDs []int64) error {
+ if err := updateDSParam(tx, dsIDs, "hdr_rw_", "edge_header_rewrite"); err != nil {
+ return err
+ }
+ if err := updateDSParam(tx, dsIDs, "cacheurl_", "cacheurl"); err != nil {
+ return err
+ }
+ if err := updateDSParam(tx, dsIDs, "regex_remap_", "regex_remap"); err != nil {
+ return err
+ }
+ return nil
+}
+
+func updateDSParam(tx *sql.Tx, dsIDs []int64, paramPrefix string, dsField string) error {
+ _, err := tx.Exec(`
+DELETE FROM parameter
+WHERE name = 'location'
+AND config_file IN (
+ SELECT CONCAT('`+paramPrefix+`', xml_id, '.config')
+ FROM deliveryservice as ds
+ WHERE ds.id = ANY($1)
+ AND (ds.`+dsField+` IS NULL OR ds.`+dsField+` = '')
+)
+`, pq.Array(dsIDs))
+ if err != nil {
+ return err
+ }
+
+ rows, err := tx.Query(`
+WITH ats_config_location AS (
+ SELECT TRIM(TRAILING '/' FROM value) as v FROM parameter WHERE name = 'location' AND config_file = 'remap.config'
+)
+INSERT INTO parameter (name, config_file, value) (
+ SELECT
+ 'location' as name,
+ CONCAT('`+paramPrefix+`', xml_id, '.config'),
+ (select v from ats_config_location)
+ FROM deliveryservice WHERE id = ANY($1)
+) ON CONFLICT (name, config_file, value) DO UPDATE SET id = EXCLUDED.id RETURNING id
+`, pq.Array(dsIDs))
+ if err != nil {
+ return errors.New("inserting parameters: " + err.Error())
+ }
+ ids := []int64{}
+ for rows.Next() {
+ id := int64(0)
+ if err := rows.Scan(&id); err != nil {
+ return errors.New("scanning inserted parameters: " + err.Error())
+ }
+ ids = append(ids, id)
+ }
+
+ _, err = tx.Exec(`
+INSERT INTO profile_parameter (parameter, profile) (
+ SELECT UNNEST($1::int[]), server.profile
+ FROM server
+ JOIN deliveryservice_server as dss ON dss.server = server.id
+ JOIN deliveryservice as ds ON ds.id = dss.deliveryservice
+ WHERE ds.id = ANY($2)
+) ON CONFLICT DO NOTHING
+`, pq.Array(ids), pq.Array(dsIDs))
+ if err != nil {
+ return errors.New("inserting profile parameters: " + err.Error())
+ }
+ return nil
+}
+
+func deleteConfigFile(tx *sql.Tx, configFile string) error {
+ _, err := tx.Exec(`DELETE FROM parameter WHERE name = 'location' AND config_file = $1`, configFile)
+ return err
+}
+
+func getDSTenants(tx *sql.Tx, dsIDs []int64) ([]int64, error) {
+ q := `
+SELECT COALESCE(tenant_id, 0) FROM deliveryservice
+WHERE deliveryservice.id = ANY($1)
+`
+ rows, err := tx.Query(q, pq.Array(dsIDs))
+ if err != nil {
+ return nil, errors.New("selecting delivery service tenants: " + err.Error())
+ }
+ defer rows.Close()
+ tenantIDs := []int64{}
+ for rows.Next() {
+ id := int64(0)
+ if err := rows.Scan(&id); err != nil {
+ return nil, errors.New("querying cachegroup delivery service tenants: " + err.Error())
+ }
+ tenantIDs = append(tenantIDs, id)
+ }
+ return tenantIDs, nil
+}
+
+// FinishTx commits the transaction if commit is true when it's called, otherwise it rolls back the transaction. This is designed to be called in a defer.
+func FinishTx(tx *sql.Tx, commit *bool) {
+ if tx == nil {
+ return
+ }
+ if !*commit {
+ tx.Rollback()
+ return
+ }
+ tx.Commit()
+}
diff --git a/traffic_ops/traffic_ops_golang/routes.go b/traffic_ops/traffic_ops_golang/routes.go
index 498f248..f49164e 100644
--- a/traffic_ops/traffic_ops_golang/routes.go
+++ b/traffic_ops/traffic_ops_golang/routes.go
@@ -109,6 +109,7 @@ func Routes(d ServerData) ([]Route, []RawRoute, http.Handler, error) {
{1.1, http.MethodDelete, `cachegroups/{id}$`, api.DeleteHandler(cachegroup.GetTypeSingleton()), auth.PrivLevelOperations, Authenticated, nil},
{1.1, http.MethodPost, `cachegroups/{id}/queue_update$`, cachegroup.QueueUpdates, auth.PrivLevelOperations, Authenticated, nil},
+ {1.1, http.MethodPost, `cachegroups/{id}/deliveryservices/?$`, cachegroup.DSPostHandler, auth.PrivLevelOperations, Authenticated, nil},
//CDN
{1.1, http.MethodGet, `cdns/name/{name}/sslkeys/?(\.json)?$`, cdn.GetSSLKeys, auth.PrivLevelAdmin, Authenticated, nil},
[trafficcontrol] 02/03: Add TO Go cachegroups/dses API test,
client funcs
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dewrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 130baa85b122f2827621c98f9e87b3245e18d80b
Author: Robert Butts <ro...@apache.org>
AuthorDate: Thu Jun 28 08:18:42 2018 -0600
Add TO Go cachegroups/dses API test, client funcs
---
lib/go-tc/deliveryservices.go | 15 +++
traffic_ops/client/asn.go | 32 +++++
traffic_ops/client/coordinate.go | 23 ++++
traffic_ops/client/deliveryserviceserver.go | 23 ----
.../api/v13/cachegroupsdeliveryservices_test.go | 141 +++++++++++++++++++++
.../testing/api/v13/deliveryserviceservers_test.go | 6 +-
.../traffic_ops_golang/cachegroup/dspost.go | 33 ++---
7 files changed, 226 insertions(+), 47 deletions(-)
diff --git a/lib/go-tc/deliveryservices.go b/lib/go-tc/deliveryservices.go
index b92d549..effa711 100644
--- a/lib/go-tc/deliveryservices.go
+++ b/lib/go-tc/deliveryservices.go
@@ -559,6 +559,21 @@ type DSServerIDs struct {
Replace *bool `json:"replace"`
}
+type CachegroupPostDSReq struct {
+ DeliveryServices []int64 `json:"deliveryServices"`
+}
+
+type CacheGroupPostDSResp struct {
+ ID util.JSONIntStr `json:"id"`
+ ServerNames []CacheName `json:"serverNames"`
+ DeliveryServices []int64 `json:"deliveryServices"`
+}
+
+type CacheGroupPostDSRespResponse struct {
+ Alerts
+ Response CacheGroupPostDSResp `json:"response"`
+}
+
type AssignedDsResponse struct {
ServerID int `json:"serverId"`
DSIds []int `json:"dsIds"`
diff --git a/traffic_ops/client/asn.go b/traffic_ops/client/asn.go
index 2a38c65..89204c7 100644
--- a/traffic_ops/client/asn.go
+++ b/traffic_ops/client/asn.go
@@ -17,9 +17,11 @@ package client
import (
"encoding/json"
+ "errors"
"fmt"
"net"
"net/http"
+ "strconv"
"github.com/apache/trafficcontrol/lib/go-tc"
)
@@ -130,3 +132,33 @@ func (to *Session) DeleteASNByASN(asn int) (tc.Alerts, ReqInf, error) {
err = json.NewDecoder(resp.Body).Decode(&alerts)
return alerts, reqInf, nil
}
+
+func (to *Session) DeleteDeliveryServiceServer(dsID int, serverID int) (tc.Alerts, ReqInf, error) {
+ route := apiBase + `/deliveryservice_server/` + strconv.Itoa(dsID) + "/" + strconv.Itoa(serverID)
+ reqResp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if err != nil {
+ return tc.Alerts{}, reqInf, errors.New("requesting from Traffic Ops: " + err.Error())
+ }
+ defer reqResp.Body.Close()
+ resp := tc.Alerts{}
+ if err = json.NewDecoder(reqResp.Body).Decode(&resp); err != nil {
+ return tc.Alerts{}, reqInf, errors.New("decoding response: " + err.Error())
+ }
+ return resp, reqInf, nil
+}
+
+func (to *Session) GetDeliveryServiceServers() (tc.DeliveryServiceServerResponse, ReqInf, error) {
+ route := apiBase + `/deliveryserviceserver`
+ reqResp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if err != nil {
+ return tc.DeliveryServiceServerResponse{}, reqInf, errors.New("requesting from Traffic Ops: " + err.Error())
+ }
+ defer reqResp.Body.Close()
+ resp := tc.DeliveryServiceServerResponse{}
+ if err = json.NewDecoder(reqResp.Body).Decode(&resp); err != nil {
+ return tc.DeliveryServiceServerResponse{}, reqInf, errors.New("decoding response: " + err.Error())
+ }
+ return resp, reqInf, nil
+}
diff --git a/traffic_ops/client/coordinate.go b/traffic_ops/client/coordinate.go
index 57b051c..ab209bd 100644
--- a/traffic_ops/client/coordinate.go
+++ b/traffic_ops/client/coordinate.go
@@ -17,9 +17,11 @@ package client
import (
"encoding/json"
+ "errors"
"fmt"
"net"
"net/http"
+ "strconv"
"github.com/apache/trafficcontrol/lib/go-tc"
)
@@ -130,3 +132,24 @@ func (to *Session) DeleteCoordinateByID(id int) (tc.Alerts, ReqInf, error) {
err = json.NewDecoder(resp.Body).Decode(&alerts)
return alerts, reqInf, nil
}
+
+func (to *Session) SetCachegroupDeliveryServices(cgID int, dsIDs []int64) (tc.CacheGroupPostDSRespResponse, ReqInf, error) {
+ uri := apiBase + `/cachegroups/` + strconv.Itoa(cgID) + `/deliveryservices`
+ req := tc.CachegroupPostDSReq{DeliveryServices: dsIDs}
+ reqBody, err := json.Marshal(req)
+ reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss}
+ if err != nil {
+ return tc.CacheGroupPostDSRespResponse{}, reqInf, err
+ }
+ reqResp, _, err := to.request(http.MethodPost, uri, reqBody)
+ if err != nil {
+ return tc.CacheGroupPostDSRespResponse{}, reqInf, errors.New("requesting from Traffic Ops: " + err.Error())
+ }
+ defer reqResp.Body.Close()
+
+ resp := tc.CacheGroupPostDSRespResponse{}
+ if err := json.NewDecoder(reqResp.Body).Decode(&resp); err != nil {
+ return tc.CacheGroupPostDSRespResponse{}, reqInf, errors.New("decoding response: " + err.Error())
+ }
+ return resp, reqInf, nil
+}
diff --git a/traffic_ops/client/deliveryserviceserver.go b/traffic_ops/client/deliveryserviceserver.go
index 7f30d9b..4e618ea 100644
--- a/traffic_ops/client/deliveryserviceserver.go
+++ b/traffic_ops/client/deliveryserviceserver.go
@@ -17,23 +17,11 @@ package client
import (
"encoding/json"
- "strconv"
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/lib/go-util"
)
-func (to *Session) GetDeliveryServiceServers() ([]tc.DeliveryServiceServer, ReqInf, error) {
- path := apiBase + `/deliveryserviceserver`
- // deliveryService
- resp := tc.DeliveryServiceServerResponse{}
- reqInf, err := get(to, path, &resp)
- if err != nil {
- return nil, reqInf, err
- }
- return resp.Response, reqInf, nil
-}
-
// CreateDeliveryServiceServers associates the given servers with the given delivery services. If replace is true, it deletes any existing associations for the given delivery service.
func (to *Session) CreateDeliveryServiceServers(dsID int, serverIDs []int, replace bool) (*tc.DSServerIDs, error) {
path := apiBase + `/deliveryserviceserver`
@@ -54,14 +42,3 @@ func (to *Session) CreateDeliveryServiceServers(dsID int, serverIDs []int, repla
}
return &resp.Response, nil
}
-
-// DeleteDeliveryService deletes the given delivery service server association.
-func (to *Session) DeleteDeliveryServiceServer(dsID int, serverID int) error {
- path := apiBase + `/deliveryservice_server/` + strconv.Itoa(dsID) + `/` + strconv.Itoa(serverID)
- resp := struct{ tc.Alerts }{}
- err := del(to, path, &resp)
- if err != nil {
- return err
- }
- return nil
-}
diff --git a/traffic_ops/testing/api/v13/cachegroupsdeliveryservices_test.go b/traffic_ops/testing/api/v13/cachegroupsdeliveryservices_test.go
new file mode 100644
index 0000000..10abfee
--- /dev/null
+++ b/traffic_ops/testing/api/v13/cachegroupsdeliveryservices_test.go
@@ -0,0 +1,141 @@
+package v13
+
+/*
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+import (
+ "github.com/apache/trafficcontrol/lib/go-log"
+ "testing"
+)
+
+func TestDeliveryServicesCachegroups(t *testing.T) {
+ CreateTestCDNs(t)
+ CreateTestTypes(t)
+ CreateTestProfiles(t)
+ CreateTestStatuses(t)
+ CreateTestDivisions(t)
+ CreateTestRegions(t)
+ CreateTestPhysLocations(t)
+ CreateTestCacheGroups(t)
+ CreateTestServers(t)
+ CreateTestDeliveryServices(t)
+
+ CreateTestCachegroupsDeliveryServices(t)
+ DeleteTestCachegroupsDeliveryServices(t)
+
+ DeleteTestDeliveryServices(t)
+ DeleteTestServers(t)
+ DeleteTestCacheGroups(t)
+ DeleteTestPhysLocations(t)
+ DeleteTestRegions(t)
+ DeleteTestDivisions(t)
+ DeleteTestStatuses(t)
+ DeleteTestProfiles(t)
+ DeleteTestTypes(t)
+ DeleteTestCDNs(t)
+}
+
+const TestEdgeServerCacheGroupName = "cachegroup1" // TODO this is the name hard-coded in the create servers test; change to be dynamic
+
+func CreateTestCachegroupsDeliveryServices(t *testing.T) {
+ log.Debugln("CreateTestCachegroupsDeliveryServices")
+
+ dss, _, err := TOSession.GetDeliveryServiceServers()
+ if err != nil {
+ t.Fatalf("cannot GET DeliveryServiceServers: %v\n", err)
+ }
+ if len(dss.Response) > 0 {
+ t.Fatalf("cannot test cachegroups delivery services: expected no initial delivery service servers, actual %v\n", len(dss.Response))
+ }
+
+ dses, _, err := TOSession.GetDeliveryServices()
+ if err != nil {
+ t.Fatalf("cannot GET DeliveryServices: %v - %v\n", err, dses)
+ }
+
+ clientCGs, _, err := TOSession.GetCacheGroupByName(TestEdgeServerCacheGroupName)
+ if err != nil {
+ t.Fatalf("getting cachegroup: " + err.Error() + "\n")
+ }
+ if len(clientCGs) != 1 {
+ t.Fatalf("getting cachegroup expected 1, got %v\n", len(clientCGs))
+ }
+ clientCG := clientCGs[0]
+
+ cgID := clientCG.ID
+
+ dsIDs := []int64{}
+ for _, ds := range dses {
+ dsIDs = append(dsIDs, int64(ds.ID))
+ }
+
+ resp, _, err := TOSession.SetCachegroupDeliveryServices(cgID, dsIDs)
+ if err != nil {
+ t.Fatalf("setting cachegroup delivery services returned error: %v\n", err)
+ }
+ if len(resp.Response.ServerNames) == 0 {
+ t.Fatalf("setting cachegroup delivery services returned success, but no servers set\n")
+ }
+
+ for _, serverName := range resp.Response.ServerNames {
+ servers, _, err := TOSession.GetServerByHostName(string(serverName))
+ if err != nil {
+ t.Fatalf("getting server: " + err.Error())
+ }
+ if len(servers) != 1 {
+ t.Fatalf("getting servers: expected 1 got %v\n", len(servers))
+ }
+ server := servers[0]
+ serverID := server.ID
+
+ serverDSes, _, err := TOSession.GetDeliveryServicesByServer(serverID)
+
+ for _, dsID := range dsIDs {
+ found := false
+ for _, serverDS := range serverDSes {
+ if serverDS.ID == int(dsID) {
+ found = true
+ break
+ }
+ }
+ if !found {
+ t.Fatalf("post succeeded, but didn't assign delivery service %v to server\n", dsID)
+ }
+ }
+ }
+}
+
+func DeleteTestCachegroupsDeliveryServices(t *testing.T) {
+ log.Debugln("DeleteTestCachegroupsDeliveryServices")
+
+ dss, _, err := TOSession.GetDeliveryServiceServers()
+ if err != nil {
+ t.Fatalf("cannot GET DeliveryServiceServers: %v\n", err)
+ }
+ for _, ds := range dss.Response {
+ _, _, err := TOSession.DeleteDeliveryServiceServer(*ds.DeliveryService, *ds.Server)
+ if err != nil {
+ t.Fatalf("deleting delivery service servers: " + err.Error() + "\n")
+ }
+ }
+
+ dss, _, err = TOSession.GetDeliveryServiceServers()
+ if err != nil {
+ t.Fatalf("cannot GET DeliveryServiceServers: %v\n", err)
+ }
+ if len(dss.Response) > 0 {
+ t.Fatalf("deleting delivery service servers: delete succeeded, expected empty subsequent get, actual %v\n", len(dss.Response))
+ }
+}
diff --git a/traffic_ops/testing/api/v13/deliveryserviceservers_test.go b/traffic_ops/testing/api/v13/deliveryserviceservers_test.go
index 2c60ae1..99e61ac 100644
--- a/traffic_ops/testing/api/v13/deliveryserviceservers_test.go
+++ b/traffic_ops/testing/api/v13/deliveryserviceservers_test.go
@@ -79,7 +79,7 @@ func DeleteTestDeliveryServiceServers(t *testing.T) {
}
found := false
- for _, dss := range dsServers {
+ for _, dss := range dsServers.Response {
if *dss.DeliveryService == ds.ID && *dss.Server == server.ID {
found = true
break
@@ -89,7 +89,7 @@ func DeleteTestDeliveryServiceServers(t *testing.T) {
t.Fatalf("POST delivery service servers returned success, but ds-server not in GET")
}
- if err := TOSession.DeleteDeliveryServiceServer(ds.ID, server.ID); err != nil {
+ if _, _, err := TOSession.DeleteDeliveryServiceServer(ds.ID, server.ID); err != nil {
t.Fatalf("DELETE delivery service server: %v\n", err)
}
@@ -99,7 +99,7 @@ func DeleteTestDeliveryServiceServers(t *testing.T) {
}
found = false
- for _, dss := range dsServers {
+ for _, dss := range dsServers.Response {
if *dss.DeliveryService == ds.ID && *dss.Server == server.ID {
found = true
break
diff --git a/traffic_ops/traffic_ops_golang/cachegroup/dspost.go b/traffic_ops/traffic_ops_golang/cachegroup/dspost.go
index 01ac0e9..8ec3dee 100644
--- a/traffic_ops/traffic_ops_golang/cachegroup/dspost.go
+++ b/traffic_ops/traffic_ops_golang/cachegroup/dspost.go
@@ -28,6 +28,7 @@ import (
"strconv"
"github.com/apache/trafficcontrol/lib/go-tc"
+ "github.com/apache/trafficcontrol/lib/go-util"
"github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api"
"github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth"
"github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant"
@@ -35,10 +36,6 @@ import (
"github.com/lib/pq"
)
-type CachegroupPostDSReq struct {
- DeliveryServices []int64 `json:"deliveryServices"`
-}
-
func DSPostHandler(w http.ResponseWriter, r *http.Request) {
inf, userErr, sysErr, errCode := api.NewInfo(r, []string{"id"}, []string{"id"})
if userErr != nil || sysErr != nil {
@@ -47,7 +44,7 @@ func DSPostHandler(w http.ResponseWriter, r *http.Request) {
}
defer inf.Close()
- req := CachegroupPostDSReq{}
+ req := tc.CachegroupPostDSReq{}
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
api.HandleErr(w, r, inf.Tx.Tx, http.StatusBadRequest, errors.New("malformed JSON: "+err.Error()), nil)
return
@@ -58,48 +55,42 @@ func DSPostHandler(w http.ResponseWriter, r *http.Request) {
api.RespWriterVals(w, r, inf.Tx.Tx, vals)(postDSes(inf.Tx.Tx, inf.User, int64(inf.IntParams["id"]), req.DeliveryServices))
}
-type CacheGroupPostDSResp struct {
- ID int64 `json:"id"`
- ServerNames []tc.CacheName `json:"serverNames"`
- DeliveryServices []int64 `json:"deliveryServices"`
-}
-
-func postDSes(tx *sql.Tx, user *auth.CurrentUser, cgID int64, dsIDs []int64) (CacheGroupPostDSResp, error) {
+func postDSes(tx *sql.Tx, user *auth.CurrentUser, cgID int64, dsIDs []int64) (tc.CacheGroupPostDSResp, error) {
cdnName, err := getCachegroupCDN(tx, cgID)
if err != nil {
- return CacheGroupPostDSResp{}, errors.New("getting cachegroup CDN: " + err.Error())
+ return tc.CacheGroupPostDSResp{}, errors.New("getting cachegroup CDN: " + err.Error())
}
tenantIDs, err := getDSTenants(tx, dsIDs)
if err != nil {
- return CacheGroupPostDSResp{}, errors.New("getting delivery service tennat IDs: " + err.Error())
+ return tc.CacheGroupPostDSResp{}, errors.New("getting delivery service tennat IDs: " + err.Error())
}
for _, tenantID := range tenantIDs {
ok, err := tenant.IsResourceAuthorizedToUserTx(int(tenantID), user, tx)
if err != nil {
- return CacheGroupPostDSResp{}, errors.New("checking tenancy: " + err.Error())
+ return tc.CacheGroupPostDSResp{}, errors.New("checking tenancy: " + err.Error())
}
if !ok {
- return CacheGroupPostDSResp{}, errors.New("not authorized for delivery service tenant " + strconv.FormatInt(tenantID, 10))
+ return tc.CacheGroupPostDSResp{}, errors.New("not authorized for delivery service tenant " + strconv.FormatInt(tenantID, 10))
}
}
if err := verifyDSesCDN(tx, dsIDs, cdnName); err != nil {
- return CacheGroupPostDSResp{}, errors.New("verifying delivery service CDNs match cachegroup server CDNs: " + err.Error())
+ return tc.CacheGroupPostDSResp{}, errors.New("verifying delivery service CDNs match cachegroup server CDNs: " + err.Error())
}
cgServers, err := getCachegroupServers(tx, cgID)
if err != nil {
- return CacheGroupPostDSResp{}, errors.New("getting cachegroup server names " + err.Error())
+ return tc.CacheGroupPostDSResp{}, errors.New("getting cachegroup server names " + err.Error())
}
if err := insertCachegroupDSes(tx, cgID, dsIDs); err != nil {
- return CacheGroupPostDSResp{}, errors.New("inserting cachegroup delivery services: " + err.Error())
+ return tc.CacheGroupPostDSResp{}, errors.New("inserting cachegroup delivery services: " + err.Error())
}
if err := updateParams(tx, dsIDs); err != nil {
- return CacheGroupPostDSResp{}, errors.New("updating delivery service parameters: " + err.Error())
+ return tc.CacheGroupPostDSResp{}, errors.New("updating delivery service parameters: " + err.Error())
}
api.CreateChangeLogRawTx(api.ApiChange, fmt.Sprintf("assign servers in cache group %v to deliveryservices %v", cgID, dsIDs), user, tx)
- return CacheGroupPostDSResp{ID: cgID, ServerNames: cgServers, DeliveryServices: dsIDs}, nil
+ return tc.CacheGroupPostDSResp{ID: util.JSONIntStr(cgID), ServerNames: cgServers, DeliveryServices: dsIDs}, nil
}
func insertCachegroupDSes(tx *sql.Tx, cgID int64, dsIDs []int64) error {