summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
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>
2015-08-20ofproto_v1_5_parser: Add OFPControllerStatusProp supportYusuke Iwase
OpenFlow Spec 1.5 introduces controller status property to describe additional controller status information. This patch add controller status property 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: Enable OFPRoleRequest to set short_idYusuke Iwase
OpenFlow Spec 1.5 introduces short_id to identify controller themselves and enables ofp_role_request to set short_id. This patch adds short_id field into OFPRoleRequest message. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20Add register_service to topology eventsTakeshi
If an application consumes topology event, Switches application should start automatically. Signed-off-by: Takeshi <a86487817@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20Add EventHostAdd event.Takeshi
This event is generated when a new host is added to a switch. Signed-off-by: Takeshi <a86487817@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20Allow specifing match fields in ClsRule.__init__Jason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20Sprinkle StringifyMixinJason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20PEP8 Line lengthJason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20Remove unused importJason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-18Stop old app on reconnectionJason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-18Use system_id from eventJason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-18Handle disconnection during discover_system_idJason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-11test_parser: Add tests generated by packet_data_generator3IWAMOTO Toshihiro
This includes tests for recently added nicira extensions. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-11Introduce packet_data_generator3IWAMOTO Toshihiro
packet_data_generator3 works as a UNIX domain socket server and executes ovs-ofctl to collect flow_mod packets. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-11test_parser: prepare for tests with packet_data_generator3IWAMOTO Toshihiro
Be able to specify xid in packet.json files, as data generated by packet_data_generator3 have non-zero xid. Also, give some detail on data mismatch in order to ease debugging. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-11Add register0 for nicira extensionsIWAMOTO Toshihiro
It was missing in the previous commit. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-11packet_data_generator2: Add Makefile for GNU environmentYusuke Iwase
The existing Makefile seems to suppose the BSD environment. This patch renames existing Makefile into "Makefile.BSD" and adds "Makefile.GNU" for GNU environment. Usage Example: - For BSD environment $ make -f Makefile.BSD - For GNU environment $ make -f Makefile.GNU Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-10use idle timeout in ofctl to avoid incomplete queryingTakeshi
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-10Python 3: Fix search for bound methodsFadi Moukayed
Signed-off-by: Fadi Moukayed <smfadi@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-10Python 3: Filter out None values returned by getmodule(...) to fix the stack ↵Fadi Moukayed
inspection Signed-off-by: Fadi Moukayed <smfadi@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-08ofproto_v1_5_parser: Add OFPBundleFeaturesStats supportYusuke Iwase
OpenFlow Spec 1.5 introduces bundle features request/reply messages to query a switch about its bundle capabilities. This patch adds bundle features request/reply messages support. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-08ofproto_v1_5_parser: Support new OFPTableFeaturesStats structureYusuke Iwase
OpenFlow Spec 1.5 introduces a new ofp_table_features structures in accordance with table feature request commands for simpler table features updates. This patch fixes OFPTableFeaturesStats class to support the new structure of ofp_table_features. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-08ofproto_v1_5_parser: Add OFPBundlePropTime supportYusuke Iwase
OpenFlow Spec 1.5 introduces ofp_bundle_prop_time property which is used in scheduled bundles. This patch adds ofp_bundle_prop_time property support. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-08test_parser: Add test case for OFP15 bundle_features request/replyYusuke Iwase
TODO: Because Open vSwitch (lib/ofp-util) does not support time scheduled bundles [EXT-340] 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-08test_parser: Add test case for OFP15 table_features_requestYusuke Iwase
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: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-08ofproto_v1_5_parser: Add OFPBundleFeaturesProp supportYusuke Iwase
OpenFlow Spec 1.5 introduces bundle features properties to indicate the bundle-related features that are supported by the switch. This patch adds bundle features properties support. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-08ofproto_v1_5_parser: Add new table feature properties supportYusuke Iwase
OpenFlow Spec 1.5 introduces new table feature properties as following. enum ofp_table_feature_prop_type { ... OFPTFPT_WRITE_COPYFIELD = 18, /* Write Copy-Field property. */ OFPTFPT_WRITE_COPYFIELD_MISS = 19, /* Write Copy-Field for table-miss. */ OFPTFPT_APPLY_COPYFIELD = 20, /* Apply Copy-Field property. */ OFPTFPT_APPLY_COPYFIELD_MISS = 21, /* Apply Copy-Field for table-miss. */ OFPTFPT_PACKET_TYPES = 22, /* Packet types property. */ ... } This patch adds these properties support. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03test_parser: Regen OFP15 port_desc request packetMinoru TAKAHASHI
Re-generate the packet data by using packet_data_generator2. (This patch is to complete the TODO of https://github.com/osrg/ryu/commit/b7b8e2fca3afafd51dc0995befc72bf04c70a19c ) Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03test_parser: Regen OFP15 group_desc request packetMinoru TAKAHASHI
Re-generate the packet data by using packet_data_generator2. (This patch is to complete the TODO of https://github.com/osrg/ryu/commit/d0733220f391d861c110ea76541d98be8f625fc8 ) Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-03test_parser: Add test case for OXS related messages in OF1.5Yusuke Iwase
TODO: Because Open vSwitch (lib/ofp-util) does not support Extensible Flow Entry Statistics [EXT-334] 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-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>