From e28196c34f1fce534fdd343082c332b6b2cda3f1 Mon Sep 17 00:00:00 2001 From: moltzaum Date: Thu, 6 Dec 2018 15:32:57 -0700 Subject: [PATCH 1/2] Added actual params to profiles --- traffic_ops/testing/api/v14/tc-fixtures.json | 410 ++++++++++++++++++- 1 file changed, 400 insertions(+), 10 deletions(-) diff --git a/traffic_ops/testing/api/v14/tc-fixtures.json b/traffic_ops/testing/api/v14/tc-fixtures.json index 211b651142..f5f17f24f9 100644 --- a/traffic_ops/testing/api/v14/tc-fixtures.json +++ b/traffic_ops/testing/api/v14/tc-fixtures.json @@ -554,24 +554,414 @@ "profiles": [ { "cdnName": "cdn1", - "description": "edge description", - "lastUpdated": "2018-03-02T17:27:11.796899+00:00", - "name": "EDGE1", - "routing_disabled": true, + "description": "Edge Cache - Apache Traffic Server", + "name": "ATS_EDGE_TIER_CACHE", + "routingDisabled": false, "type": "ATS_PROFILE", "params": [ + { + "configFile": "records.config", + "name": "CONFIG proxy.config.proxy_name", + "secure": false, + "value": "STRING __HOSTNAME__" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.config_dir", + "secure": false, + "value": "STRING /etc/trafficserver" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.admin.user_id", + "secure": false, + "value": "STRING ats" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.http.server_ports", + "secure": false, + "value": "STRING 80 80:ipv6" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.http.insert_response_via_str", + "secure": false, + "value": "INT 3" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.http.parent_proxy_routing_enable", + "secure": false, + "value": "INT 1" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.http.parent_proxy.retry_time", + "secure": false, + "value": "INT 60" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.http.connect_attempts_timeout", + "secure": false, + "value": "INT 10" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.http.cache.required_headers", + "secure": false, + "value": "INT 0" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.http.enable_http_stats", + "secure": false, + "value": "INT 1" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.dns.round_robin_nameservers", + "secure": false, + "value": "INT 0" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.log.max_space_mb_for_logs", + "secure": false, + "value": "INT 512" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.log.max_space_mb_headroom", + "secure": false, + "value": "INT 50" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.log.logfile_dir", + "secure": false, + "value": "STRING /var/log/trafficserver" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.reverse_proxy.enabled", + "secure": false, + "value": "INT 0" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.diags.debug.enabled", + "secure": false, + "value": "INT 1" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.http.slow.log.threshold", + "secure": false, + "value": "INT 10000" + }, + { + "configFile": "cache.config", + "name": "location", + "secure": false, + "value": "/etc/trafficserver/" + }, { - "name": "param1", - "configFile": "param1.txt", - "value": "value1" + "configFile": "hosting.config", + "name": "location", + "secure": false, + "value": "/etc/trafficserver/" }, { - "name": "param2", - "configFile": "param2.txt", - "value": "value2" + "configFile": "parent.config", + "name": "location", + "secure": false, + "value": "/etc/trafficserver/" + }, + { + "configFile": "plugin.config", + "name": "location", + "secure": false, + "value": "/etc/trafficserver/" + }, + { + "configFile": "records.config", + "name": "location", + "secure": false, + "value": "/etc/trafficserver/" + }, + { + "configFile": "remap.config", + "name": "location", + "secure": false, + "value": "/etc/trafficserver/" + }, + { + "configFile": "storage.config", + "name": "location", + "secure": false, + "value": "/etc/trafficserver/" + }, + { + "configFile": "volume.config", + "name": "location", + "secure": false, + "value": "/etc/trafficserver/" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.url_remap.remap_required", + "secure": false, + "value": "INT 0" + }, + { + "configFile": "rascal.properties", + "name": "health.threshold.loadavg", + "secure": false, + "value": "25.0" + }, + { + "configFile": "rascal.properties", + "name": "health.threshold.availableBandwidthInKbps", + "secure": false, + "value": ">1750000" + }, + { + "configFile": "rascal.properties", + "name": "history.count", + "secure": false, + "value": "30" + }, + { + "configFile": "rascal.properties", + "name": "health.threshold.queryTime", + "secure": false, + "value": "1000" + }, + { + "configFile": "rascal.properties", + "name": "health.polling.url", + "secure": false, + "value": "http://${hostname}/_astats?application=&inf.name=${interface_name}" + }, + { + "configFile": "storage.config", + "name": "Disk_Volume", + "secure": false, + "value": "1" + }, + { + "configFile": "rascal.properties", + "name": "health.connection.timeout", + "secure": false, + "value": "2000" + }, + { + "configFile": "chkconfig", + "name": "trafficserver", + "secure": false, + "value": "0:off\t1:off\t2:on\t3:on\t4:on\t5:on\t6:off" + }, + { + "configFile": "plugin.config", + "name": "regex_revalidate.so", + "secure": false, + "value": "--config regex_revalidate.config" + }, + { + "configFile": "regex_revalidate.config", + "name": "location", + "secure": false, + "value": "/etc/trafficserver" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.exec_thread.autoconfig", + "secure": false, + "value": "INT 0" + }, + { + "configFile": "plugin.config", + "name": "astats_over_http.so", + "secure": false, + "value": "" + }, + { + "configFile": "astats.config", + "name": "allow_ip", + "secure": false, + "value": "127.0.0.1,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16" + }, + { + "configFile": "astats.config", + "name": "allow_ip6", + "secure": false, + "value": "::1/128,fc01:9400:1000:8::/64" + }, + { + "configFile": "astats.config", + "name": "location", + "secure": false, + "value": "/etc/trafficserver" + }, + { + "configFile": "astats.config", + "name": "path", + "secure": false, + "value": "_astats" + }, + { + "configFile": "astats.config", + "name": "record_types", + "secure": false, + "value": "122" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.http.transaction_active_timeout_in", + "secure": false, + "value": "INT 0" + }, + { + "configFile": "records.config", + "name": "CONFIG proxy.config.body_factory.template_sets_dir", + "secure": false, + "value": "STRING /etc/trafficserver/body_factory" + }, + { + "configFile": "storage.config", + "name": "Drive_Letters", + "secure": false, + "value": "cache" + }, + { + "configFile": "ip_allow.config", + "name": "location", + "secure": false, + "value": "/etc/trafficserver" + }, + { + "configFile": "storage.config", + "name": "Drive_Prefix", + "secure": false, + "value": "/var/trafficserver/" + }, + { + "configFile": "set_dscp_0.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_10.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_12.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_14.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_18.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_20.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_22.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_26.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_28.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_30.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_34.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_36.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_38.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_8.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_16.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_24.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_32.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_40.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_48.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_56.config", + "name": "location", + "value": "/etc/trafficserver/dscp" + }, + { + "configFile": "set_dscp_37.config", + "name": "location", + "value": "/etc/trafficserver/dscp" } ] }, + { + "cdnName": "cdn1", + "description": "edge1 description", + "lastUpdated": "2018-03-02T17:27:11.818418+00:00", + "name": "EDGE1", + "routing_disabled": false, + "type": "ATS_PROFILE" + }, { "cdnName": "cdn4", "description": "edge2 description", From 20fc6e6a37ebc397fd000d3bd322786d09c20c0d Mon Sep 17 00:00:00 2001 From: moltzaum Date: Fri, 30 Nov 2018 13:35:29 -0700 Subject: [PATCH 2/2] Updated profile test to delete parameters it generates. Updated parameters delete test so that it checks whether or not a parameter was deleted by id instead of name and config. --- traffic_ops/testing/api/v14/parameters_test.go | 2 +- traffic_ops/testing/api/v14/profiles_test.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/traffic_ops/testing/api/v14/parameters_test.go b/traffic_ops/testing/api/v14/parameters_test.go index 88f438594d..f3ac06228e 100644 --- a/traffic_ops/testing/api/v14/parameters_test.go +++ b/traffic_ops/testing/api/v14/parameters_test.go @@ -124,7 +124,7 @@ func DeleteTestParameter(t *testing.T, pl tc.Parameter) { } // Retrieve the Parameter to see if it got deleted - pls, _, err := TOSession.GetParameterByNameAndConfigFile(pl.Name, pl.ConfigFile) + pls, _, err := TOSession.GetParameterByID(pl.ID) if err != nil { t.Errorf("error deleting Parameter name: %s\n", err.Error()) } diff --git a/traffic_ops/testing/api/v14/profiles_test.go b/traffic_ops/testing/api/v14/profiles_test.go index 82ab0e2eea..5ff5ccebf7 100644 --- a/traffic_ops/testing/api/v14/profiles_test.go +++ b/traffic_ops/testing/api/v14/profiles_test.go @@ -207,10 +207,11 @@ func DeleteTestProfiles(t *testing.T) { t.Errorf("cannot GET Profile by id: %v - %v\n", err, resp) } // delete any profile_parameter associations first + // the parameter is what's being deleted, but the delete is cascaded to profile_parameter for _, param := range resp[0].Parameters { - _, _, err := TOSession.DeleteParameterByProfileParameter(profileID, *param.ID) + _, _, err := TOSession.DeleteParameterByID(*param.ID) if err != nil { - t.Errorf("cannot DELETE profile_parameter with profileID %d, parameterID %d: %s\n", profileID, *param.ID, err.Error()) + t.Errorf("cannot DELETE parameter with parameterID %d: %s\n", *param.ID, err.Error()) } } delResp, _, err := TOSession.DeleteProfileByID(profileID)