4 files changed, 25 insertions, 8 deletions
diff --git a/v3po/api/src/main/yang/subinterface-span@2017-06-07.yang b/v3po/api/src/main/yang/subinterface-span@2019-05-27.yang
index 911181eca..82e3eb92e 100644
--- a/v3po/api/src/main/yang/subinterface-span@2017-06-07.yang
+++ b/v3po/api/src/main/yang/subinterface-span@2019-05-27.yang
@@ -44,6 +44,12 @@ module subinterface-span {
      See the License for the specific language governing permissions and
      limitations under the License.";
 
+  revision "2019-05-27" {
+    description
+      "Removed interfaces-state augmentations due to its deprecation
+       in ietf-interfaces model";
+  }
+
   revision "2017-06-07" {
     description "Eliminated config leafrefs in operational tree";
   }
diff --git a/v3po/api/src/main/yang/v3po@2019-05-02.yang b/v3po/api/src/main/yang/v3po@2019-05-27.yang
index dea978724..cc8e6d398 100644
--- a/v3po/api/src/main/yang/v3po@2019-05-02.yang
+++ b/v3po/api/src/main/yang/v3po@2019-05-27.yang
@@ -48,6 +48,13 @@ module v3po {
      See the License for the specific language governing permissions and
      limitations under the License.";
 
+  revision "2019-05-27" {
+    description
+      " - Removed interfaces-state augmentations due to its deprecation
+          in ietf-interfaces model.
+        - Refactor of leafs and groupings to match interfaces-state removal.";
+  }
+
   revision "2019-05-02" {
     description
       "Revision changes:
diff --git a/v3po/api/src/main/yang/vpp-pbb@2016-12-14.yang b/v3po/api/src/main/yang/vpp-pbb@2019-05-27.yang
index 159d05de6..1ea4e437a 100644
--- a/v3po/api/src/main/yang/vpp-pbb@2016-12-14.yang
+++ b/v3po/api/src/main/yang/vpp-pbb@2019-05-27.yang
@@ -41,6 +41,12 @@ module vpp-pbb {
      See the License for the specific language governing permissions and
      limitations under the License.";
 
+  revision "2019-05-27" {
+    description
+      "Removed interfaces-state augmentations due to its deprecation
+       in ietf-interfaces model";
+  }
+
   revision "2016-12-14" {
     description "Initial revision of pbb model";
   }
@@ -51,12 +57,4 @@ module vpp-pbb {
         uses pbb-types:pbb-rewrite-attributes;
      }
   }
-
-  augment /if:interfaces/if:interface {
-      ext:augment-identifier "pbb-rewrite-state-interface-augmentation";
-      container pbb-rewrite-state {
-         uses pbb-types:pbb-rewrite-attributes;
-         config false;
-      }
-  }
 }
diff --git a/v3po/api/src/main/yang/vpp-vlan@2018-03-19.yang b/v3po/api/src/main/yang/vpp-vlan@2019-05-27.yang
index 05b088689..bb788231a 100644
--- a/v3po/api/src/main/yang/vpp-vlan@2018-03-19.yang
+++ b/v3po/api/src/main/yang/vpp-vlan@2019-05-27.yang
@@ -47,6 +47,12 @@ module vpp-vlan {
      See the License for the specific language governing permissions and
      limitations under the License.";
 
+  revision "2019-05-27" {
+    description
+      "Removed interfaces-state augmentations due to its deprecation
+       in ietf-interfaces model";
+  }
+
   revision "2018-03-19" {
     description "Prefix invalid 802dot1q and 802dot1ad identifiers with underscore.";
   }