From bfe986e9d4f21b8925ffb800350ae8f6b3b69b30 Mon Sep 17 00:00:00 2001
From: Preetham Singh <preetham.singh@broadcom.com>
Date: Fri, 10 Jun 2022 23:37:53 -0700
Subject: [PATCH] This commit addresses below issues: 1. Short Format
 Subinterface getting deleted after vrf binding . Issue
 10802:https://github.com/Azure/sonic-buildimage/issues/10802 2. Do not allow
 short format subinterface to be created without encap vlan configuration.
 Issue 10878: https://github.com/Azure/sonic-buildimage/issues/10878

---
 config/main.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/main.py b/config/main.py
index b9713e1535..75ed138174 100644
--- a/config/main.py
+++ b/config/main.py
@@ -6810,6 +6810,10 @@ def add_subinterface(ctx, subinterface_name, vid):
     subintf_dict = {}
     if vid is not None:
         subintf_dict.update({"vlan" : vid})
+
+    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"})
     
     try: