Additions to vs docker to support teamd, bgp and configuring interfaces.

files/scripts/configdb-load.sh

@@ -10,4 +10,8 @@ if [ -r /etc/sonic/config_db.json ]; then
     sonic-cfggen -j /etc/sonic/config_db.json --write-to-db
 fi
 
+if [ -r /etc/sonic/minigraph.xml ]; then
+   sonic-cfggen -m -H --write-to-db
+fi
+
 redis-cli -n 4 SET "CONFIG_DB_INITIALIZED" "1"

platform/vs/docker-sonic-vs/Dockerfile.j2

@@ -82,6 +82,13 @@ COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["files/configdb-load.sh", "/usr/bin/"]
 COPY ["files/arp_update", "/usr/bin"]
 
+COPY ["files/image_config/interfaces/interfaces.j2", "/usr/share/sonic/templates/"]
+COPY ["files/image_config/asn/deployment_id_asn_map.yml", "/etc/sonic/"]
+COPY ["../../../dockers/docker-teamd/teamd.sh", "/usr/bin/"]
+COPY ["../../../dockers/docker-teamd/teamd.j2", "/usr/share/sonic/templates/"]
+COPY ["../../../dockers/docker-fpm-quagga/bgpcfgd", "/usr/bin/"]
+COPY ["../../../dockers/docker-fpm-quagga/*.j2", "/usr/share/sonic/templates/"]
+
 RUN echo "docker-sonic-vs" > /etc/hostname
 RUN touch /etc/quagga/zebra.conf
 

platform/vs/docker-sonic-vs/start.sh

@@ -1,5 +1,13 @@
 #!/bin/bash -e
 
+# Set correct platform string
+
+HWSKU=$(sonic-cfggen -m -v DEVICE_METADATA.localhost.hwsku)
+platform=$(find /usr/share/sonic/device -name $HWSKU | sed 's/.*\(x86.*\)\/.*/\1/')
+
+mkdir -p /host
+echo "onie_platform=$platform" > /host/machine.conf
+
 # generate configuration
 
 [ -d /etc/sonic ] || mkdir -p /etc/sonic
@@ -28,6 +36,17 @@ supervisorctl start redis-server
 
 /usr/bin/configdb-load.sh
 
+# from interfaces-config.sh
+# not adding usb0 interface for bfn platform
+# to add support for ipv6
+sysctl -w net.ipv6.conf.all.disable_ipv6=0
+ifdown --force eth0
+sonic-cfggen -d -t /usr/share/sonic/templates/interfaces.j2 > /etc/network/interfaces
+[ -f /var/run/dhclient.eth0.pid ] && kill `cat /var/run/dhclient.eth0.pid` && rm -f /var/run/dhclient.eth0.pid
+service networking restart
+ifdown lo && ifup lo
+#
+
 supervisorctl start syncd
 
 supervisorctl start orchagent
@@ -40,13 +59,15 @@ supervisorctl start neighsyncd
 
 supervisorctl start teamsyncd
 
-supervisorctl start fpmsyncd
+# started by quagga below
+# supervisorctl start fpmsyncd
 
 supervisorctl start intfmgrd
 
 supervisorctl start vlanmgrd
 
-supervisorctl start zebra
+# started by quagga below
+# supervisorctl start zebra
 
 supervisorctl start buffermgrd
 
@@ -55,3 +76,78 @@ VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
 if [ "$VLAN" != "" ]; then
     supervisorctl start arp_update
 fi
+
+
+# from teamd start.sh
+
+TEAMD_CONF_PATH=/etc/teamd
+
+rm -rf $TEAMD_CONF_PATH
+mkdir -p $TEAMD_CONF_PATH
+
+SONIC_ASIC_TYPE=$(sonic-cfggen -y /etc/sonic/sonic_version.yml -v asic_type)
+
+if [ "$SONIC_ASIC_TYPE" == "mellanox" ]; then
+    MAC_ADDRESS=$(sonic-cfggen -d -v DEVICE_METADATA.localhost.mac)
+else
+    MAC_ADDRESS=$(ip link show eth0 | grep ether | awk '{print $2}')
+fi
+
+# Align last byte
+if [ "$SONIC_ASIC_TYPE" == "mellanox" -o "$SONIC_ASIC_TYPE" == "centec" ]; then
+    last_byte=$(python -c "print '$MAC_ADDRESS'[-2:]")
+    aligned_last_byte=$(python -c "print format(int(int('$last_byte', 16) & 0b11000000), '02x')")  # put mask and take away the 0x prefix
+    MAC_ADDRESS=$(python -c "print '$MAC_ADDRESS'[:-2] + '$aligned_last_byte'")                    # put aligned byte into the end of MAC
+fi
+
+for pc in `sonic-cfggen -d -v "PORTCHANNEL.keys() | join(' ') if PORTCHANNEL"`; do
+    sonic-cfggen -d -a '{"pc":"'$pc'","hwaddr":"'$MAC_ADDRESS'"}' -t /usr/share/sonic/templates/teamd.j2 > $TEAMD_CONF_PATH/$pc.conf
+    # bring down all member ports before starting teamd
+    for member in $(sonic-cfggen -d -v "PORTCHANNEL['$pc']['members'] | join(' ')" ); do
+        if [ -L /sys/class/net/$member ]; then
+            ip link set $member down
+        fi
+    done
+done
+
+mkdir -p /var/sonic
+echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status
+
+#rsyslog already included above
+#rm -f /var/run/rsyslogd.pid
+#supervisorctl start rsyslogd
+
+supervisorctl start teamd
+#
+
+# from quagga start.sh
+mkdir -p /etc/quagga
+sonic-cfggen -d -y /etc/sonic/deployment_id_asn_map.yml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/quagga/bgpd.conf
+sonic-cfggen -d -t /usr/share/sonic/templates/zebra.conf.j2 > /etc/quagga/zebra.conf
+
+sonic-cfggen -d -t /usr/share/sonic/templates/isolate.j2 > /usr/sbin/bgp-isolate
+chown root:root /usr/sbin/bgp-isolate
+chmod 0755 /usr/sbin/bgp-isolate
+
+sonic-cfggen -d -t /usr/share/sonic/templates/unisolate.j2 > /usr/sbin/bgp-unisolate
+chown root:root /usr/sbin/bgp-unisolate
+chmod 0755 /usr/sbin/bgp-unisolate
+
+mkdir -p /var/sonic
+echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status
+
+# rm -f /var/run/rsyslogd.pid
+
+supervisorctl start bgpcfgd
+
+# started already
+# supervisorctl start rsyslogd
+
+# Start Quagga processes
+
+supervisorctl start zebra
+
+supervisorctl start bgpd
+
+supervisorctl start fpmsyncd
+

platform/vs/docker-sonic-vs/supervisord.conf

@@ -130,3 +130,20 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
+
+[program:bgpcfgd]
+command=/usr/bin/bgpcfgd
+priority=2
+autostart=false
+autorestart=false
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+
+[program:teamd]
+command=/usr/bin/teamd.sh
+priority=3
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog