Merge pull request #107 from Azure/master

update master branch
pphuchar · Aug 23, 2019 · a65721c · a65721c
2 parents d92d9f8 + 8b674c8
commit a65721c
Show file tree

Hide file tree

Showing 36 changed files with 177 additions and 207 deletions.
diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf
@@ -22,13 +22,13 @@
                     "p4_pipelines": [
                         {
                             "p4_pipeline_name": "pipe",
-                            "config": "share/tofinopd/switch/pipe/tofino.bin",
-                            "context": "share/tofinopd/switch/pipe/context.json"
+                            "config": "share/switch/pipe/tofino.bin",
+                            "context": "share/switch/pipe/context.json"
                         }
                     ],
                     "program-name": "switch",
                     "switchsai": "lib/libswitchsai.so",
-                    "bfrt-config": "share/tofinopd/switch/bf-rt.json",
+                    "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
                     "non_default_port_ppgs": 5

diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf
@@ -22,13 +22,13 @@
                     "p4_pipelines": [
                         {
                             "p4_pipeline_name": "pipe",
-                            "config": "share/tofinopd/switch/pipe/tofino.bin",
-                            "context": "share/tofinopd/switch/pipe/context.json"
+                            "config": "share/switch/pipe/tofino.bin",
+                            "context": "share/switch/pipe/context.json"
                         }
                     ],
                     "program-name": "switch",
                     "switchsai": "lib/libswitchsai.so",
-                    "bfrt-config": "share/tofinopd/switch/bf-rt.json",
+                    "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
                     "non_default_port_ppgs": 5

diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf
@@ -23,13 +23,13 @@
                     "p4_pipelines": [
                         {
                             "p4_pipeline_name": "pipe",
-                            "config": "share/tofinopd/switch/pipe/tofino.bin",
-                            "context": "share/tofinopd/switch/pipe/context.json"
+                            "config": "share/switch/pipe/tofino.bin",
+                            "context": "share/switch/pipe/context.json"
                         }
                     ],
                     "program-name": "switch",
                     "switchsai": "lib/libswitchsai.so",
-                    "bfrt-config": "share/tofinopd/switch/bf-rt.json",
+                    "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
                     "non_default_port_ppgs": 5

diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf
@@ -23,13 +23,13 @@
                     "p4_pipelines": [
                         {
                             "p4_pipeline_name": "pipe",
-                            "config": "share/tofinopd/switch/pipe/tofino.bin",
-                            "context": "share/tofinopd/switch/pipe/context.json"
+                            "config": "share/switch/pipe/tofino.bin",
+                            "context": "share/switch/pipe/context.json"
                         }
                     ],
                     "program-name": "switch",
                     "switchsai": "lib/libswitchsai.so",
-                    "bfrt-config": "share/tofinopd/switch/bf-rt.json",
+                    "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
                     "non_default_port_ppgs": 5

diff --git a/device/ingrasys/x86_64-ingrasys_s9180_32x-r0/INGRASYS-S9180-32X/switch-tna-sai.conf b/device/ingrasys/x86_64-ingrasys_s9180_32x-r0/INGRASYS-S9180-32X/switch-tna-sai.conf
@@ -23,13 +23,13 @@
                     "p4_pipelines": [
                         {
                             "p4_pipeline_name": "pipe",
-                            "config": "share/tofinopd/switch/pipe/tofino.bin",
-                            "context": "share/tofinopd/switch/pipe/context.json"
+                            "config": "share/switch/pipe/tofino.bin",
+                            "context": "share/switch/pipe/context.json"
                         }
                     ],
                     "program-name": "switch",
                     "switchsai": "lib/libswitchsai.so",
-                    "bfrt-config": "share/tofinopd/switch/bf-rt.json",
+                    "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
                     "non_default_port_ppgs": 5

diff --git a/device/ingrasys/x86_64-ingrasys_s9280_64x-r0/INGRASYS-S9280-64X/switch-tna-sai.conf b/device/ingrasys/x86_64-ingrasys_s9280_64x-r0/INGRASYS-S9280-64X/switch-tna-sai.conf
@@ -23,13 +23,13 @@
                     "p4_pipelines": [
                         {
                             "p4_pipeline_name": "pipe",
-                            "config": "share/tofinopd/switch/pipe/tofino.bin",
-                            "context": "share/tofinopd/switch/pipe/context.json"
+                            "config": "share/switch/pipe/tofino.bin",
+                            "context": "share/switch/pipe/context.json"
                         }
                     ],
                     "program-name": "switch",
                     "switchsai": "lib/libswitchsai.so",
-                    "bfrt-config": "share/tofinopd/switch/bf-rt.json",
+                    "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
                     "non_default_port_ppgs": 5

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn2700-r0/platform_reboot
@@ -4,6 +4,7 @@ declare -r EXIT_SUCCESS="0"
 declare -r EXIT_ERROR="1"
 
 declare -r FW_UPGRADE_SCRIPT="/usr/bin/mlnx-fw-upgrade.sh"
+declare -r SYSFS_PWR_CYCLE="/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pwr_cycle"
 
 FORCE_REBOOT="no"
 
@@ -20,7 +21,7 @@ function ParseArguments() {
 
 ParseArguments "$@"
 
-${FW_UPGRADE_SCRIPT} --upgrade
+${FW_UPGRADE_SCRIPT} --upgrade --verbose
 EXIT_CODE="$?"
 if [[ "${EXIT_CODE}" != "${EXIT_SUCCESS}" ]]; then
     echo "Failed to burn MLNX FW: errno=${EXIT_CODE}"
@@ -31,4 +32,7 @@ if [[ "${EXIT_CODE}" != "${EXIT_SUCCESS}" ]]; then
     fi
 fi
 
-exec /sbin/reboot $@
+# perform "hardware" reboot
+echo 1 > $SYSFS_PWR_CYCLE
+sleep 3
+echo 0 > $SYSFS_PWR_CYCLE
diff --git a/device/mellanox/x86_64-mlnx_msn2700_simx-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn2700_simx-r0/platform_reboot
diff --git a/device/mellanox/x86_64-mlnx_msn2700_simx-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn2700_simx-r0/platform_reboot
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+declare -r EXIT_SUCCESS="0"
+declare -r EXIT_ERROR="1"
+
+FORCE_REBOOT="no"
+
+function ParseArguments() {
+    while [ $# -ge 1 ]; do
+        case "$1" in
+            -f|--force)
+                FORCE_REBOOT="yes"
+            ;;
+        esac
+        shift
+    done
+}
+
+ParseArguments "$@"
+
+exec /sbin/reboot $@
diff --git a/device/mellanox/x86_64-mlnx_msn3700_simx-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn3700_simx-r0/platform_reboot
@@ -1 +1 @@
-../x86_64-mlnx_msn3700-r0/platform_reboot
+../x86_64-mlnx_msn2700_simx-r0/platform_reboot
diff --git a/device/wnc/x86_64-wnc_osw1800-r0/OSW1800-48x6q/switch-tna-sai.conf b/device/wnc/x86_64-wnc_osw1800-r0/OSW1800-48x6q/switch-tna-sai.conf
@@ -23,13 +23,13 @@
                     "p4_pipelines": [
                         {
                             "p4_pipeline_name": "pipe",
-                            "config": "share/tofinopd/switch/pipe/tofino.bin",
-                            "context": "share/tofinopd/switch/pipe/context.json"
+                            "config": "share/switch/pipe/tofino.bin",
+                            "context": "share/switch/pipe/context.json"
                         }
                     ],
                     "program-name": "switch",
                     "switchsai": "lib/libswitchsai.so",
-                    "bfrt-config": "share/tofinopd/switch/bf-rt.json",
+                    "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
                     "non_default_port_ppgs": 5

diff --git a/dockers/docker-fpm-frr/start.sh b/dockers/docker-fpm-frr/start.sh
@@ -7,12 +7,13 @@ CONFIG_TYPE=`sonic-cfggen -d -v 'DEVICE_METADATA["localhost"]["docker_routing_co
 if [ -z "$CONFIG_TYPE" ] || [ "$CONFIG_TYPE" == "separated" ]; then
     sonic-cfggen -d -y /etc/sonic/deployment_id_asn_map.yml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/frr/bgpd.conf
     sonic-cfggen -d -t /usr/share/sonic/templates/zebra.conf.j2 > /etc/frr/zebra.conf
+    sonic-cfggen -d -t /usr/share/sonic/templates/staticd.conf.j2 > /etc/frr/staticd.conf
     echo "no service integrated-vtysh-config" > /etc/frr/vtysh.conf
     rm -f /etc/frr/frr.conf
 elif [ "$CONFIG_TYPE" == "unified" ]; then
     sonic-cfggen -d -y /etc/sonic/deployment_id_asn_map.yml -t /usr/share/sonic/templates/frr.conf.j2 >/etc/frr/frr.conf
     echo "service integrated-vtysh-config" > /etc/frr/vtysh.conf
-    rm -f /etc/frr/bgpd.conf /etc/frr/zebra.conf
+    rm -f /etc/frr/bgpd.conf /etc/frr/zebra.conf /etc/frr/staticd.conf
 fi
 
 sonic-cfggen -d -t /usr/share/sonic/templates/isolate.j2 > /usr/sbin/bgp-isolate

diff --git a/dockers/docker-fpm-frr/staticd.conf.j2 b/dockers/docker-fpm-frr/staticd.conf.j2
@@ -0,0 +1,29 @@
+!
+{% block banner %}
+! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
+! generated by templates/frr/staticd.conf.j2 using config DB data
+! file: staticd.conf
+!
+{% endblock banner %}
+!
+{% block sys_init %}
+hostname {{ DEVICE_METADATA['localhost']['hostname'] }}
+password zebra
+enable password zebra
+{% endblock sys_init %}
+!
+{% block default_route %}
+! set static default route to mgmt gateway as a backup to learned default
+{% for (name, prefix) in MGMT_INTERFACE|pfx_filter %}
+{% if prefix | ipv4 %}
+ip route 0.0.0.0/0 {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} 200
+{% endif %}
+{% endfor %}
+{% endblock default_route %}
+!
+{% block logging %}
+log syslog informational
+log facility local4
+{% endblock logging %}
+!
+
diff --git a/dockers/docker-fpm-frr/zebra.conf.j2 b/dockers/docker-fpm-frr/zebra.conf.j2
@@ -36,15 +36,6 @@ link-detect
 {% endfor %}
 {% endblock interfaces %}
 !
-{% block default_route %}
-! set static default route to mgmt gateway as a backup to learned default
-{% for (name, prefix) in MGMT_INTERFACE|pfx_filter %}
-{% if prefix | ipv4 %}
-ip route 0.0.0.0/0 {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} 200
-{% endif %}
-{% endfor %}
-{% endblock default_route %}
-!
 {% block source_loopback %}
 {% set lo_ipv4_addrs = [] %}
 {% set lo_ipv6_addrs = [] %}

diff --git a/files/build_templates/radv.service.j2 b/files/build_templates/radv.service.j2
@@ -1,6 +1,6 @@
 [Unit]
 Description=Router advertiser container
-Requires=updategraph.service swss.service
+Requires=updategraph.service
 After=updategraph.service swss.service
 Before=ntp-config.service
 
@@ -11,4 +11,4 @@ ExecStart=/usr/bin/{{ docker_container_name }}.sh wait
 ExecStop=/usr/bin/{{ docker_container_name }}.sh stop
 
 [Install]
-WantedBy=multi-user.target swss.service
+WantedBy=multi-user.target
diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
@@ -2,7 +2,7 @@
 
 SERVICE="swss"
 PEER="syncd"
-DEPENDENT="teamd"
+DEPENDENT="teamd radv"
 DEBUGLOG="/tmp/swss-syncd-debug.log"
 LOCKFILE="/tmp/swss-syncd-lock"
 

diff --git a/files/scripts/syncd.sh b/files/scripts/syncd.sh
@@ -64,7 +64,7 @@ function getBootType()
         TYPE='fastfast'
         ;;
     *SONIC_BOOT_TYPE=fast*|*fast-reboot*)
-        TYPE='fast'
+        TYPE=$(awk '{ if ($1 <= 180) print "fast"; else print "cold" }' /proc/uptime)
         ;;
     *)
         TYPE='cold'

diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk
@@ -1,5 +1,5 @@
-BFN_PLATFORM = bfnplatform_8_9_1.x.ab1e16f.deb
-$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/rel_8_9_1/bfnplatform_8_9_1.x.ab1e16f.deb"
+BFN_PLATFORM = bfnplatform_9.0.0.cc6ccbe_pr_deb9.deb
+$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/rel_9_0/bfnplatform_9.0.0.cc6ccbe_pr_deb9.deb"
 
-SONIC_ONLINE_DEBS += $(BFN_PLATFORM) # $(BFN_SAI_DEV)
+SONIC_ONLINE_DEBS += $(BFN_PLATFORM)
 $(BFN_SAI_DEV)_DEPENDS += $(BFN_PLATFORM)
diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk
@@ -1,5 +1,5 @@
-BFN_SAI = bfnsdk_8_9_1.x.ab1e16f.deb
-$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/rel_8_9_1/bfnsdk_8_9_1.x.ab1e16f.deb"
+BFN_SAI = bfnsdk_9.0.0.cc6ccbe_pr_deb9.deb
+$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/rel_9_0/bfnsdk_9.0.0.cc6ccbe_pr_deb9.deb"
 
-SONIC_ONLINE_DEBS += $(BFN_SAI) # $(BFN_SAI_DEV)
+SONIC_ONLINE_DEBS += $(BFN_SAI)
 $(BFN_SAI_DEV)_DEPENDS += $(BFN_SAI)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../x86_64-mlnx_msn3700-r0/platform_reboot
		../x86_64-mlnx_msn2700_simx-r0/platform_reboot