diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2020-01-13 13:22:31 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2020-01-13 13:24:23 +0000 |
| commit | 3aae7cbce9eeaeb6007305b7af33dd8941612f19 (patch) | |
| tree | 36575876f917a4c0a194de272e7e6668c188ad1d /resources | |
| parent | acd72ef6dec39ae8c46a5a5c7695197a3fba218f (diff) | |
FIX: NF_density tests
+ Because arp->neigbor was so important to do.
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I552e175b7555ebf5053d7994c0c9173c0c96fc58
Diffstat (limited to 'resources')
5 files changed, 9 insertions, 9 deletions
diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index 456cd221f3..b2d0296656 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -368,7 +368,7 @@ class ContainerManager: f"create interface memif id {i} socket-id 2 master\n" f"set interface state memif2/{i} up\n" f"set interface l2 bridge memif2/{i} 2\n" - f"set ip arp memif2/{i} {tg_if_ip4} {tg_if_mac} " + f"set ip neighbor memif2/{i} {tg_if_ip4} {tg_if_mac} " f"static\n\n" ) diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py index 9c3e5c712e..7da1c55f82 100644 --- a/resources/libraries/python/IPsecUtil.py +++ b/resources/libraries/python/IPsecUtil.py @@ -808,7 +808,7 @@ class IPsecUtil: f"exec set interface state loop0 up\n" f"exec set interface ip address " f"{if1_n} {if2_ip - 1}/{mask}\n" - f"exec set ip arp {if1_n} {if2_ip}/{mask2} {rmac} static\n" + f"exec set ip neighbor {if1_n} {if2_ip}/{mask2} {rmac} static\n" ) tmp_f2.write( f"exec set interface ip address {if2_n} {if2_ip}/{mask}\n" @@ -1278,7 +1278,7 @@ class IPsecUtil: # Configure tunnel end point(s) on right side dut2_scripts[cnf].write( - f"set ip arp memif1/{cnf + 1} " + f"set ip neighbor memif1/{cnf + 1} " f"{ip_address(if1_ip_addr) + tnl_incr} " f"02:02:00:00:{17:02X}:{cnf:02X} static\n" f"create ipsec tunnel local-ip {ip_address(if2_ip_addr) + cnf} " diff --git a/resources/templates/container/memif_create_chain_ip4.exec b/resources/templates/container/memif_create_chain_ip4.exec index be425f53dd..1751d582be 100644 --- a/resources/templates/container/memif_create_chain_ip4.exec +++ b/resources/templates/container/memif_create_chain_ip4.exec @@ -8,8 +8,8 @@ create interface memif id $mid2 socket-id $sid2 hw-addr $mac2 master set interface ip address memif$sid2/$mid2 1.1.$sid2.1/24 set interface state memif$sid2/$mid2 up -set ip arp static memif$sid1/$mid1 1.1.$sid1.2 $vif1_mac -set ip arp static memif$sid2/$mid2 1.1.$sid2.2 $vif2_mac +set ip neighbor static memif$sid1/$mid1 1.1.$sid1.2 $vif1_mac +set ip neighbor static memif$sid2/$mid2 1.1.$sid2.2 $vif2_mac ip route add 10.0.0.0/8 via 1.1.$sid1.2 ip route add 20.0.0.0/8 via 1.1.$sid2.2 diff --git a/resources/templates/container/memif_create_chain_ipsec.exec b/resources/templates/container/memif_create_chain_ipsec.exec index 1d09325ca5..e0ef57cf15 100644 --- a/resources/templates/container/memif_create_chain_ipsec.exec +++ b/resources/templates/container/memif_create_chain_ipsec.exec @@ -8,6 +8,6 @@ create interface memif id $mid2 socket-id $sid2 hw-addr $mac2 slave set interface ip address memif$sid2/$mid2 $remote_ip/24 set interface state memif$sid2/$mid2 up -set ip arp memif$sid2/$mid2 $tg_if2_ip4 $tg_if2_mac static -set ip arp memif$sid1/$mid1 $tnl_remote_ip $tnl_remote_mac static +set ip neighbor memif$sid2/$mid2 $tg_if2_ip4 $tg_if2_mac static +set ip neighbor memif$sid1/$mid1 $tnl_remote_ip $tnl_remote_mac static ip route add $raddr_ip4/8 via $tg_if2_ip4 memif$sid2/$mid2 diff --git a/resources/templates/container/memif_create_pipeline_ip4.exec b/resources/templates/container/memif_create_pipeline_ip4.exec index f0da245328..d45eb5e200 100644 --- a/resources/templates/container/memif_create_pipeline_ip4.exec +++ b/resources/templates/container/memif_create_pipeline_ip4.exec @@ -8,8 +8,8 @@ create interface memif id $mid2 socket-id $sid2 hw-addr $mac2 $role2 set interface ip address memif$sid2/$mid2 1.1.$sid2.1/24 set interface state memif$sid2/$mid2 up -set ip arp static memif$sid1/$mid1 1.1.$sid1.2 $vif1_mac -set ip arp static memif$sid2/$mid2 1.1.$sid2.2 $vif2_mac +set ip neighbor static memif$sid1/$mid1 1.1.$sid1.2 $vif1_mac +set ip neighbor static memif$sid2/$mid2 1.1.$sid2.2 $vif2_mac ip route add 10.0.0.0/8 via 1.1.$sid1.2 ip route add 20.0.0.0/8 via 1.1.$sid2.2 |