Merge "Bug: 5009"

diff --git a/model-bgp/src/main/yang/bgp.yang b/model-bgp/src/main/yang/bgp.yang
index cced35d54575ba854650c04c87dc2bba51809a1a..dcae6c67445083d05c7c84248ef12f2df376665a 100644 (file)
--- a/model-bgp/src/main/yang/bgp.yang
+++ b/model-bgp/src/main/yang/bgp.yang
@@ -5,6 +5,7 @@ module bgp {
 
   import ietf-inet-types {
     prefix inet;
+    revision-date "2010-09-24";
   }
   import ietf-yang-types {
     prefix yang;

diff --git a/model-bgp/src/main/yang/ebgp.yang b/model-bgp/src/main/yang/ebgp.yang
index 4611809073dfd5de7220b6addc8059df3c39fb8b..54020fc988b69f7d8109f36374210e6cf6e0a581 100644 (file)
--- a/model-bgp/src/main/yang/ebgp.yang
+++ b/model-bgp/src/main/yang/ebgp.yang
@@ -8,7 +8,7 @@ module ebgp {
   prefix "ericsson-bgp";
 
   // import some basic inet types
-  import ietf-inet-types { prefix inet; }
+  import ietf-inet-types { prefix inet; revision-date "2010-09-24"; }
 
   // meta
   organization
@@ -83,7 +83,6 @@ module ebgp {
     container ebgp-multihop {
       leaf nhops {
         type uint32;
-        mandatory "true";
       }
       leaf peer-ip {
         type leafref {