You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/12/16 21:16:12 UTC
[15/50] incubator-trafficcontrol git commit: update deliveryservice
to support actual Update response
update deliveryservice to support actual Update response
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7e3d9ace
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7e3d9ace
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7e3d9ace
Branch: refs/heads/postgres
Commit: 7e3d9acec28c13e82f55891fbb3e67d2fad4284e
Parents: 806f376
Author: David Neuman <da...@gmail.com>
Authored: Wed Nov 30 10:34:21 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Dec 16 14:10:45 2016 -0700
----------------------------------------------------------------------
traffic_ops/client/delivery_service.go | 4 ++--
traffic_ops/client/delivery_service_resources.go | 6 ++++++
traffic_ops/client/fixtures/delivery_service.go | 8 ++++++++
traffic_ops/client/tests/delivery_service_test.go | 4 ++--
4 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7e3d9ace/traffic_ops/client/delivery_service.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/delivery_service.go b/traffic_ops/client/delivery_service.go
index d1102ab..db21b17 100644
--- a/traffic_ops/client/delivery_service.go
+++ b/traffic_ops/client/delivery_service.go
@@ -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) (*DeliveryServiceResponse, error) {
- var data DeliveryServiceResponse
+func (to *Session) UpdateDeliveryService(id string, ds *DeliveryService) (*UpdateDeliveryServiceResponse, error) {
+ var data UpdateDeliveryServiceResponse
jsonReq, err := json.Marshal(ds)
if err != nil {
return nil, err
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7e3d9ace/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 186c137..236382e 100644
--- a/traffic_ops/client/delivery_service_resources.go
+++ b/traffic_ops/client/delivery_service_resources.go
@@ -27,6 +27,12 @@ type CreateDeliveryServiceResponse struct {
Alerts []DeliveryServiceAlert `json:"alerts"`
}
+// UpdateDeliveryServiceResponse ...
+type UpdateDeliveryServiceResponse struct {
+ Response []DeliveryService `json:"response"`
+ Alerts []DeliveryServiceAlert `json:"alerts"`
+}
+
// DeliveryServiceResponse ...
type DeliveryServiceResponse struct {
Response DeliveryService `json:"response"`
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7e3d9ace/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 80fb96d..3f137fb 100644
--- a/traffic_ops/client/fixtures/delivery_service.go
+++ b/traffic_ops/client/fixtures/delivery_service.go
@@ -76,6 +76,14 @@ func CreateDeliveryService() *client.CreateDeliveryServiceResponse {
}
}
+// UpdateDeliveryService returns a default UpdateDeliveryServiceResponse to be used for testing.
+func UpdateDeliveryService() *client.UpdateDeliveryServiceResponse {
+ return &client.UpdateDeliveryServiceResponse{
+ Response: DeliveryServices().Response,
+ Alerts: alerts(),
+ }
+}
+
// DeleteDeliveryService returns a default DeleteDeliveryServiceResponse to be used for testing.
func DeleteDeliveryService() *client.DeleteDeliveryServiceResponse {
return &client.DeleteDeliveryServiceResponse{
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7e3d9ace/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 f52a4a3..47ff74b 100644
--- a/traffic_ops/client/tests/delivery_service_test.go
+++ b/traffic_ops/client/tests/delivery_service_test.go
@@ -187,7 +187,7 @@ func TestCreateDeliveryServiceUnauthorized(t *testing.T) {
}
func TestUpdateDeliveryService(t *testing.T) {
- resp := fixtures.DeliveryService()
+ resp := fixtures.UpdateDeliveryService()
server := testHelper.ValidHTTPServer(resp)
defer server.Close()
@@ -206,7 +206,7 @@ func TestUpdateDeliveryService(t *testing.T) {
testHelper.Success(t, "Should be able to make a request to Traffic Ops")
}
- actual := ds.Response.ID
+ actual := ds.Response[0].ID
if actual != 001 {
testHelper.Error(t, "Should get back \"001\" for \"Response.ID\", got: %s", actual)
} else {