1 files changed, 21 insertions, 126 deletions

diff --git a/v3po/api/src/main/yang/v3po@2019-05-02.yang b/v3po/api/src/main/yang/v3po@2019-05-02.yang
index 50112385b..dea978724 100644
--- a/v3po/api/src/main/yang/v3po@2019-05-02.yang
+++ b/v3po/api/src/main/yang/v3po@2019-05-02.yang
@@ -406,17 +406,15 @@ module v3po {
       type inet:ipv6-address;
       description "Host IPv6 gateway address.";
     }
-  }
 
-  grouping tap-v2-interface-state-attributes {
-      leaf device-name {
-        config false;
-        type string{
-          pattern '[a-zA-Z0-9\-;.+@$#^&*!_()=\[\]]*';
-          length 1..63;
-        }
-        description "Device name of the Tap v2 interface in VPP.";
+    leaf device-name {
+      config false;
+      type string{
+      pattern '[a-zA-Z0-9\-;.+@$#^&*!_()=\[\]]*';
+        length 1..63;
       }
+      description "Device name of the Tap v2 interface in VPP.";
+    }
   }
 
   grouping loopback-interface-base-attributes {
@@ -440,24 +438,12 @@ module v3po {
 
        Mapped to hw_interface_set_mtu VPP API message which programs the NIC.";
     }
-  }
 
-  grouping routing-base-attributes {
-    leaf ipv4-vrf-id {
-      type fib-management:fib-table-list-ref;
-    }
-    leaf ipv6-vrf-id {
-      type fib-management:fib-table-list-ref;
-    }
-    description
-      "Defines VRF tables used for ipv4 and ipv6 traffic";
-  }
-
-  grouping ethernet-state-attributes {
     leaf manufacturer-description {
       type string;
       config false;
     }
+
     leaf duplex {
       type enumeration {
         enum "half";
@@ -467,6 +453,17 @@ module v3po {
     }
   }
 
+  grouping routing-base-attributes {
+    leaf ipv4-vrf-id {
+      type fib-management:fib-table-list-ref;
+    }
+    leaf ipv6-vrf-id {
+      type fib-management:fib-table-list-ref;
+    }
+    description
+      "Defines VRF tables used for ipv4 and ipv6 traffic";
+  }
+
   grouping vhost-user-interface-base-attributes {
     leaf socket {
       type string {
@@ -488,9 +485,7 @@ module v3po {
       description "Custom device instance. Autogenerated will be used if not configured";
     }
     description "vhost-user settings";
-  }
 
-  grouping vhost-user-interface-state-attributes {
     leaf features {
       type uint64;
       config false;
@@ -630,26 +625,6 @@ module v3po {
       }
   }
 
-  grouping l2-state-attributes {
-    description
-    "Parameters for configuring Layer2 features on interfaces.";
-
-    choice interconnection {
-      case xconnect-based {
-        leaf xconnect-outgoing-interface {
-          /* Don't allow selection of this interface */
-          must "../../if:name != current()";
-          type if:interface-state-ref;
-          description
-            "L2 xconnect mode";
-        }
-      }
-      case bridge-based {
-        uses bridge-based-attributes;
-      }
-    }
-  }
-
   grouping bridge-based-attributes {
     leaf bridge-domain {
       type bridge-domain-ref;
@@ -698,24 +673,6 @@ module v3po {
     }
   }
 
-  grouping span-state-attributes {
-      description "Parameters of the SPAN feature";
-
-      container mirrored-interfaces {
-        list mirrored-interface {
-          key "iface-ref";
-          leaf iface-ref {
-            type if:interface-state-ref;
-          }
-
-          leaf state {
-            type span-state;
-            mandatory true;
-          }
-        }
-      }
-    }
-
   augment /if:interfaces/if:interface {
     ext:augment-identifier "vpp-interface-augmentation";
 
@@ -802,68 +759,6 @@ module v3po {
     }
   }
 
-  augment /if:interfaces-state/if:interface {
-    ext:augment-identifier "vpp-interface-state-augmentation";
-
-    leaf description {
-      type string;
-    }
-
-    container tap-v2 {
-      when "../if:type = 'v3po:tap-v2'";
-      uses tap-v2-interface-base-attributes;
-      uses tap-v2-interface-state-attributes;
-    }
-
-    container ethernet {
-      when "../if:type = 'ianaift:ethernetCsmacd'";
-      uses ethernet-base-attributes;
-      uses ethernet-state-attributes;
-    }
-
-    container routing {
-      uses routing-base-attributes;
-    }
-
-    container vhost-user {
-      when "../if:type = 'v3po:vhost-user'";
-      uses vhost-user-interface-base-attributes;
-      uses vhost-user-interface-state-attributes;
-    }
-
-    container vxlan {
-      when "../if:type = 'v3po:vxlan-tunnel'";
-      uses vxlan-base-attributes;
-    }
-    container vxlan-gpe {
-      when "../if:type = 'v3po:vxlan-gpe-tunnel'";
-
-      uses vxlan-gpe-base-attributes;
-    }
-
-    container gre {
-      when "../if:type = 'gre-tunnel'";
-      uses gre-base-attributes;
-    }
-
-    container l2 {
-      must "bridged-virtual-interface = 'true' or " +
-           "(not (../if:ipv4[if:enabled = 'true']/if:address/if:ip) and " +
-           "not (../if:ipv6[if:enabled = 'true']/if:address/if:ip))";
-
-      uses l2-state-attributes;
-    }
-
-    container af-packet {
-      when "../if:type = 'v3po:af-packet'";
-      uses af-packet-base-attributes;
-    }
-
-    container span {
-      uses span-state-attributes;
-    }
-  }
-
   augment /if:interfaces {
       ext:augment-identifier "vpp-interfaces-stats-augmentation";
     container statistics{
@@ -874,7 +769,7 @@ module v3po {
     }
   }
 
-  augment /if:interfaces-state/if:interface/if:statistics {
+  augment /if:interfaces/if:interface/if:statistics {
     ext:augment-identifier "vpp-interface-statistics-augmentation";
     leaf in-errors-no-buf {
       type yang:counter64;
@@ -925,7 +820,7 @@ module v3po {
     }
   }
 
-  notification interface-state-change {
+  notification interface-change {
     leaf name {
         type interface-name-or-index;
     }