From 5f63a4d671cdb27b62eeefa9bff9feb26ba4ed82 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Tue, 15 Aug 2023 13:13:33 +0200
Subject: [PATCH] confd: fix lost deviations and timezone enumerations lost in
 merge

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 src/confd/yang/infix-system@2023-07-06.yang | 43 ++++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/confd/yang/infix-system@2023-07-06.yang b/src/confd/yang/infix-system@2023-07-06.yang
index 49999fbf..15488513 100644
--- a/src/confd/yang/infix-system@2023-07-06.yang
+++ b/src/confd/yang/infix-system@2023-07-06.yang
@@ -6,7 +6,9 @@ module infix-system {
   import ietf-system {
     prefix sys;
   }
-
+  import iana-timezones {
+    prefix iana-tz;
+  }
   include infix-system-software;
 
   organization "KernelKit";
@@ -18,11 +20,28 @@ module infix-system {
     reference "internal";
   }
 
+  revision 2023-07-04 {
+    description "Updating/adding deviation specifications:
+                 - timezone-name (use tz defs from iana-timezone.yang)
+                 - timezone-utc-offset (updated path for 'not-supported')
+                 - radius ('not-supported')
+                 - dns-resolver port ('not-supported')
+                 - authentication username (limit length and pattern)";
+    reference "internal";
+  }
+
   revision 2023-04-11 {
     description "Initial revision.";
     reference "internal";
   }
 
+  typedef username {
+    type string {
+      length "1..256";
+      pattern "[_a-zA-Z0-9][-._a-zA-Z0-9]*$?";
+    }
+  }
+
   augment "/sys:system" {
     description "Augment of ietf-system for modifying /etc/motd.";
     leaf motd {
@@ -40,7 +59,27 @@ module infix-system {
     }
   }
 
-  deviation "/sys:system/sys:clock/sys:timezone/sys:timezone-utc-offset/sys:timezone-utc-offset" {
+  deviation "/sys:system/sys:clock/sys:timezone/sys:timezone-name/sys:timezone-name" {
+    deviate replace {
+      type iana-tz:iana-timezone;
+    }
+  }
+
+  deviation "/sys:system/sys:clock/sys:timezone/sys:timezone-utc-offset" {
     deviate not-supported;
   }
+
+  deviation "/sys:system/sys:radius" {
+    deviate not-supported;
+  }
+
+  deviation "/sys:system/sys:dns-resolver/sys:server/sys:transport/sys:udp-and-tcp/sys:udp-and-tcp/sys:port" {
+    deviate not-supported;
+  }
+
+  deviation "/sys:system/sys:authentication/sys:user/sys:name" {
+    deviate replace {
+      type infix-sys:username;
+    }
+  }
 }