Bug Fixes from Broadcom as of 12th Sep

src/CLI/clitree/cli-xml/acl.xml

@@ -141,7 +141,7 @@
         <PARAM
             name="seq-no"
             help="Sequence number"
-            ptype="RANGE_1_4294967295"
+            ptype="RANGE_1_65535"
             />
         <ACTION>python $SONIC_CLI_ROOT/sonic-cli.py delete_openconfig_acl_acl_acl_sets_acl_set_acl_entries_acl_entry ${name} ACL_IPV4 ${seq-no}</ACTION>
     </COMMAND>
@@ -153,7 +153,7 @@
          <PARAM
              name="seq-no"
              help="Sequence number"
-             ptype="RANGE_1_4294967295"
+             ptype="RANGE_1_65535"
              >
              <PARAM
                  name="seq-options"

src/CLI/clitree/cli-xml/sonic_types.xml

@@ -74,6 +74,13 @@
 	help=""
 	/>
     <!--=======================================================-->
+    <PTYPE
+        name="RANGE_1_65535"
+        method="integer"
+        pattern="1..65535"
+        help=""
+    />
+    <!--=======================================================-->
     <PTYPE
         name="RANGE_1_4294967295"
         method="unsignedInteger"

src/cvl/conf/cvl_cfg.json

@@ -11,9 +11,9 @@
 	"__comment1__": "Set LOGTOSTDER to 'true' to log on standard error",
 	"LOGTOSTDERR": "false",
 	"__comment2__": "Display log upto INFO level",
-	"STDERRTHRESHOLD": "INFO",
+	"STDERRTHRESHOLD": "ERROR",
 	"__comment3__": "Display log upto INFO level 8",
-	"VERBOSITY": "8",
+	"VERBOSITY": "0",
 	"SKIP_VALIDATION": "false",
 	"SKIP_SEMANTIC_VALIDATION": "false"
 }

src/cvl/cvl.go

@@ -444,7 +444,12 @@ func getRedisToYangKeys(tableName string, redisKey string)[]keyValuePairStruct{
 	keyPatterns := strings.Split(modelInfo.tableInfo[tableName].redisKeyPattern,
 			modelInfo.tableInfo[tableName].redisKeyDelim) //split by DB separator
 
-	if (len(keyNames) != len(keyVals)) {
+	/* TBD. Workaround for optional keys in INTERFACE Table.
+	   Code will be removed once model is finalized. */
+	if  ((tableName == "INTERFACE") && (len(keyNames) != len(keyVals))) {
+		keyVals = append(keyVals, "0.0.0.0/0")
+
+	} else if (len(keyNames) != len(keyVals)) {
 		return nil //number key names and values does not match
 	}
 
@@ -998,6 +1003,12 @@ func (c *CVL) addLeafRef(config bool, tableName string, name string, value strin
 
 
 func (c *CVL) addChildLeaf(config bool, tableName string, parent *yparser.YParserNode, name string, value string) {
+
+	/* If there is no value then assign default space string. */
+	if len(value) == 0 {
+                value = " "
+        }
+
 	//Batch leaf creation
 	c.batchLeaf = c.batchLeaf + name + "#" + value + "#"
 	//Check if this leaf has leafref,

src/cvl/cvl_test.go

@@ -2612,7 +2612,7 @@ func TestValidateEditConfig_DepData_Through_Cache(t *testing.T) {
 	depDataMap = map[string]interface{} {
 		"PORT" : map[string]interface{} {
 			"Ethernet3" : map[string]interface{} {
-				"mtu": "9500",
+				"mtu": "9200",
 			},
 		},
 	}
@@ -3104,7 +3104,6 @@ func TestValidateEditConfig_Two_Updates_Positive(t *testing.T) {
 	unloadConfigDB(rclient, depDataMap)
 
 }
-
 func TestValidateEditConfig_Create_Syntax_DependentData_PositivePortChannel(t *testing.T) {
 
 	cfgData := []cvl.CVLEditConfigData{
@@ -3321,3 +3320,106 @@ func TestValidateEditConfig_Use_Updated_Data_As_Create_DependentData_Single_Call
 		t.Errorf("Config Validation failed -- error details %v", cvlErrInfo)
 	}
 }
+
+func TestValidateEditConfig_Create_Syntax_Interface_AllKeys_Positive(t *testing.T) {
+
+	cfgData := []cvl.CVLEditConfigData{
+		cvl.CVLEditConfigData{
+			cvl.VALIDATE_ALL,
+			cvl.OP_CREATE,
+			"INTERFACE|Ethernet24|10.0.0.0/31",
+			map[string]string{
+			},
+		},
+	}
+
+	cvSess, _ := cvl.ValidationSessOpen()
+
+	cvlErrInfo, _ := cvSess.ValidateEditConfig(cfgData)
+
+	cvl.ValidationSessClose(cvSess)
+
+	WriteToFile(fmt.Sprintf("\nCVL Error Info is  %v\n", cvlErrInfo))
+
+	if cvlErrInfo.ErrCode != cvl.CVL_SUCCESS {
+		t.Errorf("Config Validation failed -- error details %v", cvlErrInfo)
+	}
+}
+
+func TestValidateEditConfig_Create_Syntax_Interface_OptionalKey_Positive(t *testing.T) {
+
+	cfgData := []cvl.CVLEditConfigData{
+		cvl.CVLEditConfigData{
+			cvl.VALIDATE_ALL,
+			cvl.OP_CREATE,
+			"INTERFACE|Ethernet24",
+			map[string]string{
+			},
+		},
+	}
+
+	cvSess, _ := cvl.ValidationSessOpen()
+
+	cvlErrInfo, _ := cvSess.ValidateEditConfig(cfgData)
+
+	cvl.ValidationSessClose(cvSess)
+
+	WriteToFile(fmt.Sprintf("\nCVL Error Info is  %v\n", cvlErrInfo))
+
+	if cvlErrInfo.ErrCode != cvl.CVL_SUCCESS {
+		t.Errorf("Config Validation failed -- error details %v", cvlErrInfo)
+	}
+}
+
+func TestValidateEditConfig_Create_Syntax_Interface_IncorrectKey_Negative(t *testing.T) {
+
+	cfgData := []cvl.CVLEditConfigData{
+		cvl.CVLEditConfigData{
+			cvl.VALIDATE_ALL,
+			cvl.OP_CREATE,
+			"INTERFACE|10.0.0.0/31",
+			map[string]string{
+			},
+		},
+	}
+
+	cvSess, _ := cvl.ValidationSessOpen()
+
+	cvlErrInfo, _ := cvSess.ValidateEditConfig(cfgData)
+
+	cvl.ValidationSessClose(cvSess)
+
+	WriteToFile(fmt.Sprintf("\nCVL Error Info is  %v\n", cvlErrInfo))
+
+	if cvlErrInfo.ErrCode == cvl.CVL_SUCCESS {
+		t.Errorf("Config Validation failed -- error details %v", cvlErrInfo)
+	}
+}
+
+func TestValidateEditConfig_EmptyNode_Positive(t *testing.T) {
+        cvSess, _ := cvl.ValidationSessOpen()
+
+
+        cfgData := []cvl.CVLEditConfigData{
+                cvl.CVLEditConfigData{
+                        cvl.VALIDATE_ALL,
+                        cvl.OP_UPDATE,
+                        "PORT|Ethernet0",
+                        map[string]string{
+                                "description": "",
+                                "index": "3",
+                        },
+                },
+        }
+
+        cvlErrInfo, _ := cvSess.ValidateEditConfig(cfgData)
+
+        cvl.ValidationSessClose(cvSess)
+
+        WriteToFile(fmt.Sprintf("\nCVL Error Info is  %v\n", cvlErrInfo))
+
+        if cvlErrInfo.ErrCode != cvl.CVL_SUCCESS {
+                t.Errorf("Config Validation failed -- error details %v", cvlErrInfo)
+        }
+
+}

src/cvl/schema/sonic-port.yang

@@ -59,7 +59,12 @@ module sonic-port {
 			}
 
 			leaf mtu{
-				type uint32;
+				type uint32 {
+					range "1312..9216" {
+						error-message "Invalid MTU value";
+						error-app-tag mtu-invalid;
+					}
+				}
 			}
 
 			leaf lanes {

src/translib/acl_app.go

@@ -1209,6 +1209,7 @@ func (app *AclApp) createDefaultDenyAclRule(d *db.DB, aclName string, rulesInfo
 	rulesInfo["DEFAULT_RULE"] = db.Value{Field: m}
 	rulesInfo["DEFAULT_RULE"].Field["PRIORITY"] = strconv.FormatInt(int64(MIN_PRIORITY), 10)
 	rulesInfo["DEFAULT_RULE"].Field["PACKET_ACTION"] = "DROP"
+	rulesInfo["DEFAULT_RULE"].Field["IP_TYPE"] = "ANY"
 }
 
 func convertOCAclRuleToInternalAclRule(ruleData db.Value, seqId uint32, aclName string, aclType ocbinds.E_OpenconfigAcl_ACL_TYPE, rule *ocbinds.OpenconfigAcl_Acl_AclSets_AclSet_AclEntries_AclEntry) {