2 files changed, 0 insertions, 110 deletions
diff --git a/resources/test_data/softwire/map_e_domains.py b/resources/test_data/softwire/map_e_domains.py
deleted file mode 100644
index 44cb661b01..0000000000
--- a/resources/test_data/softwire/map_e_domains.py
+++ /dev/null
@@ -1,57 +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.l
-
-"""Variables for MAP-e feature tests."""
-
-from resources.libraries.python.Map import Map
-from random import sample, randint
-from itertools import product
-
-
-def get_variables(count):
-    """Generate variables with random generated MAP-E configuration sets and
-    IP test sets.
-
-    domain_set = [IPv4_prefix, IPv6_prefix, IPv6_source, 16, 0, 0]
-    ip_set = [IPv4_dst_address, IPv6_dst_address, dst_port, IPv6_src_address]
-
-    :param count: Generate "count" map domain configuration parameters.
-    :type count: int
-    :return: Variable dictionary with domain_sets and ip_sets.
-    :rtype: dict
-    """
-    domain_sets = []
-    ip_sets = []
-
-    ip_product = [x for x in list(product(xrange(2, 224), xrange(0, 256)))
-                  if x[0] != 127]
-
-    for n1, n2 in sample(ip_product, count):
-        v4_pfx = '{}.{}.0.0/16'.format(n1, n2)
-        v6_pfx = '2001:{:x}{:x}::/48'.format(n1, n2)
-        ipv6_br = '2001:ffff::1'
-        domain_set = [v4_pfx,
-                      v6_pfx,
-                      ipv6_br, 16, 0, 0]
-        port = randint(1025, 65500)
-        ipv4_addr = '{}.{}.20.30'.format(n1, n2)
-        ipv6_addr = Map.compute_ipv6_map_destination_address(
-            v4_pfx, v6_pfx, 16, 0, 0, ipv4_addr, port)
-        domain_sets.append(domain_set)
-        ip_sets.append([ipv4_addr, ipv6_addr, port, ipv6_br])
-
-    variables = {
-        "domain_sets": domain_sets,
-        "ip_sets": ip_sets
-    }
-    return variables
diff --git a/resources/test_data/softwire/map_utils.py b/resources/test_data/softwire/map_utils.py
deleted file mode 100644
index 58ef551d7a..0000000000
--- a/resources/test_data/softwire/map_utils.py
+++ /dev/null
@@ -1,53 +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.
-
-"""Utils for MAP feature."""
-
-
-def map_port_ranges(psid, length, offset=6):
-    """Return list of port ranges for given PSID in tuple <min, max>.
-
-    :param psid: PSID.
-    :param length: PSID length.
-    :param offset: PSID offset.
-    :type psid: int
-    :type length: int
-    :type offset: int
-    :return: List of (min, max) port range tuples inclusive.
-    :rtype: list
-
-                      0                   1
-                      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
-                     +-----------+-----------+-------+
-       Ports in      |     A     |    PSID   |   j   |
-    the CE port set  |    > 0    |           |       |
-                     +-----------+-----------+-------+
-                     |  a bits   |  k bits   |m bits |
-    """
-
-    port_field_len = 16
-    port_field_min = int('0x0000', 16)
-    port_field_max = int('0xffff', 16)
-
-    a = offset
-    k = length
-    m = port_field_len - offset - length
-    km = k + m
-    j_max = port_field_max >> a + k
-
-    port_ranges = []
-    for A in range(1, (port_field_max >> km) + 1):
-        port_ranges.append((((A << k) | psid) << m,
-                            ((A << k) | psid) << m | j_max))
-
-    return port_ranges