Merge master to v1.0.3-backup

build_debian.sh

@@ -123,6 +123,10 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/arista-
 sudo cp files/initramfs-tools/mke2fs $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/mke2fs
 sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/mke2fs
 
+# Hook into initramfs: rename the management interfaces on arista switches
+sudo cp files/initramfs-tools/arista-net $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/arista-net
+sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/arista-net
+
 ## Hook into initramfs: after partition mount and loop file mount
 ## 1. Prepare layered file system
 ## 2. Bind-mount docker working directory (docker aufs cannot work over aufs rootfs)

device/ingrasys/x86_64-ingrasys_s8810_32q-r0/INGRASYS-S8810-32Q/port_config.ini

@@ -0,0 +1,33 @@
+# name          lanes             alias
+Ethernet0       37,38,39,40
+Ethernet4       33,34,35,36
+Ethernet8       45,46,47,48
+Ethernet12      41,42,43,44      
+Ethernet16      53,54,55,56 
+Ethernet20      49,50,51,52 
+Ethernet24      61,62,63,64 
+Ethernet28      57,58,59,60 
+Ethernet32      69,70,71,72 
+Ethernet36      65,66,67,68 
+Ethernet40      77,78,79,80 
+Ethernet44      73,74,75,76
+Ethernet48      85,86,87,88
+Ethernet52      81,82,83,84
+Ethernet56      93,94,95,96
+Ethernet60      89,90,91,92
+Ethernet64      101,102,103,104
+Ethernet68      97,98,99,100
+Ethernet72      109,110,111,112
+Ethernet76      105,106,107,108
+Ethernet80      117,118,119,120
+Ethernet84      113,114,115,116
+Ethernet88      125,126,127,128
+Ethernet92      121,122,123,124
+Ethernet96      5,6,7,8
+Ethernet100     1,2,3,4
+Ethernet104     13,14,15,16
+Ethernet108     9,10,11,12 
+Ethernet112     21,22,23,24 
+Ethernet116     17,18,19,20
+Ethernet120     29,30,31,32 
+Ethernet124     25,26,27,28 

device/ingrasys/x86_64-ingrasys_s8810_32q-r0/INGRASYS-S8810-32Q/sai.profile

@@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/etc/bcm/td2-s8810-32x40G.config.bcm

device/ingrasys/x86_64-ingrasys_s8810_32q-r0/fancontrol

@@ -0,0 +1,12 @@
+# Configuration file generated by pwmconfig, changes will be lost
+INTERVAL=10
+DEVPATH=hwmon2=devices/pci0000:00/0000:00:1f.3/i2c-0/0-002f
+DEVNAME=hwmon2=w83795adg
+FCTEMPS=hwmon2/device/pwm2=hwmon2/device/temp2_input hwmon2/device/pwm1=hwmon2/device/temp2_input
+#FCFANS=hwmon2/device/pwm2=hwmon2/device/fan8_input+hwmon2/device/fan7_input+hwmon2/device/fan6_input+hwmon2/device/fan5_input hwmon2/device/pwm1=hwmon2/device/fan4_input+hwmon2/device/fan3_input+hwmon2/device/fan2_input+hwmon2/device/fan1_input
+FCFANS=hwmon2/device/pwm2=hwmon2/device/fan8_input hwmon2/device/pwm2=hwmon2/device/fan7_input hwmon2/device/pwm2=hwmon2/device/fan6_input hwmon2/device/pwm2=hwmon2/device/fan5_input hwmon2/device/pwm1=hwmon2/device/fan4_input hwmon2/device/pwm1=hwmon2/device/fan3_input hwmon2/device/pwm1=hwmon2/device/fan2_input hwmon2/device/pwm1=hwmon2/device/fan1_input
+MINTEMP=hwmon2/device/pwm2=20 hwmon2/device/pwm1=20
+MAXTEMP=hwmon2/device/pwm2=60 hwmon2/device/pwm1=60
+MINSTART=hwmon2/device/pwm2=75 hwmon2/device/pwm1=75
+MINSTOP=hwmon2/device/pwm2=22 hwmon2/device/pwm1=22
+

device/ingrasys/x86_64-ingrasys_s8810_32q-r0/installer.conf

@@ -0,0 +1,3 @@
+CONSOLE_PORT=0x2f8
+CONSOLE_DEV=1
+CONSOLE_SPEED=115200

device/ingrasys/x86_64-ingrasys_s8810_32q-r0/led_proc_init.soc

@@ -0,0 +1,45 @@
+#processor initialization for Ingrasys S8810-32Q
+
+led 0 stop
+led 0 prog  12 00 61 F1 12 10 61 F2 12 04 61 F3 12 04 61 F4 67 16 86 F0 77 74 96 F2 2E F1 67 2B 67 3F 16 F3 FE F1 61 F1 12 00 DE F2 74 16 57 2E F1 32 00 32 01 B7 97 75 3A 02 01 60 FE 57 02 00 60 FE 57 2E F1 32 08 97 75 58 77 48 06 FE D2 01 70 50 77 66 06 F0 C2 08 74 58 77 66 16 F4 91 22 0E 87 22 0E 87 DA 00 74 5A 57 16 F4 91 22 0E 87 22 0F 87 DA 00 74 68 57 02 80 38 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_0_3   REMAP_PORT_3=48  REMAP_PORT_2=49  REMAP_PORT_1=50  REMAP_PORT_0=51
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_4_7   REMAP_PORT_7=52  REMAP_PORT_6=53  REMAP_PORT_5=54  REMAP_PORT_4=55
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_8_11  REMAP_PORT_11=56 REMAP_PORT_10=57 REMAP_PORT_9=58  REMAP_PORT_8=59
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_12_15 REMAP_PORT_15=60 REMAP_PORT_14=61 REMAP_PORT_13=62 REMAP_PORT_12=63
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_16_19 REMAP_PORT_19=44 REMAP_PORT_18=45 REMAP_PORT_17=46 REMAP_PORT_16=47
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_20_23 REMAP_PORT_23=40  REMAP_PORT_22=41  REMAP_PORT_21=42 REMAP_PORT_20=43
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_24_27 REMAP_PORT_27=36  REMAP_PORT_26=37  REMAP_PORT_25=38  REMAP_PORT_24=39
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_28_31 REMAP_PORT_31=32  REMAP_PORT_30=33  REMAP_PORT_29=34  REMAP_PORT_28=35
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_32_35 REMAP_PORT_35=16 REMAP_PORT_34=17 REMAP_PORT_33=18 REMAP_PORT_32=19
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_36_39 REMAP_PORT_39=20 REMAP_PORT_38=21 REMAP_PORT_37=22 REMAP_PORT_36=23
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_40_43 REMAP_PORT_43=24 REMAP_PORT_42=25 REMAP_PORT_41=26 REMAP_PORT_40=27
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_44_47 REMAP_PORT_47=28 REMAP_PORT_46=29 REMAP_PORT_45=30 REMAP_PORT_44=31
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_48_51 REMAP_PORT_51=12 REMAP_PORT_50=13 REMAP_PORT_49=14 REMAP_PORT_48=15
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_52_55 REMAP_PORT_55=8 REMAP_PORT_54=9 REMAP_PORT_53=10 REMAP_PORT_52=11
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_56_59 REMAP_PORT_59=4 REMAP_PORT_58=5 REMAP_PORT_57=6 REMAP_PORT_56=7
+modreg CMIC_LEDUP0_PORT_ORDER_REMAP_60_63 REMAP_PORT_63=0 REMAP_PORT_62=1 REMAP_PORT_61=2 REMAP_PORT_60=3
+
+led 0 auto on
+led 0 start
+
+led 1 stop
+led 1 prog  12 00 61 F1 12 10 61 F2 12 04 61 F3 12 04 61 F4 67 16 86 F0 77 74 96 F2 2E F1 67 2B 67 3F 16 F3 FE F1 61 F1 12 00 DE F2 74 16 57 2E F1 32 00 32 01 B7 97 75 3A 02 01 60 FE 57 02 00 60 FE 57 2E F1 32 08 97 75 58 77 48 06 FE D2 01 70 50 77 66 06 F0 C2 08 74 58 77 66 16 F4 91 22 0E 87 22 0E 87 DA 00 74 5A 57 16 F4 91 22 0E 87 22 0F 87 DA 00 74 68 57 02 80 38 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_0_3   REMAP_PORT_3=48  REMAP_PORT_2=49  REMAP_PORT_1=50  REMAP_PORT_0=51
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_4_7   REMAP_PORT_7=52  REMAP_PORT_6=53  REMAP_PORT_5=54  REMAP_PORT_4=55
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_8_11  REMAP_PORT_11=56 REMAP_PORT_10=57 REMAP_PORT_9=58  REMAP_PORT_8=59
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_12_15 REMAP_PORT_15=60 REMAP_PORT_14=61 REMAP_PORT_13=62 REMAP_PORT_12=63
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_16_19 REMAP_PORT_19=44 REMAP_PORT_18=45 REMAP_PORT_17=46 REMAP_PORT_16=47
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_20_23 REMAP_PORT_23=40  REMAP_PORT_22=41  REMAP_PORT_21=42 REMAP_PORT_20=43
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_24_27 REMAP_PORT_27=36  REMAP_PORT_26=37  REMAP_PORT_25=38  REMAP_PORT_24=39
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_28_31 REMAP_PORT_31=32  REMAP_PORT_30=33  REMAP_PORT_29=34  REMAP_PORT_28=35
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_32_35 REMAP_PORT_35=16 REMAP_PORT_34=17 REMAP_PORT_33=18 REMAP_PORT_32=19
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_36_39 REMAP_PORT_39=20 REMAP_PORT_38=21 REMAP_PORT_37=22 REMAP_PORT_36=23
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_40_43 REMAP_PORT_43=24 REMAP_PORT_42=25 REMAP_PORT_41=26 REMAP_PORT_40=27
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_44_47 REMAP_PORT_47=28 REMAP_PORT_46=29 REMAP_PORT_45=30 REMAP_PORT_44=31
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_48_51 REMAP_PORT_51=12 REMAP_PORT_50=13 REMAP_PORT_49=14 REMAP_PORT_48=15
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_52_55 REMAP_PORT_55=8 REMAP_PORT_54=9 REMAP_PORT_53=10 REMAP_PORT_52=11
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_56_59 REMAP_PORT_59=4 REMAP_PORT_58=5 REMAP_PORT_57=6 REMAP_PORT_56=7
+modreg CMIC_LEDUP1_PORT_ORDER_REMAP_60_63 REMAP_PORT_63=0 REMAP_PORT_62=1 REMAP_PORT_61=2 REMAP_PORT_60=3
+
+led 1 auto on
+led 1 start

device/ingrasys/x86_64-ingrasys_s8810_32q-r0/minigraph.xml

@@ -0,0 +1,121 @@
+<DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <CpgDec>
+    <IsisRouters xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    <PeeringSessions>
+      <BGPSession>
+        <StartRouter>OCPSCH0104001MS</StartRouter>
+        <StartPeer>10.10.1.30</StartPeer>
+        <EndRouter>OCPSCH01040HHLF</EndRouter>
+        <EndPeer>10.10.1.29</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+      <BGPSession>
+        <StartRouter>OCPSCH0104002MS</StartRouter>
+        <StartPeer>10.10.2.30</StartPeer>
+        <EndRouter>OCPSCH01040HHLF</EndRouter>
+        <EndPeer>10.10.2.29</EndPeer>
+        <Multihop>1</Multihop>
+        <HoldTime>10</HoldTime>
+        <KeepAliveTime>3</KeepAliveTime>
+      </BGPSession>
+    </PeeringSessions>
+    <Routers xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      <a:BGPRouterDeclaration>
+        <a:ASN>64536</a:ASN>
+        <a:Hostname>OCPSCH01040HHLF</a:Hostname>
+        <a:Peers>
+          <BGPPeer>
+            <Address>10.10.1.30</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+          </BGPPeer>
+          <BGPPeer>
+            <Address>10.10.2.30</Address>
+            <RouteMapIn i:nil="true"/>
+            <RouteMapOut i:nil="true"/>
+          </BGPPeer>
+        </a:Peers>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64542</a:ASN>
+        <a:Hostname>OCPSCH0104001MS</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+      <a:BGPRouterDeclaration>
+        <a:ASN>64543</a:ASN>
+        <a:Hostname>OCPSCH0104002MS</a:Hostname>
+        <a:RouteMaps/>
+      </a:BGPRouterDeclaration>
+    </Routers>
+  </CpgDec>
+  <DpgDec>
+    <DeviceDataPlaneInfo>
+      <IPSecTunnels/>
+      <LoopbackIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+        <a:LoopbackIPInterface>
+          <Name>HostIP</Name>
+          <AttachTo>Loopback0</AttachTo>
+          <a:Prefix xmlns:b="Microsoft.Search.Autopilot.NetMux">
+            <b:IPPrefix>100.0.0.10/32</b:IPPrefix>
+          </a:Prefix>
+          <a:PrefixStr>100.0.0.10/32</a:PrefixStr>
+        </a:LoopbackIPInterface>
+      </LoopbackIPInterfaces>
+      <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">
+      </ManagementIPInterfaces>
+      <MplsInterfaces/>
+      <MplsTeInterfaces/>
+      <RsvpInterfaces/>
+      <Hostname>OCPSCH01040HHLF</Hostname>
+      <PortChannelInterfaces/>
+      <VlanInterfaces/>
+      <IPInterfaces>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet48</AttachTo>
+          <Prefix>10.10.1.29/30</Prefix>
+        </IPInterface>
+        <IPInterface>
+          <Name i:nil="true"/>
+          <AttachTo>Ethernet52</AttachTo>
+          <Prefix>10.10.2.29/30</Prefix>
+        </IPInterface>
+      </IPInterfaces>
+      <DataAcls/>
+      <AclInterfaces/>
+      <DownstreamSummaries/>
+      <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
+    </DeviceDataPlaneInfo>
+  </DpgDec>
+  <PngDec>
+    <DeviceInterfaceLinks>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <Bandwidth>40000</Bandwidth>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>OCPSCH0104001MS</EndDevice>
+        <EndPort>Ethernet48</EndPort>
+        <StartDevice>OCPSCH01040HHLF</StartDevice>
+        <StartPort>Ethernet48</StartPort>
+      </DeviceLinkBase>
+      <DeviceLinkBase i:type="DeviceInterfaceLink">
+        <Bandwidth>40000</Bandwidth>
+        <ElementType>DeviceInterfaceLink</ElementType>
+        <EndDevice>OCPSCH8810MS</EndDevice>
+        <EndPort>Ethernet0</EndPort>
+        <StartDevice>OCPSCH01040HHLF</StartDevice>
+        <StartPort>Ethernet52</StartPort>
+      </DeviceLinkBase>
+    </DeviceInterfaceLinks>
+    <Devices>
+      <Device i:type="LeafRouter">
+        <Hostname>OCPSCH8810HHLF</Hostname>
+        <HwSku>INGRASYS-S8810-32Q</HwSku>
+      </Device>
+    </Devices>
+  </PngDec>
+  <Hostname>OCPSCH01040HHLF</Hostname>
+  <HwSku>INGRASYS-S8810-32Q</HwSku>
+</DeviceMiniGraph>

device/ingrasys/x86_64-ingrasys_s8810_32q-r0/plugins/eeprom.py

@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Ingrasys S8810-32Q
+#
+# Platform and model specific eeprom subclass, inherits from the base class,
+# and provides the followings:
+# - the eeprom format definition
+# - specific encoder/decoder if there is special need
+#############################################################################
+
+try:
+    from sonic_eeprom import eeprom_tlvinfo
+except ImportError, e:
+    raise ImportError (str(e) + "- required module not found")
+
+
+class board(eeprom_tlvinfo.TlvInfoDecoder):
+
+    def __init__(self, name, path, cpld_root, ro):
+        i2c_bus = "12"
+        i2c_addr = "0056"
+        self.eeprom_path = "/sys/class/i2c-adapter/i2c-" + i2c_bus + "/" + i2c_bus + "-" + i2c_addr + "/eeprom"
+        super(board, self).__init__(self.eeprom_path, 0, '', True)

device/ingrasys/x86_64-ingrasys_s8810_32q-r0/plugins/sfputil.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+
+try:
+    from sonic_sfp.sfputilbase import sfputilbase
+except ImportError, e:
+    raise ImportError (str(e) + "- required module not found")
+
+
+class sfputil(sfputilbase):
+    """Platform specific sfputil class"""
+
+    port_start = 0
+    port_end = 31
+    ports_in_block = 32
+
+    port_to_eeprom_mapping = {}
+    #FIXME
+    port_to_i2c_mapping = {
+        0: 18,
+        1: 19,
+        2: 20,
+        3: 21,
+        4: 22,
+        5: 23,
+        6: 24,
+        7: 25,
+        8: 26,
+        9: 27,
+        10: 28,
+        11: 29,
+        12: 30,
+        13: 31,
+        14: 32,
+        15: 33,
+        16: 34,
+        17: 35,
+        18: 36,
+        19: 37,
+        20: 38,
+        21: 39,
+        22: 40,
+        23: 41,
+        24: 42,
+        25: 43,
+        26: 44,
+        27: 45,
+        28: 46,
+        29: 47,
+        30: 48,
+        31: 49            
+    }
+
+    _qsfp_ports = range(0, ports_in_block + 1)
+
+    def __init__(self, port_num):
+        # Override port_to_eeprom_mapping for class initialization
+        eeprom_path = '/sys/class/i2c-adapter/i2c-{0}/{0}-0050/eeprom'
+        for x in range(self.port_start, self.port_end + 1):
+            port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x])
+            self.port_to_eeprom_mapping[x] = port_eeprom_path
+        sfputilbase.__init__(self, port_num)

device/ingrasys/x86_64-ingrasys_s8810_32q-r0/sensors.conf

@@ -0,0 +1,47 @@
+# libsensors configuration file
+chip "i350bb-*"
+    ignore loc1
+
+chip "jc42-*"
+    label temp1 "DIMM Temp"
+    set temp1_max 50
+    set temp1_crit 85
+
+chip "w83795adg-*"
+    label in0 "ROV"
+    set in0_min 1 * 0.97
+    set in0_max 1 * 1.033
+    ignore in1 
+    ignore in2 
+    label in3 "1.0V"
+    set in3_min 1 * 0.97
+    set in3_max 1 * 1.03
+    label in4 "1.8V"
+    set in4_min 1.8 * 0.95
+    set in4_max 1.8 * 1.05
+    ignore in5
+    label in6 "5.0V"
+    compute in6 (4)*@, @/(4)
+    set in6_min 5 * 0.95
+    set in6_max 5 * 1.05
+    ignore in7
+    label in12 "3.3V"
+    compute in6 (2)*@, @/(2)
+    set in12_min 3.3 * 0.97
+    set in12_max 3.3 * 1.03
+    ignore in14
+    ignore in15
+    ignore in16
+    label fan1 "FANTRAY 1-A"
+    label fan2 "FANTRAY 1-B"
+    label fan3 "FANTRAY 2-A"
+    label fan4 "FANTRAY 2-B"
+    label fan5 "FANTRAY 3-A"
+    label fan6 "FANTRAY 3-B"
+    label fan7 "FANTRAY 4-A"
+    label fan8 "FANTRAY 4-B"
+    label temp1 "MAC Temp"
+    label temp2 "SFP+ Port 1 Temp"
+    label temp3 "SFP+ Port 8 Temp"
+    ignore temp4
+    ignore intrusion0

dockers/docker-fpm-frr/bgpd.conf.j2

@@ -21,6 +21,7 @@ log facility local4
 router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
   bgp log-neighbor-changes
   bgp bestpath as-path multipath-relax
+  no bgp default ipv4-unicast
 {# TODO: use lo[0] for backward compatibility, will revisit the case with multiple lo interfaces #}
   bgp router-id {{ minigraph_lo_interfaces[0]['addr'] }}
 {# advertise loopback #}
@@ -53,6 +54,12 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
 {% if minigraph_devices[inventory_hostname]['type'] == 'ToRRouter' %}
   neighbor {{ neighbor_addr }} allowas-in 1
 {% endif %}
+{% if neighbor_addr | ipv4 %}
+  address-family ipv4
+    neighbor {{ neighbor_addr }} activate
+    maximum-paths 64
+  exit-address-family
+{% endif %}
 {% if neighbor_addr | ipv6 %}
   address-family ipv6
     neighbor {{ neighbor_addr }} activate

dockers/docker-fpm-frr/config.sh

@@ -12,5 +12,10 @@ sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/unisolate
 chown root:root /usr/sbin/bgp-unisolate
 chmod 0755 /usr/sbin/bgp-unisolate
 
+# If there's an integrated-config file, go ahead and remote it
+if [ -f /etc/frr/frr.conf ]; then
+    rm -rf /etc/frr/frr.conf
+fi
+
 mkdir -p /var/sonic
 echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status