1564 Commits

Author SHA1 Message Date
Simon Horman
ef8633753f of14: Add OFPQueueDesc
This may be used by queue desc request and reply messages

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-26 23:53:22 +09:00
Simon Horman
7c96df6023 of14: Add OFPQueueDescProp
This may be used by queue desc request and reply messages

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-26 23:53:10 +09:00
Simon Horman
d268e10bf6 of14: table mod with properties
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-26 23:39:41 +09:00
Simon Horman
5a4adf497e of14: Add properties support to flow mod
With this change the initialiser of OFPTableMod now
requires a properties argument. This is incompatible with
Ryu v3.6. If it is important to maintain compatibility
then things can be reworked a little to make the properties
argument optional.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-26 23:39:41 +09:00
Simon Horman
727307cabb of14: Add OFPTableModProp serialization
This will be used by at least the serialisation of
flow mod messages with properties.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-26 23:39:41 +09:00
Simon Horman
5b0bb7f6dd of14: Add table desc unit tests
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-26 23:39:41 +09:00
Simon Horman
41b11296c4 packet_data_generator: of14: Add table desc
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-26 23:39:41 +09:00
Simon Horman
5309a5649f of14: Add table desc request and reply message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-26 23:39:27 +09:00
Simon Horman
60411c3f7a of14: Add OFPTableDesc
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-26 23:39:27 +09:00
Simon Horman
96f7f51762 of14: Add OFPTableModProp
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-26 23:39:27 +09:00
watanabe.fumitaka
81322b7a0a sw test tool: fix missing to receive error of PacketOut
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-26 23:07:58 +09:00
Rob Udechukwu
98f5c2aad0 of13: support OFPAactionExperimenter with data
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-21 15:38:24 +09:00
FUJITA Tomonori
f3f784e01b sw test tool: fix pop_pbb action
"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-21 15:26:55 +09:00
Simon Horman
c566ba192c of14: Document OFPRR_{METER_DELETE, EVICTION} reasons for flow removed message
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-19 20:12:57 +09:00
watanabe.fumitaka
a63daf6caf sw test tool: add test report output
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-19 20:12:50 +09:00
Simon Horman
1250c6d3a3 ofproto: correct typo
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-19 19:00:04 +09:00
YAMAMOTO Takashi
c8b45e18b0 test_add_flow_v12_actions: fix a typo
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-17 22:40:52 +09:00
YAMAMOTO Takashi
2743eb4da5 rename neutron agent from "ofswitch" to "ofagent"
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-17 22:40:36 +09:00
FUJITA Tomonori
2a95c185e1 of13/14: fix OFPFMFC_TABLE_FULL typo
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-17 22:40:18 +09:00
FUJITA Tomonori
4c63a5cf24 ofconfig: add commit and discard_changes operation support
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-17 22:39:54 +09:00
FUJITA Tomonori
f45f534758 of_config: add OFPortStateType class
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
2014-02-14 13:27:32 +09:00
FUJITA Tomonori
78fede3f51 topology: support OF1.2 and 1.4
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
2014-02-13 15:04:50 +09:00
YAMAMOTO Takashi
37fed5c764 handler.register_service: comment
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-11 17:24:43 +09:00
YAMAMOTO Takashi
d5bb06a3f9 use six.add_metaclass
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-11 13:56:40 +09:00
YAMAMOTO Takashi
6f59821b50 pip-requires: sort in alphabetical order
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-11 13:34:45 +09:00
FUJITA Tomonori
f3c7dcbc00 of14: set default attributes for OFPMeterMod
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-10 11:03:35 +09:00
FUJITA Tomonori
ba348e8058 of13: set default attributes for OFPMeterMod
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-10 11:03:34 +09:00
YAMAMOTO Takashi
188d68fcf8 neutron-ofswitch-agent man page
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07 19:53:55 +09:00
YAMAMOTO Takashi
d175ca6f0d setup.cfg: add neutron-ofswitch-agent to console_scrpits
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07 19:53:55 +09:00
YAMAMOTO Takashi
6b972762d2 run_tests.sh: add neutron-ofswitch-agent to PYLINT_INCLUDE
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07 19:53:54 +09:00
fumihiko kakuma
a5e3693908 neutron-ofswitch-agent: neutron agent for ofswitch ML2 mechanism driver
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-07 19:53:53 +09:00
YAMAMOTO Takashi
d00d1498d7 ofproto_v1_3_parser: add a comment about extensions support
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07 19:53:46 +09:00
YAMAMOTO Takashi
4d9382ce7a pbb: add a comment
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07 19:53:41 +09:00
YAMAMOTO Takashi
57d14a3526 of_config_cli: remove a unused import
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07 19:53:36 +09:00
YAMAMOTO Takashi
e3d08bd587 run_tests.sh: add of-config-cli to PYLINT_INCLUDE
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07 19:53:32 +09:00
Wei-Li Tang
3423b2a20d ofctl_v1_3: let action group can be converted to string
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-07 19:53:26 +09:00
Yuichi Ito
4030ec74b2 sw test tool: FIX: return the transaction id when flow entries were deleted
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-07 19:53:19 +09:00
Yuichi Ito
29027c2db4 sw test tool: correct the comparison method to treat instructions as the set
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-07 19:53:12 +09:00
WATANABE Fumitaka
0a2a4b4008 sw test tool: correct error message
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-07 19:52:35 +09:00
watanabe.fumitaka
66f825ac47 sw test tool: remove unnecessary debug code
Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka1@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07 19:49:40 +09:00
FUJITA Tomonori
c6343de851 of12: fix InstructionWriteMetadata json decoder
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-07 08:59:38 +09:00
watanabe.fumitaka
44e9a47fce sw test tool: fix wrong match(ipv6_exthdr) value of test file
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-06 17:16:49 +09:00
watanabe.fumitaka
8244d4f24b sw test tool: fix wrong instruction(write metadata) value of test files
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-06 17:16:48 +09:00
YAMAMOTO Takashi
8801af2974 test_ofctl_v1_3: replace a hack with ProtocolDesc
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06 15:57:52 +09:00
YAMAMOTO Takashi
c01d5d45a8 test_parser_v12: replace a hack with ProtocolDesc
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06 15:57:52 +09:00
YAMAMOTO Takashi
190abc8117 test_ofp_pktinfilter: replace a hack with ProtocolDesc
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06 15:57:52 +09:00
YAMAMOTO Takashi
843e89e7dd ProtocolDesc: provide supported_ofp_version for ofp_handler
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-06 15:57:52 +09:00
YAMAMOTO Takashi
bda747804b ofproto_protocol: fix UnboundLocalError
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-06 15:57:46 +09:00
YAMAMOTO Takashi
6973e84867 tests: add a test case for ofproto_protocol
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-06 15:57:46 +09:00
YAMAMOTO Takashi
b48772504f test_ofp_pktinfilter: simplify
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-06 15:57:46 +09:00