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/18 22:16:46 UTC

[trafficcontrol] 02/04: moved anonymousBlockingEnabled field to V13 struct; updated test cases to use V13 struct

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

commit a5eb9ed21141d694aff5954bd6aca6ba94642dee
Author: Jesse Rivas <je...@comcast.com>
AuthorDate: Wed Jun 13 16:40:46 2018 -0600

    moved anonymousBlockingEnabled field to V13 struct; updated test cases to use V13 struct
---
 lib/go-tc/deliveryservices.go                      | 30 +++++++++++-----------
 traffic_ops/client/v13/deliveryservice.go          | 16 ++++++------
 .../experimental/server/api/deliveryservices.go    |  3 ---
 .../testing/api/v13/deliveryservices_test.go       |  6 ++---
 traffic_ops/testing/api/v13/traffic_control.go     |  2 +-
 5 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/lib/go-tc/deliveryservices.go b/lib/go-tc/deliveryservices.go
index 114d97e..86b1e35 100644
--- a/lib/go-tc/deliveryservices.go
+++ b/lib/go-tc/deliveryservices.go
@@ -26,7 +26,7 @@ const DefaultRoutingName = "cdn"
 //
 // GetDeliveryServiceResponse is deprecated use DeliveryServicesResponse...
 type GetDeliveryServiceResponse struct {
-	Response []DeliveryService `json:"response"`
+	Response []DeliveryServiceV13 `json:"response"`
 }
 
 // DeliveryServicesResponse ...
@@ -61,7 +61,6 @@ type DeleteDeliveryServiceResponse struct {
 // TODO move contents to DeliveryServiceV12, fix references, and remove
 type DeliveryService struct {
 	Active                   bool                   `json:"active"`
-	AnonymousBlockingEnabled bool                   `json:"anonymousBlockingEnabled"`
 	CacheURL                 string                 `json:"cacheurl"`
 	CCRDNSTTL                int                    `json:"ccrDnsTtl"`
 	CDNID                    int                    `json:"cdnId"`
@@ -122,12 +121,13 @@ type DeliveryServiceV12 struct {
 
 type DeliveryServiceV13 struct {
 	DeliveryServiceV12
-	DeepCachingType   DeepCachingType `json:"deepCachingType"`
-	FQPacingRate      int             `json:"fqPacingRate,omitempty"`
-	SigningAlgorithm  string          `json:"signingAlgorithm" db:"signing_algorithm"`
-	TenantName        string          `json:"tenantName,omitempty"`
-	TRRequestHeaders  string          `json:"trRequestHeaders,omitempty"`
-	TRResponseHeaders string          `json:"trResponseHeaders,omitempty"`
+	AnonymousBlockingEnabled bool            `json:"anonymousBlockingEnabled"`
+	DeepCachingType          DeepCachingType `json:"deepCachingType"`
+	FQPacingRate             int             `json:"fqPacingRate,omitempty"`
+	SigningAlgorithm         string          `json:"signingAlgorithm" db:"signing_algorithm"`
+	TenantName               string          `json:"tenantName,omitempty"`
+	TRRequestHeaders         string          `json:"trRequestHeaders,omitempty"`
+	TRResponseHeaders        string          `json:"trResponseHeaders,omitempty"`
 }
 
 // DeliveryServiceNullable - a version of the deliveryservice that allows for all fields to be null
@@ -136,7 +136,6 @@ type DeliveryServiceNullable struct {
 	// NOTE: the db: struct tags are used for testing to map to their equivalent database column (if there is one)
 	//
 	Active                   *bool                   `json:"active" db:"active"`
-	AnonymousBlockingEnabled *bool                   `json:"anonymousBlockingEnabled" db:"anonymous_blocking_enabled"`
 	CacheURL                 *string                 `json:"cacheurl" db:"cacheurl"`
 	CCRDNSTTL                *int                    `json:"ccrDnsTtl" db:"ccr_dns_ttl"`
 	CDNID                    *int                    `json:"cdnId" db:"cdn_id"`
@@ -199,12 +198,13 @@ type DeliveryServiceNullableV12 struct {
 
 type DeliveryServiceNullableV13 struct {
 	DeliveryServiceNullableV12
-	DeepCachingType   *DeepCachingType `json:"deepCachingType" db:"deep_caching_type"`
-	FQPacingRate      *int             `json:"fqPacingRate,omitempty"`
-	SigningAlgorithm  *string          `json:"signingAlgorithm" db:"signing_algorithm"`
-	Tenant            *string          `json:"tenant,omitempty"`
-	TRResponseHeaders *string          `json:"trResponseHeaders,omitempty"`
-	TRRequestHeaders  *string          `json:"trRequestHeaders,omitempty"`
+	AnonymousBlockingEnabled *bool            `json:"anonymousBlockingEnabled" db:"anonymous_blocking_enabled"`
+	DeepCachingType          *DeepCachingType `json:"deepCachingType" db:"deep_caching_type"`
+	FQPacingRate             *int             `json:"fqPacingRate,omitempty"`
+	SigningAlgorithm         *string          `json:"signingAlgorithm" db:"signing_algorithm"`
+	Tenant                   *string          `json:"tenant,omitempty"`
+	TRResponseHeaders        *string          `json:"trResponseHeaders,omitempty"`
+	TRRequestHeaders         *string          `json:"trRequestHeaders,omitempty"`
 }
 
 // Value implements the driver.Valuer interface
diff --git a/traffic_ops/client/v13/deliveryservice.go b/traffic_ops/client/v13/deliveryservice.go
index 9e5e901..3791f66 100644
--- a/traffic_ops/client/v13/deliveryservice.go
+++ b/traffic_ops/client/v13/deliveryservice.go
@@ -24,12 +24,12 @@ import (
 
 // DeliveryServices gets an array of DeliveryServices
 // Deprecated: use GetDeliveryServices
-func (to *Session) DeliveryServices() ([]tc.DeliveryService, error) {
+func (to *Session) DeliveryServices() ([]tc.DeliveryServiceV13, error) {
 	dses, _, err := to.GetDeliveryServices()
 	return dses, err
 }
 
-func (to *Session) GetDeliveryServices() ([]tc.DeliveryService, ReqInf, error) {
+func (to *Session) GetDeliveryServices() ([]tc.DeliveryServiceV13, ReqInf, error) {
 	var data tc.GetDeliveryServiceResponse
 	reqInf, err := get(to, deliveryServicesEp(), &data)
 	if err != nil {
@@ -41,12 +41,12 @@ func (to *Session) GetDeliveryServices() ([]tc.DeliveryService, ReqInf, error) {
 
 // DeliveryServicesByServer gets an array of all DeliveryServices with the given server ID assigend.
 // Deprecated: use GetDeliveryServicesByServer
-func (to *Session) DeliveryServicesByServer(id int) ([]tc.DeliveryService, error) {
+func (to *Session) DeliveryServicesByServer(id int) ([]tc.DeliveryServiceV13, error) {
 	dses, _, err := to.GetDeliveryServicesByServer(id)
 	return dses, err
 }
 
-func (to *Session) GetDeliveryServicesByServer(id int) ([]tc.DeliveryService, ReqInf, error) {
+func (to *Session) GetDeliveryServicesByServer(id int) ([]tc.DeliveryServiceV13, ReqInf, error) {
 	var data tc.GetDeliveryServiceResponse
 	reqInf, err := get(to, deliveryServicesByServerEp(strconv.Itoa(id)), &data)
 	if err != nil {
@@ -58,12 +58,12 @@ func (to *Session) GetDeliveryServicesByServer(id int) ([]tc.DeliveryService, Re
 
 // DeliveryService gets the DeliveryService for the ID it's passed
 // Deprecated: use GetDeliveryService
-func (to *Session) DeliveryService(id string) (*tc.DeliveryService, error) {
+func (to *Session) DeliveryService(id string) (*tc.DeliveryServiceV13, error) {
 	ds, _, err := to.GetDeliveryService(id)
 	return ds, err
 }
 
-func (to *Session) GetDeliveryService(id string) (*tc.DeliveryService, ReqInf, error) {
+func (to *Session) GetDeliveryService(id string) (*tc.DeliveryServiceV13, ReqInf, error) {
 	var data tc.GetDeliveryServiceResponse
 	reqInf, err := get(to, deliveryServiceEp(id), &data)
 	if err != nil {
@@ -76,7 +76,7 @@ func (to *Session) GetDeliveryService(id string) (*tc.DeliveryService, ReqInf, e
 }
 
 // CreateDeliveryService creates the DeliveryService it's passed
-func (to *Session) CreateDeliveryService(ds *tc.DeliveryService) (*tc.CreateDeliveryServiceResponse, error) {
+func (to *Session) CreateDeliveryService(ds *tc.DeliveryServiceV13) (*tc.CreateDeliveryServiceResponse, error) {
 	var data tc.CreateDeliveryServiceResponse
 	jsonReq, err := json.Marshal(ds)
 	if err != nil {
@@ -92,7 +92,7 @@ func (to *Session) CreateDeliveryService(ds *tc.DeliveryService) (*tc.CreateDeli
 
 // UpdateDeliveryService updates the DeliveryService matching the ID it's passed with
 // the DeliveryService it is passed
-func (to *Session) UpdateDeliveryService(id string, ds *tc.DeliveryService) (*tc.UpdateDeliveryServiceResponse, error) {
+func (to *Session) UpdateDeliveryService(id string, ds *tc.DeliveryServiceV13) (*tc.UpdateDeliveryServiceResponse, error) {
 	var data tc.UpdateDeliveryServiceResponse
 	jsonReq, err := json.Marshal(ds)
 	if err != nil {
diff --git a/traffic_ops/experimental/server/api/deliveryservices.go b/traffic_ops/experimental/server/api/deliveryservices.go
index 297c7ec..05e21e6 100644
--- a/traffic_ops/experimental/server/api/deliveryservices.go
+++ b/traffic_ops/experimental/server/api/deliveryservices.go
@@ -179,7 +179,6 @@ func postDeliveryservice(payload []byte, db *sqlx.DB) (interface{}, error) {
 	sqlString += ",dns_bypass_cname"
 	sqlString += ",tr_request_headers"
 	sqlString += ",created_at"
-	sqlString += ",anonymous_blocking_enabled"
 	sqlString += ") VALUES ("
 	sqlString += ":name"
 	sqlString += ",:display_name"
@@ -222,7 +221,6 @@ func postDeliveryservice(payload []byte, db *sqlx.DB) (interface{}, error) {
 	sqlString += ",:dns_bypass_cname"
 	sqlString += ",:tr_request_headers"
 	sqlString += ",:created_at"
-	sqlString += ",:anonymous_blocking_enabled"
 	sqlString += ")"
 	result, err := db.NamedExec(sqlString, v)
 	if err != nil {
@@ -290,7 +288,6 @@ func putDeliveryservice(name string, payload []byte, db *sqlx.DB) (interface{},
 	sqlString += ",dns_bypass_cname = :dns_bypass_cname"
 	sqlString += ",tr_request_headers = :tr_request_headers"
 	sqlString += ",created_at = :created_at"
-	sqlString += ",anonymous_blocking_enabled = :anonymous_blocking_enabled"
 	sqlString += " WHERE name=:name"
 	result, err := db.NamedExec(sqlString, arg)
 	if err != nil {
diff --git a/traffic_ops/testing/api/v13/deliveryservices_test.go b/traffic_ops/testing/api/v13/deliveryservices_test.go
index d28da8e..32e43d0 100644
--- a/traffic_ops/testing/api/v13/deliveryservices_test.go
+++ b/traffic_ops/testing/api/v13/deliveryservices_test.go
@@ -113,7 +113,7 @@ func GetTestDeliveryServices(t *testing.T) {
 		t.Fatalf("cannot GET DeliveryServices: %v - %v\n", err, actualDSes)
 		failed = true
 	}
-	actualDSMap := map[string]tc.DeliveryService{}
+	actualDSMap := map[string]tc.DeliveryServiceV13{}
 	for _, ds := range actualDSes {
 		actualDSMap[ds.XMLID] = ds
 	}
@@ -138,7 +138,7 @@ func UpdateTestDeliveryServices(t *testing.T) {
 		t.Fatalf("cannot GET Delivery Services: %v\n", err)
 	}
 
-	remoteDS := tc.DeliveryService{}
+	remoteDS := tc.DeliveryServiceV13{}
 	found := false
 	for _, ds := range dses {
 		if ds.XMLID == firstDS.XMLID {
@@ -190,7 +190,7 @@ func DeleteTestDeliveryServices(t *testing.T) {
 		t.Fatalf("cannot GET Servers: %v\n", err)
 	}
 	for _, testDS := range testData.DeliveryServices {
-		ds := tc.DeliveryService{}
+		ds := tc.DeliveryServiceV13{}
 		found := false
 		for _, realDS := range dses {
 			if realDS.XMLID == testDS.XMLID {
diff --git a/traffic_ops/testing/api/v13/traffic_control.go b/traffic_ops/testing/api/v13/traffic_control.go
index e456597..8395998 100644
--- a/traffic_ops/testing/api/v13/traffic_control.go
+++ b/traffic_ops/testing/api/v13/traffic_control.go
@@ -27,7 +27,7 @@ type TrafficControl struct {
 	CacheGroups                    []v13.CacheGroup                    `json:"cachegroups"`
 	DeliveryServiceRequests        []v12.DeliveryServiceRequest        `json:"deliveryServiceRequests"`
 	DeliveryServiceRequestComments []v12.DeliveryServiceRequestComment `json:"deliveryServiceRequestComments"`
-	DeliveryServices               []v12.DeliveryService               `json:"deliveryservices"`
+	DeliveryServices               []v12.DeliveryServiceV13            `json:"deliveryservices"`
 	Divisions                      []v12.Division                      `json:"divisions"`
 	Coordinates                    []v13.Coordinate                    `json:"coordinates"`
 	Origins                        []v13.Origin                        `json:"origins"`