update delivery_service to make create work
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8d874f06 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8d874f06 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8d874f06 Branch: refs/heads/psql-rebase Commit: 8d874f067c3136ae1d1726113dd22f7d5bc4129b Parents: 7e03a0b Author: David Neuman <david.neuma...@gmail.com> Authored: Tue Nov 29 15:44:27 2016 -0700 Committer: Dave Neuman <neu...@apache.org> Committed: Fri Dec 2 15:22:55 2016 -0700 ---------------------------------------------------------------------- traffic_ops/client/delivery_service.go | 4 ++-- traffic_ops/client/delivery_service_resources.go | 9 ++++++++- traffic_ops/client/fixtures/delivery_service.go | 8 ++++++++ traffic_ops/client/tests/delivery_service_test.go | 4 ++-- 4 files changed, 20 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8d874f06/traffic_ops/client/delivery_service.go ---------------------------------------------------------------------- diff --git a/traffic_ops/client/delivery_service.go b/traffic_ops/client/delivery_service.go index 82a677f..29b6843 100644 --- a/traffic_ops/client/delivery_service.go +++ b/traffic_ops/client/delivery_service.go @@ -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) (*DeliveryServiceResponse, error) { - var data DeliveryServiceResponse +func (to *Session) CreateDeliveryService(ds *DeliveryService) (*CreateDeliveryServiceResponse, error) { + var data CreateDeliveryServiceResponse jsonReq, err := json.Marshal(ds) if err != nil { return nil, err http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8d874f06/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 53e4c8e..8d53d53 100644 --- a/traffic_ops/client/delivery_service_resources.go +++ b/traffic_ops/client/delivery_service_resources.go @@ -21,6 +21,12 @@ type GetDeliveryServiceResponse struct { Response []DeliveryService `json:"response"` } +// CreateDeliveryServiceResponse ... +type CreateDeliveryServiceResponse struct { + Response []DeliveryService `json:"response"` + Alerts []DeliveryServiceAlert `json:"alerts"` +} + // DeliveryServiceResponse ... type DeliveryServiceResponse struct { Response DeliveryService `json:"response"` @@ -67,7 +73,6 @@ type DeliveryService struct { Protocol int `json:"protocol"` IPV6RoutingEnabled bool `json:"ipv6RoutingEnabled"` RangeRequestHandling int `json:"rangeRequestHandling"` - HeaderRewrite string `json:"headerRewrite"` EdgeHeaderRewrite string `json:"edgeHeaderRewrite"` MidHeaderRewrite string `json:"midHeaderRewrite"` TRResponseHeaders string `json:"trResponseHeaders"` @@ -78,6 +83,8 @@ type DeliveryService struct { DisplayName string `json:"displayName"` InitialDispersion int `json:"initialDispersion"` MatchList []DeliveryServiceMatch `json:"matchList,omitempty"` + RegionalGeoBlocking bool `json:"regionalGeoBlocking"` + LogsEnabled bool `json:"logsEnabled"` } // DeliveryServiceMatch ... http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8d874f06/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 f9996dd..80fb96d 100644 --- a/traffic_ops/client/fixtures/delivery_service.go +++ b/traffic_ops/client/fixtures/delivery_service.go @@ -68,6 +68,14 @@ func DeliveryService() *client.DeliveryServiceResponse { } } +// CreateDeliveryService returns a default CreateDeliveryServiceResponse to be used for testing. +func CreateDeliveryService() *client.CreateDeliveryServiceResponse { + return &client.CreateDeliveryServiceResponse{ + 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/8d874f06/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 bf182e4..f52a4a3 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.DeliveryService() + resp := fixtures.CreateDeliveryService() server := testHelper.ValidHTTPServer(resp) defer server.Close() @@ -158,7 +158,7 @@ func TestCreateDeliveryService(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 {
