-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Port speed #879
Port speed #879
Conversation
Conflicts: platform/mellanox/mlnx-sai.mk
retest this please |
<Speed>1000000</Speed> | ||
</a:EthernetInterface> | ||
</EthernetInterfaces> | ||
</DeviceInfo> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add hwsku in the deviceinfo
<HwSku>Force10-S6000</HwSku>
src/sonic-config-engine/minigraph.py
Outdated
@@ -438,6 +450,8 @@ def parse_xml(filename, platform=None, port_config_file=None): | |||
(u_neighbors, u_devices, _, _, _, _) = parse_png(child, hostname) | |||
elif child.tag == str(QName(ns, "MetadataDeclaration")): | |||
(syslog_servers, dhcp_servers, ntp_servers, mgmt_routes, erspan_dst, deployment_id) = parse_meta(child, hostname) | |||
elif child.tag == str(QName(ns, "DeviceInfos")): | |||
ethernet_interfaces = parse_deviceinfo(child, hostname) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change to parse_deviceinfo(child, hwsku)
src/sonic-config-engine/minigraph.py
Outdated
@@ -323,6 +323,17 @@ def parse_meta(meta, hname): | |||
deployment_id = value | |||
return syslog_servers, dhcp_servers, ntp_servers, mgmt_routes, erspan_dst, deployment_id | |||
|
|||
def parse_deviceinfo(meta, hname): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change hname to hwsku
src/sonic-config-engine/minigraph.py
Outdated
def parse_deviceinfo(meta, hname): | ||
ethernet_interfaces = [] | ||
|
||
device_info = meta.find(str(QName(ns, "DeviceInfo"))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In DeviceInfos, there are many deviceinfo. You need findall deviceinfo. and for each deviceinfo, you need to find the hwsku and only choose the hwsku that is same as hwsku.
<EnableAutoNegotiation>true</EnableAutoNegotiation> | ||
<EnableFlowControl>true</EnableFlowControl> | ||
<Index>1</Index> | ||
<InterfaceName>Ethernet0</InterfaceName> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
-> fortyGigE0/0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as comment
@andriymoroz-mlnx , can you please update the sonic-swss submodule? |
59e17cc
to
d49c045
Compare
merge pending on some other commits. |
[vnetorch]: Use metadata matching for tunnel (sonic-net#841) [aclorch]: Add ICMP type/code match for v4/v6 (sonic-net#868) [restore_neighbors] fix failure with scapy 2.4.2 (sonic-net#862) [intfsorch] Fix bug for VRF existence check (sonic-net#882) Return 0 for CRM counter instead of None if no match (sonic-net#879) Undo skipping Vnet tests, Vrf check before enslaving (sonic-net#857) [Makefile]: Remove header files from source files (sonic-net#883) Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
[vnetorch]: Use metadata matching for tunnel (#841) [aclorch]: Add ICMP type/code match for v4/v6 (#868) [restore_neighbors] fix failure with scapy 2.4.2 (#862) [intfsorch] Fix bug for VRF existence check (#882) Return 0 for CRM counter instead of None if no match (#879) Undo skipping Vnet tests, Vrf check before enslaving (#857) [Makefile]: Remove header files from source files (#883) Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
[vnetorch]: Use metadata matching for tunnel (sonic-net#841) [aclorch]: Add ICMP type/code match for v4/v6 (sonic-net#868) [restore_neighbors] fix failure with scapy 2.4.2 (sonic-net#862) [intfsorch] Fix bug for VRF existence check (sonic-net#882) Return 0 for CRM counter instead of None if no match (sonic-net#879) Undo skipping Vnet tests, Vrf check before enslaving (sonic-net#857) [Makefile]: Remove header files from source files (sonic-net#883) Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
* msft_github/master: [snmpagent]: Update sonic-snmpagent submodule (sonic-net#1004) [swss]: Update the ipinip.j2 template to specify the IPv4 loopback address (sonic-net#998) Change all port_config.ini column headers from 'port' to 'index' (sonic-net#1001) [docker-platform-monitor]: Remove stale fancontrol.pid file (if exists) before starting fancontrol (sonic-net#1002) [swss]: Update swss/common submodules (sonic-net#988) [snmp]: Update py-swsssdk/snmpagent submodules (sonic-net#996) [Broadcom]: Update SAI version to 3.0.3.2-5 (sonic-net#997) [Mellanox]: Update outdated MSN2410 minigraph (sonic-net#995) Add time stamp suffix to the dirty images version string (sonic-net#958) [Mellanox]: Remove FW upgrade procedure in docker (sonic-net#989) [snmp]: Update sonic-snmpagent submodule (sonic-net#986) [Broadcom]: Update SAI version to 3.0.3.2-4 (sonic-net#983) [Ingrasys]: Add Ingrasys S8900-64XC sfputil function and update submodule (sonic-net#984) [mellanox]: Update Mellanox SAI version (sonic-net#979) [Ingrasys]: Change hwmon kernel modules installation order (sonic-net#980) [Makefile] Allowing interactive session with the slave docker-container (sonic-net#903) [snmp]: Update sonic-snmpagent submodule (sonic-net#978) Disable snmpd module disk_hw, so no syslog messages about unavailable disks (sonic-net#977) [teamd]: Remove deprecated blocking logic before starting teamd (sonic-net#976) [Broadcom]: Update libsai version to 3.0.3.2-2 (sonic-net#973) [device/accton]: Add a new supported device, AS7312-54X (sonic-net#955) [sairedis]: update sairedis submodule (sonic-net#974) lacp runner will send lacp update right after it received SIGINT (sonic-net#969) [config]: Fix management interface configuration (sonic-net#966) [Broadcom]: Update OpenNSL modules (sonic-net#970) [utilities]: Update sonic-utilities (sonic-net#968) [interfaces]: Change MTU value to 9100 (sonic-net#967) Framework to plugin Organization specific scripts during ONIE Image build (sonic-net#951) Always start with Forwarding State flag set for bgpd (sonic-net#963) Update sonic-utilities to be compatible with sonic-net#942 (sonic-net#965) [swss]: Fix the command to get HWSKU with sonic-cfggen (sonic-net#964) [bgp]: Fix the deployment_id with DEVICE_METADATA (sonic-net#962) [Ingrasys] Update Ingrasys submodule for S8900-54XC (sonic-net#954) [build/onie installer] Install grub for SONiC post migration from another NOS (sonic-net#949) [syncd]: Comment out unused docker-ptf-brcm.mk [Broadcom]: Update OpenNSL/SAI version (sonic-net#959) [swss]: Move swss/common/sairedis submodule to 201709 tag [sairedis]: update sairedis submodule head (sonic-net#956) [service template] Starting new docker when HWSKU change is detected (sonic-net#946) [config] Fix an issue that bgp asn data type is not consistent (sonic-net#953) [mellanox]: Update Mellanox SAI version ansd SDK version [Ingrasys] update port_config.ini and sfputil for ingrasys platforms (sonic-net#952) [frr]: RR client support in minigraph for FRR (sonic-net#923) [configdb] Migrate minigraph configurations to DB (sonic-net#942) [devices]: Add led plugin for Arista 7060CX-32S and 7260CX3-64 (sonic-net#945) [sonic-slave]: SLAVE_TAG should be for both Dockerfile and Dockerfile.user (sonic-net#950) [github]: add templates for submitting issues and PR (sonic-net#947) [rsyslog]: Use timegenerated instead of timestamp (sonic-net#944) [dell]: remove nos_to_sonic_grub.cfg (sonic-net#943) [slave.mk]: Apply series of patches to SONIC_PYTHON_STDEB_DEBS targets if they exist (sonic-net#941) [rsyslog]: Use SONiC template in containers (sonic-net#940) [Broadcom]: Remove BRCM_OPENNSL library and upgrade BRCM_SAI to 3.0.3.2 (sonic-net#938) [baseimage]: allocate varlog disk in the initramfs stage (sonic-net#936) [sairedis]: revert deadlock fix in sonic-sairedis submodule (sonic-net#934) Replace CRLF line endings with LF (sonic-net#932) Fix confusing comment (sonic-net#931) Update sfputil support for Ingrasys S9100 (sonic-net#929) [quagga]: Disable ipv4 over ipv6 and enable ipv6 over ipv4 peer group (sonic-net#922) [quagga] enable core dump for bgpd and zebra (sonic-net#927) [devices]: Update Dell s6100/z9100 platform modules (sonic-net#925) Revert "Migrate DEVICE_METADATA to db (sonic-net#919)" (sonic-net#928) Migrate DEVICE_METADATA to db (sonic-net#919) [devices]: Bump sonic-platform-modules-arista submodule (sonic-net#924) [image]: build sonic-broadcom.raw image for sonic conversion from ftos (sonic-net#901) [sonic-slave] Force pyangbind version to 0.5.10 (sonic-net#918) [Arista-7260CX3] Rename hwSKU Arista-7260CX3-64 to Arista-7260CX3-C64, introducing new hwSKU Arista-7260CX3-D108C8 (sonic-net#920) [devices]: modify sfputil plugins for mellanox devices for new platform API (sonic-net#916) [cavm]Update sai revision and packet driver (sonic-net#914) [translate-acl] Specify pyangbind version to not introduce new dependency (sonic-net#915) Update sfputil support for Arista platforms (sonic-net#912) Port speed (sonic-net#879) [Accton]: Add a new supported device AS5712-54X (sonic-net#898) [kernel]: update kernel submodule (sonic-net#910) [device]: Updated dell s6100 submodule to 5ab014 (sonic-net#909) [broadcom]: update broadcom sai package to 2.1.5.1-17 (sonic-net#908) IPv4 prefixes shouldn't be sent by default over IPv6 session with FRR. (sonic-net#905) [submodule]: update sonic linux kernel (sonic-net#906) [sonic-sairedis] update sairedis submodule (sonic-net#211, sonic-net#212) (sonic-net#904) [mlnx-fw-upgrade]: Define required FW version in build time. (sonic-net#902) [SAI]: Remove the SAI submodule from buildimage repo (sonic-net#893) [Submodule update]: sonic-utilities (sonic-net#888) Revert "[mellanox]: Update Mellanox SAI version" [mellanox]: Update Mellanox SAI version [utilities]: Update sonic-utilities submodule [swss-common]: Update sonic-swss-common submodule [mellanox]: Disable fsat boot mode for SX kernel [quagga]: Update sonic-quagga submodule [Broadcom]: Update Broadcom SAI/SDK version (sonic-net#883) Squash merge v1.0.3 branch onto master
* 7812372 2018-11-08 | Update changelog to v1.3.5 (HEAD, origin/v1.3) [Guohan Lu] * a98bbfe 2018-11-08 | build saiserver and saiserver-dbg packages [Guohan Lu] * 2d3cce2 2018-11-02 | Change SAI_MIRROR_SESSION_ATTR_VLAN_HEADER_VALID to CREATE_AND_SET (sonic-net#879) [Shuotian Cheng] Signed-off-by: Guohan Lu <gulv@microsoft.com>
* Adding configuration CLIs for loopback interfaces
…omatically (#19121) #### Why I did it src/sonic-swss-common ``` * 391e27b - (HEAD -> master, origin/master, origin/HEAD) Add new table schema for BMP feature. (#879) (4 days ago) [Feng-msft] * 138b32e - [swig]: Fix swig template memory leak on issue 17025 (#876) (6 days ago) [Ze Gan] ``` #### How I did it #### How to verify it #### Description for the changelog
…omatically (sonic-net#19121) #### Why I did it src/sonic-swss-common ``` * 391e27b - (HEAD -> master, origin/master, origin/HEAD) Add new table schema for BMP feature. (sonic-net#879) (4 days ago) [Feng-msft] * 138b32e - [swig]: Fix swig template memory leak on issue 17025 (sonic-net#876) (6 days ago) [Ze Gan] ``` #### How I did it #### How to verify it #### Description for the changelog
No description provided.