Support building multi-asic component

.gitignore

@@ -111,6 +111,7 @@ dockers/docker-fpm-frr/Dockerfile
 dockers/docker-fpm-gobgp/Dockerfile
 dockers/docker-fpm-quagga/Dockerfile
 dockers/docker-lldp-sv2/Dockerfile
+dockers/docker-namespace/Dockerfile
 dockers/docker-orchagent/Dockerfile
 dockers/docker-platform-monitor/Dockerfile
 dockers/docker-router-advertiser/Dockerfile

files/build_templates/docker_image_ctl.j2

@@ -1,5 +1,31 @@
 #!/bin/bash
 
+# single instance containers are still supported (even though it might not look like it)
+# if no instance number is passed to this script, $DEV will simply be unset, resulting in docker 
+# commands being sent to the base container name. E.g. `docker start database$DEV` simply starts
+# the container `database` if no instance number is passed since `$DEV` is not defined
+
+
+{%- if docker_container_name == "database" %}
+link_namespace() {
+    # Makes namespace of a docker container available in
+    # /var/run/netns so it can be managed with iproute2
+
+    mkdir -p /var/run/netns
+    PID="$(docker inspect -f {{"'{{.State.Pid}}'"}} "{{docker_container_name}}$1")"
+
+    if `ip netns | grep --quiet "{{docker_container_name}}$1"`; then # namespace exists
+        if [ $(readlink -f /var/run/netns/ns$1) = $(readlink -f /proc/$PID/ns/net) ]; then # namespace is correctly linked
+            return 0
+        else # if it's incorrectly linked remove it
+            ip netns delete "{{docker_container_name}}$1"
+        fi
+    fi
+
+    ln -s /proc/$PID/ns/net /var/run/netns/asic$1
+}
+{%- endif %}
+
 function getMountPoint()
 {
     echo $1 | python -c "import sys, json, os; mnts = [x for x in json.load(sys.stdin)[0]['Mounts'] if x['Destination'] == '/usr/share/sonic/hwsku']; print '' if len(mnts) == 0 else os.path.basename(mnts[0]['Source'])" 2>/dev/null
@@ -10,7 +36,7 @@ function updateHostName()
     HOSTS=/etc/hosts
     HOSTS_TMP=/etc/hosts.tmp
 
-    EXEC="docker exec -i {{docker_container_name}} bash -c"
+    EXEC="docker exec -i {{docker_container_name}}$DEV bash -c"
 
     NEW_HOSTNAME="$1"
     HOSTNAME=`$EXEC "hostname"`
@@ -25,7 +51,7 @@ function updateHostName()
     # add entry with new hostname
     $EXEC "echo -e \"127.0.0.1\t$NEW_HOSTNAME\" >> $HOSTS_TMP"
 
-    echo "Set hostname in {{docker_container_name}} container"
+    echo "Set hostname in {{docker_container_name}}$DEV container"
     $EXEC "hostname '$NEW_HOSTNAME'"
     $EXEC "cat $HOSTS_TMP > $HOSTS"
     $EXEC "rm -f $HOSTS_TMP"
@@ -139,6 +165,9 @@ function preStartAction()
 function postStartAction()
 {
 {%- if docker_container_name == "database" %}
+    if [ "$DEV" ]; then
+        link_namespace $DEV
+    fi
     # Wait until redis starts
     /usr/bin/docker exec database ping_pong_db_insts
     if [[ ("$BOOT_TYPE" == "warm" || "$BOOT_TYPE" == "fastfast") && -f $WARM_DIR/dump.rdb ]]; then
@@ -200,7 +229,7 @@ start() {
         HOSTNAME=`hostname`
     fi
 
-    DOCKERCHECK=`docker inspect --type container {{docker_container_name}} 2>/dev/null`
+    DOCKERCHECK=`docker inspect --type container {{docker_container_name}}$DEV 2>/dev/null`
     if [ "$?" -eq "0" ]; then
         {%- if docker_container_name == "database" %}
         DOCKERMOUNT=""
@@ -209,39 +238,52 @@ start() {
         {%- endif %}
         if [ x"$DOCKERMOUNT" == x"$HWSKU" ]; then
             {%- if docker_container_name == "database" %}
-            echo "Starting existing {{docker_container_name}} container"
+            echo "Starting existing {{docker_container_name}}$DEV container"
             {%- else %}
-            echo "Starting existing {{docker_container_name}} container with HWSKU $HWSKU"
+            echo "Starting existing {{docker_container_name}}$DEV container with HWSKU $HWSKU"
             {%- endif %}
             preStartAction
-            docker start {{docker_container_name}}
-            CURRENT_HOSTNAME="$(docker exec {{docker_container_name}} hostname)"
+            docker start {{docker_container_name}}$DEV
+            postStartAction
+            CURRENT_HOSTNAME="$(docker exec {{docker_container_name}}$DEV hostname)"
             if [ x"$HOSTNAME" != x"$CURRENT_HOSTNAME" ]; then
                 updateHostName "$HOSTNAME"
             fi
-            postStartAction
+            updateHostName "$HOSTNAME"
             exit $?
         fi
 
         # docker created with a different HWSKU, remove and recreate
-        echo "Removing obsolete {{docker_container_name}} container with HWSKU $DOCKERMOUNT"
-        docker rm -f {{docker_container_name}}
+        echo "Removing obsolete {{docker_container_name}}$DEV container with HWSKU $DOCKERMOUNT"
+        docker rm -f {{docker_container_name}}$DEV
     fi
 
-{%- if docker_container_name == "database" %}
-    echo "Creating new {{docker_container_name}} container"
+    {%- if docker_container_name == "database" %}
+    echo "Creating new {{docker_container_name}}$DEV container"
     # if database_config exists in old_config, use it; otherwise use the default one in new image
     if [ -f /etc/sonic/old_config/database_config.json ]; then
         echo "Use database_config.json from old system..."
         mv /etc/sonic/old_config/database_config.json /etc/sonic/
     fi
-{%- else %}
-    echo "Creating new {{docker_container_name}} container with HWSKU $HWSKU"
-{%- endif %}
+    {%- else %}
+    echo "Creating new {{docker_container_name}}$DEV container with HWSKU $HWSKU"
+    {%- endif %}
+
+    if [ -z "$DEV" ]; then
+        NET="host"
+    else
+        {%- if docker_container_name == "database" %} 
+	NET="bridge"
+	{%- else %}
+        NET="container:database$DEV"
+	{%- endif %}
+    fi
+
 {%- if sonic_asic_platform == "mellanox" %}
     # TODO: Mellanox will remove the --tmpfs exception after SDK socket path changed in new SDK version
 {%- endif %}
     docker create {{docker_image_run_opt}} \
+        --net=$NET \
 {%- if install_debug_image == "y" %}
         -v /src:/src:ro -v /debug:/debug:rw \
 {%- endif %}
@@ -270,33 +312,42 @@ start() {
         --tmpfs /tmp \
 {%- endif %}
         --tmpfs /var/tmp \
-        --hostname "$HOSTNAME" \
-        --name={{docker_container_name}} {{docker_image_name}}:latest || {
+        --name={{docker_container_name}}$DEV {{docker_image_name}}:latest || {
             echo "Failed to docker run" >&1
             exit 4
     }
 
     preStartAction
     docker start {{docker_container_name}}
     postStartAction
+    updateHostName "$HOSTNAME"
 }
 
 wait() {
-    docker wait {{docker_container_name}}
+    docker wait {{docker_container_name}}$DEV
 }
 
 stop() {
-    docker stop {{docker_container_name}}
+    docker stop {{docker_container_name}}$DEV
+{%- if docker_container_name == "database" %}
+    ip netns delete "asic$DEV"
+{%- endif %}
 }
 
+OP=$1
+DEV=$2 # namespace/device number to operate on
+
 case "$1" in
-    start|wait|stop|updateHostName)
+    start|wait|stop)
+        $1
+        ;;
+    updateHostName)
         cmd=$1
-        shift
+        shift 2
         $cmd $@
         ;;
     *)
-        echo "Usage: $0 {start|wait|stop|updateHostName new_hostname}"
+        echo "Usage: $0 {start namespace(optional)|wait namespace(optional)|stop namespace(optional)|updateHostName namespace(optional) new_hostname}"
         exit 1
         ;;
 esac

files/build_templates/sonic_debian_extension.j2

@@ -221,6 +221,13 @@ sudo cp $IMAGE_CONFIGS/hostname/hostname-config.sh $FILESYSTEM_ROOT/usr/bin/
 # Copy miscellaneous scripts
 sudo cp $IMAGE_CONFIGS/misc/docker-wait-any $FILESYSTEM_ROOT/usr/bin/
 
+# Copy internal topology configuration scripts
+{%- if sonic_asic_platform == "vs" %}
+sudo cp $IMAGE_CONFIGS/topology/topology.service $FILESYSTEM_ROOT/etc/systemd/system/
+echo "topology.service" | sudo tee -a $GENERATED_SERVICE_FILE
+sudo cp $IMAGE_CONFIGS/topology/topology.sh $FILESYSTEM_ROOT/usr/bin
+{%- endif %}
+
 # Copy updategraph script and service file
 j2 files/build_templates/updategraph.service.j2 | sudo tee $FILESYSTEM_ROOT/etc/systemd/system/updategraph.service
 sudo cp $IMAGE_CONFIGS/updategraph/updategraph $FILESYSTEM_ROOT/usr/bin/
@@ -354,6 +361,13 @@ sudo cp {{script}} $FILESYSTEM_ROOT/usr/bin/
 {% for service in installer_services.split(' ') -%}
 if [ -f {{service}} ]; then
     sudo cp {{service}} $FILESYSTEM_ROOT/etc/systemd/system/
+
+    {% if "@" in service %}
+    MULTI_INSTANCE="{{service}}"
+    SINGLE_INSTANCE=${MULTI_INSTANCE/"@"}
+    sudo cp $SINGLE_INSTANCE $FILESYSTEM_ROOT/etc/systemd/system/
+    {% endif %}
+
     echo "{{service}}" | sudo tee -a $GENERATED_SERVICE_FILE
 fi
 {% endfor %}

files/image_config/topology/topology.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=Internal topology service
+[email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
+[email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
+[email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
+[email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
+
+[Service]
+Type=oneshot
+User=root
+RemainAfterExit=yes
+ExecStart=/usr/bin/topology.sh start
+ExecStop=/usr/bin/topology.sh stop
+
+[Install]
+WantedBy=multi-user.target
+

files/image_config/topology/topology.sh

@@ -0,0 +1,75 @@
+#!/bin/bash
+
+start () {
+    # Move external links into assigned frontend namespaces
+    # eth0  - eth15: asic2 
+    # eth16 - eth31: asic3 
+    # eth32 - eth47: asic4
+    # eth48 - eth63: asic5
+    for ASIC in `seq 2 5`; do
+        for NUM in `seq 1 16`; do
+            ORIG="eth$((16 * $(($ASIC - 2)) + $NUM - 1))"
+            TEMP="ethTemp999"
+            NEW="eth$(($NUM + 16))"
+            ip link set dev $ORIG down
+            ip link set dev $ORIG name $TEMP # rename to prevent conflicts before renaming in new namespace
+            ip link set dev $TEMP netns asic$ASIC
+            sudo ip netns exec asic$ASIC ip link set $TEMP name $NEW # rename to final interface name
+            sudo ip netns exec asic$ASIC ip link set $NEW up 
+        done
+    done
+
+    # Connect all backend namespaces to frontend namespaces
+    for BACKEND in `seq 0 1`; do
+        for FRONTEND in `seq 2 5`; do
+            for LINK in `seq 1 8`; do
+                BACK_NAME="eth$((8 * $(($FRONTEND - 2)) + $LINK))"
+                FRONT_NAME="eth$((8 * $BACKEND + $LINK))" 
+                TEMP_BACK="ethBack999"
+                TEMP_FRONT="ethFront999"
+
+                ip link add $TEMP_BACK type veth peer name $TEMP_FRONT # temporary name to prevent conflicts between interfaces
+                ip link set dev $TEMP_BACK netns asic$BACKEND
+                ip link set dev $TEMP_FRONT netns asic$FRONTEND 
+
+                sudo ip netns exec asic$BACKEND ip link set $TEMP_BACK name $BACK_NAME
+                sudo ip netns exec asic$FRONTEND ip link set $TEMP_FRONT name $FRONT_NAME
+
+                sudo ip netns exec asic$BACKEND ip link set $BACK_NAME up
+                sudo ip netns exec asic$FRONTEND ip link set $FRONT_NAME up
+            done
+        done
+    done
+}
+
+stop() {
+    for ASIC in `seq 2 5`; do
+        for NUM in `seq 1 16`; do
+            TEMP="eth999"
+            OLD="eth$(($NUM + 16))"
+            NAME="eth$((16 * $(($ASIC - 2)) + $NUM - 1))"
+            sudo ip netns exec asic$ASIC ip link set dev $OLD down
+            sudo ip netns exec asic$ASIC ip link set dev $OLD name $TEMP
+            sudo ip netns exec asic$ASIC ip link set dev $TEMP netns 1
+            ip link set dev $TEMP name $NAME
+            ip link set dev $NAME up
+        done
+    done
+
+    for ASIC in `seq 0 1`; do
+        for NUM in `seq 1 32`; do
+            sudo ip netns exec asic$ASIC ip link set dev eth$NUM down
+            sudo ip netns exec asic$ASIC ip link delete dev eth$NUM
+        done
+    done
+}
+
+case "$1" in
+    start|stop)
+        $1
+        ;;
+    *)
+        echo "Usage: $0 {start|stop}"
+        ;;
+esac
+

platform/template/docker-syncd-base.mk

@@ -29,7 +29,7 @@ endif
 
 
 $(DOCKER_SYNCD_BASE)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_BASE)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 

platform/vs/README.vsvm.md

@@ -9,7 +9,7 @@ sudo apt-get install libvirt-clients qemu-kvm libvirt-bin
 2. Create SONiC VM
 
 ```
-$ virsh
+$ sudo virsh
 Welcome to virsh, the virtualization interactive terminal.
 
 Type:  'help' for help with commands
@@ -22,14 +22,25 @@ Domain sonic created from sonic.xml
 virsh # 
 ```
 
-2. Connect SONiC VM via console
-
-```
-$ telnet 127.0.0.1 7000
-```
-
-3. Connect SONiC VM via SSH
-
-```
-$ ssh -p 3040 [email protected]
-```
+3. Access virtual switch:
+
+    1. Connect SONiC VM via console
+    ```
+    $ telnet 127.0.0.1 7000
+    ```
+
+    OR
+
+    2. Connect SONiC VM via SSH
+
+        1. Connect via console (see 3.1 above)
+
+        2. Request a new DHCP address
+        ```
+        sudo dhclient -v
+        ```
+
+        3. Connect via SSH
+        ```
+        $ ssh -p 3040 [email protected]
+        ```