aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2017-08-25 12:51:57 +0200
committerDave Wallace <dwallacelf@gmail.com>2017-08-28 14:11:33 +0000
commit2bdb1dc59ba736546a6663cbaf55b6edbcac6eab (patch)
tree2b06427c51f115500542898b167166e889d94cb8 /resources
parentb9ce06b180903e794a806e6eda7a1b076dc9cc8f (diff)
FIX: SNAT -> NAT renaming of API
- Based on https://gerrit.fd.io/r/#/c/8146/ Change-Id: I774483c7e2b419a9b9b6be78812ecf53a5c91eab Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/python/NAT.py113
-rw-r--r--resources/libraries/python/NATUtil.py261
-rw-r--r--resources/libraries/python/SNATUtil.py171
-rw-r--r--resources/libraries/python/VppConfigGenerator.py8
-rw-r--r--resources/libraries/robot/ip/nat.robot (renamed from resources/libraries/robot/ip/snat.robot)65
-rw-r--r--resources/libraries/robot/performance/performance_configuration.robot8
-rw-r--r--resources/libraries/robot/performance/performance_setup.robot10
-rw-r--r--resources/libraries/robot/shared/default.robot6
-rw-r--r--resources/templates/vat/nat/nat44_deterministic_forward.vat1
-rw-r--r--resources/templates/vat/nat/nat44_deterministic_reverse.vat1
-rw-r--r--resources/templates/vat/nat/nat44_set_deterministic.vat1
-rw-r--r--resources/templates/vat/nat/nat44_set_interfaces.vat1
-rw-r--r--resources/templates/vat/nat/nat_set_workers.vat1
-rw-r--r--resources/templates/vat/nat/nat_show_nat.vat1
-rw-r--r--resources/templates/vat/nat/snat_interface_dump.vat1
-rw-r--r--resources/templates/vat/nat/snat_mapping_dump.vat (renamed from resources/templates/vat/snat/snat_mapping_dump.vat)0
-rw-r--r--resources/templates/vat/snat/snat_deterministic_forward.vat1
-rw-r--r--resources/templates/vat/snat/snat_deterministic_reverse.vat1
-rw-r--r--resources/templates/vat/snat/snat_interface_dump.vat1
-rw-r--r--resources/templates/vat/snat/snat_set_deterministic.vat1
-rw-r--r--resources/templates/vat/snat/snat_set_interfaces.vat1
-rw-r--r--resources/templates/vat/snat/snat_set_workers.vat1
-rw-r--r--resources/templates/vat/snat/snat_show_snat.vat1
23 files changed, 316 insertions, 340 deletions
diff --git a/resources/libraries/python/NAT.py b/resources/libraries/python/NAT.py
deleted file mode 100644
index 485cd53e71..0000000000
--- a/resources/libraries/python/NAT.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""NAT utilities library."""
-
-from resources.libraries.python.VatExecutor import VatExecutor
-
-
-class NATUtil(object):
- """NAT utilities."""
-
- def __init__(self):
- pass
-
- @staticmethod
- def vpp_get_nat_static_mappings(node):
- """Get NAT static mappings from VPP node.
-
- :param node: VPP node.
- :type node: dict
- :returns: List of static mappings.
- :rtype: list
- :raises RuntimeError: If the output is not as expected.
- """
-
- vat = VatExecutor()
- # JSON output not supported for this command
- vat.execute_script('snat/snat_mapping_dump.vat', node, json_out=False)
-
- stdout = vat.get_script_stdout()
- lines = stdout.split("\n")
-
- data = []
- # lines[0,1] are table and column headers
- for line in lines[2::]:
- # Ignore extra data after NAT table
- if "snat_static_mapping_dump error: Misc" in line or "vat#" in line:
- continue
- items = line.split(" ")
- while "" in items:
- items.remove("")
- if len(items) == 0:
- continue
- elif len(items) == 4:
- # no ports were returned
- data.append({
- "local_address": items[0],
- "remote_address": items[1],
- "vrf": items[2],
- "protocol": items[3]
- })
- elif len(items) == 6:
- data.append({
- "local_address": items[0],
- "local_port": items[1],
- "remote_address": items[2],
- "remote_port": items[3],
- "vrf": items[4],
- "protocol": items[5]
- })
- else:
- raise RuntimeError("Unexpected output from snat_mapping_dump.")
-
- return data
-
- @staticmethod
- def vpp_get_nat_interfaces(node):
- """Get list of interfaces configured with NAT from VPP node.
-
- :param node: VPP node.
- :type node: dict
- :returns: List of interfaces on the node that are configured with NAT.
- :rtype: list
- :raises RuntimeError: If the output is not as expected.
- """
-
- vat = VatExecutor()
- # JSON output not supported for this command
- vat.execute_script('snat/snat_interface_dump.vat', node,
- json_out=False)
-
- stdout = vat.get_script_stdout()
- lines = stdout.split("\n")
-
- data = []
- for line in lines:
- items = line.split(" ")
- for trash in ("", "vat#"):
- while trash in items:
- items.remove(trash)
- if len(items) == 0:
- continue
- elif len(items) == 3:
- data.append({
- # items[0] is the table header - "sw_if_index"
- "sw_if_index": items[1],
- "direction": items[2]
- })
- else:
- raise RuntimeError(
- "Unexpected output from snat_interface_dump.")
-
- return data
diff --git a/resources/libraries/python/NATUtil.py b/resources/libraries/python/NATUtil.py
new file mode 100644
index 0000000000..ea13c9411f
--- /dev/null
+++ b/resources/libraries/python/NATUtil.py
@@ -0,0 +1,261 @@
+# Copyright (c) 2017 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""NAT utilities library."""
+
+from resources.libraries.python.VatExecutor import VatTerminal, VatExecutor
+
+
+class NATUtil(object):
+ """This class defines the methods to set NAT."""
+
+ def __init__(self):
+ pass
+
+ @staticmethod
+ def set_nat44_interfaces(node, int_in, int_out):
+ """Set inside and outside interfaces for NAT44.
+
+ :param node: DUT node.
+ :param int_in: Inside interface.
+ :param int_out: Outside interface.
+ :type node: dict
+ :type int_in: str
+ :type int_out: str
+ :returns: Response of the command.
+ :rtype: str
+ :raises RuntimeError: If setting of inside and outside interfaces for
+ NAT44 fails.
+ """
+
+ try:
+ with VatTerminal(node, json_param=False) as vat:
+ response = vat.vat_terminal_exec_cmd_from_template(
+ 'nat/nat44_set_interfaces.vat',
+ int_in=int_in, int_out=int_out)
+ return response
+ except:
+ raise RuntimeError("Setting of inside and outside interfaces for "
+ "NAT failed!")
+
+ @staticmethod
+ def set_nat44_deterministic(node, ip_in, subnet_in, ip_out, subnet_out):
+ """Set deterministic behaviour of NAT44.
+
+ :param node: DUT node.
+ :param ip_in: Inside IP.
+ :param subnet_in: Inside IP subnet.
+ :param ip_out: Outside IP.
+ :param subnet_out: Outside IP subnet.
+ :type node: dict
+ :type ip_in: str
+ :type subnet_in: str or int
+ :type ip_out: str
+ :type subnet_out: str or int
+ :returns: Response of the command.
+ :rtype: str
+ :raises RuntimeError: If setting of deterministic behaviour of NAT44
+ fails.
+ """
+
+ try:
+ with VatTerminal(node, json_param=False) as vat:
+ response = vat.vat_terminal_exec_cmd_from_template(
+ 'nat/nat44_set_deterministic.vat',
+ ip_in=ip_in, subnet_in=subnet_in,
+ ip_out=ip_out, subnet_out=subnet_out)
+ return response
+ except:
+ raise RuntimeError("Setting of deterministic behaviour of NAT "
+ "failed!")
+
+ @staticmethod
+ def set_nat_workers(node, lcores):
+ """Set NAT workers.
+
+ :param node: DUT node.
+ :param lcores: list of cores, format: range e.g. 1-5 or list of ranges
+ e.g.: 1-5,18-22.
+ :type node: dict
+ :type lcores: str
+ :returns: Response of the command.
+ :rtype: str
+ :raises RuntimeError: If setting of NAT workers fails.
+ """
+
+ try:
+ with VatTerminal(node, json_param=False) as vat:
+ response = vat.vat_terminal_exec_cmd_from_template(
+ 'nat/nat_set_workers.vat', lcores=lcores)
+ return response
+ except:
+ raise RuntimeError("Setting of NAT workers failed!")
+
+ @staticmethod
+ def show_nat(node):
+ """Show the NAT settings.
+
+ :param node: DUT node.
+ :type node: dict
+ :returns: Response of the command.
+ :rtype: str
+ :raises RuntimeError: If getting of NAT settings fails.
+ """
+
+ try:
+ with VatTerminal(node, json_param=False) as vat:
+ response = vat.vat_terminal_exec_cmd_from_template(
+ 'nat/nat_show_nat.vat')
+ return response
+ except:
+ raise RuntimeError("Getting of NAT settings failed!")
+
+ @staticmethod
+ def show_nat44_deterministic_forward(node, ip_addr):
+ """Show forward IP address and port(s).
+
+ :param node: DUT node.
+ :param ip_addr: IP address.
+ :type node: dict
+ :type ip_addr: str
+ :returns: Response of the command.
+ :rtype: str
+ :raises RuntimeError: If command 'exec snat deterministic forward'
+ fails.
+ """
+
+ try:
+ with VatTerminal(node, json_param=False) as vat:
+ response = vat.vat_terminal_exec_cmd_from_template(
+ 'nat/nat44_deterministic_forward.vat', ip=ip_addr)
+ return response
+ except:
+ raise RuntimeError("Command 'exec nat44 deterministic forward {ip}'"
+ " failed!".format(ip=ip_addr))
+
+ @staticmethod
+ def show_nat44_deterministic_reverse(node, ip_addr, port):
+ """Show reverse IP address.
+
+ :param node: DUT node.
+ :param ip_addr: IP address.
+ :param port: Port.
+ :type node: dict
+ :type ip_addr: str
+ :type port: str or int
+ :returns: Response of the command.
+ :rtype: str
+ :raises RuntimeError: If command 'exec snat deterministic reverse'
+ fails.
+ """
+
+ try:
+ with VatTerminal(node, json_param=False) as vat:
+ response = vat.vat_terminal_exec_cmd_from_template(
+ 'nat/nat44_deterministic_reverse.vat',
+ ip=ip_addr, port=port)
+ return response
+ except:
+ raise RuntimeError(
+ "Command 'exec nat44 deterministic reverse {ip}:{port}'"
+ " failed!".format(ip=ip_addr, port=port))
+
+ @staticmethod
+ def get_nat_static_mappings(node):
+ """Get NAT static mappings from VPP node.
+
+ :param node: VPP node.
+ :type node: dict
+ :returns: List of static mappings.
+ :rtype: list
+ :raises RuntimeError: If the output is not as expected.
+ """
+
+ vat = VatExecutor()
+ # JSON output not supported for this command
+ vat.execute_script('nat/snat_mapping_dump.vat', node, json_out=False)
+
+ stdout = vat.get_script_stdout()
+ lines = stdout.split("\n")
+
+ data = []
+ # lines[0,1] are table and column headers
+ for line in lines[2::]:
+ # Ignore extra data after NAT table
+ if "snat_static_mapping_dump error: Misc" in line or "vat#" in line:
+ continue
+ items = line.split(" ")
+ while "" in items:
+ items.remove("")
+ if len(items) == 0:
+ continue
+ elif len(items) == 4:
+ # no ports were returned
+ data.append({
+ "local_address": items[0],
+ "remote_address": items[1],
+ "vrf": items[2],
+ "protocol": items[3]
+ })
+ elif len(items) == 6:
+ data.append({
+ "local_address": items[0],
+ "local_port": items[1],
+ "remote_address": items[2],
+ "remote_port": items[3],
+ "vrf": items[4],
+ "protocol": items[5]
+ })
+ else:
+ raise RuntimeError("Unexpected output from snat_mapping_dump.")
+
+ return data
+
+ @staticmethod
+ def get_nat_interfaces(node):
+ """Get list of interfaces configured with NAT from VPP node.
+
+ :param node: VPP node.
+ :type node: dict
+ :returns: List of interfaces on the node that are configured with NAT.
+ :rtype: list
+ :raises RuntimeError: If the output is not as expected.
+ """
+
+ vat = VatExecutor()
+ # JSON output not supported for this command
+ vat.execute_script('nat/snat_interface_dump.vat', node,
+ json_out=False)
+
+ stdout = vat.get_script_stdout()
+ lines = stdout.split("\n")
+
+ data = []
+ for line in lines:
+ items = line.split(" ")
+ for trash in ("", "vat#"):
+ while trash in items:
+ items.remove(trash)
+ if len(items) == 0:
+ continue
+ elif len(items) == 3:
+ data.append({
+ # items[0] is the table header - "sw_if_index"
+ "sw_if_index": items[1],
+ "direction": items[2]
+ })
+ else:
+ raise RuntimeError(
+ "Unexpected output from snat_interface_dump.")
+
+ return data
diff --git a/resources/libraries/python/SNATUtil.py b/resources/libraries/python/SNATUtil.py
deleted file mode 100644
index 02cf493a93..0000000000
--- a/resources/libraries/python/SNATUtil.py
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""SNAT utilities library."""
-
-from resources.libraries.python.VatExecutor import VatTerminal
-
-
-class SNATUtil(object):
- """This class defines the methods to set SNAT."""
-
- def __init__(self):
- pass
-
- @staticmethod
- def set_snat_interfaces(node, int_in, int_out):
- """Set inside and outside interfaces for SNAT.
-
- :param node: DUT node.
- :param int_in: Inside interface.
- :param int_out: Outside interface.
- :type node: dict
- :type int_in: str
- :type int_out: str
- :returns: Response of the command.
- :rtype: str
- :raises RuntimeError: If setting of inside and outside interfaces for
- SNAT fails.
- """
-
- try:
- with VatTerminal(node, json_param=False) as vat:
- response = vat.vat_terminal_exec_cmd_from_template(
- 'snat/snat_set_interfaces.vat',
- int_in=int_in, int_out=int_out)
- return response
- except:
- raise RuntimeError("Setting of inside and outside interfaces for "
- "SNAT failed!")
-
- @staticmethod
- def set_snat_deterministic(node, ip_in, subnet_in, ip_out, subnet_out):
- """Set deterministic behaviour of SNAT.
-
- :param node: DUT node.
- :param ip_in: Inside IP.
- :param subnet_in: Inside IP subnet.
- :param ip_out: Outside IP.
- :param subnet_out: Outside IP subnet.
- :type node: dict
- :type ip_in: str
- :type subnet_in: str or int
- :type ip_out: str
- :type subnet_out: str or int
- :returns: Response of the command.
- :rtype: str
- :raises RuntimeError: If setting of deterministic behaviour of SNAT
- fails.
- """
-
- try:
- with VatTerminal(node, json_param=False) as vat:
- response = vat.vat_terminal_exec_cmd_from_template(
- 'snat/snat_set_deterministic.vat',
- ip_in=ip_in, subnet_in=subnet_in,
- ip_out=ip_out, subnet_out=subnet_out)
- return response
- except:
- raise RuntimeError("Setting of deterministic behaviour of SNAT "
- "failed!")
-
- @staticmethod
- def set_snat_workers(node, lcores):
- """Set SNAT workers.
-
- :param node: DUT node.
- :param lcores: list of cores, format: range e.g. 1-5 or list of ranges
- e.g.: 1-5,18-22.
- :type node: dict
- :type lcores: str
- :returns: Response of the command.
- :rtype: str
- :raises RuntimeError: If setting of SNAT workers fails.
- """
-
- try:
- with VatTerminal(node, json_param=False) as vat:
- response = vat.vat_terminal_exec_cmd_from_template(
- 'snat/snat_set_workers.vat', lcores=lcores)
- return response
- except:
- raise RuntimeError("Setting of SNAT workers failed!")
-
- @staticmethod
- def show_snat(node):
- """Show the SNAT settings.
-
- :param node: DUT node.
- :type node: dict
- :returns: Response of the command.
- :rtype: str
- :raises RuntimeError: If getting of SNAT settings fails.
- """
-
- try:
- with VatTerminal(node, json_param=False) as vat:
- response = vat.vat_terminal_exec_cmd_from_template(
- 'snat/snat_show_snat.vat')
- return response
- except:
- raise RuntimeError("Getting of SNAT settings failed!")
-
- @staticmethod
- def show_snat_deterministic_forward(node, ip_addr):
- """Show forward IP address and port(s).
-
- :param node: DUT node.
- :param ip_addr: IP address.
- :type node: dict
- :type ip_addr: str
- :returns: Response of the command.
- :rtype: str
- :raises RuntimeError: If command 'exec snat deterministic forward'
- fails.
- """
-
- try:
- with VatTerminal(node, json_param=False) as vat:
- response = vat.vat_terminal_exec_cmd_from_template(
- 'snat/snat_deterministic_forward.vat', ip=ip_addr)
- return response
- except:
- raise RuntimeError("Command 'exec snat deterministic forward {ip}'"
- " failed!".format(ip=ip_addr))
-
- @staticmethod
- def show_snat_deterministic_reverse(node, ip_addr, port):
- """Show reverse IP address.
-
- :param node: DUT node.
- :param ip_addr: IP address.
- :param port: Port.
- :type node: dict
- :type ip_addr: str
- :type port: str or int
- :returns: Response of the command.
- :rtype: str
- :raises RuntimeError: If command 'exec snat deterministic reverse'
- fails.
- """
-
- try:
- with VatTerminal(node, json_param=False) as vat:
- response = vat.vat_terminal_exec_cmd_from_template(
- 'snat/snat_deterministic_reverse.vat',
- ip=ip_addr, port=port)
- return response
- except:
- raise RuntimeError(
- "Command 'exec snat deterministic reverse {ip}:{port}'"
- " failed!".format(ip=ip_addr, port=port))
diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py
index 0331648269..dac8bae6bb 100644
--- a/resources/libraries/python/VppConfigGenerator.py
+++ b/resources/libraries/python/VppConfigGenerator.py
@@ -286,13 +286,13 @@ class VppConfigGenerator(object):
path = ['dpdk', 'no-multi-seg']
self.add_config_item(self._nodeconfig, '', path)
- def add_snat(self, value='deterministic'):
- """Add SNAT configuration.
+ def add_nat(self, value='deterministic'):
+ """Add NAT configuration.
- :param value: SNAT mode.
+ :param value: NAT mode.
:type value: str
"""
- path = ['snat']
+ path = ['nat']
self.add_config_item(self._nodeconfig, value, path)
def apply_config(self, waittime=5, retries=12):
diff --git a/resources/libraries/robot/ip/snat.robot b/resources/libraries/robot/ip/nat.robot
index 610a9150ee..fefc0fe739 100644
--- a/resources/libraries/robot/ip/snat.robot
+++ b/resources/libraries/robot/ip/nat.robot
@@ -12,16 +12,15 @@
# limitations under the License.
*** Settings ***
-| Library | resources.libraries.python.SNATUtil
-| Library | resources.libraries.python.NAT.NATUtil
-| Documentation | Keywords for SNAT feature in VPP.
+| Library | resources.libraries.python.NATUtil
+| Documentation | Keywords for NAT feature in VPP.
*** Keywords ***
| Configure inside and outside interfaces
-| | [Documentation] | Configure inside and outside interfaces for SNAT.
+| | [Documentation] | Configure inside and outside interfaces for NAT44.
| | ...
| | ... | *Arguments:*
-| | ... | - node - DUT node to set SNAT interfaces on. Type: dictionary
+| | ... | - node - DUT node to set NAT44 interfaces on. Type: dictionary
| | ... | - int_in - Inside interface. Type: string
| | ... | - int_out - Outside interface. Type: string
| | ...
@@ -34,13 +33,13 @@
| | ...
| | ${int_in_name}= | Set variable | ${node['interfaces']['${int_in}']['name']}
| | ${int_out_name}= | Set variable | ${node['interfaces']['${int_out}']['name']}
-| | Set SNAT Interfaces | ${node} | ${int_in_name} | ${int_out_name}
+| | Set NAT44 Interfaces | ${node} | ${int_in_name} | ${int_out_name}
-| Configure deterministic mode for SNAT
-| | [Documentation] | Set deterministic behaviour of SNAT.
+| Configure deterministic mode for NAT44
+| | [Documentation] | Set deterministic behaviour of NAT44.
| | ...
| | ... | *Arguments:*
-| | ... | - node - DUT node to set deterministic mode for SNAT on.
+| | ... | - node - DUT node to set deterministic mode for NAT44 on.
| | ... | Type: dictionary
| | ... | - ip_in - Inside IP. Type: string
| | ... | - subnet_in - Inside IP subnet. Type: string
@@ -49,83 +48,83 @@
| | ...
| | ... | *Example:*
| | ...
-| | ... | \| Configure deterministic mode for SNAT \| ${nodes['DUT1']} \
+| | ... | \| Configure deterministic mode for NAT44 \| ${nodes['DUT1']} \
| | ... | \| 100.0.0.0 \| 12 \| 12.1.1.0 \| 24 \|
| | ...
| | [Arguments] | ${node} | ${ip_in} | ${subnet_in} | ${ip_out} | ${subnet_out}
| | ...
-| | Set SNAT deterministic | ${node} | ${ip_in} | ${subnet_in} | ${ip_out}
+| | Set NAT44 deterministic | ${node} | ${ip_in} | ${subnet_in} | ${ip_out}
| | ... | ${subnet_out}
-| Configure workers for SNAT
-| | [Documentation] | Configure workers for SNAT.
+| Configure workers for NAT
+| | [Documentation] | Configure workers for NAT.
| | ...
| | ... | *Arguments:*
-| | ... | - node - DUT node to set SNAT workers on. Type: dictionary
+| | ... | - node - DUT node to set NAT workers on. Type: dictionary
| | ... | - lcores - list of cores, format: range e.g. 1-5 or list of ranges \
| | ... | e.g.: 1-5,18-22. Type: string
| | ...
| | ... | *Example:*
| | ...
-| | ... | \| Configure workers for SNAT \| ${nodes['DUT1']} \| 12-23,36-47 \|
+| | ... | \| Configure workers for NAT \| ${nodes['DUT1']} \| 12-23,36-47 \|
| | ...
| | [Arguments] | ${node} | ${lcores}
| | ...
-| | Set SNAT workers | ${node} | ${lcores}
+| | Set NAT workers | ${node} | ${lcores}
-| Show SNAT verbose
-| | [Documentation] | Get the SNAT settings on the node.
+| Show NAT verbose
+| | [Documentation] | Get the NAT settings on the node.
| | ...
| | ... | *Arguments:*
-| | ... | - node - DUT node to show SNAT. Type: dictionary
+| | ... | - node - DUT node to show NAT. Type: dictionary
| | ...
| | ... | *Example:*
| | ...
-| | ... | \| Show SNAT verbose \| ${nodes['DUT1']} \|
+| | ... | \| Show NAT verbose \| ${nodes['DUT1']} \|
| | ...
| | [Arguments] | ${node}
| | ...
-| | Show SNAT | ${node}
+| | Show NAT | ${node}
-| Get SNAT deterministic forward
+| Get NAT44 deterministic forward
| | [Documentation] | Show forward IP address and port(s).
| | ...
| | ... | *Arguments:*
-| | ... | - node - DUT node to get SNAT deterministic forward on.
+| | ... | - node - DUT node to get NAT44 deterministic forward on.
| | ... | Type: dictionary
| | ... | - ip - IP address. Type: string
| | ...
| | ... | *Example:*
| | ...
-| | ... | \| Get SNAT deterministic forward \| ${nodes['DUT1']} \| 10.0.0.2 \|
+| | ... | \| Get NAT44 deterministic forward \| ${nodes['DUT1']} \| 10.0.0.2 \|
| | ...
| | [Arguments] | ${node} | ${ip}
| | ...
-| | Show SNAT deterministic forward | ${node} | ${ip}
+| | Show NAT44 deterministic forward | ${node} | ${ip}
-| Get SNAT deterministic reverse
+| Get NAT44 deterministic reverse
| | [Documentation] | Show reverse IP address.
| | ...
| | ... | *Arguments:*
-| | ... | - node - DUT node to get SNAT deterministic reverse on.
+| | ... | - node - DUT node to get NAT44 deterministic reverse on.
| | ... | Type: dictionary
| | ... | - ip - IP address. Type: string
| | ... | - port - Port. Type: string or integer
| | ...
| | ... | *Example:*
| | ...
-| | ... | \| Get SNAT deterministic reverse \| ${nodes['DUT1']} \| 10.0.0.2 \
+| | ... | \| Get NAT44 deterministic reverse \| ${nodes['DUT1']} \| 10.0.0.2 \
| | ... | \| 1025 \|
| | ...
| | [Arguments] | ${node} | ${ip} | ${port}
| | ...
-| | Show SNAT deterministic reverse | ${node} | ${ip} | ${port}
+| | Show NAT44 deterministic reverse | ${node} | ${ip} | ${port}
| Get NAT interfaces
| | [Documentation] | Get list of interfaces configured with NAT from VPP node.
| | ...
| | ... | *Arguments:*
-| | ... | - node - DUT node to get SNAT interfaces on. Type: dictionary
+| | ... | - node - DUT node to get NAT interfaces on. Type: dictionary
| | ...
| | ... | *Example:*
| | ...
@@ -133,13 +132,13 @@
| | ...
| | [Arguments] | ${node}
| | ...
-| | VPP get NAT interfaces | ${node}
+| | Get NAT interfaces | ${node}
| Get NAT static mappings
| | [Documentation] | Get NAT static mappings from VPP node.
| | ...
| | ... | *Arguments:*
-| | ... | - node - DUT node to get SNAT static mappings on. Type: dictionary
+| | ... | - node - DUT node to get NAT static mappings on. Type: dictionary
| | ...
| | ... | *Example:*
| | ...
@@ -147,4 +146,4 @@
| | ...
| | [Arguments] | ${node}
| | ...
-| | VPP get NAT static mappings | ${node}
+| | Get NAT static mappings | ${node}
diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot
index 5935b020d0..8e170c93a9 100644
--- a/resources/libraries/robot/performance/performance_configuration.robot
+++ b/resources/libraries/robot/performance/performance_configuration.robot
@@ -1958,13 +1958,13 @@
| | Add arp on dut | ${dut2} | ${dut2_if1} | ${dut1_dut2_ip4_address}
| | ... | ${dut1_if2_mac}
-| Initialize SNAT in 3-node circular topology
-| | [Documentation] | Initialization of 3-node topology with SNAT between DUTs:
+| Initialize NAT44 in 3-node circular topology
+| | [Documentation] | Initialization of 3-node topology with NAT44 between DUTs:
| | ... | - set interfaces up
| | ... | - set IP addresses
| | ... | - set ARP
| | ... | - create routes
-| | ... | - set SNAT - only on DUT1
+| | ... | - set NAT44 - only on DUT1
| | ...
| | Set Interface State | ${dut1} | ${dut1_if1} | up
| | Set Interface State | ${dut1} | ${dut1_if2} | up
@@ -1994,7 +1994,7 @@
| | ...
| | Configure inside and outside interfaces
| | ... | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| | Configure deterministic mode for SNAT
+| | Configure deterministic mode for NAT44
| | ... | ${dut1} | 20.0.0.0 | 18 | 200.0.0.0 | 30
| Initialize L2 xconnect for '${nr}' memif pairs in 3-node circular topology
diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot
index 95b2bddd4f..5838590e31 100644
--- a/resources/libraries/robot/performance/performance_setup.robot
+++ b/resources/libraries/robot/performance/performance_setup.robot
@@ -524,9 +524,9 @@
| | Teardown traffic generator | ${tg}
| | Cleanup DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| Tear down performance discovery test with SNAT
+| Tear down performance discovery test with NAT
| | [Documentation] | Common test teardown for ndrdisc and pdrdisc performance \
-| | ... | tests with SNAT feature used.
+| | ... | tests with NAT feature used.
| | ...
| | ... | *Arguments:*
| | ... | - rate - Rate for sending packets. Type: string
@@ -535,15 +535,15 @@
| | ...
| | ... | *Example:*
| | ...
-| | ... | \| Tear down performance discovery test with SNAT \| 100000pps \| 64 \
+| | ... | \| Tear down performance discovery test with NAT \| 100000pps \| 64 \
| | ... | \| ${traffic_profile} \|
| | ...
| | [Arguments] | ${rate} | ${framesize} | ${traffic_profile}
| | ...
| | Tear down performance discovery test | ${rate} | ${framesize}
| | ... | ${traffic_profile}
-| | Show SNAT verbose | ${dut1}
-| | Show SNAT verbose | ${dut2}
+| | Show NAT verbose | ${dut1}
+| | Show NAT verbose | ${dut2}
| Tear down performance test with ACL
| | [Documentation] | Common test teardown for ndrdisc and pdrdisc performance \
diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot
index 3d1ce25732..48b61e5f86 100644
--- a/resources/libraries/robot/shared/default.robot
+++ b/resources/libraries/robot/shared/default.robot
@@ -254,12 +254,12 @@
| | :FOR | ${dut} | IN | @{duts}
| | | Run keyword | ${dut}.Add DPDK Dev Default TXD | ${txd}
-| Add SNAT to all DUTs
-| | [Documentation] | Add SNAT configuration to all DUTs.
+| Add NAT to all DUTs
+| | [Documentation] | Add NAT configuration to all DUTs.
| | ...
| | ${duts}= | Get Matches | ${nodes} | DUT*
| | :FOR | ${dut} | IN | @{duts}
-| | | Run keyword | ${dut}.Add SNAT
+| | | Run keyword | ${dut}.Add NAT
| Add cryptodev to all DUTs
| | [Documentation] | Add Cryptodev to VPP startup configuration to all DUTs.
diff --git a/resources/templates/vat/nat/nat44_deterministic_forward.vat b/resources/templates/vat/nat/nat44_deterministic_forward.vat
new file mode 100644
index 0000000000..a901398598
--- /dev/null
+++ b/resources/templates/vat/nat/nat44_deterministic_forward.vat
@@ -0,0 +1 @@
+exec nat44 deterministic forward {ip}
diff --git a/resources/templates/vat/nat/nat44_deterministic_reverse.vat b/resources/templates/vat/nat/nat44_deterministic_reverse.vat
new file mode 100644
index 0000000000..614a2c0dfb
--- /dev/null
+++ b/resources/templates/vat/nat/nat44_deterministic_reverse.vat
@@ -0,0 +1 @@
+exec nat44 deterministic reverse {ip}:{port}
diff --git a/resources/templates/vat/nat/nat44_set_deterministic.vat b/resources/templates/vat/nat/nat44_set_deterministic.vat
new file mode 100644
index 0000000000..39f3deeeb2
--- /dev/null
+++ b/resources/templates/vat/nat/nat44_set_deterministic.vat
@@ -0,0 +1 @@
+exec nat44 deterministic add in {ip_in}/{subnet_in} out {ip_out}/{subnet_out}
diff --git a/resources/templates/vat/nat/nat44_set_interfaces.vat b/resources/templates/vat/nat/nat44_set_interfaces.vat
new file mode 100644
index 0000000000..f25961dbc2
--- /dev/null
+++ b/resources/templates/vat/nat/nat44_set_interfaces.vat
@@ -0,0 +1 @@
+exec set interface nat44 in {int_in} out {int_out}
diff --git a/resources/templates/vat/nat/nat_set_workers.vat b/resources/templates/vat/nat/nat_set_workers.vat
new file mode 100644
index 0000000000..1a4d48979d
--- /dev/null
+++ b/resources/templates/vat/nat/nat_set_workers.vat
@@ -0,0 +1 @@
+exec set nat workers {lcores}
diff --git a/resources/templates/vat/nat/nat_show_nat.vat b/resources/templates/vat/nat/nat_show_nat.vat
new file mode 100644
index 0000000000..52f723280d
--- /dev/null
+++ b/resources/templates/vat/nat/nat_show_nat.vat
@@ -0,0 +1 @@
+exec show nat verbose
diff --git a/resources/templates/vat/nat/snat_interface_dump.vat b/resources/templates/vat/nat/snat_interface_dump.vat
new file mode 100644
index 0000000000..b80db63d82
--- /dev/null
+++ b/resources/templates/vat/nat/snat_interface_dump.vat
@@ -0,0 +1 @@
+snat_interface_dump
diff --git a/resources/templates/vat/snat/snat_mapping_dump.vat b/resources/templates/vat/nat/snat_mapping_dump.vat
index 7ac763b4f3..7ac763b4f3 100644
--- a/resources/templates/vat/snat/snat_mapping_dump.vat
+++ b/resources/templates/vat/nat/snat_mapping_dump.vat
diff --git a/resources/templates/vat/snat/snat_deterministic_forward.vat b/resources/templates/vat/snat/snat_deterministic_forward.vat
deleted file mode 100644
index 3bb7b2b1f9..0000000000
--- a/resources/templates/vat/snat/snat_deterministic_forward.vat
+++ /dev/null
@@ -1 +0,0 @@
-exec snat deterministic forward {ip} \ No newline at end of file
diff --git a/resources/templates/vat/snat/snat_deterministic_reverse.vat b/resources/templates/vat/snat/snat_deterministic_reverse.vat
deleted file mode 100644
index 1b9ac5bac5..0000000000
--- a/resources/templates/vat/snat/snat_deterministic_reverse.vat
+++ /dev/null
@@ -1 +0,0 @@
-exec snat deterministic reverse {ip}:{port} \ No newline at end of file
diff --git a/resources/templates/vat/snat/snat_interface_dump.vat b/resources/templates/vat/snat/snat_interface_dump.vat
deleted file mode 100644
index 599c82d8d7..0000000000
--- a/resources/templates/vat/snat/snat_interface_dump.vat
+++ /dev/null
@@ -1 +0,0 @@
-snat_interface_dump \ No newline at end of file
diff --git a/resources/templates/vat/snat/snat_set_deterministic.vat b/resources/templates/vat/snat/snat_set_deterministic.vat
deleted file mode 100644
index 200ae69008..0000000000
--- a/resources/templates/vat/snat/snat_set_deterministic.vat
+++ /dev/null
@@ -1 +0,0 @@
-exec snat deterministic add in {ip_in}/{subnet_in} out {ip_out}/{subnet_out} \ No newline at end of file
diff --git a/resources/templates/vat/snat/snat_set_interfaces.vat b/resources/templates/vat/snat/snat_set_interfaces.vat
deleted file mode 100644
index 905c219ca3..0000000000
--- a/resources/templates/vat/snat/snat_set_interfaces.vat
+++ /dev/null
@@ -1 +0,0 @@
-exec set interface snat in {int_in} out {int_out} \ No newline at end of file
diff --git a/resources/templates/vat/snat/snat_set_workers.vat b/resources/templates/vat/snat/snat_set_workers.vat
deleted file mode 100644
index 23e8bac3eb..0000000000
--- a/resources/templates/vat/snat/snat_set_workers.vat
+++ /dev/null
@@ -1 +0,0 @@
-exec set snat workers {lcores} \ No newline at end of file
diff --git a/resources/templates/vat/snat/snat_show_snat.vat b/resources/templates/vat/snat/snat_show_snat.vat
deleted file mode 100644
index 0ce9f1e914..0000000000
--- a/resources/templates/vat/snat/snat_show_snat.vat
+++ /dev/null
@@ -1 +0,0 @@
-exec show snat verbose \ No newline at end of file