summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2016-02-27app/ofctl_rest: support OpenFlow1.4Minoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-18ofproto: Fixes invalid async config property typesMinoru TAKAHASHI
The following types are presents in Openflow Spec v1.4.0 and 1.4.1. OFPTFPT_EXPERIMENTER_SLAVE = 0xFFFE OFPTFPT_EXPERIMENTER_MASTER = 0xFFFF Prefix of async config property type should be 'OFPACPT_' but the above are starting with 'OFPTFPT_'. Because these types have been fixed in Openflow v1.5.0, this patch fixes the above types in ofproto_v1_4.py as follows. OFPTFPT_EXPERIMENTER_SLAVE = 0xFFFE <-- treated as deprecated[*1] OFPTFPT_EXPERIMENTER_MASTER = 0xFFFF <-- treated as deprecated[*1] OFPACPT_EXPERIMENTER_SLAVE = 0xFFFE OFPACPT_EXPERIMENTER_MASTER = 0xFFFF [*1] OFPTFPT_EXPERIMENTER_SLAVE/MASTER are left in ofproto_v1_4.py for backward compatibility. Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-18simple_switch: Separate simple_switch for beginnersIWASE Yusuke
simple_switch_* apps have conflicting two faces of its purpose. One is the example apps for beginners, the other is the utility apps for the L2 switching in the user environments. These are difficult to be compatible. This patch adds an example app for begginers and separates from simple_switch_* apps. This makes it easy to improve the L2 switching function of simple_switch_* apps. To simplify example_switch_13, the following features are dropped from simple_switch_* apps. - FlowMod and Packet-Out messages using "buffer_id". - Checking the expected "miss_send_length" field. - Ignoring the LLDP packets Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-18drop python2.6 supportFUJITA Tomonori
The Python core team[*1] stopped supporting python 2.6. Some Python libraries started following the same path and trying to support 2.6 becomes painful... For example, most of you already noticed, oslo.config dropped 2.6 support. I tried to work around it with the following commit: https://github.com/osrg/ryu/commit/22501710983fb79a8a337e6bf650821efdc7cf59 But this forces users of decent distributions (e.g Ubuntu 14.04) to upgrade pip (old pip versions can't understand version conditions). [*1] http://www.curiousefficiency.org/posts/2015/04/stop-supporting-python26.html Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-18Fix i386 test failuresCorey Bryant
Signed-off-by: Corey Bryant <corey.bryant@canonical.com> Reviewed-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-10test_parser: add an NXActionRegLoad testIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-10packet_data_generator3: generate an NXActionRegLoad packetIWAMOTO Toshihiro
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-10Implement NXActionRegLoadIWAMOTO Toshihiro
The OpenStack Neutron's of_interface code generates flows with NXActionRegLoad. It's not required but better to be able to parse them. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-10test_parser: Fix ofp_multipart_type in OFPFlowStatsRequestIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-10ofproto_v1_5_parser: Add missing field in OFPMeterFeaturesStatsIWASE Yusuke
"features" field is introduced in OpenFlow 1.5, but this field is not defined in ofproto_v1_5_parser.py. This patch adds this missing field. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-10ofproto_v1_5_parser: Fix unresolved structure referencesIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-10test_parser: Add missing packet data for OFP15IWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-10tox: Adapt to PyPy interpreterIWASE Yusuke
Note: Though tests may not be enough, as far as running unit test, this patch makes compatible with PyPy interpreter. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-10of12/3/4/5: fix to_jsondict of OFPActionSetFieldMinoru TAKAHASHI
Some fields missing in the JSON dict that to_jsondict of OFPActionSetField is returnd. This patch fixes this problem. Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-10protocols/bgp: Log socket creation errorJason Kölker
Helpful to track down why the bgp server is stopping when the user running ryu does not have CAP_NET_BIND_SERVICE. Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-02Ryu 3.30FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-01Update conntrack test json and binary packetsIWAMOTO Toshihiro
Ovs has changed the definition of conntrack flags in commit 63bc9fb1c69fa81f3b30c2669d25962da3119d0f, and packet_data_generator3 now generates different test data. Update the data and corresponding json data accordingly. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-01test_parser: add conntrack NAT testsIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-01packet_data_generator3: add a couple of conntrack packetsIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-01Implement NXActionNATIWAMOTO Toshihiro
This action is for the conntrack Nicira extension. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-01rest_router: Ensure that usage of icmp.dest_unreach and icmp.TimeExceeded ↵Victor Orlikowski
complies with RFC 4884 When using the icmp.dest_unreach and icmp.TimeExceeded classes, we should ensure that it is in compliance with RFC 4884. As such, the data_len parameter passed to the constructor of each should be interpreted in 32 bit units. Furthermore - any data that is passed in must be zero padded to a 32 bit boundary. The only sample application known to use either of these types is rest_router. This patch corrects its use of these classes. Signed-off-by: Victor J. Orlikowski <vjo@duke.edu> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-31packet: Better validate parameters to constructors better icmpVictor Orlikowski
According to RFC 4884 (which supersedes RFC 792), the Destination Unreachable and Time Exceeded ICMP message get a new “length” field. This length field, for ICMPv4, is interpreted in 32 bit units. In the constructor, we cannot validate that the length specified matches the length of the data passed; the length may need to be larger (in 32 bit units) in order to accommodate the data that is actually being sent. We *should*, however, ensure that the data_len parameter passed fits into a single byte. It may make sense to document the fact that the length is specified 32 bit units, for when users of the icmp class get a ValueError back from these constructors. Signed-off-by: Victor J. Orlikowski <vjo@duke.edu> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-31doc: remove obsolete OpenStack infoFUJITA Tomonori
ofagent is obsolete. Ryu became the part of OVS agent. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-31bgp: Clean up syntax in services/protocols/bgp/operator/views/base.py to ↵Victor Orlikowski
avoid SyntaxErrors When byte-compiled, base.py in the bgp protocol service generates a large number of SyntaxErrors for me. This patch cleans up the SyntaxErrors, while retaining the original (intended?) semantics. Signed-off-by: Victor J. Orlikowski <vjo@duke.edu> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-31Reconnected event additions and cleanupsVictor Orlikowski
This patch adds ports to the EventDPReconnected in dpset, and adds an EventSwitchReconnected to the topology module. Signed-off-by: Victor J. Orlikowski <vjo@duke.edu> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-31test: Yet another typo fixVictor Orlikowski
This patch merely cleans up a typo. Signed-off-by: Victor J. Orlikowski <vjo@duke.edu> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-31test: ImportError fix, error caused by unordered import LinkYgor Amaral
Signed-off-by: Ygor Amaral <ygor.amaral@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-31topology: Make sure the last IP in the list is the newest IP.Chia-Lin Cho
In the wireless network, when host attaches AP, it will send many ARP requests which Src IP were used before. This causes the last IP in the list may not be the newest one and we also cannot know which IP in the list is the newest. So this patch can solve it. Signed-off-by: Chia-Lin Cho <fox91119@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-30Message cleanup in ofproto_parserVictor Orlikowski
Minor message text cleanup. Signed-off-by: Victor J. Orlikowski <vjo@duke.edu> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-30Typo cleanupVictor Orlikowski
Minor message text cleanup. Signed-off-by: Victor J. Orlikowski <vjo@duke.edu> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-30Typo fixes in lib/packet/bgp.pyVictor Orlikowski
A couple of minor typo fixes. Signed-off-by: Victor J. Orlikowski <vjo@duke.edu> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-30Fix: "AddrFormatError: address '...' is not an EUIv48"Jan Keler
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-30packet/bgp: Gaurd against extra data in the bufferJason Kölker
While attempting to peer with a vendor switch, parsing its BGPOptParamCapabilityGracefulRestart excepted due to the length of the identifier tuples not being a multiple of 4 octets. It appears that this might be common as other implementations also stop when the buffer is < 4. Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-30protocols/ovsdb: Forcably kill the main_threadJason Kölker
Should allow AppManager.run_apps to terminate. Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-30protocols/ovsdb: Handle accept() errorsJason Kölker
An exception during server.accept() should not cause the server thread to terminate. Log the exception and continue instead. Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-30protocols/ovsdb: Handle disconnects gracefullyJason Kölker
If the client closes the connection during setup, the socket's FD is closed out automatically, ignore the errors while forcably shuting down the socket. Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-30test: disable rpc unittest with large file for nowFUJITA Tomonori
disable the rpc unittest with large file for now because it doesn't work with eventlet 0.18 and later. Ryu doesn't have any use cases like this test but should be investigated. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-21ofproto/NXAction: Fix NXActionUnknown parsingMinoru TAKAHASHI
Exception error occurs when NXActionUnknown parsing, because _subtype(NXActionUnknown class member variable) is not defined. This patch fixes this problem. Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-21of14_parser: unify OFPActionExperimenter implementationMinoru TAKAHASHI
Currently, there is different OFPActionExperimenter implementation of between of_parser_v14 and v13/5. Because the implementation of v13/5 is better than v14, this patch fixes to of_parser_v14 for unification the implementation. Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-19test_ofctl: Update json representationsIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-19test_ofctl_utils: Add unit tests for ofctl_utils.pyIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-19lib/ofctl: Add utility library for ofctl_v1_*.pyIWASE Yusuke
This patch enables ofctl_v1_*.py to use the reserved OpenFlow numbers (e.g. port numbering such as "OFPP_CONTROLLER") in the request and reply parameters of ofctl_rest.py. Example: - When adding a flow entry: $ curl -X POST -d '{ "dpid": 1, "actions":[ { "type": "OUTPUT", "port": "CONTROLLER" } ] }' http://localhost:8080/stats/flowentry/add - When getting flows stats: $ curl -X GET http://localhost:8080/stats/flow/1 { "1": [ { ... "actions": [ "OUTPUT:CONTROLLER" ], ... } ] } Suggested-by: Sergio Andres Rivera Polanco <sergiorivera88@gmail.com> Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-19doc: Add Nicira Extension Structures referencesIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-19doc: ofproto_ref: Update supported actions/matches listIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-19packet_data: regenIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-19test_parser: Add expected json representationsIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-19packet_data_generator2: Add some OFP13/15 messagesIWASE Yusuke
Add the following OFP13/15 Messages. - OFP13/15 Handshake Implemented: OFPT_FEATURES_REPLY TODO: OFPT_FEATURES_REQUEST - OFP13/15 Switch Configuration Messages Implemented: OFPT_SET_CONFIG, OFPT_GET_CONFIG_REPLY TODO: OFPT_GET_CONFIG_REQUEST Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-19lib/ofctl_v1_*: Confirm hw_addr is str in mod_port_behaviorIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-19test_ofctl: Compare sent messages in json representationIWASE Yusuke
Currently, test_ofctl compares the sent messages in binary, so it is difficult to figure out the differences of the sent messages and the expected messages. This patch fixes to compare the sent messages in json representation in order to make easy to debug. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-01-19Remove old link when link updatesChia-Lin Cho
Signed-off-by: Chia-Lin Cho <fox91119@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>