X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Futil.py;h=e21fdb810260d285940ff6e32ca7b765de4a9ae8;hb=af2cc6425;hp=c7e4693e99864d135b10e88b7300dac48acb684c;hpb=9beabd8afd9c9a3f302ebddaae47f7a1275faeca;p=vpp.git diff --git a/test/util.py b/test/util.py index c7e4693e998..e21fdb81026 100644 --- a/test/util.py +++ b/test/util.py @@ -5,7 +5,6 @@ import ipaddress import logging import socket from socket import AF_INET6 -import six import sys import os.path @@ -113,7 +112,7 @@ def check_core_path(logger, core_path): " current core pattern is: %s" % corefmt) -class NumericConstant(object): +class NumericConstant: desc_dict = {} @@ -132,7 +131,7 @@ class NumericConstant(object): return "" -class Host(object): +class Host: """ Generic test host "connected" to VPPs interface. """ @property @@ -204,19 +203,6 @@ class Host(object): self._ip6_ll = ip6_ll -class ForeignAddressFactory(object): - count = 0 - prefix_len = 24 - net_template = '10.10.10.{}' - net = net_template.format(0) + '/' + str(prefix_len) - - def get_ip4(self): - if self.count > 255: - raise Exception("Network host address exhaustion") - self.count += 1 - return self.net_template.format(self.count) - - class L4_Conn(): """ L4 'connection' tied to two VPP interfaces """