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

Address PR review comments - phase2
project-arlo · Nov 15, 2019 · 20869c8 · 20869c8
2 parents a9e5a85 + d97e540
commit 20869c8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 20 deletions.
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 */
 			},
 		},
 	}