summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2015-09-15doc/app/ofctl_rest: Add command examples for WRITE/CLEAR_ACTIONSMinoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-15Uncap pbr versionIWAMOTO Toshihiro
This reverts commit 9414322f307fe607f7fefb8611871bbf810b5ee4, as the workaround for readthedocs seems to be no longer necessary. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-15topology: Fixed conditional statementChia-Lin Cho
_is_edge_port(port) in switches.py will return `False` if the port belongs to link. Signed-off-by: Chia-Lin Cho <fox91119@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-15ofproto_v1_5: Add OFPBAC_BAD_METERYusuke Iwase
OpenFlow 1.5.1 adds new error OFPBAC_BAD_METER for bad meter in flow-mod (EXT-530). Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-10bgp: enable nexthop_self for locally generated routesISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-10test_ofctl: improving readabilityMinoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-10test_ofctl: Add unit test for OFPIT_[WRITE/CLEAR]_ACTIONSMinoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-10ofctl_v1_[23]: Add support for OFPIT_[WRITE/CLEAR]_ACTIONSMinoru TAKAHASHI
This patch makes ofctl_rest enable setting instruction type of OFPIT_WRITE/CLEAR_ACTIONS. e.g.) $ curl -X POST -d '{ "dpid": 1, "cookie": 1, "cookie_mask": 1, "table_id": 0, "idle_timeout": 30, "hard_timeout": 30, "priority": 11111, "flags": 1, "match":{ "in_port":1 }, "actions":[ { "type":"WRITE_ACTIONS", "actions":[ { "type":"POP_VLAN", }, { "type":"OUTPUT", "port": 2 } ] } ] }' http://localhost:8080/stats/flowentry/add $ curl -X POST -d '{ "dpid": 1, "cookie": 1, "cookie_mask": 1, "table_id": 0, "idle_timeout": 30, "hard_timeout": 30, "priority": 11111, "flags": 1, "match":{ "in_port":1 }, "actions":[ { "type":"CLEAR_ACTIONS" } ] }' http://localhost:8080/stats/flowentry/add Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-10ofp_handler: Output human readable error msg ev logYusuke Iwase
Currently, the error message event log which is output by ofp_handler.py is difficult to understand what is wrong in the previous OpenFlow request message. This patch improves the readability of this output to find out errors. *** Output Example *** EventOFPErrorMsg received. version=0x4, msg_type=0x1, msg_len=0x4c, xid=0xecc7f07b `-- msg_type: OFPT_ERROR(1) OFPErrorMsg(type=0x4, code=0x9, data=b'\x04\x0e\x00\x58\xec\xc7\xf0\x7b\x00\x0 0\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\ x00\x2b\x67\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x0 0\x01\x00\x0c\x80\x00\x18\x04\xc0\xa8\x00\x01\x00\x00\x00\x00') |-- type: OFPET_BAD_MATCH(4) |-- code: OFPBMC_BAD_PREREQ(9) `-- data: version=0x4, msg_type=0xe, msg_len=0x58, xid=0xecc7f07b `-- msg_type: OFPT_FLOW_MOD(14) Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-10ofproto_parser: Unify str representation of MsgBaseYusuke Iwase
This patch unifies str representation of MsgBase into comma-separated array of 'key=value' style. before: version: 0x1 msg_type 0x0 xid 0x660a4ade OFPHello() after: version=0x1,msg_type=0x0,msg_len=0x8,xid=0x660a4ade,OFPHello() Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-10utils: Add binary_str() method to print binary dataYusuke Iwase
Because repr() is not enough to escape ascii code or control code, MsgBase.__str__() may collapse representation with binary data. This patch add binary_str() in order to convert binary data into a sequence of '\x00' style string. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-10utils: Unify output str format of hex_array()Yusuke Iwase
This patch simplifies hex_array() and unifies its output into '0x%02x' format. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-10doc: Add some JSON examples to openflow api reference for of1.5Minoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-10test_parser: Add expected json outputs for OF1.5Minoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-10doc: Add openflow api reference for of1.5Minoru TAKAHASHI
Update OpenFlow API document. - add OpenFlow 1.5 API Reference - update OpenFlow API Reference index for OF1.5 Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-10test_parser: Add test case for OFP15 table_features_replyMinoru TAKAHASHI
TODO: Because Open vSwitch (lib/ofp-util) does not support Egress Tables [EXT-306] yet, re-generate the packet data by using packet_data_generator2 when Open vSwitch supports it. Reference: OpenFlow 1.1+ support status of Open vSwitch https://github.com/openvswitch/ovs/blob/master/OPENFLOW-1.1%2B.md Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-04Ryu 3.25FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-03packet: dhcp should set _MIN_LENFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-03packet: udp should detect dhcpFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-03ofctl_v1_[23]: Fix the output result of get_flow_stats()Minoru TAKAHASHI
Add flows OFPIT_APPLY_ACTIONS and OFPIT_WRITE_ACTIONS and OFPIT_CLEAR_ACTIONS as the type of instructions, respectively. Then, the output results of get_flow_stats() are the same. This patch fix this problem. before applying this patch: * case OFPIT_APPLY_ACTIONS and OFPIT_WRITE_ACTIONS { "1": [ { "actions": [ "OUTPUT:2", "OUTPUT:3" ], ... } ] } * case OFPIT_CLEAR_ACTIONS { "1": [ { "actions": [], ... } ] } after apply this patch: * case OFPIT_APPLY_ACTIONS { "1": [ { "actions": [ "OUTPUT:2", "OUTPUT:3" ], ... } ] } * case OFPIT_WRITE_ACTIONS { "1": [ { "actions": [ { "WRITE_ACTIONS": [ "OUTPUT:4", "OUTPUT:5" ] } ], ... } ] } * case OFPIT_CLEAR_ACTIONS { "1": [ { "actions": [ "CLEAR_ACTIONS" ], ... } ] } Reported-by: Liu, Weijie <wliu43@illinois.edu> Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-30ofctl_v1_[23]: Convert masked match value into strYusuke Iwase
Currently, ofctl_v1_[23].py always converts metadata field into str type for display, but does not convert pbb_isid and tunnel_id fields even if these fields are masked. So ofctl_v1_3.py fails to convert masked pbb_isid and tunnel_id fields. This patch fixes to convert masked match field into str type and not to convert non-masked field. These changes will improve maintainability when ofctl_v1_*.py will support new match fields. Reported-by: Weijie Liu <wliu43@illinois.edu> Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-30packet/igmp: Python 3: truncate IGMP timer fields to integers before packingFadi Moukayed
This patch adds explicit integer conversions to the IGMP timer fields. This is necessary because Python 3's pack(...) does not automatically coerce floating-point values to integers (Python 3 actually throws a struct.error on struct.pack('B', 1.0)). This fixes IgmpQuerier._send_query and IgmpSnooper._do_query under Python 3, and possibly other functions that pass/assign floats to the `maxresp' attribute. Signed-off-by: Fadi Moukayed <smfadi@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-30doc: ofctl_rest: Add table of contentsYusuke Iwase
This patch adds a table of contents into the ofctl_rest API reference in order to improve its readability. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-25README.rst: add OF 1.5 supportFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-24bgp: Added support to indicate the next hop IP address for the BGP moduleISHIDA Wataru
If the path has a next hop value set, it should be used in the BGP Update message first. This changes to logic to use the check for the next hop in the order prefix/path->peer config->speaker config. This will allow for sending the nexthop as part of the add_prefix message and allow for overiding the nexthop of the peer if one is set. Based-on: Alan Quillin <alanquillin@gmail.com> Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-24bgp: add neighbor_state_get methodFUJITA Tomonori
Can be used to get the state of peer(s). Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-24Remove hosts from edge port when link addedTakeshi
Host could be added into edge port if host packet arrived before lldp packet. Signed-off-by: Takeshi <a86487817@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-24ofproto_v1_5_parser: Fix typo in commentMinoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-24ofproto_v1_4_parser: Fix typo in commentMinoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-24ofproto_v1_3_parser: Fix typo in commentMinoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-24ofproto_v1_2_parser: Fix typo in commentMinoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-21python3: Fix relative importsIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-21doc: Include snort_integrate page into toctreeYusuke Iwase
Currently, snort_integrate page is not included into toctree, and it is difficult for user to find this page. This patch adds snort_integrate page into toctree, and removes warnings when building this page. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-21Add missing comment to rest_topologyTakeshi
Signed-off-by: Takeshi <a86487817@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-21Add EventHostAdd handler for web socket applicationTakeshi
Signed-off-by: Takeshi <a86487817@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20test_parser: Add test case for OFPQueuePropExperimenterYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20ofproto_v1_3_parser: Add OFPQueuePropExperimenter supportYusuke Iwase
This patch is the implementation for the following TODO. - # TODO: add ofp_queue_prop_experimenter Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20ofproto_v1_3_parser: Backport OFPTableFeatureProp classYusuke Iwase
This patch backports OFPTableFeatureProp class from ofproto_v1_[45]_parser.py. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20ofproto_v1_[45]_parser: Add missing OFPTFPT_EXPERIMENTER_MISSYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20ofproto_v1_3_parser: Backport OFPPropBase/OFPPropCommonExperimenter4ByteDataYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20test_parser: Fix some expected json representationsYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20ofproto_v1_[45]_parser: Fix to parse experimenter_dataYusuke Iwase
This patch fixes to parse experimenter_data of ofp_*_prop_experimenter as a list of uint32_t values at OFPPropCommonExperimenter4ByteData. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20ofproto_v1_[345]: Define common structure for experimenter propertyYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20ofproto_v1_4_parser: Move utility method to OFPPropBaseYusuke Iwase
The backport from ofproto_v1_5_parser: This patch moves get_rest() and serialize() from OFPTableFeatureProp to OFPPropBase in order to share it with other subclass. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20test_parser: Add test case for OFP15 packet_outYusuke Iwase
TODO: Because Open vSwitch (lib/ofp-util) does not support OF1.5 packet_out structure [EXT-427] yet, re-generate the packet data by using packet_data_generator2 when Open vSwitch supports it. Reference: OpenFlow 1.1+ support status of Open vSwitch https://github.com/openvswitch/ovs/blob/master/OPENFLOW-1.1%2B.md Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20ofproto_v1_5_parser: Enable setting OFPMatch in OFPPacketOut messageYusuke Iwase
OpenFlow 1.5 supports setting all pipeline field of the packet in the Packet-Out message. This patch adds match field in packet_out message and moves the in_port field into the match field. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20test_parser: Add test case for OFP15 controller connection status messagesYusuke Iwase
TODO: Because Open vSwitch (lib/ofp-util) does not support controller connection status messages [EXT-454] yet, re-generate the packet data by using packet_data_generator2 when Open vSwitch supports it. Reference: OpenFlow 1.1+ support status of Open vSwitch https://github.com/openvswitch/ovs/blob/master/OPENFLOW-1.1%2B.md Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20test_parser: Add implemented type for OFPT_CONTROLLER_STATUSYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20ofproto_v1_5_parser: Add OFPControllerStatusStats supportYusuke Iwase
OpenFlow Spec 1.5 introduces controller status multipart messages to query status of controller connections. This patch adds controller status multipart messages support. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20ofproto_v1_5_parser: Add OFPControllerStatus supportYusuke Iwase
OpenFlow Spec 1.5 introduces controller status message to inform controller of changes in connection status. This patch adds controller status message support. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-07 20:24:06 +0000