platform.json/hwsku.json format changes #43

samaity · 2020-02-10T23:02:24Z

Signed-off-by: Sangita Maity sangitamaity0211@gmail.com

- What I did
Modified code to make it compatible with current platform.json/hwsku.json format changes

dependent on this PR titled [Seastone] Changes for platform.json/hwsku.json for DPB

Changing format of platform.json from:

{
        "Ethernet0": {
            "index": "1,1,1,1",
            "lanes": "65,66,67,68",
            "alias_at_lanes": "Eth1/1, Eth1/2, Eth1/3, Eth1/4",
            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
        },
        "Ethernet4": {
            "index": "2,2,2,2",
            "lanes": "69,70,71,72",
            "alias_at_lanes": "Eth2/1, Eth2/2, Eth2/3, Eth2/4",
            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
        }
}

to

{
    "interfaces": {
        "Ethernet0": {
            "index": "1,1,1,1",
            "lanes": "65,66,67,68",
            "alias_at_lanes": "Eth1/1, Eth1/2, Eth1/3, Eth1/4",
            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
        },
        "Ethernet4": {
            "index": "2,2,2,2",
            "lanes": "69,70,71,72",
            "alias_at_lanes": "Eth2/1, Eth2/2, Eth2/3, Eth2/4",
            "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]"
        }
    }
}

Changing format of hwsku.json from:

{
        "Ethernet0": {
            "default_brkout_mode": "1x100G[40G]"
        },
        "Ethernet4": {
            "default_brkout_mode": "1x100G[40G]"
        }
}

to

{
    "interfaces": {
        "Ethernet0": {
            "default_brkout_mode": "1x100G[40G]"
        },
        "Ethernet4": {
            "default_brkout_mode": "1x100G[40G]"
        }
    }
}

- How I did
Changed the code and the test script for consistency.

- How to verify it

samaity@a07fe2458d08:/sonic$ BLDENV=stretch make -f slave.mk target/debs/stretch/sonic-device-data_1.0-1_all.deb
SONiC Build System

Build Configuration
"CONFIGURED_PLATFORM"             : "broadcom"
"CONFIGURED_ARCH"                 : "amd64"
"SONIC_CONFIG_PRINT_DEPENDENCIES" : ""
"SONIC_BUILD_JOBS"                : "1"
"SONIC_CONFIG_MAKE_JOBS"          : "24"
"SONIC_USE_DOCKER_BUILDKIT"       : ""
"USERNAME"                        : "admin"
"PASSWORD"                        : "YourPaSsWoRd"
"ENABLE_DHCP_GRAPH_SERVICE"       : ""
"SHUTDOWN_BGP_ON_START"           : ""
"ENABLE_PFCWD_ON_START"           : ""
"INSTALL_DEBUG_TOOLS"             : ""
"ROUTING_STACK"                   : "frr"
"FRR_USER_UID"                    : "300"
"FRR_USER_GID"                    : "300"
"ENABLE_SYNCD_RPC"                : ""
"ENABLE_ORGANIZATION_EXTENSIONS"  : "y"
"HTTP_PROXY"                      : ""
"HTTPS_PROXY"                     : ""
"ENABLE_SYSTEM_TELEMETRY"         : ""
"SONIC_DEBUGGING_ON"              : ""
"SONIC_PROFILING_ON"              : ""
"KERNEL_PROCURE_METHOD"           : "build"
"BUILD_TIMESTAMP"                 : ""
"BLDENV"                          : "stretch"
"VS_PREPARE_MEM"                  : "yes"
"ENABLE_SFLOW"                    : "y"

From Logs

File ../../../device/dell/x86_64-dellemc_z9264f_c3538-r0/media_settings.json passed validity check
File ../../../device/celestica/x86_64-cel_seastone-r0/platform.json passed validity check

sonic-device-data_1.0-1_all.deb got successfully built.

samaity@a07fe2458d08:/sonic$ ls -la target/debs/stretch/sonic-dev*
-rw-r--r-- 1 samaity gsamaity 5807304 Feb 11 00:03 target/debs/stretch/sonic-device-data_1.0-1_all.deb
-rw-r--r-- 1 samaity gsamaity   27553 Feb 11 00:03 target/debs/stretch/sonic-device-data_1.0-1_all.deb.log
samaity@a07fe2458d08:/sonic$

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

…-daemons (sonic-net#3420) * advance pointer for sonic-platform-daemon to 9e2eb29e6e55a116b424faa63f510c7cdeeef7eb [xcvrd] fix issue: xcvrd fails due to syntax error after sequential reboot (#43) * advance pointer for sonic-platform-common to ac7fde6e9ce532d450b3c43f354fc2f128053b4f [sonic_sfp] fix syntax error in sfputilbase._read_eeprom_specific_bytes (#58)

…t#4302) Brief: The community code for has been updated, which mismatched with the existing sonic-mgmt-framework. Hence it broke the build. Submodule-PR: #43 Details: The SONiC mgmt Framework, pulls down the community modules in two steps. Pull the existing; This does a transparent compile too. Then checkout the specific commit-id for each and do the final compile. The community code change broke in the compilation phase of step-1. Fix: For the two affected modules, do download only. Proper fix: As part of the next phase of changes, the mgmt-framework is moving go-submodule mode, which will ensure the download happens for the assigned commit-ids only. e.g. Refer go.mod in sonic-telemetry

…t#4302) Brief: The community code for has been updated, which mismatched with the existing sonic-mgmt-framework. Hence it broke the build. Submodule-PR: zhenggen-xu#43 Details: The SONiC mgmt Framework, pulls down the community modules in two steps. Pull the existing; This does a transparent compile too. Then checkout the specific commit-id for each and do the final compile. The community code change broke in the compilation phase of step-1. Fix: For the two affected modules, do download only. Proper fix: As part of the next phase of changes, the mgmt-framework is moving go-submodule mode, which will ensure the download happens for the assigned commit-ids only. e.g. Refer go.mod in sonic-telemetry

457e94d51 [macsec_linux]: Fixbug cannot dump the PN due to type error (zhenggen-xu#42) f7c073323 Disable P2P module (zhenggen-xu#41) 7b3b777e2 [ci]: use native arm64 and armhf build pool (zhenggen-xu#40) d4e91d66c [sonic_operator]: Increase wait timeout (zhenggen-xu#39) 43611ef88e [sonic_operators]: Add log in sonic operators (zhenggen-xu#43) Signed-off-by: Ze Gan <ganze718@gmail.com>

…onic-net#10406) #### Why I did it To take the following into sonic-buildimage 36e1f61 API endpoints to ConfigDBConnector to support pre-loading data without blackout (sonic-net#587) [sonic-swss-common](https://github.com/Azure/sonic-swss-common) ``` 36e1f61 API endpoints to ConfigDBConnector to support pre-loading data without blackout (sonic-net#587) 556f4ad Add SAI copy action to ACL schema (sonic-net#591) db18c3a Fix bitwidth of mac address in SAI ACL schema (sonic-net#590) e9442bb [ConfigDBPipeConnector]: Added set_entry API (sonic-net#586) 6c007c0 Update README for gmock (sonic-net#562) ``` [sonic-linkmgrd](https://github.com/Azure/sonic-linkmgrd) ``` 83dfc99 Enforce uniform file/class naming convention (zhenggen-xu#52) 83004bf Shutdown ICMP heartbeats when default route state is missing and ToR is in `auto` mode (zhenggen-xu#44) b81ea31 Add `LinkProberStateMachineActiveActive` (zhenggen-xu#47) c43cf7a Decrease link probing interval after switchover to better determine the overhead of a toggle (zhenggen-xu#43) 2239fbe Enhance clang format (zhenggen-xu#46) ``` #### How I did it * Advanced submodules pointers #### How to verify it 1. make configure PLATFORM=mellanox 2. make target/sonic-mellanox.bin

[202012][sonic-linkmgrd]Submodule update 8507629 Jing Zhang Mon Apr 4 10:25:22 2022 -0700 Lower unsolicited MUX state change notification log level to WARNING zhenggen-xu#57 17d217d Longxiang Lyu Mon Mar 21 12:15:19 2022 +0800 Enhance clang format (zhenggen-xu#46) c72fa2a Jing Zhang Fri Apr 1 12:23:29 2022 -0700 Disable the feature that decreases link probe interval for measuring switch overhead zhenggen-xu#49 (zhenggen-xu#54) 256b01b Jing Zhang Thu Mar 31 16:20:00 2022 -0700 Update link prober metrics posting logics zhenggen-xu#50 zhenggen-xu#53 dfd48d0 Jing Zhang Wed Mar 23 16:27:45 2022 -0700 Decrease link probing interval after switchover to better determine the overhead of a toggle zhenggen-xu#43 (zhenggen-xu#48) sign-off: Jing Zhang zhangjing@microsoft.com

samaity force-pushed the fix_platform_hwsku_interface branch from 8a7e0ee to 7dabea7 Compare February 11, 2020 00:26

platform.json/hwsku.json format changes

08c2fbb

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

samaity force-pushed the fix_platform_hwsku_interface branch from 7dabea7 to 08c2fbb Compare February 11, 2020 00:31

zhenggen-xu approved these changes Feb 13, 2020

View reviewed changes

zhenggen-xu merged commit 4c88c5c into zhenggen-xu:sonic-cfg-mgmt Feb 13, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

platform.json/hwsku.json format changes #43

platform.json/hwsku.json format changes #43

samaity commented Feb 10, 2020 •

edited

Loading

platform.json/hwsku.json format changes #43

platform.json/hwsku.json format changes #43

Conversation

samaity commented Feb 10, 2020 • edited Loading

samaity commented Feb 10, 2020 •

edited

Loading