From 3be8ac2e076725dc6b0b5df49bc53994bef21904 Mon Sep 17 00:00:00 2001
From: Rafal Szarecki <rszarecki@gmail.com>
Date: Tue, 11 Feb 2025 09:48:06 -0800
Subject: [PATCH 01/20] URPF model

---
 .../openconfig-pf-interfaces.yang             | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/release/models/policy-forwarding/openconfig-pf-interfaces.yang b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
index 705e7f795..577ebe027 100644
--- a/release/models/policy-forwarding/openconfig-pf-interfaces.yang
+++ b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
@@ -132,6 +132,52 @@ submodule openconfig-pf-interfaces {
     }
   }
 
+  gruping use pf-urpf-config {
+    leaf enabled {
+      type boolean;
+      default false;
+      description
+      "Turns ON/OFF packet's source address verification against content of
+      FIB. This is one of anti-spoofing protection techniques.";
+    }
+    leaf mode {
+      type string;
+      default "STRICT";
+      description
+      "The URPF in STRICT mode requires packet source address to LPM some route
+      in FIB, AND next-hop of this route must be interface packet was
+      received on.
+      The URPF in LOOSE mode requires packet source address to LPM some route
+      in FIB.
+      This leaf is irrelevalnt and should be ignored if URPF is not enabled.";
+    }
+    leaf allow_default_route {
+      type boolean;
+      default true;
+      description
+      "If set to false, and packets source address LPM the default route -
+      0.0.0.0/0 or ::/0 - URPF fails and packet is discarded, as if it would not
+      LPM any route.";
+    }
+    leaf allow_drop_next_hop {
+      type boolean;
+      default false;
+      description
+      "If set to false, and packets source address LPM the route with DROP
+      next-hop URPF fails and packet is discarded, as if it would not
+      LPM any route.";
+    }
+    leaf allow-feasible-path {
+      type boolean;
+      default false;
+      description
+      "The routing system may select subset of equally-good path as result of
+      tie-break (e.g. BGP RID) or ECMP width limits. If set to true, packet
+      are accepted if source address LPM to any equally-good path, even if it
+      is not selected for forwading.";
+    }
+  }
+
   grouping pf-interface-config {
     description
       "Configuration parameters relating to an interface to policy
@@ -178,5 +224,62 @@ submodule openconfig-pf-interfaces {
         The policy specified in this leaf is used to specifically choose the L3VRF network
         instance that is used for specific input criteria of packets.";
     }
+    container afi-safis {
+      description
+        "Address family specific configuration";
+      list afi-safi [
+        key "afi-safi-name";
+
+        description
+          "AFI,SAFI";
+
+        leaf afi-safi-name {
+          type leafref {
+            path "../config/afi-safi-name";
+          }
+          description
+            "Reference to the AFI-SAFI name used as a key
+            for the AFI-SAFI list";
+        }
+        container config {
+          description
+            "Configuration parameters for the AFI-SAFI";
+          leaf afi-safi-name {
+            type identityref {
+              base oc-bgp-types:AFI_SAFI_TYPE;
+            }
+            description "AFI,SAFI";
+          }
+        }
+        container urpf {
+          container config{
+            uses pf-urpf-config;
+          }
+          container state {
+            uses pf-urpf-config;
+            leaf urpf-drop-pkts {
+              type oc-yang:counter64;
+              description
+                "This counter counts packet discarded as result of Unicast
+                Reverse Path Forwarding verification.";
+              reference
+                "RFC2827: Network Ingress Filtering: Defeating Denial of
+                Service Attacks which employ IP Source Address Spoofing
+                RFC3704: Ingress Filtering for Multihomed Networks";
+            }
+            leaf urpf-drop-bytes {
+              type oc-yang:counter64;
+              description
+                "This counter counts bytes/octets discarded as result of
+                Unicast Reverse Path Forwarding verification.";
+              reference
+                "RFC2827: Network Ingress Filtering: Defeating Denial of
+                Service Attacks which employ IP Source Address Spoofing
+                RFC3704: Ingress Filtering for Multihomed Networks";
+            }
+          }          
+        }
+      ]
+    }
   }
 }

From 8b8f80ff14c9193ac5c21d5adb3cc94127ef58f1 Mon Sep 17 00:00:00 2001
From: rszarecki <46606165+rszarecki@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:01:25 -0800
Subject: [PATCH 02/20] urpf

---
 .../policy-forwarding/openconfig-policy-forwarding.yang   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/release/models/policy-forwarding/openconfig-policy-forwarding.yang b/release/models/policy-forwarding/openconfig-policy-forwarding.yang
index c6d37209a..1dabac25f 100644
--- a/release/models/policy-forwarding/openconfig-policy-forwarding.yang
+++ b/release/models/policy-forwarding/openconfig-policy-forwarding.yang
@@ -81,8 +81,14 @@ module openconfig-policy-forwarding {
     The forwarding action of the corresponding policy is set to
     PATH_GROUP and references the configured group of LSPs.";
 
-  oc-ext:openconfig-version "0.6.1";
+  oc-ext:openconfig-version "0.7.0";
 
+  revision "2025-02-11" {
+    description
+      "Add model for support of URPF source address verification";
+    reference "0.7.0";
+  }
+  
   revision "2023-04-25" {
     description
       "Clarify use of interface-ref.";

From 5dffe3a8cb8e6eb63882fad2986f09384a5de1ac Mon Sep 17 00:00:00 2001
From: rszarecki <46606165+rszarecki@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:02:54 -0800
Subject: [PATCH 03/20] urpf

---
 .../policy-forwarding/openconfig-pf-interfaces.yang       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/release/models/policy-forwarding/openconfig-pf-interfaces.yang b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
index 577ebe027..ed97125b8 100644
--- a/release/models/policy-forwarding/openconfig-pf-interfaces.yang
+++ b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
@@ -19,12 +19,12 @@ submodule openconfig-pf-interfaces {
     "This submodule contains groupings related to the association
     between interfaces and policy forwarding rules.";
 
-  oc-ext:openconfig-version "0.6.1";
+  oc-ext:openconfig-version "0.7.0";
 
-  revision "2023-04-25" {
+  revision "2025-02-11" {
     description
-      "Clarify use of interface-ref.";
-    reference "0.6.1";
+      "Add model for support of URPF source address verification";
+    reference "0.7.0";
   }
 
   revision "2023-03-27" {

From 501f4f1bc29ac9221a0bcf8338fa8b3841e1e671 Mon Sep 17 00:00:00 2001
From: rszarecki <46606165+rszarecki@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:04:55 -0800
Subject: [PATCH 04/20] patch 1

---
 release/models/policy-forwarding/openconfig-pf-interfaces.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/models/policy-forwarding/openconfig-pf-interfaces.yang b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
index ed97125b8..e248fdf86 100644
--- a/release/models/policy-forwarding/openconfig-pf-interfaces.yang
+++ b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
@@ -132,7 +132,7 @@ submodule openconfig-pf-interfaces {
     }
   }
 
-  gruping use pf-urpf-config {
+  grouping use pf-urpf-config {
     leaf enabled {
       type boolean;
       default false;

From 50b649328b4e56f45c0ac73fb8162d45d0a451e3 Mon Sep 17 00:00:00 2001
From: rszarecki <46606165+rszarecki@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:06:47 -0800
Subject: [PATCH 05/20] rev up

---
 .../openconfig-pf-forwarding-policies.yang                | 8 +++++++-
 .../policy-forwarding/openconfig-pf-path-groups.yang      | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang b/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang
index 9485ab3c4..6dccf8ab6 100644
--- a/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang
+++ b/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang
@@ -21,8 +21,14 @@ submodule openconfig-pf-forwarding-policies {
     "This submodule contains configuration and operational state
     relating to the definition of policy-forwarding policies.";
 
-  oc-ext:openconfig-version "0.6.1";
+  oc-ext:openconfig-version "0.7.0";
 
+  revision "2025-02-11" {
+    description
+      "Add model for support of URPF source address verification";
+    reference "0.7.0";
+  }
+  
   revision "2023-04-25" {
     description
       "Clarify use of interface-ref.";
diff --git a/release/models/policy-forwarding/openconfig-pf-path-groups.yang b/release/models/policy-forwarding/openconfig-pf-path-groups.yang
index c1c9283cb..fda11c0ef 100644
--- a/release/models/policy-forwarding/openconfig-pf-path-groups.yang
+++ b/release/models/policy-forwarding/openconfig-pf-path-groups.yang
@@ -18,8 +18,14 @@ submodule openconfig-pf-path-groups {
     forwarding entities together to be used as policy forwarding
     targets.";
 
-  oc-ext:openconfig-version "0.6.1";
+  oc-ext:openconfig-version "0.7.0";
 
+  revision "2025-02-11" {
+    description
+      "Add model for support of URPF source address verification";
+    reference "0.7.0";
+  }
+  
   revision "2023-04-25" {
     description
       "Clarify use of interface-ref.";

From 65f9e52058abcd0b283fc9e60db98562a8737531 Mon Sep 17 00:00:00 2001
From: rszarecki <46606165+rszarecki@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:12:42 -0800
Subject: [PATCH 06/20] patch 2

---
 release/models/policy-forwarding/openconfig-pf-interfaces.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/models/policy-forwarding/openconfig-pf-interfaces.yang b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
index e248fdf86..da3f14045 100644
--- a/release/models/policy-forwarding/openconfig-pf-interfaces.yang
+++ b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
@@ -132,7 +132,7 @@ submodule openconfig-pf-interfaces {
     }
   }
 
-  grouping use pf-urpf-config {
+  grouping pf-urpf-config {
     leaf enabled {
       type boolean;
       default false;

From 02887da4f23983e4ff17824444fa1872eae275a4 Mon Sep 17 00:00:00 2001
From: rszarecki <46606165+rszarecki@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:16:50 -0800
Subject: [PATCH 07/20] path 3

---
 .../openconfig-pf-interfaces.yang             | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/release/models/policy-forwarding/openconfig-pf-interfaces.yang b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
index da3f14045..0e91f2c41 100644
--- a/release/models/policy-forwarding/openconfig-pf-interfaces.yang
+++ b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
@@ -137,19 +137,19 @@ submodule openconfig-pf-interfaces {
       type boolean;
       default false;
       description
-      "Turns ON/OFF packet's source address verification against content of
-      FIB. This is one of anti-spoofing protection techniques.";
+        "Turns ON/OFF packet's source address verification against content of
+        FIB. This is one of anti-spoofing protection techniques.";
     }
     leaf mode {
       type string;
       default "STRICT";
       description
-      "The URPF in STRICT mode requires packet source address to LPM some route
-      in FIB, AND next-hop of this route must be interface packet was
-      received on.
-      The URPF in LOOSE mode requires packet source address to LPM some route
-      in FIB.
-      This leaf is irrelevalnt and should be ignored if URPF is not enabled.";
+        "The URPF in STRICT mode requires packet source address to LPM some route
+        in FIB, AND next-hop of this route must be interface packet was
+        received on.
+        The URPF in LOOSE mode requires packet source address to LPM some route
+        in FIB.
+        This leaf is irrelevalnt and should be ignored if URPF is not enabled.";
     }
     leaf allow_default_route {
       type boolean;
@@ -163,18 +163,18 @@ submodule openconfig-pf-interfaces {
       type boolean;
       default false;
       description
-      "If set to false, and packets source address LPM the route with DROP
-      next-hop URPF fails and packet is discarded, as if it would not
-      LPM any route.";
+        "If set to false, and packets source address LPM the route with DROP
+        next-hop URPF fails and packet is discarded, as if it would not
+        LPM any route.";
     }
     leaf allow-feasible-path {
       type boolean;
       default false;
       description
-      "The routing system may select subset of equally-good path as result of
-      tie-break (e.g. BGP RID) or ECMP width limits. If set to true, packet
-      are accepted if source address LPM to any equally-good path, even if it
-      is not selected for forwading.";
+        "The routing system may select subset of equally-good path as result of
+        tie-break (e.g. BGP RID) or ECMP width limits. If set to true, packet
+        are accepted if source address LPM to any equally-good path, even if it
+        is not selected for forwading.";
     }
   }
 

From ab03bcb9a3b5de51d72020efe0441efe50b69045 Mon Sep 17 00:00:00 2001
From: rszarecki <46606165+rszarecki@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:18:56 -0800
Subject: [PATCH 08/20] patch 4

---
 .../models/policy-forwarding/openconfig-pf-interfaces.yang    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/release/models/policy-forwarding/openconfig-pf-interfaces.yang b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
index 0e91f2c41..5d5da4ac2 100644
--- a/release/models/policy-forwarding/openconfig-pf-interfaces.yang
+++ b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
@@ -252,7 +252,9 @@ submodule openconfig-pf-interfaces {
           }
         }
         container urpf {
-          container config{
+          description
+            "URPF container";
+          container config {
             uses pf-urpf-config;
           }
           container state {

From 5481a7b20d2989c6a85fd19aa4609d6d6ed996b5 Mon Sep 17 00:00:00 2001
From: rszarecki <46606165+rszarecki@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:21:32 -0800
Subject: [PATCH 09/20] path 5

---
 .../openconfig-pf-interfaces.yang             | 36 -------------------
 1 file changed, 36 deletions(-)

diff --git a/release/models/policy-forwarding/openconfig-pf-interfaces.yang b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
index 5d5da4ac2..44147111e 100644
--- a/release/models/policy-forwarding/openconfig-pf-interfaces.yang
+++ b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
@@ -140,42 +140,6 @@ submodule openconfig-pf-interfaces {
         "Turns ON/OFF packet's source address verification against content of
         FIB. This is one of anti-spoofing protection techniques.";
     }
-    leaf mode {
-      type string;
-      default "STRICT";
-      description
-        "The URPF in STRICT mode requires packet source address to LPM some route
-        in FIB, AND next-hop of this route must be interface packet was
-        received on.
-        The URPF in LOOSE mode requires packet source address to LPM some route
-        in FIB.
-        This leaf is irrelevalnt and should be ignored if URPF is not enabled.";
-    }
-    leaf allow_default_route {
-      type boolean;
-      default true;
-      description
-      "If set to false, and packets source address LPM the default route -
-      0.0.0.0/0 or ::/0 - URPF fails and packet is discarded, as if it would not
-      LPM any route.";
-    }
-    leaf allow_drop_next_hop {
-      type boolean;
-      default false;
-      description
-        "If set to false, and packets source address LPM the route with DROP
-        next-hop URPF fails and packet is discarded, as if it would not
-        LPM any route.";
-    }
-    leaf allow-feasible-path {
-      type boolean;
-      default false;
-      description
-        "The routing system may select subset of equally-good path as result of
-        tie-break (e.g. BGP RID) or ECMP width limits. If set to true, packet
-        are accepted if source address LPM to any equally-good path, even if it
-        is not selected for forwading.";
-    }
   }
 
   grouping pf-interface-config {

From 3ba43bb541db34675fd21622886c3f7b9737390e Mon Sep 17 00:00:00 2001
From: rszarecki <46606165+rszarecki@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:21:54 -0800
Subject: [PATCH 10/20] pathch 6

---
 .../models/policy-forwarding/openconfig-policy-forwarding.yang  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/models/policy-forwarding/openconfig-policy-forwarding.yang b/release/models/policy-forwarding/openconfig-policy-forwarding.yang
index 1dabac25f..516129064 100644
--- a/release/models/policy-forwarding/openconfig-policy-forwarding.yang
+++ b/release/models/policy-forwarding/openconfig-policy-forwarding.yang
@@ -164,4 +164,4 @@ module openconfig-policy-forwarding {
       uses pf-path-groups-structural;
     }
   }
-}
+}
\ No newline at end of file

From cd95f55e978a29b8fa3911402bb7abae99f6637d Mon Sep 17 00:00:00 2001
From: rszarecki <46606165+rszarecki@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:24:06 -0800
Subject: [PATCH 11/20] patch 10

---
 .../models/policy-forwarding/openconfig-pf-interfaces.yang    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/release/models/policy-forwarding/openconfig-pf-interfaces.yang b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
index 44147111e..fd60c18dc 100644
--- a/release/models/policy-forwarding/openconfig-pf-interfaces.yang
+++ b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
@@ -218,11 +218,7 @@ submodule openconfig-pf-interfaces {
         container urpf {
           description
             "URPF container";
-          container config {
-            uses pf-urpf-config;
-          }
           container state {
-            uses pf-urpf-config;
             leaf urpf-drop-pkts {
               type oc-yang:counter64;
               description

From ac4c42a8b3f2855e48d19f3f802987dce62207a8 Mon Sep 17 00:00:00 2001
From: rszarecki <46606165+rszarecki@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:24:59 -0800
Subject: [PATCH 12/20] patch 11

---
 .../policy-forwarding/openconfig-pf-interfaces.yang    | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/release/models/policy-forwarding/openconfig-pf-interfaces.yang b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
index fd60c18dc..2cb41db76 100644
--- a/release/models/policy-forwarding/openconfig-pf-interfaces.yang
+++ b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
@@ -132,16 +132,6 @@ submodule openconfig-pf-interfaces {
     }
   }
 
-  grouping pf-urpf-config {
-    leaf enabled {
-      type boolean;
-      default false;
-      description
-        "Turns ON/OFF packet's source address verification against content of
-        FIB. This is one of anti-spoofing protection techniques.";
-    }
-  }
-
   grouping pf-interface-config {
     description
       "Configuration parameters relating to an interface to policy

From 17c9e0a3a989e22f28fad6088f01f8da1b48a5d7 Mon Sep 17 00:00:00 2001
From: Rafal Szarecki <rszarecki@gmail.com>
Date: Tue, 11 Feb 2025 10:44:58 -0800
Subject: [PATCH 13/20] Revert "Updated UDP enums related to
 openconfig-aft-types. (#1248)"

This reverts commit a1722856e7e576484eaebd43129269c5298f81b9.
---
 release/models/aft/openconfig-aft-types.yang | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/release/models/aft/openconfig-aft-types.yang b/release/models/aft/openconfig-aft-types.yang
index 4594d4aa0..56d920b5f 100644
--- a/release/models/aft/openconfig-aft-types.yang
+++ b/release/models/aft/openconfig-aft-types.yang
@@ -16,13 +16,7 @@ module openconfig-aft-types {
     "Types related to the OpenConfig Abstract Forwarding
     Table (AFT) model";
 
-  oc-ext:openconfig-version "1.3.0";
-
-  revision "2025-01-28" {
-    description
-        "Deprecated UDP enum and replaced it by more fine-grained enums UDPV4 and UDPV6.";
-    reference "1.3.0";
-  }
+  oc-ext:openconfig-version "1.2.0";
 
   revision "2024-07-18" {
     description
@@ -103,16 +97,7 @@ module openconfig-aft-types {
       }
       enum UDP {
         description
-          "DEPRECATED. The encapsulation header is UDP packet header. This node
-          is deprecated in favor of UDPV4 and UDPV6 nodes.";
-      }
-      enum UDPV4 {
-        description
-          "The encapsulation header is a UDP + IPv4 header.";
-      }
-      enum UDPV6 {
-        description
-          "The encapsulation header is a UDP + IPv6 header.";
+          "The encapsulation header is UDP packet header.";
       }
     }
     description

From d36c1d3596c7858dbfddfcdee8395f92b1e7cec9 Mon Sep 17 00:00:00 2001
From: Rafal Szarecki <rszarecki@gmail.com>
Date: Tue, 11 Feb 2025 10:48:05 -0800
Subject: [PATCH 14/20] Revert "URPF model"

This reverts commit 3be8ac2e076725dc6b0b5df49bc53994bef21904.
---
 release/models/policy-forwarding/openconfig-pf-interfaces.yang | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/release/models/policy-forwarding/openconfig-pf-interfaces.yang b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
index 2cb41db76..5f1f2af7c 100644
--- a/release/models/policy-forwarding/openconfig-pf-interfaces.yang
+++ b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
@@ -178,6 +178,7 @@ submodule openconfig-pf-interfaces {
         The policy specified in this leaf is used to specifically choose the L3VRF network
         instance that is used for specific input criteria of packets.";
     }
+<<<<<<< HEAD
     container afi-safis {
       description
         "Address family specific configuration";
@@ -233,5 +234,7 @@ submodule openconfig-pf-interfaces {
         }
       ]
     }
+=======
+>>>>>>> parent of 3be8ac2 (URPF model)
   }
 }

From cddb789f78f4cb0191ee8361f5b8743c184fe6e2 Mon Sep 17 00:00:00 2001
From: Rafal Szarecki <rszarecki@gmail.com>
Date: Tue, 11 Feb 2025 10:49:20 -0800
Subject: [PATCH 15/20] cleanup

---
 .../openconfig-pf-interfaces.yang             | 58 -------------------
 1 file changed, 58 deletions(-)

diff --git a/release/models/policy-forwarding/openconfig-pf-interfaces.yang b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
index 5f1f2af7c..6e4f4db04 100644
--- a/release/models/policy-forwarding/openconfig-pf-interfaces.yang
+++ b/release/models/policy-forwarding/openconfig-pf-interfaces.yang
@@ -178,63 +178,5 @@ submodule openconfig-pf-interfaces {
         The policy specified in this leaf is used to specifically choose the L3VRF network
         instance that is used for specific input criteria of packets.";
     }
-<<<<<<< HEAD
-    container afi-safis {
-      description
-        "Address family specific configuration";
-      list afi-safi [
-        key "afi-safi-name";
-
-        description
-          "AFI,SAFI";
-
-        leaf afi-safi-name {
-          type leafref {
-            path "../config/afi-safi-name";
-          }
-          description
-            "Reference to the AFI-SAFI name used as a key
-            for the AFI-SAFI list";
-        }
-        container config {
-          description
-            "Configuration parameters for the AFI-SAFI";
-          leaf afi-safi-name {
-            type identityref {
-              base oc-bgp-types:AFI_SAFI_TYPE;
-            }
-            description "AFI,SAFI";
-          }
-        }
-        container urpf {
-          description
-            "URPF container";
-          container state {
-            leaf urpf-drop-pkts {
-              type oc-yang:counter64;
-              description
-                "This counter counts packet discarded as result of Unicast
-                Reverse Path Forwarding verification.";
-              reference
-                "RFC2827: Network Ingress Filtering: Defeating Denial of
-                Service Attacks which employ IP Source Address Spoofing
-                RFC3704: Ingress Filtering for Multihomed Networks";
-            }
-            leaf urpf-drop-bytes {
-              type oc-yang:counter64;
-              description
-                "This counter counts bytes/octets discarded as result of
-                Unicast Reverse Path Forwarding verification.";
-              reference
-                "RFC2827: Network Ingress Filtering: Defeating Denial of
-                Service Attacks which employ IP Source Address Spoofing
-                RFC3704: Ingress Filtering for Multihomed Networks";
-            }
-          }          
-        }
-      ]
-    }
-=======
->>>>>>> parent of 3be8ac2 (URPF model)
   }
 }

From 9696e8f391a0321e0aa02fd15c9162eea92efcda Mon Sep 17 00:00:00 2001
From: Rafal Szarecki <rszarecki@gmail.com>
Date: Fri, 28 Feb 2025 10:16:50 -0800
Subject: [PATCH 16/20] Add interface-defaults to LLDP

---
 release/models/lldp/openconfig-lldp.yang | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/release/models/lldp/openconfig-lldp.yang b/release/models/lldp/openconfig-lldp.yang
index e687b7c61..e677a0b0d 100644
--- a/release/models/lldp/openconfig-lldp.yang
+++ b/release/models/lldp/openconfig-lldp.yang
@@ -535,6 +535,27 @@ module openconfig-lldp {
     description
       "Top-level grouping ";
 
+    container interface-defaults {
+      description
+        "Container of LLDP attributes that applys to all interfaces 
+        of the system.";
+      container config {
+          description
+            "Configuration data for LLDP on all interface. Any leaf set
+            here could be overwriten on per-interfaces basis in
+            /lldp/interfaces/interface/* hirarchy";
+            leaf enabled {
+              type boolean;
+              default "true";
+              description
+                "Enable or disable the LLDP protocol on all 
+                interfaces by default";
+            }
+          }
+        }
+      }
+    }
+    
     container interfaces {
       description
         "Enclosing container ";

From 1135ae7d8d1b56284c3105de63a37cdc3fc44aab Mon Sep 17 00:00:00 2001
From: Rafal Szarecki <rszarecki@gmail.com>
Date: Fri, 28 Feb 2025 10:22:17 -0800
Subject: [PATCH 17/20] fix trailing garbage after module

---
 release/models/lldp/openconfig-lldp.yang | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/release/models/lldp/openconfig-lldp.yang b/release/models/lldp/openconfig-lldp.yang
index e677a0b0d..eff79f079 100644
--- a/release/models/lldp/openconfig-lldp.yang
+++ b/release/models/lldp/openconfig-lldp.yang
@@ -540,17 +540,16 @@ module openconfig-lldp {
         "Container of LLDP attributes that applys to all interfaces 
         of the system.";
       container config {
-          description
-            "Configuration data for LLDP on all interface. Any leaf set
-            here could be overwriten on per-interfaces basis in
-            /lldp/interfaces/interface/* hirarchy";
-            leaf enabled {
-              type boolean;
+        description
+          "Configuration data for LLDP on all interface. Any leaf set
+          here could be overwriten on per-interfaces basis in
+          /lldp/interfaces/interface/* hirarchy";
+          leaf enabled {
+            type boolean;
               default "true";
               description
-                "Enable or disable the LLDP protocol on all 
-                interfaces by default";
-            }
+              "Enable or disable the LLDP protocol on all 
+              interfaces by default";
           }
         }
       }

From e049ad3dd6492c8cba660d34fc3b78905c748ea2 Mon Sep 17 00:00:00 2001
From: Rafal Szarecki <rszarecki@gmail.com>
Date: Fri, 28 Feb 2025 10:24:02 -0800
Subject: [PATCH 18/20] pathc 1

---
 release/models/lldp/openconfig-lldp.yang | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/release/models/lldp/openconfig-lldp.yang b/release/models/lldp/openconfig-lldp.yang
index eff79f079..b2b7597fd 100644
--- a/release/models/lldp/openconfig-lldp.yang
+++ b/release/models/lldp/openconfig-lldp.yang
@@ -675,6 +675,3 @@ module openconfig-lldp {
   // data definition statements
 
   uses lldp-top;
-
-
-}

From 2c2f78e7e0b2177288b2d226c77d64a4dd0f9a1f Mon Sep 17 00:00:00 2001
From: Rafal Szarecki <rszarecki@gmail.com>
Date: Fri, 28 Feb 2025 10:32:08 -0800
Subject: [PATCH 19/20] pathch 2

---
 release/models/lldp/openconfig-lldp.yang | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/release/models/lldp/openconfig-lldp.yang b/release/models/lldp/openconfig-lldp.yang
index b2b7597fd..294c1995d 100644
--- a/release/models/lldp/openconfig-lldp.yang
+++ b/release/models/lldp/openconfig-lldp.yang
@@ -546,13 +546,12 @@ module openconfig-lldp {
           /lldp/interfaces/interface/* hirarchy";
           leaf enabled {
             type boolean;
-              default "true";
-              description
-              "Enable or disable the LLDP protocol on all 
-              interfaces by default";
+            default "true";
+            description
+            "Enable or disable the LLDP protocol on all 
+            interfaces by default";
           }
         }
-      }
     }
     
     container interfaces {
@@ -675,3 +674,4 @@ module openconfig-lldp {
   // data definition statements
 
   uses lldp-top;
+}
\ No newline at end of file

From 751a665b2379e32169c744f7003f15660cc0548a Mon Sep 17 00:00:00 2001
From: Rafal Szarecki <rszarecki@gmail.com>
Date: Fri, 28 Feb 2025 10:36:56 -0800
Subject: [PATCH 20/20] ass states

---
 release/models/lldp/openconfig-lldp.yang | 32 ++++++++++++++++++------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/release/models/lldp/openconfig-lldp.yang b/release/models/lldp/openconfig-lldp.yang
index 294c1995d..80530b657 100644
--- a/release/models/lldp/openconfig-lldp.yang
+++ b/release/models/lldp/openconfig-lldp.yang
@@ -539,19 +539,37 @@ module openconfig-lldp {
       description
         "Container of LLDP attributes that applys to all interfaces 
         of the system.";
+      
       container config {
         description
           "Configuration data for LLDP on all interface. Any leaf set
           here could be overwriten on per-interfaces basis in
           /lldp/interfaces/interface/* hirarchy";
-          leaf enabled {
-            type boolean;
-            default "true";
-            description
-            "Enable or disable the LLDP protocol on all 
-            interfaces by default";
-          }
+      
+        leaf enabled {
+          type boolean;
+          default "true";
+          description
+          "Enable or disable the LLDP protocol on all 
+          interfaces by default";
         }
+      }
+      container state {
+
+        config false;
+        
+        description
+          "Configuration data for LLDP on all interface. Any leaf set
+          here could be overwriten on per-interfaces basis in
+          /lldp/interfaces/interface/* hirarchy";
+        
+        leaf enabled {
+          type boolean;
+          description
+          "Enable or disable the LLDP protocol on all 
+          interfaces by default";
+        }
+      }
     }
     
     container interfaces {