This is an automated email from the ASF dual-hosted git repository.
rshah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 0068dd8de8 Removing v5 client methods for Delivery Service Required
Capabilities (#7804)
0068dd8de8 is described below
commit 0068dd8de803e229f2fc78406c0195fce5023f43
Author: Srijeet Chatterjee <[email protected]>
AuthorDate: Thu Sep 14 12:12:53 2023 -0600
Removing v5 client methods for Delivery Service Required Capabilities
(#7804)
* Removing v5 client methods for Delivery Service Required Capabilities
* add changelog
* remove commented out code
---
CHANGELOG.md | 1 +
infrastructure/cdn-in-a-box/enroller/enroller.go | 21 +++--
.../api/v5/cachegroupsdeliveryservices_test.go | 2 +-
traffic_ops/testing/api/v5/cdn_federations_test.go | 2 +-
traffic_ops/testing/api/v5/cdn_locks_test.go | 2 +-
.../api/v5/cdns_name_configs_monitoring_test.go | 2 +-
.../testing/api/v5/cdns_name_snapshot_new_test.go | 2 +-
.../testing/api/v5/cdns_name_snapshot_test.go | 2 +-
.../testing/api/v5/deliveryservices_test.go | 2 +-
.../testing/api/v5/deliveryserviceservers_test.go | 8 +-
.../api/v5/deliveryservicesideligible_test.go | 2 +-
.../testing/api/v5/deliveryservicesregexes_test.go | 2 +-
.../api/v5/federation_deliveryservices_test.go | 2 +-
.../api/v5/federation_federation_resolvers_test.go | 2 +-
.../testing/api/v5/federation_users_test.go | 2 +-
traffic_ops/testing/api/v5/federations_test.go | 2 +-
traffic_ops/testing/api/v5/jobs_test.go | 2 +-
traffic_ops/testing/api/v5/monitoring_test.go | 2 +-
traffic_ops/testing/api/v5/origins_test.go | 2 +-
.../api/v5/server_server_capabilities_test.go | 2 +-
.../api/v5/servers_id_deliveryservices_test.go | 8 +-
.../testing/api/v5/servers_id_status_test.go | 2 +-
traffic_ops/testing/api/v5/servers_test.go | 2 +-
traffic_ops/testing/api/v5/snapshot_test.go | 2 +-
.../testing/api/v5/staticdnsentries_test.go | 2 +-
traffic_ops/testing/api/v5/steering_test.go | 2 +-
traffic_ops/testing/api/v5/steeringtargets_test.go | 2 +-
traffic_ops/testing/api/v5/tc-fixtures.json | 102 +++++++++++++++------
.../testing/api/v5/topologies_queue_update_test.go | 2 +-
traffic_ops/testing/api/v5/topologies_test.go | 2 +-
traffic_ops/testing/api/v5/withobjs_test.go | 79 ++++++++--------
31 files changed, 160 insertions(+), 109 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea739e1327..3e3bacca95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -179,6 +179,7 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
- [#7749](https://github.com/apache/trafficcontrol/pull/7749) *Traffic Ops*
Fixes `tenants` v5 apis to respond with `RFC3339` date/time Format.
### Removed
+- [#7804](https://github.com/apache/trafficcontrol/pull/7804) Removed unneeded
V5 client methods for `deliveryServiceRequiredcapabilities`.
- [#7271](https://github.com/apache/trafficcontrol/pull/7271) Removed
components in `infrastructre/docker/`, not in use as cdn-in-a-box performs the
same functionality.
- [#7271](https://github.com/apache/trafficcontrol/pull/7271)
Removed`misc/jira_github_issue_import.py`, the project does not use JIRA.
- [#7271](https://github.com/apache/trafficcontrol/pull/7271) Removed
`traffic_ops/install/bin/convert_profile/`, this script is outdated and is for
use on an EOL ATS version.
diff --git a/infrastructure/cdn-in-a-box/enroller/enroller.go
b/infrastructure/cdn-in-a-box/enroller/enroller.go
index 22bdb274c7..926a9db478 100644
--- a/infrastructure/cdn-in-a-box/enroller/enroller.go
+++ b/infrastructure/cdn-in-a-box/enroller/enroller.go
@@ -270,16 +270,25 @@ func enrollDeliveryServicesRequiredCapability(toSession
*session, r io.Reader) e
}
dsrc.DeliveryServiceID = dses.Response[0].ID
- alerts, _, err :=
toSession.CreateDeliveryServicesRequiredCapability(dsrc,
client.RequestOptions{})
+ dsUpdate := dses.Response[0]
+ dsUpdate.RequiredCapabilities = []string{*dsrc.RequiredCapability}
+
+ sc := tc.ServerCapabilityV5{
+ Name: *dsrc.RequiredCapability,
+ Description: "description",
+ }
+
+ _, _, err = toSession.CreateServerCapability(sc,
client.RequestOptions{})
if err != nil {
- log.Infof("error creating Delivery Services Required
Capability: %v", err)
+ log.Infof("error creating Server Capability: %v", err)
return err
}
- enc := json.NewEncoder(os.Stdout)
- enc.SetIndent("", " ")
- err = enc.Encode(&alerts)
-
+ _, _, err = toSession.UpdateDeliveryService(*dsUpdate.ID, dsUpdate,
client.RequestOptions{})
+ if err != nil {
+ log.Infof("error creating Delivery Services Required
Capability: %v", err)
+ return err
+ }
return err
}
diff --git a/traffic_ops/testing/api/v5/cachegroupsdeliveryservices_test.go
b/traffic_ops/testing/api/v5/cachegroupsdeliveryservices_test.go
index 8b4867ce2c..a55804bb78 100644
--- a/traffic_ops/testing/api/v5/cachegroupsdeliveryservices_test.go
+++ b/traffic_ops/testing/api/v5/cachegroupsdeliveryservices_test.go
@@ -28,7 +28,7 @@ import (
)
func TestCacheGroupsDeliveryServices(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices, CacheGroupsDeliveryServices}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, DeliveryServices,
CacheGroupsDeliveryServices}, func() {
methodTests := utils.TestCase[client.Session,
client.RequestOptions, []int]{
"POST": {
diff --git a/traffic_ops/testing/api/v5/cdn_federations_test.go
b/traffic_ops/testing/api/v5/cdn_federations_test.go
index ab7e902845..2878b3dfe8 100644
--- a/traffic_ops/testing/api/v5/cdn_federations_test.go
+++ b/traffic_ops/testing/api/v5/cdn_federations_test.go
@@ -39,7 +39,7 @@ var cdnName = "cdn1"
var xmlId = "ds1"
func TestCDNFederations(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Parameters, Profiles, Tenants,
CacheGroups, Statuses, Divisions, Regions, PhysLocations, Servers, Topologies,
ServiceCategories, DeliveryServices, CDNFederations}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Parameters, Profiles, Tenants,
CacheGroups, Statuses, Divisions, Regions, PhysLocations, Servers, Topologies,
ServiceCategories, ServerCapabilities, DeliveryServices, CDNFederations},
func() {
currentTime := time.Now().UTC().Add(-15 * time.Second)
currentTimeRFC := currentTime.Format(time.RFC1123)
diff --git a/traffic_ops/testing/api/v5/cdn_locks_test.go
b/traffic_ops/testing/api/v5/cdn_locks_test.go
index 3f401938aa..768a56e6c5 100644
--- a/traffic_ops/testing/api/v5/cdn_locks_test.go
+++ b/traffic_ops/testing/api/v5/cdn_locks_test.go
@@ -32,7 +32,7 @@ import (
)
func TestCDNLocks(t *testing.T) {
- WithObjs(t, []TCObj{Types, CacheGroups, CDNs, Parameters, Profiles,
ProfileParameters, Statuses, Divisions, Regions, PhysLocations, Servers,
ServiceCategories, Topologies, Tenants, Roles, Users, DeliveryServices,
StaticDNSEntries, CDNLocks}, func() {
+ WithObjs(t, []TCObj{Types, CacheGroups, CDNs, Parameters, Profiles,
ProfileParameters, Statuses, Divisions, Regions, PhysLocations, Servers,
ServiceCategories, Topologies, Tenants, Roles, Users, ServerCapabilities,
DeliveryServices, StaticDNSEntries, CDNLocks}, func() {
now := time.Now().Round(time.Microsecond)
opsUserSession := utils.CreateV5Session(t,
Config.TrafficOps.URL, "opsuser", "pa$$word",
Config.Default.Session.TimeoutInSecs)
diff --git a/traffic_ops/testing/api/v5/cdns_name_configs_monitoring_test.go
b/traffic_ops/testing/api/v5/cdns_name_configs_monitoring_test.go
index 3eb4869cae..4960379bb6 100644
--- a/traffic_ops/testing/api/v5/cdns_name_configs_monitoring_test.go
+++ b/traffic_ops/testing/api/v5/cdns_name_configs_monitoring_test.go
@@ -29,7 +29,7 @@ import (
)
func TestCDNNameConfigsMonitoring(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
ProfileParameters, Statuses, Divisions, Regions, PhysLocations, CacheGroups,
Servers, Topologies, ServiceCategories, DeliveryServices}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
ProfileParameters, Statuses, Divisions, Regions, PhysLocations, CacheGroups,
Servers, Topologies, ServiceCategories, ServerCapabilities, DeliveryServices},
func() {
methodTests := utils.V5TestCase{
"GET": {
diff --git a/traffic_ops/testing/api/v5/cdns_name_snapshot_new_test.go
b/traffic_ops/testing/api/v5/cdns_name_snapshot_new_test.go
index 2f1000f519..4dc65c71c3 100644
--- a/traffic_ops/testing/api/v5/cdns_name_snapshot_new_test.go
+++ b/traffic_ops/testing/api/v5/cdns_name_snapshot_new_test.go
@@ -30,7 +30,7 @@ import (
var baselineCRConfig tc.CRConfig
func TestCDNNameSnapshotNew(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, DeliveryServices}, func() {
methodTests := utils.V5TestCase{
"GET": {
diff --git a/traffic_ops/testing/api/v5/cdns_name_snapshot_test.go
b/traffic_ops/testing/api/v5/cdns_name_snapshot_test.go
index 3dba9ea686..a242c9ac51 100644
--- a/traffic_ops/testing/api/v5/cdns_name_snapshot_test.go
+++ b/traffic_ops/testing/api/v5/cdns_name_snapshot_test.go
@@ -25,7 +25,7 @@ import (
)
func TestCDNNameSnapshot(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, DeliveryServices}, func() {
methodTests := utils.V5TestCase{
"GET": {
diff --git a/traffic_ops/testing/api/v5/deliveryservices_test.go
b/traffic_ops/testing/api/v5/deliveryservices_test.go
index a35c5706af..56b849c722 100644
--- a/traffic_ops/testing/api/v5/deliveryservices_test.go
+++ b/traffic_ops/testing/api/v5/deliveryservices_test.go
@@ -32,7 +32,7 @@ import (
)
func TestDeliveryServices(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServerCapabilities, ServiceCategories, DeliveryServices,
ServerServerCapabilities, DeliveryServiceServerAssignments}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServerCapabilities, ServerServerCapabilities, ServiceCategories,
DeliveryServices, DeliveryServiceServerAssignments}, func() {
currentTime := time.Now().UTC().Add(-15 * time.Second)
currentTimeRFC := currentTime.Format(time.RFC1123)
diff --git a/traffic_ops/testing/api/v5/deliveryserviceservers_test.go
b/traffic_ops/testing/api/v5/deliveryserviceservers_test.go
index 2b56d112a8..8b68fab3c7 100644
--- a/traffic_ops/testing/api/v5/deliveryserviceservers_test.go
+++ b/traffic_ops/testing/api/v5/deliveryserviceservers_test.go
@@ -31,7 +31,7 @@ import (
)
func TestDeliveryServiceServers(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, DeliveryServices,
DeliveryServiceServerAssignments, ServerServerCapabilities}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, DeliveryServiceServerAssignments}, func() {
tomorrow := time.Now().UTC().AddDate(0, 0,
1).Format(time.RFC1123)
@@ -197,7 +197,7 @@ func TestDeliveryServiceServers(t *testing.T) {
}
func TestDeliveryServiceXMLIDServers(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices, DeliveryServiceServerAssignments}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, DeliveryServiceServerAssignments}, func() {
dsXMLIDServersTests := utils.V5TestCase{
"POST": {
"BAD REQUEST when ASSIGNING SERVERS to a
TOPOLOGY DS": {
@@ -254,7 +254,7 @@ func TestDeliveryServiceXMLIDServers(t *testing.T) {
}
func TestDeliveryServicesIDServers(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices, DeliveryServiceServerAssignments}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, DeliveryServiceServerAssignments}, func() {
dsIDServersTests := utils.V5TestCase{
"GET": {
"OK when VALID request": {
@@ -283,7 +283,7 @@ func TestDeliveryServicesIDServers(t *testing.T) {
}
func TestDeliveryServicesDSIDServerID(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices, DeliveryServiceServerAssignments}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, DeliveryServiceServerAssignments}, func() {
dssDSIDServerIDTests := utils.V5TestCase{
"DELETE": {
"OK when VALID REQUEST": {
diff --git a/traffic_ops/testing/api/v5/deliveryservicesideligible_test.go
b/traffic_ops/testing/api/v5/deliveryservicesideligible_test.go
index 3ae0e1c8b0..25c79b8c88 100644
--- a/traffic_ops/testing/api/v5/deliveryservicesideligible_test.go
+++ b/traffic_ops/testing/api/v5/deliveryservicesideligible_test.go
@@ -24,7 +24,7 @@ import (
)
func TestDeliveryServicesEligible(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices}, func() {
methodTests := utils.TestCase[client.Session,
client.RequestOptions, struct{}]{
"GET": {
diff --git a/traffic_ops/testing/api/v5/deliveryservicesregexes_test.go
b/traffic_ops/testing/api/v5/deliveryservicesregexes_test.go
index aef4d011bf..d7c1862fa8 100644
--- a/traffic_ops/testing/api/v5/deliveryservicesregexes_test.go
+++ b/traffic_ops/testing/api/v5/deliveryservicesregexes_test.go
@@ -29,7 +29,7 @@ import (
)
func TestDeliveryServicesRegexes(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices, DeliveryServicesRegexes}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, DeliveryServicesRegexes}, func() {
methodTests := utils.TestCase[client.Session,
client.RequestOptions, tc.DeliveryServiceRegexPost]{
"GET": {
diff --git a/traffic_ops/testing/api/v5/federation_deliveryservices_test.go
b/traffic_ops/testing/api/v5/federation_deliveryservices_test.go
index 924eaf0ebc..f2f51e5f2f 100644
--- a/traffic_ops/testing/api/v5/federation_deliveryservices_test.go
+++ b/traffic_ops/testing/api/v5/federation_deliveryservices_test.go
@@ -31,7 +31,7 @@ import (
)
func TestFederationsDeliveryServices(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices, CDNFederations,
FederationDeliveryServices}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, CDNFederations, FederationDeliveryServices}, func() {
methodTests := utils.TestCase[client.Session,
client.RequestOptions, tc.FederationDSPost]{
"GET": {
diff --git a/traffic_ops/testing/api/v5/federation_federation_resolvers_test.go
b/traffic_ops/testing/api/v5/federation_federation_resolvers_test.go
index 188ba615c1..dd41da155c 100644
--- a/traffic_ops/testing/api/v5/federation_federation_resolvers_test.go
+++ b/traffic_ops/testing/api/v5/federation_federation_resolvers_test.go
@@ -26,7 +26,7 @@ import (
)
func TestFederationFederationResolvers(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Parameters, Profiles, Tenants,
CacheGroups, Statuses, Divisions, Regions, PhysLocations, Servers, Topologies,
ServiceCategories, DeliveryServices, CDNFederations, FederationResolvers,
FederationFederationResolvers}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Parameters, Profiles, Tenants,
CacheGroups, Statuses, Divisions, Regions, PhysLocations, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, CDNFederations, FederationResolvers,
FederationFederationResolvers}, func() {
methodTests := utils.TestCase[client.Session,
client.RequestOptions, tc.AssignFederationResolversRequest]{
"GET": {
diff --git a/traffic_ops/testing/api/v5/federation_users_test.go
b/traffic_ops/testing/api/v5/federation_users_test.go
index b3d01451ad..9686783286 100644
--- a/traffic_ops/testing/api/v5/federation_users_test.go
+++ b/traffic_ops/testing/api/v5/federation_users_test.go
@@ -32,7 +32,7 @@ import (
)
func TestFederationUsers(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices, CDNFederations, FederationUsers}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, CDNFederations, FederationUsers}, func() {
currentTime := time.Now().UTC().Add(-15 * time.Second)
currentTimeRFC := currentTime.Format(time.RFC1123)
diff --git a/traffic_ops/testing/api/v5/federations_test.go
b/traffic_ops/testing/api/v5/federations_test.go
index 58c1775659..4bf2dce381 100644
--- a/traffic_ops/testing/api/v5/federations_test.go
+++ b/traffic_ops/testing/api/v5/federations_test.go
@@ -30,7 +30,7 @@ import (
)
func TestFederations(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices, CDNFederations,
FederationDeliveryServices, FederationUsers}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, CDNFederations, FederationDeliveryServices, FederationUsers},
func() {
currentTime := time.Now().UTC().Add(-15 * time.Second)
currentTimeRFC := currentTime.Format(time.RFC1123)
diff --git a/traffic_ops/testing/api/v5/jobs_test.go
b/traffic_ops/testing/api/v5/jobs_test.go
index a83d2ae857..06172bc448 100644
--- a/traffic_ops/testing/api/v5/jobs_test.go
+++ b/traffic_ops/testing/api/v5/jobs_test.go
@@ -31,7 +31,7 @@ import (
)
func TestJobs(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices, Jobs}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, Jobs}, func() {
currentTime := time.Now()
pastTime := currentTime.AddDate(0, 0, -1)
diff --git a/traffic_ops/testing/api/v5/monitoring_test.go
b/traffic_ops/testing/api/v5/monitoring_test.go
index 32f44f262f..03bcd8d68f 100644
--- a/traffic_ops/testing/api/v5/monitoring_test.go
+++ b/traffic_ops/testing/api/v5/monitoring_test.go
@@ -23,7 +23,7 @@ import (
)
func TestMonitoring(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
ProfileParameters, Statuses, Divisions, Regions, PhysLocations, CacheGroups,
Servers, Topologies, ServiceCategories, DeliveryServices}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
ProfileParameters, Statuses, Divisions, Regions, PhysLocations, CacheGroups,
Servers, Topologies, ServiceCategories, ServerCapabilities,
ServerServerCapabilities, DeliveryServices}, func() {
GetTestMonitoringConfigNoSnapshotOnTheFly(t) // MUST run first
AllCDNsCanSnapshot(t)
})
diff --git a/traffic_ops/testing/api/v5/origins_test.go
b/traffic_ops/testing/api/v5/origins_test.go
index af679f9974..cbbc950614 100644
--- a/traffic_ops/testing/api/v5/origins_test.go
+++ b/traffic_ops/testing/api/v5/origins_test.go
@@ -33,7 +33,7 @@ import (
)
func TestOrigins(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Coordinates, Types, Tenants, Parameters,
Profiles, Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers,
Users, Topologies, ServiceCategories, DeliveryServices, Origins}, func() {
+ WithObjs(t, []TCObj{CDNs, Coordinates, Types, Tenants, Parameters,
Profiles, Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers,
Users, Topologies, ServiceCategories, ServerCapabilities,
ServerServerCapabilities, DeliveryServices, Origins}, func() {
currentTime := time.Now().UTC().Add(-15 * time.Second)
currentTimeRFC := currentTime.Format(time.RFC1123)
diff --git a/traffic_ops/testing/api/v5/server_server_capabilities_test.go
b/traffic_ops/testing/api/v5/server_server_capabilities_test.go
index f112d34b6a..4f88a0a16d 100644
--- a/traffic_ops/testing/api/v5/server_server_capabilities_test.go
+++ b/traffic_ops/testing/api/v5/server_server_capabilities_test.go
@@ -33,7 +33,7 @@ import (
)
func TestServerServerCapabilities(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices, DeliveryServiceServerAssignments,
ServerCapabilities, ServerServerCapabilities,
DeliveryServicesRequiredCapabilities}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, DeliveryServiceServerAssignments}, func() {
currentTime := time.Now().UTC().Add(-15 * time.Second)
tomorrow := currentTime.AddDate(0, 0, 1).Format(time.RFC1123)
diff --git a/traffic_ops/testing/api/v5/servers_id_deliveryservices_test.go
b/traffic_ops/testing/api/v5/servers_id_deliveryservices_test.go
index 5dbc59c275..ee67655c6f 100644
--- a/traffic_ops/testing/api/v5/servers_id_deliveryservices_test.go
+++ b/traffic_ops/testing/api/v5/servers_id_deliveryservices_test.go
@@ -28,7 +28,7 @@ import (
)
func TestServersIDDeliveryServices(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Parameters, Profiles, Statuses,
Divisions, Regions, PhysLocations, CacheGroups, Servers, Tenants, Topologies,
ServiceCategories, DeliveryServices, DeliveryServiceServerAssignments}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Parameters, Profiles, Statuses,
Divisions, Regions, PhysLocations, CacheGroups, Servers, Tenants, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, DeliveryServiceServerAssignments}, func() {
currentTime := time.Now().UTC().Add(-15 * time.Second)
tomorrow := currentTime.AddDate(0, 0, 1).Format(time.RFC1123)
@@ -52,14 +52,14 @@ func TestServersIDDeliveryServices(t *testing.T) {
EndpointID: GetServerID(t,
"atlanta-edge-01"),
ClientSession: TOSession,
RequestBody: map[string]interface{}{
- "dsIds":
[]int{GetDeliveryServiceId(t, "ds1")()},
+ "dsIds":
[]int{GetDeliveryServiceId(t, "dsserverid")()},
"replace": true,
},
Expectations:
utils.CkRequest(utils.NoError(), utils.HasStatus(http.StatusOK),
validateServersDeliveryServicesPost(
GetServerID(t,
"atlanta-edge-01")(),
[]int{
-
GetDeliveryServiceId(t, "ds1")(),
+
GetDeliveryServiceId(t, "dsserverid")(),
GetDeliveryServiceId(t, "ds-based-top-with-no-mids")(),
},
2)),
@@ -100,7 +100,7 @@ func TestServersIDDeliveryServices(t *testing.T) {
EndpointID: GetServerID(t,
"cdn2-test-edge"),
ClientSession: TOSession,
RequestBody: map[string]interface{}{
- "dsIds":
[]int{GetDeliveryServiceId(t, "ds1")()},
+ "dsIds":
[]int{GetDeliveryServiceId(t, "dsserverid")()},
"replace": true,
},
Expectations:
utils.CkRequest(utils.HasError(), utils.HasStatus(http.StatusConflict)),
diff --git a/traffic_ops/testing/api/v5/servers_id_status_test.go
b/traffic_ops/testing/api/v5/servers_id_status_test.go
index 9555156d28..ba7bdbca4e 100644
--- a/traffic_ops/testing/api/v5/servers_id_status_test.go
+++ b/traffic_ops/testing/api/v5/servers_id_status_test.go
@@ -28,7 +28,7 @@ import (
)
func TestServersIDStatus(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers,
ServiceCategories, Topologies, DeliveryServices,
DeliveryServiceServerAssignments}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers,
ServiceCategories, Topologies, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, DeliveryServiceServerAssignments}, func() {
methodTests := utils.TestCase[client.Session,
client.RequestOptions, tc.ServerPutStatus]{
"PUT": {
diff --git a/traffic_ops/testing/api/v5/servers_test.go
b/traffic_ops/testing/api/v5/servers_test.go
index 56a6886cb1..38ad3fc189 100644
--- a/traffic_ops/testing/api/v5/servers_test.go
+++ b/traffic_ops/testing/api/v5/servers_test.go
@@ -33,7 +33,7 @@ import (
)
func TestServers(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices, DeliveryServiceServerAssignments}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, DeliveryServiceServerAssignments}, func() {
currentTime := time.Now().UTC().Add(-15 * time.Second)
currentTimeRFC := currentTime.Format(time.RFC1123)
diff --git a/traffic_ops/testing/api/v5/snapshot_test.go
b/traffic_ops/testing/api/v5/snapshot_test.go
index ad50513717..4128fce3d6 100644
--- a/traffic_ops/testing/api/v5/snapshot_test.go
+++ b/traffic_ops/testing/api/v5/snapshot_test.go
@@ -29,7 +29,7 @@ import (
)
func TestSnapshot(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices, DeliveryServiceServerAssignments}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, DeliveryServiceServerAssignments}, func() {
readOnlyUserSession := utils.CreateV5Session(t,
Config.TrafficOps.URL, "readonlyuser", "pa$$word",
Config.Default.Session.TimeoutInSecs)
diff --git a/traffic_ops/testing/api/v5/staticdnsentries_test.go
b/traffic_ops/testing/api/v5/staticdnsentries_test.go
index 975b1b2f1d..f4873786b7 100644
--- a/traffic_ops/testing/api/v5/staticdnsentries_test.go
+++ b/traffic_ops/testing/api/v5/staticdnsentries_test.go
@@ -32,7 +32,7 @@ import (
)
func TestStaticDNSEntries(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices, StaticDNSEntries}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, StaticDNSEntries}, func() {
currentTime := time.Now().UTC().Add(-15 * time.Second)
currentTimeRFC := currentTime.Format(time.RFC1123)
diff --git a/traffic_ops/testing/api/v5/steering_test.go
b/traffic_ops/testing/api/v5/steering_test.go
index 7bbeaaf963..54714ab880 100644
--- a/traffic_ops/testing/api/v5/steering_test.go
+++ b/traffic_ops/testing/api/v5/steering_test.go
@@ -27,7 +27,7 @@ import (
)
func TestSteering(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices, Users, SteeringTargets}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, Users, SteeringTargets}, func() {
methodTests := utils.TestCase[client.Session,
client.RequestOptions, struct{}]{
"GET": {
diff --git a/traffic_ops/testing/api/v5/steeringtargets_test.go
b/traffic_ops/testing/api/v5/steeringtargets_test.go
index 6801fae988..561dc5af36 100644
--- a/traffic_ops/testing/api/v5/steeringtargets_test.go
+++ b/traffic_ops/testing/api/v5/steeringtargets_test.go
@@ -31,7 +31,7 @@ import (
)
func TestSteeringTargets(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices, Users, SteeringTargets}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices, Users, SteeringTargets}, func() {
steeringUserSession := utils.CreateV5Session(t,
Config.TrafficOps.URL, "steering", "pa$$word",
Config.Default.Session.TimeoutInSecs)
diff --git a/traffic_ops/testing/api/v5/tc-fixtures.json
b/traffic_ops/testing/api/v5/tc-fixtures.json
index e79a1c3aed..3fd3bba2ae 100644
--- a/traffic_ops/testing/api/v5/tc-fixtures.json
+++ b/traffic_ops/testing/api/v5/tc-fixtures.json
@@ -459,6 +459,7 @@
"regexRemap": "rr1\nrr2",
"regionalGeoBlocking": false,
"remapText": "@plugin=tslua.so
@pparam=/opt/trafficserver/etc/trafficserver/remapPlugin1.lua",
+ "requiredCapabilities": ["foo"],
"routingName": "ccr-ds1",
"signed": false,
"signingAlgorithm": "url_sig",
@@ -470,6 +471,72 @@
"anonymousBlockingEnabled": true,
"maxRequestHeaderBytes": 131072
},
+ {
+ "active": "ACTIVE",
+ "cdnName": "cdn1",
+ "ccrDnsTtl": 3600,
+ "checkPath": "",
+ "consistentHashQueryParams": [],
+ "deepCachingType": "NEVER",
+ "displayName": "dsserveridDisplayName",
+ "dnsBypassCname": null,
+ "dnsBypassIp": "",
+ "dnsBypassIp6": "",
+ "dnsBypassTtl": 30,
+ "dscp": 40,
+ "edgeHeaderRewrite": "edgeHeader1\nedgeHeader2",
+ "exampleURLs": [
+ "http://ccr.ds1.example.net";,
+ "https://ccr.ds1.example.net";
+ ],
+ "fqPacingRate": 0,
+ "geoLimit": 0,
+ "geoLimitCountries": [],
+ "geoLimitRedirectURL": null,
+ "geoProvider": 0,
+ "globalMaxMbps": 0,
+ "globalMaxTps": 0,
+ "httpBypassFqdn": "",
+ "infoUrl": "TBD",
+ "initialDispersion": 1,
+ "ipv6RoutingEnabled": true,
+ "logsEnabled": false,
+ "longDesc": "d s 1",
+ "longDesc1": "ds1",
+ "longDesc2": "ds1",
+ "matchList": [
+ {
+ "pattern": ".*\\.ds1\\..*",
+ "setNumber": 0,
+ "type": "HOST_REGEXP"
+ }
+ ],
+ "maxDnsAnswers": 0,
+ "midHeaderRewrite": "midHeader1\nmidHeader2",
+ "missLat": 41.881944,
+ "missLong": -87.627778,
+ "multiSiteOrigin": false,
+ "orgServerFqdn": "http://origin.example.net";,
+ "originShield": null,
+ "profileDescription": null,
+ "profileName": "ATS_EDGE_TIER_CACHE",
+ "protocol": 2,
+ "qstringIgnore": 1,
+ "rangeRequestHandling": 0,
+ "regexRemap": "rr1\nrr2",
+ "regionalGeoBlocking": false,
+ "remapText": "@plugin=tslua.so
@pparam=/opt/trafficserver/etc/trafficserver/remapPlugin1.lua",
+ "routingName": "ccr-ds1",
+ "signed": false,
+ "signingAlgorithm": "url_sig",
+ "sslKeyVersion": 2,
+ "tenant": "tenant1",
+ "tenantName": "tenant1",
+ "type": "HTTP",
+ "xmlId": "dsserverid",
+ "anonymousBlockingEnabled": true,
+ "maxRequestHeaderBytes": 131072
+ },
{
"active": "ACTIVE",
"cdnName": "cdn1",
@@ -530,6 +597,7 @@
"regexRemap": "rr1\nrr2",
"regionalGeoBlocking": false,
"remapText": "@plugin=tslua.so
@pparam=/opt/trafficserver/etc/trafficserver/ds2plugin.lua",
+ "requiredCapabilities": ["bar"],
"routingName": "ccr-ds2",
"signed": false,
"signingAlgorithm": "url_sig",
@@ -783,6 +851,7 @@
"regexRemap": "rr1\nrr2",
"regionalGeoBlocking": false,
"remapText": "@plugin=tslua.so
@pparam=/opt/trafficserver/etc/trafficserver/remapPlugin1.lua",
+ "requiredCapabilities": ["bar"],
"routingName": "ccr-msods1",
"signed": false,
"signingAlgorithm": "url_sig",
@@ -977,6 +1046,7 @@
"regexRemap": null,
"regionalGeoBlocking": false,
"remapText": null,
+ "requiredCapabilities": ["ram", "disk"],
"routingName": "cdn",
"signed": false,
"signingAlgorithm": null,
@@ -1040,6 +1110,7 @@
"regexRemap": null,
"regionalGeoBlocking": false,
"remapText": null,
+ "requiredCapabilities": ["ram"],
"routingName": "cdn",
"signed": false,
"signingAlgorithm": null,
@@ -1732,6 +1803,7 @@
"qstringIgnore": 0,
"rangeRequestHandling": 0,
"regionalGeoBlocking": false,
+ "requiredCapabilities": ["ram"],
"tenant": "tenant1",
"topology": "top-with-caches-in-cdn1",
"type": "HTTP",
@@ -1759,36 +1831,6 @@
"pattern": ".*"
}
],
- "deliveryservicesRequiredCapabilities": [
- {
- "xmlID": "ds1",
- "RequiredCapability": "foo"
- },
- {
- "xmlID": "ds2",
- "RequiredCapability": "bar"
- },
- {
- "xmlID": "msods1",
- "RequiredCapability": "bar"
- },
- {
- "xmlID": "ds-top-req-cap",
- "RequiredCapability": "ram"
- },
- {
- "xmlID": "ds-top-req-cap",
- "RequiredCapability": "disk"
- },
- {
- "xmlID": "ds-top-req-cap2",
- "RequiredCapability": "ram"
- },
- {
- "xmlID": "test-rm-ssc",
- "RequiredCapability": "ram"
- }
- ],
"deliveryServiceServerAssignments": [
{
"xmlId": "ds-top",
diff --git a/traffic_ops/testing/api/v5/topologies_queue_update_test.go
b/traffic_ops/testing/api/v5/topologies_queue_update_test.go
index a1ee357358..22c0fea2db 100644
--- a/traffic_ops/testing/api/v5/topologies_queue_update_test.go
+++ b/traffic_ops/testing/api/v5/topologies_queue_update_test.go
@@ -33,7 +33,7 @@ import (
)
func TestTopologiesQueueUpdate(t *testing.T) {
- WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, DeliveryServices}, func() {
+ WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles,
Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies,
ServiceCategories, ServerCapabilities, ServerServerCapabilities,
DeliveryServices}, func() {
methodTests := utils.TestCase[client.Session,
client.RequestOptions, tc.TopologiesQueueUpdateRequest]{
"POST": {
diff --git a/traffic_ops/testing/api/v5/topologies_test.go
b/traffic_ops/testing/api/v5/topologies_test.go
index bafa450fbf..5c492ee498 100644
--- a/traffic_ops/testing/api/v5/topologies_test.go
+++ b/traffic_ops/testing/api/v5/topologies_test.go
@@ -34,7 +34,7 @@ import (
)
func TestTopologies(t *testing.T) {
- WithObjs(t, []TCObj{Tenants, Users, Types, CacheGroups, CDNs,
Parameters, Profiles, Statuses, Divisions, Regions, PhysLocations, Servers,
ServerCapabilities, ServerServerCapabilities, Topologies, ServiceCategories,
DeliveryServices, DeliveryServicesRequiredCapabilities,
DeliveryServiceServerAssignments}, func() {
+ WithObjs(t, []TCObj{Tenants, Users, Types, CacheGroups, CDNs,
Parameters, Profiles, Statuses, Divisions, Regions, PhysLocations, Servers,
ServerCapabilities, ServerServerCapabilities, Topologies, ServiceCategories,
DeliveryServices, DeliveryServiceServerAssignments}, func() {
readOnlyUserSession := utils.CreateV5Session(t,
Config.TrafficOps.URL, "readonlyuser", "pa$$word",
Config.Default.Session.TimeoutInSecs)
diff --git a/traffic_ops/testing/api/v5/withobjs_test.go
b/traffic_ops/testing/api/v5/withobjs_test.go
index 94fdbf7bb5..eb2564e09d 100644
--- a/traffic_ops/testing/api/v5/withobjs_test.go
+++ b/traffic_ops/testing/api/v5/withobjs_test.go
@@ -89,44 +89,43 @@ type TCObjFuncs struct {
}
var withFuncs = map[TCObj]TCObjFuncs{
- ASN: {CreateTestASNs, DeleteTestASNs},
- CacheGroups: {CreateTestCacheGroups,
DeleteTestCacheGroups},
- CacheGroupsDeliveryServices:
{CreateTestCachegroupsDeliveryServices, DeleteTestCachegroupsDeliveryServices},
- CDNs: {CreateTestCDNs, DeleteTestCDNs},
- CDNLocks: {CreateTestCDNLocks,
DeleteTestCDNLocks},
- CDNNotifications: {CreateTestCDNNotifications,
DeleteTestCDNNotifications},
- CDNFederations: {CreateTestCDNFederations,
DeleteTestCDNFederations},
- Coordinates: {CreateTestCoordinates,
DeleteTestCoordinates},
- DeliveryServices: {CreateTestDeliveryServices,
DeleteTestDeliveryServices},
- DeliveryServicesRegexes:
{CreateTestDeliveryServicesRegexes, DeleteTestDeliveryServicesRegexes},
- DeliveryServiceRequests:
{CreateTestDeliveryServiceRequests, DeleteTestDeliveryServiceRequests},
- DeliveryServiceRequestComments:
{CreateTestDeliveryServiceRequestComments,
DeleteTestDeliveryServiceRequestComments},
- DeliveryServicesRequiredCapabilities:
{CreateTestDeliveryServicesRequiredCapabilities,
DeleteTestDeliveryServicesRequiredCapabilities},
- DeliveryServiceServerAssignments:
{CreateTestDeliveryServiceServerAssignments, DeleteTestDeliveryServiceServers},
- Divisions: {CreateTestDivisions,
DeleteTestDivisions},
- FederationDeliveryServices:
{CreateTestFederationDeliveryServices, DeleteTestCDNFederations},
- FederationUsers: {CreateTestFederationUsers,
DeleteTestFederationUsers},
- FederationResolvers: {CreateTestFederationResolvers,
DeleteTestFederationResolvers},
- FederationFederationResolvers:
{CreateTestFederationFederationResolvers,
DeleteTestFederationFederationResolvers},
- Jobs: {CreateTestJobs, DeleteTestJobs},
- Origins: {CreateTestOrigins,
DeleteTestOrigins},
- Parameters: {CreateTestParameters,
DeleteTestParameters},
- PhysLocations: {CreateTestPhysLocations,
DeleteTestPhysLocations},
- Profiles: {CreateTestProfiles,
DeleteTestProfiles},
- ProfileParameters: {CreateTestProfileParameters,
DeleteTestProfileParameters},
- Regions: {CreateTestRegions,
DeleteTestRegions},
- Roles: {CreateTestRoles,
DeleteTestRoles},
- ServerCapabilities: {CreateTestServerCapabilities,
DeleteTestServerCapabilities},
- ServerChecks: {CreateTestServerChecks,
DeleteTestServerChecks},
- ServerServerCapabilities:
{CreateTestServerServerCapabilities, DeleteTestServerServerCapabilities},
- Servers: {CreateTestServers,
DeleteTestServers},
- ServiceCategories: {CreateTestServiceCategories,
DeleteTestServiceCategories},
- Statuses: {CreateTestStatuses,
DeleteTestStatuses},
- StaticDNSEntries: {CreateTestStaticDNSEntries,
DeleteTestStaticDNSEntries},
- SteeringTargets: {CreateTestSteeringTargets,
DeleteTestSteeringTargets},
- Tenants: {CreateTestTenants,
DeleteTestTenants},
- ServerCheckExtensions: {CreateTestServerCheckExtensions,
DeleteTestServerCheckExtensions},
- Topologies: {CreateTestTopologies,
DeleteTestTopologies},
- Types: {CreateTestTypes,
DeleteTestTypes},
- Users: {CreateTestUsers,
ForceDeleteTestUsers},
+ ASN: {CreateTestASNs, DeleteTestASNs},
+ CacheGroups: {CreateTestCacheGroups,
DeleteTestCacheGroups},
+ CacheGroupsDeliveryServices:
{CreateTestCachegroupsDeliveryServices, DeleteTestCachegroupsDeliveryServices},
+ CDNs: {CreateTestCDNs, DeleteTestCDNs},
+ CDNLocks: {CreateTestCDNLocks,
DeleteTestCDNLocks},
+ CDNNotifications: {CreateTestCDNNotifications,
DeleteTestCDNNotifications},
+ CDNFederations: {CreateTestCDNFederations,
DeleteTestCDNFederations},
+ Coordinates: {CreateTestCoordinates,
DeleteTestCoordinates},
+ DeliveryServices: {CreateTestDeliveryServices,
DeleteTestDeliveryServices},
+ DeliveryServicesRegexes: {CreateTestDeliveryServicesRegexes,
DeleteTestDeliveryServicesRegexes},
+ DeliveryServiceRequests: {CreateTestDeliveryServiceRequests,
DeleteTestDeliveryServiceRequests},
+ DeliveryServiceRequestComments:
{CreateTestDeliveryServiceRequestComments,
DeleteTestDeliveryServiceRequestComments},
+ DeliveryServiceServerAssignments:
{CreateTestDeliveryServiceServerAssignments, DeleteTestDeliveryServiceServers},
+ Divisions: {CreateTestDivisions,
DeleteTestDivisions},
+ FederationDeliveryServices:
{CreateTestFederationDeliveryServices, DeleteTestCDNFederations},
+ FederationUsers: {CreateTestFederationUsers,
DeleteTestFederationUsers},
+ FederationResolvers: {CreateTestFederationResolvers,
DeleteTestFederationResolvers},
+ FederationFederationResolvers:
{CreateTestFederationFederationResolvers,
DeleteTestFederationFederationResolvers},
+ Jobs: {CreateTestJobs, DeleteTestJobs},
+ Origins: {CreateTestOrigins,
DeleteTestOrigins},
+ Parameters: {CreateTestParameters,
DeleteTestParameters},
+ PhysLocations: {CreateTestPhysLocations,
DeleteTestPhysLocations},
+ Profiles: {CreateTestProfiles,
DeleteTestProfiles},
+ ProfileParameters: {CreateTestProfileParameters,
DeleteTestProfileParameters},
+ Regions: {CreateTestRegions,
DeleteTestRegions},
+ Roles: {CreateTestRoles, DeleteTestRoles},
+ ServerCapabilities: {CreateTestServerCapabilities,
DeleteTestServerCapabilities},
+ ServerChecks: {CreateTestServerChecks,
DeleteTestServerChecks},
+ ServerServerCapabilities: {CreateTestServerServerCapabilities,
DeleteTestServerServerCapabilities},
+ Servers: {CreateTestServers,
DeleteTestServers},
+ ServiceCategories: {CreateTestServiceCategories,
DeleteTestServiceCategories},
+ Statuses: {CreateTestStatuses,
DeleteTestStatuses},
+ StaticDNSEntries: {CreateTestStaticDNSEntries,
DeleteTestStaticDNSEntries},
+ SteeringTargets: {CreateTestSteeringTargets,
DeleteTestSteeringTargets},
+ Tenants: {CreateTestTenants,
DeleteTestTenants},
+ ServerCheckExtensions: {CreateTestServerCheckExtensions,
DeleteTestServerCheckExtensions},
+ Topologies: {CreateTestTopologies,
DeleteTestTopologies},
+ Types: {CreateTestTypes, DeleteTestTypes},
+ Users: {CreateTestUsers,
ForceDeleteTestUsers},
}
