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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
