summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2015-06-25python3: Avoid applying ord() to integersIWAMOTO Toshihiro
In python3, b'abc'[0] isn't a string but a int value and ord() should not be used. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-25python3: Use formencode instead of xml_compareIWAMOTO Toshihiro
The last release of xml_compare is 7 years ago and doesn't support python3. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-25python3: Open packet data with binary modeIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-25python3: Fix dynamically added test methodsIWAMOTO Toshihiro
Usage of types.MethodType has changed and means a bound method in python3. This is probably the reason why self must be passed explicitly in python3. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-25python3: Use b'str' for binary literalsIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-25python3: Remove use of buffer()IWAMOTO Toshihiro
python3 doesn't have buffer(). They are mostly needed by the fact that python2.6's unpack doesn't take bytearray. Replace them with six.binary_type or remove them where not needed. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-25python3: Use six.text_type instead of unicodefumihiko kakuma
This is the partial patch to supporting python 3. unicode was removed in python 3. So we use six.text_type instead of unicode. Signed-off-by: Fumihiko Kakuma <kakuma@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-23eventlet has already supported WebSocket(RFC6455) in stable releases (>= 0.15)FUJITA Tomonori
Signed-off-by: Satoshi Kobayashi <satoshi-k@stratosphere.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-23python3: Use integer division where appropriateIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-22python3: Fix import issues with python2IWAMOTO Toshihiro
Fix issues introduced in commit c3c2112cb16a60271f4eb595f82721b1f1adc633, reported by Satoshi KOBAYASHI on ryu-devel. Use six.moves to handle module name changes. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-20python3: Use bytes type 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-06-20python3: Adapt to new iterator namesIWAMOTO Toshihiro
This patch is generated by "2to3 -f dict" and irrevant parts were hand-removed. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-20python3: Fix starndard library importsIWAMOTO Toshihiro
Generated by runnig "2to3 -f imports". Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-20ofproto: Fix ImportError on python3IWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-20tox.ini: Be able to run python3 unit testsIWAMOTO Toshihiro
With this change, you can run "tox -e py34" to test python3 compatibility. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-18test_parser_ofpstats: Add unit test for OFPStats classYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-18ofproto_v1_5_parser: Add OPFStats parser for Flow Stats StructuresYusuke Iwase
This patch adds OPFStats class which has simpler API with OFPMatch class. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-18test_oxs: Add unit test for oxs_fields.pyYusuke Iwase
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-18oxs_fields: Add OXS class supportYusuke Iwase
This patch adds OXS class parser for Extensible Flow Entry Statistics in OpenFlow Spec 1.5. And this implementation introduces oxx_fields.py to share the logic functions with oxm_fields.py. note: This pacth has no implementation for specific OXS Experimenter classes as oxm_fields.py has. (eg. ONF Experimenter, Nicira Experimenter) Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-18Clean up server socket and thread when shutting downJerry Cen
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-18Fixed the function name of out filterJerry Cen
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-18ofctl_rest: fix error of delete_flow_entryMinoru TAKAHASHI
ofctl_rest caused an exception when run delete_flow_entry command in OpenFlow1.0. 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>
2015-06-14ofctl_v1_0: fix output of get_flow_statsMinoru TAKAHASHI
After applying this patch, ofctl_v1_0:get_flow_stats outputs only match fields that no wildcard is set. Execution example is as follows. before applying this patch: $curl http://127.0.0.1:8080/stats/flow/1 { "1": [ { "actions": [ "OUTPUT:1" ], "byte_count": 238, "cookie": 0, "duration_nsec": 585000000, "duration_sec": 154, "hard_timeout": 0, "idle_timeout": 0, "match": { "dl_dst": "00:00:00:00:00:01", "dl_src": "00:00:00:00:00:00", "dl_type": 0, "dl_vlan": 0, "dl_vlan_pcp": 0, "in_port": 2, "nw_dst": "0.0.0.0", "nw_proto": 0, "nw_src": "0.0.0.0", "nw_tos": 0, "tp_dst": 0, "tp_src": 0 }, "packet_count": 3, "priority": 32768, "table_id": 0 } ] } after applying this patch: $curl http://127.0.0.1:8080/stats/flow/1 { "1": [ { "actions": [ "OUTPUT:1" ], "byte_count": 238, "cookie": 0, "duration_nsec": 593000000, "duration_sec": 12, "hard_timeout": 0, "idle_timeout": 0, "match": { "dl_dst": "00:00:00:00:00:01", "in_port": 2 }, "packet_count": 3, "priority": 32768, "table_id": 0 } ] } 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-06-04Ryu 3.22FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-02test_parser: Add some expected json representationsIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-02packet_data: RegenIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-02packet_data_generator2: Generate conjunction packetsIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-06-02Implement NXActionConjunction and conj_id match for OF1.3 and OF1.5IWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-27Add missing ryu.contrib.update_module_path callsYAMAMOTO Takashi
Found by investigating readthedocs logs. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-27Cap pbr versionYAMAMOTO Takashi
This is a workaround oslo.config related failures on readthedocs. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-19packet_data: RegenYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-19packet_generator2: learn actionYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-19test_parser: Add some expected json representationsYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-19ofproto_v1_5: Add legacy NXM aliases for some OXMsYAMAMOTO Takashi
A motivation of this change is UTs comparing on-wire binaries; some of NX actions (eg. learn) includes OXM/NXMs fields and Open vSwitch prefers legacy NXMs over OXMs when encoding them. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-19ofproto_v1_3: Add legacy NXM aliases for some OXMsYAMAMOTO Takashi
A motivation of this change is UTs comparing on-wire binaries; some of NX actions (eg. learn) includes OXM/NXMs fields and Open vSwitch prefers legacy NXMs over OXMs when encoding them. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-19Pull nx_actions for OpenFlow 1.5YAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-19_NXFlowSpec: Add type annotation for stringify stuffYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-19nx_actions: Modify __module__ for generated classes for stringify stuffYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-19NXActionRegMove: Add type annotation for stringify stuffYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-19Adapt to namespace-less osloYAMAMOTO Takashi
oslo packages got away from namespaces while ago. Update ryu to use the new namespace-less import path. Bump oslo.config requirement version accordingly. Reference: https://blueprints.launchpad.net/oslo-incubator/+spec/drop-namespace-packages Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-19test_lib: Remove a questional exception re-raisingYAMAMOTO Takashi
This "raise" makes the following code to fall back to non-color unreachable. While this has been so since the initial version, recently it started biting us on travis-ci. (I haven't investigated why. It might or might not be related to recently released tox 2.0's "ENV isolation".) Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-19Be able to parse classes that start with "NX"IWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-02Ryu 3.21FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-05-02Suppress warningSatoshi Kobayashi
UserWarning is always shown when ryu.controller.dpset.DPset is loaded. It is noisy. Signed-off-by: Satoshi Kobayashi <satoshi-k@stratosphere.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-04-29sw test tool: Fix typoClaudio Pisa
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-04-28tests: Remove some unnecessary shebangsYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-04-28packet_data: RegenYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-04-28test_parser: Add expected json representationsYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-04-28packet_data_generator2: Generate OF1.3 packets where appropriateYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-04-28packet_data_generator2: Make the list of OF versions per messagesYAMAMOTO Takashi
Preparation for OF1.3 tests. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-10 10:23:10 +0000