36 files changed, 183 insertions, 183 deletions
diff --git a/resources/libraries/python/TLDK/UdpTest.py b/resources/libraries/python/TLDK/UdpTest.py
index adf0888724..adc8aa0ed0 100644
--- a/resources/libraries/python/TLDK/UdpTest.py
+++ b/resources/libraries/python/TLDK/UdpTest.py
@@ -1,126 +1,126 @@
-# 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.
-
-
-"""
-This module exists to provide the UDP test for TLDK on topology nodes.
-"""
-
-from scapy.utils import rdpcap
-from scapy.layers.inet import IP
-from scapy.layers.inet6 import IPv6
-
-from robot.libraries.BuiltIn import BuiltIn
-
-from resources.libraries.python.ssh import SSH
-from resources.libraries.python.TLDK.TLDKConstants import TLDKConstants as con
-from resources.libraries.python.topology import Topology
-
-class UdpTest(object):
-    """Test the TLDK UDP function."""
-
-    @staticmethod
-    def get_pcap_info(file_prefix):
-        """Get the Dest IP from the RX pcap file
-
-        :param file_prefix: the test case pcap file prefix
-        :type file_prefix: str
-        :returns: packet counts, dest ip, is or not ipv4
-        :rtype: tuple(int, str, bool).
-        """
-        exec_dir = BuiltIn().get_variable_value("${EXECDIR}")
-
-        rx_pcapfile = '{0}/{1}/{2}_rx.pcap' \
-            .format(exec_dir, con.TLDK_TESTCONFIG, file_prefix)
-        packets = rdpcap(rx_pcapfile)
-        count = len(packets)
-
-        ### the first packet
-        pkt = packets[0]
-        if pkt.type == 0x0800:
-            ### this is a IPv4 packet
-            dest_ip = pkt[IP].dst
-            is_ipv4 = True
-        elif pkt.type == 0x86dd:
-            ### this is a IPv6 packet
-            dest_ip = pkt[IPv6].dst
-            is_ipv4 = False
-
-        return count, dest_ip, is_ipv4
-
-    @staticmethod
-    def exec_the_udpfwd_test(dut_node, dut_if, file_prefix, \
-            dest_ip, is_ipv4=True):
-        """Execute the udpfwd on the dut_node.
-
-        :param dut_node: Will execute the udpfwd on this node.
-        :param dut_if: DUT interface name.
-        :param file_prefix: The test case config file prefix.
-        :param dest_ip: The UDP packet dest IP.
-        :param is_ipv4: Execute the IPv4 or IPv6 test.
-        :type dut_node: dict
-        :type dut_if: str
-        :type file_prefix: str
-        :type dest_ip: str
-        :type is_ipv4: bool
-        :returns: none.
-        :raises RuntimeError: If failed to execute udpfwd test on the dut node.
-        """
-        pci_address = Topology.get_interface_pci_addr(dut_node, dut_if)
-        ssh = SSH()
-        ssh.connect(dut_node)
-        if is_ipv4:
-            cmd = 'cd {0}/{4} && ./run_tldk.sh {0}/{5}/{2}_rx.pcap ' \
-                '{0}/{5}/{2}_tx.pcap {1} {0}/{5}/{2}_fe.cfg ' \
-                '{0}/{5}/{2}_be.cfg {3} NONE' \
-                .format(con.REMOTE_FW_DIR, pci_address, file_prefix, \
-                dest_ip, con.TLDK_SCRIPTS, con.TLDK_TESTCONFIG)
-        else:
-            cmd = 'cd {0}/{4} && ./run_tldk.sh {0}/{5}/{2}_rx.pcap ' \
-                '{0}/{5}/{2}_tx.pcap {1} {0}/{5}/{2}_fe.cfg ' \
-                '{0}/{5}/{2}_be.cfg NONE {3}' \
-                .format(con.REMOTE_FW_DIR, pci_address, file_prefix, \
-                dest_ip, con.TLDK_SCRIPTS, con.TLDK_TESTCONFIG)
-
-        (ret_code, _, _) = ssh.exec_command(cmd, timeout=600)
-        if ret_code != 0:
-            raise RuntimeError('Failed to execute udpfwd test at node {0}'
-                               .format(dut_node['host']))
-
-    @staticmethod
-    def get_the_test_result(dut_node, file_prefix):
-        """
-        After execute the udpfwd cmd, use this to get the test result.
-
-        :param dut_node: will get the test result in this dut node
-        :param dut_if: the dut interface name
-        :param file_prefix: the test case output file prefix
-        :type dut_node: dice
-        :type dut_if: str
-        :type file_prefix: str
-        :returns: str.
-        :rtype: str
-        :raises RuntimeError: If failed to get the test result.
-        """
-        ssh = SSH()
-        ssh.connect(dut_node)
-        cmd = 'cd {0}; tcpdump -nnnn -vvv -r ./{2}/{1}_tx.pcap | ' \
-            'grep \'udp sum ok\' | wc -l' \
-            .format(con.REMOTE_FW_DIR, file_prefix, con.TLDK_TESTCONFIG)
-
-        (ret_code, stdout, _) = ssh.exec_command(cmd, timeout=100)
-        if ret_code != 0:
-            raise RuntimeError('Failed to get test result at node {0}'
-                               .format(dut_node['host']))
-
-        return stdout
+# 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.
+
+
+"""
+This module exists to provide the UDP test for TLDK on topology nodes.
+"""
+
+from scapy.utils import rdpcap
+from scapy.layers.inet import IP
+from scapy.layers.inet6 import IPv6
+
+from robot.libraries.BuiltIn import BuiltIn
+
+from resources.libraries.python.ssh import SSH
+from resources.libraries.python.TLDK.TLDKConstants import TLDKConstants as con
+from resources.libraries.python.topology import Topology
+
+class UdpTest(object):
+    """Test the TLDK UDP function."""
+
+    @staticmethod
+    def get_pcap_info(file_prefix):
+        """Get the Dest IP from the RX pcap file
+
+        :param file_prefix: the test case pcap file prefix
+        :type file_prefix: str
+        :returns: packet counts, dest ip, is or not ipv4
+        :rtype: tuple(int, str, bool).
+        """
+        exec_dir = BuiltIn().get_variable_value("${EXECDIR}")
+
+        rx_pcapfile = '{0}/{1}/{2}_rx.pcap' \
+            .format(exec_dir, con.TLDK_TESTCONFIG, file_prefix)
+        packets = rdpcap(rx_pcapfile)
+        count = len(packets)
+
+        ### the first packet
+        pkt = packets[0]
+        if pkt.type == 0x0800:
+            ### this is a IPv4 packet
+            dest_ip = pkt[IP].dst
+            is_ipv4 = True
+        elif pkt.type == 0x86dd:
+            ### this is a IPv6 packet
+            dest_ip = pkt[IPv6].dst
+            is_ipv4 = False
+
+        return count, dest_ip, is_ipv4
+
+    @staticmethod
+    def exec_the_udpfwd_test(dut_node, dut_if, file_prefix, \
+            dest_ip, is_ipv4=True):
+        """Execute the udpfwd on the dut_node.
+
+        :param dut_node: Will execute the udpfwd on this node.
+        :param dut_if: DUT interface name.
+        :param file_prefix: The test case config file prefix.
+        :param dest_ip: The UDP packet dest IP.
+        :param is_ipv4: Execute the IPv4 or IPv6 test.
+        :type dut_node: dict
+        :type dut_if: str
+        :type file_prefix: str
+        :type dest_ip: str
+        :type is_ipv4: bool
+        :returns: none.
+        :raises RuntimeError: If failed to execute udpfwd test on the dut node.
+        """
+        pci_address = Topology.get_interface_pci_addr(dut_node, dut_if)
+        ssh = SSH()
+        ssh.connect(dut_node)
+        if is_ipv4:
+            cmd = 'cd {0}/{4} && ./run_tldk.sh {0}/{5}/{2}_rx.pcap ' \
+                '{0}/{5}/{2}_tx.pcap {1} {0}/{5}/{2}_fe.cfg ' \
+                '{0}/{5}/{2}_be.cfg {3} NONE' \
+                .format(con.REMOTE_FW_DIR, pci_address, file_prefix, \
+                dest_ip, con.TLDK_SCRIPTS, con.TLDK_TESTCONFIG)
+        else:
+            cmd = 'cd {0}/{4} && ./run_tldk.sh {0}/{5}/{2}_rx.pcap ' \
+                '{0}/{5}/{2}_tx.pcap {1} {0}/{5}/{2}_fe.cfg ' \
+                '{0}/{5}/{2}_be.cfg NONE {3}' \
+                .format(con.REMOTE_FW_DIR, pci_address, file_prefix, \
+                dest_ip, con.TLDK_SCRIPTS, con.TLDK_TESTCONFIG)
+
+        (ret_code, _, _) = ssh.exec_command(cmd, timeout=600)
+        if ret_code != 0:
+            raise RuntimeError('Failed to execute udpfwd test at node {0}'
+                               .format(dut_node['host']))
+
+    @staticmethod
+    def get_the_test_result(dut_node, file_prefix):
+        """
+        After execute the udpfwd cmd, use this to get the test result.
+
+        :param dut_node: will get the test result in this dut node
+        :param dut_if: the dut interface name
+        :param file_prefix: the test case output file prefix
+        :type dut_node: dice
+        :type dut_if: str
+        :type file_prefix: str
+        :returns: str.
+        :rtype: str
+        :raises RuntimeError: If failed to get the test result.
+        """
+        ssh = SSH()
+        ssh.connect(dut_node)
+        cmd = 'cd {0}; tcpdump -nnnn -vvv -r ./{2}/{1}_tx.pcap | ' \
+            'grep \'udp sum ok\' | wc -l' \
+            .format(con.REMOTE_FW_DIR, file_prefix, con.TLDK_TESTCONFIG)
+
+        (ret_code, stdout, _) = ssh.exec_command(cmd, timeout=100)
+        if ret_code != 0:
+            raise RuntimeError('Failed to get test result at node {0}'
+                               .format(dut_node['host']))
+
+        return stdout
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index 0f25ebe42e..ca63efef56 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -190,11 +190,11 @@ class TrafficGenerator(object):
             ssh.connect(tg_node)
 
             (ret, stdout, stderr) = ssh.exec_command(
-                "sudo -E sh -c '{}/resources/tools/t-rex/"
-                "t-rex-installer.sh'".format(Constants.REMOTE_FW_DIR),
+                "sudo -E sh -c '{}/resources/tools/trex/"
+                "trex_installer.sh'".format(Constants.REMOTE_FW_DIR),
                 timeout=1800)
             if int(ret) != 0:
-                logger.error('trex installation failed: {0}'.format(
+                logger.error('TRex installation failed: {0}'.format(
                     stdout + stderr))
                 raise RuntimeError('Installation of TG failed')
 
@@ -274,7 +274,7 @@ class TrafficGenerator(object):
                 # get T-rex server info
                 (ret, _, _) = ssh.exec_command(
                     "sh -c 'sleep 3; "
-                    "{0}/resources/tools/t-rex/t-rex-server-info.py'"\
+                    "{0}/resources/tools/trex/trex_server_info.py'"\
                     .format(Constants.REMOTE_FW_DIR),
                     timeout=120)
                 if int(ret) == 0:
@@ -320,8 +320,8 @@ class TrafficGenerator(object):
         ssh.connect(node)
 
         (ret, _, _) = ssh.exec_command(
-            "sh -c '{}/resources/tools/t-rex/"
-            "t-rex-stateless-stop.py'".format(Constants.REMOTE_FW_DIR))
+            "sh -c '{}/resources/tools/trex/"
+            "trex_stateless_stop.py'".format(Constants.REMOTE_FW_DIR))
 
         if int(ret) != 0:
             raise RuntimeError('T-rex stateless runtime error')
@@ -355,12 +355,12 @@ class TrafficGenerator(object):
         _latency = "--latency" if latency else ""
         _p0, _p1 = (2, 1) if self._ifaces_reordered else (1, 2)
 
-        profile_path = ("{0}/resources/tools/t-rex/stream_profiles/"
+        profile_path = ("{0}/resources/traffic_profiles/trex/"
                         "{1}.py".format(Constants.REMOTE_FW_DIR,
                                         traffic_type))
         (ret, stdout, _) = ssh.exec_command(
             "sh -c "
-            "'{0}/resources/tools/t-rex/t-rex-stateless-profile.py "
+            "'{0}/resources/tools/trex/trex_stateless_profile.py "
             "--profile {1} "
             "--duration {2} "
             "--frame_size {3} "
diff --git a/resources/libraries/robot/ipsec.robot b/resources/libraries/robot/crypto/ipsec.robot
index 73f7179f30..74a1a53f25 100644
--- a/resources/libraries/robot/ipsec.robot
+++ b/resources/libraries/robot/crypto/ipsec.robot
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/default.robot
+| Resource | resources/libraries/robot/shared/default.robot
 | Library | resources.libraries.python.IPsecUtil
 | Library | resources.libraries.python.NodePath
 | Library | resources.libraries.python.TrafficScriptExecutor
diff --git a/resources/libraries/robot/DPDK/default.robot b/resources/libraries/robot/dpdk/default.robot
index e6921c9b27..e6921c9b27 100644
--- a/resources/libraries/robot/DPDK/default.robot
+++ b/resources/libraries/robot/dpdk/default.robot
diff --git a/resources/libraries/robot/fds/default.robot b/resources/libraries/robot/fds/default.robot
index 83657e9fb4..2808ec08db 100644
--- a/resources/libraries/robot/fds/default.robot
+++ b/resources/libraries/robot/fds/default.robot
@@ -12,8 +12,8 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/default.robot
-| Resource | resources/libraries/robot/double_qemu_setup.robot
+| Resource | resources/libraries/robot/shared/default.robot
+| Resource | resources/libraries/robot/vm/double_qemu_setup.robot
 | Library | resources.libraries.python.VatHistory
 | Library | resources.libraries.python.Trace
 | ...
diff --git a/resources/libraries/robot/dhcp_client.robot b/resources/libraries/robot/features/dhcp_client.robot
index 192ab2b729..efc016741a 100644
--- a/resources/libraries/robot/dhcp_client.robot
+++ b/resources/libraries/robot/features/dhcp_client.robot
@@ -13,7 +13,7 @@
 
 *** Settings ***
 | Library  | Collections
-| Resource | resources/libraries/robot/default.robot
+| Resource | resources/libraries/robot/shared/default.robot
 | Library  | resources.libraries.python.Dhcp.DhcpClient
 | Library  | resources.libraries.python.TrafficScriptExecutor
 | Documentation | DHCP Client specific keywords.
diff --git a/resources/libraries/robot/dhcp_proxy.robot b/resources/libraries/robot/features/dhcp_proxy.robot
index e2b16e5149..e6ea69d5d0 100644
--- a/resources/libraries/robot/dhcp_proxy.robot
+++ b/resources/libraries/robot/features/dhcp_proxy.robot
@@ -13,7 +13,7 @@
 
 *** Settings ***
 | Library  | Collections
-| Resource | resources/libraries/robot/default.robot
+| Resource | resources/libraries/robot/shared/default.robot
 | Library  | resources.libraries.python.Dhcp.DhcpProxy
 | Library  | resources.libraries.python.TrafficScriptExecutor
 | Documentation | DHCP Proxy specific keywords.
diff --git a/resources/libraries/robot/policer.robot b/resources/libraries/robot/features/policer.robot
index 6e75a45965..321488b8c5 100644
--- a/resources/libraries/robot/policer.robot
+++ b/resources/libraries/robot/features/policer.robot
@@ -12,8 +12,8 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/default.robot
-| Resource | resources/libraries/robot/testing_path.robot
+| Resource | resources/libraries/robot/shared/default.robot
+| Resource | resources/libraries/robot/shared/testing_path.robot
 | Library | resources.libraries.python.Policer
 | Library | resources.libraries.python.InterfaceUtil
 | Library | resources.libraries.python.IPv4Util
diff --git a/resources/libraries/robot/honeycomb/policer.robot b/resources/libraries/robot/honeycomb/policer.robot
index 17191c5b37..87b97470ac 100644
--- a/resources/libraries/robot/honeycomb/policer.robot
+++ b/resources/libraries/robot/honeycomb/policer.robot
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/traffic.robot
+| Resource | resources/libraries/robot/shared/traffic.robot
 | Library | resources.libraries.python.honeycomb.Routing.RoutingKeywords
 | Variables | resources/test_data/honeycomb/policer_variables.py
 | Documentation | Keywords used to test Policer using Honeycomb.
diff --git a/resources/libraries/robot/ipv4.robot b/resources/libraries/robot/ip/ip4.robot
index 3fa522f5c5..03964181b5 100644
--- a/resources/libraries/robot/ipv4.robot
+++ b/resources/libraries/robot/ip/ip4.robot
@@ -11,8 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 *** Settings ***
-| Resource | resources/libraries/robot/default.robot
-| Resource | resources/libraries/robot/counters.robot
+| Resource | resources/libraries/robot/shared/default.robot
+| Resource | resources/libraries/robot/shared/counters.robot
 | Library | resources.libraries.python.IPv4Util.IPv4Util
 | Library | resources.libraries.python.IPv4Setup.IPv4Setup
 | Library | resources.libraries.python.NodePath
diff --git a/resources/libraries/robot/ipv6.robot b/resources/libraries/robot/ip/ip6.robot
index b82c995e3a..43b0b8c646 100644
--- a/resources/libraries/robot/ipv6.robot
+++ b/resources/libraries/robot/ip/ip6.robot
@@ -21,8 +21,8 @@
 | Library | resources.libraries.python.Routing
 | Library | resources.libraries.python.InterfaceUtil
 | Library | resources.libraries.python.topology.Topology
-| Resource | resources/libraries/robot/default.robot
-| Resource | resources/libraries/robot/counters.robot
+| Resource | resources/libraries/robot/shared/default.robot
+| Resource | resources/libraries/robot/shared/counters.robot
 | Documentation | IPv6 keywords
 
 *** Keywords ***
diff --git a/resources/libraries/robot/map.robot b/resources/libraries/robot/ip/map.robot
index ac086b4511..ac086b4511 100644
--- a/resources/libraries/robot/map.robot
+++ b/resources/libraries/robot/ip/map.robot
diff --git a/resources/libraries/robot/snat.robot b/resources/libraries/robot/ip/snat.robot
index 610a9150ee..610a9150ee 100644
--- a/resources/libraries/robot/snat.robot
+++ b/resources/libraries/robot/ip/snat.robot
diff --git a/resources/libraries/robot/bridge_domain.robot b/resources/libraries/robot/l2/l2_bridge_domain.robot
index 22e46a02cb..9c6c29dc7d 100644
--- a/resources/libraries/robot/bridge_domain.robot
+++ b/resources/libraries/robot/l2/l2_bridge_domain.robot
@@ -16,8 +16,8 @@
 | Library | resources.libraries.python.InterfaceUtil
 | Library | resources.libraries.python.NodePath
 | Library | resources.libraries.python.VhostUser
-| Resource | resources/libraries/robot/interfaces.robot
-| Resource | resources/libraries/robot/l2_traffic.robot
+| Resource | resources/libraries/robot/shared/interfaces.robot
+| Resource | resources/libraries/robot/l2/l2_traffic.robot
 
 *** Keywords ***
 | Configure L2BD forwarding
diff --git a/resources/libraries/robot/l2_traffic.robot b/resources/libraries/robot/l2/l2_traffic.robot
index bca801778e..bca801778e 100644
--- a/resources/libraries/robot/l2_traffic.robot
+++ b/resources/libraries/robot/l2/l2_traffic.robot
diff --git a/resources/libraries/robot/l2_xconnect.robot b/resources/libraries/robot/l2/l2_xconnect.robot
index 00d33e867a..00d33e867a 100644
--- a/resources/libraries/robot/l2_xconnect.robot
+++ b/resources/libraries/robot/l2/l2_xconnect.robot
diff --git a/resources/libraries/robot/tagging.robot b/resources/libraries/robot/l2/tagging.robot
index 431812b3ab..7731ed193e 100644
--- a/resources/libraries/robot/tagging.robot
+++ b/resources/libraries/robot/l2/tagging.robot
@@ -13,8 +13,8 @@
 
 *** Settings ***
 | Documentation | Keywords for VLAN tests
-| Resource | resources/libraries/robot/default.robot
-| Resource | resources/libraries/robot/l2_xconnect.robot
+| Resource | resources/libraries/robot/shared/default.robot
+| Resource | resources/libraries/robot/l2/l2_xconnect.robot
 | Library | resources.libraries.python.L2Util
 | Library | resources.libraries.python.InterfaceUtil
 | Library | resources.libraries.python.NodePath
diff --git a/resources/libraries/robot/gre.robot b/resources/libraries/robot/overlay/gre.robot
index c237e883a3..0e825f05fb 100644
--- a/resources/libraries/robot/gre.robot
+++ b/resources/libraries/robot/overlay/gre.robot
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/interfaces.robot
+| Resource | resources/libraries/robot/shared/interfaces.robot
 
 *** Keywords ***
 | Create GRE tunnel interface and set it up
diff --git a/resources/libraries/robot/lisp/l2lisp.robot b/resources/libraries/robot/overlay/l2lisp.robot
index 3e908a2378..5dcfcc5971 100644
--- a/resources/libraries/robot/lisp/l2lisp.robot
+++ b/resources/libraries/robot/overlay/l2lisp.robot
@@ -14,7 +14,7 @@
 *** Settings ***
 | Documentation | LISP-gpe encapsulation suite keywords
 | Library | resources.libraries.python.topology.Topology
-| Resource | resources/libraries/robot/lisp/lisp_api.robot
+| Resource | resources/libraries/robot/overlay/lisp_api.robot
 | Library  | resources.libraries.python.LispSetup.LispLocatorSet
 | Library  | resources.libraries.python.LispSetup.LispLocator
 | Library  | resources.libraries.python.LispSetup.LispLocalEid
diff --git a/resources/libraries/robot/lisp/lisp_api.robot b/resources/libraries/robot/overlay/lisp_api.robot
index 1f431245be..1485a405a6 100644
--- a/resources/libraries/robot/lisp/lisp_api.robot
+++ b/resources/libraries/robot/overlay/lisp_api.robot
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/interfaces.robot
+| Resource | resources/libraries/robot/shared/interfaces.robot
 | Library  | resources.libraries.python.NodePath
 | Library  | resources.libraries.python.LispSetup.LispStatus
 | Library  | resources.libraries.python.LispSetup.LispSetup
diff --git a/resources/libraries/robot/lisp/lisp_static_adjacency.robot b/resources/libraries/robot/overlay/lisp_static_adjacency.robot
index 737c535ce8..f20fd51eb4 100644
--- a/resources/libraries/robot/lisp/lisp_static_adjacency.robot
+++ b/resources/libraries/robot/overlay/lisp_static_adjacency.robot
@@ -13,7 +13,7 @@
 
 *** Settings ***
 | Documentation | Lisp static adjacency suite keywords
-| Resource | resources/libraries/robot/lisp/lisp_api.robot
+| Resource | resources/libraries/robot/overlay/lisp_api.robot
 | Library  | resources.libraries.python.LispSetup.LispLocatorSet
 | Library  | resources.libraries.python.LispSetup.LispLocator
 | Library  | resources.libraries.python.LispSetup.LispLocalEid
diff --git a/resources/libraries/robot/lisp/lispgpe.robot b/resources/libraries/robot/overlay/lispgpe.robot
index c39b64cf3f..d5115d8242 100644
--- a/resources/libraries/robot/lisp/lispgpe.robot
+++ b/resources/libraries/robot/overlay/lispgpe.robot
@@ -14,7 +14,7 @@
 *** Settings ***
 | Documentation | LISP-gpe encapsulation suite keywords
 | Library | resources.libraries.python.topology.Topology
-| Resource | resources/libraries/robot/lisp/lisp_api.robot
+| Resource | resources/libraries/robot/overlay/lisp_api.robot
 | Library  | resources.libraries.python.LispSetup.LispLocatorSet
 | Library  | resources.libraries.python.LispSetup.LispLocator
 | Library  | resources.libraries.python.LispSetup.LispLocalEid
diff --git a/resources/libraries/robot/vxlan.robot b/resources/libraries/robot/overlay/vxlan.robot
index d867189a15..69f4c10a88 100644
--- a/resources/libraries/robot/vxlan.robot
+++ b/resources/libraries/robot/overlay/vxlan.robot
@@ -13,10 +13,10 @@
 
 *** Settings ***
 | Library  | Collections
-| Resource | resources/libraries/robot/default.robot
-| Resource | resources/libraries/robot/interfaces.robot
-| Resource | resources/libraries/robot/bridge_domain.robot
-| Resource | resources/libraries/robot/l2_xconnect.robot
+| Resource | resources/libraries/robot/shared/default.robot
+| Resource | resources/libraries/robot/shared/interfaces.robot
+| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot
+| Resource | resources/libraries/robot/l2/l2_xconnect.robot
 | Library  | resources.libraries.python.L2Util
 | Library  | resources.libraries.python.IPUtil
 | Library  | resources.libraries.python.IPv4Util
diff --git a/resources/libraries/robot/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot
index 1141c34be4..17b8c68545 100644
--- a/resources/libraries/robot/performance_configuration.robot
+++ b/resources/libraries/robot/performance/performance_configuration.robot
@@ -20,15 +20,15 @@
 | Library | resources.libraries.python.VhostUser
 | Library | resources.libraries.python.TrafficGenerator
 | Library | resources.libraries.python.TrafficGenerator.TGDropRateSearchImpl
-| Resource | resources/libraries/robot/default.robot
-| Resource | resources/libraries/robot/interfaces.robot
-| Resource | resources/libraries/robot/counters.robot
-| Resource | resources/libraries/robot/bridge_domain.robot
-| Resource | resources/libraries/robot/l2_xconnect.robot
-| Resource | resources/libraries/robot/ipv4.robot
-| Resource | resources/libraries/robot/ipv6.robot
-| Resource | resources/libraries/robot/qemu.robot
-| Resource | resources/libraries/robot/tagging.robot
+| Resource | resources/libraries/robot/shared/default.robot
+| Resource | resources/libraries/robot/shared/interfaces.robot
+| Resource | resources/libraries/robot/shared/counters.robot
+| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot
+| Resource | resources/libraries/robot/l2/l2_xconnect.robot
+| Resource | resources/libraries/robot/ip/ip4.robot
+| Resource | resources/libraries/robot/ip/ip6.robot
+| Resource | resources/libraries/robot/vm/qemu.robot
+| Resource | resources/libraries/robot/l2/tagging.robot
 | Documentation | Performance suite keywords - configuration.
 
 *** Keywords ***
diff --git a/resources/libraries/robot/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot
index da23ca8196..a2aaa52bc8 100644
--- a/resources/libraries/robot/performance_setup.robot
+++ b/resources/libraries/robot/performance/performance_setup.robot
@@ -12,8 +12,8 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/performance_configuration.robot
-| Resource | resources/libraries/robot/performance_utils.robot
+| Resource | resources/libraries/robot/performance/performance_configuration.robot
+| Resource | resources/libraries/robot/performance/performance_utils.robot
 | Documentation | Performance suite keywords - Suite and test setups and
 | ... | teardowns.
 
diff --git a/resources/libraries/robot/performance_utils.robot b/resources/libraries/robot/performance/performance_utils.robot
index 76f88b31dd..544aaeb343 100644
--- a/resources/libraries/robot/performance_utils.robot
+++ b/resources/libraries/robot/performance/performance_utils.robot
@@ -20,15 +20,15 @@
 | Library | resources.libraries.python.VhostUser
 | Library | resources.libraries.python.TrafficGenerator
 | Library | resources.libraries.python.TrafficGenerator.TGDropRateSearchImpl
-| Resource | resources/libraries/robot/default.robot
-| Resource | resources/libraries/robot/interfaces.robot
-| Resource | resources/libraries/robot/counters.robot
-| Resource | resources/libraries/robot/bridge_domain.robot
-| Resource | resources/libraries/robot/l2_xconnect.robot
-| Resource | resources/libraries/robot/ipv4.robot
-| Resource | resources/libraries/robot/ipv6.robot
-| Resource | resources/libraries/robot/qemu.robot
-| Resource | resources/libraries/robot/tagging.robot
+| Resource | resources/libraries/robot/shared/default.robot
+| Resource | resources/libraries/robot/shared/interfaces.robot
+| Resource | resources/libraries/robot/shared/counters.robot
+| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot
+| Resource | resources/libraries/robot/l2/l2_xconnect.robot
+| Resource | resources/libraries/robot/ip/ip4.robot
+| Resource | resources/libraries/robot/ip/ip6.robot
+| Resource | resources/libraries/robot/vm/qemu.robot
+| Resource | resources/libraries/robot/l2/tagging.robot
 | Documentation | Performance suite keywords - utilities to find and verify NDR
 | ... | and PDR.
 
diff --git a/resources/libraries/robot/counters.robot b/resources/libraries/robot/shared/counters.robot
index 3591dd5fe7..3591dd5fe7 100644
--- a/resources/libraries/robot/counters.robot
+++ b/resources/libraries/robot/shared/counters.robot
diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/shared/default.robot
index 68d399702a..96bdd5344e 100644
--- a/resources/libraries/robot/default.robot
+++ b/resources/libraries/robot/shared/default.robot
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/qemu.robot
+| Resource | resources/libraries/robot/vm/qemu.robot
 | Variables | resources/libraries/python/topology.py
 | Variables | resources/libraries/python/VatHistory.py
 | Library | resources.libraries.python.topology.Topology
diff --git a/resources/libraries/robot/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot
index c2b897d6a0..c2b897d6a0 100644
--- a/resources/libraries/robot/interfaces.robot
+++ b/resources/libraries/robot/shared/interfaces.robot
diff --git a/resources/libraries/robot/lxc.robot b/resources/libraries/robot/shared/lxc.robot
index 83bd5c1837..83bd5c1837 100644
--- a/resources/libraries/robot/lxc.robot
+++ b/resources/libraries/robot/shared/lxc.robot
diff --git a/resources/libraries/robot/testing_path.robot b/resources/libraries/robot/shared/testing_path.robot
index b7543e1c4d..b7543e1c4d 100644
--- a/resources/libraries/robot/testing_path.robot
+++ b/resources/libraries/robot/shared/testing_path.robot
diff --git a/resources/libraries/robot/traffic.robot b/resources/libraries/robot/shared/traffic.robot
index d39784666f..3a5cacee50 100644
--- a/resources/libraries/robot/traffic.robot
+++ b/resources/libraries/robot/shared/traffic.robot
@@ -21,8 +21,8 @@
 | Library | resources.libraries.python.Routing
 | Library | resources.libraries.python.InterfaceUtil
 | Library | resources.libraries.python.topology.Topology
-| Resource | resources/libraries/robot/default.robot
-| Resource | resources/libraries/robot/counters.robot
+| Resource | resources/libraries/robot/shared/default.robot
+| Resource | resources/libraries/robot/shared/counters.robot
 | Documentation | Traffic keywords
 
 *** Keywords ***
diff --git a/resources/libraries/robot/telemetry/ipfix.robot b/resources/libraries/robot/telemetry/ipfix.robot
index 5248964f29..b7d8ac74f9 100644
--- a/resources/libraries/robot/telemetry/ipfix.robot
+++ b/resources/libraries/robot/telemetry/ipfix.robot
@@ -16,7 +16,7 @@
 *** Settings ***
 | Library | resources.libraries.python.TrafficScriptExecutor
 | Library | resources.libraries.python.InterfaceUtil
-| Resource | resources/libraries/robot/default.robot
+| Resource | resources/libraries/robot/shared/default.robot
 | Documentation | Traffic keywords
 
 *** Keywords ***
diff --git a/resources/libraries/robot/TLDK/TLDKUtils.robot b/resources/libraries/robot/tldk/tldk_utils.robot
index 75e982252c..75e982252c 100644
--- a/resources/libraries/robot/TLDK/TLDKUtils.robot
+++ b/resources/libraries/robot/tldk/tldk_utils.robot
diff --git a/resources/libraries/robot/double_qemu_setup.robot b/resources/libraries/robot/vm/double_qemu_setup.robot
index 377e222804..377e222804 100644
--- a/resources/libraries/robot/double_qemu_setup.robot
+++ b/resources/libraries/robot/vm/double_qemu_setup.robot
diff --git a/resources/libraries/robot/qemu.robot b/resources/libraries/robot/vm/qemu.robot
index 097f3cb1a8..097f3cb1a8 100644
--- a/resources/libraries/robot/qemu.robot
+++ b/resources/libraries/robot/vm/qemu.robot