Using updated py common utility subintf apis and updating mock_tables

Author: preetham-singh

config/main.py

@@ -20,7 +20,7 @@
 from portconfig import get_child_ports
 from socket import AF_INET, AF_INET6
 from sonic_py_common import device_info, multi_asic
-from sonic_py_common.interface import get_interface_table_name, get_port_table_name, intf_get_longname
+from sonic_py_common.interface import get_interface_table_name, get_port_table_name, get_intf_longname
 from utilities_common import util_base
 from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector
 from utilities_common.db import Db
@@ -5901,7 +5901,7 @@ def add_subinterface(ctx, subinterface_name, vid):
     if interface_alias is not None:
         if not port_dict:
             ctx.fail("{} parent interface not found. {} table none".format(interface_alias, intf_table_name))
-        if intf_get_longname(interface_alias) not in port_dict.keys():
+        if get_intf_longname(interface_alias) not in port_dict.keys():
             ctx.fail("{} parent interface not found".format(subinterface_name))
 
     # Validate if parent is portchannel member
@@ -5924,7 +5924,7 @@ def add_subinterface(ctx, subinterface_name, vid):
     if vid is not None:
         subintf_dict.update({"vlan" : vid})
 
-    if subintf_vlan_check(config_db, intf_get_longname(interface_alias), vid) is True:
+    if subintf_vlan_check(config_db, get_intf_longname(interface_alias), vid) is True:
         ctx.fail("Vlan {} encap already configured on other subinterface on {}".format(vid, interface_alias))
 
     subintf_dict.update({"admin_status" : "up"})

scripts/intfutil

@@ -10,7 +10,7 @@ from tabulate import tabulate
 from utilities_common import constants
 from utilities_common import multi_asic as multi_asic_util
 from utilities_common.intf_filter import parse_interface_in_filter
-from sonic_py_common.interface import intf_get_longname
+from sonic_py_common.interface import get_intf_longname
 
 # mock the redis for unit test purposes #
 try:
@@ -314,7 +314,7 @@ def appl_db_portchannel_status_get(appl_db, config_db, po_name, status_type, por
 def appl_db_sub_intf_status_get(appl_db, config_db, front_panel_ports_list, portchannel_speed_dict, sub_intf_name, status_type):
     sub_intf_sep_idx = sub_intf_name.find(VLAN_SUB_INTERFACE_SEPARATOR)
     if sub_intf_sep_idx != -1:
-        parent_port_name = intf_get_longname(sub_intf_name[:sub_intf_sep_idx])
+        parent_port_name = get_intf_longname(sub_intf_name[:sub_intf_sep_idx])
 
         full_intf_table_name = "INTF_TABLE" + ":" + sub_intf_name
 

tests/mock_tables/appl_db.json

@@ -136,7 +136,8 @@
         "speed": "100000"
     },
     "INTF_TABLE:Ethernet0.10": {
-        "admin_status": "up"
+        "admin_status": "up",
+        "vlan": "10"
     },
     "INTF_TABLE:Eth64.10": {
         "admin_status": "up",