fix merge issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e0c6ffbc Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e0c6ffbc Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e0c6ffbc Branch: refs/heads/psql-rebase Commit: e0c6ffbcda2c2d2f8ee9e226e74b23f46a5b6b92 Parents: c81ea21 Author: Dave Neuman <neu...@apache.org> Authored: Wed Dec 7 09:59:32 2016 -0700 Committer: Dave Neuman <neu...@apache.org> Committed: Wed Dec 7 09:59:32 2016 -0700 ---------------------------------------------------------------------- .../tests/integration/deliveryservice_test.go | 15 ++++++++++++ .../tests/integration/integration_helper.go | 24 +++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e0c6ffbc/traffic_ops/client/tests/integration/deliveryservice_test.go ---------------------------------------------------------------------- diff --git a/traffic_ops/client/tests/integration/deliveryservice_test.go b/traffic_ops/client/tests/integration/deliveryservice_test.go index 4b56058..036bb1f 100644 --- a/traffic_ops/client/tests/integration/deliveryservice_test.go +++ b/traffic_ops/client/tests/integration/deliveryservice_test.go @@ -1,3 +1,18 @@ +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + package integration import ( http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e0c6ffbc/traffic_ops/client/tests/integration/integration_helper.go ---------------------------------------------------------------------- diff --git a/traffic_ops/client/tests/integration/integration_helper.go b/traffic_ops/client/tests/integration/integration_helper.go index 675934d..2468a2c 100644 --- a/traffic_ops/client/tests/integration/integration_helper.go +++ b/traffic_ops/client/tests/integration/integration_helper.go @@ -1,3 +1,18 @@ +/* + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + package integration import ( @@ -66,11 +81,18 @@ func GetType(useInTable string) (traffic_ops.Type, error) { } //GetDeliveryService returns a DeliveryService Struct -func GetDeliveryService() (traffic_ops.DeliveryService, error) { +func GetDeliveryService(cdn string) (traffic_ops.DeliveryService, error) { dss, err := to.DeliveryServices() if err != nil { return *new(traffic_ops.DeliveryService), err } + if cdn != "" { + for _, ds := range dss { + if ds.CDNName == cdn { + return ds, nil + } + } + } return dss[0], nil }
