summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
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>
2013-08-06dpset: support OF1.3FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Tested-by: Satoshi Kobayashi <satoshi-k@stratosphere.co.jp>
2013-08-04packet lib: provide bpdu._MIN_LENYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-04packet lib: provide llc._MIN_LENYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-04packet lib: implement lacp.__len__YAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-04packet lib: implement ryu.lib.packet.lldp.lldp.__len__YAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-04packet lib: provide a default impl of __len__YAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-02support setup.py install with git archive tarballsFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-01use d2to1 and pbr for packagingFUJITA Tomonori
- distutils2-like setup.cfg files for a package's metadata - avoid absolute '/etc/ryu/' path for our config file Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-01tests: stop comparing text addressesYAMAMOTO Takashi
on OS X, ntop produces strings like '3ffe:507::1:200:86ff:fe05:80da' while others (NetBSD, Linux) produce '3ffe:507:0:1:200:86ff:fe05:80da'. RFC 5952 4.2.2. says OS X behaviour is incorrect. (MUST NOT) for longer term, it's probably better to workaround this in addrconv module. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
2013-08-01correct file permissionYuichi Ito
i'm sorry but i have set a wrong permission to files related to LACP. Signed-off-by: Yuichi Ito <ito.yuichi0@gmal.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-01note about network address representationYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-01packet lib: pydoc update/improvements after api changeYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-01packet lib api: update documentationYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-01rest_router: update after packet lib api changesYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-01topology.switches: update after packet lib api changesYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-01packet lib: change the api to use text addressesYAMAMOTO Takashi
for example: >>> from ryu.lib.packet.ipv4 import ipv4 >>> o = ipv4(src='127.0.0.1') >>> o.src '127.0.0.1' >>> i left lldp TLVs as they seem to be treated opaque. for now, i don't change mac.DONTCARE and mac.BROADCAST because they are used by the ofproto world as well. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-01Ryu 2.2FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-01sync README with the web siteFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-01add 2013 to copyright for documentationsFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31test_parser: update of13 expected resultsYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of13 OFPMatch: remove now unused codeYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of13: more OFPMatch old api compatYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of13: make OFPMatch.to_jsondict work on instances composed with old apiYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of13 OFPMatchField: make this safe to serialize multiple timesYAMAMOTO Takashi
this will be used by OFPMatch old api compat code.$ Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of13: OFPMatch api compatYAMAMOTO Takashi
make old query api work on OFPMatch instances created with from_jsondict. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of13: OFPMatch from_json/to_json for new apiYAMAMOTO Takashi
this breaks from_json/to_json for old api Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of13: add OFPMatch.get for convenienceYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of13: add OFPMatch.iteritems for convenienceYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of13: new OFPMatch field query apiYAMAMOTO Takashi
an example: if 'ipv6_src' in match: print match['ipv6_src'] Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of13: new match field parserYAMAMOTO Takashi
add a new match field parser which fills OFPMatch attributes used by the new api. the old parser which fills match.fields is kept for now but will be removed later. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of13: new OFPMatch composer apiYAMAMOTO Takashi
a new api to compose matches. it looks like: match = OFPMatch(in_port=1, eth_type=0x86dd, ipv6_src=('2001:db8:bd05:1d2:288a:1fc0:1:10ee', 'ffff:ffff:ffff:ffff::'), ipv6_dst = '2001:db8:bd05:1d2:288a:1fc0:1:10ee') the old match.set_foo and match.append_field methods are kept for now but will be removed later. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31test_parser: update of12 expected resultsYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of12 OFPMatch: remove now unused codeYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of12: OFPMatch more old api compatYAMAMOTO Takashi
enough to pass test_parser_v12. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of12: make OFPMatch.to_jsondict work on instances composed with old apiYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of12 OFPMatchField: make this safe to serialize multiple timesYAMAMOTO Takashi
this will be used by OFPMatch old api compat code. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of12: OFPMatch api compatYAMAMOTO Takashi
make old query api work on OFPMatch instances created with from_jsondict. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of12: OFPMatch from_json/to_json for new apiYAMAMOTO Takashi
this breaks from_json/to_json for old api Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of12: add OFPMatch.get for convenienceYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of12: add OFPMatch.iteritems for convenienceYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of12: new OFPMatch field query apiYAMAMOTO Takashi
an example: if 'ipv6_src' in match: print match['ipv6_src'] Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-07-31of12: new match field parserYAMAMOTO Takashi
add a new match field parser which fills OFPMatch attributes used by the new api. the old parser which fills match.fields is kept for now but will be removed later. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>