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 2018/06/04 16:38:01 UTC
[incubator-trafficcontrol] 06/10: Completed modifications from
change request needed for PR
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/incubator-trafficcontrol.git
commit 5b9a5394006e172323d0dd788d84e7b2373a9cf4
Author: ASchmidt <An...@comcast.com>
AuthorDate: Tue May 22 08:55:29 2018 -0600
Completed modifications from change request needed for PR
---
lib/go-tc/deliveryservice_servers.go | 8 +++----
.../deliveryservice/servers/servers.go | 28 +++++++++++-----------
traffic_ops/traffic_ops_golang/routes.go | 6 ++---
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/lib/go-tc/deliveryservice_servers.go b/lib/go-tc/deliveryservice_servers.go
index 2239103..06d731a 100644
--- a/lib/go-tc/deliveryservice_servers.go
+++ b/lib/go-tc/deliveryservice_servers.go
@@ -56,9 +56,9 @@ type DeliveryServiceServer struct {
type Filter int
const (
- ASSIGNED Filter = iota
- UNASSIGNED
- ELIGIBLE
+ Assigned Filter = iota
+ Unassigned
+ Eligible
)
type DSServer struct {
@@ -107,7 +107,7 @@ type DSServer struct {
UpdPending *bool `json:"updPending" db:"upd_pending"`
}
-// DSSDeliveryService - a version of the deliveryservice that allows for all fields to be null
+// DSSDeliveryService is a representation of a deliveryservice that allows for all fields to be null
type DSSDeliveryService struct {
// NOTE: the db: struct tags are used for testing to map to their equivalent database column (if there is one)
//
diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go b/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go
index 3b65680..c6ba71a 100644
--- a/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go
+++ b/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go
@@ -100,7 +100,7 @@ func (dss *TODeliveryServiceServer) Validate(db *sqlx.DB) []error {
return tovalidate.ToErrors(errs)
}
-// api/1.1/deliveryserviceserver$
+// ReadDSSHandler list all of the Deliveryservice Servers in response to requests to api/1.1/deliveryserviceserver$
func ReadDSSHandler(db *sqlx.DB) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
//create error function with ResponseWriter and Request
@@ -288,9 +288,9 @@ type DSServers struct {
type TODSServers DSServers
-var dsserversRef = TODSServers(DSServers{})
-func GetServersForDsIdRef() *TODSServers {
+func createServersForDsIdRef() *TODSServers {
+ var dsserversRef = TODSServers(DSServers{})
return &dsserversRef
}
@@ -307,7 +307,7 @@ func GetReplaceHandler(db *sqlx.DB) http.HandlerFunc {
}
// get list of server Ids to insert
- payload := GetServersForDsIdRef()
+ payload := createServersForDsIdRef()
servers := payload.Servers
dsId := payload.DsId
@@ -371,8 +371,8 @@ func GetReplaceHandler(db *sqlx.DB) http.HandlerFunc {
i := 0
respServers := []int{}
- for i < len(servers) {
- dtos := map[string]interface{}{"id": dsId, "server": servers[i]}
+ for _ , server := range servers {
+ dtos := map[string]interface{}{"id": dsId, "server": server}
resultRows, err := tx.NamedQuery(insertIdsQuery(), dtos)
if err != nil {
if pqErr, ok := err.(*pq.Error); ok {
@@ -388,7 +388,7 @@ func GetReplaceHandler(db *sqlx.DB) http.HandlerFunc {
log.Errorf("received non pq error: %++v from create execution", err)
return
}
- respServers = append(respServers, servers[i])
+ respServers = append(respServers, server)
resultRows.Next()
i++
defer resultRows.Close()
@@ -419,13 +419,13 @@ func GetReplaceHandler(db *sqlx.DB) http.HandlerFunc {
type TODeliveryServiceServers tc.DeliveryServiceServers
-var serversRef = TODeliveryServiceServers(tc.DeliveryServiceServers{})
-func GetServersRef() *TODeliveryServiceServers {
+func createServersRef() *TODeliveryServiceServers {
+ serversRef := TODeliveryServiceServers(tc.DeliveryServiceServers{})
return &serversRef
}
-// api/1.1/deliveryservices/{xml_id}/servers
+// GetCreateHandler assigns an existing Server to and existing Deliveryservice in response to api/1.1/deliveryservices/{xml_id}/servers
func GetCreateHandler(db *sqlx.DB) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
handleErrs := tc.GetHandleErrorsFunc(w, r)
@@ -480,7 +480,7 @@ func GetCreateHandler(db *sqlx.DB) http.HandlerFunc {
// get list of server Ids to insert
defer r.Body.Close()
- payload := GetServersRef()
+ payload := createServersRef()
if err := json.NewDecoder(r.Body).Decode(payload); err != nil {
log.Errorf("Error trying to decode the request body: %s", err)
@@ -589,7 +589,7 @@ func selectServerIds() string {
return query
}
-// GetReadHandler api/1.1/deliveryservices/{id}/servers|unassigned_servers|eligible
+// GetReadHandler retrieves lists of servers based in the filter identified in the request: api/1.1/deliveryservices/{id}/servers|unassigned_servers|eligible
func GetReadHandler(db *sqlx.DB, filter tc.Filter) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
handleErrs := tc.GetHandleErrorsFunc(w, r)
@@ -601,7 +601,7 @@ func GetReadHandler(db *sqlx.DB, filter tc.Filter) http.HandlerFunc {
where := `WHERE s.id in (select server from deliveryservice_server where deliveryservice = $1)`
- if filter == tc.UNASSIGNED {
+ if filter == tc.Unassigned {
where = `WHERE s.id not in (select server from deliveryservice_server where deliveryservice = $1)`
}
@@ -730,7 +730,7 @@ func GetDServiceRef() *TODSSDeliveryService {
return &dserviceRef
}
-// Read api/1.1/servers/{id}/deliveryservices$
+// Read shows all of the delivery services associated with the specified server.
func (dss *TODSSDeliveryService) Read(db *sqlx.DB, params map[string]string, user auth.CurrentUser) ([]interface{}, []error, tc.ApiErrorType) {
var err error = nil
orderby := params["orderby"]
diff --git a/traffic_ops/traffic_ops_golang/routes.go b/traffic_ops/traffic_ops_golang/routes.go
index 9240c45..6a39edb 100644
--- a/traffic_ops/traffic_ops_golang/routes.go
+++ b/traffic_ops/traffic_ops_golang/routes.go
@@ -168,9 +168,9 @@ func Routes(d ServerData) ([]Route, []RawRoute, http.Handler, error) {
{1.1, http.MethodPost,`deliveryserviceserver$`, dsserver.GetReplaceHandler(d.DB),auth.PrivLevelOperations, Authenticated, nil},
{1.1, http.MethodPost,`deliveryservices/{xml_id}/servers$`, dsserver.GetCreateHandler( d.DB ) ,auth.PrivLevelOperations, Authenticated, nil},
{1.1, http.MethodGet, `servers/{id}/deliveryservices$`, api.ReadHandler(dsserver.GetDServiceRef(), d.DB),auth.PrivLevelReadOnly, Authenticated, nil},
- {1.1, http.MethodGet, `deliveryservices/{id}/servers$`, dsserver.GetReadHandler(d.DB, "Assigned"),auth.PrivLevelReadOnly, Authenticated, nil},
- {1.1, http.MethodGet, `deliveryservices/{id}/unassigned_servers$`, dsserver.GetReadHandler(d.DB, "Unassigned"),auth.PrivLevelReadOnly, Authenticated, nil},
- //{1.1, http.MethodGet, `deliveryservices/{id}/servers/eligible$`, dsserver.GetReadHandler(d.DB, "Eligible"),auth.PrivLevelReadOnly, Authenticated, nil},
+ {1.1, http.MethodGet, `deliveryservices/{id}/servers$`, dsserver.GetReadHandler(d.DB, tc.Assigned),auth.PrivLevelReadOnly, Authenticated, nil},
+ {1.1, http.MethodGet, `deliveryservices/{id}/unassigned_servers$`, dsserver.GetReadHandler(d.DB, tc.Unassigned),auth.PrivLevelReadOnly, Authenticated, nil},
+ //{1.1, http.MethodGet, `deliveryservices/{id}/servers/eligible$`, dsserver.GetReadHandler(d.DB, tc.Eligible),auth.PrivLevelReadOnly, Authenticated, nil},
//Server
{1.1, http.MethodGet, `servers/checks$`, handlerToFunc(proxyHandler), 0, NoAuth, []Middleware{}},
--
To stop receiving notification emails like this one, please contact
rob@apache.org.