23 files changed, 46 insertions, 46 deletions
diff --git a/src/scripts/vnet/bvi b/src/scripts/vnet/bvi
index 124fa044bfd..e1caf6606d6 100644
--- a/src/scripts/vnet/bvi
+++ b/src/scripts/vnet/bvi
@@ -29,7 +29,7 @@ l2fib add 00:02:04:06:08:0a    0  GigabitEthernet2/2/0.1 static
 
 
 ip route table 0 8.0.0.1/32 via loop0
-set ip arp loop0 8.0.0.1 00:02:04:06:08:0a
+set ip neighbor loop0 8.0.0.1 00:02:04:06:08:0a
 
 
 ip route add 1.2.3.3/32 via GigabitEthernet2/1/0 IP4: 00:15:17:61:73:47 -> 00:15:17:61:73:46
diff --git a/src/scripts/vnet/gre b/src/scripts/vnet/gre
index 9c2063db3fa..820fc09f469 100644
--- a/src/scripts/vnet/gre
+++ b/src/scripts/vnet/gre
@@ -2,16 +2,16 @@ comment { overlay interface }
 create packet-generator interface pg0
 set int ip address pg0 192.168.1.1/24
 set int ip address pg0 192:168:1::1/64
-set ip arp pg0 192.168.1.2 1:2:3:4:5:6 static
-set ip6 neighbor pg0 192:168:1::2 1:2:3:4:5:6 static
+set ip neighbor pg0 192.168.1.2 1:2:3:4:5:6 static
+set ip neighbor pg0 192:168:1::2 1:2:3:4:5:6 static
 set int state pg0 up
 
 comment { underlay interface }
 create packet-generator interface pg1
 set int ip address pg1 192.168.2.1/24
 set int ip address pg1 192:168:2::1/64
-set ip arp pg1 192.168.2.2 6:5:4:3:2:1 static
-set ip6 neighbor pg1 192:168:2::2 6:5:4:3:2:1 static
+set ip neighbor pg1 192.168.2.2 6:5:4:3:2:1 static
+set ip neighbor pg1 192:168:2::2 6:5:4:3:2:1 static
 set int state pg1 up
 
 comment { gre4 over ipv6 }
diff --git a/src/scripts/vnet/gre-teb b/src/scripts/vnet/gre-teb
index ec0f6193e78..992005cfa83 100644
--- a/src/scripts/vnet/gre-teb
+++ b/src/scripts/vnet/gre-teb
@@ -1,7 +1,7 @@
 create packet-generator interface pg0
 create packet-generator interface pg1
 set int ip address pg1 192.168.2.1/24
-set ip arp pg1 192.168.2.2 6:5:4:3:2:1 static
+set ip neighbor pg1 192.168.2.2 6:5:4:3:2:1 static
 create gre tunnel dst 192.168.2.2 src 192.168.2.1 teb
 
 set int state pg0 up
diff --git a/src/scripts/vnet/ip6 b/src/scripts/vnet/ip6
index de6a8e85cd0..e03c6fd2c91 100644
--- a/src/scripts/vnet/ip6
+++ b/src/scripts/vnet/ip6
@@ -20,8 +20,8 @@ set int state loop1 up
 set int ip address loop0 2001:1::1/64
 set int ip address loop1 2001:2::1/64
 
-set ip6 neighbor loop0 2001:1::2 00:00:DD:EE:AA:DD
-set ip6 neighbor loop1 2001:2::2 00:00:DD:EE:AA:EE
+set ip neighbor loop0 2001:1::2 00:00:DD:EE:AA:DD
+set ip neighbor loop1 2001:2::2 00:00:DD:EE:AA:EE
 
 ip route add 3001::/64 via 2001:2::2 loop1
 
diff --git a/src/scripts/vnet/ipsec b/src/scripts/vnet/ipsec
index bf3cbbc56e7..55cd914c4f7 100644
--- a/src/scripts/vnet/ipsec
+++ b/src/scripts/vnet/ipsec
@@ -30,9 +30,9 @@ set int ip table ipsec1 1
 set int unnum ipsec1 use pg1
 
 ip route add 192.168.1.0/24 via ipsec0
-set ip arp pg1 192.168.1.2 00:11:22:33:44:55
+set ip neighbor pg1 192.168.1.2 00:11:22:33:44:55
 ip route add table 1 192.168.0.0/24 via ipsec1
-set ip arp pg0 192.168.0.2 00:11:22:33:44:66
+set ip neighbor pg0 192.168.0.2 00:11:22:33:44:66
 
 trace add pg-input 100
 
diff --git a/src/scripts/vnet/ipsec_tun_protect b/src/scripts/vnet/ipsec_tun_protect
index ed81f913139..b30281fcf92 100644
--- a/src/scripts/vnet/ipsec_tun_protect
+++ b/src/scripts/vnet/ipsec_tun_protect
@@ -35,9 +35,9 @@ set int ip table ipip1 1
 set int unnum ipip1 use pg1
 
 ip route add 192.168.1.0/24 via ipip0
-set ip arp pg1 192.168.1.2 00:11:22:33:44:55
+set ip neighbor pg1 192.168.1.2 00:11:22:33:44:55
 ip route add table 1 192.168.0.0/24 via ipip1
-set ip arp pg0 192.168.0.2 00:11:22:33:44:66
+set ip neighbor pg0 192.168.0.2 00:11:22:33:44:66
 
 trace add pg-input 100
 
diff --git a/src/scripts/vnet/l2tp b/src/scripts/vnet/l2tp
index fcfe4b5f9ac..e9a73d579b7 100644
--- a/src/scripts/vnet/l2tp
+++ b/src/scripts/vnet/l2tp
@@ -19,7 +19,7 @@ l2tp session add client 11::1 our 22::2 l2-interface GigabitEthernet2/1/0.1
 l2tp session add client 11::1 our 22::3 l2-interface GigabitEthernet2/1/0.2 local-session-id 2 l2-sublayer-present
 
 ip route 11::1/128 via GigabitEthernet2/2/0
-set ip6 neighbor GigabitEthernet2/2/0 11::1 00:02:04:06:08:0a
+set ip neighbor GigabitEthernet2/2/0 11::1 00:02:04:06:08:0a
 
 enable ip6 interface GigabitEthernet2/2/0 
 
diff --git a/src/scripts/vnet/l3fwd b/src/scripts/vnet/l3fwd
index e3dcf73e8de..8d0aaa99e8c 100644
--- a/src/scripts/vnet/l3fwd
+++ b/src/scripts/vnet/l3fwd
@@ -1,15 +1,15 @@
 create packet-generator interface pg0
 set int ip address pg0 192.168.1.1/24
 set int ip address pg0 192:168:1::1/64
-set ip arp pg0 192.168.1.2 1:2:3:4:5:6 static
-set ip6 neighbor pg0 192:168:1::2 1:2:3:4:5:6 static
+set ip neighbor pg0 192.168.1.2 1:2:3:4:5:6 static
+set ip neighbor pg0 192:168:1::2 1:2:3:4:5:6 static
 set int state pg0 up
 
 create packet-generator interface pg1
 set int ip address pg1 192.168.2.1/24
 set int ip address pg1 192:168:2::1/64
-set ip arp pg1 192.168.2.2 6:5:4:3:2:1 static
-set ip6 neighbor pg1 192:168:2::2 6:5:4:3:2:1 static
+set ip neighbor pg1 192.168.2.2 6:5:4:3:2:1 static
+set ip neighbor pg1 192:168:2::2 6:5:4:3:2:1 static
 set int state pg1 up
 
 packet-generator new {
diff --git a/src/scripts/vnet/leftpeer/leftpeer-ioam.conf b/src/scripts/vnet/leftpeer/leftpeer-ioam.conf
index 6c1b502c2f7..cbc7a9f64fe 100644
--- a/src/scripts/vnet/leftpeer/leftpeer-ioam.conf
+++ b/src/scripts/vnet/leftpeer/leftpeer-ioam.conf
@@ -8,7 +8,7 @@ set int state GigabitEthernet2/3/0 up
 
 ioam set rewrite trace-elts 2 pow
 
-set ip6 neighbor GigabitEthernet2/3/0 db03::3 00:50:56:b7:05:cb
+set ip neighbor GigabitEthernet2/3/0 db03::3 00:50:56:b7:05:cb
 
 ip route add db04::0/64 via db03::3 
 
diff --git a/src/scripts/vnet/lfib/ip4-to-mpls b/src/scripts/vnet/lfib/ip4-to-mpls
index c7923297a9f..5ec412aa21d 100644
--- a/src/scripts/vnet/lfib/ip4-to-mpls
+++ b/src/scripts/vnet/lfib/ip4-to-mpls
@@ -18,7 +18,7 @@ set int state loop1 up
 set int ip address loop0 1.0.0.1/24
 set int ip address loop1 2.0.0.1/24
 
-set ip arp static loop1 2.0.0.2 dead.beef.babe
+set ip neighbor static loop1 2.0.0.2 dead.beef.babe
 set int mpls loop1 enable
 ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
 
diff --git a/src/scripts/vnet/lfib/mpls-pop-to-mpls b/src/scripts/vnet/lfib/mpls-pop-to-mpls
index 1b7ef8d2e7b..34a57901c03 100644
--- a/src/scripts/vnet/lfib/mpls-pop-to-mpls
+++ b/src/scripts/vnet/lfib/mpls-pop-to-mpls
@@ -16,7 +16,7 @@ set int state loop1 up
 set int ip address loop0 1.0.0.1/24
 set int ip address loop1 2.0.0.1/24
 
-set ip arp static loop1 2.0.0.2 dead.beef.babe
+set ip neighbor static loop1 2.0.0.2 dead.beef.babe
 set int mpls loop1 enable
 
 ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
diff --git a/src/scripts/vnet/lfib/mpls-to-ip4 b/src/scripts/vnet/lfib/mpls-to-ip4
index 4bd707fa2e8..5acf5fd0e9e 100644
--- a/src/scripts/vnet/lfib/mpls-to-ip4
+++ b/src/scripts/vnet/lfib/mpls-to-ip4
@@ -16,7 +16,7 @@ set int state loop1 up
 set int ip address loop0 1.0.0.1/24
 set int ip address loop1 2.0.0.1/24
 
-set ip arp static loop1 2.0.0.2 dead.beef.babe
+set ip neighbor static loop1 2.0.0.2 dead.beef.babe
 set int mpls loop1 enable
 
 ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
diff --git a/src/scripts/vnet/lfib/mpls-to-mpls b/src/scripts/vnet/lfib/mpls-to-mpls
index 07015d2b310..5de3d31979a 100644
--- a/src/scripts/vnet/lfib/mpls-to-mpls
+++ b/src/scripts/vnet/lfib/mpls-to-mpls
@@ -16,7 +16,7 @@ set int state loop1 up
 set int ip address loop0 1.0.0.1/24
 set int ip address loop1 2.0.0.1/24
 
-set ip arp static loop1 2.0.0.2 dead.beef.babe
+set ip neighbor static loop1 2.0.0.2 dead.beef.babe
 set int mpls loop1 enable
 
 ip route add 2.2.2.2/32 via 2.0.0.2 loop1 out-label 33
diff --git a/src/scripts/vnet/mpls-tunnel b/src/scripts/vnet/mpls-tunnel
index e69ad6b678b..1c395f4c324 100644
--- a/src/scripts/vnet/mpls-tunnel
+++ b/src/scripts/vnet/mpls-tunnel
@@ -51,7 +51,7 @@ loop create
 set int state loop0 up
 
 set int ip address loop0 10.0.0.1/24
-set ip arp loop0 10.0.0.2 00:00:11:aa:bb:cc
+set ip neighbor loop0 10.0.0.2 00:00:11:aa:bb:cc
 
 mpls tunnel add via 10.0.0.2 loop0 out-label 33 out-label 34 out-label 35 out-label 36
 set int state mpls-tunnel0 up
diff --git a/src/scripts/vnet/nat44 b/src/scripts/vnet/nat44
index bce96487dd2..5c593233d53 100644
--- a/src/scripts/vnet/nat44
+++ b/src/scripts/vnet/nat44
@@ -33,7 +33,7 @@ set int ip address pg0 10.0.0.1/24
 set int ip address pg1 172.16.1.1/24
 set int state pg0 up
 set int state pg1 up
-set ip arp static pg0 10.0.0.3 abcd.abcd.abcd
-set ip arp static pg0 10.0.0.4 abcd.abcd.abcd
-set ip arp static pg1 172.16.1.2 cdef.abcd.abcd
+set ip neighbor static pg0 10.0.0.3 abcd.abcd.abcd
+set ip neighbor static pg0 10.0.0.4 abcd.abcd.abcd
+set ip neighbor static pg1 172.16.1.2 cdef.abcd.abcd
 set int nat44 in pg0 out pg1
diff --git a/src/scripts/vnet/nat44_det b/src/scripts/vnet/nat44_det
index ad1e7bb09d5..9b28738dc8f 100644
--- a/src/scripts/vnet/nat44_det
+++ b/src/scripts/vnet/nat44_det
@@ -95,8 +95,8 @@ set int ip address pg0 10.0.0.1/24
 set int ip address pg1 172.16.1.1/24
 set int state pg0 up
 set int state pg1 up
-set ip arp static pg0 10.0.0.3 abcd.abcd.abcd
-set ip arp static pg0 10.0.0.4 abcd.abcd.abcd
-set ip arp static pg1 172.16.1.2 cdef.abcd.abcd
+set ip neighbor static pg0 10.0.0.3 abcd.abcd.abcd
+set ip neighbor static pg0 10.0.0.4 abcd.abcd.abcd
+set ip neighbor static pg1 172.16.1.2 cdef.abcd.abcd
 set int nat44 in pg0 out pg1
 trace add pg-input 10
diff --git a/src/scripts/vnet/nat44_lb b/src/scripts/vnet/nat44_lb
index 0e476357c54..6b6d4e1df94 100644
--- a/src/scripts/vnet/nat44_lb
+++ b/src/scripts/vnet/nat44_lb
@@ -36,11 +36,11 @@ set int ip address pg0 10.0.0.1/24
 set int ip address pg1 172.16.1.1/24
 set int state pg0 up
 set int state pg1 up
-set ip arp static pg0 10.0.0.10 abcd.abcd.abcd
-set ip arp static pg0 10.0.0.11 abcd.abcd.abce
-set ip arp static pg0 10.0.0.12 abce.abcd.abcd
-set ip arp static pg0 10.0.0.13 abce.abcd.abce
-set ip arp static pg1 172.16.1.10 cdef.abcd.abcd
-set ip arp static pg1 172.16.1.11 cdef.abcd.abce
+set ip neighbor static pg0 10.0.0.10 abcd.abcd.abcd
+set ip neighbor static pg0 10.0.0.11 abcd.abcd.abce
+set ip neighbor static pg0 10.0.0.12 abce.abcd.abcd
+set ip neighbor static pg0 10.0.0.13 abce.abcd.abce
+set ip neighbor static pg1 172.16.1.10 cdef.abcd.abcd
+set ip neighbor static pg1 172.16.1.11 cdef.abcd.abce
 set int nat44 in pg0 out pg1
 trace add pg-input 10
diff --git a/src/scripts/vnet/nat44_static b/src/scripts/vnet/nat44_static
index 26e340819f1..3c761875b2c 100644
--- a/src/scripts/vnet/nat44_static
+++ b/src/scripts/vnet/nat44_static
@@ -36,7 +36,7 @@ set int ip address pg0 10.0.0.1/24
 set int ip address pg1 172.16.1.1/24
 set int state pg0 up
 set int state pg1 up
-set ip arp static pg0 10.0.0.3 abcd.abcd.abcd
-set ip arp static pg1 172.16.1.2 cdef.abcd.abcd
+set ip neighbor static pg0 10.0.0.3 abcd.abcd.abcd
+set ip neighbor static pg1 172.16.1.2 cdef.abcd.abcd
 set int nat44 in pg0 out pg1
 trace add pg-input 10
diff --git a/src/scripts/vnet/nat44_static_with_port b/src/scripts/vnet/nat44_static_with_port
index 7297fb4c7a2..9087fbbd993 100644
--- a/src/scripts/vnet/nat44_static_with_port
+++ b/src/scripts/vnet/nat44_static_with_port
@@ -36,7 +36,7 @@ set int ip address pg0 10.0.0.1/24
 set int ip address pg1 172.16.1.1/24
 set int state pg0 up
 set int state pg1 up
-set ip arp static pg0 10.0.0.3 abcd.abcd.abcd
-set ip arp static pg1 172.16.1.2 cdef.abcd.abcd
+set ip neighbor static pg0 10.0.0.3 abcd.abcd.abcd
+set ip neighbor static pg1 172.16.1.2 cdef.abcd.abcd
 set int nat44 in pg0 out pg1
 trace add pg-input 10
diff --git a/src/scripts/vnet/nat64 b/src/scripts/vnet/nat64
index 85cd1798ed1..7e37dd88ba7 100644
--- a/src/scripts/vnet/nat64
+++ b/src/scripts/vnet/nat64
@@ -35,6 +35,6 @@ set int ip address pg0 2000::1/64
 set int ip address pg1 172.16.1.1/24
 set int state pg0 up
 set int state pg1 up
-set ip6 neighbor pg0 2000::3 abcd.abcd.abcd static
-set ip arp static pg1 172.16.1.2 cdef.abcd.abcd
+set ip neighbor pg0 2000::3 abcd.abcd.abcd static
+set ip neighbor static pg1 172.16.1.2 cdef.abcd.abcd
 set interface nat64 in pg0 out pg1
diff --git a/src/scripts/vnet/nat64_static b/src/scripts/vnet/nat64_static
index 3cf682d5854..3c4dc48bd3a 100644
--- a/src/scripts/vnet/nat64_static
+++ b/src/scripts/vnet/nat64_static
@@ -35,8 +35,8 @@ set int ip address pg0 2000::1/64
 set int ip address pg1 172.16.1.1/24
 set int state pg0 up
 set int state pg1 up
-set ip6 neighbor pg0 2000::3 abcd.abcd.abcd static
-set ip arp static pg1 172.16.1.2 cdef.abcd.abcd
+set ip neighbor pg0 2000::3 abcd.abcd.abcd static
+set ip neighbor static pg1 172.16.1.2 cdef.abcd.abcd
 set interface nat64 in pg0 out pg1
 nat64 add static bib 2000::3 3001 172.16.1.3 37678 udp
 nat64 add static bib 2000::3 3006 172.16.1.3 38678 udp
diff --git a/src/scripts/vnet/rightpeer/rightpeer-ioam.conf b/src/scripts/vnet/rightpeer/rightpeer-ioam.conf
index 3e9a8d343e2..61f1522a013 100644
--- a/src/scripts/vnet/rightpeer/rightpeer-ioam.conf
+++ b/src/scripts/vnet/rightpeer/rightpeer-ioam.conf
@@ -6,8 +6,8 @@ comment { connects to ioam domain leftpeer addr db03::1/64 }
 set int ip address GigabitEthernet2/3/0 db03::3/64
 set int state GigabitEthernet2/3/0 up
 
-set ip6 neighbor GigabitEthernet2/3/0 db03::1 00:50:56:b7:05:bf
-set ip6 neighbor GigabitEthernet2/4/0 db04::4 00:50:56:b7:05:d2
+set ip neighbor GigabitEthernet2/3/0 db03::1 00:50:56:b7:05:bf
+set ip neighbor GigabitEthernet2/4/0 db04::4 00:50:56:b7:05:d2
 
 ip route add db02::0/64 via db03::1
 
diff --git a/src/scripts/vnet/sr/sr_mpls b/src/scripts/vnet/sr/sr_mpls
index 4646372a346..cc4fb3c8d85 100644
--- a/src/scripts/vnet/sr/sr_mpls
+++ b/src/scripts/vnet/sr/sr_mpls
@@ -6,6 +6,6 @@ loop create
 set int state loop0 up
 
 set int ip address loop0 11.0.0.1/24
-set ip arp loop0 11.0.0.2 00:00:11:aa:bb:cc
+set ip neighbor loop0 11.0.0.2 00:00:11:aa:bb:cc
 
 mpls local-label 16001 via 11.0.0.2 loop0 out-label 16001