summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2013-05-23docs: fix ryu module importFUJITA Tomonori
readthedocs.org complains about the failure about ryu module import. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-23tests/unit/packet/test_vrrp: add tests for is_valid()YAMADA Hideki
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-23lib/packet/vrrp: fix is_valid()YAMADA Hideki
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-23test_parser_v10: remove tests for __str__YAMADA Hideki
Following errors occur at current master (commit 21692141dc7e8be2d44338ce4eff5af584e4ff8f) ====================================================================== ERROR: test_parser (ryu.tests.unit.ofproto.test_parser_v10.TestOFPFlowRemoved) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 4080, in test_parser eq_(str(cookie['val']), check['cookie']) KeyError: 'cookie' ====================================================================== ERROR: test_parser (ryu.tests.unit.ofproto.test_parser_v10.TestOFPPacketIn) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 3782, in test_parser ok_(self._test_parser()) File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 3774, in _test_parser eq_(str(buffer_id['val']), check['buffer_id']) KeyError: 'buffer_id' ====================================================================== ERROR: test_parser_padding (ryu.tests.unit.ofproto.test_parser_v10.TestOFPPacketIn) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 3785, in test_parser_padding ok_(self._test_parser(True)) File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 3774, in _test_parser eq_(str(buffer_id['val']), check['buffer_id']) KeyError: 'buffer_id' ====================================================================== ERROR: test_str (ryu.tests.unit.ofproto.test_parser_v10.TestOFPQueuePropMinRate) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 2615, in test_str eq_(check['rate'], str(self.rate['val'])) KeyError: 'rate' ====================================================================== ERROR: test_str (ryu.tests.unit.ofproto.test_parser_v10.TestOFPQueuePropNone) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 2564, in test_str eq_(check['property'], str(self.property['val'])) KeyError: 'property' ====================================================================== ERROR: test_parser (ryu.tests.unit.ofproto.test_parser_v10.TestOFPSwitchFeatures) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 3580, in test_parser eq_(check['ports'].find('OFPPhyPort'), 0) KeyError: 'ports' Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-23Merge branch 'master' of github.com:osrg/ryuFUJITA Tomonori
2013-05-18of13: Fix for OFPQueueGetConfigReply/RequestPhilipp Aeschlimann
Signed-off-by: Philipp Aeschlimann <aepp@zhaw.ch> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-18run_tests: make python interpreter overridableYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-18app/gre_tunnel: pylintIsaku Yamahata
> E: 60,18:PortSet.EventTunnelKeyDel.__init__: Undefined variable 'EventTunnelKeyDel' > W: 18,0: Unused import logging Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-18app/quantum_adapter: unbreak quantum changeIsaku Yamahata
Now quantum checks attributes strictly on REST request by the changeset of 61bdda62e8950a9747073e2be7b81cdea0af2f25 Don't send non-standard attribute. > commit 61bdda62e8950a9747073e2be7b81cdea0af2f25 > Author: Jason Zhang <zhesen@nttmcl.com> > Date: Tue Feb 12 18:40:12 2013 -0800 > > Raising error if invalid attribute passed in. > > 400 will be returned when invalid attributes > are passed into Quantum API. > > Fixed the some test cases failed since the > enforcement of invalid attribute checking > > Fixes: bug #1076179 > > Change-Id: I4e9e2891c444f9dcd051f7b325d3c9403b28db86 Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-18of10: sprinkle StringifyMixinYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-18of: StringifyMixinYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-18use dpid_to_str in some placesYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-14tests/ofproto: add unit test for ofproto automatic detectionIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-14ofproto: exception during startup related ofp module detactionIsaku Yamahata
This patch fixes the following exception. ryu/controller/ofp_event.py: update cd /opt/stack/ryu && /opt/stack/ryu/bin/ryu-mana ^Mger --config-file /etc/ryu/ryu.conf || touch "/opt/stack/status/stack/ryu.failur ^Me" > Traceback (most recent call last): > File "/opt/stack/ryu/bin/ryu-manager", line 41, in <module> > from ryu.base.app_manager import AppManager > File "/opt/stack/ryu/ryu/base/app_manager.py", line 22, in <module> > from ryu.controller.handler import register_instance > File "/opt/stack/ryu/ryu/controller/handler.py", line 20, in <module> > from ryu.controller import ofp_event > File "/opt/stack/ryu/ryu/controller/ofp_event.py", line 69, in <module> > for ofp_mods in ofproto.get_ofp_module(): > TypeError: get_ofp_module() takes exactly 1 argument (0 given) Reported-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-15tests/ofproto: add unit test for ofproto automatic detectionIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-15ofproto: exception during startup related ofp module detactionIsaku Yamahata
This patch fixes the following exception. ryu/controller/ofp_event.py: update cd /opt/stack/ryu && /opt/stack/ryu/bin/ryu-mana ^Mger --config-file /etc/ryu/ryu.conf || touch "/opt/stack/status/stack/ryu.failur ^Me" > Traceback (most recent call last): > File "/opt/stack/ryu/bin/ryu-manager", line 41, in <module> > from ryu.base.app_manager import AppManager > File "/opt/stack/ryu/ryu/base/app_manager.py", line 22, in <module> > from ryu.controller.handler import register_instance > File "/opt/stack/ryu/ryu/controller/handler.py", line 20, in <module> > from ryu.controller import ofp_event > File "/opt/stack/ryu/ryu/controller/ofp_event.py", line 69, in <module> > for ofp_mods in ofproto.get_ofp_module(): > TypeError: get_ofp_module() takes exactly 1 argument (0 given) Reported-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-14of13: add missing UINTxx_MAXYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-14controller/ofp_event: don't hardcode supported OFP parser moduleIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-14ofproto: detect supported OFP versions automatically.Isaku Yamahata
And add helper functions to get OFP modules/class for a given OFP version. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-14ofproto_parser: simplify msg_str_attr() a bitIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-13update requirementsYAMAMOTO Takashi
netaddr is used by: ryu/app/tunnel_port_updater.py ryu/lib/packet/vrrp.py Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-11Support bind IPv6 addresses in StreamServerCan Zhang
Use a very loose condition to determine if the address is an IPv6 address or not. Signed-off-by: Can Zhang <can@canx.me> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-11Revert "add eventlet to test requirement"FUJITA Tomonori
This reverts commit e93a3f2d99133422e51fbd531dd58052e8e261a3. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-12ofproto: change the way __str__ is implemented for of-wire messagesYAMAMOTO Takashi
instead of explicit listing of of-wire attributes, use a heuristics to exclude internal attributes. (eg. buf, datapath, etc) this commit changes __str__ outputs. update a test case accordingly. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-10controller: stop catching GreenletExitYAMAMOTO Takashi
no longer necessary after the hub changes. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-10hub: add some more testsYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-10hub: handle GreenletExit internallyYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-10hub: commentYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-10of1.0: simplify NXAction initializationIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-10of1.0: simplify OFPActionVendorIsaku Yamahata
vendor value is available as cls_vendor. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-10of1.0: NXActionHeader should be subclass of OFPActionVendorIsaku Yamahata
Because NXActionHeader is extention to OFPActionVendor. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-04of1.3: fix OFPPortStatus parserYoshihiro Kaneko
A correction same as OF1.2. Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-04of1.3: fix parser of OFPGetAsyncReplyYoshihiro Kaneko
The (un)pack format of OFPGetAsycnReply extracts 6 values. Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-04of1.3: fix serializer of OFPSetAsyncYoshihiro Kaneko
The pack format of OFPSetAsync requires 6 arguments. Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-04of1.3: fix wrong method name in OFPQueueGetConfigRequestYoshihiro Kaneko
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-04of1.3: fix pack string of OFPMeterStatsRequestYoshihiro Kaneko
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-04of1.3: fix wrong class name in OFPGroupFeaturesStatsRequest.__init__()Yoshihiro Kaneko
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-04of1.3: fix attribute name of OFPGroupDescStatsYoshihiro Kaneko
accord with OF1.3.0/1.3.1 spec. Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-04of1.3: fix lacking argument in OFPAggregateStatsRequest.__init__()Yoshihiro Kaneko
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-02add eventlet to test requirementFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-02lib/hub: Event.wait should return its internal flagIsaku Yamahata
'pydoc gevent.event.Event' says > Help on method wait in gevent.event.Event: > > gevent.event.Event.wait = wait(self, timeout=None) unbound gevent.event.Event method > Block until the internal flag is true. > If the internal flag is true on entry, return immediately. Otherwise, > block until another thread calls :meth:`set` to set the flag to true, > or until the optional timeout occurs. > > When the *timeout* argument is present and not ``None``, it should be a > floating point number specifying a timeout for the operation in seconds > (or fractions thereof). > > Return the value of the internal flag (``True`` or ``False``). Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-01of1.0: match accepts partial parametersFUJITA Tomonori
You can pass some of the parameters for OFPMatch. match = OFPMatch(in_port=in_port) Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-01limit the size of ryu app's event queueYAMAMOTO Takashi
otherwise a queue grows too long and consumes much memory on load. the size used in this commit (128) is arbitrary. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-01controller: fix send queue draining againYAMAMOTO Takashi
and this time add comments to explain the intention. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-01sweep the tree to change from gevent to ryu.lib.hubYAMAMOTO Takashi
mostly mechanical changes. also, change the requirement from gevent to eventlet. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-05-01add a threading hub moduleYAMAMOTO Takashi
this provides gevent-like api using eventlet. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-30Ryu 1.9FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-28of1.0: add nx_aggregate_stats supportOHMURA Kei
Signed-off-by: OHMURA Kei <ohmura.kei@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-28of1.0: OFPMatch support keyword-style parametersCan Zhang
Signed-off-by: Can Zhang <can@canx.me> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-28ovs.poller: workaround a bug in eventletYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>