-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[DPB]Removing default admin status initialization in DPB flow while l…
…oading minigraph (#8711) To Fix #8697 . The config load_minigraph initializes 'admin_status' to up when platform.json has DPB configs. This doesn't happen when using port_config.ini The update minigraph has logic to initialize only the ports whose neighbors are defined or those belonging to portchannel However, a change was introduced to have default admin status to be 'up' in portconfig.py when the minigraph was using platform.json This will lead to sanity check failure in sonic-mgmt and thus no test cases could be run
- Loading branch information
1 parent
e3cfc44
commit d8841cb
Showing
5 changed files
with
133 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 118 additions & 0 deletions
118
src/sonic-config-engine/tests/platform-sample-graph.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| <DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"> | ||
| <CpgDec/> | ||
| <DpgDec> | ||
| <DeviceDataPlaneInfo> | ||
| <IPSecTunnels/> | ||
| <LoopbackIPInterfaces/> | ||
| <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/> | ||
| <ManagementVIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/> | ||
| <MplsInterfaces/> | ||
| <MplsTeInterfaces/> | ||
| <RsvpInterfaces/> | ||
| <Hostname>switch-t0</Hostname> | ||
| <PortChannelInterfaces> | ||
| <PortChannel> | ||
| <Name>PortChannel01</Name> | ||
| <AttachTo>Ethernet20</AttachTo> | ||
| <SubInterface/> | ||
| </PortChannel> | ||
| <PortChannel> | ||
| <Name>PortChannel1001</Name> | ||
| <AttachTo>Ethernet4;Ethernet6</AttachTo> | ||
| <SubInterface/> | ||
| </PortChannel> | ||
| </PortChannelInterfaces> | ||
| <VlanInterfaces/> | ||
| <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"> | ||
| <ElementType>DeviceInterfaceLink</ElementType> | ||
| <Bandwidth>100000</Bandwidth> | ||
| <EndDevice>ARISTA01T1</EndDevice> | ||
| <EndPort>et1</EndPort> | ||
| <FlowControl>true</FlowControl> | ||
| <StartDevice>switch-t0</StartDevice> | ||
| <StartPort>Ethernet0</StartPort> | ||
| <Validate>true</Validate> | ||
| </DeviceLinkBase> | ||
| </DeviceInterfaceLinks> | ||
| <Devices> | ||
| <Device i:type="ToRRouter"> | ||
| <Hostname>switch-t0</Hostname> | ||
| <HwSku>Force10-S6000</HwSku> | ||
| <ClusterName>AAA00PrdStr00</ClusterName> | ||
| </Device> | ||
| <Device i:type="LeafRouter"> | ||
| <Hostname>ARISTA01T1</Hostname> | ||
| <HwSku>Arista</HwSku> | ||
| </Device> | ||
| </Devices> | ||
| </PngDec> | ||
| <DeviceInfos> | ||
| <DeviceInfo> | ||
| <EthernetInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"> | ||
| <a:EthernetInterface> | ||
| <ElementType>DeviceInterface</ElementType> | ||
| <AlternateSpeeds i:nil="true"/> | ||
| <EnableFlowControl>true</EnableFlowControl> | ||
| <Index>1</Index> | ||
| <InterfaceName>Ethernet0</InterfaceName> | ||
| <InterfaceType i:nil="true"/> | ||
| <MultiPortsInterface>false</MultiPortsInterface> | ||
| <PortName>0</PortName> | ||
| <Priority>0</Priority> | ||
| <Speed>100000</Speed> | ||
| </a:EthernetInterface> | ||
| <a:EthernetInterface> | ||
| <ElementType>DeviceInterface</ElementType> | ||
| <AlternateSpeeds i:nil="true"/> | ||
| <EnableFlowControl>true</EnableFlowControl> | ||
| <Index>1</Index> | ||
| <InterfaceName>Ethernet4</InterfaceName> | ||
| <InterfaceType i:nil="true"/> | ||
| <MultiPortsInterface>false</MultiPortsInterface> | ||
| <PortName>0</PortName> | ||
| <Priority>0</Priority> | ||
| <Speed>50000</Speed> | ||
| </a:EthernetInterface> | ||
| <a:EthernetInterface> | ||
| <ElementType>DeviceInterface</ElementType> | ||
| <AlternateSpeeds i:nil="true"/> | ||
| <EnableFlowControl>true</EnableFlowControl> | ||
| <Index>1</Index> | ||
| <InterfaceName>Ethernet6</InterfaceName> | ||
| <InterfaceType i:nil="true"/> | ||
| <MultiPortsInterface>false</MultiPortsInterface> | ||
| <PortName>0</PortName> | ||
| <Priority>0</Priority> | ||
| <Speed>50000</Speed> | ||
| </a:EthernetInterface> | ||
| <a:EthernetInterface> | ||
| <ElementType>DeviceInterface</ElementType> | ||
| <AlternateSpeeds i:nil="true"/> | ||
| <EnableFlowControl>true</EnableFlowControl> | ||
| <Index>1</Index> | ||
| <InterfaceName>Ethernet20</InterfaceName> | ||
| <InterfaceType i:nil="true"/> | ||
| <MultiPortsInterface>false</MultiPortsInterface> | ||
| <PortName>0</PortName> | ||
| <Priority>0</Priority> | ||
| <Speed>100000</Speed> | ||
| </a:EthernetInterface> | ||
| </EthernetInterfaces> | ||
| <FlowControl>true</FlowControl> | ||
| <Height>0</Height> | ||
| <HwSku>Force10-S6000</HwSku> | ||
| <ManagementInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/> | ||
| </DeviceInfo> | ||
| </DeviceInfos> | ||
| <Hostname>switch-t0</Hostname> | ||
| <HwSku>Force10-S6000</HwSku> | ||
| </DeviceMiniGraph> |
Oops, something went wrong.