CSIT-687: Directory structure reorganization

Change-Id: I772c9e214be2461adf58124998d272e7d795220f
Signed-off-by: Tibor Frank <tifrank@cisco.com>
Signed-off-by: Maciek Konstantynowicz <mkonstan@cisco.com>

3 files changed, 0 insertions, 276 deletions

diff --git a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
deleted file mode 100644
index cf7b40bef7..0000000000
--- a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot
+++ /dev/null
@@ -1,117 +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.
-
-*** Settings ***
-| Resource | resources/libraries/robot/default.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/dhcp_client.robot
-| Resource | resources/libraries/robot/ipv4.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *DHCPv4 Client related test cases*
-
-*** Variables ***
-| ${client_hostname}= | dhcp-client
-| ${client_ip}= | 192.168.23.10
-| ${client_mask}= | 255.255.255.0
-| ${server_ip}= | 192.168.23.1
-| ${own_xid}= | 11112222
-| ${lease_time}= | ${15}
-
-*** Test Cases ***
-| TC01: VPP sends a DHCP DISCOVER
-| | [Documentation] | Configure DHCPv4 client on interface to TG without
-| | ... | hostname and check if DHCPv4 DISCOVER message contains all
-| | ... | required fields with expected values.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | Then Verify DHCP DISCOVER header | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac}
-
-| TC02: VPP sends a DHCPv4 DISCOVER with hostname
-| | [Documentation] | Configure DHCPv4 client on interface to TG with hostname
-| | ... | and check if DHCPv4 DISCOVER message contains all required
-| | ... | fields with expected values.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | ... | ${client_hostname}
-| | Then Verify DHCP DISCOVER header | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${client_hostname}
-
-| TC03: VPP sends DHCPv4 REQUEST after OFFER
-| | [Documentation] | Configure DHCPv4 client on interface to TG and check if
-| | ... | DHCPv4 REQUEST message contains all required fields.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
-| | ... | ${FALSE} | ${NONE}
-| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | Then Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if1_mac} | ${server_ip}
-| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask}
-
-| TC04: VPP doesn't send DHCPv4 REQUEST after OFFER with wrong XID
-| | [ Tags ] | EXPECTED_FAILING
-| | [Documentation] | Configure DHCPv4 client on interface to TG. If server
-| | ... | sends DHCPv4 OFFER with different XID as in DHCPv4
-| | ... | DISCOVER, DHCPv4 REQUEST message shouldn't be sent.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
-| | ... | ${FALSE} | ${NONE}
-| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | Then Run Keyword And Expect Error | DHCP REQUEST Rx timeout
-| | ... | Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if1_mac} | ${server_ip}
-| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask}
-| | ... | offer_xid=${own_xid}
-
-| TC05: VPP honors DHCPv4 lease time
-| | [Documentation] | Send IP configuration to the VPP client via DHCPv4.
-| | ... | Address is checked with ICMP echo request and there should
-| | ... | be no reply for echo request when lease has expired.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
-| | ... | ${FALSE} | ${NONE}
-| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1}
-| | And Configure IP on client via DHCP
-| | ... | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if1_mac} | ${server_ip}
-| | ... | ${client_ip} | ${client_mask}
-| | ... | ${lease_time}
-| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if1} | ${server_ip}
-| | ... | ${tg_to_dut_if1_mac}
-| | Then Send ICMP echo request and verify answer
-| | ... | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} | ${client_ip}
-| | ... | ${server_ip}
-| | And Sleep | ${lease_time}
-| | And Run Keyword And Expect Error | ICMP echo Rx timeout
-| | ... | Send ICMP echo request and verify answer | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac}
-| | ... | ${client_ip} | ${server_ip}
diff --git a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot
deleted file mode 100644
index 3e89c63f73..0000000000
--- a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot
+++ /dev/null
@@ -1,93 +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.
-
-*** Settings ***
-| Resource | resources/libraries/robot/default.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/dhcp_proxy.robot
-| Resource | resources/libraries/robot/ipv4.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *DHCPv4 proxy test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG = DUT
-| ... |        with two links between the nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP-BOOTP-DHCP
-| ... | *[Cfg] DUT configuration:* DUT is configured with DHCPv4 proxy.
-| ... | *[Ver] TG verification:* Test DHCPv4 packets are sent
-| ... |        on TG on first link to DUT and received on TG on second link.
-| ... |        On receive TG verifies if DHCPv4 packets are valid.
-
-*** Variables ***
-| ${dut_to_tg_if1_ip}= | 172.16.0.1
-| ${dut_to_tg_if2_ip}= | 192.168.0.1
-| ${dhcp_server_ip}= | 192.168.0.100
-| ${client_ip}= | 172.16.0.2
-| ${prefix_length}= | 24
-
-| ${discover_src_ip}= | 0.0.0.0
-| ${valid_discover_dst_ip}= | 255.255.255.255
-| ${invalid_discover_dst_ip}= | 255.255.255.1
-
-*** Test Cases ***
-| TC01: VPP proxies valid DHCPv4 request to DHCPv4 server
-| | [Documentation] |
-| | ... | [Top] TG=DUT \
-| | ... | [Enc] Eth-IPv4-UDP-BOOTP-DHCP
-| | ... | [Cfg] On DUT setup DHCPv4 proxy.
-| | ... | [Ver] Make TG verify matching DHCPv4 packets between client and DHCPv4
-| | ... | server through DHCP proxy.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
-| | ... | ${FALSE} | ${NONE}
-| | And Set Interface Address | ${dut_node}
-| | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length}
-| | And Set Interface Address | ${dut_node}
-| | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length}
-| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server_ip}
-| | ... | ${tg_to_dut_if2_mac}
-| | When DHCP Proxy Config | ${dut_node} | ${dhcp_server_ip}
-| | ... | ${dut_to_tg_if1_ip}
-| | Then Send DHCP messages and check answer | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if2} | ${dhcp_server_ip} | ${tg_to_dut_if2_mac}
-| | ... | ${client_ip} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_ip}
-
-| TC02: VPP proxy ignores invalid DHCPv4 request
-| | [Documentation] |
-| | ... | [Top] TG=DUT \
-| | ... | [Enc] Eth-IPv4-UDP-BOOTP-DHCP
-| | ... | [Cfg] On DUT setup DHCPv4 proxy.
-| | ... | [Ver] Make TG verify matching invalid DHCPv4 packets are dropped.
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local
-| | ... | ${FALSE} | ${NONE}
-| | And Set Interface Address | ${dut_node}
-| | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length}
-| | And Set Interface Address | ${dut_node}
-| | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length}
-| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server_ip}
-| | ... | ${tg_to_dut_if2_mac}
-| | When DHCP Proxy Config | ${dut_node} | ${dhcp_server_ip}
-| | ... | ${dut_to_tg_if1_ip}
-| | Then Send DHCP DISCOVER and check answer | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if2} | ${discover_src_ip} | ${valid_discover_dst_ip}
-| | And DHCP DISCOVER should fail | ${tg_node} | ${tg_to_dut_if1}
-| | ... | ${tg_to_dut_if2} | ${discover_src_ip} | ${invalid_discover_dst_ip}
diff --git a/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot b/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot
deleted file mode 100644
index 88f0fbdcb5..0000000000
--- a/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot
+++ /dev/null
@@ -1,66 +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.
-
-*** Settings ***
-| Resource | resources/libraries/robot/default.robot
-| Resource | resources/libraries/robot/testing_path.robot
-| Resource | resources/libraries/robot/dhcp_proxy.robot
-| Resource | resources/libraries/robot/ipv6.robot
-| Library | resources.libraries.python.Trace
-| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH
-| Test Setup | Set up functional test
-| Test Teardown | Tear down functional test
-| Documentation | *DHCPv6 proxy test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG = DUT
-| ... |        with two links between the nodes.
-| ... | *[Cfg] DUT configuration:* DUT is configured with DHCPv6 proxy.
-| ... | *[Ver] TG verification:* Test DHCPv6 packets are sent
-| ... |        on TG on first link to DUT and received on TG on second link.
-| ... |        On receive TG verifies if DHCPv6 packets are valid
-| ... | *[Ref] Applicable standard specifications:* RFC 3315
-
-
-*** Variables ***
-| ${dut_to_tg_if1_ip}= | 3ffe:62::1
-| ${dut_to_tg_if2_ip}= | 3ffe:63::1
-| ${dhcp_server_ip}= | 3ffe:63::2
-| ${prefix_length}= | 64
-
-
-*** Test Cases ***
-| TC01: VPP proxies valid DHCPv6 request to DHCPv6 server
-| | [Documentation] |
-| | ... | [Top] TG=DUT
-| | ... | [Cfg] On DUT setup DHCP proxy.
-| | ... | [Ver] Make TG verify matching DHCPv6 packets between client and \
-| | ... | DHCPv6 server through DHCPv6 proxy.
-| | ... | [Ref] RFC 3315
-| | ...
-| | Given Configure path in 2-node circular topology
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | And Vpp Set If Ipv6 Addr | ${dut_node}
-| | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length}
-| | And Vpp Set If Ipv6 Addr | ${dut_node}
-| | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length}
-| | And VPP Route Add | ${dut_node} | ff02::1:2 | 128 | ${NONE} | local
-| | ... | ${FALSE} | ${NONE}
-| | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server_ip}
-| | ... | ${tg_to_dut_if2_mac}
-| | And Vpp All Ra Suppress Link Layer | ${nodes}
-| | When DHCP Proxy Config | ${dut_node} | ${dhcp_server_ip}
-| | ... | ${dut_to_tg_if1_ip}
-| | Then Send DHCPv6 Messages | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| | ... | ${dut_to_tg_if1_ip} | ${dut_to_tg_if1_mac} | ${dhcp_server_ip}
-| | ... | ${tg_to_dut_if2_mac} | ${tg_to_dut_if1_mac} |  ${dut_to_tg_if2_mac}