Merge pull request sonic-net#28 from e-sonic/default_lossless_leaf_re…

…moval [SNC-16197] Remove default-lossless-buffer-profile leaf
project-arlo · Jan 31, 2022 · 30a4e24 · 30a4e24
2 parents 07c27d5 + 9dc39b0
commit 30a4e24
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 93 deletions.
diff --git a/cvl/custom_validation/sonic_qos_buffer.go b/cvl/custom_validation/sonic_qos_buffer.go
@@ -407,16 +407,3 @@ func (t *CustomValidation) ValidateGetOper(
 	}
 	return CVLErrorInfo{ErrCode: CVL_SUCCESS}
 }
-
-func (t *CustomValidation) ValidateGetOperLeaf(
-	vc *CustValidationCtxt) CVLErrorInfo {
-
-	if (vc.CurCfg.VOp == OP_CREATE) || (vc.CurCfg.VOp == OP_UPDATE) || (vc.CurCfg.VOp == OP_DELETE) {
-		return CVLErrorInfo{
-			ErrCode:          CVL_ERROR,
-			ConstraintErrMsg: "Only Get operation allowed for default_lossless_buffer_profile!",
-			ErrAppTag:        "invalid-operation",
-		}
-	}
-	return CVLErrorInfo{ErrCode: CVL_SUCCESS}
-}
diff --git a/models/yang/annotations/openconfig-qos-annot.yang b/models/yang/annotations/openconfig-qos-annot.yang
@@ -1025,20 +1025,4 @@ module openconfig-qos-annot {
       sonic-ext:field-name "qindex";
     }
   }
-
-  deviation /oc-qos:qos/oc-qos:interfaces/oc-qos:interface/oc-qos-dev:buffer/oc-qos-dev:config/oc-qos-dev:default-lossless-buffer-profile {
-    deviate add {
-      sonic-ext:table-name "PORT";
-      sonic-ext:field-name "default_lossless_buffer_profile";
-    }
-  }
-
-  deviation /oc-qos:qos/oc-qos:interfaces/oc-qos:interface/oc-qos-dev:buffer/oc-qos-dev:state/oc-qos-dev:default-lossless-buffer-profile {
-    deviate add {
-      sonic-ext:db-name "APPL_DB";
-      sonic-ext:table-name "PORT_TABLE";
-      sonic-ext:field-name "default_lossless_buffer_profile";
-    }
-  }
-
 }
diff --git a/models/yang/extensions/openconfig-qos-deviation.yang b/models/yang/extensions/openconfig-qos-deviation.yang
@@ -124,51 +124,4 @@ module openconfig-qos-deviation {
   deviation /oc-qos:qos/oc-qos:classifiers {
     deviate not-supported;
   }
-
-  grouping qos-interface-buffer-top {
-    description
-      "Qos Buffer for interface.";
-
-    container buffer {
-      description
-        "Qos data for interface";
-
-      container config {
-        description
-          "Configuration data for Qos";
-
-        leaf default-lossless-buffer-profile {
-          type boolean;
-          default false;
-          description
-            "Enable/disable the creation and use of the system's pre-defined
-             default lossless buffer-profiles during QoS-buffer initialization.
-             When disabled (false) the default lossless buffer-profiles
-             (e.g. pg_lossless_40000_300m_profile) will not be created
-             automatically and the user can define their customized lossless
-             buffer-profiles.";
-        }
-      }
-
-      container state {
-        config false;
-        description
-          "Operational data for Qos";
-
-        leaf default-lossless-buffer-profile {
-          type boolean;
-          description
-            "Use of system's pre-defined default lossless buffer-profiles is enabled/disabled.";
-        }
-      }
-    }
-  }
-
-  augment /oc-qos:qos/oc-qos:interfaces/oc-qos:interface {
-    description
-      "Configuration and operational specific data for Qos-Buffer on interfaces.";
-    uses qos-interface-buffer-top;
-  }
-
-
 }
diff --git a/models/yang/sonic/sonic-port.yang b/models/yang/sonic/sonic-port.yang
@@ -189,18 +189,6 @@ module sonic-port {
                 }
 				uses errdisable_link_flap_config;
 
-                leaf default_lossless_buffer_profile {
-                    type boolean;
-                    default false;
-		    sonic-ext:custom-validation ValidateGetOperLeaf;
-                    description
-                        "Enable/disable the creation and use of the system's pre-defined
-                         default lossless buffer-profiles during QoS-buffer initialization.
-                         When disabled (false) the default lossless buffer-profiles
-                         (e.g. pg_lossless_40000_300m_profile) will not be created
-                         automatically and the user can define their customized lossless
-                         buffer-profiles.";
-                }
             }
         }
         container PORT_TABLE {
@@ -288,11 +276,6 @@ module sonic-port {
                     type string;
                 }
 
-                leaf default_lossless_buffer_profile {
-                    type boolean;
-                    description
-                        "Use of system's pre-defined default lossless buffer-profiles is enabled/disabled.";
-                }
             }
         }
     }