diff --git a/cvl/jsondata_test.go b/cvl/jsondata_test.go
index bf0036679..f8fac4eff 100644
--- a/cvl/jsondata_test.go
+++ b/cvl/jsondata_test.go
@@ -55,7 +55,8 @@ var json_validate_config_data = []string{`{
 						"mac": "4c:76:25:f4:70:82",
 						"default_pfcwd_status": "disable",
 						"deployment_id": "1",
-						"type": "ToRRouter"
+						"type": "ToRRouter",
+						"nexthop_group": "disabled"
 						}
 					}
 				}`,
diff --git a/cvl/testdata/schema/sonic-device-metadata.yang b/cvl/testdata/schema/sonic-device-metadata.yang
index 0f5109552..9aeecc1fe 100644
--- a/cvl/testdata/schema/sonic-device-metadata.yang
+++ b/cvl/testdata/schema/sonic-device-metadata.yang
@@ -100,6 +100,14 @@ module sonic-device-metadata {
 						enum LeafRouter;
 					}
 				}
+
+				leaf nexthop_group {
+					type enumeration {
+						enum enabled;
+						enum disabled;
+					}
+					default disabled;
+				}
 			}
 		}
 	}
diff --git a/models/yang/sonic/import.mk b/models/yang/sonic/import.mk
index e52ff765f..cc3496360 100644
--- a/models/yang/sonic/import.mk
+++ b/models/yang/sonic/import.mk
@@ -5,4 +5,5 @@
 # or glob patterns of basenames (like sonic-telemetry*.yang) can be specified.
 # Other sonic yangs referred by these will also be copied.
 #
-SONICYANG_IMPORTS += sonic-sflow.yang
\ No newline at end of file
+SONICYANG_IMPORTS += sonic-sflow.yang
+SONICYANG_IMPORTS += sonic-device_metadata.yang