Merge pull request #165 from mssonicbld/sonicbld/202205-merge

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205
sonic-net · Nov 28, 2023 · 4b9a4b1 · 4b9a4b1
2 parents a071a50 + 63cd433
commit 4b9a4b1
Show file tree

Hide file tree

Showing 22 changed files with 70 additions and 103 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -348,6 +348,7 @@
           <a:IPPrefix>10.7.0.196/26</a:IPPrefix>
         </ManagementAddress>
         <Hostname>switch2-t0</Hostname>
+        <ClusterName>DB5PrdApp11</ClusterName>
         <HwSku>Force10-S6000</HwSku>
       </Device>
       <Device i:type="LeafRouter">
@@ -359,7 +360,8 @@
         <DeviceLocation i:nil="true"/>
         <ManagementAddress xmlns:a="Microsoft.Search.Autopilot.NetMux">
           <a:IPPrefix>10.7.0.196/26</a:IPPrefix>
-        </ManagementAddress> 
+        </ManagementAddress>
+        <ClusterName>DB5PrdApp11</ClusterName>
         <HwSku>Force10-S6000</HwSku>
       </Device>
       <Device i:type="SmartCable">

diff --git 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
@@ -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
@@ -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"
     },