Merge pull request #2 from adaraiseh/main

fix yang modules warnings and errors
okda-networks · Feb 19, 2024 · 8ab1df5 · 8ab1df5
2 parents c53a24a + 593bed8
commit 8ab1df5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/yang/iproute2-ip-link-vlan-ext.yang b/yang/iproute2-ip-link-vlan-ext.yang
@@ -3,13 +3,11 @@ module iproute2-ip-link-vlan-ext {
     namespace "urn:okda:iproute2:ip:link:vlan:ext";
     prefix "iplinkvlan";
 
-    import ietf-inet-types { prefix inet; }
-    import ietf-yang-types { prefix yang; }
     import iproute2-ip-link {prefix iplink;}
 
 
     organization
-        "Okda networks";
+        "Okda Networks";
 
     contact
         "Author: Ali Aqrabawi
@@ -31,9 +29,9 @@ module iproute2-ip-link-vlan-ext {
     augment "/iplink:links/iplink:link" {
         description "adding vlan type paramters";
         container vlan {
-            when "../type='vlan'";
+            when "../iplink:type = 'iplink:vlan'";
             description "vlan type interface paramters";
-            leaf protcol {
+            leaf protocol {
                 description "VLAN_PROTO - either 802.1Q or 802.1ad.";
                 default "802.1q";
                 type enumeration {

diff --git a/yang/iproute2-ip-link.yang b/yang/iproute2-ip-link.yang
@@ -3,10 +3,10 @@ module iproute2-ip-link {
     namespace "urn:okda:iproute2:ip:link";
     prefix "iplink";
 
-    import ietf-inet-types { prefix inet; }
-    import ietf-yang-types { prefix yang; }
+    //import ietf-inet-types { prefix inet; }
+    //import ietf-yang-types { prefix yang; }
     organization
-        "Okda networks";
+        "Okda Networks";
 
     contact
         "Author: Ali Aqrabawi
@@ -37,6 +37,12 @@ module iproute2-ip-link {
             "Base identity for ip link types.";
     }
 
+    identity vlan {
+        base link-type;
+        description
+            "VLAN device.";
+    }
+
     identity bond {
         base link-type;
         description

diff --git a/yang/iproute2-ip-nexthop.yang b/yang/iproute2-ip-nexthop.yang
@@ -4,11 +4,11 @@ module iproute2-ip-nexthop {
     prefix "ipnh";
 
     import ietf-inet-types { prefix inet; }
-    import ietf-yang-types { prefix yang; }
+    //import ietf-yang-types { prefix yang; }
     import iproute2-ip-link { prefix iplink; }
 
     organization
-        "Okda networks";
+        "Okda Networks";
 
     contact
         "Author: Ali Aqrabawi
@@ -44,7 +44,7 @@ module iproute2-ip-nexthop {
 
                 }
             }
-            choice via {
+            choice via { // review this: why a choice with one option ?
                 description "nexthop ip address";
                 container ipv4 {
                     description "ipv4 nexthop";
@@ -66,7 +66,7 @@ module iproute2-ip-nexthop {
                 default false;
                 description " specify if this is blackhole nexthop, which discards all traffic sent to it.";
                 type boolean;
-                when "not(../interface) and not(../via)";
+                when "not(../dev) and not(../ipv6) and not(../ipv4)";
             }
             leaf online {
                 type boolean;

diff --git a/yang/iproute2-ip-route.yang b/yang/iproute2-ip-route.yang
@@ -4,9 +4,9 @@ module iproute2-ip-route {
     prefix "iprt";
 
     import ietf-inet-types { prefix inet; }
-    import ietf-yang-types { prefix yang; }
+    //import ietf-yang-types { prefix yang; }
     organization
-        "Okda networks";
+        "Okda Networks";
 
     contact
         "Author: Ali Aqrabawi

diff --git a/yang/iproute2-tc-filter.yang b/yang/iproute2-tc-filter.yang
@@ -25,7 +25,7 @@ module iproute2-tc-filter {
 
     list filter {
       description "A list of filters.";
-
+      key "handle";
       choice dev-or-block { //review
         case dev-case {
           leaf dev {