Revert "Update j2cli to jinjanator. (sonic-net#15600)" (sonic-net#15636)

This reverts commit 174c6bf.

Author: lerry-lee

ansible/setup-management-network.sh

@@ -33,10 +33,10 @@ echo "Refreshing apt package lists..."
 apt-get update
 echo
 
-echo "STEP 1: Checking for jinjanator package..."
-if ! command -v jinjanate; then
-    echo "jinjanator not found, installing jinjanator"
-    cmd="install --user jinjanator==24.4.0"
+echo "STEP 1: Checking for j2cli package..."
+if ! command -v j2; then
+    echo "j2cli not found, installing j2cli"
+    cmd="install --user j2cli==0.3.10"
     if ! command -v pip &> /dev/null; then
         pip3 $cmd
     else

docs/testbed/README.testbed.Setup.md

@@ -20,7 +20,7 @@ This document describes the steps to setup the testbed and deploy a topology.
     ```
 - Install Python prerequisites
     ```
-    sudo pip3 install jinjanator
+    sudo pip3 install j2cli
     ```
 - Install Docker (all credits to https://docs.docker.com/engine/install/ubuntu/ )
     ```

docs/testbed/README.testbed.VsSetup.md

@@ -22,7 +22,7 @@ First, we need to prepare the host where we will be configuring the virtual test
         ```
         sudo apt install python python-pip openssh-server
         # v0.3.10 Jinja2 is required, lower version may cause uncompatible issue
-        sudo pip install jinjanate==24.4.0
+        sudo pip install j2cli==0.3.10
         ```
 
 3. Run the host setup script to install required packages and initialize the management bridge network

setup-container.sh

@@ -275,7 +275,7 @@ ROOT_PASS=${ROOT_PASS}
 EOF
 
     log_info "generate a Dockerfile: ${TMP_DIR}/Dockerfile"
-    jinjanate -o "${TMP_DIR}/Dockerfile" "${TMP_DIR}/Dockerfile.j2" "${TMP_DIR}/data.env" || \
+    j2 -o "${TMP_DIR}/Dockerfile" "${TMP_DIR}/Dockerfile.j2" "${TMP_DIR}/data.env" || \
     log_error "failed to generate a Dockerfile: ${TMP_DIR}/Dockerfile"
 
     log_info "building docker image from ${TMP_DIR}: ${LOCAL_IMAGE} ..."
@@ -445,14 +445,8 @@ if docker ps -a --format "{{.Names}}" | grep -q "^${CONTAINER_NAME}$"; then
     fi
 fi
 
-if ! which jinjanate &> /dev/null; then
-    echo "jinjanator not found, installing jinjanator"
-    cmd="install --user jinjanator==24.4.0"
-    if ! command -v pip &> /dev/null; then
-        pip3 $cmd
-    else
-        pip $cmd
-    fi
+if ! which j2 &> /dev/null; then
+    exit_failure "missing Jinja2 templates support: make sure j2cli package is installed"
 fi
 
 pull_sonic_mgmt_docker_image