Skip to content

Commit

Permalink
Changing Traffic Router to point to Traffic Ops api version 5.0 (#7757)
Browse files Browse the repository at this point in the history
* Changing Traffic Router to point to Traffic Ops api version 5.0

* add changelog

* fix tests
  • Loading branch information
srijeet0406 committed Aug 29, 2023
1 parent 66e93a1 commit 3735399
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 25 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- [#7652](https://github.com/apache/trafficcontrol/pull/7652) *t3c* added rpmdb checks and use package data from t3c-apply-metadata.json if rpmdb is corrupt.

### Changed
- [#7757](https://github.com/apache/trafficcontrol/pull/7757) *Traffic Router* Changed Traffic Router to point to api version 5.0 of Traffic Ops.
- [#7732](https://github.com/apache/trafficcontrol/pull/7732) *Traffic Router* Increased negative TTL value to 900 seconds.
- [#7584](https://github.com/apache/trafficcontrol/pull/7584) *Documentation* Upgrade Traffic Control Sphinx documentation Makefile OS intelligent.
- [#7521](https://github.com/apache/trafficcontrol/pull/7521) *Traffic Ops* Returns empty array instead of null when no permissions are given for roles endpoint using POST or PUT request.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import java.util.Map;

public class TrafficOpsUtils {
public static final String TO_API_VERSION = "4.0";
public static final String TO_API_VERSION = "5.0";

private String username;
private String password;
Expand Down
12 changes: 6 additions & 6 deletions traffic_router/core/src/test/resources/publish/CrConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -1916,12 +1916,12 @@
}
},
"config": {
"certificate.api.url": "http://${toHostname}/api/4.0/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/4.0/dnsrecords/",
"certificate.api.url": "http://${toHostname}/api/5.0/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/5.0/dnsrecords/",
"dnschallengemapping.polling.interval": "600000",
"federationmapping.polling.url": "http://${toHostname}/api/4.0/federations/all",
"federationmapping.polling.url": "http://${toHostname}/api/5.0/federations/all",
"federationmapping.polling.interval": "600000",
"steeringmapping.polling.url": "http://${toHostname}/api/4.0/steering",
"steeringmapping.polling.url": "http://${toHostname}/api/5.0/steering",
"steeringmapping.polling.interval": "15000",
"weight": "1.0",
"requestHeaders": [
Expand All @@ -1940,7 +1940,7 @@
},
"coveragezone.polling.interval": "86400000",
"regional_geoblock.polling.url.renamed": "http://testing-tm-01.cdn.example.com/some/path",
"keystore.auth.url": "http://localhost:3000/api/4.0/user/login",
"keystore.auth.url": "http://localhost:3000/api/5.0/user/login",
"neustar.polling.interval": "12800000",
"geolocation6.polling.interval": "86400000",
"domain_name": "thecdn.example.com",
Expand All @@ -1954,7 +1954,7 @@
},
"coveragezone.polling.url": "http://localhost:8889/czf.json",
"deepcoveragezone.polling.url": "http://localhost:8889/dczmap.json",
"api.auth.url": "http://${toHostname}/api/4.0/user/login",
"api.auth.url": "http://${toHostname}/api/5.0/user/login",
"certificates.polling.interval": "10000",
"dnssec.enabled": "false",
"edge.dns.routing": "true",
Expand Down
12 changes: 6 additions & 6 deletions traffic_router/core/src/test/resources/publish/CrConfig2.json
Original file line number Diff line number Diff line change
Expand Up @@ -1210,12 +1210,12 @@
}
},
"config": {
"certificate.api.url": "http://${toHostname}/api/4.0/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/4.0/dnsrecords/",
"certificate.api.url": "http://${toHostname}/api/5.0/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/5.0/dnsrecords/",
"dnschallengemapping.polling.interval": "600000",
"federationmapping.polling.url": "http://${toHostname}/api/4.0/federations/all",
"federationmapping.polling.url": "http://${toHostname}/api/5.0/federations/all",
"federationmapping.polling.interval": "600000",
"steeringmapping.polling.url": "http://${toHostname}/api/4.0/steering",
"steeringmapping.polling.url": "http://${toHostname}/api/5.0/steering",
"steeringmapping.polling.interval": "15000",
"weight": "1.0",
"requestHeaders": [
Expand All @@ -1234,7 +1234,7 @@
},
"coveragezone.polling.interval": "86400000",
"regional_geoblock.polling.url.renamed": "http://testing-tm-01.cdn.example.com/some/path",
"keystore.auth.url": "http://localhost:3000/api/4.0/user/login",
"keystore.auth.url": "http://localhost:3000/api/5.0/user/login",
"neustar.polling.interval": "12800000",
"geolocation6.polling.interval": "86400000",
"domain_name": "thecdn.example.com",
Expand All @@ -1247,7 +1247,7 @@
"refresh": "28800"
},
"coveragezone.polling.url": "http://localhost:8889/czf.json",
"api.auth.url": "http://${toHostname}/api/4.0/user/login",
"api.auth.url": "http://${toHostname}/api/5.0/user/login",
"certificates.polling.interval": "10000",
"dnssec.enabled": "false"
}
Expand Down
12 changes: 6 additions & 6 deletions traffic_router/core/src/test/resources/publish/CrConfig3.json
Original file line number Diff line number Diff line change
Expand Up @@ -1210,12 +1210,12 @@
}
},
"config": {
"certificate.api.url": "http://${toHostname}/api/4.0/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/4.0/dnsrecords/",
"certificate.api.url": "http://${toHostname}/api/5.0/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/5.0/dnsrecords/",
"dnschallengemapping.polling.interval": "600000",
"federationmapping.polling.url": "http://${toHostname}/api/4.0/federations/all",
"federationmapping.polling.url": "http://${toHostname}/api/5.0/federations/all",
"federationmapping.polling.interval": "600000",
"steeringmapping.polling.url": "http://${toHostname}/api/4.0/steering",
"steeringmapping.polling.url": "http://${toHostname}/api/5.0/steering",
"steeringmapping.polling.interval": "15000",
"weight": "1.0",
"requestHeaders": [
Expand All @@ -1234,7 +1234,7 @@
},
"coveragezone.polling.interval": "86400000",
"regional_geoblock.polling.url.renamed": "http://testing-tm-01.cdn.example.com/some/path",
"keystore.auth.url": "http://localhost:3000/api/4.0/user/login",
"keystore.auth.url": "http://localhost:3000/api/5.0/user/login",
"neustar.polling.interval": "12800000",
"geolocation6.polling.interval": "86400000",
"domain_name": "thecdn.example.com",
Expand All @@ -1247,7 +1247,7 @@
"refresh": "28800"
},
"coveragezone.polling.url": "http://localhost:8889/czf.json",
"api.auth.url": "http://${toHostname}/api/4.0/user/login",
"api.auth.url": "http://${toHostname}/api/5.0/user/login",
"certificates.polling.interval": "10000",
"dnssec.enabled": "false"
}
Expand Down
12 changes: 6 additions & 6 deletions traffic_router/core/src/test/resources/publish/CrConfig4.json
Original file line number Diff line number Diff line change
Expand Up @@ -1255,12 +1255,12 @@
}
},
"config": {
"certificate.api.url": "http://${toHostname}/api/4.0/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/4.0/dnsrecords/",
"certificate.api.url": "http://${toHostname}/api/5.0/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/5.0/dnsrecords/",
"dnschallengemapping.polling.interval": "600000",
"federationmapping.polling.url": "http://${toHostname}/api/4.0/federations/all",
"federationmapping.polling.url": "http://${toHostname}/api/5.0/federations/all",
"federationmapping.polling.interval": "600000",
"steeringmapping.polling.url": "http://${toHostname}/api/4.0/steering",
"steeringmapping.polling.url": "http://${toHostname}/api/5.0/steering",
"steeringmapping.polling.interval": "15000",
"weight": "1.0",
"requestHeaders": [
Expand All @@ -1279,7 +1279,7 @@
},
"coveragezone.polling.interval": "86400000",
"regional_geoblock.polling.url.renamed": "http://testing-tm-01.cdn.example.com/some/path",
"keystore.auth.url": "http://localhost:3000/api/4.0/user/login",
"keystore.auth.url": "http://localhost:3000/api/5.0/user/login",
"neustar.polling.interval": "12800000",
"geolocation6.polling.interval": "86400000",
"domain_name": "thecdn.example.com",
Expand All @@ -1292,7 +1292,7 @@
"refresh": "28800"
},
"coveragezone.polling.url": "http://localhost:8889/czf.json",
"api.auth.url": "http://${toHostname}/api/4.0/user/login",
"api.auth.url": "http://${toHostname}/api/5.0/user/login",
"certificates.polling.interval": "10000",
"dnssec.enabled": "false"
}
Expand Down

0 comments on commit 3735399

Please sign in to comment.