Merge pull request #278 from project-arlo/cvl_sonic_yang_changes_rel_1.0

dutta-partha · web-flow · commit 20869c809e35 · 2019-11-15T12:37:39.000+05:30
Address PR review comments - phase2
diff --git a/models/yang/sonic/common/sonic-common.yang b/models/yang/sonic/common/sonic-common.yang
@@ -1,7 +1,7 @@
 
 module sonic-common {
 	namespace "http://github.com/Azure/sonic-common";
-	prefix scommon;
+	prefix cmn;
 
 	organization
 		"SONiC";
diff --git a/models/yang/sonic/sonic-acl.yang b/models/yang/sonic/sonic-acl.yang
@@ -1,6 +1,6 @@
 module sonic-acl {
 	namespace "http://github.com/Azure/sonic-acl";
-	prefix sacl;
+	prefix acl;
 	yang-version 1.1;
 
 	import ietf-inet-types {
@@ -117,14 +117,6 @@ module sonic-acl {
 					}
 				}
 
-				leaf MIRROR_ACTION {
-					type string {
-						pattern '[a-zA-Z0-9]{1}([-a-zA-Z0-9_]{1,63})' {
-							error-app-tag mirror-action-invalid;
-						}
-					}
-				}
-
 				leaf IP_TYPE {
 					mandatory true;
 					type enumeration {
@@ -181,7 +173,7 @@ module sonic-acl {
 				choice src_port {
 					case l4_src_port {
 						leaf L4_SRC_PORT {
-							type uint16;
+							type inet:port-number;
 						}
 					}
 					case l4_src_port_range {
@@ -198,7 +190,7 @@ module sonic-acl {
 				choice dst_port {
 					case l4_dst_port {
 						leaf L4_DST_PORT {
-							type uint16;
+							type inet:port-number;
 						}
 					}
 					case l4_dst_port_range {
@@ -221,11 +213,7 @@ module sonic-acl {
 				}
 
 				leaf DSCP { 
-					type uint8 {
-						range "0..63" {
-							error-app-tag dscp-invalid;
-						}
-					}
+					type inet:dscp;
 				}
 			}
 		}
diff --git a/models/yang/sonic/sonic-interface.yang b/models/yang/sonic/sonic-interface.yang
@@ -37,13 +37,15 @@ module sonic-interface {
 					}
 				}
 
+				/* Add a leafref, once VRF YANG is supported 
 				leaf vrf-name {
 					type string {
 						pattern 'Vrf([-a-zA-Z0-9_]{1,60})' {
 							error-app-tag vrf-name-invalid;
 						}
 					}
 				}
+				*/
 
 			}
 
diff --git a/models/yang/sonic/sonic-port.yang b/models/yang/sonic/sonic-port.yang
@@ -3,7 +3,7 @@ module sonic-port {
 	prefix prt;
 
 	import sonic-common {
-		prefix scommon;
+		prefix cmn;
 	}
 
 	organization
@@ -75,7 +75,7 @@ module sonic-port {
 				}
 
 				leaf admin_status {
-					type scommon:admin-status;
+					type cmn:admin-status;
 					default "down";
 				}
 			}
diff --git a/src/cvl/cvl_test.go b/src/cvl/cvl_test.go
@@ -1812,12 +1812,14 @@ func TestValidateEditConfig_Update_Syntax_DependentData_Redis_Positive(t *testin
 	loadConfigDB(rclient, mpi_acl_table_rule)
 
 	depDataMap := map[string]interface{}{
+	/* Use MIRROR session once supported  ---
 		"MIRROR_SESSION": map[string]interface{}{
 			"everflow2": map[string]interface{}{
 				"src_ip": "10.1.0.32",
 				"dst_ip": "2.2.2.2",
 			},
 		},
+		*/
 	}
 
 	loadConfigDB(rclient, depDataMap)
@@ -1829,7 +1831,10 @@ func TestValidateEditConfig_Update_Syntax_DependentData_Redis_Positive(t *testin
 			cvl.OP_UPDATE,
 			"ACL_RULE|TestACL13|Rule1",
 			map[string]string{
+				/* Use Mirror session when supported
 				"MIRROR_ACTION": "everflow2",
+				*/
+				"PACKET_ACTION" : "FORWARD",
 			},
 		},
 	}
@@ -3403,7 +3408,7 @@ func TestValidateEditConfig_Create_Syntax_Interface_OptionalKey_Positive(t *test
 			cvl.OP_CREATE,
 			"INTERFACE|Ethernet24",
 			map[string]string{
-				"vrf-name": "Vrf1",
+				/*"vrf-name": "Vrf1", -- Enable once VRF YANG implemented */
 			},
 		},
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`module sonic-acl {`
`2`	`2`	`namespace "http://github.com/Azure/sonic-acl";`
`3`		`- prefix sacl;`
	`3`	`+ prefix acl;`
`4`	`4`	`yang-version 1.1;`
`5`	`5`
`6`	`6`	`import ietf-inet-types {`
`@@ -117,14 +117,6 @@ module sonic-acl {`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
`120`		`- leaf MIRROR_ACTION {`
`121`		`- type string {`
`122`		`- pattern '[a-zA-Z0-9]{1}([-a-zA-Z0-9_]{1,63})' {`
`123`		`- error-app-tag mirror-action-invalid;`
`124`		`- }`
`125`		`- }`
`126`		`- }`
`127`		`-`
`128`	`120`	`leaf IP_TYPE {`
`129`	`121`	`mandatory true;`
`130`	`122`	`type enumeration {`
`@@ -181,7 +173,7 @@ module sonic-acl {`
`181`	`173`	`choice src_port {`
`182`	`174`	`case l4_src_port {`
`183`	`175`	`leaf L4_SRC_PORT {`
`184`		`- type uint16;`
	`176`	`+ type inet:port-number;`
`185`	`177`	`}`
`186`	`178`	`}`
`187`	`179`	`case l4_src_port_range {`
`@@ -198,7 +190,7 @@ module sonic-acl {`
`198`	`190`	`choice dst_port {`
`199`	`191`	`case l4_dst_port {`
`200`	`192`	`leaf L4_DST_PORT {`
`201`		`- type uint16;`
	`193`	`+ type inet:port-number;`
`202`	`194`	`}`
`203`	`195`	`}`
`204`	`196`	`case l4_dst_port_range {`
`@@ -221,11 +213,7 @@ module sonic-acl {`
`221`	`213`	`}`
`222`	`214`
`223`	`215`	`leaf DSCP {`
`224`		`- type uint8 {`
`225`		`- range "0..63" {`
`226`		`- error-app-tag dscp-invalid;`
`227`		`- }`
`228`		`- }`
	`216`	`+ type inet:dscp;`
`229`	`217`	`}`
`230`	`218`	`}`
`231`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,15 @@ module sonic-interface {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ /* Add a leafref, once VRF YANG is supported`
`40`	`41`	`leaf vrf-name {`
`41`	`42`	`type string {`
`42`	`43`	`pattern 'Vrf([-a-zA-Z0-9_]{1,60})' {`
`43`	`44`	`error-app-tag vrf-name-invalid;`
`44`	`45`	`}`
`45`	`46`	`}`
`46`	`47`	`}`
	`48`	`+ */`
`47`	`49`
`48`	`50`	`}`
`49`	`51`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module sonic-port {`
`3`	`3`	`prefix prt;`
`4`	`4`
`5`	`5`	`import sonic-common {`
`6`		`- prefix scommon;`
	`6`	`+ prefix cmn;`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`organization`
`@@ -75,7 +75,7 @@ module sonic-port {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`leaf admin_status {`
`78`		`- type scommon:admin-status;`
	`78`	`+ type cmn:admin-status;`
`79`	`79`	`default "down";`
`80`	`80`	`}`
`81`	`81`	`}`