aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--GPL/tools/trex/trex_astf_assert.py2
-rw-r--r--GPL/tools/trex/trex_astf_profile.py2
-rw-r--r--GPL/tools/trex/trex_astf_stop.py4
-rw-r--r--GPL/tools/trex/trex_stl_assert.py2
-rw-r--r--GPL/tools/trex/trex_stl_profile.py4
-rw-r--r--GPL/tools/trex/trex_stl_stop.py4
-rw-r--r--GPL/traffic_profiles/trex/profile_trex_astf_base_class.py2
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-2n-dot1qip4asym-ip4src254.py30
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-2n-ethip4-macsrc500kdst500k.py18
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-2n-ethip4-macsrc50kdst50k.py8
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-2n-ethip4-macsrc5kdst5k.py8
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-1cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-2cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-4cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-8cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-1cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-2cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-4cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-8cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-1cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-2cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-4cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-8cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst4-2cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst4-4cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-1cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-2cnf.py3
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-4cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-8cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-1cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-2cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-4cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-8cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-1cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-2cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-4cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-8cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-1cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-2cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-4cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-8cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-1cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-2cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-4cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-8cnf.py1
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000.py2
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-macsrc500kdst500k.py8
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4-macsrc5kdst5k.py8
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-3n-ethip4udp-10u15p.py4
-rw-r--r--GPL/traffic_profiles/trex/trex-stl-dot1qip4vxlan-ip4src8udpsrcrnd.py3
-rw-r--r--GPL/traffic_scripts/PacketVerifier.py1
-rw-r--r--GPL/traffic_scripts/geneve_tunnel.py6
-rw-r--r--GPL/traffic_scripts/ipsec_interface.py12
-rw-r--r--GPL/traffic_scripts/ipsec_policy.py6
-rw-r--r--GPL/traffic_scripts/lisp/lisp_check.py27
-rw-r--r--GPL/traffic_scripts/lisp/lispgpe_check.py24
-rw-r--r--GPL/traffic_scripts/nat.py24
-rw-r--r--GPL/traffic_scripts/policer.py7
-rw-r--r--GPL/traffic_scripts/send_icmp_wait_for_reply.py34
-rw-r--r--GPL/traffic_scripts/send_ip_check_headers.py26
-rw-r--r--GPL/traffic_scripts/srv6_encap.py38
-rw-r--r--GPL/traffic_scripts/vxlan.py4
-rw-r--r--docs/automating_vpp_api_flag_day.rst2
-rwxr-xr-xfdio.infra.terraform/1n_nmd/tools/artifacts.py2
-rw-r--r--requirements.txt2
-rw-r--r--resources/libraries/bash/entry/README.txt2
-rw-r--r--resources/libraries/bash/entry/check/README.txt2
-rw-r--r--resources/libraries/bash/entry/check/autogen.sh2
-rw-r--r--resources/libraries/bash/entry/check/copyright_year.sh2
-rw-r--r--resources/libraries/bash/entry/check/doc_verify.sh2
-rw-r--r--resources/libraries/bash/entry/check/gpl_license.sh2
-rw-r--r--resources/libraries/bash/entry/check/line.sh2
-rw-r--r--resources/libraries/bash/entry/check/new_line.sh2
-rw-r--r--resources/libraries/bash/entry/check/pylint.sh2
-rw-r--r--resources/libraries/bash/entry/check/tc_coverage.sh2
-rw-r--r--resources/libraries/bash/entry/check_crc.sh2
-rwxr-xr-xresources/libraries/bash/entry/cleanup_dpdk.sh2
-rwxr-xr-xresources/libraries/bash/entry/init_dpdk.sh2
-rwxr-xr-xresources/libraries/bash/entry/install_dpdk.sh2
-rwxr-xr-xresources/libraries/bash/entry/patch_l3fwd.sh2
-rw-r--r--resources/libraries/bash/entry/per_patch_device.sh2
-rw-r--r--resources/libraries/bash/entry/per_patch_perf.sh2
-rwxr-xr-xresources/libraries/bash/entry/run_l3fwd.sh2
-rwxr-xr-xresources/libraries/bash/entry/run_testpmd.sh2
-rw-r--r--resources/libraries/bash/entry/with_oper_for_vpp.sh2
-rw-r--r--resources/libraries/bash/function/README.txt2
-rw-r--r--resources/libraries/bash/function/artifacts.sh4
-rw-r--r--resources/libraries/bash/function/gather.sh4
-rw-r--r--resources/libraries/bash/function/per_patch.sh4
-rwxr-xr-xresources/libraries/bash/k8s_setup.sh2
-rw-r--r--resources/libraries/bash/shell/k8s_utils.sh2
-rw-r--r--resources/libraries/python/Classify.py2
-rw-r--r--resources/libraries/python/CoreDumpUtil.py2
-rw-r--r--resources/libraries/python/DPDK/DPDKTools.py2
-rw-r--r--resources/libraries/python/DPDK/L3fwdTest.py2
-rw-r--r--resources/libraries/python/DUTSetup.py2
-rw-r--r--resources/libraries/python/Dhcp.py2
-rw-r--r--resources/libraries/python/DropRateSearch.py2
-rw-r--r--resources/libraries/python/FilteredLogger.py2
-rw-r--r--resources/libraries/python/HoststackUtil.py8
-rw-r--r--resources/libraries/python/IPAddress.py2
-rw-r--r--resources/libraries/python/IPUtil.py48
-rw-r--r--resources/libraries/python/IPsecUtil.py12
-rw-r--r--resources/libraries/python/IPv6Util.py2
-rw-r--r--resources/libraries/python/KubernetesUtils.py4
-rw-r--r--resources/libraries/python/L2Util.py2
-rw-r--r--resources/libraries/python/LimitUtil.py2
-rw-r--r--resources/libraries/python/LoadBalancerUtil.py2
-rw-r--r--resources/libraries/python/LocalExecution.py2
-rw-r--r--resources/libraries/python/MLRsearch/AbstractMeasurer.py2
-rw-r--r--resources/libraries/python/MLRsearch/__init__.py2
-rw-r--r--resources/libraries/python/Memif.py2
-rw-r--r--resources/libraries/python/NATUtil.py2
-rw-r--r--resources/libraries/python/Namespaces.py2
-rw-r--r--resources/libraries/python/NodePath.py2
-rw-r--r--resources/libraries/python/NsimUtil.py2
-rw-r--r--resources/libraries/python/OptionString.py2
-rw-r--r--resources/libraries/python/PLRsearch/Integrator.py2
-rw-r--r--resources/libraries/python/PLRsearch/__init__.py2
-rw-r--r--resources/libraries/python/PLRsearch/log_plus.py2
-rw-r--r--resources/libraries/python/PLRsearch/stat_trackers.py2
-rw-r--r--resources/libraries/python/PapiHistory.py2
-rw-r--r--resources/libraries/python/Policer.py2
-rw-r--r--resources/libraries/python/QemuUtils.py2
-rw-r--r--resources/libraries/python/SRv6.py2
-rw-r--r--resources/libraries/python/SchedUtils.py2
-rw-r--r--resources/libraries/python/SysctlUtil.py2
-rw-r--r--resources/libraries/python/TGSetup.py2
-rw-r--r--resources/libraries/python/TestConfig.py2
-rw-r--r--resources/libraries/python/Trace.py2
-rw-r--r--resources/libraries/python/TrafficScriptExecutor.py2
-rw-r--r--resources/libraries/python/VatExecutor.py2
-rw-r--r--resources/libraries/python/VatJsonUtil.py2
-rw-r--r--resources/libraries/python/VppApiCrc.py3
-rw-r--r--resources/libraries/python/autogen/Regenerator.py6
-rw-r--r--resources/libraries/python/autogen/__init__.py2
-rwxr-xr-xresources/libraries/python/autogen/add_suite_tag.py2
-rw-r--r--resources/libraries/python/jumpavg/AvgStdevStats.py2
-rw-r--r--resources/libraries/python/jumpavg/BitCountingGroup.py2
-rw-r--r--resources/libraries/python/jumpavg/BitCountingGroupList.py2
-rw-r--r--resources/libraries/python/jumpavg/BitCountingStats.py2
-rw-r--r--resources/libraries/python/jumpavg/__init__.py2
-rw-r--r--resources/libraries/python/jumpavg/classify.py2
-rw-r--r--resources/libraries/python/parsers/JsonParser.py2
-rw-r--r--resources/libraries/python/ssh.py2
-rw-r--r--resources/libraries/robot/features/acl.robot2
-rw-r--r--resources/libraries/robot/features/policer.robot2
-rw-r--r--resources/libraries/robot/ip/ip4.robot2
-rw-r--r--resources/libraries/robot/ip/ip6.robot2
-rw-r--r--resources/libraries/robot/l2/l2_patch.robot2
-rw-r--r--resources/libraries/robot/l2/l2_traffic.robot2
-rw-r--r--resources/libraries/robot/l2/l2_xconnect.robot2
-rw-r--r--resources/libraries/robot/l2/tagging.robot2
-rw-r--r--resources/libraries/robot/nsim/nsim.robot2
-rw-r--r--resources/libraries/robot/overlay/lisp.robot2
-rw-r--r--resources/libraries/robot/overlay/lisp_api.robot2
-rw-r--r--resources/libraries/robot/overlay/lispgpe.robot2
-rw-r--r--resources/libraries/robot/overlay/srv6.robot2
-rw-r--r--resources/libraries/robot/overlay/vxlan.robot2
-rw-r--r--resources/libraries/robot/shared/memif.robot2
-rw-r--r--resources/libraries/robot/shared/test_setup.robot2
-rw-r--r--resources/libraries/robot/shared/traffic.robot2
-rw-r--r--resources/test_data/lisp/lisp.py2
-rw-r--r--resources/test_data/lisp/performance/lisp_static_adjacency.py2
-rw-r--r--resources/tools/__init__.py2
-rw-r--r--resources/tools/block_replacer/apache2gpl.sh2
-rw-r--r--resources/tools/block_replacer/replace.py2
-rwxr-xr-xresources/tools/doc_gen/gen_rst.py2
-rw-r--r--resources/tools/integrated/__init__.py2
-rw-r--r--resources/tools/integrated/check_crc.py6
-rw-r--r--resources/tools/integrated/compare_perpatch.py4
-rw-r--r--resources/tools/iperf/iperf_client.py5
-rw-r--r--resources/tools/presentation/__init__.py2
-rw-r--r--resources/tools/presentation/environment.py2
-rw-r--r--resources/tools/presentation/static_content.py2
-rw-r--r--resources/tools/scripts/gdb-commands2
-rwxr-xr-xresources/tools/scripts/topo_reservation.py2
-rw-r--r--resources/topology_schemas/2_node_topology.sch.yaml2
-rw-r--r--resources/topology_schemas/topology.sch.yaml2
-rwxr-xr-xtests/dpdk/perf/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/container_memif/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/hoststack/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/ip4/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/ip4_tunnels/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/ip6/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/ip6_tunnels/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/l2/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/lb/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/nfv_density/dcr_memif/chain/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/nfv_density/dcr_memif/pipeline/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/nfv_density/vm_vhost/chain/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/srv6/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/vm_vhost/regenerate_testcases.py2
-rwxr-xr-xtests/vpp/perf/vts/regenerate_testcases.py2
-rw-r--r--topologies/available/2n_hw_testbed1.yaml.example2
-rw-r--r--topologies/available/3n_hw_testbed1.yaml.example2
-rw-r--r--tox-requirements.txt2
200 files changed, 372 insertions, 342 deletions
diff --git a/.gitignore b/.gitignore
index bd08ccda77..a693a1be03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/GPL/tools/trex/trex_astf_assert.py b/GPL/tools/trex/trex_astf_assert.py
index e983f598b9..494f3832bd 100644
--- a/GPL/tools/trex/trex_astf_assert.py
+++ b/GPL/tools/trex/trex_astf_assert.py
@@ -40,7 +40,7 @@ import sys
sys.path.insert(
0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/"
)
-from trex.astf.api import *
+from trex.astf.api import ASTFClient, TRexError
def main():
diff --git a/GPL/tools/trex/trex_astf_profile.py b/GPL/tools/trex/trex_astf_profile.py
index d08fb61778..193ff21185 100644
--- a/GPL/tools/trex/trex_astf_profile.py
+++ b/GPL/tools/trex/trex_astf_profile.py
@@ -36,7 +36,7 @@ import time
sys.path.insert(
0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/"
)
-from trex.astf.api import *
+from trex.astf.api import ASTFClient, ASTFProfile, TRexError
def fmt_latency(lat_min, lat_avg, lat_max, hdrh):
diff --git a/GPL/tools/trex/trex_astf_stop.py b/GPL/tools/trex/trex_astf_stop.py
index 1db122ba0f..871b252328 100644
--- a/GPL/tools/trex/trex_astf_stop.py
+++ b/GPL/tools/trex/trex_astf_stop.py
@@ -41,12 +41,10 @@ import argparse
import json
import sys
-from collections import OrderedDict # Needed to parse xstats representation.
-
sys.path.insert(
0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/"
)
-from trex.astf.api import *
+from trex.astf.api import ASTFClient
def main():
diff --git a/GPL/tools/trex/trex_stl_assert.py b/GPL/tools/trex/trex_stl_assert.py
index eef06be49f..f4f6d16603 100644
--- a/GPL/tools/trex/trex_stl_assert.py
+++ b/GPL/tools/trex/trex_stl_assert.py
@@ -40,7 +40,7 @@ import sys
sys.path.insert(
0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/"
)
-from trex.stl.api import *
+from trex.stl.api import STLClient, STLError
def main():
diff --git a/GPL/tools/trex/trex_stl_profile.py b/GPL/tools/trex/trex_stl_profile.py
index 4eedc80899..cef985870c 100644
--- a/GPL/tools/trex/trex_stl_profile.py
+++ b/GPL/tools/trex/trex_stl_profile.py
@@ -36,7 +36,7 @@ import time
sys.path.insert(
0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/"
)
-from trex.stl.api import *
+from trex.stl.api import STLClient, STLProfile, STLError
def fmt_latency(lat_min, lat_avg, lat_max, hdrh):
@@ -155,7 +155,7 @@ def simple_burst(
if u"macsrc" in profile_file:
client.set_port_attr(ports=[port_0, port_1], promiscuous=True)
if isinstance(framesize, int):
- last_stream_a = int((len(streams) - 2 ) / 2)
+ last_stream_a = int((len(streams) - 2) / 2)
last_stream_b = (last_stream_a * 2)
client.add_streams(streams[0:last_stream_a], ports=[port_0])
if traffic_directions > 1:
diff --git a/GPL/tools/trex/trex_stl_stop.py b/GPL/tools/trex/trex_stl_stop.py
index 1704a89220..14ec817f70 100644
--- a/GPL/tools/trex/trex_stl_stop.py
+++ b/GPL/tools/trex/trex_stl_stop.py
@@ -41,12 +41,10 @@ import argparse
import json
import sys
-from collections import OrderedDict # Needed to parse xstats representation.
-
sys.path.insert(
0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/"
)
-from trex.stl.api import *
+from trex.stl.api import STLClient
def main():
diff --git a/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py b/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py
index 80ae78fc5a..e36e52c2c1 100644
--- a/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py
+++ b/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py
@@ -133,7 +133,7 @@ class TrafficProfileBaseClass:
"""
self.framesize = kwargs[u"framesize"]
self._pcap_dir = kwargs.get(
- u"pcap_dir",u"/opt/trex-core-2.88/scripts/avl"
+ u"pcap_dir", u"/opt/trex-core-2.88/scripts/avl"
)
return self.create_profile()
diff --git a/GPL/traffic_profiles/trex/trex-stl-2n-dot1qip4asym-ip4src254.py b/GPL/traffic_profiles/trex/trex-stl-2n-dot1qip4asym-ip4src254.py
index f5da9d95b7..91df41eba7 100644
--- a/GPL/traffic_profiles/trex/trex-stl-2n-dot1qip4asym-ip4src254.py
+++ b/GPL/traffic_profiles/trex/trex-stl-2n-dot1qip4asym-ip4src254.py
@@ -70,24 +70,24 @@ class TrafficStreams(TrafficStreamsBaseClass):
# Direction 0 --> 1
base_pkt_a = (
- Ether() /
- IP(
- src=self.p1_src_start_ip,
- dst=self.p1_dst_start_ip,
- proto=61
- )
+ Ether() /
+ IP(
+ src=self.p1_src_start_ip,
+ dst=self.p1_dst_start_ip,
+ proto=61
+ )
)
# Direction 1 --> 0
base_pkt_b = (
- Ether() /
- Dot1Q(
- vlan=self.vlan_id
- ) /
- IP(
- src=self.p2_src_start_ip,
- dst=self.p2_dst_start_ip,
- proto=61
- )
+ Ether() /
+ Dot1Q(
+ vlan=self.vlan_id
+ ) /
+ IP(
+ src=self.p2_src_start_ip,
+ dst=self.p2_dst_start_ip,
+ proto=61
+ )
)
# Direction 0 --> 1
diff --git a/GPL/traffic_profiles/trex/trex-stl-2n-ethip4-macsrc500kdst500k.py b/GPL/traffic_profiles/trex/trex-stl-2n-ethip4-macsrc500kdst500k.py
index 7792236269..73c36ef2a1 100644
--- a/GPL/traffic_profiles/trex/trex-stl-2n-ethip4-macsrc500kdst500k.py
+++ b/GPL/traffic_profiles/trex/trex-stl-2n-ethip4-macsrc500kdst500k.py
@@ -95,15 +95,15 @@ class TrafficStreams(TrafficStreamsBaseClass):
)
# Direction 1 --> 0
base_pkt_b = (
- Ether(
- src=self.p2_src_start_mac,
- dst=self.p2_dst_start_mac
- ) /
- IP(
- src=self.p2_src_start_ip,
- dst=self.p2_dst_start_ip,
- proto=61
- )
+ Ether(
+ src=self.p2_src_start_mac,
+ dst=self.p2_dst_start_mac
+ ) /
+ IP(
+ src=self.p2_src_start_ip,
+ dst=self.p2_dst_start_ip,
+ proto=61
+ )
)
# Direction 0 --> 1
diff --git a/GPL/traffic_profiles/trex/trex-stl-2n-ethip4-macsrc50kdst50k.py b/GPL/traffic_profiles/trex/trex-stl-2n-ethip4-macsrc50kdst50k.py
index 49d1032abb..535aa73e4f 100644
--- a/GPL/traffic_profiles/trex/trex-stl-2n-ethip4-macsrc50kdst50k.py
+++ b/GPL/traffic_profiles/trex/trex-stl-2n-ethip4-macsrc50kdst50k.py
@@ -124,11 +124,11 @@ class TrafficStreams(TrafficStreamsBaseClass):
),
STLVmWrFlowVar(
fv_name=u"mac_src",
- pkt_offset= 8
+ pkt_offset=8
),
STLVmWrFlowVar(
fv_name=u"mac_dst",
- pkt_offset= 2
+ pkt_offset=2
),
STLVmFlowVar(
name=u"ip_src",
@@ -176,11 +176,11 @@ class TrafficStreams(TrafficStreamsBaseClass):
),
STLVmWrFlowVar(
fv_name=u"mac_src",
- pkt_offset= 8
+ pkt_offset=8
),
STLVmWrFlowVar(
fv_name=u"mac_dst",
- pkt_offset= 2
+ pkt_offset=2
),
STLVmFlowVar(
name=u"ip_src",
diff --git a/GPL/traffic_profiles/trex/trex-stl-2n-ethip4-macsrc5kdst5k.py b/GPL/traffic_profiles/trex/trex-stl-2n-ethip4-macsrc5kdst5k.py
index d71c2d6eab..a9039fa49f 100644
--- a/GPL/traffic_profiles/trex/trex-stl-2n-ethip4-macsrc5kdst5k.py
+++ b/GPL/traffic_profiles/trex/trex-stl-2n-ethip4-macsrc5kdst5k.py
@@ -125,11 +125,11 @@ class TrafficStreams(TrafficStreamsBaseClass):
),
STLVmWrFlowVar(
fv_name=u"mac_src",
- pkt_offset= 8
+ pkt_offset=8
),
STLVmWrFlowVar(
fv_name=u"mac_dst",
- pkt_offset= 2
+ pkt_offset=2
),
STLVmFlowVar(
name=u"ip_src",
@@ -177,11 +177,11 @@ class TrafficStreams(TrafficStreamsBaseClass):
),
STLVmWrFlowVar(
fv_name=u"mac_src",
- pkt_offset= 8
+ pkt_offset=8
),
STLVmWrFlowVar(
fv_name=u"mac_dst",
- pkt_offset= 2
+ pkt_offset=2
),
STLVmFlowVar(
name=u"ip_src",
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-1cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-1cnf.py
index 9d15e9ea28..615ca88bb4 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-1cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-1cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-2cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-2cnf.py
index 7fefc279db..5f9a9d6b68 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-2cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-2cnf.py
@@ -163,4 +163,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-4cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-4cnf.py
index e8fc20f488..04cfa5f2fb 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-4cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-4cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-8cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-8cnf.py
index ab2aaae36a..2b43760b05 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-8cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst1000-8cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-1cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-1cnf.py
index 90c741d7dc..a997d8f5bc 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-1cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-1cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-2cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-2cnf.py
index 34a089abf1..db49cb73bc 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-2cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-2cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-4cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-4cnf.py
index 24611f1ec6..749258b8c5 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-4cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-4cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-8cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-8cnf.py
index 8217450185..a5ae2e2b55 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-8cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst10000-8cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-1cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-1cnf.py
index 76a8299904..10e6a50d95 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-1cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-1cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-2cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-2cnf.py
index dff6e0209e..65f9d18ee0 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-2cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-2cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-4cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-4cnf.py
index c28e214995..ff02a2b811 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-4cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-4cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-8cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-8cnf.py
index 664e341b07..ce85e17c5e 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-8cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst20000-8cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst4-2cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst4-2cnf.py
index 858ff84652..b34518f4b9 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst4-2cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst4-2cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst4-4cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst4-4cnf.py
index 42698bf7dc..3e941b98bd 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst4-4cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst4-4cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-1cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-1cnf.py
index a52c3d91e8..0acbfb701d 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-1cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-1cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-2cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-2cnf.py
index 78be186d91..e58d437753 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-2cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-2cnf.py
@@ -145,7 +145,7 @@ class TrafficStreams(TrafficStreamsBaseClass):
STLVmWrFlowVar(
fv_name=u"dst",
pkt_offset=u"IP.dst"
- ),
+ ),
STLVmFixIpv4(
offset=u"IP"
)
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-4cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-4cnf.py
index e49ffeeacd..6fce1ed791 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-4cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-4cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-8cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-8cnf.py
index b09b024a16..7a65d7ccad 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-8cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40-8cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-1cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-1cnf.py
index 1af2c4c841..8b0df91ba5 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-1cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-1cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-2cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-2cnf.py
index 4acd1faf40..a40792ad0c 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-2cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-2cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-4cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-4cnf.py
index 302bd20f3c..0553e6faeb 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-4cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-4cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-8cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-8cnf.py
index e92efb927e..9ee65eb354 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-8cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst400-8cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-1cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-1cnf.py
index 14e258552b..7da9933da0 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-1cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-1cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-2cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-2cnf.py
index ac0c503f67..518e4b0d2d 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-2cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-2cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-4cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-4cnf.py
index 2c301efed2..d9dade68d0 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-4cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-4cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-8cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-8cnf.py
index 96bc3fbb26..7dc9410fd7 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-8cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst40000-8cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-1cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-1cnf.py
index 02620e00e9..367624ea07 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-1cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-1cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-2cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-2cnf.py
index 03662d514e..c528be7a31 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-2cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-2cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-4cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-4cnf.py
index d8f8e69a6d..9df1f4da36 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-4cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-4cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-8cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-8cnf.py
index 1c793b98a1..4d062b4573 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-8cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst5000-8cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-1cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-1cnf.py
index 43ef04ffbe..76cb46592b 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-1cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-1cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-2cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-2cnf.py
index 5a8c9f7f3d..f8d84c7696 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-2cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-2cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-4cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-4cnf.py
index 5fc755b2d1..c97f1ca176 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-4cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-4cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-8cnf.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-8cnf.py
index f655046bea..3d225f8ce3 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-8cnf.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000-8cnf.py
@@ -164,4 +164,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000.py
index d00fb76e78..53cef6b1ab 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-ip4dst60000.py
@@ -96,7 +96,7 @@ class TrafficStreams(TrafficStreamsBaseClass):
STLVmWrFlowVar(
fv_name=u"dst",
pkt_offset=u"IP.dst"
- ),
+ ),
STLVmFixIpv4(
offset=u"IP"
)
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-macsrc500kdst500k.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-macsrc500kdst500k.py
index c2e37fd3cd..1cbbffdb2a 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-macsrc500kdst500k.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-macsrc500kdst500k.py
@@ -125,11 +125,11 @@ class TrafficStreams(TrafficStreamsBaseClass):
),
STLVmWrFlowVar(
fv_name=u"mac_src",
- pkt_offset= 8
+ pkt_offset=8
),
STLVmWrFlowVar(
fv_name=u"mac_dst",
- pkt_offset= 2
+ pkt_offset=2
),
STLVmFlowVar(
name=u"ip_src",
@@ -177,11 +177,11 @@ class TrafficStreams(TrafficStreamsBaseClass):
),
STLVmWrFlowVar(
fv_name=u"mac_src",
- pkt_offset= 8
+ pkt_offset=8
),
STLVmWrFlowVar(
fv_name=u"mac_dst",
- pkt_offset= 2
+ pkt_offset=2
),
STLVmFlowVar(
name=u"ip_src",
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-macsrc5kdst5k.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-macsrc5kdst5k.py
index d71c2d6eab..a9039fa49f 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-macsrc5kdst5k.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4-macsrc5kdst5k.py
@@ -125,11 +125,11 @@ class TrafficStreams(TrafficStreamsBaseClass):
),
STLVmWrFlowVar(
fv_name=u"mac_src",
- pkt_offset= 8
+ pkt_offset=8
),
STLVmWrFlowVar(
fv_name=u"mac_dst",
- pkt_offset= 2
+ pkt_offset=2
),
STLVmFlowVar(
name=u"ip_src",
@@ -177,11 +177,11 @@ class TrafficStreams(TrafficStreamsBaseClass):
),
STLVmWrFlowVar(
fv_name=u"mac_src",
- pkt_offset= 8
+ pkt_offset=8
),
STLVmWrFlowVar(
fv_name=u"mac_dst",
- pkt_offset= 2
+ pkt_offset=2
),
STLVmFlowVar(
name=u"ip_src",
diff --git a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4udp-10u15p.py b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4udp-10u15p.py
index 9b85dd529d..c84838d2f9 100644
--- a/GPL/traffic_profiles/trex/trex-stl-3n-ethip4udp-10u15p.py
+++ b/GPL/traffic_profiles/trex/trex-stl-3n-ethip4udp-10u15p.py
@@ -92,7 +92,7 @@ class TrafficStreams(TrafficStreamsBaseClass):
)
# Direction 1 --> 0
base_pkt_b = (
- Ether() /
+ Ether() /
IP(
src=self.p2_src_start_ip,
dst=self.p2_dst_start_ip,
@@ -130,7 +130,7 @@ class TrafficStreams(TrafficStreamsBaseClass):
# Direction 0 --> 1
vm2 = STLScVmRaw(
[
- STLVmFlowVar(
+ STLVmFlowVar(
name=u"dport",
min_value=self.p2_dst_start_udp_port,
max_value=self.p2_dst_end_udp_port,
diff --git a/GPL/traffic_profiles/trex/trex-stl-dot1qip4vxlan-ip4src8udpsrcrnd.py b/GPL/traffic_profiles/trex/trex-stl-dot1qip4vxlan-ip4src8udpsrcrnd.py
index a1cf195bfa..0e2ac5ecaf 100644
--- a/GPL/traffic_profiles/trex/trex-stl-dot1qip4vxlan-ip4src8udpsrcrnd.py
+++ b/GPL/traffic_profiles/trex/trex-stl-dot1qip4vxlan-ip4src8udpsrcrnd.py
@@ -60,7 +60,7 @@ _VXLAN_FLAGS = list(u"R"*24 + u"RRRIRRRRR")
class VXLAN(Packet):
- name=u"VXLAN"
+ name = u"VXLAN"
fields_desc = [
FlagsField(u"flags", 0x08000000, 32, _VXLAN_FLAGS),
ThreeBytesField(u"vni", 0),
@@ -295,4 +295,3 @@ def register():
:rtype: Object
"""
return TrafficStreams()
-
diff --git a/GPL/traffic_scripts/PacketVerifier.py b/GPL/traffic_scripts/PacketVerifier.py
index 89b8c3c206..974906e439 100644
--- a/GPL/traffic_scripts/PacketVerifier.py
+++ b/GPL/traffic_scripts/PacketVerifier.py
@@ -76,6 +76,7 @@
import os
import select
+import time
from scapy.all import ETH_P_IP, ETH_P_IPV6, ETH_P_ALL, ETH_P_ARP
from scapy.config import conf
diff --git a/GPL/traffic_scripts/geneve_tunnel.py b/GPL/traffic_scripts/geneve_tunnel.py
index 1270aa6663..19dae6d5c9 100644
--- a/GPL/traffic_scripts/geneve_tunnel.py
+++ b/GPL/traffic_scripts/geneve_tunnel.py
@@ -284,9 +284,9 @@ def main():
# read another packet in the queue if the current one is
# ICMPv6MLReport2
continue
- else:
- # otherwise process the current packet
- break
+
+ # otherwise process the current packet
+ break
check_geneve(
rx_pkt_recv, ip_layer, rx_src_mac, rx_dst_mac, geneve_tunnel_mac,
diff --git a/GPL/traffic_scripts/ipsec_interface.py b/GPL/traffic_scripts/ipsec_interface.py
index ee157260fa..d49e8bc57e 100644
--- a/GPL/traffic_scripts/ipsec_interface.py
+++ b/GPL/traffic_scripts/ipsec_interface.py
@@ -243,9 +243,9 @@ def main():
if rx_pkt_recv.haslayer(ICMPv6ND_NS):
# read another packet in the queue if the current one is ICMPv6ND_NS
continue
- else:
- # otherwise process the current packet
- break
+
+ # otherwise process the current packet
+ break
check_ipsec(
rx_pkt_recv, ip_layer, rx_src_mac, rx_dst_mac, src_tun, dst_tun, src_ip,
@@ -275,9 +275,9 @@ def main():
# read another packet in the queue if the current one is
# ICMPv6MLReport2
continue
- else:
- # otherwise process the current packet
- break
+
+ # otherwise process the current packet
+ break
check_ip(tx_pkt_recv, ip_layer, tx_dst_mac, tx_src_mac, dst_ip, src_ip)
diff --git a/GPL/traffic_scripts/ipsec_policy.py b/GPL/traffic_scripts/ipsec_policy.py
index 4acf0a144b..b0d4545114 100644
--- a/GPL/traffic_scripts/ipsec_policy.py
+++ b/GPL/traffic_scripts/ipsec_policy.py
@@ -209,9 +209,9 @@ def main():
# read another packet in the queue if the current one is
# ICMPv6MLReport2
continue
- else:
- # otherwise process the current packet
- break
+
+ # otherwise process the current packet
+ break
check_ip(rx_pkt_recv, ip_layer, src_ip, dst_ip)
diff --git a/GPL/traffic_scripts/lisp/lisp_check.py b/GPL/traffic_scripts/lisp/lisp_check.py
index 88d4ad5619..f7b4c6a797 100644
--- a/GPL/traffic_scripts/lisp/lisp_check.py
+++ b/GPL/traffic_scripts/lisp/lisp_check.py
@@ -66,17 +66,33 @@ class LispInnerIPv6(IPv6):
name = u"Lisp Inner Layer - IPv6"
-def valid_ipv4(ip):
+def valid_ipv4(ip_address):
+ """Check IPv4 address.
+
+ :param ip_address: IPv4 address to check.
+ :type ip_address: str
+ :returns: True if IP address is correct.
+ :rtype: bool
+ :raises AttributeError, AddressValueError: If IP address is not valid.
+ """
try:
- ipaddress.IPv4Address(ip)
+ ipaddress.IPv4Address(ip_address)
return True
except (AttributeError, ipaddress.AddressValueError):
return False
-def valid_ipv6(ip):
+def valid_ipv6(ip_address):
+ """Check IPv6 address.
+
+ :param ip_address: IPv6 address to check.
+ :type ip_address: str
+ :returns: True if IP address is correct.
+ :rtype: bool
+ :raises AttributeError, AddressValueError: If IP address is not valid.
+ """
try:
- ipaddress.IPv6Address(ip)
+ ipaddress.IPv6Address(ip_address)
return True
except (AttributeError, ipaddress.AddressValueError):
return False
@@ -85,7 +101,8 @@ def valid_ipv6(ip):
def main():
"""Send IP ICMP packet from one traffic generator interface to the other.
- :raises RuntimeError: If the received packet is not correct."""
+ :raises RuntimeError: If the received packet is not correct.
+ """
args = TrafficScriptArg(
[
diff --git a/GPL/traffic_scripts/lisp/lispgpe_check.py b/GPL/traffic_scripts/lisp/lispgpe_check.py
index 79d2ccfab6..f8fa595867 100644
--- a/GPL/traffic_scripts/lisp/lispgpe_check.py
+++ b/GPL/traffic_scripts/lisp/lispgpe_check.py
@@ -92,17 +92,33 @@ class LispGPEInnerNSH(Packet):
"""
-def valid_ipv4(ip):
+def valid_ipv4(ip_address):
+ """Check IPv4 address.
+
+ :param ip_address: IPv4 address to check.
+ :type ip_address: str
+ :returns: True if IP address is correct.
+ :rtype: bool
+ :raises AttributeError, AddressValueError: If IP address is not valid.
+ """
try:
- ipaddress.IPv4Address(ip)
+ ipaddress.IPv4Address(ip_address)
return True
except (AttributeError, ipaddress.AddressValueError):
return False
-def valid_ipv6(ip):
+def valid_ipv6(ip_address):
+ """Check IPv6 address.
+
+ :param ip_address: IPv6 address to check.
+ :type ip_address: str
+ :returns: True if IP address is correct.
+ :rtype: bool
+ :raises AttributeError, AddressValueError: If IP address is not valid.
+ """
try:
- ipaddress.IPv6Address(ip)
+ ipaddress.IPv6Address(ip_address)
return True
except (AttributeError, ipaddress.AddressValueError):
return False
diff --git a/GPL/traffic_scripts/nat.py b/GPL/traffic_scripts/nat.py
index 319d617f7c..43715fb383 100644
--- a/GPL/traffic_scripts/nat.py
+++ b/GPL/traffic_scripts/nat.py
@@ -38,17 +38,33 @@ from .PacketVerifier import RxQueue, TxQueue
from .TrafficScriptArg import TrafficScriptArg
-def valid_ipv4(ip):
+def valid_ipv4(ip_address):
+ """Check IPv4 address.
+
+ :param ip_address: IPv4 address to check.
+ :type ip_address: str
+ :returns: True if IP address is correct.
+ :rtype: bool
+ :raises AttributeError, AddressValueError: If IP address is not valid.
+ """
try:
- ipaddress.IPv4Address(ip)
+ ipaddress.IPv4Address(ip_address)
return True
except (AttributeError, ipaddress.AddressValueError):
return False
-def valid_ipv6(ip):
+def valid_ipv6(ip_address):
+ """Check IPv6 address.
+
+ :param ip_address: IPv6 address to check.
+ :type ip_address: str
+ :returns: True if IP address is correct.
+ :rtype: bool
+ :raises AttributeError, AddressValueError: If IP address is not valid.
+ """
try:
- ipaddress.IPv6Address(ip)
+ ipaddress.IPv6Address(ip_address)
return True
except (AttributeError, ipaddress.AddressValueError):
return False
diff --git a/GPL/traffic_scripts/policer.py b/GPL/traffic_scripts/policer.py
index ef78f279ad..46131da2a0 100644
--- a/GPL/traffic_scripts/policer.py
+++ b/GPL/traffic_scripts/policer.py
@@ -26,7 +26,6 @@
"""Traffic script for IPsec verification."""
import sys
-import logging
from ipaddress import ip_address
from scapy.layers.l2 import Ether
@@ -117,9 +116,9 @@ def main():
# read another packet in the queue if the current one is
# ICMPv6MLReport2
continue
- else:
- # otherwise process the current packet
- break
+
+ # otherwise process the current packet
+ break
if pkt_recv is None:
raise RuntimeError(u"Rx timeout")
diff --git a/GPL/traffic_scripts/send_icmp_wait_for_reply.py b/GPL/traffic_scripts/send_icmp_wait_for_reply.py
index 966fa60a9c..fefa60f44e 100644
--- a/GPL/traffic_scripts/send_icmp_wait_for_reply.py
+++ b/GPL/traffic_scripts/send_icmp_wait_for_reply.py
@@ -38,33 +38,33 @@ from .PacketVerifier import RxQueue, TxQueue
from .TrafficScriptArg import TrafficScriptArg
-def valid_ipv4(ip):
- """Check if IP address has the correct IPv4 address format.
+def valid_ipv4(ip_address):
+ """Check IPv4 address.
- :param ip: IP address.
- :type ip: str
- :return: True in case of correct IPv4 address format,
- otherwise return False.
+ :param ip_address: IPv4 address to check.
+ :type ip_address: str
+ :returns: True if IP address is correct.
:rtype: bool
+ :raises AttributeError, AddressValueError: If IP address is not valid.
"""
try:
- ipaddress.IPv4Address(ip)
+ ipaddress.IPv4Address(ip_address)
return True
except (AttributeError, ipaddress.AddressValueError):
return False
-def valid_ipv6(ip):
- """Check if IP address has the correct IPv6 address format.
+def valid_ipv6(ip_address):
+ """Check IPv6 address.
- :param ip: IP address.
- :type ip: str
- :return: True in case of correct IPv6 address format,
- otherwise return False.
+ :param ip_address: IPv6 address to check.
+ :type ip_address: str
+ :returns: True if IP address is correct.
:rtype: bool
+ :raises AttributeError, AddressValueError: If IP address is not valid.
"""
try:
- ipaddress.IPv6Address(ip)
+ ipaddress.IPv6Address(ip_address)
return True
except (AttributeError, ipaddress.AddressValueError):
return False
@@ -105,9 +105,9 @@ def main():
raise ValueError(u"IP not in correct format")
icmp_request = (
- Ether(src=src_mac, dst=dst_mac) /
- ip_layer(src=src_ip, dst=dst_ip) /
- icmp_req()
+ Ether(src=src_mac, dst=dst_mac) /
+ ip_layer(src=src_ip, dst=dst_ip) /
+ icmp_req()
)
# Send created packet on the interface
diff --git a/GPL/traffic_scripts/send_ip_check_headers.py b/GPL/traffic_scripts/send_ip_check_headers.py
index 40268d99c2..e052b12190 100644
--- a/GPL/traffic_scripts/send_ip_check_headers.py
+++ b/GPL/traffic_scripts/send_ip_check_headers.py
@@ -42,17 +42,33 @@ from .PacketVerifier import RxQueue, TxQueue
from .TrafficScriptArg import TrafficScriptArg
-def valid_ipv4(ip):
+def valid_ipv4(ip_address):
+ """Check IPv4 address.
+
+ :param ip_address: IPv4 address to check.
+ :type ip_address: str
+ :returns: True if IP address is correct.
+ :rtype: bool
+ :raises AttributeError, AddressValueError: If IP address is not valid.
+ """
try:
- ipaddress.IPv4Address(ip)
+ ipaddress.IPv4Address(ip_address)
return True
except (AttributeError, ipaddress.AddressValueError):
return False
-def valid_ipv6(ip):
+def valid_ipv6(ip_address):
+ """Check IPv6 address.
+
+ :param ip_address: IPv6 address to check.
+ :type ip_address: str
+ :returns: True if IP address is correct.
+ :rtype: bool
+ :raises AttributeError, AddressValueError: If IP address is not valid.
+ """
try:
- ipaddress.IPv6Address(ip)
+ ipaddress.IPv6Address(ip_address)
return True
except (AttributeError, ipaddress.AddressValueError):
return False
@@ -90,7 +106,7 @@ def main():
rxq = RxQueue(rx_if)
txq = TxQueue(tx_if)
- sent_packets =list()
+ sent_packets = list()
pkt_raw = Ether(src=tx_src_mac, dst=tx_dst_mac)
if encaps_tx == u"Dot1q":
diff --git a/GPL/traffic_scripts/srv6_encap.py b/GPL/traffic_scripts/srv6_encap.py
index 9cdfccf432..ce62d79974 100644
--- a/GPL/traffic_scripts/srv6_encap.py
+++ b/GPL/traffic_scripts/srv6_encap.py
@@ -255,9 +255,9 @@ def main():
if rx_pkt_recv.haslayer(ICMPv6ND_NS):
# read another packet in the queue if the current one is ICMPv6ND_NS
continue
- else:
- # otherwise process the current packet
- break
+
+ # otherwise process the current packet
+ break
check_srv6(
rx_pkt_recv, rx_src_mac, rx_dst_mac, src_ip, dst_ip, dir0_srcsid,
@@ -270,20 +270,20 @@ def main():
ip_pkt[Raw].load += (b"\0" * (size_limit - 14 - len(ip_pkt)))
rx_pkt_send = (
- Ether(src=rx_dst_mac, dst=rx_src_mac) /
- IPv6(src=dir1_srcsid, dst=dir1_dstsid1) /
- IPv6ExtHdrSegmentRouting(
- segleft=1 if dir1_dstsid3 == u"None" else 2,
- lastentry=1 if dir1_dstsid3 == u"None" else 2,
- addresses=[dir1_dstsid2, dir1_dstsid1]
- if dir1_dstsid3 == u"None"
- else [dir1_dstsid3, dir1_dstsid2, dir1_dstsid1]
- ) /
- ip_pkt
+ Ether(src=rx_dst_mac, dst=rx_src_mac) /
+ IPv6(src=dir1_srcsid, dst=dir1_dstsid1) /
+ IPv6ExtHdrSegmentRouting(
+ segleft=1 if dir1_dstsid3 == u"None" else 2,
+ lastentry=1 if dir1_dstsid3 == u"None" else 2,
+ addresses=[dir1_dstsid2, dir1_dstsid1]
+ if dir1_dstsid3 == u"None"
+ else [dir1_dstsid3, dir1_dstsid2, dir1_dstsid1]
+ ) /
+ ip_pkt
) if dir1_dstsid2 != u"None" else (
- Ether(src=rx_dst_mac, dst=rx_src_mac) /
- IPv6(src=dir1_srcsid, dst=dir1_dstsid1) /
- ip_pkt
+ Ether(src=rx_dst_mac, dst=rx_src_mac) /
+ IPv6(src=dir1_srcsid, dst=dir1_dstsid1) /
+ ip_pkt
)
rx_txq.send(rx_pkt_send)
@@ -300,9 +300,9 @@ def main():
# read another packet in the queue if the current one is
# ICMPv6MLReport2
continue
- else:
- # otherwise process the current packet
- break
+
+ # otherwise process the current packet
+ break
if decap == u"True":
check_ip(tx_pkt_recv, tx_dst_mac, tx_src_mac, dst_ip, src_ip)
diff --git a/GPL/traffic_scripts/vxlan.py b/GPL/traffic_scripts/vxlan.py
index 2acd2a2c93..25d2d60ed8 100644
--- a/GPL/traffic_scripts/vxlan.py
+++ b/GPL/traffic_scripts/vxlan.py
@@ -21,6 +21,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+"""Traffic script for vxlan verification."""
+
from scapy.fields import BitField, XByteField, X3BytesField
from scapy.layers.inet import UDP
from scapy.layers.l2 import Ether
@@ -28,6 +30,8 @@ from scapy.packet import Packet, bind_layers
class VXLAN(Packet):
+ """Custom scapy layer override for VXLAN."""
+
name = u"VXLAN"
fields_desc = [
BitField(u"flags", 0x08000000, 32),
diff --git a/docs/automating_vpp_api_flag_day.rst b/docs/automating_vpp_api_flag_day.rst
index 2268cf496f..5e4803822f 100644
--- a/docs/automating_vpp_api_flag_day.rst
+++ b/docs/automating_vpp_api_flag_day.rst
@@ -1,5 +1,5 @@
..
- Copyright (c) 2020 Cisco and/or its affiliates.
+ Copyright (c) 2021 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:
diff --git a/fdio.infra.terraform/1n_nmd/tools/artifacts.py b/fdio.infra.terraform/1n_nmd/tools/artifacts.py
index 36bef7c5c6..8c0a24af72 100755
--- a/fdio.infra.terraform/1n_nmd/tools/artifacts.py
+++ b/fdio.infra.terraform/1n_nmd/tools/artifacts.py
@@ -1,6 +1,6 @@
#!/usr/bin/python3
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/requirements.txt b/requirements.txt
index e715ccc964..244c7649ad 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -36,6 +36,8 @@ numpy==1.17.3
scipy==1.5.4
# PAL/DOC dependencies
+boto3==1.17.78
+botocore==1.20.78
hdrhistogram==0.6.1
pandas==0.25.3
plotly==4.1.1
diff --git a/resources/libraries/bash/entry/README.txt b/resources/libraries/bash/entry/README.txt
index bf7897f8a6..8757c9b013 100644
--- a/resources/libraries/bash/entry/README.txt
+++ b/resources/libraries/bash/entry/README.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/check/README.txt b/resources/libraries/bash/entry/check/README.txt
index a72274464c..7f86d83b58 100644
--- a/resources/libraries/bash/entry/check/README.txt
+++ b/resources/libraries/bash/entry/check/README.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/check/autogen.sh b/resources/libraries/bash/entry/check/autogen.sh
index 822c50c0ea..4ff214c260 100644
--- a/resources/libraries/bash/entry/check/autogen.sh
+++ b/resources/libraries/bash/entry/check/autogen.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/check/copyright_year.sh b/resources/libraries/bash/entry/check/copyright_year.sh
index 2f9bc1fbeb..dae1a8dc46 100644
--- a/resources/libraries/bash/entry/check/copyright_year.sh
+++ b/resources/libraries/bash/entry/check/copyright_year.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/check/doc_verify.sh b/resources/libraries/bash/entry/check/doc_verify.sh
index 50b3d2db17..544586a767 100644
--- a/resources/libraries/bash/entry/check/doc_verify.sh
+++ b/resources/libraries/bash/entry/check/doc_verify.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/check/gpl_license.sh b/resources/libraries/bash/entry/check/gpl_license.sh
index a1c46a0e90..167d3f3ecd 100644
--- a/resources/libraries/bash/entry/check/gpl_license.sh
+++ b/resources/libraries/bash/entry/check/gpl_license.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/check/line.sh b/resources/libraries/bash/entry/check/line.sh
index 932f3cdbe9..6f373121e0 100644
--- a/resources/libraries/bash/entry/check/line.sh
+++ b/resources/libraries/bash/entry/check/line.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/check/new_line.sh b/resources/libraries/bash/entry/check/new_line.sh
index 2e24c0256b..4857f9f8bd 100644
--- a/resources/libraries/bash/entry/check/new_line.sh
+++ b/resources/libraries/bash/entry/check/new_line.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/check/pylint.sh b/resources/libraries/bash/entry/check/pylint.sh
index 4d8c27d634..18e7d3db72 100644
--- a/resources/libraries/bash/entry/check/pylint.sh
+++ b/resources/libraries/bash/entry/check/pylint.sh
@@ -29,7 +29,7 @@ source "${BASH_FUNCTION_DIR}/common.sh" || {
echo "Source failed." >&2
exit 1
}
-pylint_args=("--rcfile=pylint.cfg" "resources/" "GPL/")
+pylint_args=("--rcfile=pylint.cfg" "resources/" "GPL/traffic_scripts")
if pylint "${pylint_args[@]}" > "pylint.log"; then
warn
warn "Pylint checker: PASS"
diff --git a/resources/libraries/bash/entry/check/tc_coverage.sh b/resources/libraries/bash/entry/check/tc_coverage.sh
index 2fda5f7d52..66afbb45cf 100644
--- a/resources/libraries/bash/entry/check/tc_coverage.sh
+++ b/resources/libraries/bash/entry/check/tc_coverage.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/check_crc.sh b/resources/libraries/bash/entry/check_crc.sh
index 798d29a7f0..5860bcbca5 100644
--- a/resources/libraries/bash/entry/check_crc.sh
+++ b/resources/libraries/bash/entry/check_crc.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/cleanup_dpdk.sh b/resources/libraries/bash/entry/cleanup_dpdk.sh
index 726f98c1a1..517e5b98f5 100755
--- a/resources/libraries/bash/entry/cleanup_dpdk.sh
+++ b/resources/libraries/bash/entry/cleanup_dpdk.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/init_dpdk.sh b/resources/libraries/bash/entry/init_dpdk.sh
index 910ade38f9..fdbb5b2bd6 100755
--- a/resources/libraries/bash/entry/init_dpdk.sh
+++ b/resources/libraries/bash/entry/init_dpdk.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/install_dpdk.sh b/resources/libraries/bash/entry/install_dpdk.sh
index d87aa5a832..f6a6d454af 100755
--- a/resources/libraries/bash/entry/install_dpdk.sh
+++ b/resources/libraries/bash/entry/install_dpdk.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/patch_l3fwd.sh b/resources/libraries/bash/entry/patch_l3fwd.sh
index 0ce02a0047..88597f1da0 100755
--- a/resources/libraries/bash/entry/patch_l3fwd.sh
+++ b/resources/libraries/bash/entry/patch_l3fwd.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/per_patch_device.sh b/resources/libraries/bash/entry/per_patch_device.sh
index ba4f4bb478..efa925eda0 100644
--- a/resources/libraries/bash/entry/per_patch_device.sh
+++ b/resources/libraries/bash/entry/per_patch_device.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/per_patch_perf.sh b/resources/libraries/bash/entry/per_patch_perf.sh
index 7b64aea67f..565a566eb0 100644
--- a/resources/libraries/bash/entry/per_patch_perf.sh
+++ b/resources/libraries/bash/entry/per_patch_perf.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/run_l3fwd.sh b/resources/libraries/bash/entry/run_l3fwd.sh
index 5716dec59a..d204e89c6f 100755
--- a/resources/libraries/bash/entry/run_l3fwd.sh
+++ b/resources/libraries/bash/entry/run_l3fwd.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/run_testpmd.sh b/resources/libraries/bash/entry/run_testpmd.sh
index 6208487774..1d6b9ee3c6 100755
--- a/resources/libraries/bash/entry/run_testpmd.sh
+++ b/resources/libraries/bash/entry/run_testpmd.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/entry/with_oper_for_vpp.sh b/resources/libraries/bash/entry/with_oper_for_vpp.sh
index 23c0d8a9d1..f9d7829bd2 100644
--- a/resources/libraries/bash/entry/with_oper_for_vpp.sh
+++ b/resources/libraries/bash/entry/with_oper_for_vpp.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/function/README.txt b/resources/libraries/bash/function/README.txt
index 5215e5085b..e4eb91565b 100644
--- a/resources/libraries/bash/function/README.txt
+++ b/resources/libraries/bash/function/README.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/function/artifacts.sh b/resources/libraries/bash/function/artifacts.sh
index 0a08d7311e..3fe6bae428 100644
--- a/resources/libraries/bash/function/artifacts.sh
+++ b/resources/libraries/bash/function/artifacts.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
-# Copyright (c) 2020 Cisco and/or its affiliates.
-# Copyright (c) 2019 PANTHEON.tech and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2021 PANTHEON.tech 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:
diff --git a/resources/libraries/bash/function/gather.sh b/resources/libraries/bash/function/gather.sh
index e0829400b0..2112e1be01 100644
--- a/resources/libraries/bash/function/gather.sh
+++ b/resources/libraries/bash/function/gather.sh
@@ -1,5 +1,5 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Copyright (c) 2019 PANTHEON.tech and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2021 PANTHEON.tech 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:
diff --git a/resources/libraries/bash/function/per_patch.sh b/resources/libraries/bash/function/per_patch.sh
index 43a3f971bf..76dbf51416 100644
--- a/resources/libraries/bash/function/per_patch.sh
+++ b/resources/libraries/bash/function/per_patch.sh
@@ -1,5 +1,5 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
-# Copyright (c) 2020 PANTHEON.tech s.r.o.
+# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2021 PANTHEON.tech s.r.o.
# 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:
diff --git a/resources/libraries/bash/k8s_setup.sh b/resources/libraries/bash/k8s_setup.sh
index 6ebfeecadd..d1d3a38454 100755
--- a/resources/libraries/bash/k8s_setup.sh
+++ b/resources/libraries/bash/k8s_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/bash/shell/k8s_utils.sh b/resources/libraries/bash/shell/k8s_utils.sh
index ac5ecfa287..c29151059b 100644
--- a/resources/libraries/bash/shell/k8s_utils.sh
+++ b/resources/libraries/bash/shell/k8s_utils.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/Classify.py b/resources/libraries/python/Classify.py
index 13472617f2..9a73f29ba6 100644
--- a/resources/libraries/python/Classify.py
+++ b/resources/libraries/python/Classify.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/CoreDumpUtil.py b/resources/libraries/python/CoreDumpUtil.py
index e1c7b65765..97948ad28a 100644
--- a/resources/libraries/python/CoreDumpUtil.py
+++ b/resources/libraries/python/CoreDumpUtil.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/DPDK/DPDKTools.py b/resources/libraries/python/DPDK/DPDKTools.py
index 9bb89968d2..e22245cb75 100644
--- a/resources/libraries/python/DPDK/DPDKTools.py
+++ b/resources/libraries/python/DPDK/DPDKTools.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/DPDK/L3fwdTest.py b/resources/libraries/python/DPDK/L3fwdTest.py
index c33810348d..07ffae9c43 100644
--- a/resources/libraries/python/DPDK/L3fwdTest.py
+++ b/resources/libraries/python/DPDK/L3fwdTest.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py
index 396029a04f..712da63893 100644
--- a/resources/libraries/python/DUTSetup.py
+++ b/resources/libraries/python/DUTSetup.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/Dhcp.py b/resources/libraries/python/Dhcp.py
index ec2c895bc3..2b4d03ec9e 100644
--- a/resources/libraries/python/Dhcp.py
+++ b/resources/libraries/python/Dhcp.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/DropRateSearch.py b/resources/libraries/python/DropRateSearch.py
index 49e64d9219..b1991ee046 100644
--- a/resources/libraries/python/DropRateSearch.py
+++ b/resources/libraries/python/DropRateSearch.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/FilteredLogger.py b/resources/libraries/python/FilteredLogger.py
index 3df5714837..42068ef58c 100644
--- a/resources/libraries/python/FilteredLogger.py
+++ b/resources/libraries/python/FilteredLogger.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/HoststackUtil.py b/resources/libraries/python/HoststackUtil.py
index 2f093ce843..76c75ee867 100644
--- a/resources/libraries/python/HoststackUtil.py
+++ b/resources/libraries/python/HoststackUtil.py
@@ -35,7 +35,6 @@ class HoststackUtil():
'args' - command arguments.
:rtype: dict
"""
- # TODO: Use a python class instead of dictionary for the return type
proto = vpp_echo_attributes[u"uri_protocol"]
addr = vpp_echo_attributes[u"uri_ip4_addr"]
port = vpp_echo_attributes[u"uri_port"]
@@ -71,7 +70,6 @@ class HoststackUtil():
'args' - command arguments.
:rtype: dict
"""
- # TODO: Use a python class instead of dictionary for the return type
iperf3_cmd = {}
iperf3_cmd[u"env_vars"] = f"VCL_CONFIG={Constants.REMOTE_FW_DIR}/" \
f"{Constants.RESOURCES_TPL_VCL}/" \
@@ -102,9 +100,11 @@ class HoststackUtil():
f" --time {iperf3_attributes[u'time']}"
if iperf3_attributes[u"udp"]:
iperf3_cmd[u"args"] += u" --udp"
- iperf3_cmd[u"args"] += f" --bandwidth {iperf3_attributes[u'bandwidth']}"
+ iperf3_cmd[u"args"] += \
+ f" --bandwidth {iperf3_attributes[u'bandwidth']}"
if iperf3_attributes[u"length"] > 0:
- iperf3_cmd[u"args"] += f" --length {iperf3_attributes[u'length']}"
+ iperf3_cmd[u"args"] += \
+ f" --length {iperf3_attributes[u'length']}"
return iperf3_cmd
@staticmethod
diff --git a/resources/libraries/python/IPAddress.py b/resources/libraries/python/IPAddress.py
index b8a4d7443d..8f8ebbffc6 100644
--- a/resources/libraries/python/IPAddress.py
+++ b/resources/libraries/python/IPAddress.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/IPUtil.py b/resources/libraries/python/IPUtil.py
index 4d5753ea92..fdd7c66e18 100644
--- a/resources/libraries/python/IPUtil.py
+++ b/resources/libraries/python/IPUtil.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
@@ -51,7 +51,6 @@ class FibPathType(IntEnum):
class FibPathFlags(IntEnum):
"""FIB path flags."""
FIB_PATH_FLAG_NONE = 0
- # TODO: Name too long for pylint, fix in VPP.
FIB_PATH_FLAG_RESOLVE_VIA_ATTACHED = 1
FIB_PATH_FLAG_RESOLVE_VIA_HOST = 2
@@ -67,26 +66,26 @@ class FibPathNhProto(IntEnum):
class IpDscp(IntEnum):
"""DSCP code points."""
- IP_API_DSCP_CS0 = 0,
- IP_API_DSCP_CS1 = 8,
- IP_API_DSCP_AF11 = 10,
- IP_API_DSCP_AF12 = 12,
- IP_API_DSCP_AF13 = 14,
- IP_API_DSCP_CS2 = 16,
- IP_API_DSCP_AF21 = 18,
- IP_API_DSCP_AF22 = 20,
- IP_API_DSCP_AF23 = 22,
- IP_API_DSCP_CS3 = 24,
- IP_API_DSCP_AF31 = 26,
- IP_API_DSCP_AF32 = 28,
- IP_API_DSCP_AF33 = 30,
- IP_API_DSCP_CS4 = 32,
- IP_API_DSCP_AF41 = 34,
- IP_API_DSCP_AF42 = 36,
- IP_API_DSCP_AF43 = 38,
- IP_API_DSCP_CS5 = 40,
- IP_API_DSCP_EF = 46,
- IP_API_DSCP_CS6 = 48,
+ IP_API_DSCP_CS0 = 0
+ IP_API_DSCP_CS1 = 8
+ IP_API_DSCP_AF11 = 10
+ IP_API_DSCP_AF12 = 12
+ IP_API_DSCP_AF13 = 14
+ IP_API_DSCP_CS2 = 16
+ IP_API_DSCP_AF21 = 18
+ IP_API_DSCP_AF22 = 20
+ IP_API_DSCP_AF23 = 22
+ IP_API_DSCP_CS3 = 24
+ IP_API_DSCP_AF31 = 26
+ IP_API_DSCP_AF32 = 28
+ IP_API_DSCP_AF33 = 30
+ IP_API_DSCP_CS4 = 32
+ IP_API_DSCP_AF41 = 34
+ IP_API_DSCP_AF42 = 36
+ IP_API_DSCP_AF43 = 38
+ IP_API_DSCP_CS5 = 40
+ IP_API_DSCP_EF = 46
+ IP_API_DSCP_CS6 = 48
IP_API_DSCP_CS7 = 50
@@ -147,9 +146,6 @@ class IPUtil:
with PapiSocketExecutor(node) as papi_exec:
details = papi_exec.add(cmd, **args).get_details(err_msg)
- # TODO: CSIT currently looks only whether the list is empty.
- # Add proper value processing if values become important.
-
return details
@staticmethod
@@ -411,8 +407,6 @@ class IPUtil:
:type namespace: str
:raises RuntimeError: IP could not be deleted.
"""
- # TODO: Refactor command execution in namespaces into central
- # methods (e.g. Namespace.exec_cmd_in_namespace)
if namespace is not None:
cmd = f"ip netns exec {namespace} ip addr del " \
f"{ip_addr}/{prefix_length} dev {interface}"
diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py
index f75daf93c1..e066bc9424 100644
--- a/resources/libraries/python/IPsecUtil.py
+++ b/resources/libraries/python/IPsecUtil.py
@@ -94,18 +94,18 @@ class IPsecProto(IntEnum):
class IPsecSadFlags(IntEnum):
"""IPsec Security Association Database flags."""
- IPSEC_API_SAD_FLAG_NONE = 0,
+ IPSEC_API_SAD_FLAG_NONE = 0
# Enable extended sequence numbers
- IPSEC_API_SAD_FLAG_USE_ESN = 0x01,
+ IPSEC_API_SAD_FLAG_USE_ESN = 0x01
# Enable Anti - replay
- IPSEC_API_SAD_FLAG_USE_ANTI_REPLAY = 0x02,
+ IPSEC_API_SAD_FLAG_USE_ANTI_REPLAY = 0x02
# IPsec tunnel mode if non-zero, else transport mode
- IPSEC_API_SAD_FLAG_IS_TUNNEL = 0x04,
+ IPSEC_API_SAD_FLAG_IS_TUNNEL = 0x04
# IPsec tunnel mode is IPv6 if non-zero, else IPv4 tunnel
# only valid if is_tunnel is non-zero
- IPSEC_API_SAD_FLAG_IS_TUNNEL_V6 = 0x08,
+ IPSEC_API_SAD_FLAG_IS_TUNNEL_V6 = 0x08
# Enable UDP encapsulation for NAT traversal
- IPSEC_API_SAD_FLAG_UDP_ENCAP = 0x10,
+ IPSEC_API_SAD_FLAG_UDP_ENCAP = 0x10
# IPsec SA is or inbound traffic
IPSEC_API_SAD_FLAG_IS_INBOUND = 0x40
diff --git a/resources/libraries/python/IPv6Util.py b/resources/libraries/python/IPv6Util.py
index 883304487d..b383695480 100644
--- a/resources/libraries/python/IPv6Util.py
+++ b/resources/libraries/python/IPv6Util.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/KubernetesUtils.py b/resources/libraries/python/KubernetesUtils.py
index d0d72a39a1..9ded0e8b9e 100644
--- a/resources/libraries/python/KubernetesUtils.py
+++ b/resources/libraries/python/KubernetesUtils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
@@ -488,8 +488,6 @@ class KubernetesUtils:
vpp_config.add_unix_cli_listen(value=u"0.0.0.0:5002")
vpp_config.add_unix_nodaemon()
vpp_config.add_socksvr()
- vpp_config.add_heapsize(u"4G")
- vpp_config.add_ip_heap_size(u"4G")
vpp_config.add_ip6_heap_size(u"4G")
vpp_config.add_ip6_hash_buckets(u"2000000")
if not kwargs[u"jumbo"]:
diff --git a/resources/libraries/python/L2Util.py b/resources/libraries/python/L2Util.py
index eea66b82b1..0f00787bd4 100644
--- a/resources/libraries/python/L2Util.py
+++ b/resources/libraries/python/L2Util.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/LimitUtil.py b/resources/libraries/python/LimitUtil.py
index c34109c2b7..6559f6aeb0 100644
--- a/resources/libraries/python/LimitUtil.py
+++ b/resources/libraries/python/LimitUtil.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/LoadBalancerUtil.py b/resources/libraries/python/LoadBalancerUtil.py
index 340afe50a3..986d5b598d 100644
--- a/resources/libraries/python/LoadBalancerUtil.py
+++ b/resources/libraries/python/LoadBalancerUtil.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Intel and/or its affiliates.
+# Copyright (c) 2021 Intel 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:
diff --git a/resources/libraries/python/LocalExecution.py b/resources/libraries/python/LocalExecution.py
index ea40156404..98dfce1375 100644
--- a/resources/libraries/python/LocalExecution.py
+++ b/resources/libraries/python/LocalExecution.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/MLRsearch/AbstractMeasurer.py b/resources/libraries/python/MLRsearch/AbstractMeasurer.py
index 82116f2e43..da66b4e174 100644
--- a/resources/libraries/python/MLRsearch/AbstractMeasurer.py
+++ b/resources/libraries/python/MLRsearch/AbstractMeasurer.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/MLRsearch/__init__.py b/resources/libraries/python/MLRsearch/__init__.py
index 70c713eaa0..35ef812179 100644
--- a/resources/libraries/python/MLRsearch/__init__.py
+++ b/resources/libraries/python/MLRsearch/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/Memif.py b/resources/libraries/python/Memif.py
index 2128d30428..d38f5000a7 100644
--- a/resources/libraries/python/Memif.py
+++ b/resources/libraries/python/Memif.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/NATUtil.py b/resources/libraries/python/NATUtil.py
index 0f8e746663..60e0e6d1a3 100644
--- a/resources/libraries/python/NATUtil.py
+++ b/resources/libraries/python/NATUtil.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/Namespaces.py b/resources/libraries/python/Namespaces.py
index 4bea8b5575..d78d2f6d44 100644
--- a/resources/libraries/python/Namespaces.py
+++ b/resources/libraries/python/Namespaces.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/NodePath.py b/resources/libraries/python/NodePath.py
index 7f24b0e4fc..cc91c4a2f5 100644
--- a/resources/libraries/python/NodePath.py
+++ b/resources/libraries/python/NodePath.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/NsimUtil.py b/resources/libraries/python/NsimUtil.py
index 85e41a4553..bc599c090a 100644
--- a/resources/libraries/python/NsimUtil.py
+++ b/resources/libraries/python/NsimUtil.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/OptionString.py b/resources/libraries/python/OptionString.py
index bdb5ee2b4c..35988c4b71 100644
--- a/resources/libraries/python/OptionString.py
+++ b/resources/libraries/python/OptionString.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/PLRsearch/Integrator.py b/resources/libraries/python/PLRsearch/Integrator.py
index 331bd8475b..a7a59391ed 100644
--- a/resources/libraries/python/PLRsearch/Integrator.py
+++ b/resources/libraries/python/PLRsearch/Integrator.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/PLRsearch/__init__.py b/resources/libraries/python/PLRsearch/__init__.py
index 6d1559d5f0..22360cb182 100644
--- a/resources/libraries/python/PLRsearch/__init__.py
+++ b/resources/libraries/python/PLRsearch/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/PLRsearch/log_plus.py b/resources/libraries/python/PLRsearch/log_plus.py
index 62378f6f2c..8ede2909c6 100644
--- a/resources/libraries/python/PLRsearch/log_plus.py
+++ b/resources/libraries/python/PLRsearch/log_plus.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/PLRsearch/stat_trackers.py b/resources/libraries/python/PLRsearch/stat_trackers.py
index 2a7a05cae6..e0b21dc3a9 100644
--- a/resources/libraries/python/PLRsearch/stat_trackers.py
+++ b/resources/libraries/python/PLRsearch/stat_trackers.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/PapiHistory.py b/resources/libraries/python/PapiHistory.py
index cacfbd6b19..65995ce8ef 100644
--- a/resources/libraries/python/PapiHistory.py
+++ b/resources/libraries/python/PapiHistory.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/Policer.py b/resources/libraries/python/Policer.py
index 37b1c7f745..6d3bf86462 100644
--- a/resources/libraries/python/Policer.py
+++ b/resources/libraries/python/Policer.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py
index 682def1a27..573336153a 100644
--- a/resources/libraries/python/QemuUtils.py
+++ b/resources/libraries/python/QemuUtils.py
@@ -243,6 +243,8 @@ class QemuUtils:
:type virtio_feature_mask: int
"""
self._nic_id += 1
+ if jumbo_frames:
+ logger.debug(u"Jumbo frames temporarily disabled!")
self._params.add_with_value(
u"chardev", f"socket,id=char{self._nic_id},"
f"path={socket}{u',server' if server is True else u''}"
diff --git a/resources/libraries/python/SRv6.py b/resources/libraries/python/SRv6.py
index 4ff8866bda..eca22a2b17 100644
--- a/resources/libraries/python/SRv6.py
+++ b/resources/libraries/python/SRv6.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/SchedUtils.py b/resources/libraries/python/SchedUtils.py
index bb14c29de8..cfc75344f9 100644
--- a/resources/libraries/python/SchedUtils.py
+++ b/resources/libraries/python/SchedUtils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/SysctlUtil.py b/resources/libraries/python/SysctlUtil.py
index f8c169a833..6c5e9e2081 100644
--- a/resources/libraries/python/SysctlUtil.py
+++ b/resources/libraries/python/SysctlUtil.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/TGSetup.py b/resources/libraries/python/TGSetup.py
index e105921e23..7b3cee4098 100644
--- a/resources/libraries/python/TGSetup.py
+++ b/resources/libraries/python/TGSetup.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/TestConfig.py b/resources/libraries/python/TestConfig.py
index 9e104e2098..c1b7b1b600 100644
--- a/resources/libraries/python/TestConfig.py
+++ b/resources/libraries/python/TestConfig.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/Trace.py b/resources/libraries/python/Trace.py
index 9c02286b0f..f54ae1060e 100644
--- a/resources/libraries/python/Trace.py
+++ b/resources/libraries/python/Trace.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/TrafficScriptExecutor.py b/resources/libraries/python/TrafficScriptExecutor.py
index 8faa084ca1..0a45a0b22f 100644
--- a/resources/libraries/python/TrafficScriptExecutor.py
+++ b/resources/libraries/python/TrafficScriptExecutor.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/VatExecutor.py b/resources/libraries/python/VatExecutor.py
index 26d4b75781..63f46c8b6d 100644
--- a/resources/libraries/python/VatExecutor.py
+++ b/resources/libraries/python/VatExecutor.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/VatJsonUtil.py b/resources/libraries/python/VatJsonUtil.py
index 594d3e2f39..3e956e790d 100644
--- a/resources/libraries/python/VatJsonUtil.py
+++ b/resources/libraries/python/VatJsonUtil.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/VppApiCrc.py b/resources/libraries/python/VppApiCrc.py
index 1fcb91d4b9..ca76397fc6 100644
--- a/resources/libraries/python/VppApiCrc.py
+++ b/resources/libraries/python/VppApiCrc.py
@@ -373,7 +373,8 @@ class VppApiCrcChecker:
if not matching:
self._reported[api_name] = crc
self.log_and_raise(
- f"No active collection contains API {api_name!r} with CRC {crc!r}"
+ f"No active collection contains API {api_name!r} with CRC "
+ f"{crc!r}"
)
options = self._options[api_name]
options.pop(u"vat_help", None)
diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index fd0d8cfee0..abcd7b8b99 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -157,9 +157,9 @@ def add_default_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list):
if kwargs[u"frame_size"] not in MIN_FRAME_SIZE_VALUES:
emit = False
if (
- u"-cps-" in suite_id
- or u"-pps-" in suite_id
- or u"-tput-" in suite_id
+ u"-cps-" in suite_id
+ or u"-pps-" in suite_id
+ or u"-tput-" in suite_id
):
if kwargs[u"frame_size"] not in MIN_FRAME_SIZE_VALUES:
emit = False
diff --git a/resources/libraries/python/autogen/__init__.py b/resources/libraries/python/autogen/__init__.py
index dfb2255a09..939824903e 100644
--- a/resources/libraries/python/autogen/__init__.py
+++ b/resources/libraries/python/autogen/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/autogen/add_suite_tag.py b/resources/libraries/python/autogen/add_suite_tag.py
index 63bfa1a385..276e6b04a4 100755
--- a/resources/libraries/python/autogen/add_suite_tag.py
+++ b/resources/libraries/python/autogen/add_suite_tag.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/jumpavg/AvgStdevStats.py b/resources/libraries/python/jumpavg/AvgStdevStats.py
index 9a8decd932..4720c10f3d 100644
--- a/resources/libraries/python/jumpavg/AvgStdevStats.py
+++ b/resources/libraries/python/jumpavg/AvgStdevStats.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/jumpavg/BitCountingGroup.py b/resources/libraries/python/jumpavg/BitCountingGroup.py
index 0c1aabba30..f1bdc502fd 100644
--- a/resources/libraries/python/jumpavg/BitCountingGroup.py
+++ b/resources/libraries/python/jumpavg/BitCountingGroup.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/jumpavg/BitCountingGroupList.py b/resources/libraries/python/jumpavg/BitCountingGroupList.py
index bcc5e43267..aed1304d97 100644
--- a/resources/libraries/python/jumpavg/BitCountingGroupList.py
+++ b/resources/libraries/python/jumpavg/BitCountingGroupList.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/jumpavg/BitCountingStats.py b/resources/libraries/python/jumpavg/BitCountingStats.py
index 0addec013b..7b5e659214 100644
--- a/resources/libraries/python/jumpavg/BitCountingStats.py
+++ b/resources/libraries/python/jumpavg/BitCountingStats.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/jumpavg/__init__.py b/resources/libraries/python/jumpavg/__init__.py
index cb8b3df43d..4fa696c538 100644
--- a/resources/libraries/python/jumpavg/__init__.py
+++ b/resources/libraries/python/jumpavg/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/jumpavg/classify.py b/resources/libraries/python/jumpavg/classify.py
index 5f5ce6160c..252c71e8d5 100644
--- a/resources/libraries/python/jumpavg/classify.py
+++ b/resources/libraries/python/jumpavg/classify.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/parsers/JsonParser.py b/resources/libraries/python/parsers/JsonParser.py
index bebe2a2407..c7a28bc1e4 100644
--- a/resources/libraries/python/parsers/JsonParser.py
+++ b/resources/libraries/python/parsers/JsonParser.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/python/ssh.py b/resources/libraries/python/ssh.py
index 5c397eeb17..476cb62ad9 100644
--- a/resources/libraries/python/ssh.py
+++ b/resources/libraries/python/ssh.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/features/acl.robot b/resources/libraries/robot/features/acl.robot
index 8621562b22..1dd706c3ac 100644
--- a/resources/libraries/robot/features/acl.robot
+++ b/resources/libraries/robot/features/acl.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/features/policer.robot b/resources/libraries/robot/features/policer.robot
index a9394d6c9f..84296eb79a 100644
--- a/resources/libraries/robot/features/policer.robot
+++ b/resources/libraries/robot/features/policer.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/ip/ip4.robot b/resources/libraries/robot/ip/ip4.robot
index 0220fe29f6..ef5b27f7de 100644
--- a/resources/libraries/robot/ip/ip4.robot
+++ b/resources/libraries/robot/ip/ip4.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/ip/ip6.robot b/resources/libraries/robot/ip/ip6.robot
index ec22c5511b..edb264190c 100644
--- a/resources/libraries/robot/ip/ip6.robot
+++ b/resources/libraries/robot/ip/ip6.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/l2/l2_patch.robot b/resources/libraries/robot/l2/l2_patch.robot
index b1a53ef4e3..0a0d19c0b3 100644
--- a/resources/libraries/robot/l2/l2_patch.robot
+++ b/resources/libraries/robot/l2/l2_patch.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/l2/l2_traffic.robot b/resources/libraries/robot/l2/l2_traffic.robot
index 25699b14c7..36ff3e7fe4 100644
--- a/resources/libraries/robot/l2/l2_traffic.robot
+++ b/resources/libraries/robot/l2/l2_traffic.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/l2/l2_xconnect.robot b/resources/libraries/robot/l2/l2_xconnect.robot
index 2cdba5b4d2..59199b6c90 100644
--- a/resources/libraries/robot/l2/l2_xconnect.robot
+++ b/resources/libraries/robot/l2/l2_xconnect.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/l2/tagging.robot b/resources/libraries/robot/l2/tagging.robot
index 273384c5cc..dd4642c505 100644
--- a/resources/libraries/robot/l2/tagging.robot
+++ b/resources/libraries/robot/l2/tagging.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/nsim/nsim.robot b/resources/libraries/robot/nsim/nsim.robot
index 4b5248ad94..042aedd8b0 100644
--- a/resources/libraries/robot/nsim/nsim.robot
+++ b/resources/libraries/robot/nsim/nsim.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/overlay/lisp.robot b/resources/libraries/robot/overlay/lisp.robot
index 21036dc0c0..c759aafda4 100644
--- a/resources/libraries/robot/overlay/lisp.robot
+++ b/resources/libraries/robot/overlay/lisp.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/overlay/lisp_api.robot b/resources/libraries/robot/overlay/lisp_api.robot
index d2245c3f9a..9d6bbeaf2d 100644
--- a/resources/libraries/robot/overlay/lisp_api.robot
+++ b/resources/libraries/robot/overlay/lisp_api.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/overlay/lispgpe.robot b/resources/libraries/robot/overlay/lispgpe.robot
index 1fa84da721..53ca690621 100644
--- a/resources/libraries/robot/overlay/lispgpe.robot
+++ b/resources/libraries/robot/overlay/lispgpe.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/overlay/srv6.robot b/resources/libraries/robot/overlay/srv6.robot
index 92c8220cb7..9462a71189 100644
--- a/resources/libraries/robot/overlay/srv6.robot
+++ b/resources/libraries/robot/overlay/srv6.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/overlay/vxlan.robot b/resources/libraries/robot/overlay/vxlan.robot
index f98514e2a2..92da03eaf1 100644
--- a/resources/libraries/robot/overlay/vxlan.robot
+++ b/resources/libraries/robot/overlay/vxlan.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/shared/memif.robot b/resources/libraries/robot/shared/memif.robot
index 50051ca413..e3f3ddc793 100644
--- a/resources/libraries/robot/shared/memif.robot
+++ b/resources/libraries/robot/shared/memif.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/shared/test_setup.robot b/resources/libraries/robot/shared/test_setup.robot
index b5b9e57cf7..e2fcfc5f87 100644
--- a/resources/libraries/robot/shared/test_setup.robot
+++ b/resources/libraries/robot/shared/test_setup.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/libraries/robot/shared/traffic.robot b/resources/libraries/robot/shared/traffic.robot
index 08f579c9df..bd8edcf751 100644
--- a/resources/libraries/robot/shared/traffic.robot
+++ b/resources/libraries/robot/shared/traffic.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/test_data/lisp/lisp.py b/resources/test_data/lisp/lisp.py
index d52b7a9ecd..27614704f2 100644
--- a/resources/test_data/lisp/lisp.py
+++ b/resources/test_data/lisp/lisp.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/test_data/lisp/performance/lisp_static_adjacency.py b/resources/test_data/lisp/performance/lisp_static_adjacency.py
index 4351a40f55..097e5facc3 100644
--- a/resources/test_data/lisp/performance/lisp_static_adjacency.py
+++ b/resources/test_data/lisp/performance/lisp_static_adjacency.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/tools/__init__.py b/resources/tools/__init__.py
index e9d6d476eb..56935cf72b 100644
--- a/resources/tools/__init__.py
+++ b/resources/tools/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/tools/block_replacer/apache2gpl.sh b/resources/tools/block_replacer/apache2gpl.sh
index f248393d50..67b51f200c 100644
--- a/resources/tools/block_replacer/apache2gpl.sh
+++ b/resources/tools/block_replacer/apache2gpl.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/tools/block_replacer/replace.py b/resources/tools/block_replacer/replace.py
index 02d1889331..5154c51be1 100644
--- a/resources/tools/block_replacer/replace.py
+++ b/resources/tools/block_replacer/replace.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/tools/doc_gen/gen_rst.py b/resources/tools/doc_gen/gen_rst.py
index 28223e22c7..1cb1005a50 100755
--- a/resources/tools/doc_gen/gen_rst.py
+++ b/resources/tools/doc_gen/gen_rst.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/tools/integrated/__init__.py b/resources/tools/integrated/__init__.py
index a708b16817..fed3209ecf 100644
--- a/resources/tools/integrated/__init__.py
+++ b/resources/tools/integrated/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/tools/integrated/check_crc.py b/resources/tools/integrated/check_crc.py
index 1d98a467e2..6baa7a190d 100644
--- a/resources/tools/integrated/check_crc.py
+++ b/resources/tools/integrated/check_crc.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
@@ -62,8 +62,8 @@ def main():
u"",
u"In the former case, please consult the following document",
u"to see how to make CSIT accept the .api editing change.",
- u"https://github.com/FDio/csit/blob/master/docs/automating_vpp_api_flag_day.rst"
- u"",
+ u"https://github.com/FDio/csit/blob/master/docs/"
+ u"automating_vpp_api_flag_day.rst",
u"For the latter case, please rebase the patch to see",
u"if that fixes the problem. If repeated rebases do not help",
u"send and email to csit-dev@lists.fd.io asking to investigate.",
diff --git a/resources/tools/integrated/compare_perpatch.py b/resources/tools/integrated/compare_perpatch.py
index 62e55629f6..b4d52dcdfe 100644
--- a/resources/tools/integrated/compare_perpatch.py
+++ b/resources/tools/integrated/compare_perpatch.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
@@ -72,7 +72,7 @@ def main():
for test_index in range(num_tests):
parent_values = list()
current_values = list()
- for iteration_index in range(len(parent_iterations)):
+ for iteration_index, _ in enumerate(parent_iterations):
parent_values.extend(
json.loads(parent_iterations[iteration_index][test_index])
)
diff --git a/resources/tools/iperf/iperf_client.py b/resources/tools/iperf/iperf_client.py
index 9d9ed9b197..b77dea1179 100644
--- a/resources/tools/iperf/iperf_client.py
+++ b/resources/tools/iperf/iperf_client.py
@@ -44,7 +44,10 @@ def simple_burst(args):
try:
for i in range(0, args.instances):
cmd = u"exec sudo "
- cmd += f"ip netns exec {args.namespace} " if args.namespace else u""
+ cmd += (
+ f"ip netns exec {args.namespace} "
+ if args.namespace else u""
+ )
cmd += f"iperf3 "
cmd += f"--client {args.host} "
cmd += f"--bind {args.bind} "
diff --git a/resources/tools/presentation/__init__.py b/resources/tools/presentation/__init__.py
index 67fa7230d6..a85fe45c2b 100644
--- a/resources/tools/presentation/__init__.py
+++ b/resources/tools/presentation/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/tools/presentation/environment.py b/resources/tools/presentation/environment.py
index ea4d94ad70..9bf9586da8 100644
--- a/resources/tools/presentation/environment.py
+++ b/resources/tools/presentation/environment.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/tools/presentation/static_content.py b/resources/tools/presentation/static_content.py
index 0fb81d1cbe..831d8a8f84 100644
--- a/resources/tools/presentation/static_content.py
+++ b/resources/tools/presentation/static_content.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/tools/scripts/gdb-commands b/resources/tools/scripts/gdb-commands
index 419dca934b..b9acc864f1 100644
--- a/resources/tools/scripts/gdb-commands
+++ b/resources/tools/scripts/gdb-commands
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/tools/scripts/topo_reservation.py b/resources/tools/scripts/topo_reservation.py
index 021c60a6b6..c1b5c4658e 100755
--- a/resources/tools/scripts/topo_reservation.py
+++ b/resources/tools/scripts/topo_reservation.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/topology_schemas/2_node_topology.sch.yaml b/resources/topology_schemas/2_node_topology.sch.yaml
index 8de397106a..fac67d5e47 100644
--- a/resources/topology_schemas/2_node_topology.sch.yaml
+++ b/resources/topology_schemas/2_node_topology.sch.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/resources/topology_schemas/topology.sch.yaml b/resources/topology_schemas/topology.sch.yaml
index 37478058fe..edf52483d6 100644
--- a/resources/topology_schemas/topology.sch.yaml
+++ b/resources/topology_schemas/topology.sch.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/dpdk/perf/regenerate_testcases.py b/tests/dpdk/perf/regenerate_testcases.py
index 190213fb3d..5059df90bf 100755
--- a/tests/dpdk/perf/regenerate_testcases.py
+++ b/tests/dpdk/perf/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/vpp/perf/container_memif/regenerate_testcases.py b/tests/vpp/perf/container_memif/regenerate_testcases.py
index ec754aa261..87521e662d 100755
--- a/tests/vpp/perf/container_memif/regenerate_testcases.py
+++ b/tests/vpp/perf/container_memif/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/vpp/perf/hoststack/regenerate_testcases.py b/tests/vpp/perf/hoststack/regenerate_testcases.py
index ec754aa261..87521e662d 100755
--- a/tests/vpp/perf/hoststack/regenerate_testcases.py
+++ b/tests/vpp/perf/hoststack/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/vpp/perf/ip4/regenerate_testcases.py b/tests/vpp/perf/ip4/regenerate_testcases.py
index ec754aa261..87521e662d 100755
--- a/tests/vpp/perf/ip4/regenerate_testcases.py
+++ b/tests/vpp/perf/ip4/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/vpp/perf/ip4_tunnels/regenerate_testcases.py b/tests/vpp/perf/ip4_tunnels/regenerate_testcases.py
index ec754aa261..87521e662d 100755
--- a/tests/vpp/perf/ip4_tunnels/regenerate_testcases.py
+++ b/tests/vpp/perf/ip4_tunnels/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/vpp/perf/ip6/regenerate_testcases.py b/tests/vpp/perf/ip6/regenerate_testcases.py
index f6bbf0a102..b1c6336c72 100755
--- a/tests/vpp/perf/ip6/regenerate_testcases.py
+++ b/tests/vpp/perf/ip6/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/vpp/perf/ip6_tunnels/regenerate_testcases.py b/tests/vpp/perf/ip6_tunnels/regenerate_testcases.py
index f6bbf0a102..b1c6336c72 100755
--- a/tests/vpp/perf/ip6_tunnels/regenerate_testcases.py
+++ b/tests/vpp/perf/ip6_tunnels/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/vpp/perf/l2/regenerate_testcases.py b/tests/vpp/perf/l2/regenerate_testcases.py
index ec754aa261..87521e662d 100755
--- a/tests/vpp/perf/l2/regenerate_testcases.py
+++ b/tests/vpp/perf/l2/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/vpp/perf/lb/regenerate_testcases.py b/tests/vpp/perf/lb/regenerate_testcases.py
index 6ff6d4d800..b2108a0ac5 100755
--- a/tests/vpp/perf/lb/regenerate_testcases.py
+++ b/tests/vpp/perf/lb/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Inter and/or its affiliates.
+# Copyright (c) 2021 Inter 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:
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/regenerate_testcases.py b/tests/vpp/perf/nfv_density/dcr_memif/chain/regenerate_testcases.py
index ec754aa261..87521e662d 100755
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/regenerate_testcases.py
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/regenerate_testcases.py b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/regenerate_testcases.py
index ec754aa261..87521e662d 100755
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/regenerate_testcases.py
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/regenerate_testcases.py b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/regenerate_testcases.py
index ec754aa261..87521e662d 100755
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/regenerate_testcases.py
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/regenerate_testcases.py b/tests/vpp/perf/nfv_density/vm_vhost/chain/regenerate_testcases.py
index ec754aa261..87521e662d 100755
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/regenerate_testcases.py
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/regenerate_testcases.py b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/regenerate_testcases.py
index 2754aff34f..a0ab498f84 100755
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/regenerate_testcases.py
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/vpp/perf/srv6/regenerate_testcases.py b/tests/vpp/perf/srv6/regenerate_testcases.py
index f6bbf0a102..b1c6336c72 100755
--- a/tests/vpp/perf/srv6/regenerate_testcases.py
+++ b/tests/vpp/perf/srv6/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/vpp/perf/vm_vhost/regenerate_testcases.py b/tests/vpp/perf/vm_vhost/regenerate_testcases.py
index ec754aa261..87521e662d 100755
--- a/tests/vpp/perf/vm_vhost/regenerate_testcases.py
+++ b/tests/vpp/perf/vm_vhost/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tests/vpp/perf/vts/regenerate_testcases.py b/tests/vpp/perf/vts/regenerate_testcases.py
index f5467bfe93..85a40e61e0 100755
--- a/tests/vpp/perf/vts/regenerate_testcases.py
+++ b/tests/vpp/perf/vts/regenerate_testcases.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/topologies/available/2n_hw_testbed1.yaml.example b/topologies/available/2n_hw_testbed1.yaml.example
index dee8f730de..4155f6eb0a 100644
--- a/topologies/available/2n_hw_testbed1.yaml.example
+++ b/topologies/available/2n_hw_testbed1.yaml.example
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/topologies/available/3n_hw_testbed1.yaml.example b/topologies/available/3n_hw_testbed1.yaml.example
index e476ae05fb..565b8555ab 100644
--- a/topologies/available/3n_hw_testbed1.yaml.example
+++ b/topologies/available/3n_hw_testbed1.yaml.example
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
diff --git a/tox-requirements.txt b/tox-requirements.txt
index 6f56438bcf..ffc760aec5 100644
--- a/tox-requirements.txt
+++ b/tox-requirements.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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: