You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ne...@apache.org on 2016/11/09 21:23:18 UTC
[2/4] incubator-trafficcontrol git commit: clean up
`traffic_ops/client` ds structs & tests
clean up `traffic_ops/client` ds structs & tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/116946ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/116946ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/116946ab
Branch: refs/heads/master
Commit: 116946aba57a849a092efa4ad9cb7d63d2797e4d
Parents: d4f6e02
Author: Mike Ball <mi...@gmail.com>
Authored: Thu Nov 3 21:49:42 2016 -0400
Committer: Dave Neuman <ne...@apache.org>
Committed: Wed Nov 9 14:22:40 2016 -0700
----------------------------------------------------------------------
traffic_ops/client/delivery_service.go | 12 +++++------
.../client/delivery_service_resources.go | 6 +++---
traffic_ops/client/fixtures/delivery_service.go | 21 ++++----------------
.../client/tests/delivery_service_test.go | 4 ++--
4 files changed, 15 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/116946ab/traffic_ops/client/delivery_service.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/delivery_service.go b/traffic_ops/client/delivery_service.go
index 06595bc..bc902f5 100644
--- a/traffic_ops/client/delivery_service.go
+++ b/traffic_ops/client/delivery_service.go
@@ -19,7 +19,7 @@ import "encoding/json"
// DeliveryServices gets an array of DeliveryServices
func (to *Session) DeliveryServices() ([]DeliveryService, error) {
- var data DeliveryServiceResponse
+ var data GetDeliveryServiceResponse
err := get(to, deliveryServicesEp(), &data)
if err != nil {
return nil, err
@@ -30,7 +30,7 @@ func (to *Session) DeliveryServices() ([]DeliveryService, error) {
// DeliveryService gets the DeliveryService for the ID it's passed
func (to *Session) DeliveryService(id string) (*DeliveryService, error) {
- var data DeliveryServiceResponse
+ var data GetDeliveryServiceResponse
err := get(to, deliveryServiceEp(id), &data)
if err != nil {
return nil, err
@@ -40,8 +40,8 @@ func (to *Session) DeliveryService(id string) (*DeliveryService, error) {
}
// CreateDeliveryService creates the DeliveryService it's passed
-func (to *Session) CreateDeliveryService(ds *DeliveryService) (*CreateDeliveryServiceResponse, error) {
- var data CreateDeliveryServiceResponse
+func (to *Session) CreateDeliveryService(ds *DeliveryService) (*DeliveryServiceResponse, error) {
+ var data DeliveryServiceResponse
jsonReq, err := json.Marshal(ds)
if err != nil {
return nil, err
@@ -56,8 +56,8 @@ func (to *Session) CreateDeliveryService(ds *DeliveryService) (*CreateDeliverySe
// UpdateDeliveryService updates the DeliveryService matching the ID it's passed with
// the DeliveryService it is passed
-func (to *Session) UpdateDeliveryService(id string, ds *DeliveryService) (*CreateDeliveryServiceResponse, error) {
- var data CreateDeliveryServiceResponse
+func (to *Session) UpdateDeliveryService(id string, ds *DeliveryService) (*DeliveryServiceResponse, error) {
+ var data DeliveryServiceResponse
jsonReq, err := json.Marshal(ds)
if err != nil {
return nil, err
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/116946ab/traffic_ops/client/delivery_service_resources.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/delivery_service_resources.go b/traffic_ops/client/delivery_service_resources.go
index 9bccd2e..9162a12 100644
--- a/traffic_ops/client/delivery_service_resources.go
+++ b/traffic_ops/client/delivery_service_resources.go
@@ -16,14 +16,14 @@
package client
-// DeliveryServiceResponse ...
-type DeliveryServiceResponse struct {
+// GetDeliveryServiceResponse ...
+type GetDeliveryServiceResponse struct {
Version string `json:"version"`
Response []DeliveryService `json:"response"`
}
// CreateDeliveryServiceResponse ...
-type CreateDeliveryServiceResponse struct {
+type DeliveryServiceResponse struct {
Response DeliveryService `json:"response"`
Alerts []DeliveryServiceAlert `json:"alerts"`
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/116946ab/traffic_ops/client/fixtures/delivery_service.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/fixtures/delivery_service.go b/traffic_ops/client/fixtures/delivery_service.go
index 5b274a0..150988b 100644
--- a/traffic_ops/client/fixtures/delivery_service.go
+++ b/traffic_ops/client/fixtures/delivery_service.go
@@ -18,8 +18,8 @@ package fixtures
import "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
// DeliveryServices returns a default DeliveryServiceResponse to be used for testing.
-func DeliveryServices() *client.DeliveryServiceResponse {
- return &client.DeliveryServiceResponse{
+func DeliveryServices() *client.GetDeliveryServiceResponse {
+ return &client.GetDeliveryServiceResponse{
Response: []client.DeliveryService{
client.DeliveryService{
ID: "001",
@@ -51,21 +51,8 @@ func DeliveryServices() *client.DeliveryServiceResponse {
}
}
-// CreateDeliveryService returns a default CreateDeliveryServiceResponse to be used for testing.
-func CreateDeliveryService() *client.CreateDeliveryServiceResponse {
- return &client.CreateDeliveryServiceResponse{
- Response: DeliveryServices().Response[0],
- Alerts: []client.DeliveryServiceAlert{
- client.DeliveryServiceAlert{
- Level: "level",
- Text: "text",
- },
- },
- }
-}
-
-// UpdateDeliveryService returns a default CreateDeliveryServiceResponse to be used for testing.
-func UpdateDeliveryService() *client.CreateDeliveryServiceResponse {
+// DeliveryService returns a default DeliveryServiceResponse to be used for testing.
+func DeliveryService() *client.DeliveryServiceResponse {
return &client.CreateDeliveryServiceResponse{
Response: DeliveryServices().Response[0],
Alerts: []client.DeliveryServiceAlert{
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/116946ab/traffic_ops/client/tests/delivery_service_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/tests/delivery_service_test.go b/traffic_ops/client/tests/delivery_service_test.go
index 62794f5..5fe2343 100644
--- a/traffic_ops/client/tests/delivery_service_test.go
+++ b/traffic_ops/client/tests/delivery_service_test.go
@@ -139,7 +139,7 @@ func TestDeliveryServiceUnauthorized(t *testing.T) {
}
func TestCreateDeliveryService(t *testing.T) {
- resp := fixtures.CreateDeliveryService()
+ resp := fixtures.DeliveryService()
server := testHelper.ValidHTTPServer(resp)
defer server.Close()
@@ -187,7 +187,7 @@ func TestCreateDeliveryServiceUnauthorized(t *testing.T) {
}
func TestUpdateDeliveryService(t *testing.T) {
- resp := fixtures.UpdateDeliveryService()
+ resp := fixtures.DeliveryService()
server := testHelper.ValidHTTPServer(resp)
defer server.Close()