2 files changed, 47 insertions, 24 deletions

diff --git a/v3po/api/src/main/yang/proxy-arp.yang b/v3po/api/src/main/yang/proxy-arp.yang
new file mode 100644
index 000000000..9629678e1
--- /dev/null
+++ b/v3po/api/src/main/yang/proxy-arp.yang
@@ -0,0 +1,47 @@
+module proxy-arp {
+  yang-version 1;
+  namespace "urn:opendaylight:params:xml:ns:yang:vpp:proxy:arp";
+  prefix "proxy-arp";
+
+  revision "2017-03-15" {
+    description "Initial revision of proxy ARP model for VPP";
+  }
+
+  import ietf-inet-types {
+    prefix "inet";
+  }
+  import ietf-interfaces {
+    prefix "if";
+  }
+  import yang-ext {
+    prefix "ext";
+  }
+
+  container proxy-ranges {
+    list proxy-range {
+      key "vrf-id low-addr high-addr";
+      leaf vrf-id {
+        type uint32;
+      }
+      leaf low-addr {
+        type inet:ipv4-address;
+      }
+      leaf high-addr {
+        type inet:ipv4-address;
+      }
+      description
+        "Parameters for configuring Proxy ARP on interfaces.";
+    }
+  }
+
+  augment /if:interfaces/if:interface {
+    ext:augment-identifier "proxy-arp-interface-augmentation";
+
+    container proxy-arp {
+      presence "Enables proxy ARP on given interface";
+    }
+  }
+
+  // TODO(HC2VPP-86): add interfaces-state augmentation once VPP supports ARP proxy read (VPP-225)
+  // TODO(HC2VPP-7): move to interfaces/ip plugin
+}
\ No newline at end of file
diff --git a/v3po/api/src/main/yang/v3po.yang b/v3po/api/src/main/yang/v3po.yang
index 6333ec58d..14ca14d92 100644
--- a/v3po/api/src/main/yang/v3po.yang
+++ b/v3po/api/src/main/yang/v3po.yang
@@ -506,22 +506,6 @@ module v3po {
       }
   }
 
-  grouping proxy-arp-attributes {
-        description
-        "Parameters for configuring Proxy ARP on interfaces.";
-
-      leaf vrf-id {
-        type uint32;
-        default 0;
-      }
-      leaf low-addr {
-          type inet:ipv4-address;
-      }
-      leaf high-addr {
-          type inet:ipv4-address;
-      }
-  }
-
   grouping span-attributes {
     description "Parameters of the SPAN feature";
 
@@ -599,10 +583,6 @@ module v3po {
       uses vxlan-gpe-base-attributes;
     }
 
-    container proxy-arp {
-      uses proxy-arp-attributes;
-    }
-
     container acl {
       container ingress {
         uses vpp-classfier-acl:acl-base-attributes;
@@ -698,10 +678,6 @@ module v3po {
       uses l2-base-attributes;
     }
 
-    container proxy-arp {
-      uses proxy-arp-attributes;
-    }
-
     container acl {
       container ingress {
         uses vpp-classfier-acl:acl-base-attributes;