3535from utilities_common import util_base
3636from swsscommon import swsscommon
3737from swsscommon .swsscommon import SonicV2Connector , ConfigDBConnector , ConfigDBPipeConnector , \
38- is_interface_name_valid , IFACE_NAME_MAX_LEN
38+ isInterfaceNameValid , IFACE_NAME_MAX_LEN
3939from utilities_common .db import Db
4040from utilities_common .intf_filter import parse_interface_in_filter
4141from utilities_common import bgp_util
@@ -439,7 +439,7 @@ def is_portchannel_name_valid(portchannel_name):
439439 if (portchannel_name [CFG_PORTCHANNEL_PREFIX_LEN :].isdigit () is False or
440440 int (portchannel_name [CFG_PORTCHANNEL_PREFIX_LEN :]) > CFG_PORTCHANNEL_MAX_VAL ) :
441441 return False
442- if not is_interface_name_valid (portchannel_name ):
442+ if not isInterfaceNameValid (portchannel_name ):
443443 return False
444444 return True
445445
@@ -6031,7 +6031,7 @@ def add_vrf(ctx, vrf_name):
60316031 config_db = ValidatedConfigDBConnector (ctx .obj ['config_db' ])
60326032 if not vrf_name .startswith ("Vrf" ) and not (vrf_name == 'mgmt' ) and not (vrf_name == 'management' ):
60336033 ctx .fail ("'vrf_name' must begin with 'Vrf' or named 'mgmt'/'management' in case of ManagementVRF." )
6034- if not is_interface_name_valid (vrf_name ):
6034+ if not isInterfaceNameValid (vrf_name ):
60356035 ctx .fail ("'vrf_name' length should not exceed {} characters" .format (IFACE_NAME_MAX_LEN ))
60366036 if is_vrf_exists (config_db , vrf_name ):
60376037 ctx .fail ("VRF {} already exists!" .format (vrf_name ))
@@ -6051,7 +6051,7 @@ def del_vrf(ctx, vrf_name):
60516051 config_db = ValidatedConfigDBConnector (ctx .obj ['config_db' ])
60526052 if not vrf_name .startswith ("Vrf" ) and not (vrf_name == 'mgmt' ) and not (vrf_name == 'management' ):
60536053 ctx .fail ("'vrf_name' must begin with 'Vrf' or named 'mgmt'/'management' in case of ManagementVRF." )
6054- if not is_interface_name_valid (vrf_name ):
6054+ if not isInterfaceNameValid (vrf_name ):
60556055 ctx .fail ("'vrf_name' length should not exceed {} characters" .format ((IFACE_NAME_MAX_LEN )))
60566056 syslog_table = config_db .get_table ("SYSLOG_SERVER" )
60576057 syslog_vrf_dev = "mgmt" if vrf_name == "management" else vrf_name
@@ -7830,7 +7830,7 @@ def add_subinterface(ctx, subinterface_name, vid):
78307830
78317831 if interface_alias is None :
78327832 ctx .fail ("{} invalid subinterface" .format (interface_alias ))
7833- if not is_interface_name_valid (interface_alias ):
7833+ if not isInterfaceNameValid (interface_alias ):
78347834 ctx .fail ("Subinterface name length should not exceed {} characters" .format (IFACE_NAME_MAX_LEN ))
78357835
78367836 if interface_alias .startswith ("Po" ) is True :
0 commit comments