996 Commits

Author SHA1 Message Date
FUJITA Tomonori
e2612ddd44 Revert "packet lib: igmp: add some constant values"
This reverts commit 98998118d6f51148f9f0005165e99984e97a711a.

My bad. Somehow applied twice.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-09-02 14:00:12 +09:00
Satoshi Kobayashi
d2246e6626 Add a configuration file for tox (http://testrun.org/tox/)
Python 2.6 and 2.7 interpreters are added to PATH, you can execute the following. Each virtual environment will be made and a test will be run.

$ tox

NOTE: py33 was failure because dependence packages are not worked on Python3 (At least: Eventlet).

Signed-off-by: Satoshi Kobayashi <satoshi-k@stratosphere.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-09-02 12:35:05 +09:00
Satoshi Kobayashi
bab02cfaba Fix POP_MPLS of ofctl_v1_3.to_actions() problem
POP_MPLS (class OFPActionPopMpls) requires ethertype.

Signed-off-by: Satoshi Kobayashi <satoshi-k@stratosphere.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-09-02 12:28:20 +09:00
Yuichi Ito
98998118d6 packet lib: igmp: add some constant values
Signed-off-by: Yuichi Ito <ito.yuichi0@gmal.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-09-02 12:06:55 +09:00
watanabe.fumitaka
ff384ba9c2 packet lib: bpdu: use text address
Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka@nttcom.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-09-02 11:59:34 +09:00
Yuichi Ito
afb737cb6b packet lib: igmp: add a constant value
Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-09-02 11:59:25 +09:00
watanabe.fumitaka
483d9a81ea packet lib: llc: correct a variable name
Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka@nttcom.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-09-02 11:59:11 +09:00
Yoshihiro Kaneko
ffe919311b of12: add docstrings for openflow messages
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-09-02 11:42:31 +09:00
Yoshihiro Kaneko
6a64c9e3aa of13: add docstrings for openflow messages
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-09-02 11:42:30 +09:00
Yuichi Ito
a0460efd15 packet lib: igmp: add some constant values
Signed-off-by: Yuichi Ito <ito.yuichi0@gmal.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-29 10:42:48 +09:00
Yuichi Ito
2ca49a222b add LACP application
this application provides the simple example of link aggregation using LACP.

the module "lacplib" controls exchange of LACP packets and watches the
status of the slave i/fs.  the status changes if the i/fs went into a
LAG or timeout to exchange LACP occurred.  the module sends a
"EventSlaveStateChanged" event when the status changed.

the module "simple_switch_lacp" is a variation of "simple_switch".
the switch receives the "EventPacketIn" event instead of the
"EventOFPPacketIn" event from the module "lacplib" in order to except
LACP.  when the module received "EventSlaveStateChanged" event, the
module resets flow entries.

to run:
ryu-manager ryu/app/simple_switch_lacp.py

Signed-off-by: Yuichi Ito <ito.yuichi0@gmal.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-29 10:22:00 +09:00
Wataru ISHIDA
46d7a9805c rest_router: convert haddr to bin for OFPActionSetDlSrc/Dst
Signed-off-by: Wataru ISHIDA <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-29 07:22:14 +09:00
Wataru ISHIDA
d5c4d774bc rest_router: avoid assertion when ip_text is 0
Signed-off-by: Wataru ISHIDA <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-29 07:22:09 +09:00
YAMAMOTO Takashi
667e41cccb avoid importing a module twice
due to the way utils.import_module is implemented,
"ryu-manager ryu/app/switches.py" ends up with loading
switches.py module twice.
this commit fixes that by checking if module pathnames specified
on the command line is aliases of already loaded modules.
while the check is incomplete, it should cover the most of useful cases.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-28 15:56:12 +09:00
FUJITA Tomonori
7acf32e80e of13: set default args for FlowMod
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-27 21:03:08 +09:00
FUJITA Tomonori
012513848d of12: set default args for FlowMod
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
2013-08-27 21:03:08 +09:00
FUJITA Tomonori
cec887faa4 fix of match from_jsondict mask bug
Match's from_jsondict() requres 'mask' in JSON even if the match
doesn't have 'mask'.

 from_jsondict
    in dict_['oxm_fields']]
  File "/Users/fujita/git/ryu/ryu/ofproto/oxm_fields.py", line 230, in from_jsondict
    mask = tlv['mask']
KeyError: 'mask'

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
2013-08-27 11:54:55 +09:00
YAMAMOTO Takashi
943a1c711f of13: update expected *.json output for OFPTableFeaturesStats.name
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:07 +09:00
YAMAMOTO Takashi
67df35b27b of13: remove trailing NULs in OFPTableFeaturesStats.name
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:07 +09:00
YAMAMOTO Takashi
0e92c8e844 test_parser_v12: update after OFPTableStats.name change
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:07 +09:00
YAMAMOTO Takashi
cf4d06679d of12: update expected *.json output for OFPTableStats.name
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:07 +09:00
YAMAMOTO Takashi
c832fe658b of12: remove trailing NULs in OFPTableStats.name
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:07 +09:00
YAMAMOTO Takashi
b972589906 of10: remove trailing NULs in OFPTableStats.name
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:07 +09:00
YAMAMOTO Takashi
24d91c929e of13: update expected *.json output after OFPPort.name change
this also includes updates after "packet_data_generator: fix port names"
commit.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:07 +09:00
YAMAMOTO Takashi
90581d0ae0 of13: remove trailing NULs in OFPPort.name
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:07 +09:00
YAMAMOTO Takashi
78147bba1b of12: update expected *.json output after OFPPort.name change
this also includes updates after "packet_data_generator: fix port names"
commit.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:07 +09:00
YAMAMOTO Takashi
a0313b796e of12: remove trailing NULs in OFPPort.name
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:07 +09:00
YAMAMOTO Takashi
552f4a2b6a of10: update expected *.json output after OFPPhyPort.name change
this also includes updates after "packet_data_generator: fix port names"
commit.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:07 +09:00
YAMAMOTO Takashi
aa6f056a26 of10: remove trailing NULs in OFPPhyPort.name
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:07 +09:00
YAMAMOTO Takashi
4af07ca975 regen after "packet_data_generator: fix port names" commit
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:06 +09:00
YAMAMOTO Takashi
77bda64419 packet_data_generator: fix port names
these broken names were come from the bug in LINC.
https://github.com/FlowForwarding/LINC-Switch/pull/133

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:06 +09:00
YAMAMOTO Takashi
193093a3fe of13: update expected *.json after OFPDescStats changes
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:06 +09:00
YAMAMOTO Takashi
30a1a415ab of13: make OFPDescStats more human readable
- when parsing, remove zero padding.
- stop base64 encoding for json representation because these fields
  are ASCII strings per OF spec.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:06 +09:00
YAMAMOTO Takashi
49ad016184 of12: update expected *.json after OFPDescStats changes
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:06 +09:00
YAMAMOTO Takashi
534f8c7e93 of12: make OFPDescStats more human readable
- when parsing, remove zero padding.
- stop base64 encoding for json representation because these fields
  are ASCII strings per OF spec.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:06 +09:00
YAMAMOTO Takashi
aa6c1e8b8a of10: make OFPDescStats more human readable
- when parsing, remove zero padding.
- stop base64 encoding for json representation because these fields
  are ASCII strings per OF spec.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 16:49:06 +09:00
YAMAMOTO Takashi
b8e1d5045d rest_router: update after ofproto hw_addr changes
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 15:04:47 +09:00
YAMAMOTO Takashi
0cfe9b4ab4 rest_router: fix of10 case
looks like a regression in commit db40bc0f98abc84dcdbd3fa4d19aa573d94188d9.
(rest_router: follow packet lib api change)

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 15:04:47 +09:00
YAMAMOTO Takashi
4457537d26 a simple script to plot rest_topology's output
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 15:04:47 +09:00
YAMAMOTO Takashi
c27f2f17e2 topology.switches: fix bin vs text address problem
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 15:04:47 +09:00
YAMAMOTO Takashi
4228f3de03 of13: update tests
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 15:04:47 +09:00
YAMAMOTO Takashi
1d24352b30 of13: fix json representation of OFPPort.hw_addr and OFPPortMod.hw_addr
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 15:04:46 +09:00
YAMAMOTO Takashi
94cda7a894 of12: update tests
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 15:04:46 +09:00
YAMAMOTO Takashi
4923862df0 of12: fix json representation of OFPPort.hw_addr and OFPPortMod.hw_addr
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 15:04:46 +09:00
YAMAMOTO Takashi
780381963d of10: update tests
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 15:04:46 +09:00
YAMAMOTO Takashi
9e698c7483 of10: fix json representation of OFPPhyPort.hw_addr and OFPPortMod.hw_addr
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 15:04:46 +09:00
YAMAMOTO Takashi
93a8487137 stringify: allow user classes to annotate type of their attributes
allow user classes to annotate type of their attributes using
_TYPE class attribute.

an example:

    class Foo(StringifyMixin):
        _TYPE = {'ascii': ['attr1', 'attr2']}
        def __init__(self):
            self.attr1 = 'hoge'
            self.attr2 = 'fuga'

currently handles only 'ascii' type, for which just convert from/to
unicode.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 15:04:46 +09:00
YAMAMOTO Takashi
1a3adadca4 of13: use text address for OFPPort.hw_addr and OFPPortMod.hw_addr
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 15:04:46 +09:00
YAMAMOTO Takashi
ec23d73770 of12: use text address for OFPPort.hw_addr and OFPPortMod.hw_addr
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 15:04:46 +09:00
YAMAMOTO Takashi
bae19f1edf of10: use text address for OFPPhyPort.hw_addr and OFPPortMod.hw_addr
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-08-26 15:04:46 +09:00