Updating spec and yang based on QBGP apis

QBGP is not supporting updateBfd(). so its better to have one container
for all the BFD parameters so that multiple calls wont land into QBGP

Change-Id: I90f11f5ebb9086a8e7bb891b2c0e992baf7c777f
Signed-off-by: Vyshakh Krishnan CH <vyshakh.krishnan.c.h@ericsson.com>

diff --git a/docs/specs/oxygen/faster-dcgw-failure-detection.rst b/docs/specs/oxygen/faster-dcgw-failure-detection.rst
index 0b24d8075b8affc633c58c5fad4ec27b34dd6a92..034381a2342d48e7a9223a06484c3cabd431a5e3 100644 (file)
--- a/docs/specs/oxygen/faster-dcgw-failure-detection.rst
+++ b/docs/specs/oxygen/faster-dcgw-failure-detection.rst
@@ -189,14 +189,20 @@ None
 Yang changes
 ------------
 A new yang file ebgp-bfd.yang, published to accomodate bfd parameters,
-which has two containers: bfd-monitoring, bfd-config as below.
+which has bfd-config container as below.
 
 .. code-block:: none
    :caption: ebgp-bfd.yang
 
-    container bfd-monitoring {
+    container bfd-config {
         config        "true";
 
+        leaf bfd-enabled {
+            description  "is BFD enabled";
+            type         boolean;
+            default      false;
+        }
+
         leaf detect-mult {
             type        uint32;
             default     3;
@@ -222,9 +228,7 @@ which has two containers: bfd-monitoring, bfd-config as below.
                          transmit BFD control messages. Defaults
                          to 6000";
         }
-    }
 
-    container bfd-config {
         leaf multihop {
             type        boolean;
             default     true;
@@ -235,26 +239,22 @@ which has two containers: bfd-monitoring, bfd-config as below.
 
 Changes will be needed in ``ebgp.yang``.
 
-- A new parameter will be adde to the existing ebgp.yang,
-  to enable/disable bfd in bgp configuration
-- dc-gwy TEP ip will be modified as list
+- dc-gw TEP ip will be modified as a container
 
 .. code-block:: none
    :caption: ebgp.yang
 
-     leaf bfd-enabled {
-       type boolean;
-       mandatory "false";
-     }
-
-     list tep-dcgw {
-         key          "dc-gw-ip";
-         description  "mapping: DC-Gwy ip <> TEP ip";
-         leaf dc-gw-ip {
-              type string;
-         }
-         leaf-list tep-ip {
-             type string;
+     container dcgw-tep-list {
+          list dcgw-tep {
+               key          "dc-gw-ip";
+               description  "mapping: DC-Gwy ip <> TEP ip";
+
+               leaf dc-gw-ip {
+                   type string;
+               }
+               leaf-list tep-ips {
+                   type string;
+               }
          }
      }
 

diff --git a/model-bgp/src/main/yang/ebgp-bfd.yang b/model-bgp/src/main/yang/ebgp-bfd.yang
index e004b9ab2b57b72697c2badd7b8631288868efe6..e391900efa6e640f352ac4fbf84520f40d6334eb 100644 (file)
--- a/model-bgp/src/main/yang/ebgp-bfd.yang
+++ b/model-bgp/src/main/yang/ebgp-bfd.yang
@@ -13,9 +13,14 @@ module bfd {
     revision "2019-02-19" {
     }
 
-    container bfd-monitoring {
+    container bfd-config {
         config        "true";
 
+        leaf bfd-enabled {
+            description  "is BFD enabled";
+            type         boolean;
+            default      false;
+        }
         leaf detect-mult {
             type        uint32;
             default     3;
@@ -24,8 +29,8 @@ module bfd {
         }
         leaf min-rx {
             type        uint32 {
-                            range "50..50000";
-            }
+               range "50..50000";
+               }
             default     500;
             description "The shortest interval, in milli-seconds, at
                          which this BFD session offers to receive
@@ -33,22 +38,18 @@ module bfd {
         }
         leaf min-tx {
             type        uint32 {
-                            range "1000 .. 60000";
-            }
+               range "1000 .. 60000";
+           }
             default     6000;
             description "The shortest interval, in milli-seconds,
                          at which this BFD session is willing to
                          transmit BFD control messages. Defaults
                          to 6000";
         }
-    }
-
-    container bfd-config {
         leaf multihop {
             type        boolean;
             default     true;
             description "Value of True indicates suppport for BFD multihop";
-            config      "true";
         }
     }
 }

diff --git a/model-bgp/src/main/yang/ebgp.yang b/model-bgp/src/main/yang/ebgp.yang
index abae3418c9d94de4fed4a1feeb09437cc60dad55..26cfeff4505890fc30a658731d5be96e6266d8f1 100644 (file)
--- a/model-bgp/src/main/yang/ebgp.yang
+++ b/model-bgp/src/main/yang/ebgp.yang
@@ -404,23 +404,19 @@ module ebgp {
        }
   } //vrfMaxpaths
 
-  container bfd {
-      leaf bfd-enabled {
-          description  "is BFD enabled";
-          type         boolean;
-          default      false;
+  container dcgw-tep-list {
+      list dcgw-tep {
+          key          "dc-gw-ip";
+          description  "mapping: DC-Gwy ip <> TEP ip";
+
+          leaf dc-gw-ip {
+              type string;
+          }
+          leaf-list tep-ips {
+              type string;
+          }
       }
   }
 
-  list tep-dcgw {
-      key          "dc-gw-ip";
-      description  "mapping: DC-Gwy ip <> TEP ip";
-      leaf dc-gw-ip {
-           type string;
-      }
-      leaf-list tep-ip {
-          type string;
-      }
-  }
  } // bgp
 }