summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xrelease_notes.asciidoc1
-rwxr-xr-xtrex_config.asciidoc33
2 files changed, 16 insertions, 18 deletions
diff --git a/release_notes.asciidoc b/release_notes.asciidoc
index 7cd707f2..b37e467e 100755
--- a/release_notes.asciidoc
+++ b/release_notes.asciidoc
@@ -41,6 +41,7 @@ See link:trex_manual.html#_configuration_yaml_parameter_of_cfg_option[here] and
* link:https://trex-tgn.cisco.com/youtrack/issue/trex-253[trex-253]
* link:https://trex-tgn.cisco.com/youtrack/issue/trex-212[trex-212]
+* link:https://trex-tgn.cisco.com/youtrack/issue/trex-251[trex-251]
== Release 2.09 ==
diff --git a/trex_config.asciidoc b/trex_config.asciidoc
index 5fc5a0fc..742b9968 100755
--- a/trex_config.asciidoc
+++ b/trex_config.asciidoc
@@ -135,17 +135,14 @@ Full description of config file parameters can be found in the manual.
----
- port_limit : 2
port_info :
- - default_gw : 11.11.11.1 <1>
- ip : 11.11.11.2 <2>
- - default_gw : 12.12.12.1 <3>
- ip : 12.12.12.2 <4>
+ - default_gw : 11.11.11.1 #<1>
+ ip : 11.11.11.2 #<2>
+ - default_gw : 12.12.12.1 #<3>
+ ip : 12.12.12.2 #<4>
----
-
-<1> TRex port 0 config- should be router's TenG 0/0/0 IP.
-TRex will try to resolve this address by sending ARP request.
+<1> TRex port 0 config- should be router's TenG 0/0/0 IP. TRex will try to resolve this address by sending ARP request.
<2> Next hop of router's TenG 0/0/0. TRex will send gratuitous ARP for this address.
-<3> TRex port 1 config- should be router's TenG 0/0/1 IP.
-TRex will try to resolve this address by sending ARP request.
+<3> TRex port 1 config- should be router's TenG 0/0/1 IP. TRex will try to resolve this address by sending ARP request.
<4> Next hop of router's TenG 0/0/0. TRex will send gratuitous ARP for this address.
== TRex emulated server/client IPs definition in traffic config file
@@ -253,10 +250,10 @@ file must contain the following (instead of the ``ip'' and ``default_gw'').
----
- port_limit : 2
port_info : # set eh mac addr
- - dest_mac : [0x0,0x0,0x0,0x1,0x0,0x0] <1>
- src_mac : [0x0,0x0,0x0,0x2,0x0,0x0] <2>
- - dest_mac : [0x0,0x0,0x0,0x3,0x0,0x0] <3>
- src_mac : [0x0,0x0,0x0,0x4,0x0,0x0] <4>
+ - dest_mac : [0x0,0x0,0x0,0x1,0x0,0x0]
+ src_mac : [0x0,0x0,0x0,0x2,0x0,0x0]
+ - dest_mac : [0x0,0x0,0x0,0x3,0x0,0x0]
+ src_mac : [0x0,0x0,0x0,0x4,0x0,0x0]
----
=============================================================================
. Should be Router's TenG 0/0/0 mac-address.
@@ -269,8 +266,8 @@ file must contain the following (instead of the ``ip'' and ``default_gw'').
[source,python]
----
- arp 12.12.12.2 0000.0002.0000 ARPA <1>
- arp 11.11.11.2 0000.0004.0000 ARPA <2>
+ arp 12.12.12.2 0000.0002.0000 ARPA #<1>
+ arp 11.11.11.2 0000.0004.0000 ARPA #<2>
----
<1> TRex port 0 source mac-address.
<2> TRex port 1 source mac-address.
@@ -299,9 +296,9 @@ interface TenGigabitEthernet1/0/0
ip address 11.11.11.1 255.255.255.0
ip policy route-map p1_to_p2
load-interval 30
- ipv6 enable #<1>
- ipv6 address 2001:DB8:1111:2222::1/64 #<2>
- ipv6 policy route-map ipv6_p1_to_p2 #<3>
+ ipv6 enable #<1>
+ ipv6 address 2001:DB8:1111:2222::1/64 #<2>
+ ipv6 policy route-map ipv6_p1_to_p2 #<3>
!