[SDFAB-585] Moving p4src/ in p4src/tna (#386)

* Move p4src/ in p4src/tna

* Fix Tofino P4C_OUT path for all tests

Author: EmanueleGallone

.gitignore

@@ -1,6 +1,6 @@
 # Copyright 2020-present Open Networking Foundation
 # SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-p4src/build
+p4src/tna/build
 target
 *.pyc
 src/main/resources/p4c-out

Makefile

@@ -35,34 +35,36 @@ build: clean $(PROFILES) pipeconf
 
 all: $(PROFILES)
 
+
 fabric:
-	@$(DIR)/p4src/build.sh fabric ""
+	@$(DIR)/p4src/tna/build.sh fabric ""
+
 
 # Profiles which are not completed yet.
 # fabric-simple:
-# 	@$(DIR)/p4src/build.sh fabric-simple "-DWITH_SIMPLE_NEXT"
+# 	@$(DIR)/p4src/tna/build.sh fabric-simple "-DWITH_SIMPLE_NEXT"
 
 # fabric-bng:
-# 	@$(DIR)/p4src/build.sh fabric-bng "-DWITH_BNG -DWITHOUT_XCONNECT"
+# 	@$(DIR)/p4src/tna/build.sh fabric-bng "-DWITH_BNG -DWITHOUT_XCONNECT"
 
 fabric-int:
-	@$(DIR)/p4src/build.sh fabric-int "-DWITH_INT"
+	@$(DIR)/p4src/tna/build.sh fabric-int "-DWITH_INT"
 
 fabric-spgw:
-	@$(DIR)/p4src/build.sh fabric-spgw "-DWITH_SPGW"
+	@$(DIR)/p4src/tna/build.sh fabric-spgw "-DWITH_SPGW"
 
 fabric-spgw-int:
-	@$(DIR)/p4src/build.sh fabric-spgw-int "-DWITH_SPGW -DWITH_INT"
+	@$(DIR)/p4src/tna/build.sh fabric-spgw-int "-DWITH_SPGW -DWITH_INT"
 
 constants:
 	docker run -v $(DIR):$(DIR) -w $(DIR) --rm --user $(UID) \
 		--entrypoint ./util/gen-p4-constants.py $(TESTER_DOCKER_IMG) \
 		-o $(DIR)/src/main/java/org/stratumproject/fabric/tna/behaviour/P4InfoConstants.java \
-		p4info $(DIR)/p4src/build/fabric-spgw-int/sde_$(SDE_VER_)/p4info.txt
+		p4info $(DIR)/p4src/tna/build/fabric-spgw-int/sde_$(SDE_VER_)/p4info.txt
 	docker run -v $(DIR):$(DIR) -w $(DIR) --rm \
 		--user $(UID) \
 		$(SDE_P4C_DOCKER_IMG) \
-		get-hdr-size.py --py-out "$(DIR)/ptf/tests/common/bmd_bytes.py" "$(DIR)/p4src/build"
+		get-hdr-size.py --py-out "$(DIR)/ptf/tests/common/bmd_bytes.py" "$(DIR)/p4src/tna/build"
 
 _m2_vol:
 	docker volume create --opt o=uid=$(UID) --opt device=tmpfs --opt type=tmpfs $(MVN_CACHE)
@@ -117,7 +119,7 @@ netcfg:
 
 p4i:
 	$(info *** Started p4i app at http://localhost:3000)
-	docker run -d --rm --name p4i -v$(DIR):$(DIR)/p4src/build -w $(DIR)/p4src/build -p 3000:3000/tcp --init --cap-add CAP_SYS_ADMIN --cap-add CAP_NET_ADMIN $(SDE_P4I_DOCKER_IMG) xvfb-run /opt/p4i/p4i
+	docker run -d --rm --name p4i -v$(DIR):$(DIR)/p4src/tna/build -w $(DIR)/p4src/tna/build -p 3000:3000/tcp --init --cap-add CAP_SYS_ADMIN --cap-add CAP_NET_ADMIN $(SDE_P4I_DOCKER_IMG) xvfb-run /opt/p4i/p4i
 
 p4i-stop:
 	docker kill p4i
@@ -133,7 +135,7 @@ format:
 
 clean:
 	-rm -rf src/main/resources/p4c-out
-	-rm -rf p4src/build
+	-rm -rf p4src/tna/build
 	-rm -rf target
 
 deep-clean: clean

p4src/build.sh p4src/tna/build.shp4src/build.sh renamed to p4src/tna/build.sh

@@ -10,7 +10,7 @@ MONTARA_CPU_PORT=192 # dual-pipe
 # DIR is this file directory.
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 P4_SRC_DIR=${DIR}
-ROOT_DIR="$( cd "${DIR}/../" && pwd )"
+ROOT_DIR="$( cd "${DIR}/../.." && pwd )"
 
 PROFILE=$1
 OTHER_PP_FLAGS=$2
@@ -20,7 +20,7 @@ source "${ROOT_DIR}/.env"
 
 # PWD is the directory where this script is called from (should be the root of
 # this repo).
-P4C_OUT=${ROOT_DIR}/p4src/build/${PROFILE}
+P4C_OUT=${ROOT_DIR}/p4src/tna/build/${PROFILE}
 # Prevent the creation by docker run to avoid having root owner
 mkdir -p "${P4C_OUT}"