You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2017/01/10 03:39:01 UTC
[49/50] incubator-trafficcontrol git commit: Merge branch
'merge-postgres' of https://github.com/dangogh/incubator-trafficcontrol
Merge branch 'merge-postgres' of https://github.com/dangogh/incubator-trafficcontrol
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/d4171849
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d4171849
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d4171849
Branch: refs/heads/master
Commit: d4171849789f9bb000e4ff379fb8581ac4a9c71c
Parents: 9328758 496bcab
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Mon Jan 9 20:36:53 2017 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Mon Jan 9 20:36:53 2017 -0700
----------------------------------------------------------------------
infrastructure/docker/traffic_ops/Dockerfile | 20 +-
traffic_ops/app/conf/development/database.conf | 8 +-
traffic_ops/app/conf/integration/database.conf | 8 +-
traffic_ops/app/conf/production/database.conf | 8 +-
traffic_ops/app/conf/test/database.conf | 8 +-
traffic_ops/app/cpanfile | 4 +-
traffic_ops/app/db/admin.pl | 156 +-
traffic_ops/app/db/convert_bools.sql | 95 +
traffic_ops/app/db/create_tables.sql | 3564 +-
traffic_ops/app/db/dbconf.yml | 22 +-
traffic_ops/app/db/migrations/.keep | 0
.../db/migrations/20141222103718_extension.sql | 95 -
.../20150108100000_add_job_deliveryservice.sql | 21 -
.../migrations/20150205100000_cg_location.sql | 57 -
.../migrations/20150209100000_cran_to_asn.sql | 22 -
.../db/migrations/20150210100000_ds_keyinfo.sql | 25 -
.../20150304100000_add_ip6_ds_routing.sql | 26 -
.../migrations/20150310100000_add_bg_fetch.sql | 24 -
.../migrations/20150316100000_move_hdr_rw.sql | 30 -
.../20150331105256_add_origin_shield.sql | 23 -
.../20150501100000_add_mid_hdr_rw.sql | 24 -
.../20150503100001_add_regex_remap.sql | 23 -
.../migrations/20150504100000_rr_handling.sql | 22 -
.../20150504100001_add_param_index.sql | 22 -
.../20150521100000_add_cacheurl_to_ds.sql | 22 -
.../migrations/20150530100000_add_any_remap.sql | 24 -
.../migrations/20150618100000_add_multisite.sql | 23 -
.../migrations/20150626100000_add_cg_uniq.sql | 25 -
.../20150706084134_stats_summary_table.sql | 29 -
.../migrations/20150721000000_add_stat_date.sql | 21 -
.../20150722100000_add_disname_tr_headers.sql | 24 -
.../20150728000000_add_initial_dispersion.sql | 22 -
.../20150804000000_add_preprod_status.sql | 22 -
.../20150807000000_add_dns_bypass_cname.sql | 22 -
.../20150825175644_shorten_display_name.sql | 31 -
.../app/db/migrations/20150922092122_cdn.sql | 69 -
.../20150925020500_drop_cdn_param.sql | 23 -
.../20151020143912_unique_cdn_name.sql | 27 -
.../20151021000000_federation_tables.sql | 76 -
.../20151027152323_tr_request_headers.sql | 23 -
.../20151107000000_cdn_dnssec_enabled.sql | 23 -
.../migrations/20151202193037_secondary_cg.sql | 23 -
.../migrations/20151207000000_unique_email.sql | 25 -
.../20151208000000_add_job_status.sql | 27 -
.../20160102193037_drop_local_user.sql | 23 -
...20160202000000_add_regional_geo_blocking.sql | 22 -
.../migrations/20160222104337_add_ssh_key.sql | 23 -
.../20160323160333_add_geo_provider.sql | 23 -
.../20160329141600_add_ds_protocol_not_null.sql | 22 -
...0160510082300_add_ds_geo_limit_countries.sql | 25 -
.../20160510202613_add_ds_steering.sql | 35 -
.../20160526140027_add_deploy_role.sql | 23 -
.../20160603084204_add_logs_enabled.sql | 25 -
.../db/migrations/20160613153313_add_guid.sql | 23 -
.../20160614000000_mod_param_cfg_len.sql | 24 -
...20160628000000_update_cdn_dnssec_enabled.sql | 24 -
.../20160630000000_add_multisite_algrithom.sql | 23 -
.../20160630010009_add_secure_parameter.sql | 23 -
.../20160718000000_drop_ttl_max_hours_param.sql | 23 -
.../20160718000005_drop_ttl_min_hours_param.sql | 23 -
...20160729000000_add_geolimit_redirect_url.sql | 23 -
.../20160809092015_update_serverchecks.sql | 24 -
.../20160817171741_server_add_https_port.sql | 23 -
.../20160826111234_modify_server_table.sql | 58 -
.../20160909141413_add_offline_reason.sql | 24 -
.../20161208000000_alter_cdn_name_not_null.sql | 23 +
.../20161208000001_create_snapshots.sql | 32 +
.../app/db/pg-migration/Dockerfile-convert | 22 +
.../app/db/pg-migration/Dockerfile-mysql | 19 +
.../app/db/pg-migration/Dockerfile-pgloader | 21 +
.../app/db/pg-migration/Dockerfile-postgres | 22 +
.../pg-migration/Dockerfile-traffic_ops-client | 27 +
traffic_ops/app/db/pg-migration/README.md | 21 +
traffic_ops/app/db/pg-migration/convert.yml | 23 +
traffic_ops/app/db/pg-migration/dataimport.env | 17 +
traffic_ops/app/db/pg-migration/dataimport.yml | 24 +
.../app/db/pg-migration/docker-compose.yml | 73 +
traffic_ops/app/db/pg-migration/get-to-data.sh | 38 +
traffic_ops/app/db/pg-migration/mysql.env | 18 +
.../app/db/pg-migration/mysql/conf.d/mysql.cnf | 21 +
traffic_ops/app/db/pg-migration/mysql_host.yml | 22 +
traffic_ops/app/db/pg-migration/pgloader.yml | 24 +
traffic_ops/app/db/pg-migration/postgres.env | 17 +
.../app/db/pg-migration/postgres_host.yml | 24 +
traffic_ops/app/db/pg-migration/runconvert.sh | 30 +
traffic_ops/app/db/pg-migration/runmysql.sh | 27 +
traffic_ops/app/db/pg-migration/runpgloader.sh | 39 +
traffic_ops/app/db/seeds.sql | 314 +-
traffic_ops/app/lib/API/Cachegroup.pm | 16 +-
traffic_ops/app/lib/API/Cdn.pm | 30 +-
traffic_ops/app/lib/API/ChangeLog.pm | 3 -
.../app/lib/API/DeliveryService/Steering.pm | 2 +-
.../app/lib/API/DeliveryServiceServer.pm | 3 +
traffic_ops/app/lib/API/Deliveryservice.pm | 64 +-
traffic_ops/app/lib/API/Federation.pm | 4 +-
traffic_ops/app/lib/API/HwInfo.pm | 1 +
traffic_ops/app/lib/API/Parameter.pm | 3 +-
traffic_ops/app/lib/API/Profile.pm | 2 +-
traffic_ops/app/lib/API/Server.pm | 2 +-
traffic_ops/app/lib/API/ServerCheck.pm | 2 +-
traffic_ops/app/lib/API/ToExtension.pm | 4 +-
traffic_ops/app/lib/API/Topology.pm | 2 +-
traffic_ops/app/lib/API/User.pm | 2 +-
traffic_ops/app/lib/Fixtures/Asn.pm | 9 +-
traffic_ops/app/lib/Fixtures/Cachegroup.pm | 20 +-
.../app/lib/Fixtures/CachegroupParameter.pm | 8 +-
traffic_ops/app/lib/Fixtures/Cdn.pm | 9 +-
traffic_ops/app/lib/Fixtures/Deliveryservice.pm | 301 +-
.../app/lib/Fixtures/DeliveryserviceRegex.pm | 99 +-
.../app/lib/Fixtures/DeliveryserviceServer.pm | 46 +-
.../app/lib/Fixtures/DeliveryserviceTmuser.pm | 26 +-
traffic_ops/app/lib/Fixtures/Division.pm | 6 +-
traffic_ops/app/lib/Fixtures/EdgeCachegroup.pm | 6 +-
traffic_ops/app/lib/Fixtures/Federation.pm | 3 +-
.../lib/Fixtures/FederationDeliveryservice.pm | 8 +-
.../app/lib/Fixtures/FederationResolver.pm | 3 +-
.../app/lib/Fixtures/FederationTmuser.pm | 5 +-
traffic_ops/app/lib/Fixtures/Hwinfo.pm | 13 +-
traffic_ops/app/lib/Fixtures/Integration/Asn.pm | 87 +-
.../app/lib/Fixtures/Integration/Cachegroup.pm | 175 +-
traffic_ops/app/lib/Fixtures/Integration/Cdn.pm | 27 +-
.../lib/Fixtures/Integration/Deliveryservice.pm | 390 +-
.../Integration/DeliveryserviceRegex.pm | 79 +-
.../Integration/DeliveryserviceServer.pm | 2023 +-
.../app/lib/Fixtures/Integration/Division.pm | 25 +-
.../lib/Fixtures/Integration/GooseDbVersion.pm | 286 +-
.../app/lib/Fixtures/Integration/Parameter.pm | 4909 ++-
.../lib/Fixtures/Integration/PhysLocation.pm | 276 +-
.../app/lib/Fixtures/Integration/Profile.pm | 232 +-
.../Fixtures/Integration/ProfileParameter.pm | 35717 +++++++++++++++--
.../app/lib/Fixtures/Integration/Regex.pm | 90 +-
.../app/lib/Fixtures/Integration/Region.pm | 38 +-
.../app/lib/Fixtures/Integration/Role.pm | 70 +-
.../app/lib/Fixtures/Integration/Server.pm | 3164 +-
.../app/lib/Fixtures/Integration/Servercheck.pm | 173 +-
.../app/lib/Fixtures/Integration/Status.pm | 70 +-
.../app/lib/Fixtures/Integration/TmUser.pm | 169 +-
.../app/lib/Fixtures/Integration/ToExtension.pm | 65 +-
.../app/lib/Fixtures/Integration/Type.pm | 352 +-
traffic_ops/app/lib/Fixtures/Job.pm | 7 +-
traffic_ops/app/lib/Fixtures/JobAgent.pm | 3 +-
traffic_ops/app/lib/Fixtures/JobStatus.pm | 3 +-
traffic_ops/app/lib/Fixtures/Log.pm | 4 +-
traffic_ops/app/lib/Fixtures/Parameter.pm | 3 +-
traffic_ops/app/lib/Fixtures/PhysLocation.pm | 15 +-
traffic_ops/app/lib/Fixtures/Profile.pm | 16 +-
.../app/lib/Fixtures/ProfileParameter.pm | 238 +-
traffic_ops/app/lib/Fixtures/Regex.pm | 95 +-
traffic_ops/app/lib/Fixtures/Region.pm | 8 +-
traffic_ops/app/lib/Fixtures/Role.pm | 3 +-
traffic_ops/app/lib/Fixtures/Server.pm | 165 +-
traffic_ops/app/lib/Fixtures/Staticdnsentry.pm | 22 +-
traffic_ops/app/lib/Fixtures/StatsSummary.pm | 46 +
traffic_ops/app/lib/Fixtures/Status.pm | 3 +-
traffic_ops/app/lib/Fixtures/TmUser.pm | 61 +-
traffic_ops/app/lib/MojoPlugins/Health.pm | 16 +-
traffic_ops/app/lib/MojoPlugins/Server.pm | 2 +
traffic_ops/app/lib/Schema/Result/Asn.pm | 38 +-
traffic_ops/app/lib/Schema/Result/Cachegroup.pm | 72 +-
.../lib/Schema/Result/CachegroupParameter.pm | 26 +-
traffic_ops/app/lib/Schema/Result/Cdn.pm | 58 +-
.../Result/DeliveryServiceInfoForDomainList.pm | 65 +-
.../Result/DeliveryServiceInfoForServerList.pm | 5 +-
.../app/lib/Schema/Result/Deliveryservice.pm | 282 +-
.../lib/Schema/Result/DeliveryserviceRegex.pm | 20 +-
.../lib/Schema/Result/DeliveryserviceServer.pm | 26 +-
.../lib/Schema/Result/DeliveryserviceTmuser.pm | 26 +-
traffic_ops/app/lib/Schema/Result/Division.pm | 33 +-
traffic_ops/app/lib/Schema/Result/Federation.pm | 52 +-
.../Schema/Result/FederationDeliveryservice.pm | 44 +-
.../Result/FederationFederationResolver.pm | 44 +-
.../app/lib/Schema/Result/FederationResolver.pm | 57 +-
.../app/lib/Schema/Result/FederationTmuser.pm | 50 +-
.../app/lib/Schema/Result/GooseDbVersion.pm | 31 +-
traffic_ops/app/lib/Schema/Result/Hwinfo.pm | 44 +-
.../lib/Schema/Result/InfluxDBHostsOnline.pm | 2 +-
traffic_ops/app/lib/Schema/Result/Job.pm | 96 +-
traffic_ops/app/lib/Schema/Result/JobAgent.pm | 34 +-
traffic_ops/app/lib/Schema/Result/JobResult.pm | 46 +-
traffic_ops/app/lib/Schema/Result/JobStatus.pm | 34 +-
traffic_ops/app/lib/Schema/Result/Log.pm | 45 +-
traffic_ops/app/lib/Schema/Result/Parameter.pm | 47 +-
.../app/lib/Schema/Result/PhysLocation.pm | 88 +-
traffic_ops/app/lib/Schema/Result/Profile.pm | 38 +-
.../app/lib/Schema/Result/ProfileParameter.pm | 26 +-
traffic_ops/app/lib/Schema/Result/Regex.pm | 39 +-
traffic_ops/app/lib/Schema/Result/Region.pm | 39 +-
.../app/lib/Schema/Result/RiakHostsOnline.pm | 2 +-
traffic_ops/app/lib/Schema/Result/Role.pm | 28 +-
traffic_ops/app/lib/Schema/Result/Server.pm | 214 +-
.../app/lib/Schema/Result/Servercheck.pm | 162 +-
traffic_ops/app/lib/Schema/Result/Snapshot.pm | 95 +
.../app/lib/Schema/Result/Staticdnsentry.pm | 60 +-
.../app/lib/Schema/Result/StatsSummary.pm | 67 +-
traffic_ops/app/lib/Schema/Result/Status.pm | 34 +-
.../app/lib/Schema/Result/SteeringTarget.pm | 48 +-
traffic_ops/app/lib/Schema/Result/TmUser.pm | 140 +-
.../app/lib/Schema/Result/ToExtension.pm | 75 +-
traffic_ops/app/lib/Schema/Result/Type.pm | 43 +-
.../app/lib/Test/IntegrationTestHelper.pm | 40 +-
traffic_ops/app/lib/Test/TestHelper.pm | 100 +-
traffic_ops/app/lib/TrafficOpsRoutes.pm | 11 +-
traffic_ops/app/lib/UI/Cdn.pm | 8 +-
traffic_ops/app/lib/UI/ChangeLog.pm | 4 +-
traffic_ops/app/lib/UI/ConfigFiles.pm | 15 +-
traffic_ops/app/lib/UI/DeliveryService.pm | 3 +-
traffic_ops/app/lib/UI/GenDbDump.pm | 21 +-
traffic_ops/app/lib/UI/Parameter.pm | 2 +-
traffic_ops/app/lib/UI/Profile.pm | 4 +-
traffic_ops/app/lib/UI/Region.pm | 2 +-
traffic_ops/app/lib/UI/Server.pm | 7 +-
traffic_ops/app/lib/UI/Snapshot.pm | 39 +
traffic_ops/app/lib/UI/Tools.pm | 16 +-
traffic_ops/app/lib/UI/Topology.pm | 98 +-
traffic_ops/app/lib/UI/UploadHandlerCsv.pm | 2 +-
traffic_ops/app/t/api/1.1/asn.t | 12 +-
traffic_ops/app/t/api/1.1/cachegroup.t | 2 +-
traffic_ops/app/t/api/1.1/cdn.t | 51 +
.../app/t/api/1.1/deliveryservice/ssl_keys.t | 2 +-
.../app/t/api/1.1/deliveryserviceserver.t | 2 +-
traffic_ops/app/t/api/1.1/job.t | 30 +-
traffic_ops/app/t/api/1.1/server.t | 10 +-
traffic_ops/app/t/api/1.2/asn.t | 22 +-
traffic_ops/app/t/api/1.2/cachegroup.t | 35 +-
traffic_ops/app/t/api/1.2/cdn.t | 9 +-
traffic_ops/app/t/api/1.2/deliveryservice.t | 10 +-
.../app/t/api/1.2/deliveryservice_matches.t | 8 +-
.../app/t/api/1.2/deliveryservice_regex.t | 6 +-
.../app/t/api/1.2/deliveryservice_server.t | 26 +-
traffic_ops/app/t/api/1.2/division.t | 15 +-
traffic_ops/app/t/api/1.2/federation_external.t | 87 +-
traffic_ops/app/t/api/1.2/parameter.t | 50 +-
traffic_ops/app/t/api/1.2/physlocation.t | 8 +-
traffic_ops/app/t/api/1.2/profile.t | 6 +-
traffic_ops/app/t/api/1.2/profile_parameter.t | 85 +-
traffic_ops/app/t/api/1.2/region.t | 14 +-
traffic_ops/app/t/api/1.2/server.t | 310 +-
traffic_ops/app/t/api/1.2/server_create.t | 189 -
traffic_ops/app/t/api/1.2/stats_summary.t | 12 +-
traffic_ops/app/t/deliveryservice.t | 108 +-
traffic_ops/app/t/deliveryserviceserver.t | 25 +-
traffic_ops/app/t/health.t | 6 +-
traffic_ops/app/t/hwinfo.t | 2 +
traffic_ops/app/t/parameter.t | 4 +-
traffic_ops/app/t/phys_location.t | 6 +-
traffic_ops/app/t/profile.t | 6 -
traffic_ops/app/t/purge.t | 6 +-
traffic_ops/app/t/server.t | 18 +-
traffic_ops/app/t/staticdnsentry.t | 2 +-
traffic_ops/app/t/status.t | 88 -
traffic_ops/app/t/types.t | 82 -
traffic_ops/app/t/uploadhandlercsv.t | 57 -
traffic_ops/app/t/user.t | 16 +-
traffic_ops/app/t_integration/extensions.t | 8 +-
traffic_ops/app/t_integration/server.t | 73 +-
traffic_ops/build/traffic_ops.spec | 8 +-
traffic_ops/client/cachegroup.go | 5 +-
traffic_ops/client/cdn.go | 4 +-
traffic_ops/client/delivery_service.go | 8 +-
.../client/delivery_service_resources.go | 58 +-
traffic_ops/client/fixtures/cachegroup.go | 4 +-
traffic_ops/client/fixtures/cdn.go | 1 +
traffic_ops/client/fixtures/delivery_service.go | 52 +-
traffic_ops/client/fixtures/hardware.go | 15 +-
traffic_ops/client/fixtures/profile.go | 1 +
traffic_ops/client/fixtures/server.go | 22 +-
traffic_ops/client/fixtures/types.go | 2 +
traffic_ops/client/fixtures/user.go | 2 +-
traffic_ops/client/hardware.go | 10 +-
traffic_ops/client/parameter.go | 1 -
traffic_ops/client/profile.go | 2 +-
traffic_ops/client/server.go | 7 +-
traffic_ops/client/stats_summary.go | 1 -
traffic_ops/client/tests/cachegroup_test.go | 12 +-
traffic_ops/client/tests/cdn_test.go | 5 +
.../client/tests/delivery_service_test.go | 28 +-
traffic_ops/client/tests/hardware_test.go | 27 +-
traffic_ops/client/tests/integration/Readme.md | 14 +
.../client/tests/integration/cachegroup_test.go | 83 +
.../client/tests/integration/cdn_test.go | 106 +
.../client/tests/integration/crconfig_test.go | 40 +
.../tests/integration/deliveryservice_test.go | 696 +
.../client/tests/integration/hardware_test.go | 119 +
.../tests/integration/integration_helper.go | 136 +
.../client/tests/integration/parameter_test.go | 68 +
.../client/tests/integration/profile_test.go | 73 +
.../client/tests/integration/server_test.go | 236 +
.../tests/integration/stats_summary_test.go | 241 +
.../integration/traffic_monitor_config_test.go | 175 +
.../integration/traffic_router_config_test.go | 220 +
.../client/tests/integration/type_test.go | 73 +
.../client/tests/integration/user_test.go | 67 +
traffic_ops/client/tests/profile_test.go | 6 +
traffic_ops/client/tests/type_test.go | 12 +
traffic_ops/client/tests/user_test.go | 4 +-
traffic_ops/client/traffic_monitor_config.go | 1 -
traffic_ops/client/traffic_ops.go | 7 +-
traffic_ops/client/traffic_router_config.go | 1 -
traffic_ops/client/type.go | 2 +-
traffic_ops/client/user.go | 10 +-
.../src/common/models/DeliveryServicesModel.js | 6 +-
.../DashboardDeliveryServicesController.js | 2 +-
302 files changed, 52724 insertions(+), 10455 deletions(-)
----------------------------------------------------------------------