Cvl yang cleanup

Makefile

@@ -101,6 +101,7 @@ install:
 	$(INSTALL) -d $(DESTDIR)/usr/sbin/schema/
 	$(INSTALL) -d $(DESTDIR)/usr/sbin/lib/
 	$(INSTALL) -D $(TOPDIR)/src/cvl/schema/*.yin $(DESTDIR)/usr/sbin/schema/
+	$(INSTALL) -D $(TOPDIR)/src/cvl/testdata/schema/*.yin $(DESTDIR)/usr/sbin/schema/
 	cp -rf $(TOPDIR)/build/rest_server/dist/ui/ $(DESTDIR)/rest_ui/
 	cp -rf $(TOPDIR)/build/cli $(DESTDIR)/usr/sbin/
 	cp -rf $(TOPDIR)/build/swagger_client_py/ $(DESTDIR)/usr/sbin/lib/

src/cvl/Makefile

@@ -50,7 +50,10 @@ tests:
 	make -C tests
 
 gotest:
-	 CVL_CFG_FILE=$(abspath .)/conf/cvl_cfg.json CVL_SCHEMA_PATH=$(abspath .)/schema GOPATH=$(GOPATH) tests/run_test.sh
+	make -C schema
+	make -C testdata/schema
+	cp schema/*.yin testdata/schema
+	CVL_CFG_FILE=$(abspath .)/conf/cvl_cfg.json CVL_SCHEMA_PATH=$(abspath .)/testdata/schema GOPATH=$(GOPATH) tests/run_test.sh
 
 clean:
 	make -C tests clean

src/cvl/cvl_test.go

@@ -2806,16 +2806,16 @@ func TestBadSchema(t *testing.T) {
 
 	if _, err := os.Stat("/usr/sbin/schema"); os.IsNotExist(err) {
 		//Corrupt some schema file 
-		exec.Command("/bin/sh", "-c", "/bin/cp schema/sonic-port.yin schema/sonic-port.yin.bad" + 
-		" && /bin/sed -i '1 a <junk>' schema/sonic-port.yin.bad").Output()
+		exec.Command("/bin/sh", "-c", "/bin/cp testdata/schema/sonic-port.yin testdata/schema/sonic-port.yin.bad" + 
+		" && /bin/sed -i '1 a <junk>' testdata/schema/sonic-port.yin.bad").Output()
 
 		//Parse bad schema file
-		if module, _ := yparser.ParseSchemaFile("schema/sonic-port.yin.bad.1"); module != nil { //should fail
+		if module, _ := yparser.ParseSchemaFile("testdata/schema/sonic-port.yin.bad"); module != nil { //should fail
 			t.Errorf("Bad schema parsing should fail.")
 		}
 
 		//Revert to 
-		exec.Command("/bin/sh",  "-c", "/bin/rm schema/sonic-port.yin.bad").Output()
+		exec.Command("/bin/sh",  "-c", "/bin/rm testdata/schema/sonic-port.yin.bad").Output()
 	} else {
 		//Corrupt some schema file 
 		exec.Command("/bin/sh", "-c", "/bin/cp /usr/sbin/schema/sonic-port.yin /usr/sbin/schema/sonic-port.yin.bad" + 

src/cvl/internal/yparser/yparser.go

@@ -250,7 +250,12 @@ func ParseSchemaFile(modelFile string) (*YParserModule, YParserError) {
 //Add child node to a parent node
 func(yp *YParser) AddChildNode(module *YParserModule, parent *YParserNode, name string) *YParserNode {
 
-	return (*YParserNode)(C.lyd_new((*C.struct_lyd_node)(parent), (*C.struct_lys_module)(module), C.CString(name)))
+	ret := (*YParserNode)(C.lyd_new((*C.struct_lyd_node)(parent), (*C.struct_lys_module)(module), C.CString(name)))
+	if (ret == nil) {
+		TRACE_LOG(INFO_DEBUG, TRACE_YPARSER, "Failed parsing node %s\n", name)
+	}
+
+	return ret
 }
 
 //Add child node to a parent node

src/cvl/schema/sonic-acl.yang

@@ -19,23 +19,15 @@ module sonic-acl {
 		prefix prt;
 	}
 
-	import sonic-portchannel {
-		prefix spc;
-	}
-
 	import sonic-mirror-session {
 		prefix sms;
 	}
 
-	import sonic-pf-limits {
-		prefix spf;
-	}
-
 	organization
-		"BRCM";
+		"SONiC";
 
 	contact
-		"BRCM";
+		"SONiC";
 
 	description
 		"SONIC ACL";
@@ -50,13 +42,12 @@ module sonic-acl {
 		list ACL_TABLE {
 			key "aclname";
 
-			/* must "count(/prt:sonic-port/prt:PORT) > 0"; */
 
 			leaf aclname {
-                type string {
-                    pattern '[a-zA-Z0-9]{1}([-a-zA-Z0-9_]{0,71})';
-                    length 1..72;
-                }
+				type string {
+					pattern '[a-zA-Z0-9]{1}([-a-zA-Z0-9_]{0,71})';
+					length 1..72;
+				}
 			}
 
 			leaf policy_desc {
@@ -84,30 +75,14 @@ module sonic-acl {
 			}
 
 			leaf-list ports {
-				type union { 
-					type leafref {
-						path "/prt:sonic-port/prt:PORT/prt:ifname";
-					}
-					type leafref {
-						path "/spc:sonic-portchannel/spc:PORTCHANNEL/spc:name";
-					}
+				type leafref {
+					path "/prt:sonic-port/prt:PORT/prt:ifname";
 				}
 			}
 		}
 
 		list ACL_RULE { 
 			key "aclname rulename";
-			scommon:pf-check    "ACL_CheckAclLimits";	
-
-			/* Limit for number of dynamic ACL rules */	
-			/*must "count(../ACL_RULE) > /spf:sonic-pf-limits/acl/MAX_ACL_RULES" {
-				error-message "Number of ACL rules reached max platform limit.";
-			}
-			must "PRIORITY > /spf:sonic-pf-limits/acl/MAX_PRIORITY" {
-				error-message "Invalid ACL rule priority.";
-			}
-			 must "count(../ACL_TABLE) > 0 and count(/prt:sonic-port/prt:PORT) > 0"; //Temporary work-around 
-			 */
 
 			leaf aclname {
 				type leafref {
@@ -116,7 +91,7 @@ module sonic-acl {
 				must "(/scommon:operation/scommon:operation != 'DELETE') or " +
 					"count(current()/../../ACL_TABLE[aclname=current()]/ports) = 0" {
 						error-message "Ports are already bound to this rule.";
-				}
+					}
 			} 
 
 			leaf rulename {
@@ -127,7 +102,7 @@ module sonic-acl {
 				type uint16 {
 					range "1..65535"{
 						error-message "Invalid ACL rule priority.";
-					}
+				}
 				}
 			}
 
@@ -160,16 +135,16 @@ module sonic-acl {
 					enum NON_IPV6;
 				}
 			}
-		
+
 			leaf IP_PROTOCOL {
 				type uint8 {
 					range "1|2|6|17|46|47|51|103|115";
 				}
 			}
 
 			leaf ETHER_TYPE {
-				type string{
-					pattern "(0x88CC)|(0x8100)|(0x8915)|(0x0806)|(0x0800)|(0x86DD)|(0x8847)"{
+				type string {
+					pattern "(0x88CC)|(0x8100)|(0x8915)|(0x0806)|(0x0800)|(0x86DD)|(0x8847)" {
 						error-message "Invalid ACL Rule Ether Type";
 						error-app-tag ether-type-invalid;
 					}

src/cvl/schema/sonic-common.yang

@@ -8,10 +8,10 @@ module sonic-common {
 	}
 
 	organization
-		"BRCM";
+		"SONiC";
 
 	contact
-		"BRCM";
+		"SONiC";
 
 	description
 		"SONIC VLAN";
@@ -22,18 +22,18 @@ module sonic-common {
 	}
 
 	typedef tagging_mode {
-			type enumeration {
-				enum untagged;
-				enum tagged;
-				enum priority_tagged;
-			}
+		type enumeration {
+			enum untagged;
+			enum tagged;
+			enum priority_tagged;
+		}
 	}
 
 	typedef admin-status {
-			type enumeration {
-				enum up;
-				enum down;
-			}
+		type enumeration {
+			enum up;
+			enum down;
+		}
 	}
 
 	extension custom-handler {
@@ -63,19 +63,19 @@ module sonic-common {
 	extension map-list {
 		description
 			"If it is a map list";
-		argument "value"; //
+		argument "value"; 
 	}
 
 	extension map-leaf {
 		description
 			"Map leaf names";
-		argument "value"; //
+		argument "value"; 
 	}
 
 	extension pf-check {
 		description
 			"Platform specific validation";
-		argument "handler"; //
+		argument "handler"; 
 	}
 
 	container operation {

src/cvl/schema/sonic-interface.yang

@@ -7,8 +7,8 @@ module sonic-interface {
 	}
 
 	import ietf-inet-types {
-                prefix inet;
-        }
+		prefix inet;
+	}
 
 	import sonic-common {
 		prefix scommon;
@@ -19,10 +19,10 @@ module sonic-interface {
 	}
 
 	organization
-		"BRCM";
+		"SONiC";
 
 	contact
-		"BRCM";
+		"SONiC";
 
 	description
 		"SONIC INTERFACE";
@@ -38,13 +38,13 @@ module sonic-interface {
 
 			leaf portname{
 				type leafref {
-                                        path "/prt:sonic-port/prt:PORT/prt:ifname";
-                                }
+					path "/prt:sonic-port/prt:PORT/prt:ifname";
+				}
 			}
 
 			leaf ip_prefix {
-				 mandatory true;
-                                 type inet:ip-prefix;
+				mandatory true;
+				type inet:ip-prefix;
 
 			}
 		}

src/cvl/schema/sonic-mirror-session.yang

@@ -15,10 +15,10 @@ module sonic-mirror-session {
 	}
 
 	organization
-		"BRCM";
+		"SONiC";
 
 	contact
-		"BRCM";
+		"SONiC";
 
 	description
 		"SONIC MIRROR SESSION";

src/cvl/schema/sonic-port.yang

@@ -11,10 +11,10 @@ module sonic-port {
 	}
 
 	organization
-		"BRCM";
+		"SONiC";
 
 	contact
-		"BRCM";
+		"SONiC";
 
 	description
 		"SONIC VLAN";
@@ -33,11 +33,11 @@ module sonic-port {
 				type string {
 					pattern "Ethernet([1-3][0-9]{3}|[1-9][0-9]{2}|[1-9][0-9]|[0-9])"{
 						error-message "Invalid interface name";
-						error-app-tag interface-name-invalid;
-					}
+					error-app-tag interface-name-invalid;
+				}
 				}
 			}
-			
+
 			leaf index {
 				type uint16;
 			}

src/cvl/testdata/schema/Makefile

@@ -0,0 +1,44 @@
+################################################################################
+#                                                                              #
+#  Copyright 2019 Broadcom. The term Broadcom refers to Broadcom Inc. and/or   #
+#  its subsidiaries.                                                           #
+#                                                                              #
+#  Licensed under the Apache License, Version 2.0 (the "License");             #
+#  you may not use this file except in compliance with the License.            #
+#  You may obtain a copy of the License at                                     #
+#                                                                              #
+#     http://www.apache.org/licenses/LICENSE-2.0                               #
+#                                                                              #
+#  Unless required by applicable law or agreed to in writing, software         #
+#  distributed under the License is distributed on an "AS IS" BASIS,           #
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    #
+#  See the License for the specific language governing permissions and         #
+#  limitations under the License.                                              #
+#                                                                              #
+################################################################################
+
+src_files=$(wildcard *.yang)
+out=$(patsubst %.yang, %.yin, $(src_files)) 
+out_ext=$(patsubst %.yang, %.tree, $(src_files)) 
+
+all:schema
+
+schema: $(out)
+
+%.yin:%.yang
+	@echo "Generating $@ ..."
+	@devFile="`echo $< | cut -d . -f1`-dev.yang"; \
+	if [ -f $$devFile ] ; then devOpt="--deviation-module $$devFile"; fi; \
+	pyang -p ../../schema/:../../schema/ietf/ -f yin $$devOpt $< -o [email protected]
+	@xmllint  --noblanks  [email protected] > $@
+	@rm -rf  [email protected]
+
+%.tree:%.yang
+	@echo "Generating $@ ..."
+	@devFile="`echo $< | cut -d . -f1`-dev.yang"; \
+	if [ -f $$devFile ] ; then devOpt="--deviation-module $$devFile"; fi; \
+	pyang -p ../../schema/:../../schema/ietf/ -f tree $$devOpt $< -o $@
+
+clean:
+	@echo "Removing files ..."
+	rm -rf *.yin

src/cvl/schema/sonic-acl-dev.yang → src/cvl/testdata/schema/sonic-acl-dev.yang

@@ -21,13 +21,13 @@ module sonic-acl-dev {
 
 
 	organization
-		"BRCM";
+		"SONiC";
 
 	contact
-		"BRCM";
+		"SONiC";
 
 	description
-		"SONIC ACLi Deviations";
+		"SONIC ACL Deviations";
 
 	revision 2019-05-15 {
 		description

src/cvl/schema/sonic-bgp-neighbor.yang → src/cvl/testdata/schema/sonic-bgp-neighbor.yang

@@ -19,10 +19,10 @@ module sonic-bgp-neighbor {
 	}
 
 	organization
-		"BRCM";
+		"SONiC";
 
 	contact
-		"BRCM";
+		"SONiC";
 
 	description
 		"SONIC BGP NEIGHBOR";