diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/0/config-ramon-1-0.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/0/config-ramon-1-0.bcm index e55bc4a4ebc7..4d84d93be146 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/0/config-ramon-1-0.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/0/config-ramon-1-0.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=1 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/1/config-ramon-1-1.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/1/config-ramon-1-1.bcm index 802109801fa3..8bbe2ff74752 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/1/config-ramon-1-1.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/1/config-ramon-1-1.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=2 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/10/config-ramon-6-0.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/10/config-ramon-6-0.bcm index 372ea07d1cf0..9f155988cff2 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/10/config-ramon-6-0.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/10/config-ramon-6-0.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=11 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/11/config-ramon-6-1.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/11/config-ramon-6-1.bcm index 3070800dbf4d..915ecc0777df 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/11/config-ramon-6-1.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/11/config-ramon-6-1.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=12 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/12/config-ramon-7-0.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/12/config-ramon-7-0.bcm index 8f7297b7716a..131c55e93c99 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/12/config-ramon-7-0.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/12/config-ramon-7-0.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=13 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/13/config-ramon-7-1.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/13/config-ramon-7-1.bcm index 219aaa4aea1d..1096803edd2a 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/13/config-ramon-7-1.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/13/config-ramon-7-1.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=14 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/14/config-ramon-8-0.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/14/config-ramon-8-0.bcm index ba21d010fa47..455ae7eae6a5 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/14/config-ramon-8-0.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/14/config-ramon-8-0.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=15 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/15/config-ramon-8-1.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/15/config-ramon-8-1.bcm index 4e9aeef329f9..ad2580fc9b69 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/15/config-ramon-8-1.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/15/config-ramon-8-1.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=16 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/2/config-ramon-2-0.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/2/config-ramon-2-0.bcm index 6a5423c5e185..21c77791667d 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/2/config-ramon-2-0.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/2/config-ramon-2-0.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=3 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/3/config-ramon-2-1.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/3/config-ramon-2-1.bcm index a13d25a0264f..3509b6ef3132 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/3/config-ramon-2-1.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/3/config-ramon-2-1.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=4 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/4/config-ramon-3-0.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/4/config-ramon-3-0.bcm index 449076477dd6..f0be45c4da19 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/4/config-ramon-3-0.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/4/config-ramon-3-0.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=5 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/5/config-ramon-3-1.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/5/config-ramon-3-1.bcm index cd94ed157c46..358f96344b75 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/5/config-ramon-3-1.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/5/config-ramon-3-1.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=6 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/6/config-ramon-4-0.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/6/config-ramon-4-0.bcm index 017ac5ccd40c..c42441dbcbad 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/6/config-ramon-4-0.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/6/config-ramon-4-0.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=7 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/7/config-ramon-4-1.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/7/config-ramon-4-1.bcm index 679e3fa07592..761e75cccd86 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/7/config-ramon-4-1.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/7/config-ramon-4-1.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=8 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/8/config-ramon-5-0.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/8/config-ramon-5-0.bcm index 4adac068b8eb..524a2f4b3004 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/8/config-ramon-5-0.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/8/config-ramon-5-0.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=9 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/9/config-ramon-5-1.bcm b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/9/config-ramon-5-1.bcm index 31834cddc4bb..289ffff958d3 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/9/config-ramon-5-1.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/Nokia-IXR7250E-SUP-10/9/config-ramon-5-1.bcm @@ -2,7 +2,7 @@ appl_enable_intr_init.BCM8879X=0 appl_param_module_id.BCM8879X=10 bcm_linkscan_interval.BCM8879X=0 -bcm_stat_interval.BCM8879X=4000000 +bcm_stat_interval.BCM8879X=5000000 bist_enable.BCM8879X=0 core_clock_speed_khz.BCM8879X=1000000 custom_feature_access_only.BCM8879X=0 @@ -19,8 +19,8 @@ load_firmware.BCM8879X=0x102 mdio_output_delay_ext.BCM8879X=14 mdio_output_delay_int.BCM8879X=25 mem_cache_enable_parity.BCM8879X=1 -mm_intr_enable.BCM8879X=0 -mm_timeout_usec.BCM8879X=300000 +miim_intr_enable.BCM8879X=0 +miim_timeout_usec.BCM8879X=300000 polled_irq_delay.BCM8879X=100000 polled_irq_mode.BCM8879X=1 port_fec.BCM8879X=7 diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case.xml b/src/sonic-config-engine/tests/simple-sample-graph-case.xml index aaade89d5d49..cfcb8559ef2f 100644 --- a/src/sonic-config-engine/tests/simple-sample-graph-case.xml +++ b/src/sonic-config-engine/tests/simple-sample-graph-case.xml @@ -348,6 +348,7 @@ 10.7.0.196/26 switch2-t0 + DB5PrdApp11 Force10-S6000 @@ -359,7 +360,8 @@ 10.7.0.196/26 - + + DB5PrdApp11 Force10-S6000 diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py index 92834ee36f99..6fb4d5f89ac8 100644 --- a/src/sonic-config-engine/tests/test_minigraph_case.py +++ b/src/sonic-config-engine/tests/test_minigraph_case.py @@ -209,6 +209,7 @@ def test_minigraph_neighbor_metadata(self): expected_table = { 'switch2-t0': { + 'cluster': 'DB5PrdApp11', 'lo_addr': '25.1.1.10/32', 'mgmt_addr': '10.7.0.196/26', 'hwsku': 'Force10-S6000', @@ -228,7 +229,8 @@ def test_minigraph_neighbor_metadata(self): 'hwsku': 'server-sku', 'type': 'Server' }, - 'switch-01t1': { + 'switch-01t1': { + 'cluster': 'DB5PrdApp11', 'lo_addr': '10.1.0.186/32', 'deployment_id': '2', 'hwsku': 'Force10-S6000', diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md index 93814e8f5d38..bda1af49ed93 100644 --- a/src/sonic-yang-models/doc/Configuration.md +++ b/src/sonic-yang-models/doc/Configuration.md @@ -844,12 +844,14 @@ instance is supported in SONiC. { "DEVICE_NEIGHBOR_METADATA": { "ARISTA01T1": { + "cluster": "AAA00PrdStr00", "lo_addr": "None", "mgmt_addr": "10.11.150.45", "hwsku": "Arista-VM", "type": "LeafRouter" }, "ARISTA02T1": { + "cluster": "AAA00PrdStr00", "lo_addr": "None", "mgmt_addr": "10.11.150.46", "hwsku": "Arista-VM", diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/device_neighbor_metadata.json b/src/sonic-yang-models/tests/yang_model_tests/tests/device_neighbor_metadata.json index 404856159a44..b8e62bff7fd3 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests/device_neighbor_metadata.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests/device_neighbor_metadata.json @@ -2,17 +2,6 @@ "DEVICE_NEIGHBOR_METADATA_TABLE": { "desc": "DEVICE_NEIGHBOR_METADATA_TABLE config pattern." }, - "DEVICE_NEIGHBOR_METADATA_TYPE_INCORRECT_PATTERN": { - "desc": "DEVICE_NEIGHBOR_METADATA_TYPE_INCORRECT_PATTERN pattern failure.", - "eStrKey" : "Pattern" - }, - "DEVICE_NEIGHBOR_METADATA_TYPE_CORRECT_PATTERN": { - "desc": "DEVICE_NEIGHBOR_METADATA correct value for Type field" - }, - "DEVICE_NEIGHBOR_METADATA_TYPE_INCORRECT_PATTERN_BMC": { - "desc": "DEVICE_NEIGHBOR_METADATA_TYPE_INCORRECT_PATTERN pattern failure with IncorrectTypeBmc.", - "eStrKey" : "Pattern" - }, "DEVICE_NEIGHBOR_METADATA_TYPE_CORRECT_PATTERN_BMC": { "desc": "DEVICE_NEIGHBOR_METADATA correct value for type field for Bmc" }, diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_neighbor_metadata.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_neighbor_metadata.json index 82faf0815f56..8c5388d2043c 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_neighbor_metadata.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_neighbor_metadata.json @@ -1,43 +1,4 @@ { - "DEVICE_NEIGHBOR_METADATA_TYPE_INCORRECT_PATTERN": { - "sonic-device_neighbor_metadata:sonic-device_neighbor_metadata": { - "sonic-device_neighbor_metadata:DEVICE_NEIGHBOR_METADATA": { - "DEVICE_NEIGHBOR_METADATA_LIST": [ - { - "name": "Ethernet116", - "hwsku": "Arista", - "type": "ToRrouter" - } - ] - } - } - }, - "DEVICE_NEIGHBOR_METADATA_TYPE_CORRECT_PATTERN": { - "sonic-device_neighbor_metadata:sonic-device_neighbor_metadata": { - "sonic-device_neighbor_metadata:DEVICE_NEIGHBOR_METADATA": { - "DEVICE_NEIGHBOR_METADATA_LIST": [ - { - "name": "Ethernet116", - "hwsku": "Arista", - "type": "BackEndToRRouter" - } - ] - } - } - }, - "DEVICE_NEIGHBOR_METADATA_TYPE_INCORRECT_PATTERN_BMC": { - "sonic-device_neighbor_metadata:sonic-device_neighbor_metadata": { - "sonic-device_neighbor_metadata:DEVICE_NEIGHBOR_METADATA": { - "DEVICE_NEIGHBOR_METADATA_LIST": [ - { - "name": "Ethernet116", - "hwsku": "DUMMY_BMC_SKU", - "type": "IncorrectTypeBmc" - } - ] - } - } - }, "DEVICE_NEIGHBOR_METADATA_TYPE_CORRECT_PATTERN_BMC": { "sonic-device_neighbor_metadata:sonic-device_neighbor_metadata": { "sonic-device_neighbor_metadata:DEVICE_NEIGHBOR_METADATA": { @@ -69,6 +30,7 @@ "sonic-device_neighbor_metadata:DEVICE_NEIGHBOR_METADATA": { "DEVICE_NEIGHBOR_METADATA_LIST": [ { + "cluster": "AAA00PrdStr00", "lo_addr": "25.77.193.11/32", "mgmt_addr": "0.0.0.0/0", "name": "dccsw01.nw", @@ -77,6 +39,7 @@ "deployment_id": "1" }, { + "cluster": "AAA00PrdStr00", "lo_addr": "0.0.0.0/0", "mgmt_addr": "10.11.150.46/26", "name": "dccsw02.nw", @@ -85,6 +48,7 @@ "deployment_id": "1" }, { + "cluster": "AAA00PrdStr00", "lo_addr_v6": "2a04:5555:40:a709::2/126", "mgmt_addr": "10.11.150.47/26", "name": "dccsw03.nw", @@ -93,6 +57,7 @@ "deployment_id": "1" }, { + "cluster": "AAA00PrdStr00", "name": "dccsw04.nw", "mgmt_addr_v6": "2a04:5555:40:a708::2/126", "hwsku": "Arista", @@ -100,12 +65,14 @@ "deployment_id": "1" }, { + "cluster": "AAA00PrdStr00", "name": "dccsw05.nw", "hwsku": "Arista", "type": "LeafRouter", "deployment_id": "1" }, { + "cluster": "AAA00PrdStr00", "lo_addr_v6": "2a04:5555:40:a710::2/126", "name": "dccsw06.nw", "hwsku": "Arista", @@ -113,6 +80,7 @@ "deployment_id": "1" }, { + "cluster": "AAA00PrdStr00", "lo_addr": "25.77.193.11/32", "name": "dccsw07.nw", "hwsku": "Arista", @@ -120,6 +88,7 @@ "deployment_id": "1" }, { + "cluster": "AAA00PrdStr00", "mgmt_addr": "10.11.150.48/26", "name": "dccsw08.nw", "hwsku": "Arista", diff --git a/src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang b/src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang index 594c4a8c2c2c..cf3cbde89be3 100644 --- a/src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang +++ b/src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang @@ -40,6 +40,11 @@ module sonic-device_neighbor_metadata { } } + leaf cluster { + description "The switch is a member of this cluster"; + type string; + } + leaf hwsku { type stypes:hwsku; } @@ -82,9 +87,7 @@ module sonic-device_neighbor_metadata { leaf type { description "Network element type"; - type string { - pattern "ToRRouter|LeafRouter|SpineChassisFrontendRouter|ChassisBackendRouter|ASIC|Asic|Supervior|MgmtToRRouter|MgmtLeafRouter|SpineRouter|BackEndToRRouter|BackEndLeafRouter|EPMS|MgmtTsToR|BmcMgmtToRRouter|Server|Bmc|MiniPower|SmartCable|Ixia|not-provisioned"; - } + type string; } leaf deployment_id {