summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
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>
2015-07-04travis: run tests with python3FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-03python3: Convert chr to six.int2byteIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-03Fix test packet data generationIWAMOTO Toshihiro
They are bugs found during python3 compatibility work. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-03Use the asciilist type for lists of ip addressesIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-03python3: Misc str related fixupsIWAMOTO Toshihiro
In python2, binary_type + bytearray gives bytearray, but it gives binary_type in python3. Make sure the result is bytearray in both cases. Also, remove some redundunt str()s rather than converting them to six.binary_type. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-03python3: Round time() return value to microsecondsIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-03python3: Adapt to iterator changeIWAMOTO Toshihiro
Use next(i) instead of i.next() for iteration, which works both in python2 and 3. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-03python3: Use b'str' for binary dataIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-03python3: Convert str to six.binary_typeIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-03packet_utils: Remove checksum() side-effectIWAMOTO Toshihiro
checksum() was modifying argument when it is bytearray. Make sure checksum() doesn't modify its argument. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-03python3: Use {encode, decode}('ascii') for text packet dataIWAMOTO Toshihiro
Some packet data are ascii type. Use {encode,decode} to make python3's struct.pack happy. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-03python3: Partially revert b'str' conversionIWAMOTO Toshihiro
This patch partially reverts 75e8c58916524243e6796e73c371981e14fff6ee and 536a42d8c1c0be48e78d5f29b6fd55a38012d953. dhcp.sname is ascii. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-03python3: Use six.indexbytes for extracting single byte of dataIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-03python3: Store AsciiStringType class data as strIWAMOTO Toshihiro
AsciiStringType data are mostly IP addresses and they must be text_type in python3 for text_to_bin to work. Also introduce AsciiStringListType, which is suitable for lists of IP addresses. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-02Ryu 3.23FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-01python3: fix bgp reggressionFUJITA Tomonori
fix the c0590ea903d1fbe40a22e04970d5a8a7e489aa44 commit. 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-01python3: Misc. python3 fixIWAMOTO Toshihiro
These are several kinds of python3 compatibility idioms. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-01python3: Make stringify test functionalIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-01python3: Make ryu.utils.hex_array functionalIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-01python3: Use b'str' for binary dataIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-01python3: Use six.binary_type for I/O of ryu.lib.rpcIWAMOTO Toshihiro
While msgpack has default binary-unicode conversion, the feature is somehow disabled in ryu. As the other parts of ryu requires binary_type data where they directly appear on-wire, simply follow the policy. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-01python3: Use 'str' not b'str' for user test dataIWAMOTO Toshihiro
These "user" test data are similar to ones that are initialized from JSON. So it makes more sense to define them as str not binary_type. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-07-01python3: Restore original str()s where six.binary_type shouldn't be usedIWAMOTO Toshihiro
This partially reverts 227b8fd984fc2fa5a37b4d8ae5d64dbd8166cc18. These tests are testing __str__ method and shouldn't have been changed. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-30python3: fix bgp reggressionFUJITA Tomonori
fix the c0590ea903d1fbe40a22e04970d5a8a7e489aa44 commit. 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-06-30Avoid string exception raisingYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-30packet.ospf: Avoid parameter 'cls' reassignmentYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>