matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[yang-models]: Remove PLY Extensions and change translation code. (#6915)

Browse Source 
* [yang-models]: Remove PLY Extensions and change translation code.

   With assumption that TABLE_SEPARATOR and ENTRY_SEPARATOR for configDB is always "|",
   translation from configDB.json to sonicYang.json can be done based on keys specified
   in YANG Lists inside YANG models. So removing extensions is good idea.

Changes:
-- Remove use of regex in Translation code.
-- Remove regex Extensions from YANG models.
-- Improved debugging i.e. log on stdout in case of any Exception from sonic-yang-mgmt,
   so that failed tests can be debugged faster. Also this is good to debug Dynamic
   port breakout issues.
-- Minor Test changes.

Co-authored-by: lguohan <lguohan@gmail.com>
This commit is contained in:
Praveen Chaudhary 2021-03-28 00:49:10 -07:00 committed by GitHub
parent 6d23a78ffb
commit d3d0c2623d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 66 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sonic-yang-mgmt/sonic_yang.py
View File

@ -47,11 +47,13 @@ class SonicYang(SonicYangExtMixin):
def __del__(self): def __del__(self):
pass pass
def sysLog(self, debug=syslog.LOG_INFO, msg=None): def sysLog(self, debug=syslog.LOG_INFO, msg=None, doPrint=False):
# log debug only if enabled # log debug only if enabled
if self.DEBUG == False and debug == syslog.LOG_DEBUG: if self.DEBUG == False and debug == syslog.LOG_DEBUG:
return return
if doPrint:
print("{}({}):{}".format(self.SYSLOG_IDENTIFIER, debug, msg))
syslog.openlog(self.SYSLOG_IDENTIFIER) syslog.openlog(self.SYSLOG_IDENTIFIER)
syslog.syslog(debug, msg) syslog.syslog(debug, msg)
syslog.closelog() syslog.closelog()

99
src/sonic-yang-mgmt/sonic_yang_ext.py
View File

@ -3,7 +3,6 @@
from __future__ import print_function from __future__ import print_function
import yang as ly import yang as ly
import re
import syslog import syslog
from json import dump, dumps, loads from json import dump, dumps, loads
@ -47,7 +46,8 @@ class SonicYangExtMixin:
self._createDBTableToModuleMap() self._createDBTableToModuleMap()
except Exception as e: except Exception as e:
print("Yang Models Load failed") self.sysLog(msg="Yang Models Load failed:{}".format(str(e)), \
debug=syslog.LOG_ERR, doPrint=True)
raise SonicYangException("Yang Models Load failed\n{}".format(str(e))) raise SonicYangException("Yang Models Load failed\n{}".format(str(e)))
return True return True
@ -65,6 +65,8 @@ class SonicYangExtMixin:
self.yJson.append(parse(xml)) self.yJson.append(parse(xml))
self.sysLog(msg="Parsed Json for {}".format(m.name())) self.sysLog(msg="Parsed Json for {}".format(m.name()))
except Exception as e: except Exception as e:
self.sysLog(msg="JSON schema Load failed:{}".format(str(e)), \
debug=syslog.LOG_ERR, doPrint=True)
raise e raise e
return return
@ -90,7 +92,9 @@ class SonicYangExtMixin:
# top level container must exist for rest of the yang files and it should # top level container must exist for rest of the yang files and it should
# have same name as module name. # have same name as module name.
assert topLevelContainer['@name'] == moduleName if topLevelContainer['@name'] != moduleName:
raise(SonicYangException("topLevelContainer mismatch {}:{}".\
format(topLevelContainer['@name'], moduleName)))
# Each container inside topLevelContainer maps to a sonic config table. # Each container inside topLevelContainer maps to a sonic config table.
container = topLevelContainer['container'] container = topLevelContainer['container']
@ -154,25 +158,22 @@ class SonicYangExtMixin:
Input: Input:
tableKey: Config DB Primary Key, Example tableKey = "Vlan111|2a04:5555:45:6709::1/64" tableKey: Config DB Primary Key, Example tableKey = "Vlan111|2a04:5555:45:6709::1/64"
keys: key string from YANG list, i.e. 'vlan_name ip-prefix'. keys: key string from YANG list, i.e. 'vlan_name ip-prefix'.
regex: A regex to extract keys from tableKeys, good to have it as accurate as possible.
Return: Return:
KeyDict = {"vlan_name": "Vlan111", "ip-prefix": "2a04:5555:45:6709::1/64"} KeyDict = {"vlan_name": "Vlan111", "ip-prefix": "2a04:5555:45:6709::1/64"}
""" """
def _extractKey(self, tableKey, keys, regex): def _extractKey(self, tableKey, keys):
keyList = keys.split() keyList = keys.split()
# get the value groups # get the value groups
value = re.match(regex, tableKey) value = tableKey.split("|")
# match lens
if len(keyList) != len(value):
raise Exception("Value not found for {} in {}".format(keys, tableKey))
# create the keyDict # create the keyDict
i = 1
keyDict = dict() keyDict = dict()
for k in keyList: for i in range(len(keyList)):
if value.group(i): keyDict[keyList[i]] = value[i].strip()
keyDict[k] = value.group(i)
else:
raise Exception("Value not found for {} in {}".format(k, tableKey))
i = i + 1
return keyDict return keyDict
@ -264,22 +265,21 @@ class SonicYangExtMixin:
Xlate a list Xlate a list
This function will xlate from a dict in config DB to a Yang JSON list This function will xlate from a dict in config DB to a Yang JSON list
using yang model. Output will be go in self.xlateJson using yang model. Output will be go in self.xlateJson
Note: Exceptions from this function are collected in exceptionList and
are displayed only when an entry is not xlated properly from ConfigDB
to sonic_yang.json.
""" """
def _xlateList(self, model, yang, config, table): def _xlateList(self, model, yang, config, table, exceptionList):
#create a dict to map each key under primary key with a dict yang model. #create a dict to map each key under primary key with a dict yang model.
#This is done to improve performance of mapping from values of TABLEs in #This is done to improve performance of mapping from values of TABLEs in
#config DB to leaf in YANG LIST. #config DB to leaf in YANG LIST.
leafDict = self._createLeafDict(model) leafDict = self._createLeafDict(model)
# fetch regex from YANG models.
keyRegEx = model['ext:key-regex-configdb-to-yang']['@value']
# seperator `|` has special meaning in regex, so change it appropriately.
keyRegEx = re.sub(r'\|', r'\\|', keyRegEx)
# get keys from YANG model list itself # get keys from YANG model list itself
listKeys = model['key']['@value'] listKeys = model['key']['@value']
self.sysLog(msg="xlateList regex:{} keyList:{}".\ self.sysLog(msg="xlateList keyList:{}".format(listKeys))
format(keyRegEx, listKeys))
primaryKeys = list(config.keys()) primaryKeys = list(config.keys())
for pkey in primaryKeys: for pkey in primaryKeys:
@ -288,7 +288,7 @@ class SonicYangExtMixin:
self.sysLog(syslog.LOG_DEBUG, "xlateList Extract pkey:{}".\ self.sysLog(syslog.LOG_DEBUG, "xlateList Extract pkey:{}".\
format(pkey)) format(pkey))
# Find and extracts key from each dict in config # Find and extracts key from each dict in config
keyDict = self._extractKey(pkey, listKeys, keyRegEx) keyDict = self._extractKey(pkey, listKeys)
# fill rest of the values in keyDict # fill rest of the values in keyDict
for vKey in config[pkey]: for vKey in config[pkey]:
self.sysLog(syslog.LOG_DEBUG, "xlateList vkey {}".format(vKey)) self.sysLog(syslog.LOG_DEBUG, "xlateList vkey {}".format(vKey))
@ -300,7 +300,9 @@ class SonicYangExtMixin:
except Exception as e: except Exception as e:
# log debug, because this exception may occur with multilists # log debug, because this exception may occur with multilists
self.sysLog(syslog.LOG_DEBUG, "xlateList Exception {}".format(e)) self.sysLog(msg="xlateList Exception:{}".format(str(e)), \
debug=syslog.LOG_DEBUG, doPrint=True)
exceptionList.append(str(e))
# with multilist, we continue matching other keys. # with multilist, we continue matching other keys.
continue continue
@ -310,12 +312,12 @@ class SonicYangExtMixin:
Process list inside a Container. Process list inside a Container.
This function will call xlateList based on list(s) present in Container. This function will call xlateList based on list(s) present in Container.
""" """
def _xlateListInContainer(self, model, yang, configC, table): def _xlateListInContainer(self, model, yang, configC, table, exceptionList):
clist = model clist = model
#print(clist['@name']) #print(clist['@name'])
yang[clist['@name']] = list() yang[clist['@name']] = list()
self.sysLog(msg="xlateProcessListOfContainer: {}".format(clist['@name'])) self.sysLog(msg="xlateProcessListOfContainer: {}".format(clist['@name']))
self._xlateList(clist, yang[clist['@name']], configC, table) self._xlateList(clist, yang[clist['@name']], configC, table, exceptionList)
# clean empty lists # clean empty lists
if len(yang[clist['@name']]) == 0: if len(yang[clist['@name']]) == 0:
del yang[clist['@name']] del yang[clist['@name']]
@ -354,16 +356,18 @@ class SonicYangExtMixin:
# To Handle multiple Lists, Make a copy of config, because we delete keys # To Handle multiple Lists, Make a copy of config, because we delete keys
# from config after each match. This is done to match one pkey with one list. # from config after each match. This is done to match one pkey with one list.
configC = config.copy() configC = config.copy()
exceptionList = list()
clist = model.get('list') clist = model.get('list')
# If single list exists in container, # If single list exists in container,
if clist and isinstance(clist, dict) and \ if clist and isinstance(clist, dict) and \
clist['@name'] == model['@name']+"_LIST" and bool(configC): clist['@name'] == model['@name']+"_LIST" and bool(configC):
self._xlateListInContainer(clist, yang, configC, table) self._xlateListInContainer(clist, yang, configC, table, \
exceptionList)
# If multi-list exists in container, # If multi-list exists in container,
elif clist and isinstance(clist, list) and bool(configC): elif clist and isinstance(clist, list) and bool(configC):
for modelList in clist: for modelList in clist:
self._xlateListInContainer(modelList, yang, configC, table) self._xlateListInContainer(modelList, yang, configC, table, \
exceptionList)
# Handle container(s) in container # Handle container(s) in container
ccontainer = model.get('container') ccontainer = model.get('container')
@ -388,7 +392,10 @@ class SonicYangExtMixin:
# All entries in copy of config must have been parsed. # All entries in copy of config must have been parsed.
if len(configC): if len(configC):
self.sysLog(syslog.LOG_ERR, "Alert: Remaining keys in Config") self.sysLog(msg="All Keys are not parsed in {}\n{}".format(table, \
configC.keys()), debug=syslog.LOG_ERR, doPrint=True)
self.sysLog(msg="exceptionList:{}".format(exceptionList), \
debug=syslog.LOG_ERR, doPrint=True)
raise(Exception("All Keys are not parsed in {}\n{}".format(table, \ raise(Exception("All Keys are not parsed in {}\n{}".format(table, \
configC.keys()))) configC.keys())))
@ -433,22 +440,24 @@ class SonicYangExtMixin:
""" """
create config DB table key from entry in yang JSON create config DB table key from entry in yang JSON
""" """
def _createKey(self, entry, regex): def _createKey(self, entry, keys):
keyDict = dict() keyDict = dict()
keyV = regex keyList = keys.split()
# get the keys from regex of key extractor keyV = ""
keyList = re.findall(r'<(.*?)>', regex)
for key in keyList: for key in keyList:
val = entry.get(key) val = entry.get(key)
if val: if val:
#print("pair: {} {}".format(key, val)) #print("pair: {} {}".format(key, val))
keyDict[key] = sval = str(val) keyDict[key] = sval = str(val)
keyV = re.sub(r'<'+key+'>', sval, keyV) keyV += sval + "|"
#print("VAL: {} {}".format(regex, keyV)) #print("VAL: {} {}".format(regex, keyV))
else: else:
raise Exception("key {} not found in entry".format(key)) raise Exception("key {} not found in entry".format(key))
#print("kDict {}".format(keyDict)) #print("kDict {}".format(keyDict))
keyV = keyV.rstrip("|")
return keyV, keyDict return keyV, keyDict
""" """
@ -478,10 +487,8 @@ class SonicYangExtMixin:
""" """
def _revXlateList(self, model, yang, config, table): def _revXlateList(self, model, yang, config, table):
# fetch regex from YANG models # get keys from YANG model list itself
keyRegEx = model['ext:key-regex-yang-to-configdb']['@value'] listKeys = model['key']['@value']
self.sysLog(msg="revXlateList regex:{}".format(keyRegEx))
# create a dict to map each key under primary key with a dict yang model. # create a dict to map each key under primary key with a dict yang model.
# This is done to improve performance of mapping from values of TABLEs in # This is done to improve performance of mapping from values of TABLEs in
# config DB to leaf in YANG LIST. # config DB to leaf in YANG LIST.
@ -491,7 +498,7 @@ class SonicYangExtMixin:
if "_LIST" in model['@name']: if "_LIST" in model['@name']:
for entry in yang: for entry in yang:
# create key of config DB table # create key of config DB table
pkey, pkeydict = self._createKey(entry, keyRegEx) pkey, pkeydict = self._createKey(entry, listKeys)
self.sysLog(syslog.LOG_DEBUG, "revXlateList pkey:{}".format(pkey)) self.sysLog(syslog.LOG_DEBUG, "revXlateList pkey:{}".format(pkey))
config[pkey]= dict() config[pkey]= dict()
# fill rest of the entries # fill rest of the entries
@ -631,7 +638,8 @@ class SonicYangExtMixin:
list = self._findYangList(container, table+"_LIST") list = self._findYangList(container, table+"_LIST")
xpath = xpath + "/" + list['key']['@value'].split()[0] xpath = xpath + "/" + list['key']['@value'].split()[0]
except Exception as e: except Exception as e:
print("find xpath of port Leaf failed") self.sysLog(msg="find xpath of port Leaf failed", \
debug = syslog.LOG_ERR, doPrint=True)
raise SonicYangException("find xpath of port Leaf failed\n{}".format(str(e))) raise SonicYangException("find xpath of port Leaf failed\n{}".format(str(e)))
return xpath return xpath
@ -649,7 +657,8 @@ class SonicYangExtMixin:
list = self._findYangList(container, table+"_LIST") list = self._findYangList(container, table+"_LIST")
xpath = self._findXpathList(xpath, list, [portName]) xpath = self._findXpathList(xpath, list, [portName])
except Exception as e: except Exception as e:
print("find xpath of port failed") self.sysLog(msg="find xpath of port failed", \
debug = syslog.LOG_ERR, doPrint=True)
raise SonicYangException("find xpath of port failed\n{}".format(str(e))) raise SonicYangException("find xpath of port failed\n{}".format(str(e)))
return xpath return xpath
@ -671,6 +680,8 @@ class SonicYangExtMixin:
xpath = xpath + '['+listKey+'=\''+keys[i]+'\']' xpath = xpath + '['+listKey+'=\''+keys[i]+'\']'
i = i + 1 i = i + 1
except Exception as e: except Exception as e:
self.sysLog(msg="_findXpathList:{}".format(str(e)), \
debug=syslog.LOG_ERR, doPrint=True)
raise e raise e
return xpath return xpath
@ -703,7 +714,8 @@ class SonicYangExtMixin:
except Exception as e: except Exception as e:
self.root = None self.root = None
print("Data Loading Failed") self.sysLog(msg="Data Loading Failed:{}".format(str(e)), \
debug=syslog.LOG_ERR, doPrint=True)
raise SonicYangException("Data Loading Failed\n{}".format(str(e))) raise SonicYangException("Data Loading Failed\n{}".format(str(e)))
return True return True
@ -725,7 +737,8 @@ class SonicYangExtMixin:
self._revXlateConfigDB(revXlateFile=revXlateFile) self._revXlateConfigDB(revXlateFile=revXlateFile)
except Exception as e: except Exception as e:
print("Get Data Tree Failed") self.sysLog(msg="Get Data Tree Failed:{}".format(str(e)), \
debug=syslog.LOG_ERR, doPrint=True)
raise SonicYangException("Get Data Tree Failed\n{}".format(str(e))) raise SonicYangException("Get Data Tree Failed\n{}".format(str(e)))
return self.revXlateJson return self.revXlateJson
@ -760,6 +773,8 @@ class SonicYangExtMixin:
if self._deleteNode(xpath=xpath, node=node) == False: if self._deleteNode(xpath=xpath, node=node) == False:
raise Exception('_deleteNode failed') raise Exception('_deleteNode failed')
except Exception as e: except Exception as e:
self.sysLog(msg="deleteNode:{}".format(str(e)), \
debug=syslog.LOG_ERR, doPrint=True)
raise SonicYangException("Failed to delete node {}\n{}".\ raise SonicYangException("Failed to delete node {}\n{}".\
format( xpath, str(e))) format( xpath, str(e)))

5
src/sonic-yang-mgmt/tests/libyang-python-tests/test_sonic_yang.py
View File

@ -340,6 +340,11 @@ class Test_SonicYang(object):
print("Xlate and Rev Xlate Passed") print("Xlate and Rev Xlate Passed")
else: else:
print("Xlate and Rev Xlate failed") print("Xlate and Rev Xlate failed")
# print for better debugging, in case of failure.
print("syc.jIn: {}".format({t:syc.jIn[t].keys() \
for t in syc.jIn.keys()}))
print("syc.revXlateJson: {}".format({t:syc.revXlateJson[t].keys() \
for t in syc.revXlateJson.keys()}))
# make it fail # make it fail
assert False == True assert False == True

8
src/sonic-yang-models/yang-models/sonic-acl.yang
View File

@ -45,10 +45,6 @@ module sonic-acl {
key "ACL_TABLE_NAME RULE_NAME"; key "ACL_TABLE_NAME RULE_NAME";
ext:key-regex-configdb-to-yang "^([a-zA-Z0-9_-]+)|([a-zA-Z0-9_-]+)$";
ext:key-regex-yang-to-configdb "<ACL_TABLE_NAME>|<RULE_NAME>";
leaf ACL_TABLE_NAME { leaf ACL_TABLE_NAME {
type leafref { type leafref {
path "/acl:sonic-acl/acl:ACL_TABLE/acl:ACL_TABLE_LIST/acl:ACL_TABLE_NAME"; path "/acl:sonic-acl/acl:ACL_TABLE/acl:ACL_TABLE_LIST/acl:ACL_TABLE_NAME";
@ -233,10 +229,6 @@ module sonic-acl {
key "ACL_TABLE_NAME"; key "ACL_TABLE_NAME";
ext:key-regex-configdb-to-yang "^([a-zA-Z0-9-_]+)$";
ext:key-regex-yang-to-configdb "<ACL_TABLE_NAME>";
leaf ACL_TABLE_NAME { leaf ACL_TABLE_NAME {
type string; type string;
} }

4
src/sonic-yang-models/yang-models/sonic-breakout_cfg.yang
View File

@ -26,10 +26,6 @@ module sonic-breakout_cfg {
key "port"; key "port";
ext:key-regex-configdb-to-yang "^([a-zA-Z0-9_-]+)$";
ext:key-regex-yang-to-configdb "<port>";
/* /*
* This is leaf instead of a leafref towards port, because this * This is leaf instead of a leafref towards port, because this
* table will contains Parent ports and their current breakout-mode, * table will contains Parent ports and their current breakout-mode,

4
src/sonic-yang-models/yang-models/sonic-device_neighbor.yang
View File

@ -35,10 +35,6 @@ module sonic-device_neighbor {
key "peer_name"; key "peer_name";
ext:key-regex-configdb-to-yang "^([a-zA-Z0-9_-]+)$";
ext:key-regex-yang-to-configdb "<peer_name>";
leaf peer_name { leaf peer_name {
type string { type string {
length 1..255; length 1..255;

10
src/sonic-yang-models/yang-models/sonic-extension.yang
View File

@ -10,14 +10,4 @@ module sonic-extension {
revision 2019-07-01 { revision 2019-07-01 {
description "First Revision"; description "First Revision";
} }
extension key-regex-configdb-to-yang {
description "Key regex used to convert config DB keys to YANG Config";
argument "value";
}
extension key-regex-yang-to-configdb {
description "Key regex used to convert config DB keys to YANG Config";
argument "value";
}
} }

8
src/sonic-yang-models/yang-models/sonic-interface.yang
View File

@ -38,10 +38,6 @@ module sonic-interface {
key "name"; key "name";
ext:key-regex-configdb-to-yang "^(Ethernet[0-9]+)$";
ext:key-regex-yang-to-configdb "<name>";
leaf name { leaf name {
type leafref { type leafref {
path /port:sonic-port/port:PORT/port:PORT_LIST/port:name; path /port:sonic-port/port:PORT/port:PORT_LIST/port:name;
@ -63,10 +59,6 @@ module sonic-interface {
key "name ip-prefix"; key "name ip-prefix";
ext:key-regex-configdb-to-yang "^(Ethernet[0-9]+)|([a-fA-F0-9:./]+)$";
ext:key-regex-yang-to-configdb "<name>|<ip-prefix>";
leaf name { leaf name {
/* This node must be present in INTERFACE_LIST */ /* This node must be present in INTERFACE_LIST */
must "(current() = ../../INTERFACE_LIST[name=current()]/name)" must "(current() = ../../INTERFACE_LIST[name=current()]/name)"

8
src/sonic-yang-models/yang-models/sonic-loopback-interface.yang
View File

@ -29,10 +29,6 @@ module sonic-loopback-interface {
list LOOPBACK_INTERFACE_LIST { list LOOPBACK_INTERFACE_LIST {
key "name"; key "name";
ext:key-regex-configdb-to-yang "^([a-zA-Z0-9-_]+)$";
ext:key-regex-yang-to-configdb "<name>";
leaf name{ leaf name{
type string; type string;
} }
@ -50,10 +46,6 @@ module sonic-loopback-interface {
key "name ip-prefix"; key "name ip-prefix";
ext:key-regex-configdb-to-yang "^([a-zA-Z0-9-_]+)|([a-fA-F0-9:./]+$)";
ext:key-regex-yang-to-configdb "<name>|<ip-prefix>";
leaf name{ leaf name{
/* This node must be present in LOOPBACK_INTERFACE_LIST */ /* This node must be present in LOOPBACK_INTERFACE_LIST */
must "(current() = ../../LOOPBACK_INTERFACE_LIST[name=current()]/name)" must "(current() = ../../LOOPBACK_INTERFACE_LIST[name=current()]/name)"

4
src/sonic-yang-models/yang-models/sonic-port.yang
View File

@ -31,10 +31,6 @@ module sonic-port{
key "name"; key "name";
ext:key-regex-configdb-to-yang "^(Ethernet[0-9]+)$";
ext:key-regex-yang-to-configdb "<name>";
leaf name { leaf name {
type string { type string {
length 1..128; length 1..128;

4
src/sonic-yang-models/yang-models/sonic-portchannel.yang
View File

@ -35,10 +35,6 @@ module sonic-portchannel {
key "name"; key "name";
ext:key-regex-configdb-to-yang "^(PortChannel[0-9]{1,4})$";
ext:key-regex-yang-to-configdb "<name>";
leaf name { leaf name {
type string { type string {
length 1..128; length 1..128;

18
src/sonic-yang-models/yang-models/sonic-vlan.yang
View File

@ -42,10 +42,6 @@ module sonic-vlan {
key "name"; key "name";
ext:key-regex-configdb-to-yang "^(Vlan[a-zA-Z0-9_-]+)$";
ext:key-regex-yang-to-configdb "<name>";
leaf name { leaf name {
type leafref { type leafref {
path /vlan:sonic-vlan/vlan:VLAN/vlan:VLAN_LIST/vlan:name; path /vlan:sonic-vlan/vlan:VLAN/vlan:VLAN_LIST/vlan:name;
@ -65,10 +61,6 @@ module sonic-vlan {
key "name ip-prefix"; key "name ip-prefix";
ext:key-regex-configdb-to-yang "^(Vlan[a-zA-Z0-9_-]+)|([a-fA-F0-9:./]+$)";
ext:key-regex-yang-to-configdb "<name>|<ip-prefix>";
leaf name { leaf name {
/* This node must be present in VLAN_INTERFACE_LIST */ /* This node must be present in VLAN_INTERFACE_LIST */
must "(current() = ../../VLAN_INTERFACE_LIST[name=current()]/name)" must "(current() = ../../VLAN_INTERFACE_LIST[name=current()]/name)"
@ -119,11 +111,7 @@ module sonic-vlan {
list VLAN_LIST { list VLAN_LIST {
key "name"; key "name";
ext:key-regex-configdb-to-yang "^(Vlan[a-zA-Z0-9_-]+)$";
ext:key-regex-yang-to-configdb "<name>";
leaf name { leaf name {
type string { type string {
pattern 'Vlan([0-9]{1,3}|[1-3][0-9]{3}|[4][0][0-8][0-9]|[4][0][9][0-4])'; pattern 'Vlan([0-9]{1,3}|[1-3][0-9]{3}|[4][0][0-8][0-9]|[4][0][9][0-4])';
@ -168,10 +156,6 @@ module sonic-vlan {
key "name port"; key "name port";
ext:key-regex-configdb-to-yang "^(Vlan[a-zA-Z0-9-_]+)|(Ethernet[0-9]+)$";
ext:key-regex-yang-to-configdb "<name>|<port>";
leaf name { leaf name {
type leafref { type leafref {
path "/vlan:sonic-vlan/vlan:VLAN/vlan:VLAN_LIST/vlan:name"; path "/vlan:sonic-vlan/vlan:VLAN/vlan:VLAN_LIST/vlan:name";