Merge branch 'flexcn_traffic_steering' into 'develop'

traffic steering

See merge request oai/cn5g/oai-cn5g-upf-vpp!3

docker/Dockerfile.upf-vpp.rhel7

@@ -67,7 +67,7 @@ RUN git clone -b stable/2101 https://github.com/fdio/vpp.git && \
     git clone https://github.com/travelping/upg-vpp.git && \
     # For the moment let us fix a given commit
     cd upg-vpp && \
-    git checkout -f 4d32e1721c1e9a1bd7ea861658f502a64f9b4073 && \
+    git checkout -f 1f047425c5c99db44c2e599ad1dfd767d426cce8 && \
     cd .. && \
     mv upg-vpp/upf/ vpp/src/plugins/ && \
     mv upg-vpp/vpp-patches/* scripts/patches/ && \

docker/Dockerfile.upf-vpp.ubuntu18

@@ -60,7 +60,7 @@ RUN git clone -b stable/2101 https://github.com/fdio/vpp.git && \
     git clone https://github.com/travelping/upg-vpp.git && \
     # For the moment let us fix a given commit
     cd upg-vpp && \
-    git checkout -f 4d32e1721c1e9a1bd7ea861658f502a64f9b4073 && \
+    git checkout -f 1f047425c5c99db44c2e599ad1dfd767d426cce8 && \
     cd .. && \
     mv upg-vpp/upf/ vpp/src/plugins/ && \
     mv upg-vpp/vpp-patches/* scripts/patches/ && \

docs/BUILD_IMAGE.md

@@ -19,7 +19,7 @@ Here in our network configuration, we need to pass the "GIT PROXY" configuration
 ## 3.1 On a Ubuntu 18.04 Host ##
 
 ```bash
-$ docker build --target vpp-upg --tag vpp-upg:develop \
+$ docker build --target oai-upf-vpp --tag vpp-upg:develop \
                --file docker/Dockerfile.upf-vpp.ubuntu18 \
                --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" .
 ```
@@ -27,7 +27,7 @@ $ docker build --target vpp-upg --tag vpp-upg:develop \
 ##  3.2 On a RHEL 7 Host ##
 
 ```bash
-$ docker build --target vpp-upg --tag vpp-upg:develop \
+$ docker build --target oai-upf-vpp --tag vpp-upg:develop \
                --file docker/Dockerfile.upf-vpp.rhel7 \
                --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" .
 ```