From a0a1bdba6245c685898bab5007de28452bbd2d27 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 20 Aug 2019 09:51:54 +0000 Subject: Add: avf-dot1q testcases + Few fixes in doc + Align testcases Signed-off-by: Peter Mikus Change-Id: I5575db8255a74fd46f37d5cc2637b9b4448bcd7f --- resources/libraries/robot/shared/interfaces.robot | 8 +- ...trex-sl-dot1qip4-vlan1ip4src254ip4dst254-bvi.py | 118 +++++++++++++++++++++ .../trex-sl-dot1qip4-vlan1ip4src254ip4dst254.py | 4 +- 3 files changed, 126 insertions(+), 4 deletions(-) create mode 100755 resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254-bvi.py (limited to 'resources') diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot index e249cd5d4e..55d0a3d844 100644 --- a/resources/libraries/robot/shared/interfaces.robot +++ b/resources/libraries/robot/shared/interfaces.robot @@ -252,10 +252,14 @@ | | ... | | ${dut_str}= | Convert To Lowercase | ${dut} | | :FOR | ${id} | IN RANGE | 1 | ${count} + 1 +| | | ${if1_vlan}= | Get Variable Value | \${${dut_str}_vlan1} | | | ${default}= | Evaluate | ${100} + ${id} - ${1} -| | | ${if1_vlan}= | Get Variable Value | \${${dut_str}_vlan1} | ${default} +| | | ${if1_vlan}= | Set Variable If | '${if1_vlan}' == '${NONE}' +| | | ... | ${default} | ${if1_vlan} +| | | ${if2_vlan}= | Get Variable Value | \${${dut_str}_vlan2} | | | ${default}= | Evaluate | ${200} + ${id} - ${1} -| | | ${if2_vlan}= | Get Variable Value | \${${dut_str}_vlan2} | ${default} +| | | ${if2_vlan}= | Set Variable If | '${if2_vlan}' == '${NONE}' +| | | ... | ${default} | ${if2_vlan} | | | ${if1_name} | ${if1_index}= | Run Keyword If | | | ... | ${create} or ${id} == ${1} | | | ... | Create Vlan Subinterface diff --git a/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254-bvi.py b/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254-bvi.py new file mode 100755 index 0000000000..24deddf694 --- /dev/null +++ b/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254-bvi.py @@ -0,0 +1,118 @@ +# Copyright (c) 2019 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Stream profile for T-rex traffic generator. + +Stream profile: + - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time. + - Packet: ETH / DOT1Q / IP / + - Direction 0 --> 1: + - Destination MAC address: ba:dc:00:ff:ee:01 + - VLAN range: 100 + - Source IP address range: 10.10.10.1 - 10.10.10.254 + - Destination IP address range: 20.20.20.1 - 20.20.20.254 + - Direction 1 --> 0: + - Destination MAC address: ba:dc:00:ff:ee:01 + - VLAN range: 200 + - Source IP address range: 20.20.20.1 - 20.20.20.254 + - Destination IP address range: 10.10.10.1 - 10.10.10.254 +""" + +from trex.stl.api import * +from profile_trex_stateless_base_class import TrafficStreamsBaseClass + + +class TrafficStreams(TrafficStreamsBaseClass): + """Stream profile.""" + + def __init__(self): + """Initialization and setting of streams' parameters.""" + + super(TrafficStreamsBaseClass, self).__init__() + + # VLAN IDs + self.p1_vlan_start = 100 + self.p2_vlan_start = 200 + + # IPs used in packet headers. + self.p1_src_start_ip = '10.10.10.1' + self.p1_src_end_ip = '10.10.10.254' + + self.p1_dst_start_ip = '20.20.20.1' + self.p1_dst_end_ip = '20.20.20.254' + + self.p2_src_start_ip = '20.20.20.1' + self.p2_src_end_ip = '20.20.20.254' + + self.p2_dst_start_ip = '10.10.10.1' + self.p2_dst_end_ip = '10.10.10.254' + + def define_packets(self): + """Defines the packets to be sent from the traffic generator. + + Packet definition: | ETH | DOT1Q | IP | + + :returns: Packets to be sent from the traffic generator. + :rtype: tuple + """ + + # Direction 0 --> 1 + base_pkt_a = (Ether(dst='ba:dc:00:ff:ee:01') / + Dot1Q(vlan=self.p1_vlan_start) / + IP(src=self.p1_src_start_ip, + dst=self.p1_dst_start_ip, + proto=61)) + # Direction 1 --> 0 + base_pkt_b = (Ether(dst='ba:dc:00:ff:ee:01') / + Dot1Q(vlan=self.p2_vlan_start) / + IP(src=self.p2_src_start_ip, + dst=self.p2_dst_start_ip, + proto=61)) + + # Direction 0 --> 1 + vm1 = STLScVmRaw([STLVmFlowVar(name="ip_src", + min_value=self.p1_src_start_ip, + max_value=self.p1_src_end_ip, + size=4, op="random"), + STLVmWrFlowVar(fv_name="ip_src", pkt_offset="IP.src"), + STLVmFlowVar(name="ip_dst", + min_value=self.p1_dst_start_ip, + max_value=self.p1_dst_end_ip, + size=4, op="random"), + STLVmWrFlowVar(fv_name="ip_dst", pkt_offset="IP.dst"), + STLVmFixIpv4(offset="IP")]) + # Direction 1 --> 0 + vm2 = STLScVmRaw([STLVmFlowVar(name="ip_src", + min_value=self.p2_src_start_ip, + max_value=self.p2_src_end_ip, + size=4, op="random"), + STLVmWrFlowVar(fv_name="ip_src", pkt_offset="IP.src"), + STLVmFlowVar(name="ip_dst", + min_value=self.p2_dst_start_ip, + max_value=self.p2_dst_end_ip, + size=4, op="random"), + STLVmWrFlowVar(fv_name="ip_dst", pkt_offset="IP.dst"), + STLVmFixIpv4(offset="IP")]) + + return base_pkt_a, base_pkt_b, vm1, vm2 + + +def register(): + """Register this traffic profile to T-rex. + + Do not change this function. + + :returns: Traffic streams. + :rtype: Object + """ + return TrafficStreams() diff --git a/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254.py b/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254.py index be58eb4e3e..bf5151905c 100755 --- a/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254.py +++ b/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254.py @@ -65,13 +65,13 @@ class TrafficStreams(TrafficStreamsBaseClass): """ # Direction 0 --> 1 - base_pkt_a = (Ether(dst='ba:dc:00:ff:ee:01') / + base_pkt_a = (Ether() / Dot1Q(vlan=self.p1_vlan_start) / IP(src=self.p1_src_start_ip, dst=self.p1_dst_start_ip, proto=61)) # Direction 1 --> 0 - base_pkt_b = (Ether(dst='ba:dc:00:ff:ee:01') / + base_pkt_b = (Ether() / Dot1Q(vlan=self.p2_vlan_start) / IP(src=self.p2_src_start_ip, dst=self.p2_dst_start_ip, -- cgit 1.2.3-korg