summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2013-08-26of12: use text address for OFPPort.hw_addr and OFPPortMod.hw_addrYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26of10: use text address for OFPPhyPort.hw_addr and OFPPortMod.hw_addrYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-24MANIFEST.in: exclude packet_data_generatorYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-24add simple learning switch app for OF1.2FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-24add simple learning switch app for OF1.3FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-24of13: set ActionOutput default max_len to zeroFUJITA Tomonori
same as of10. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-24of12: set ActionOutput default max_len to zeroFUJITA Tomonori
same as of10. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-24fix the commit 833328a mess-upFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-23lib/packet: update docstrings to fix broken tables in latex/pdfYoshihiro Kaneko
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-23doc: fix overflow from the page in latex/pdf.Yoshihiro Kaneko
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-23of1.2, of1.3: update document for OFPMatchYoshihiro Kaneko
ofproto_v1_3_parser.OFPMatch: add a list of available fields. ofproto_v1_2_parser.OFPMatch: add docstrings same as of1.3. doc: add reference page for of1.2 Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-23packet lib: fix ipv6 parserYgor Amaral
payload length in ipv6 header doesn't include the basic ipv6 header length (40 bytes). Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-20ofctl lib: Actions is a listSatoshi Kobayashi
Signed-off-by: Satoshi Kobayashi <satoshi-k@stratosphere.co.jp> Acked-by: OHMURA Kei <ohmura.kei@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-15of13: test_parser: update expected *.json resultsYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-15of13: test_parser: regen *.packetYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-15of13: packet_data_generator: use set_field actionYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-15of13: change OFPActionSetField api, following the recent OFPMatch apiYAMAMOTO Takashi
old api: OFPActionSetField(MTInPort(OXM_OF_IN_PORT, 1)) new api: OFPActionSetField(in_port=1) and make the json representation similar to OFPMatch as well. an example: "OFPActionSetField": { "field": { "OXMTlv": { "field": "vlan_vid", "mask": null, "value": 258 } } } Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-15of12: test_parser: update expected *.json resultsYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-15of12: test_parser: regen *.packetYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-15of12: packet_data_generator: use set_field actionYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-15of12: change OFPActionSetField api, following the recent OFPMatch apiYAMAMOTO Takashi
old api: OFPActionSetField(MTInPort(OXM_OF_IN_PORT, 1)) new api: OFPActionSetField(in_port=1) and make the json representation similar to OFPMatch as well. an example: "OFPActionSetField": { "field": { "OXMTlv": { "field": "vlan_vid", "mask": null, "value": 258 } } } Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-15of13: update *.json after OFPMatch changesYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-15of13: change OFPMatch json representation to match with on-wireYAMAMOTO Takashi
old: { "OFPMatch": { "eth_dst": "f2:0b:a4:7d:f8:ea" }} new: { "OFPMatch": { "oxm_fields": [ { "OXMTlv": { "field": "eth_dst", "mask": null, "value": "f2:0b:a4:7d:f8:ea" }} ] }} Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-15of13: make OFPMatch use oxm_fields routinesYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-15of12: update *.json after OFPMatch changesYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-15of12: change OFPMatch json representation to match with on-wireYAMAMOTO Takashi
old: { "OFPMatch": { "eth_dst": "f2:0b:a4:7d:f8:ea" }} new: { "OFPMatch": { "oxm_fields": [ { "OXMTlv": { "field": "eth_dst", "mask": null, "value": "f2:0b:a4:7d:f8:ea" }} ] }} Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-15of12: make OFPMatch use oxm_fields routinesYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-15oxm_fields: add some routinesYAMAMOTO Takashi
these will be used by the later OFPMatch and OFPActionSetField changes. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-13doc: add reference for ofproto api documentYoshihiro Kaneko
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-13packet_base: update docstringYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-13doc: fix some sphinx warnings and errorsYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-13doc: fix a typoYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-13ofproto_v1_3_parser: add docstring to OFPMatchYoshihiro Kaneko
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-13normalize json files using tools/normalize_json.pyYAMAMOTO Takashi
i used to use json_pp for this purpose but different versions of perl seem to format differently. use python "json.dumps(d, ensure_ascii=True, indent=3, sort_keys=True)" instead this time. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-13a script to normalize jsonYAMAMOTO Takashi
this will be used to normalize *.json files in the tree so that we can get more readable diffs. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-12lib/packet: add Internet Group Management ProtocolYuichi Ito
Signed-off-by: Yuichi Ito <ito.yuichi0@gmal.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-11test_parser: stop testing unsupported operationsYAMAMOTO Takashi
while this happens to work right now, it will stop working when we re-expose "len" and friends, which are only available after parse or serialize. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-11test_parser: have a list of operations expected to workYAMAMOTO Takashi
instead of guessing. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-11unit test: test OFPMatch.append_fieldYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-11unit test for OFPMatch old/new api compatibilityYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-08app/rest_firewall: add API for VLAN configurationwatanabe.fumitaka
add REST-API for VLAN configuration of rest_firewall application. it implements handling each vlan groups separately. This update(v1->v2) contains the following change. make function of conversion of cookie and ruleID for easily understanding. Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka@nttcom.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-07ofproto: _baseattribute can be class attributeIsaku Yamahata
So that it can save memory a bit. Cc: yamamoto@valinux.co.jp Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-07ofproto: make binary code loadableGlenn McGuire
I've been using the latest RYU source from GIT, and building my own python eggs. When launching ryu-manager, I get the following error: [root@hostname ryu]# ryu-manager Traceback (most recent call last): File "/usr/bin/ryu-manager", line 5, in <module> pkg_resources.run_script('ryu==2.2', 'ryu-manager') File "/usr/lib/python2.6/site-packages/pkg_resources.py", line 461, in run_script self.require(requires)[0].run_script(script_name, ns) File "/usr/lib/python2.6/site-packages/pkg_resources.py", line 1194, in run_script execfile(script_filename, namespace, namespace) File "/usr/lib/python2.6/site-packages/ryu-2.2-py2.6.egg/EGG-INFO/scripts/ryu-manage\ r", line 43, in <module> from ryu.topology import switches File "build/bdist.linux-x86_64/egg/ryu/topology/switches.py", line 427, in <module> File "build/bdist.linux-x86_64/egg/ryu/topology/switches.py", line 574, in Switches AttributeError: 'module' object has no attribute 'EventOFPPortStatus' [root@hostname ryu]# python ./bin/ryu-manager Traceback (most recent call last): File "./bin/ryu-manager", line 55, in <module> from ryu.topology import switches File "build/bdist.linux-x86_64/egg/ryu/topology/switches.py", line 427, in <module> File "build/bdist.linux-x86_64/egg/ryu/topology/switches.py", line 574, in Switches AttributeError: 'module' object has no attribute 'EventOFPPortStatus' I found that I could execute ryu-manager correctly from the interactive python shell but not from the command line, and looked at the derivation of Event classes from pathnames. It occurred to me that the eggs would not necessarily include the source files, so I tried successfully to make the code look up both source and compiled filenames, and return the union of that. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-06packet lib: make vrrp get_payload robustFUJITA Tomonori
Let's not make an assumption about the position of IP(v4 or v6) and VRRP. The original code excepts pure ether or vlan and search them in try-and-error way. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-06packet lib to string: unit testswatanabe.fumitaka
Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka@nttcom.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-06packet lib to string: add __str__ to basewatanabe.fumitaka
Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka@nttcom.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-06packet lib to string: inherits StringifyMixinwatanabe.fumitaka
Some class inherits stringify.StringifyMixin and, remove class variable 'tlvs' (not used as class variable and interferes to string) from lldp.lldp Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka@nttcom.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-06unit tests for the new OFPMatch apiYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-06of13: fix old parser and serializer of PBB_IDYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-06of12: stop assuming OFPXMC_OPENFLOW_BASICYAMAMOTO Takashi
fix a merge botch and sync with of1.3 version. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>