X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fip%2Fnat.robot;fp=resources%2Flibraries%2Frobot%2Fip%2Fnat.robot;h=e1c302e98ab04b30b2164ab92333e9df90555dc4;hb=250d14332d04569f01117e614a25de290e629800;hp=17229401649227d1ed916b0a84c8bbcbf663245a;hpb=6ebf54b7c0471d2723066e051307bff5561f63d1;p=csit.git

diff --git a/resources/libraries/robot/ip/nat.robot b/resources/libraries/robot/ip/nat.robot
index 1722940164..e1c302e98a 100644
--- a/resources/libraries/robot/ip/nat.robot
+++ b/resources/libraries/robot/ip/nat.robot
@@ -33,7 +33,8 @@
 | | [Arguments] | ${node} | ${int_in} | ${int_out}
 | |
 | | ${int_in_name}= | Set variable | ${node['interfaces']['${int_in}']['name']}
-| | ${int_out_name}= | Set variable | ${node['interfaces']['${int_out}']['name']}
+| | ${int_out_name}= | Set variable
+| | ... | ${node['interfaces']['${int_out}']['name']}
 | | Set NAT44 Interfaces | ${node} | ${int_in_name} | ${int_out_name}
 
 | Configure deterministic mode for NAT44
@@ -85,45 +86,72 @@
 | |
 | | Set interfaces in path up
 | |
-| | VPP Interface Set IP Address | ${dut1} | ${DUT1_${int}1}[0] | 10.0.0.1 | 20
+| | ${tg_if1_ip4}= | Get Variable Value | ${tg_if1_ip4} | 10.0.0.2
+| | ${tg_if1_mask}= | Get Variable Value | ${tg_if1_mask} | 20
+| | ${tg_if2_ip4}= | Get Variable Value | ${tg_if2_ip4} | 12.0.0.2
+| | ${tg_if2_mask}= | Get Variable Value | ${tg_if2_mask} | 20
+| | ${dut1_if1_ip4}= | Get Variable Value | ${dut1_if1_ip4} | 10.0.0.1
+| | ${dut1_if1_mask}= | Get Variable Value | ${dut1_if1_mask} | 20
+| | ${dut1_if2_ip4}= | Get Variable Value | ${dut1_if2_ip4} | 11.0.0.1
+| | ${dut1_if2_mask}= | Get Variable Value | ${dut2_if2_mask} | 20
+| | ${dut2_if1_ip4}= | Get Variable Value | ${dut2_if1_ip4} | 11.0.0.2
+| | ${dut2_if1_mask}= | Get Variable Value | ${dut2_if1_mask} | 20
+| | ${dut2_if2_ip4}= | Get Variable Value | ${dut2_if2_ip4} | 12.0.0.1
+| | ${dut2_if2_mask}= | Get Variable Value | ${dut2_if2_mask} | 20
+| | ${inside_net}= | Get Variable Value | ${inside_net} | 192.168.0.0
+| | ${inside_mask}= | Get Variable Value | ${inside_mask} | 16
+| | ${nat_net}= | Get Variable Value | ${nat_net} | 109.146.163.128
+| | ${nat_mask}= | Get Variable Value | ${nat_mask} | 26
+| | ${dest_net}= | Get Variable Value | ${dest_net} | 20.0.0.0
+| | ${dest_mask}= | Get Variable Value | ${dest_mask} | 24
+| |
+| | VPP Interface Set IP Address | ${dut1} | ${DUT1_${int}1}[0]
+| | ... | ${dut1_if1_ip4} | ${dut1_if1_mask}
 | | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | VPP Interface Set IP Address | ${dut1} | ${DUT1_${int}2}[0]
-| | ... | 11.0.0.1 | 20
+| | ... | ${dut1_if2_ip4} | ${dut1_if2_mask}
 | | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | VPP Interface Set IP Address | ${dut2} | ${DUT2_${int}1}[0]
-| | ... | 11.0.0.2 | 20
+| | ... | ${dut2_if1_ip4} | ${dut2_if1_mask}
 | | ${dut}= | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | Set Variable | ${dut2}
 | | ... | ELSE | Set Variable | ${dut1}
 | | ${dut_if2}= | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | Set Variable | ${DUT2_${int}2}[0]
 | | ... | ELSE | Set Variable | ${DUT1_${int}2}[0]
-| | VPP Interface Set IP Address | ${dut} | ${dut_if2} | 12.0.0.1 | 20
+| | VPP Interface Set IP Address | ${dut} | ${dut_if2} | ${dut2_if2_ip4}
+| | ... | ${dut2_if2_mask}
 | |
 | | VPP Add IP Neighbor
-| | ... | ${dut1} | ${DUT1_${int}1}[0] | 10.0.0.2 | ${TG_pf1_mac}[0]
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${tg_if1_ip4} | ${TG_pf1_mac}[0]
 | | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | VPP Add IP Neighbor
-| | ... | ${dut1} | ${DUT1_${int}2}[0] | 11.0.0.2 | ${DUT2_${int}1_mac}[0]
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${dut2_if1_ip4}
+| | ... | ${DUT2_${int}1_mac}[0]
 | | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | VPP Add IP Neighbor
-| | ... | ${dut2} | ${DUT2_${int}1}[0] | 11.0.0.1 | ${DUT1_${int}2_mac}[0]
+| | ... | ${dut2} | ${DUT2_${int}1}[0] | ${dut1_if2_ip4}
+| | ... | ${DUT1_${int}2_mac}[0]
 | | VPP Add IP Neighbor
-| | ... | ${dut} | ${dut_if2} | 12.0.0.2 | ${TG_pf2_mac}[0]
+| | ... | ${dut} | ${dut_if2} | ${tg_if2_ip4} | ${TG_pf2_mac}[0]
 | |
-| | Vpp Route Add | ${dut1} | 20.0.0.0 | 18 | gateway=10.0.0.2
-| | ... | interface=${DUT1_${int}1}[0]
+| | Vpp Route Add | ${dut1} | ${inside_net} | ${inside_mask}
+| | ... | gateway=${tg_if1_ip4} | interface=${DUT1_${int}1}[0]
 | | Run Keyword If | '${dut2_status}' == 'PASS'
-| | ... | Vpp Route Add | ${dut1} | 12.0.0.2 | 32 | gateway=11.0.0.2
-| | ... | interface=${DUT1_${int}2}[0]
+| | ... | Vpp Route Add | ${dut1} | ${dest_net} | ${dest_mask}
+| | ... | gateway=${dut2_if1_ip4} | interface=${DUT1_${int}2}[0]
+| | Run Keyword Unless | '${dut2_status}' == 'PASS'
+| | ... | Vpp Route Add | ${dut1} | ${dest_net} | ${dest_mask}
+| | ... | gateway=${tg_if2_ip4} | interface=${DUT1_${int}2}[0]
 | | Run Keyword If | '${dut2_status}' == 'PASS'
-| | ... | Vpp Route Add | ${dut2} | 12.0.0.0 | 24 | gateway=12.0.0.2
-| | ... | interface=${DUT2_${int}2}[0]
+| | ... | Vpp Route Add | ${dut2} | ${dest_net} | ${dest_mask}
+| | ... | gateway=${tg_if2_ip4} | interface=${DUT2_${int}2}[0]
 | | Run Keyword If | '${dut2_status}' == 'PASS'
-| | ... | Vpp Route Add | ${dut2} | 200.0.0.0 | 30 | gateway=11.0.0.1
-| | ... | interface=${DUT2_${int}1}[0]
+| | ... | Vpp Route Add | ${dut2} | ${nat_net} | ${nat_mask}
+| | ... | gateway=${dut1_if2_ip4} | interface=${DUT2_${int}1}[0]
 | |
 | | Configure inside and outside interfaces
 | | ... | ${dut1} | ${DUT1_${int}1}[0] | ${DUT1_${int}2}[0]
 | | Configure deterministic mode for NAT44
-| | ... | ${dut1} | 20.0.0.0 | 18 | 200.0.0.0 | 30
+| | ... | ${dut1} | ${inside_net} | ${inside_mask} | ${nat_net} | ${nat_mask}
+