Merge remote-tracking branch 'upstream/master'

peteryui · Sep 2, 2014 · 1e71b4b · 1e71b4b
2 parents aa0f638 + 6fd6f46
commit 1e71b4b
Show file tree

Hide file tree

Showing 17 changed files with 11,936 additions and 3,109 deletions.
diff --git a/en/source/images/rest_router/fig4.svg b/en/source/images/rest_router/fig4.svg
diff --git a/en/source/sources/link_aggregation.py b/en/source/sources/link_aggregation.py
@@ -28,12 +28,7 @@
     c0.start()
     s1.start([c0])
 
-    net.terms.append(makeTerm(c0))
-    net.terms.append(makeTerm(s1))
-    net.terms.append(makeTerm(h1))
-    net.terms.append(makeTerm(h2))
-    net.terms.append(makeTerm(h3))
-    net.terms.append(makeTerm(h4))
+    net.startTerms()
 
     CLI(net)
 

diff --git a/en/source/sources/spanning_tree.py b/en/source/sources/spanning_tree.py
@@ -34,13 +34,7 @@
     s2.start([c0])
     s3.start([c0])
 
-    net.terms.append(makeTerm(c0))
-    net.terms.append(makeTerm(s1))
-    net.terms.append(makeTerm(s2))
-    net.terms.append(makeTerm(s3))
-    net.terms.append(makeTerm(h1))
-    net.terms.append(makeTerm(h2))
-    net.terms.append(makeTerm(h3))
+    net.startTerms()
 
     CLI(net)
 

diff --git a/en/source/spanning_tree.rst b/en/source/spanning_tree.rst
@@ -172,7 +172,40 @@ Source name: ``simple_switch_stp_13.py``
 .. literalinclude:: sources/simple_switch_stp_13.py
 
 
+.. NOTE::
+
+    If using the Open vSwitch, this application dose not wrok well depending
+    on the Open vSwitch's settings or version.
+    Open vSwitch has the STP implementation, but if this option is disabled
+    (by default), Open vSwitch drops the STP (BPDU) packets with the dest mac
+    address "01:80:c2:00:00:00" specified in IEEE 802.1D.
+    For only executing this application, you can avoid this constraint by
+    modifying the source code as follows.
+
+    ryu/ryu/lib/packet/bpdu.py:
+
+    .. rst-class:: sourcecode
+
+    ::
+
+        # BPDU destination
+        #BRIDGE_GROUP_ADDRESS = '01:80:c2:00:00:00'
+        BRIDGE_GROUP_ADDRESS = '01:80:c2:00:00:0e'
+
+    Then, execute the following commands to affect the modification.
+
+    .. rst-class:: console
+
+    ::
 
+        $ cd ryu
+        $ sudo python setup.py install
+        running install
+        ...
+        ...
+        running install_scripts
+        Installing ryu-manager script to /usr/local/bin
+        Installing ryu script to /usr/local/bin
 
 
 Configuring the Experimental Environment

diff --git a/en/source/switch_test_tool.rst b/en/source/switch_test_tool.rst
@@ -224,13 +224,13 @@ The test tool is executed by the following command.
 ..
 
 
-    ===================== ==================================== =====================
-    Option                Explanation                          Default value
-    ===================== ==================================== =====================
-    --test-switch-target  Data path ID of test target switch   0000000000000001
-    --test-switch-tester  Data path ID of auxiliary switch     0000000000000002
-    --test-switch-dir     Directory path of test pattern file  ryu/tests/switch/of13
-    ===================== ==================================== =====================
+    ========================= ==================================== =====================
+    Option                    Explanation                          Default value
+    ========================= ==================================== =====================
+    ``--test-switch-target``  Data path ID of test target switch   0000000000000001
+    ``--test-switch-tester``  Data path ID of auxiliary switch     0000000000000002
+    ``--test-switch-dir``     Directory path of test pattern file  ryu/tests/switch/of13
+    ========================= ==================================== =====================
 
 
 .. NOTE::

diff --git a/ja/source/igmp_snooping.rst b/ja/source/igmp_snooping.rst
@@ -829,7 +829,7 @@ host: h2s1:
 
     root@ryu-vm:~# vlc-wrapper sample.mov --sout udp:225.0.0.1 --loop
 
-すると、「225.0.0.1」のマルチキャストグループに参加しているh1s2、h3s2、h1s3
+すると、「225.0.0.1」のマルチキャストグループに参加しているh1s2、h3s2、h3s1
 の各ホストで実行しているVLCに、マルチキャストサーバで配信している動画が再生さ
 れます。「225.0.0.2」に参加しているh2s2では動画は再生されません。