summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2014-02-11use six.add_metaclassYAMAMOTO Takashi
as suggested by OpenStack Style Guideline. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-11pip-requires: sort in alphabetical orderYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-10of14: set default attributes for OFPMeterModFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-10of13: set default attributes for OFPMeterModFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07neutron-ofswitch-agent man pageYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07setup.cfg: add neutron-ofswitch-agent to console_scrpitsYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07run_tests.sh: add neutron-ofswitch-agent to PYLINT_INCLUDEYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07neutron-ofswitch-agent: neutron agent for ofswitch ML2 mechanism driverfumihiko kakuma
Like ryu-manager, this agent serves Ryu applications and acts an OpenFlow controller to control switches. The neutron agent logic, which we will push to the neutron repo, is implemented as a Ryu application. Implements: OpenStack blueprint ryu-ml2-driver https://blueprints.launchpad.net/neutron/+spec/ryu-ml2-driver Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07ofproto_v1_3_parser: add a comment about extensions supportYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07pbb: add a commentYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07of_config_cli: remove a unused importYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07run_tests.sh: add of-config-cli to PYLINT_INCLUDEYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07ofctl_v1_3: let action group can be converted to stringWei-Li Tang
Signed-off-by: Wei-Li Tang <alextwl@xinguard.com> Reviewed-by: WATANABE Fumitaka <watanabe.fumitaka1@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07sw test tool: FIX: return the transaction id when flow entries were deletedYuichi Ito
OfTester._test_initialize() expects the transaction id as a return value of TargetSw.del_test_flow() for checking the error. but this method at current version does not return the transaction id. this patch gets del_test_flow() to return the transaction id. Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07sw test tool: correct the comparison method to treat instructions as the setYuichi Ito
according to OF spec, the instruction is treated as the set. this means that the order of instructions which flow_stat message returns is inconstant. this patch corrects the comparison method of instructions by sorting in a particular order before comparison. Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com> Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07sw test tool: correct error messageWATANABE Fumitaka
When test tool receives a malformed packet(length value is unusual, for example), detecting differences between expected and received is a failure. In this case, 'Internal error.' is not suitable as a log message and should notify tool receives a malformed packet. Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka1@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07sw test tool: remove unnecessary debug codewatanabe.fumitaka
Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka1@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07of12: fix InstructionWriteMetadata json decoderFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06sw test tool: fix wrong match(ipv6_exthdr) value of test filewatanabe.fumitaka
The value of match(ipv6_exthdr) of the of13/match/39_IPV6_EXTHDR.json test file is wrong. The correct value matching to a ipv6(ext_hdrs=[hop_opts,auth]) is ipv6_exthdr=001000100=68. This patch corrects it. Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka1@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06sw test tool: fix wrong instruction(write metadata) value of test fileswatanabe.fumitaka
The value of instruction(write metadata) of the test file is wrong. In the table-miss test of of13/match/02_METADATA* test files, metadata=255 or 240(mask=0xf0) is specified as match. In order to make it table-miss, it needed to write metadata except 255. Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka1@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06test_ofctl_v1_3: replace a hack with ProtocolDescYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06test_parser_v12: replace a hack with ProtocolDescYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06test_ofp_pktinfilter: replace a hack with ProtocolDescYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06ProtocolDesc: provide supported_ofp_version for ofp_handlerYAMAMOTO Takashi
Reported-by: watanabe.fumitaka Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06ofproto_protocol: fix UnboundLocalErrorYAMAMOTO Takashi
fix the following crash. from Yuichi Ito. minor editorialization by me. > Traceback (most recent call last): > File "/usr/local/bin/ryu-manager", line 9, in <module> > load_entry_point('ryu==3.6', 'console_scripts', 'ryu-manager')() > File "/usr/local/lib/python2.7/dist-packages/ryu/cmd/manager.py", line 73, in main > services.extend(app_mgr.instantiate_apps(**contexts)) > File "/usr/local/lib/python2.7/dist-packages/ryu/base/app_manager.py", line 368, in instantiate_apps > self._instantiate(app_name, cls, *args, **kwargs) > File "/usr/local/lib/python2.7/dist-packages/ryu/base/app_manager.py", line 350, in _instantiate > ofproto_protocol.set_app_supported_versions(cls.OFP_VERSIONS) > File "/usr/local/lib/python2.7/dist-packages/ryu/ofproto/ofproto_protocol.py", line 40, in set_app_supported_versions > _versions &= set(vers) > UnboundLocalError: local variable '_versions' referenced before assignment Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06tests: add a test case for ofproto_protocolYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06test_ofp_pktinfilter: simplifyYAMAMOTO Takashi
stop inheriting RyuApp class to make the implementation of other tests (tests.cmd.test_manager) easiler. this module is for packet_in_filter decorator and does not start ryu app anyway. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06OFPGroupMod: Fix OFPGC_* typo in examplesWei-Li Tang
OFPFC_* enumerations are declared for flow mod commands, not for groups. Signed-off-by: Wei-Li Tang <alextwl@xinguard.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-05test_parser: replace a hack with ProtocolDescYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-05controller: use ProtocolDescYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-05ofproto_protocol: provide a class to describe an openflow versionYAMAMOTO Takashi
currently OFP classes takes the Datapath object, which is too complex for this purpose. this class, ProtocolDesc, is intended to be a simpler replacement for that. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Reviewed-by: Satoshi Kobayashi <satoshi-k@stratosphere.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-05ofproto_v1_3_parser: import ofproto_v1_3 as 'ofproto'YAMAMOTO Takashi
as proposed while ago, import ofproto_v1_3 with a version agnostic name to reduce differences between parser modules. the name 'ofproto' was chosen to match with ofproto_v1_4_parser. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-05ofproto_v1_2_parser: import ofproto_v1_2 as 'ofproto'YAMAMOTO Takashi
as proposed while ago, import ofproto_v1_2 with a version agnostic name to reduce differences between parser modules. the name 'ofproto' was chosen to match with ofproto_v1_4_parser. update tests accordingly. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-05ofproto_v1_0_parser: import ofproto_v1_0 as 'ofproto'YAMAMOTO Takashi
as proposed while ago, import ofproto_v1_0 with a version agnostic name to reduce differences between parser modules. the name 'ofproto' was chosen to match with ofproto_v1_4_parser. update tests accordingly. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-04of14: Add to ofproto unit testsSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-04of14: Add port mod message supportSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-04of14: Add queue stats request and reply message supportSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-04of14: Add port stats request and reply message supportSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-04of14: Add generic OFPropBase classSimon Horman
Add generic OFPropBase class and make OFPPortProp a subclass of it. This is to allow other properties classes to be implemented as subclasses of OFPPropBase, simplifying their implementation. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-04of14: Rename OFPPortDescPropUnknown as OFPPortPropUnknownSimon Horman
This corrects what appears to be a typo as OFPPortDescPropUnknown is never called but OFPPortPropUnknown, which does not exist, is called. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-04of14: Add port status message supportSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-04of14: Add meter mod message supportSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-04of14: Add OFPMeterBandDscpRemark and OFPMeterBandExperimenterSimon Horman
These will be used my meter mod message support which is added by a subsequent patch. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-04of14: Move OFPMeterBand* to above OFPMeterConfigStatsSimon Horman
This is a purely cosmetic change to move some code to the same location it is found in the of1.3 implementation, aiding comparison between the two codebases. It also move the code closer to where it is used. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-04of14: Add table features stats request and reply message supportSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-04of14: Add _ordered_fields to .4 OFPMatchSimon Horman
This appears to be necessary for wire tests to pass if matches are in an order different from that defined by Ryu. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-04of14: Fix OFPInstructionWriteMetadata JSON decodeSimon Horman
This is in line with 4a394aae2f1a3b82 ("Fix OFPInstructionWriteMetadata JSON decode") which fixes the following for OF1.3: CLS <class 'ryu.ofproto.ofproto_v1_3_parser.OFPInstructionWriteMetadata'> ARG {u'metadata_mask': 18446744073709551615L, u'type': 2, u'len': 24, u'metadata': 18446744069414584320L} KWARG {u'type_': 2, u'metadata_mask': 18446744073709551615L, u'len_': 24, u'metadata': 18446744069414584320L} Traceback (most recent call last): File "a.py", line 19, in <module> msg = ofproto_parser.ofp_msg_from_jsondict(dp, m) File "/Users/fujita/git/ryu/ryu/ofproto/ofproto_parser.py", line 100, in ofp_msg_from_jsondict return cls.from_jsondict(v, datapath=dp) File "/Users/fujita/git/ryu/ryu/lib/stringify.py", line 291, in from_jsondict kwargs = cls._restore_args(_mapdict_kv(decode, dict_)) File "/Users/fujita/git/ryu/ryu/lib/stringify.py", line 46, in <lambda> _mapdict_kv = lambda f, d: dict([(k, f(k, v)) for k, v in d.items()]) File "/Users/fujita/git/ryu/ryu/lib/stringify.py", line 290, in <lambda> decode = lambda k, x: cls._decode_value(k, x, decode_string) File "/Users/fujita/git/ryu/ryu/lib/stringify.py", line 234, in _decode_value return cls._get_decoder(k, decode_string)(json_value) File "/Users/fujita/git/ryu/ryu/lib/stringify.py", line 242, in _decode v = map(_decode, json_value) File "/Users/fujita/git/ryu/ryu/lib/stringify.py", line 245, in _decode v = cls.obj_from_jsondict(json_value) File "/Users/fujita/git/ryu/ryu/lib/stringify.py", line 223, in obj_from_jsondict return obj_cls.from_jsondict(v) File "/Users/fujita/git/ryu/ryu/lib/stringify.py", line 293, in from_jsondict return cls(**dict(kwargs, **additional_args)) TypeError: __init__() got an unexpected keyword argument 'type_' Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-04of14: set default attributes for OFPMultipartRequest subclassesSimon Horman
This is in keeping with 1368fd6899722a9c ("of13: set default attributes for OFPMultipartRequest subclasses"). Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-04of14: add some assertionsSimon Horman
This is in keeping with e08ac471d44db846 ("ofproto_v1_3_parser: put some assertions"). Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-03Ryu 3.6FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-04 11:54:34 +0000