summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2015-08-03ofproto_v1_5_parser: Add OFPFlowDesc supportYusuke Iwase
OpenFlow Spec 1.5 introduce lightweight flow statistics multipart, rename existing flow statistics as flow description. This patch add flow description multipart support. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03ofproto_v1_5_parser: Fix OFPFlowStats/OFPAggregateStats to use OFPStatsYusuke Iwase
OpenFlow Spec 1.5 introduces OXS into flow statistics multipart and flow aggregate multipart. This patch fixes these multipart to use OXS. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03ofproto_v1_5_parser: Fix OFPFlowRemoved to use OFPStatsYusuke Iwase
OpenFlow Spec 1.5 introduces OXS into flow removed message. This patch fixes flow removed message to use OXS. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03ofproto_v1_5_parser: Use b'str' for binary dataYusuke Iwase
Note: ofproto_v1_[034]_parser was done in previous commits. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03ofproto_v1_5_parser: Use six.binary_type instead of bufferYusuke Iwase
To support Python3, buffer() type need to be replaced with six.binary_type(). Note: ofproto_v1_[0234]_parser was done in previous commits. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03test_parser: Add test case for OFP15 group_desc replyYusuke Iwase
TODO: Because Open vSwitch (lib/ofp-util) does not support OF1.5 group_desc structure [EXT-350] 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-03test_parser: Add expected json representations of OF1.5 GroupModYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03packet_data: RegenYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03packet_data_generator2: Generate OF1.5 GroupMod packetsYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03ofproto_v1_5_parser: Support OF1.5 OFPGroupDescStats structureYusuke Iwase
OpenFlow Spec 1.5 adds properties field which is a list of group properties. This patch adds properties field support in group description multipart reply message. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03ofproto_v1_[345]: Fix backward compatibility for OFPGroupDescStatsYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03ofproto_v1_5_parser: Support OF1.5 OFPGroupMod structureYusuke Iwase
OpenFlow Spec 1.5 adds bucket_id and properties fields. And also introduces command_bucket_id field which indicates Bucket Id used as part of the new commands, OFPGC_INSERT_BUCKET and OFPGC_REMOVE_BUCKET. This patch adds these fields support and fixes the example of usage according to this changes. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03ofproto_v1_5_parser: Add OFPGroupProp supportYusuke Iwase
OpenFlow Spec 1.5 introduces group property to extend groups. This patch add group property support. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03ofproto_v1_5_parser: Add OFPGroupBucketProp supportYusuke Iwase
OpenFlow Spec 1.5 introduces group bucket properties to extend group buckets and redefine bucket fields weight, watch_port and watch_group as group bucket properties. This patch adds group bucket properties support and restructures bucket fields. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03ofproto_v1_5: Fix a typoYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03Ryu 3.24FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-31ospf: fix serialize() to work with packet.Packet()ISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-31of1.5: Multipart METER_CONFIG was renamed to METER_DESCMinoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-31of1.5: Meter statistics field flow_count was renamed to ref_countMinoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-31test_parser: Add test case for OFP15 port_desc requestMinoru TAKAHASHI
TODO:Open vSwtich (lib/ofp-util) support OF1.5 port_desc_request, but it has a bug[1]. So, re-generate the packet data by using packet_data_generator2 when Open vSwitch fix the bug. ref: 1) http://openvswitch.org/pipermail/discuss/2015-July/018253.html Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-31of1.5: port statistics and port descriptions use a common request formatMinoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-31test_parser: Add test case for OFP15 group_desc requestMinoru TAKAHASHI
TODO:Open vSwtich (lib/ofp-util) support OF1.5 group_desc_request, but it has a bug[1]. So, re-generate the packet data by using packet_data_generator2 when Open vSwitch fix the bug. ref: 1) http://openvswitch.org/pipermail/discuss/2015-July/018253.html Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-31of1.5: group statistics and group descriptions use a common request formatMinoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-31test_parser: Add test case for OFP15 queue_desc requestMinoru TAKAHASHI
TODO: Because Open vSwitch (lib/ofp-util) does not support queue_desc request, 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: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-31of1.5: queue statistics and queue descriptions use a common request formatMinoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-31ofproto_v1_[2345]_parser: Add items method to OFPMatch/OFPStatsYusuke Iwase
iteritems() was renamed as items() to support Python3. In accordance with this change, this patch adds items() into OFPMatch/OFPStats class for convenience. Reported-by: Ed Kiefer <ehk8@cornell.edu> Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-30Add OVSDB manager protocol applicationJason Kölker
Allows listening on a socket for OVSDB clients, reacting to their events and modifying their database. Co-Authored-By: Chris Hansen <chris.hansen.career@gmail.com> Co-Authored-By: Ravi Kamachi <ravi.kamachi@rackspace.com> Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: Chris Hansen <chris.hansen.career@gmail.com> Signed-off-by: Ravi Kamachi <ravi.kamachi@rackspace.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-29OF: send fin/ack in response to fin packetFUJITA Tomonori
Calls socket's close(). Reported-by: Guru Chaitanya Perakam <gperakam@Brocade.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Tested-by: Guru Chaitanya Perakam <gperakam@Brocade.com>
2015-07-25packet_data_generator2: Adopt upgrade of ofputil_packet_inYusuke Iwase
In accordance with the upgrade of ofputil_packet_in structure in OVS libraries, this patch fixes the usage of struct ofputil_packet_in when initializing the flow metadata field. FYI: The appropriate commit on OVS GitHub https://github.com/openvswitch/ovs/commit/50dcbd8ed473210e6d2aa44f28843fb417416397 Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-22test_ofctl: Add some test cases of OF1.0 actionsMinoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-22ofctl_v1_0: fix output string of ENQUEUEMinoru TAKAHASHI
There is no port information in output string of ENQUEUE in ofctl_v1_0.py This patch fixes this problem. Execution example is as follows. curl -X GET http://localhost:8080/stats/flow/1 { "1": [ { "actions": [ "ENQUEUE:2:3" # ENQUEUE:<port>:<queue_id> ], "byte_count": 0, "cookie": 0, "duration_nsec": 864000000, "duration_sec": 107, "hard_timeout": 0, "idle_timeout": 0, "match": { "in_port": 5 }, "packet_count": 0, "priority": 32768, "table_id": 0 } ] } Reported-by: Weijie Liu <wliu43@illinois.edu> Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-22OXM/OXS: Initialize exp_type with oxm_fieldYusuke Iwase
OpenFlow Spec 1.5 mandates that Experimenter OXMs encode the experimenter type in the oxm_field field of the OXM header (EXT-380). Assumption: This can be applied for OXSs too. This patch initializes exp_type value of _Experimenter class with oxm_field/oxs_field value. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-22ofproto_v1_5_parser: Add OFPPortDescPropRecirculate classYusuke Iwase
This class is parser class for OFPPDPT_RECIRCULATE type in Port Description Properties. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-22ofproto_v1_5_parser: Add OFPPortDescPropOxm classYusuke Iwase
This class is parser class for OFPPDPT_PIPELINE_INPUT and OFPPDPT_PIPELINE_OUTPUT type in Port Description Properties. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-22ofproto_v1_5_parser: Move utility method to OFPPropBaseYusuke Iwase
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-07-22ofproto_v1_[45]_parser: Sort out the inheritance relation of OFP*PropYusuke Iwase
This patch sorts out the inheritance relation of properties field class. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-22ofproto_v1_[45]_parser: Correct example of OFPPortModYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-22ofproto_v1_[45]_parser: Rename Port Description Properties classYusuke Iwase
To reflect the name of struct ofp_port_desc_prop_* in OpenFlow Spec 1.4/1.5, this patch renames "OFPPortProp" to "OFPPortDescProp". e.g.) in OpenFlow Spec 1.4 struct ofp_port_desc_prop_header { uint16_t type; /* One of OFPPDPT_*. */ uint16_t length; /* Length in bytes of this property. */ }; Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-22ofproto_v1_5_parser: Enable setting mask in OFPActionSetFieldYusuke Iwase
OpenFlow Sepc 1.5 allows wildcard to be used in set-field action (EXT-314). This patch enables setting mask in set-field action. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-22ofproto_v1_5_parser: Add OFPActionCopyField supportYusuke Iwase
OpenFlow Spec 1.5 introduces Copy-Field action which allows to copy the value from one header or pipeline field into another header or pipeline field (EXT-320). This patch add Copy-Field action support. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-22ofproto_v1_5_parser: Add OFPInstructionStatTrigger supportYusuke Iwase
OpenFlow Spec 1.5 introduces new instruction OFPIT_STAT_TRIGGER to define a set of statistics thresholds using OXS (EXT-335). This patch adds OFPIT_STAT_TRIGGER instruction support. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-18add host restful apiTakeshi
Signed-off-by: Takeshi <a86487817@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-18add host discovery functionsTakeshi
Signed-off-by: Takeshi <a86487817@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-10ignore lldp packet to avoid wrong linksTakeshi
Signed-off-by: Takeshi <a86487817@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-09bgp: fix withdrawn label handling againFUJITA Tomonori
The commit fba7213 is incomplete; doesn't parse properly so crashes when serializing. Reported-by: Toshiki Tsuboi <t.tsubo2000@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Tested-by: Toshiki Tsuboi <t.tsubo2000@gmail.com>
2015-07-09ignore lldp packet to avoid wrong linksTakeshi
Signed-off-by: Takeshi <a86487817@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-08declare python3 supportFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-06bgp: fix bug of not taking care of withdrawn labelISHIDA Wataru
Reported-by: Toshiki Tsuboi <t.tsubo2000@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-07-05Add registers 1-7 as nicira extensions for matching and settingGal Sagie
This patch adds the ability to match and set registers 1-7 in openflow. Verified to work with OVS 2.3.1 Signed-off-by: Gal Sagie <gal.sagie@huawei.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-04Implement NX Resubmit-table actionYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <imuwoto@gmail.com> Tested-by: Gal Sagie <gal.sagie@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>