Fix to cleanup leftover global policy configuration in BGP model

* (M) release/models/bgp/openconfig-bgp-common-multiprotocol.yang * (M) release/models/bgp/openconfig-bgp-common-structure.yang * (M) release/models/bgp/openconfig-bgp-common.yang * (M) release/models/bgp/openconfig-bgp-global.yang - Removed remaining global-level policy configuration. This is supported in the network-instance model, e.g., for route redistribution. * (M) release/models/bgp/openconfig-bgp-neighbor.yang * (M) release/models/bgp/openconfig-bgp-peer-group.yang * (M) release/models/bgp/openconfig-bgp-policy.yang * (M) release/models/bgp/openconfig-bgp-types.yang * (M) release/models/bgp/openconfig-bgp.yang
openconfig · Feb 4, 2017 · d9841ec · d9841ec
1 parent a1c2b55
commit d9841ec
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 11 deletions.
diff --git a/release/models/bgp/openconfig-bgp-common-multiprotocol.yang b/release/models/bgp/openconfig-bgp-common-multiprotocol.yang
@@ -24,7 +24,13 @@ submodule openconfig-bgp-common-multiprotocol {
     for multiple protocols in BGP. The groupings are common across
     multiple contexts.";
 
-  oc-ext:openconfig-version "3.0.0";
+  oc-ext:openconfig-version "3.0.1";
+
+  revision "2017-02-02" {
+    description
+      "Bugfix to remove remaining global-level policy data";
+    reference "3.0.1";
+  }
 
   revision "2017-01-26" {
     description

diff --git a/release/models/bgp/openconfig-bgp-common-structure.yang b/release/models/bgp/openconfig-bgp-common-structure.yang
@@ -22,7 +22,13 @@ submodule openconfig-bgp-common-structure {
     contexts and provide structure around other primitive groupings.";
 
 
-  oc-ext:openconfig-version "3.0.0";
+  oc-ext:openconfig-version "3.0.1";
+
+  revision "2017-02-02" {
+    description
+      "Bugfix to remove remaining global-level policy data";
+    reference "3.0.1";
+  }
 
   revision "2017-01-26" {
     description

diff --git a/release/models/bgp/openconfig-bgp-common.yang b/release/models/bgp/openconfig-bgp-common.yang
@@ -24,7 +24,13 @@ submodule openconfig-bgp-common {
     may be application to a subset of global, peer-group or neighbor
     contexts.";
 
-  oc-ext:openconfig-version "3.0.0";
+  oc-ext:openconfig-version "3.0.1";
+
+  revision "2017-02-02" {
+    description
+      "Bugfix to remove remaining global-level policy data";
+    reference "3.0.1";
+  }
 
   revision "2017-01-26" {
     description

diff --git a/release/models/bgp/openconfig-bgp-global.yang b/release/models/bgp/openconfig-bgp-global.yang
@@ -25,7 +25,13 @@ submodule openconfig-bgp-global {
     "This sub-module contains groupings that are specific to the
     global context of the OpenConfig BGP module";
 
-  oc-ext:openconfig-version "3.0.0";
+  oc-ext:openconfig-version "3.0.1";
+
+  revision "2017-02-02" {
+    description
+      "Bugfix to remove remaining global-level policy data";
+    reference "3.0.1";
+  }
 
   revision "2017-01-26" {
     description
@@ -187,7 +193,7 @@ submodule openconfig-bgp-global {
       type leafref {
         // At bgp/global/dynamic-neighbor-prefixes/dynamic-neighbor
         // prefix/config/peer-group
-        path "../../../../../peer-groups/peer-group/config/" + 
+        path "../../../../../peer-groups/peer-group/config/" +
              "peer-group-name";
       }
       description
@@ -198,6 +204,25 @@ submodule openconfig-bgp-global {
     }
   }
 
+  grouping bgp-global-mp-all-afi-safi-list-contents {
+    description
+      "A grouping used for contents of the list of AFI-SAFI
+      entries at the global BGP level.";
+
+    // import and export policy included for the afi/safi
+
+    uses bgp-common-mp-ipv4-unicast-group;
+    uses bgp-common-mp-ipv6-unicast-group;
+    uses bgp-common-mp-ipv4-labeled-unicast-group;
+    uses bgp-common-mp-ipv6-labeled-unicast-group;
+    uses bgp-common-mp-l3vpn-ipv4-unicast-group;
+    uses bgp-common-mp-l3vpn-ipv6-unicast-group;
+    uses bgp-common-mp-l3vpn-ipv4-multicast-group;
+    uses bgp-common-mp-l3vpn-ipv6-multicast-group;
+    uses bgp-common-mp-l2vpn-vpls-group;
+    uses bgp-common-mp-l2vpn-evpn-group;
+  }
+
   grouping bgp-global-afi-safi-list {
     description
       "List of address-families associated with the BGP instance";
@@ -249,7 +274,7 @@ submodule openconfig-bgp-global {
 
       uses bgp-common-route-selection-options;
       uses bgp-common-global-group-use-multiple-paths;
-      uses bgp-common-mp-all-afi-safi-list-contents;
+      uses bgp-global-mp-all-afi-safi-list-contents;
     }
   }
 

diff --git a/release/models/bgp/openconfig-bgp-neighbor.yang b/release/models/bgp/openconfig-bgp-neighbor.yang
@@ -29,7 +29,13 @@ submodule openconfig-bgp-neighbor {
     "This sub-module contains groupings that are specific to the
     neighbor context of the OpenConfig BGP module.";
 
-  oc-ext:openconfig-version "3.0.0";
+  oc-ext:openconfig-version "3.0.1";
+
+  revision "2017-02-02" {
+    description
+      "Bugfix to remove remaining global-level policy data";
+    reference "3.0.1";
+  }
 
   revision "2017-01-26" {
     description

diff --git a/release/models/bgp/openconfig-bgp-peer-group.yang b/release/models/bgp/openconfig-bgp-peer-group.yang
@@ -24,7 +24,13 @@ submodule openconfig-bgp-peer-group {
     "This sub-module contains groupings that are specific to the
     peer-group context of the OpenConfig BGP module.";
 
-  oc-ext:openconfig-version "3.0.0";
+  oc-ext:openconfig-version "3.0.1";
+
+  revision "2017-02-02" {
+    description
+      "Bugfix to remove remaining global-level policy data";
+    reference "3.0.1";
+  }
 
   revision "2017-01-26" {
     description

diff --git a/release/models/bgp/openconfig-bgp-policy.yang b/release/models/bgp/openconfig-bgp-policy.yang
@@ -28,7 +28,13 @@ module openconfig-bgp-policy {
     It augments the base routing-policy module with BGP-specific
     options for conditions and actions.";
 
-  oc-ext:openconfig-version "3.0.0";
+  oc-ext:openconfig-version "3.0.1";
+
+  revision "2017-02-02" {
+    description
+      "Bugfix to remove remaining global-level policy data";
+    reference "3.0.1";
+  }
 
   revision "2017-01-26" {
     description

diff --git a/release/models/bgp/openconfig-bgp-types.yang b/release/models/bgp/openconfig-bgp-types.yang
@@ -22,7 +22,13 @@ module openconfig-bgp-types {
     policy. It can be imported by modules that make use of BGP
     attributes";
 
-  oc-ext:openconfig-version "3.0.0";
+  oc-ext:openconfig-version "3.0.1";
+
+  revision "2017-02-02" {
+    description
+      "Bugfix to remove remaining global-level policy data";
+    reference "3.0.1";
+  }
 
   revision "2017-01-26" {
     description

diff --git a/release/models/bgp/openconfig-bgp.yang b/release/models/bgp/openconfig-bgp.yang
@@ -59,7 +59,13 @@ module openconfig-bgp {
           +-> [ optional pointer to peer-group ]
           +-> AFI / SAFI [ per-AFI overrides ]";
 
-  oc-ext:openconfig-version "3.0.0";
+  oc-ext:openconfig-version "3.0.1";
+
+  revision "2017-02-02" {
+    description
+      "Bugfix to remove remaining global-level policy data";
+    reference "3.0.1";
+  }
 
   revision "2017-01-26" {
     description