From: Yaroslav Brustinov Date: Wed, 31 Aug 2016 00:18:47 +0000 (+0300) Subject: fix typo in static routing IP. X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=7af70d850f003d76cb57ce7386187dd853e44059;p=trex.git fix typo in static routing IP. fix search path of Sphinx --- diff --git a/trex_config.asciidoc b/trex_config.asciidoc index c08cac4d..42f21b62 100755 --- a/trex_config.asciidoc +++ b/trex_config.asciidoc @@ -116,7 +116,7 @@ image::images/TrexConfig.png[title="TRex/Router setup"] == TRex configuration * TRex act as both client and server side -* TRex port mac addrees should configure correctly, so packet generated from port 1 will get to 2 and vice-versa +* TRex port mac address should configure correctly, so packet generated from port 1 will get to 2 and vice-versa * To use the config file you can add this switch `--cfg [file]` * Or edit the configuration file in `/etc/trex_cfg.yaml` @@ -130,14 +130,14 @@ image::images/TrexConfig.png[title="TRex/Router setup"] src_mac : [0x0,0x0,0x0,0x4,0x0,0x00] <4> ---- <1> Correspond to TRex port 0 - should be Router TenG 0/0/0 mac-address -<2> Should be distinc mac-addrees, router should be configure to sent to this mac-addrees +<2> Should be distinc mac-address, router should be configure to sent to this mac-address <3> Correspond to TRex port 1 - should be Router TenG 0/0/1 mac-address -<4> Should be distinc mac-addrees, router should be configure to sent to this mac-addrees +<4> Should be distinc mac-address, router should be configure to sent to this mac-address == Router configuration PBR part 1 -* Router moves packets from port 0->1 and 1->0 without looking into IP addrees. +* Router moves packets from port 0->1 and 1->0 without looking into IP address. * TenG 0/0/0 <-> TenG 0/0/1 @@ -161,11 +161,11 @@ interface TenGigabitEthernet0/0/1 load-interval 30 ! ---- -<1> Configure mac-addrees to match TRex destination port-0 +<1> Configure mac-address to match TRex destination port-0 <2> Set MTU -<3> Set an ip addrees ( routing can't work without this) +<3> Set an ip address ( routing can't work without this) <4> Configure PBR policy - see next slide -<5> Configure mac-addrees to match TRex destination port-1 +<5> Configure mac-address to match TRex destination port-1 == Router configuration PBR part 2 @@ -186,16 +186,16 @@ route-map p2_to_p1 permit 10 == Router configuration PBR part 3 -* What about destination mac-address it should be TRex source mac-addrees? -* The folowing configuration addrees it +* What about destination mac-address it should be TRex source mac-address? +* The folowing configuration address it [source,python] ---- arp 11.11.11.12 0000.0002.0000 ARPA <1> arp 12.11.11.12 0000.0004.0000 ARPA <2> ---- -<1> Destination mac-addrees of packets sent from If 0/0/0 is matched to TRex source mac-address port-0 -<2> Destination mac-addrees of packets sent from If 0/0/1 is matched to TRex source mac-address port-1 +<1> Destination mac-address of packets sent from If 0/0/0 is matched to TRex source mac-address port-0 +<2> Destination mac-address of packets sent from If 0/0/1 is matched to TRex source mac-address port-1 == Static-route configuration - TRex @@ -233,8 +233,8 @@ interface TenGigabitEthernet0/0/1 mtu 4000 ip address 22.11.11.11 255.255.255.0 ! -ip route 16.0.0.0 255.0.0.0 22.11.11.12 <1> -ip route 48.0.0.0 255.0.0.0 11.11.11.12 <2> +ip route 16.0.0.0 255.0.0.0 11.11.11.12 <1> +ip route 48.0.0.0 255.0.0.0 22.11.11.12 <2> ---- <1> Match the range of TRex YAML ( client side 0/0/0 ) <2> Match the range of TRex YAML ( server side 0/0/1) @@ -294,7 +294,7 @@ csi-mcp-asr1k-40(config)#ipv6 route 4000::/64 2001::2 csi-mcp-asr1k-40(config)#ipv6 route 5000::/64 3001::2 ---- <1> Enable ipv6 -<2> Add ipv6 addrees +<2> Add ipv6 address <3> Add pbr <4> Enable ipv6 routing <5> Mac-addr setting should be like TRex diff --git a/ws_main.py b/ws_main.py index 2a534dfc..8b2f99b6 100755 --- a/ws_main.py +++ b/ws_main.py @@ -248,7 +248,7 @@ def options(opt): def configure(conf): conf.find_program('asciidoc', path_list='/usr/bin/', var='ASCIIDOC') - conf.find_program('sphinx-build', path_list='/usr/local/bin/', var='SPHINX') + conf.find_program('sphinx-build', path_list='~/.local/bin /usr/local/bin/ /usr/bin', var='SPHINX') pass; def convert_to_pdf(task): @@ -797,7 +797,8 @@ def build_cp_docs (task): if not trex_core_git_path: # there exists a default directory or the desired ENV variable. return 1 trex_core_docs_path = os.path.abspath(os.path.join(trex_core_git_path, 'scripts', 'automation', 'trex_control_plane', 'doc')) - build_doc_cmd = shlex.split("/usr/local/bin/sphinx-build -W -b {bld} {src} {dst}".format( + build_doc_cmd = shlex.split("{sph} -W -b {bld} {src} {dst}".format( + sph= task.env['SPHINX'], bld= "html", src= ".", dst= out_dir) @@ -811,7 +812,8 @@ def build_stl_cp_docs (task): if not trex_core_git_path: # there exists a default directory or the desired ENV variable. return 1 trex_core_docs_path = os.path.abspath(os.path.join(trex_core_git_path, 'scripts', 'automation', 'trex_control_plane', 'doc_stl')) - build_doc_cmd = shlex.split("/usr/local/bin/sphinx-build -W -b {bld} {src} {dst}".format( + build_doc_cmd = shlex.split("{sph} -W -b {bld} {src} {dst}".format( + sph= task.env['SPHINX'], bld= "html", src= ".", dst= out_dir)