From da6074053630bca72285a31338b0b64fab34811b Mon Sep 17 00:00:00 2001 From: Brennan Fieck Date: Wed, 29 Aug 2018 20:53:12 +0000 Subject: [PATCH 01/18] Added TO_ORT build tree --- .../ort => traffic_ops_ort}/README.md | 0 .../atstccfg/.gitignore | 0 .../atstccfg/README.md | 0 .../atstccfg/atstccfg.go | 0 .../atstccfg/cfgfile/all.go | 0 .../atstccfg/cfgfile/astatsdotconfig.go | 0 .../atstccfg/cfgfile/atsdotrules.go | 0 .../atstccfg/cfgfile/bgfetchdotconfig.go | 0 .../atstccfg/cfgfile/cachedotconfig.go | 0 .../atstccfg/cfgfile/cacheurldotconfig.go | 0 .../atstccfg/cfgfile/cfgfile.go | 0 .../atstccfg/cfgfile/cfgfile_test.go | 0 .../atstccfg/cfgfile/chkconfig.go | 0 .../atstccfg/cfgfile/dropqstringdotconfig.go | 0 .../atstccfg/cfgfile/facts.go | 0 .../cfgfile/headerrewritedotconfig.go | 0 .../cfgfile/headerrewritemiddotconfig.go | 0 .../atstccfg/cfgfile/hostingdotconfig.go | 0 .../atstccfg/cfgfile/ipallowdotconfig.go | 0 .../atstccfg/cfgfile/loggingdotconfig.go | 0 .../atstccfg/cfgfile/loggingdotyaml.go | 0 .../atstccfg/cfgfile/logsxmldotconfig.go | 0 .../atstccfg/cfgfile/meta.go | 0 .../atstccfg/cfgfile/packages.go | 0 .../atstccfg/cfgfile/parentdotconfig.go | 0 .../atstccfg/cfgfile/plugindotconfig.go | 0 .../atstccfg/cfgfile/recordsdotconfig.go | 0 .../atstccfg/cfgfile/regexremapdotconfig.go | 0 .../cfgfile/regexrevalidatedotconfig.go | 0 .../atstccfg/cfgfile/remapdotconfig.go | 0 .../atstccfg/cfgfile/routing.go | 0 .../atstccfg/cfgfile/servercachedotconfig.go | 0 .../atstccfg/cfgfile/serverunknownconfig.go | 0 .../atstccfg/cfgfile/setdscpdotconfig.go | 0 .../atstccfg/cfgfile/sslkeys.go | 0 .../atstccfg/cfgfile/sslmulticertdotconfig.go | 0 .../atstccfg/cfgfile/storagedotconfig.go | 0 .../atstccfg/cfgfile/sysctldotconf.go | 0 .../atstccfg/cfgfile/unknownconfig.go | 0 .../atstccfg/cfgfile/urisigningconfig.go | 0 .../atstccfg/cfgfile/urisigningconfig_test.go | 0 .../atstccfg/cfgfile/urlsigconfig.go | 0 .../atstccfg/cfgfile/urlsigconfig_test.go | 0 .../atstccfg/cfgfile/volumedotconfig.go | 0 .../atstccfg/config/config.go | 0 .../atstccfg/getdata/getdata.go | 0 .../atstccfg/plugin/README.md | 0 .../atstccfg/plugin/hello_world.go | 0 .../atstccfg/plugin/plugin.go | 0 .../atstccfg/plugin/plugin_test.go | 0 .../atstccfg/toreq/toreq.go | 0 .../github.com/apache/trafficcontrol/LICENSE | 0 .../github.com/apache/trafficcontrol/VERSION | 0 .../apache/trafficcontrol/changeset.txt | 0 .../traffic_ops/client/README.md | 0 .../traffic_ops/client/about.go | 0 .../trafficcontrol/traffic_ops/client/asn.go | 0 .../traffic_ops/client/atsconfig.go | 0 .../traffic_ops/client/cachegroup.go | 0 .../client/cachegroup_parameters.go | 0 .../trafficcontrol/traffic_ops/client/cdn.go | 0 .../traffic_ops/client/cdn_domains.go | 0 .../traffic_ops/client/cdnfederations.go | 0 .../traffic_ops/client/coordinate.go | 0 .../traffic_ops/client/crconfig.go | 0 .../traffic_ops/client/deliveryservice.go | 0 .../client/deliveryservice_endpoints.go | 0 .../deliveryservice_request_comments.go | 0 .../client/deliveryservice_requests.go | 0 .../deliveryservices_required_capabilities.go | 0 .../client/deliveryserviceserver.go | 0 .../traffic_ops/client/division.go | 0 .../traffic_ops/client/dsuser.go | 0 .../traffic_ops/client/endpoints.go | 0 .../traffic_ops/client/federation.go | 0 .../traffic_ops/client/federation_resolver.go | 0 .../traffic_ops/client/hardware.go | 0 .../trafficcontrol/traffic_ops/client/iso.go | 0 .../trafficcontrol/traffic_ops/client/job.go | 0 .../trafficcontrol/traffic_ops/client/log.go | 0 .../traffic_ops/client/origin.go | 0 .../traffic_ops/client/parameter.go | 0 .../traffic_ops/client/phys_location.go | 0 .../trafficcontrol/traffic_ops/client/ping.go | 0 .../traffic_ops/client/profile.go | 0 .../traffic_ops/client/profile_parameter.go | 0 .../traffic_ops/client/region.go | 0 .../trafficcontrol/traffic_ops/client/role.go | 0 .../traffic_ops/client/server.go | 0 .../client/server_server_capabilities.go | 0 .../client/server_update_status.go | 0 .../traffic_ops/client/servercapability.go | 0 .../traffic_ops/client/servercheck.go | 0 .../traffic_ops/client/serversstatus.go | 0 .../traffic_ops/client/session.go | 0 .../traffic_ops/client/staticdnsentry.go | 0 .../traffic_ops/client/stats_summary.go | 0 .../traffic_ops/client/status.go | 0 .../traffic_ops/client/steering.go | 0 .../traffic_ops/client/steeringtarget.go | 0 .../traffic_ops/client/tenant.go | 0 .../traffic_ops/client/tenant_endpoints.go | 0 .../traffic_ops/client/toextension.go | 0 .../traffic_ops/client/traffic_monitor.go | 0 .../traffic_ops/client/traffic_stats.go | 0 .../trafficcontrol/traffic_ops/client/type.go | 0 .../traffic_ops/client/update.go | 0 .../trafficcontrol/traffic_ops/client/user.go | 0 .../trafficcontrol/traffic_ops/client/util.go | 0 .../atstccfg/toreqnew/toreqnew.go | 0 .../atstccfg/torequtil/torequtil.go | 0 .../atstccfg/torequtil/torequtil_test.go | 0 .../update-to-client/update-to-client.go | 0 traffic_ops_ort/build/build_rpm.sh | 49 +++++++++++++++++++ .../build/traffic_ops_ort.spec | 0 .../supermicro_udev_mapper.pl | 0 .../traffic_ops_ort.pl | 0 117 files changed, 49 insertions(+) rename {traffic_ops/ort => traffic_ops_ort}/README.md (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/.gitignore (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/README.md (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/atstccfg.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/all.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/astatsdotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/atsdotrules.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/bgfetchdotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/cachedotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/cacheurldotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/cfgfile.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/cfgfile_test.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/chkconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/dropqstringdotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/facts.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/headerrewritedotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/headerrewritemiddotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/hostingdotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/ipallowdotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/loggingdotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/loggingdotyaml.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/logsxmldotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/meta.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/packages.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/parentdotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/plugindotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/recordsdotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/regexremapdotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/regexrevalidatedotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/remapdotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/routing.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/servercachedotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/serverunknownconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/setdscpdotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/sslkeys.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/sslmulticertdotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/storagedotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/sysctldotconf.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/unknownconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/urisigningconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/urisigningconfig_test.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/urlsigconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/urlsigconfig_test.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/cfgfile/volumedotconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/config/config.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/getdata/getdata.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/plugin/README.md (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/plugin/hello_world.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/plugin/plugin.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/plugin/plugin_test.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/toreq.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/LICENSE (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/VERSION (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/changeset.txt (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/README.md (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/about.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/asn.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/atsconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cachegroup.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cachegroup_parameters.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cdn.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cdn_domains.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cdnfederations.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/coordinate.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/crconfig.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice_endpoints.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice_request_comments.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice_requests.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservices_required_capabilities.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryserviceserver.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/division.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/dsuser.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/endpoints.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/federation.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/federation_resolver.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/hardware.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/iso.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/job.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/log.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/origin.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/parameter.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/phys_location.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/ping.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/profile.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/profile_parameter.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/region.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/role.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/server.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/server_server_capabilities.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/server_update_status.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/servercapability.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/servercheck.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/serversstatus.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/session.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/staticdnsentry.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/stats_summary.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/status.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/steering.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/steeringtarget.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/tenant.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/tenant_endpoints.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/toextension.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/traffic_monitor.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/traffic_stats.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/type.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/update.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/user.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/util.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/toreqnew/toreqnew.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/torequtil/torequtil.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/torequtil/torequtil_test.go (100%) rename {traffic_ops/ort => traffic_ops_ort}/atstccfg/update-to-client/update-to-client.go (100%) create mode 100644 traffic_ops_ort/build/build_rpm.sh rename {traffic_ops => traffic_ops_ort}/build/traffic_ops_ort.spec (100%) rename {traffic_ops/ort => traffic_ops_ort}/supermicro_udev_mapper.pl (100%) rename {traffic_ops/ort => traffic_ops_ort}/traffic_ops_ort.pl (100%) diff --git a/traffic_ops/ort/README.md b/traffic_ops_ort/README.md similarity index 100% rename from traffic_ops/ort/README.md rename to traffic_ops_ort/README.md diff --git a/traffic_ops/ort/atstccfg/.gitignore b/traffic_ops_ort/atstccfg/.gitignore similarity index 100% rename from traffic_ops/ort/atstccfg/.gitignore rename to traffic_ops_ort/atstccfg/.gitignore diff --git a/traffic_ops/ort/atstccfg/README.md b/traffic_ops_ort/atstccfg/README.md similarity index 100% rename from traffic_ops/ort/atstccfg/README.md rename to traffic_ops_ort/atstccfg/README.md diff --git a/traffic_ops/ort/atstccfg/atstccfg.go b/traffic_ops_ort/atstccfg/atstccfg.go similarity index 100% rename from traffic_ops/ort/atstccfg/atstccfg.go rename to traffic_ops_ort/atstccfg/atstccfg.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/all.go b/traffic_ops_ort/atstccfg/cfgfile/all.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/all.go rename to traffic_ops_ort/atstccfg/cfgfile/all.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/astatsdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/astatsdotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/astatsdotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/astatsdotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/atsdotrules.go b/traffic_ops_ort/atstccfg/cfgfile/atsdotrules.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/atsdotrules.go rename to traffic_ops_ort/atstccfg/cfgfile/atsdotrules.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/bgfetchdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/bgfetchdotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/bgfetchdotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/bgfetchdotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/cachedotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/cachedotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/cachedotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/cachedotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/cacheurldotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/cacheurldotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/cacheurldotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/cacheurldotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/cfgfile.go b/traffic_ops_ort/atstccfg/cfgfile/cfgfile.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/cfgfile.go rename to traffic_ops_ort/atstccfg/cfgfile/cfgfile.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/cfgfile_test.go b/traffic_ops_ort/atstccfg/cfgfile/cfgfile_test.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/cfgfile_test.go rename to traffic_ops_ort/atstccfg/cfgfile/cfgfile_test.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/chkconfig.go b/traffic_ops_ort/atstccfg/cfgfile/chkconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/chkconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/chkconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/dropqstringdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/dropqstringdotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/dropqstringdotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/dropqstringdotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/facts.go b/traffic_ops_ort/atstccfg/cfgfile/facts.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/facts.go rename to traffic_ops_ort/atstccfg/cfgfile/facts.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/headerrewritedotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/headerrewritedotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/headerrewritedotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/headerrewritedotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/headerrewritemiddotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/headerrewritemiddotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/headerrewritemiddotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/headerrewritemiddotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/hostingdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/hostingdotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/hostingdotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/hostingdotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/ipallowdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/ipallowdotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/ipallowdotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/ipallowdotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/loggingdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/loggingdotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/loggingdotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/loggingdotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/loggingdotyaml.go b/traffic_ops_ort/atstccfg/cfgfile/loggingdotyaml.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/loggingdotyaml.go rename to traffic_ops_ort/atstccfg/cfgfile/loggingdotyaml.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/logsxmldotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/logsxmldotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/logsxmldotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/logsxmldotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/meta.go b/traffic_ops_ort/atstccfg/cfgfile/meta.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/meta.go rename to traffic_ops_ort/atstccfg/cfgfile/meta.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/packages.go b/traffic_ops_ort/atstccfg/cfgfile/packages.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/packages.go rename to traffic_ops_ort/atstccfg/cfgfile/packages.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/parentdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/parentdotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/parentdotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/parentdotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/plugindotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/plugindotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/plugindotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/plugindotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/recordsdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/recordsdotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/recordsdotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/recordsdotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/regexremapdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/regexremapdotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/regexremapdotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/regexremapdotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/regexrevalidatedotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/regexrevalidatedotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/regexrevalidatedotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/regexrevalidatedotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/remapdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/remapdotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/remapdotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/remapdotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/routing.go b/traffic_ops_ort/atstccfg/cfgfile/routing.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/routing.go rename to traffic_ops_ort/atstccfg/cfgfile/routing.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/servercachedotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/servercachedotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/servercachedotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/servercachedotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/serverunknownconfig.go b/traffic_ops_ort/atstccfg/cfgfile/serverunknownconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/serverunknownconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/serverunknownconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/setdscpdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/setdscpdotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/setdscpdotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/setdscpdotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/sslkeys.go b/traffic_ops_ort/atstccfg/cfgfile/sslkeys.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/sslkeys.go rename to traffic_ops_ort/atstccfg/cfgfile/sslkeys.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/sslmulticertdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/sslmulticertdotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/sslmulticertdotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/sslmulticertdotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/storagedotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/storagedotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/storagedotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/storagedotconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/sysctldotconf.go b/traffic_ops_ort/atstccfg/cfgfile/sysctldotconf.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/sysctldotconf.go rename to traffic_ops_ort/atstccfg/cfgfile/sysctldotconf.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/unknownconfig.go b/traffic_ops_ort/atstccfg/cfgfile/unknownconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/unknownconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/unknownconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/urisigningconfig.go b/traffic_ops_ort/atstccfg/cfgfile/urisigningconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/urisigningconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/urisigningconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/urisigningconfig_test.go b/traffic_ops_ort/atstccfg/cfgfile/urisigningconfig_test.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/urisigningconfig_test.go rename to traffic_ops_ort/atstccfg/cfgfile/urisigningconfig_test.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/urlsigconfig.go b/traffic_ops_ort/atstccfg/cfgfile/urlsigconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/urlsigconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/urlsigconfig.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/urlsigconfig_test.go b/traffic_ops_ort/atstccfg/cfgfile/urlsigconfig_test.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/urlsigconfig_test.go rename to traffic_ops_ort/atstccfg/cfgfile/urlsigconfig_test.go diff --git a/traffic_ops/ort/atstccfg/cfgfile/volumedotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/volumedotconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/cfgfile/volumedotconfig.go rename to traffic_ops_ort/atstccfg/cfgfile/volumedotconfig.go diff --git a/traffic_ops/ort/atstccfg/config/config.go b/traffic_ops_ort/atstccfg/config/config.go similarity index 100% rename from traffic_ops/ort/atstccfg/config/config.go rename to traffic_ops_ort/atstccfg/config/config.go diff --git a/traffic_ops/ort/atstccfg/getdata/getdata.go b/traffic_ops_ort/atstccfg/getdata/getdata.go similarity index 100% rename from traffic_ops/ort/atstccfg/getdata/getdata.go rename to traffic_ops_ort/atstccfg/getdata/getdata.go diff --git a/traffic_ops/ort/atstccfg/plugin/README.md b/traffic_ops_ort/atstccfg/plugin/README.md similarity index 100% rename from traffic_ops/ort/atstccfg/plugin/README.md rename to traffic_ops_ort/atstccfg/plugin/README.md diff --git a/traffic_ops/ort/atstccfg/plugin/hello_world.go b/traffic_ops_ort/atstccfg/plugin/hello_world.go similarity index 100% rename from traffic_ops/ort/atstccfg/plugin/hello_world.go rename to traffic_ops_ort/atstccfg/plugin/hello_world.go diff --git a/traffic_ops/ort/atstccfg/plugin/plugin.go b/traffic_ops_ort/atstccfg/plugin/plugin.go similarity index 100% rename from traffic_ops/ort/atstccfg/plugin/plugin.go rename to traffic_ops_ort/atstccfg/plugin/plugin.go diff --git a/traffic_ops/ort/atstccfg/plugin/plugin_test.go b/traffic_ops_ort/atstccfg/plugin/plugin_test.go similarity index 100% rename from traffic_ops/ort/atstccfg/plugin/plugin_test.go rename to traffic_ops_ort/atstccfg/plugin/plugin_test.go diff --git a/traffic_ops/ort/atstccfg/toreq/toreq.go b/traffic_ops_ort/atstccfg/toreq/toreq.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/toreq.go rename to traffic_ops_ort/atstccfg/toreq/toreq.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/LICENSE b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/LICENSE similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/LICENSE rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/LICENSE diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/VERSION b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/VERSION similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/VERSION rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/VERSION diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/changeset.txt b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/changeset.txt similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/changeset.txt rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/changeset.txt diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/README.md b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/README.md similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/README.md rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/README.md diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/about.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/about.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/about.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/about.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/asn.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/asn.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/asn.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/asn.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/atsconfig.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/atsconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/atsconfig.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/atsconfig.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cachegroup.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cachegroup.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cachegroup.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cachegroup.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cachegroup_parameters.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cachegroup_parameters.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cachegroup_parameters.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cachegroup_parameters.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cdn.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cdn.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cdn.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cdn.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cdn_domains.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cdn_domains.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cdn_domains.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cdn_domains.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cdnfederations.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cdnfederations.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cdnfederations.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/cdnfederations.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/coordinate.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/coordinate.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/coordinate.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/coordinate.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/crconfig.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/crconfig.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/crconfig.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/crconfig.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice_endpoints.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice_endpoints.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice_endpoints.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice_endpoints.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice_request_comments.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice_request_comments.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice_request_comments.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice_request_comments.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice_requests.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice_requests.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice_requests.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservice_requests.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservices_required_capabilities.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservices_required_capabilities.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservices_required_capabilities.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryservices_required_capabilities.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryserviceserver.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryserviceserver.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryserviceserver.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/deliveryserviceserver.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/division.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/division.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/division.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/division.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/dsuser.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/dsuser.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/dsuser.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/dsuser.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/endpoints.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/endpoints.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/endpoints.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/endpoints.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/federation.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/federation.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/federation.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/federation.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/federation_resolver.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/federation_resolver.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/federation_resolver.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/federation_resolver.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/hardware.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/hardware.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/hardware.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/hardware.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/iso.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/iso.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/iso.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/iso.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/job.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/job.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/job.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/job.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/log.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/log.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/log.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/log.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/origin.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/origin.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/origin.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/origin.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/parameter.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/parameter.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/parameter.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/parameter.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/phys_location.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/phys_location.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/phys_location.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/phys_location.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/ping.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/ping.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/ping.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/ping.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/profile.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/profile.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/profile.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/profile.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/profile_parameter.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/profile_parameter.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/profile_parameter.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/profile_parameter.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/region.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/region.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/region.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/region.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/role.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/role.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/role.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/role.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/server.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/server.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/server.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/server.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/server_server_capabilities.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/server_server_capabilities.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/server_server_capabilities.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/server_server_capabilities.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/server_update_status.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/server_update_status.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/server_update_status.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/server_update_status.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/servercapability.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/servercapability.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/servercapability.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/servercapability.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/servercheck.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/servercheck.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/servercheck.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/servercheck.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/serversstatus.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/serversstatus.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/serversstatus.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/serversstatus.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/session.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/session.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/session.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/session.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/staticdnsentry.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/staticdnsentry.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/staticdnsentry.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/staticdnsentry.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/stats_summary.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/stats_summary.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/stats_summary.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/stats_summary.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/status.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/status.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/status.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/status.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/steering.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/steering.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/steering.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/steering.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/steeringtarget.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/steeringtarget.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/steeringtarget.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/steeringtarget.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/tenant.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/tenant.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/tenant.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/tenant.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/tenant_endpoints.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/tenant_endpoints.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/tenant_endpoints.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/tenant_endpoints.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/toextension.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/toextension.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/toextension.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/toextension.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/traffic_monitor.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/traffic_monitor.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/traffic_monitor.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/traffic_monitor.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/traffic_stats.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/traffic_stats.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/traffic_stats.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/traffic_stats.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/type.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/type.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/type.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/type.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/update.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/update.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/update.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/update.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/user.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/user.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/user.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/user.go diff --git a/traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/util.go b/traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/util.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/util.go rename to traffic_ops_ort/atstccfg/toreq/vendor/github.com/apache/trafficcontrol/traffic_ops/client/util.go diff --git a/traffic_ops/ort/atstccfg/toreqnew/toreqnew.go b/traffic_ops_ort/atstccfg/toreqnew/toreqnew.go similarity index 100% rename from traffic_ops/ort/atstccfg/toreqnew/toreqnew.go rename to traffic_ops_ort/atstccfg/toreqnew/toreqnew.go diff --git a/traffic_ops/ort/atstccfg/torequtil/torequtil.go b/traffic_ops_ort/atstccfg/torequtil/torequtil.go similarity index 100% rename from traffic_ops/ort/atstccfg/torequtil/torequtil.go rename to traffic_ops_ort/atstccfg/torequtil/torequtil.go diff --git a/traffic_ops/ort/atstccfg/torequtil/torequtil_test.go b/traffic_ops_ort/atstccfg/torequtil/torequtil_test.go similarity index 100% rename from traffic_ops/ort/atstccfg/torequtil/torequtil_test.go rename to traffic_ops_ort/atstccfg/torequtil/torequtil_test.go diff --git a/traffic_ops/ort/atstccfg/update-to-client/update-to-client.go b/traffic_ops_ort/atstccfg/update-to-client/update-to-client.go similarity index 100% rename from traffic_ops/ort/atstccfg/update-to-client/update-to-client.go rename to traffic_ops_ort/atstccfg/update-to-client/update-to-client.go diff --git a/traffic_ops_ort/build/build_rpm.sh b/traffic_ops_ort/build/build_rpm.sh new file mode 100644 index 0000000000..135e3894d7 --- /dev/null +++ b/traffic_ops_ort/build/build_rpm.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +# +# +# 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. +# + +#---------------------------------------- +function importFunctions() { + local script=$(readlink -f "$0") + local scriptdir=$(dirname "$script") + export TO_DIR=$(dirname "$scriptdir") + export TC_DIR=$(dirname "$TO_DIR") + functions_sh="$TC_DIR/build/functions.sh" + if [[ ! -r $functions_sh ]]; then + echo "error: can't find $functions_sh" + exit 1 + fi + . "$functions_sh" +} + +#---------------------------------------- +function initBuildArea() { + echo "Initializing the build area for Traffic Ops ORT" + mkdir -p "$RPMBUILD"/{SPECS,SOURCES,RPMS,SRPMS,BUILD,BUILDROOT} || { echo "Could not create $RPMBUILD: $?"; exit 1; } + + local dest=$(createSourceDir traffic_ops_ort) + cp -p traffic_ops_ort.pl "$dest" + cp -p supermicro_udev_mapper.pl "$dest" + tar -czvf "$dest".tgz -C "$RPMBUILD"/SOURCES $(basename "$dest") || \ + { echo "Could not create tape archive $dest.tgz: $?"; exit 1; } + + echo "The build area has been initialized." +} + +#---------------------------------------- +importFunctions +initBuildArea +buildRpm traffic_ops_ort diff --git a/traffic_ops/build/traffic_ops_ort.spec b/traffic_ops_ort/build/traffic_ops_ort.spec similarity index 100% rename from traffic_ops/build/traffic_ops_ort.spec rename to traffic_ops_ort/build/traffic_ops_ort.spec diff --git a/traffic_ops/ort/supermicro_udev_mapper.pl b/traffic_ops_ort/supermicro_udev_mapper.pl similarity index 100% rename from traffic_ops/ort/supermicro_udev_mapper.pl rename to traffic_ops_ort/supermicro_udev_mapper.pl diff --git a/traffic_ops/ort/traffic_ops_ort.pl b/traffic_ops_ort/traffic_ops_ort.pl similarity index 100% rename from traffic_ops/ort/traffic_ops_ort.pl rename to traffic_ops_ort/traffic_ops_ort.pl From 4d7b382d859251031511e2ce8b4ae45e4e7bdc9e Mon Sep 17 00:00:00 2001 From: Brennan Fieck Date: Wed, 29 Aug 2018 20:54:13 +0000 Subject: [PATCH 02/18] Made TO_ORT an independent build --- .../docker/build/Dockerfile-traffic_ops_ort | 33 +++++++++++ .../docker/build/docker-compose.yml | 8 +++ traffic_ops/build/build_rpm.sh | 14 +---- traffic_ops_ort/build/build_rpm.sh | 58 +++++++++++++------ 4 files changed, 82 insertions(+), 31 deletions(-) create mode 100644 infrastructure/docker/build/Dockerfile-traffic_ops_ort diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops_ort b/infrastructure/docker/build/Dockerfile-traffic_ops_ort new file mode 100644 index 0000000000..218c8d95e1 --- /dev/null +++ b/infrastructure/docker/build/Dockerfile-traffic_ops_ort @@ -0,0 +1,33 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +FROM centos:7 + +# top level of trafficcontrol directory must be mounted as a volume: +# docker run --volume /trafficcontrol:$(pwd) ... +VOLUME /trafficcontrol + +### Common for all sub-component builds +RUN yum -y install \ + epel-release \ + git \ + rpm-build && \ + yum -y clean all + +ADD infrastructure/docker/build/clean_build.sh / +CMD /clean_build.sh traffic_ops_ort + +#vi:syntax=Dockerfile diff --git a/infrastructure/docker/build/docker-compose.yml b/infrastructure/docker/build/docker-compose.yml index c68df7e4e7..3ce454203d 100644 --- a/infrastructure/docker/build/docker-compose.yml +++ b/infrastructure/docker/build/docker-compose.yml @@ -42,6 +42,14 @@ services: volumes: - ../../..:/trafficcontrol:z + traffic_ops_ort_build: + image: traffic_ops_ort_builder + build: + dockerfile: infrastructure/docker/build/Dockerfile-traffic_ops_ort + context: ../../.. + volumes: + - ../../..:/trafficcontrol:z + traffic_portal_build: image: apache/traffic_portal_builder:master #build: diff --git a/traffic_ops/build/build_rpm.sh b/traffic_ops/build/build_rpm.sh index 6fa490a457..09fcacb09f 100755 --- a/traffic_ops/build/build_rpm.sh +++ b/traffic_ops/build/build_rpm.sh @@ -34,7 +34,7 @@ function initBuildArea() { echo "Initializing the build area." mkdir -p "$RPMBUILD"/{SPECS,SOURCES,RPMS,SRPMS,BUILD,BUILDROOT} || { echo "Could not create $RPMBUILD: $?"; exit 1; } - local to_dest=$(createSourceDir traffic_ops) + local dest=$(createSourceDir traffic_ops) cd "$TO_DIR" || \ { echo "Could not cd to $TO_DIR: $?"; exit 1; } @@ -85,16 +85,6 @@ function initBuildArea() { cp "$TO_DIR"/build/*.spec "$RPMBUILD"/SPECS/. || \ { echo "Could not copy spec files: $?"; exit 1; } - # Create traffic_ops_ort source area - to_ort_dest=$(createSourceDir traffic_ops_ort) - cp -p ort/traffic_ops_ort.pl "$to_ort_dest" - cp -p ort/supermicro_udev_mapper.pl "$to_ort_dest" - mkdir -p "${to_ort_dest}/atstccfg" - cp -R -p ort/atstccfg/* "${to_ort_dest}/atstccfg" - - tar -czvf "$to_ort_dest".tgz -C "$RPMBUILD"/SOURCES $(basename "$to_ort_dest") || \ - { echo "Could not create tar archive $to_ort_dest: $?"; exit 1; } - export PLUGINS=$(grep -l -P '(?&2; + exit 1; fi - . "$functions_sh" + . "$functions_sh"; } #---------------------------------------- function initBuildArea() { - echo "Initializing the build area for Traffic Ops ORT" - mkdir -p "$RPMBUILD"/{SPECS,SOURCES,RPMS,SRPMS,BUILD,BUILDROOT} || { echo "Could not create $RPMBUILD: $?"; exit 1; } + echo "Initializing the build area for Traffic Ops ORT"; + mkdir -p "$RPMBUILD"/{SPECS,SOURCES,RPMS,SRPMS,BUILD,BUILDROOT} + + local dest=$(createSourceDir traffic_ops_ort); + cd "$ORT_DIR"; + + echo "PATH: $PATH"; + echo "GOPATH: $GOPATH"; + go version; + go env; + + go get -v golang.org/x/crypto/ed25519 golang.org/x/crypto/scrypt golang.org/x/net/ipv4 golang.org/x/net/ipv6 golang.org/x/sys/unix; + + GC=(go build) + GFLAGS=(-v) + if [[ "$DEBUG_BUILD" == true ]]; then + echo "DEBUG_BUILD is enabled, building without optimization or inlining..."; + GFLAGS+=(--gcflags 'all=-N -l'); + fi; - local dest=$(createSourceDir traffic_ops_ort) - cp -p traffic_ops_ort.pl "$dest" - cp -p supermicro_udev_mapper.pl "$dest" - tar -czvf "$dest".tgz -C "$RPMBUILD"/SOURCES $(basename "$dest") || \ - { echo "Could not create tape archive $dest.tgz: $?"; exit 1; } + cp -p traffic_ops_ort.pl "$dest"; + cp -p supermicro_udev_mapper.pl "$dest"; + mkdir -p "${dest}/atstccfg"; + cp -Rp atstccfg/* "${dest}/atstccfg"; + tar -czvf "$dest".tgz -C "$RPMBUILD"/SOURCES $(basename "$dest"); - echo "The build area has been initialized." + echo "The build area has been initialized."; } #---------------------------------------- -importFunctions -initBuildArea -buildRpm traffic_ops_ort +importFunctions; +checkEnvironment go; +initBuildArea; +buildRpm traffic_ops_ort; From 98817e1e85769b739cf7cd27663f58ae79650484 Mon Sep 17 00:00:00 2001 From: Brennan Fieck Date: Thu, 30 Aug 2018 13:35:16 +0000 Subject: [PATCH 03/18] Specifically, TO build needs the TO spec file --- traffic_ops/build/build_rpm.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/traffic_ops/build/build_rpm.sh b/traffic_ops/build/build_rpm.sh index 09fcacb09f..17671d48b1 100755 --- a/traffic_ops/build/build_rpm.sh +++ b/traffic_ops/build/build_rpm.sh @@ -76,13 +76,13 @@ function initBuildArea() { { echo "Could not build atstccfg binary"; exit 1; } popd - rsync -av etc install "$to_dest"/ || \ - { echo "Could not copy to $to_dest: $?"; exit 1; } - rsync -av app/{bin,conf,cpanfile,db,lib,public,script,templates} "$to_dest"/app/ || \ - { echo "Could not copy to $to_dest/app: $?"; exit 1; } - tar -czvf "$to_dest".tgz -C "$RPMBUILD"/SOURCES $(basename "$to_dest") || \ - { echo "Could not create tar archive $to_dest.tgz: $?"; exit 1; } - cp "$TO_DIR"/build/*.spec "$RPMBUILD"/SPECS/. || \ + rsync -av doc etc install "$dest"/ || \ + { echo "Could not copy to $dest: $?"; exit 1; } + rsync -av app/{bin,conf,cpanfile,db,lib,public,script,templates} "$dest"/app/ || \ + { echo "Could not copy to $dest/app: $?"; exit 1; } + tar -czvf "$dest".tgz -C "$RPMBUILD"/SOURCES $(basename "$dest") || \ + { echo "Could not create tar archive $dest.tgz: $?"; exit 1; } + cp "$TO_DIR"/build/traffic_ops.spec "$RPMBUILD"/SPECS/. || \ { echo "Could not copy spec files: $?"; exit 1; } export PLUGINS=$(grep -l -P '(? Date: Thu, 30 Aug 2018 13:35:55 +0000 Subject: [PATCH 04/18] Fixed build script; added failure messages --- traffic_ops_ort/build/build_rpm.sh | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 traffic_ops_ort/build/build_rpm.sh diff --git a/traffic_ops_ort/build/build_rpm.sh b/traffic_ops_ort/build/build_rpm.sh old mode 100644 new mode 100755 index fb813a0685..383a22e317 --- a/traffic_ops_ort/build/build_rpm.sh +++ b/traffic_ops_ort/build/build_rpm.sh @@ -58,6 +58,7 @@ function initBuildArea() { mkdir -p "${dest}/atstccfg"; cp -Rp atstccfg/* "${dest}/atstccfg"; tar -czvf "$dest".tgz -C "$RPMBUILD"/SOURCES $(basename "$dest"); + cp build/traffic_ops_ort.spec "$RPMBUILD"/SPECS/.; echo "The build area has been initialized."; } From 6e67c1d95e714226015061f4ebca8183e8028e2e Mon Sep 17 00:00:00 2001 From: Brennan Fieck Date: Thu, 30 Aug 2018 13:45:42 +0000 Subject: [PATCH 05/18] Changelog update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e052f082fd..0b1239f6bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - With the addition of multiple server interfaces, interface data is constructed from IP Address/Gateway/Netmask (and their IPv6 counterparts) and Interface Name and Interface MTU fields on services. These **MUST** have proper, valid data before attempting to upgrade or the upgrade **WILL** fail. In particular IP fields need to be valid IP addresses/netmasks, and MTU must only be positive integers of at least 1280. - The `/servers` and `/servers/{{ID}}}` API endpoints have been updated to use and reflect multi-interface servers. - CDN Snapshots now use a server's "service addresses" to provide its IP addresses +- Traffic Ops and Traffic Ops ORT are now separate, independent builds ### Deprecated - Deprecated the non-nullable `DeliveryService` Go struct and other structs that use it. `DeliveryServiceNullable` structs should be used instead. From 1b108eeff75c76b3cbacb97004679e356248f0b9 Mon Sep 17 00:00:00 2001 From: Brennan Fieck Date: Thu, 30 Aug 2018 13:45:51 +0000 Subject: [PATCH 06/18] Documentation update --- docs/source/development/building.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/development/building.rst b/docs/source/development/building.rst index 87a0829700..f00601fbfa 100644 --- a/docs/source/development/building.rst +++ b/docs/source/development/building.rst @@ -60,6 +60,7 @@ If present, ``projects`` should be one or more project names. When no specific p - source\ [2]_ - traffic_monitor_build\ [2]_ - traffic_ops_build\ [2]_ +- traffic_ops_ort_build\ [2]_ - traffic_portal_build\ [2]_ - traffic_router_build\ [2]_ - traffic_stats_build\ [2]_ From 051bb13da0e58bb8d5669b506f092bfbbfb05e63 Mon Sep 17 00:00:00 2001 From: ocket8888 Date: Fri, 1 May 2020 16:08:00 -0600 Subject: [PATCH 07/18] Added Go to build image since we need it now --- infrastructure/docker/build/Dockerfile-traffic_ops_ort | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops_ort b/infrastructure/docker/build/Dockerfile-traffic_ops_ort index 218c8d95e1..d58fabaf60 100644 --- a/infrastructure/docker/build/Dockerfile-traffic_ops_ort +++ b/infrastructure/docker/build/Dockerfile-traffic_ops_ort @@ -27,6 +27,11 @@ RUN yum -y install \ rpm-build && \ yum -y clean all +RUN curl -LO https://dl.google.com/go/go1.14.2.linux-amd64.tar.gz && \ + tar -C /usr/local -xvzf go1.14.2.linux-amd64.tar.gz && \ + ln -s /usr/local/go/bin/go /usr/bin/go && \ + rm go1.14.2.linux-amd64.tar.gz + ADD infrastructure/docker/build/clean_build.sh / CMD /clean_build.sh traffic_ops_ort From d29b95b55a422f8a4015c938b8bca520b8beb177 Mon Sep 17 00:00:00 2001 From: ocket8888 Date: Fri, 1 May 2020 16:10:44 -0600 Subject: [PATCH 08/18] Fixed spec file for new paths --- traffic_ops_ort/build/traffic_ops_ort.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/traffic_ops_ort/build/traffic_ops_ort.spec b/traffic_ops_ort/build/traffic_ops_ort.spec index 1147af9b7c..1e14f6b900 100644 --- a/traffic_ops_ort/build/traffic_ops_ort.spec +++ b/traffic_ops_ort/build/traffic_ops_ort.spec @@ -25,7 +25,7 @@ Group: Applications/Communications Source0: traffic_ops_ort-%{version}.tgz URL: https://github.com/apache/trafficcontrol/ Vendor: Apache Software Foundation -Packager: daniel_kirkwood at Cable dot Comcast dot com +Packager: dev at trafficcontrol dot Apache dot org %{?el6:Requires: perl-JSON, perl-libwww-perl, perl-Crypt-SSLeay, perl-Digest-SHA} %{?el7:Requires: perl-JSON, perl-libwww-perl, perl-Crypt-SSLeay, perl-LWP-Protocol-https, perl-Digest-SHA} @@ -39,10 +39,10 @@ tar xvf %{SOURCE0} -C $RPM_SOURCE_DIR %build # copy atstccfg binary -godir=src/github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg +godir=src/github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg ( mkdir -p "$godir" && \ cd "$godir" && \ - cp "$TC_DIR"/traffic_ops/ort/atstccfg/atstccfg . + cp "$TC_DIR"/traffic_ops_ort/atstccfg/atstccfg . ) || { echo "Could not copy go program at $(pwd): $!"; exit 1; } @@ -51,7 +51,7 @@ mkdir -p ${RPM_BUILD_ROOT}/opt/ort cp -p ${RPM_SOURCE_DIR}/traffic_ops_ort-%{version}/traffic_ops_ort.pl ${RPM_BUILD_ROOT}/opt/ort cp -p ${RPM_SOURCE_DIR}/traffic_ops_ort-%{version}/supermicro_udev_mapper.pl ${RPM_BUILD_ROOT}/opt/ort -src=src/github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg +src=src/github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg cp -p "$src"/atstccfg ${RPM_BUILD_ROOT}/opt/ort %clean From 765de3732db87f6bc7fc6b18c350141fd99f8e55 Mon Sep 17 00:00:00 2001 From: ocket8888 Date: Fri, 1 May 2020 16:17:22 -0600 Subject: [PATCH 09/18] Re-added Go build step that I forgot in the rebase --- traffic_ops_ort/build/build_rpm.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/traffic_ops_ort/build/build_rpm.sh b/traffic_ops_ort/build/build_rpm.sh index 383a22e317..af9e6504cd 100755 --- a/traffic_ops_ort/build/build_rpm.sh +++ b/traffic_ops_ort/build/build_rpm.sh @@ -53,6 +53,10 @@ function initBuildArea() { GFLAGS+=(--gcflags 'all=-N -l'); fi; + pushd atstccfg; + "${GC[@]}" "${GCFLAGS[@]}" -ldflags "-X main.GitRevision=`git rev-parse HEAD` -X main.BuildTimestamp=`date +'%Y-%M-%dT%H:%M:%s'` -X main.Version=${TC_VERSION}"; + popd; + cp -p traffic_ops_ort.pl "$dest"; cp -p supermicro_udev_mapper.pl "$dest"; mkdir -p "${dest}/atstccfg"; From 46b76863cf9101886b7fa14c378d9ee914cd2952 Mon Sep 17 00:00:00 2001 From: ocket8888 Date: Fri, 1 May 2020 16:23:31 -0600 Subject: [PATCH 10/18] Fixed import paths --- traffic_ops_ort/atstccfg/atstccfg.go | 12 ++++++------ traffic_ops_ort/atstccfg/cfgfile/all.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/astatsdotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/atsdotrules.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/bgfetchdotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/cachedotconfig.go | 2 +- .../atstccfg/cfgfile/cacheurldotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/cfgfile.go | 4 ++-- traffic_ops_ort/atstccfg/cfgfile/cfgfile_test.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/chkconfig.go | 2 +- .../atstccfg/cfgfile/dropqstringdotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/facts.go | 2 +- .../atstccfg/cfgfile/headerrewritedotconfig.go | 2 +- .../atstccfg/cfgfile/headerrewritemiddotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/hostingdotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/ipallowdotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/loggingdotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/loggingdotyaml.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/logsxmldotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/meta.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/packages.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/parentdotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/plugindotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/recordsdotconfig.go | 2 +- .../atstccfg/cfgfile/regexremapdotconfig.go | 2 +- .../atstccfg/cfgfile/regexrevalidatedotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/remapdotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/routing.go | 2 +- .../atstccfg/cfgfile/servercachedotconfig.go | 2 +- .../atstccfg/cfgfile/serverunknownconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/setdscpdotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/sslkeys.go | 2 +- .../atstccfg/cfgfile/sslmulticertdotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/storagedotconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/sysctldotconf.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/unknownconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/urisigningconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/urlsigconfig.go | 2 +- traffic_ops_ort/atstccfg/cfgfile/volumedotconfig.go | 2 +- traffic_ops_ort/atstccfg/config/config.go | 4 ++-- traffic_ops_ort/atstccfg/getdata/getdata.go | 2 +- traffic_ops_ort/atstccfg/plugin/README.md | 2 +- traffic_ops_ort/atstccfg/plugin/hello_world.go | 2 +- traffic_ops_ort/atstccfg/plugin/plugin.go | 2 +- traffic_ops_ort/atstccfg/plugin/plugin_test.go | 2 +- traffic_ops_ort/atstccfg/toreq/toreq.go | 2 +- traffic_ops_ort/atstccfg/toreqnew/toreqnew.go | 2 +- .../atstccfg/update-to-client/update-to-client.go | 8 ++++---- 48 files changed, 58 insertions(+), 58 deletions(-) diff --git a/traffic_ops_ort/atstccfg/atstccfg.go b/traffic_ops_ort/atstccfg/atstccfg.go index 0a77c62217..cb222cffd8 100644 --- a/traffic_ops_ort/atstccfg/atstccfg.go +++ b/traffic_ops_ort/atstccfg/atstccfg.go @@ -54,12 +54,12 @@ import ( "strings" "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/cfgfile" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/getdata" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/plugin" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/toreq" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/toreqnew" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/cfgfile" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/getdata" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/plugin" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/toreq" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/toreqnew" ) func main() { diff --git a/traffic_ops_ort/atstccfg/cfgfile/all.go b/traffic_ops_ort/atstccfg/cfgfile/all.go index edf3be14a9..9072edc2e7 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/all.go +++ b/traffic_ops_ort/atstccfg/cfgfile/all.go @@ -32,7 +32,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-rfc" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) // GetAllConfigs gets all config files for cfg.CacheHostName. diff --git a/traffic_ops_ort/atstccfg/cfgfile/astatsdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/astatsdotconfig.go index c90d5c40c5..1d9b805752 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/astatsdotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/astatsdotconfig.go @@ -22,7 +22,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileProfileAstatsDotConfig(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/atsdotrules.go b/traffic_ops_ort/atstccfg/cfgfile/atsdotrules.go index ee51c24180..801cbcf303 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/atsdotrules.go +++ b/traffic_ops_ort/atstccfg/cfgfile/atsdotrules.go @@ -22,7 +22,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) const ATSDotRulesFileName = StorageFileName diff --git a/traffic_ops_ort/atstccfg/cfgfile/bgfetchdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/bgfetchdotconfig.go index d0de192b2d..574f2c0653 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/bgfetchdotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/bgfetchdotconfig.go @@ -22,7 +22,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileCDNBGFetchDotConfig(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/cachedotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/cachedotconfig.go index 71fb56613a..a9a5c4ce32 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/cachedotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/cachedotconfig.go @@ -22,7 +22,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileProfileCacheDotConfig(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/cacheurldotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/cacheurldotconfig.go index ae60a85819..9e036ef7a1 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/cacheurldotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/cacheurldotconfig.go @@ -22,7 +22,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileCDNCacheURL(toData *config.TOData, fileName string) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/cfgfile.go b/traffic_ops_ort/atstccfg/cfgfile/cfgfile.go index de4813d5d4..13c6d8cc25 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/cfgfile.go +++ b/traffic_ops_ort/atstccfg/cfgfile/cfgfile.go @@ -30,8 +30,8 @@ import ( "github.com/apache/trafficcontrol/lib/go-log" "github.com/apache/trafficcontrol/lib/go-tc" "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/toreq" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/toreq" ) const TrafficOpsProxyParameterName = `tm.rev_proxy.url` diff --git a/traffic_ops_ort/atstccfg/cfgfile/cfgfile_test.go b/traffic_ops_ort/atstccfg/cfgfile/cfgfile_test.go index 1e8cb639d3..a2e88bf263 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/cfgfile_test.go +++ b/traffic_ops_ort/atstccfg/cfgfile/cfgfile_test.go @@ -29,7 +29,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func TestWriteConfigs(t *testing.T) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/chkconfig.go b/traffic_ops_ort/atstccfg/cfgfile/chkconfig.go index c96872dbb9..b0d4730f01 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/chkconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/chkconfig.go @@ -21,7 +21,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileServerChkconfig(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/dropqstringdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/dropqstringdotconfig.go index 4474ea8c2b..c16ee71738 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/dropqstringdotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/dropqstringdotconfig.go @@ -21,7 +21,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileProfileDropQStringDotConfig(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/facts.go b/traffic_ops_ort/atstccfg/cfgfile/facts.go index 6cace4f0c4..5b5fe1a24b 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/facts.go +++ b/traffic_ops_ort/atstccfg/cfgfile/facts.go @@ -21,7 +21,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileProfile12MFacts(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/headerrewritedotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/headerrewritedotconfig.go index be13ba0c11..58967275b1 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/headerrewritedotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/headerrewritedotconfig.go @@ -25,7 +25,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileCDNHeaderRewrite(toData *config.TOData, fileName string) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/headerrewritemiddotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/headerrewritemiddotconfig.go index 460e3b9f5d..3df4e96176 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/headerrewritemiddotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/headerrewritemiddotconfig.go @@ -25,7 +25,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileCDNHeaderRewriteMid(toData *config.TOData, fileName string) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/hostingdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/hostingdotconfig.go index 6c4ac36713..a88cb4fafd 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/hostingdotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/hostingdotconfig.go @@ -25,7 +25,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) const ServerHostingDotConfigMidIncludeInactive = false diff --git a/traffic_ops_ort/atstccfg/cfgfile/ipallowdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/ipallowdotconfig.go index 8c7489cdfd..d7c8e8011c 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/ipallowdotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/ipallowdotconfig.go @@ -25,7 +25,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileServerIPAllowDotConfig(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/loggingdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/loggingdotconfig.go index 99b0648139..e3e9a2c927 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/loggingdotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/loggingdotconfig.go @@ -21,7 +21,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileProfileLoggingDotConfig(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/loggingdotyaml.go b/traffic_ops_ort/atstccfg/cfgfile/loggingdotyaml.go index 22cfc21374..8cca1ca2f9 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/loggingdotyaml.go +++ b/traffic_ops_ort/atstccfg/cfgfile/loggingdotyaml.go @@ -21,7 +21,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileProfileLoggingDotYAML(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/logsxmldotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/logsxmldotconfig.go index 32265d9c71..df77e182f3 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/logsxmldotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/logsxmldotconfig.go @@ -21,7 +21,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileProfileLogsXMLDotConfig(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/meta.go b/traffic_ops_ort/atstccfg/cfgfile/meta.go index 655e51307e..a9851d2c97 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/meta.go +++ b/traffic_ops_ort/atstccfg/cfgfile/meta.go @@ -24,7 +24,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetMeta(toData *config.TOData) (*tc.ATSConfigMetaData, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/packages.go b/traffic_ops_ort/atstccfg/cfgfile/packages.go index 97e1120665..61b3de34f3 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/packages.go +++ b/traffic_ops_ort/atstccfg/cfgfile/packages.go @@ -21,7 +21,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileServerPackages(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/parentdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/parentdotconfig.go index 75b6eeff9f..52d8346528 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/parentdotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/parentdotconfig.go @@ -30,7 +30,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-log" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileServerParentDotConfig(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/plugindotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/plugindotconfig.go index 2e6698f930..36dc81df2d 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/plugindotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/plugindotconfig.go @@ -21,7 +21,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileProfilePluginDotConfig(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/recordsdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/recordsdotconfig.go index f7064c86f1..5adc39e82e 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/recordsdotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/recordsdotconfig.go @@ -21,7 +21,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileProfileRecordsDotConfig(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/regexremapdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/regexremapdotconfig.go index fecf353e8c..d419bee077 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/regexremapdotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/regexremapdotconfig.go @@ -24,7 +24,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileCDNRegexRemap(toData *config.TOData, fileName string) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/regexrevalidatedotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/regexrevalidatedotconfig.go index 8df14fb944..1df55c8d07 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/regexrevalidatedotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/regexrevalidatedotconfig.go @@ -23,7 +23,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-log" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileCDNRegexRevalidateDotConfig(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/remapdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/remapdotconfig.go index 73c35b3d6b..699152416e 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/remapdotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/remapdotconfig.go @@ -29,7 +29,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-log" "github.com/apache/trafficcontrol/lib/go-tc" "github.com/apache/trafficcontrol/lib/go-util" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileServerRemapDotConfig(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/routing.go b/traffic_ops_ort/atstccfg/cfgfile/routing.go index 58a0aaab05..62be2d8d0c 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/routing.go +++ b/traffic_ops_ort/atstccfg/cfgfile/routing.go @@ -26,7 +26,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-log" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) var scopeConfigFileFuncs = map[string]func(toData *config.TOData, fileName string) (string, string, string, error){ diff --git a/traffic_ops_ort/atstccfg/cfgfile/servercachedotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/servercachedotconfig.go index 13fb58d50d..23fe117bdb 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/servercachedotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/servercachedotconfig.go @@ -25,7 +25,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) const ServerCacheDotConfigIncludeInactiveDSes = false // TODO move to lib/go-atscfg diff --git a/traffic_ops_ort/atstccfg/cfgfile/serverunknownconfig.go b/traffic_ops_ort/atstccfg/cfgfile/serverunknownconfig.go index 96633e587c..45c775617d 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/serverunknownconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/serverunknownconfig.go @@ -22,7 +22,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileServerUnknownConfig(toData *config.TOData, fileName string) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/setdscpdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/setdscpdotconfig.go index 6f0e6eff31..994ff955d4 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/setdscpdotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/setdscpdotconfig.go @@ -24,7 +24,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileCDNSetDSCP(toData *config.TOData, fileName string) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/sslkeys.go b/traffic_ops_ort/atstccfg/cfgfile/sslkeys.go index e54231fae8..f5b47e2b50 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/sslkeys.go +++ b/traffic_ops_ort/atstccfg/cfgfile/sslkeys.go @@ -25,7 +25,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-log" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetSSLCertsAndKeyFiles(toData *config.TOData) ([]config.ATSConfigFile, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/sslmulticertdotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/sslmulticertdotconfig.go index f40883bb07..f13a97ea91 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/sslmulticertdotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/sslmulticertdotconfig.go @@ -22,7 +22,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileCDNSSLMultiCertDotConfig(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/storagedotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/storagedotconfig.go index 01a824b493..c7a7b9afe8 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/storagedotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/storagedotconfig.go @@ -21,7 +21,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) const StorageFileName = "storage.config" diff --git a/traffic_ops_ort/atstccfg/cfgfile/sysctldotconf.go b/traffic_ops_ort/atstccfg/cfgfile/sysctldotconf.go index 6f5abccbb1..8084fe5443 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/sysctldotconf.go +++ b/traffic_ops_ort/atstccfg/cfgfile/sysctldotconf.go @@ -21,7 +21,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileProfileSysCtlDotConf(toData *config.TOData) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/unknownconfig.go b/traffic_ops_ort/atstccfg/cfgfile/unknownconfig.go index 2dd3e18ab0..f55b97ba02 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/unknownconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/unknownconfig.go @@ -21,7 +21,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileProfileUnknownConfig(toData *config.TOData, fileName string) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/urisigningconfig.go b/traffic_ops_ort/atstccfg/cfgfile/urisigningconfig.go index 8756b77cc2..ee56f3df8a 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/urisigningconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/urisigningconfig.go @@ -25,7 +25,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileProfileURISigningConfig(toData *config.TOData, fileName string) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/urlsigconfig.go b/traffic_ops_ort/atstccfg/cfgfile/urlsigconfig.go index eb689f2fa7..d39e9921d8 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/urlsigconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/urlsigconfig.go @@ -25,7 +25,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetConfigFileProfileURLSigConfig(toData *config.TOData, fileName string) (string, string, string, error) { diff --git a/traffic_ops_ort/atstccfg/cfgfile/volumedotconfig.go b/traffic_ops_ort/atstccfg/cfgfile/volumedotconfig.go index 71f457df4d..2fb4f7a84b 100644 --- a/traffic_ops_ort/atstccfg/cfgfile/volumedotconfig.go +++ b/traffic_ops_ort/atstccfg/cfgfile/volumedotconfig.go @@ -21,7 +21,7 @@ package cfgfile import ( "github.com/apache/trafficcontrol/lib/go-atscfg" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) const VolumeFileName = StorageFileName diff --git a/traffic_ops_ort/atstccfg/config/config.go b/traffic_ops_ort/atstccfg/config/config.go index 3b87f1883c..55b6cc50f7 100644 --- a/traffic_ops_ort/atstccfg/config/config.go +++ b/traffic_ops_ort/atstccfg/config/config.go @@ -30,8 +30,8 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-log" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/toreq" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/toreqnew" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/toreq" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/toreqnew" flag "github.com/ogier/pflag" ) diff --git a/traffic_ops_ort/atstccfg/getdata/getdata.go b/traffic_ops_ort/atstccfg/getdata/getdata.go index 3923e73b6e..23a9cebe99 100644 --- a/traffic_ops_ort/atstccfg/getdata/getdata.go +++ b/traffic_ops_ort/atstccfg/getdata/getdata.go @@ -34,7 +34,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-atscfg" "github.com/apache/trafficcontrol/lib/go-log" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func GetDataFuncs() map[string]func(config.TCCfg, io.Writer) error { diff --git a/traffic_ops_ort/atstccfg/plugin/README.md b/traffic_ops_ort/atstccfg/plugin/README.md index 0480aba1a0..9cd675ffc4 100644 --- a/traffic_ops_ort/atstccfg/plugin/README.md +++ b/traffic_ops_ort/atstccfg/plugin/README.md @@ -19,7 +19,7 @@ # Adding a Plugin -To add a plugin, create a new `.go` file in the `traffic_ops/ort/atstccfg/plugin` directory. This file should have a unique name, to avoid conflicts. Consider prefixing it with your company name, website, or a UUID. +To add a plugin, create a new `.go` file in the `traffic_ops_ort/atstccfg/plugin` directory. This file should have a unique name, to avoid conflicts. Consider prefixing it with your company name, website, or a UUID. The filename, sans `.go`, is the name of your plugin, and will be the key used for configuration in the remap file. For example, if your file is `f49e54fc-fd17-4e1c-92c6-67028fde8504-hello-world.go`, the name of your plugin is `f49e54fc-fd17-4e1c-92c6-67028fde8504-hello-world`. diff --git a/traffic_ops_ort/atstccfg/plugin/hello_world.go b/traffic_ops_ort/atstccfg/plugin/hello_world.go index 0808692ceb..93f6aeaef4 100644 --- a/traffic_ops_ort/atstccfg/plugin/hello_world.go +++ b/traffic_ops_ort/atstccfg/plugin/hello_world.go @@ -15,7 +15,7 @@ package plugin */ import ( - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func init() { diff --git a/traffic_ops_ort/atstccfg/plugin/plugin.go b/traffic_ops_ort/atstccfg/plugin/plugin.go index e900336830..bf5ab5e319 100644 --- a/traffic_ops_ort/atstccfg/plugin/plugin.go +++ b/traffic_ops_ort/atstccfg/plugin/plugin.go @@ -24,7 +24,7 @@ import ( "time" "github.com/apache/trafficcontrol/lib/go-log" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) // List returns the list of plugins compiled into the calling executable. diff --git a/traffic_ops_ort/atstccfg/plugin/plugin_test.go b/traffic_ops_ort/atstccfg/plugin/plugin_test.go index 228587605a..b8d763e1df 100644 --- a/traffic_ops_ort/atstccfg/plugin/plugin_test.go +++ b/traffic_ops_ort/atstccfg/plugin/plugin_test.go @@ -22,7 +22,7 @@ package plugin import ( "testing" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/config" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/config" ) func TestPlugin(t *testing.T) { diff --git a/traffic_ops_ort/atstccfg/toreq/toreq.go b/traffic_ops_ort/atstccfg/toreq/toreq.go index 69f74c434e..67238f2772 100644 --- a/traffic_ops_ort/atstccfg/toreq/toreq.go +++ b/traffic_ops_ort/atstccfg/toreq/toreq.go @@ -38,7 +38,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-tc" "github.com/apache/trafficcontrol/lib/go-util" toclient "github.com/apache/trafficcontrol/traffic_ops/client" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/torequtil" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/torequtil" ) type TOClient struct { diff --git a/traffic_ops_ort/atstccfg/toreqnew/toreqnew.go b/traffic_ops_ort/atstccfg/toreqnew/toreqnew.go index 56bf454634..81db18f9b6 100644 --- a/traffic_ops_ort/atstccfg/toreqnew/toreqnew.go +++ b/traffic_ops_ort/atstccfg/toreqnew/toreqnew.go @@ -39,7 +39,7 @@ import ( "github.com/apache/trafficcontrol/lib/go-log" "github.com/apache/trafficcontrol/lib/go-tc" - "github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg/torequtil" + "github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg/torequtil" toclient "github.com/apache/trafficcontrol/traffic_ops/v2-client" ) diff --git a/traffic_ops_ort/atstccfg/update-to-client/update-to-client.go b/traffic_ops_ort/atstccfg/update-to-client/update-to-client.go index 5f6144e20a..c0bdf593dc 100644 --- a/traffic_ops_ort/atstccfg/update-to-client/update-to-client.go +++ b/traffic_ops_ort/atstccfg/update-to-client/update-to-client.go @@ -58,18 +58,18 @@ func main() { } func usageStr() string { - return `usage: go run update-to-client.go /path/to/traffic_ops/ort/atstccfg branch-to-vendor + return `usage: go run update-to-client.go /path/to/traffic_ops_ort/atstccfg branch-to-vendor Example: go run update-to-client/update-to-client.go . 5.0.x -This script updates traffic_ops/ort/atstccfg after a Traffic Ops release is made. +This script updates traffic_ops_ort/atstccfg after a Traffic Ops release is made. Be aware! It can and will modify all .go files in the given directory! Back up any uncommitted changes! Also be aware! This is very specific to the current code. If symbols or patterns are changed around how the master vs vendored client are used, this script will have to be updated. Expecations: -- atstccfg is at github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg +- atstccfg is at github.com/apache/trafficcontrol/traffic_ops_ort/atstccfg - The master TO client is at github.com/apache/trafficcontrol/traffic_ops/client - The previous major version client is vendored at atstccfg/toreq/vendor - The master client wrapper for atstccfg is at atstccfg/toreqnew @@ -82,7 +82,7 @@ Expecations: The arguments are the atstccfg directory, and the name of the branch to vendor from. -This script should always be called from trafficcontrol/traffic_ops/ort/atstccfg. +This script should always be called from trafficcontrol/traffic_ops_ort/atstccfg. It copies the traffic_ops/client from that branch into toreq/vendor, and then updates all references to cfg.TOClientNew to cfg.TOClient. From 66939bed8207884ceaa8be60e22c2bb8e9da3bb0 Mon Sep 17 00:00:00 2001 From: ocket8888 Date: Fri, 1 May 2020 16:43:30 -0600 Subject: [PATCH 11/18] Fixed TC_DIR definition --- traffic_ops_ort/build/build_rpm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/traffic_ops_ort/build/build_rpm.sh b/traffic_ops_ort/build/build_rpm.sh index af9e6504cd..dec90c6056 100755 --- a/traffic_ops_ort/build/build_rpm.sh +++ b/traffic_ops_ort/build/build_rpm.sh @@ -22,7 +22,7 @@ function importFunctions() { local script=$(readlink -f "$0"); local scriptdir=$(dirname "$script"); export ORT_DIR=$(dirname "$scriptdir"); - export TC_DIR=$(dirname "$TO_DIR"); + export TC_DIR=$(dirname "$ORT_DIR"); functions_sh="$TC_DIR/build/functions.sh"; if [[ ! -r $functions_sh ]]; then echo "error: can't find $functions_sh" >&2; From f9f37a5310c2a3945f1e71de4b2a9d64b318281b Mon Sep 17 00:00:00 2001 From: ocket8888 Date: Wed, 10 Jun 2020 21:31:58 -0600 Subject: [PATCH 12/18] Removed uneeded dependency --- infrastructure/docker/build/Dockerfile-traffic_ops_ort | 1 - 1 file changed, 1 deletion(-) diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops_ort b/infrastructure/docker/build/Dockerfile-traffic_ops_ort index d58fabaf60..29ae6f829f 100644 --- a/infrastructure/docker/build/Dockerfile-traffic_ops_ort +++ b/infrastructure/docker/build/Dockerfile-traffic_ops_ort @@ -22,7 +22,6 @@ VOLUME /trafficcontrol ### Common for all sub-component builds RUN yum -y install \ - epel-release \ git \ rpm-build && \ yum -y clean all From 4f80faf1a91523a5c2ec99fd6cc9b44cb0bc045b Mon Sep 17 00:00:00 2001 From: ocket8888 Date: Wed, 10 Jun 2020 21:34:54 -0600 Subject: [PATCH 13/18] changed cp flags to be simpler --- traffic_ops_ort/build/build_rpm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/traffic_ops_ort/build/build_rpm.sh b/traffic_ops_ort/build/build_rpm.sh index dec90c6056..9bcaf99acf 100755 --- a/traffic_ops_ort/build/build_rpm.sh +++ b/traffic_ops_ort/build/build_rpm.sh @@ -60,7 +60,7 @@ function initBuildArea() { cp -p traffic_ops_ort.pl "$dest"; cp -p supermicro_udev_mapper.pl "$dest"; mkdir -p "${dest}/atstccfg"; - cp -Rp atstccfg/* "${dest}/atstccfg"; + cp -a atstccfg/* "${dest}/atstccfg"; tar -czvf "$dest".tgz -C "$RPMBUILD"/SOURCES $(basename "$dest"); cp build/traffic_ops_ort.spec "$RPMBUILD"/SPECS/.; From 716ce19e69b1a11e010c0f4b9d8d97660c3c7bb1 Mon Sep 17 00:00:00 2001 From: ocket8888 Date: Wed, 10 Jun 2020 21:40:44 -0600 Subject: [PATCH 14/18] fixed TO build --- traffic_ops/build/build_rpm.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/traffic_ops/build/build_rpm.sh b/traffic_ops/build/build_rpm.sh index 17671d48b1..a2e4cbcce9 100755 --- a/traffic_ops/build/build_rpm.sh +++ b/traffic_ops/build/build_rpm.sh @@ -70,13 +70,7 @@ function initBuildArea() { { echo "Could not build convert_profile binary"; exit 1; } popd - # compile atstccfg - pushd ort/atstccfg - "${go_build[@]}" -ldflags "-X main.GitRevision=`git rev-parse HEAD` -X main.BuildTimestamp=`date +'%Y-%M-%dT%H:%M:%s'` -X main.Version=${TC_VERSION}" || \ - { echo "Could not build atstccfg binary"; exit 1; } - popd - - rsync -av doc etc install "$dest"/ || \ + rsync -av etc install "$dest"/ || \ { echo "Could not copy to $dest: $?"; exit 1; } rsync -av app/{bin,conf,cpanfile,db,lib,public,script,templates} "$dest"/app/ || \ { echo "Could not copy to $dest/app: $?"; exit 1; } From 3e2337fc2ca23573ba3728b2791fc90aa7998d68 Mon Sep 17 00:00:00 2001 From: ocket8888 Date: Wed, 10 Jun 2020 22:45:04 -0600 Subject: [PATCH 15/18] Reduced necessary changes for Go version upgrade --- infrastructure/docker/build/Dockerfile-traffic_ops_ort | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops_ort b/infrastructure/docker/build/Dockerfile-traffic_ops_ort index 29ae6f829f..5909d6f775 100644 --- a/infrastructure/docker/build/Dockerfile-traffic_ops_ort +++ b/infrastructure/docker/build/Dockerfile-traffic_ops_ort @@ -26,10 +26,10 @@ RUN yum -y install \ rpm-build && \ yum -y clean all -RUN curl -LO https://dl.google.com/go/go1.14.2.linux-amd64.tar.gz && \ - tar -C /usr/local -xvzf go1.14.2.linux-amd64.tar.gz && \ +RUN curl -Lo go.tgz https://dl.google.com/go/go1.14.2.linux-amd64.tar.gz && \ + tar -C /usr/local -xvzf go.tgz && \ ln -s /usr/local/go/bin/go /usr/bin/go && \ - rm go1.14.2.linux-amd64.tar.gz + rm go.tgz ADD infrastructure/docker/build/clean_build.sh / CMD /clean_build.sh traffic_ops_ort From f6558d9f89141702450aa7065aafaba24a7bc83e Mon Sep 17 00:00:00 2001 From: ocket8888 Date: Thu, 11 Jun 2020 14:19:59 -0600 Subject: [PATCH 16/18] Using official Apache builder --- infrastructure/docker/build/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/docker/build/docker-compose.yml b/infrastructure/docker/build/docker-compose.yml index 3ce454203d..e2fb397183 100644 --- a/infrastructure/docker/build/docker-compose.yml +++ b/infrastructure/docker/build/docker-compose.yml @@ -43,10 +43,10 @@ services: - ../../..:/trafficcontrol:z traffic_ops_ort_build: - image: traffic_ops_ort_builder - build: - dockerfile: infrastructure/docker/build/Dockerfile-traffic_ops_ort - context: ../../.. + image: apache/traffic_ops_ort_builder:master + # build: + # dockerfile: infrastructure/docker/build/Dockerfile-traffic_ops_ort + # context: ../../.. volumes: - ../../..:/trafficcontrol:z From bbba3c1a03dd2dd089148392da9d9fe586982598 Mon Sep 17 00:00:00 2001 From: ocket8888 Date: Thu, 11 Jun 2020 14:23:02 -0600 Subject: [PATCH 17/18] Added image pull to avoid breaking change --- pkg | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg b/pkg index 8a6168f385..592d56047a 100755 --- a/pkg +++ b/pkg @@ -134,6 +134,7 @@ while (( "$#" )); do if (( "$verbose" == 0 )); then exec >/dev/null 2>&1 fi + "${COMPOSECMD[@]}" -f $COMPOSE_FILE pull $1; "${COMPOSECMD[@]}" -f $COMPOSE_FILE build $1 || exit 1 "${COMPOSECMD[@]}" -f $COMPOSE_FILE run "${RUN_OPTIONS[@]}" --rm $1 || exit 1 ) || { From d6e117fd9a85de9bdb438964c87c472fb3f588c5 Mon Sep 17 00:00:00 2001 From: ocket8888 Date: Thu, 11 Jun 2020 14:34:02 -0600 Subject: [PATCH 18/18] Combined build and pull commands --- pkg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg b/pkg index 592d56047a..63e163b42a 100755 --- a/pkg +++ b/pkg @@ -134,8 +134,7 @@ while (( "$#" )); do if (( "$verbose" == 0 )); then exec >/dev/null 2>&1 fi - "${COMPOSECMD[@]}" -f $COMPOSE_FILE pull $1; - "${COMPOSECMD[@]}" -f $COMPOSE_FILE build $1 || exit 1 + "${COMPOSECMD[@]}" -f $COMPOSE_FILE build --pull $1 || exit 1 "${COMPOSECMD[@]}" -f $COMPOSE_FILE run "${RUN_OPTIONS[@]}" --rm $1 || exit 1 ) || { # Don't totally bail out, but make note of the failures.