Giving ort its own build (#2776)

* Added TO_ORT build tree

* Made TO_ORT an independent build

* Specifically, TO build needs the TO spec file

* Fixed build script; added failure messages

* Changelog update

* Documentation update

* Added Go to build image since we need it now

* Fixed spec file for new paths

* Re-added Go build step that I forgot in the rebase

* Fixed import paths

* Fixed TC_DIR definition

* Removed uneeded dependency

* changed cp flags to be simpler

* fixed TO build

* Reduced necessary changes for Go version upgrade

* Using official Apache builder

* Added image pull to avoid breaking change

* Combined build and pull commands

Co-authored-by: Brennan Fieck <Brennan_WilliamFieck@comcast.com>

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.

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]_

infrastructure/docker/build/Dockerfile-traffic_ops_ort

@@ -0,0 +1,37 @@
+# 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 \
+		git \
+		rpm-build && \
+	yum -y clean all
+
+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 go.tgz
+
+ADD infrastructure/docker/build/clean_build.sh /
+CMD /clean_build.sh traffic_ops_ort
+
+#vi:syntax=Dockerfile

infrastructure/docker/build/docker-compose.yml

@@ -42,6 +42,14 @@ services:
     volumes:
       - ../../..:/trafficcontrol:z
 
+  traffic_ops_ort_build:
+    image: apache/traffic_ops_ort_builder:master
+    # build:
+    #   dockerfile: infrastructure/docker/build/Dockerfile-traffic_ops_ort
+    #   context: ../../..
+    volumes:
+      - ../../..:/trafficcontrol:z
+
   traffic_portal_build:
     image: apache/traffic_portal_builder:master
     #build:

pkg

@@ -134,7 +134,7 @@ while (( "$#" )); do
 		if (( "$verbose" == 0 )); then
 			exec >/dev/null 2>&1
 		fi
-		"${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.

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; }
 
@@ -70,31 +70,15 @@ 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 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 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; }
 
-	# 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 '(?<!func )AddPlugin\(' ${TO_DIR}/traffic_ops_golang/plugin/*.go | xargs -I '{}' basename {} '.go')
 
 	echo "The build area has been initialized."
@@ -104,4 +88,4 @@ function initBuildArea() {
 importFunctions
 checkEnvironment go
 initBuildArea
-buildRpm traffic_ops traffic_ops_ort
+buildRpm traffic_ops

traffic_ops/ort/atstccfg/atstccfg.go → 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() {

traffic_ops/ort/atstccfg/cfgfile/all.go → 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.

traffic_ops/ort/atstccfg/cfgfile/astatsdotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/atsdotrules.go → 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

traffic_ops/ort/atstccfg/cfgfile/bgfetchdotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/cachedotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/cacheurldotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/cfgfile.go → 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`

traffic_ops/ort/atstccfg/cfgfile/cfgfile_test.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/chkconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/dropqstringdotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/facts.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/headerrewritedotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/headerrewritemiddotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/hostingdotconfig.go → 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

traffic_ops/ort/atstccfg/cfgfile/ipallowdotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/loggingdotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/loggingdotyaml.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/logsxmldotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/meta.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/packages.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/parentdotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/plugindotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/recordsdotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/regexremapdotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/regexrevalidatedotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/remapdotconfig.go → 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) {

traffic_ops/ort/atstccfg/cfgfile/routing.go → 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){