summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2014-02-26of14: Add OFPTableDescSimon Horman
This may be table status and table desc messages. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-26of14: Add OFPTableModPropSimon Horman
This may be table mod, table status and table desc messages. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-26sw test tool: fix missing to receive error of PacketOutwatanabe.fumitaka
Since transaction ID of PacketOut message is not hold, an error message to this PacketOut is not able to be received. This patch fixes it. Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka1@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-21of13: support OFPAactionExperimenter with dataRob Udechukwu
The length check assert was added by FUJITA since the spec says that lenght of data should be a multiple of 8. Signed-off-by: Rob Udechukwu <rnudechu@ncsu.edu> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-21sw test tool: fix pop_pbb actionFUJITA Tomonori
"The Pop PBB header action does not remove the backbone VLAN header (B-TAG)" as described in openflow spec 1.3.3. The format of I-TAG TCI is pcp,..,I-SID,C-DA,C-SA as in 802.1Q-2011 Figure 9-3. Change the test senario, converting from B-MAC/I-TAG/S-TAG/C-TAG/ethertype/Data to C-MAC/S-TAG/C-TAG/ethertype/Data looks more common. Reported-by: Hiroaki KAWAI <kawai@stratosphere.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-19of14: Document OFPRR_{METER_DELETE, EVICTION} reasons for flow removed messageSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-19sw test tool: add test report outputwatanabe.fumitaka
Add following reports to the output of a switch test tool. This report outputs the test item of each error type, and the number of errors. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-19ofproto: correct typoSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-17test_add_flow_v12_actions: fix a typoYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-17rename neutron agent from "ofswitch" to "ofagent"YAMAMOTO Takashi
suggested by some openstack folks. see https://review.openstack.org/#/c/71791 Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-17of13/14: fix OFPFMFC_TABLE_FULL typoFUJITA Tomonori
Reported-by: Morgan Yang <Morgan.Yang@radisys.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Reviewed-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
2014-02-17ofconfig: add commit and discard_changes operation supportFUJITA Tomonori
They are necessary for switches that don't support the feature of modifying 'running' configuration directly; instead, needs to modify 'candidate' configuration and then commit (or discard). Also fix do_get method's comment typo. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Reviewed-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
2014-02-14of_config: add OFPortStateType classFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Reviewed-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
2014-02-13topology: support OF1.2 and 1.4FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Reviewed-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
2014-02-11handler.register_service: commentYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
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>