2467 Commits

Author SHA1 Message Date
FUJITA Tomonori
8726f8b0bf Ryu 3.25
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
v3.25
2015-09-04 08:20:05 +09:00
FUJITA Tomonori
396c32d4aa packet: dhcp should set _MIN_LEN
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-03 22:47:35 +09:00
FUJITA Tomonori
e47c5bf16a packet: udp should detect dhcp
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-09-03 22:35:02 +09:00
Minoru TAKAHASHI
22387e09e4 ofctl_v1_[23]: Fix the output result of get_flow_stats()
Add flows OFPIT_APPLY_ACTIONS and OFPIT_WRITE_ACTIONS and
OFPIT_CLEAR_ACTIONS as the type of instructions, respectively.
Then, the output results of get_flow_stats() are the same.
This patch fix this problem.

before applying this patch:

 * case OFPIT_APPLY_ACTIONS and OFPIT_WRITE_ACTIONS

{
    "1": [
        {
            "actions": [
                "OUTPUT:2",
                "OUTPUT:3"
            ],
        ...
        }
    ]
}

 * case OFPIT_CLEAR_ACTIONS

{
    "1": [
        {
            "actions": [],
        ...
        }
    ]
}

after apply this patch:

 * case OFPIT_APPLY_ACTIONS

{
    "1": [
        {
            "actions": [
                "OUTPUT:2",
                "OUTPUT:3"
            ],
        ...
        }
    ]
}

 * case OFPIT_WRITE_ACTIONS

{
    "1": [
        {
            "actions": [
                {
                    "WRITE_ACTIONS": [
                        "OUTPUT:4",
                        "OUTPUT:5"
                    ]
                }
            ],
        ...
        }
    ]
}

 * case OFPIT_CLEAR_ACTIONS

{
    "1": [
        {
            "actions": [
                "CLEAR_ACTIONS"
            ],
        ...
        }
    ]
}

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-09-03 22:26:57 +09:00
Yusuke Iwase
2701fa129f ofctl_v1_[23]: Convert masked match value into str
Currently, ofctl_v1_[23].py always converts metadata field into str
type for display, but does not convert pbb_isid and tunnel_id fields
even if these fields are masked.
So ofctl_v1_3.py fails to convert masked pbb_isid and tunnel_id fields.

This patch fixes to convert masked match field into str type and not
to convert non-masked field.
These changes will improve maintainability when ofctl_v1_*.py will
support new match fields.

Reported-by: Weijie Liu <wliu43@illinois.edu>
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-30 14:21:51 +09:00
Fadi Moukayed
9bca06c31c packet/igmp: Python 3: truncate IGMP timer fields to integers before packing
This patch adds explicit integer conversions to the IGMP timer
fields. This is necessary because Python 3's pack(...) does not
automatically coerce floating-point values to integers (Python 3
actually throws a struct.error on struct.pack('B', 1.0)).

This fixes IgmpQuerier._send_query and IgmpSnooper._do_query under
Python 3, and possibly other functions that pass/assign floats to the
`maxresp' attribute.

Signed-off-by: Fadi Moukayed <smfadi@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-30 14:17:30 +09:00
Yusuke Iwase
7028704b3f doc: ofctl_rest: Add table of contents
This patch adds a table of contents into the ofctl_rest API
reference in order to improve its readability.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-30 14:04:38 +09:00
FUJITA Tomonori
08edfa067e README.rst: add OF 1.5 support
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-25 04:55:43 +09:00
ISHIDA Wataru
2a4423fda3 bgp: Added support to indicate the next hop IP address for the BGP module
If the path has a next hop value set, it should be used in the BGP
Update message first.  This changes to logic to use the check for the
next hop in the order prefix/path->peer config->speaker config.  This
will allow for sending the nexthop as part of the add_prefix message and
allow for overiding the nexthop of the peer if one is set.

Based-on: Alan Quillin <alanquillin@gmail.com>
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-24 14:37:27 +09:00
FUJITA Tomonori
1a9008b73e bgp: add neighbor_state_get method
Can be used to get the state of peer(s).

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-24 14:23:44 +09:00
Takeshi
0d405de657 Remove hosts from edge port when link added
Host could be added into edge port if host packet arrived before lldp
packet.

Signed-off-by: Takeshi <a86487817@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-24 14:04:09 +09:00
Minoru TAKAHASHI
65695e47a6 ofproto_v1_5_parser: Fix typo in comment
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-24 14:00:43 +09:00
Minoru TAKAHASHI
d24b96c40f ofproto_v1_4_parser: Fix typo in comment
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-24 14:00:43 +09:00
Minoru TAKAHASHI
51dc621fcf ofproto_v1_3_parser: Fix typo in comment
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-24 14:00:43 +09:00
Minoru TAKAHASHI
3f005ea5e0 ofproto_v1_2_parser: Fix typo in comment
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-24 14:00:43 +09:00
IWAMOTO Toshihiro
08cbbfbfff python3: Fix relative imports
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-21 13:10:58 +09:00
Yusuke Iwase
1fc4ec6d8a doc: Include snort_integrate page into toctree
Currently, snort_integrate page is not included into toctree,
and it is difficult for user to find this page.
This patch adds snort_integrate page into toctree,
and removes warnings when building this page.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-21 09:39:48 +09:00
Takeshi
ad4613d7db Add missing comment to rest_topology
Signed-off-by: Takeshi <a86487817@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-21 09:33:15 +09:00
Takeshi
06d84458a4 Add EventHostAdd handler for web socket application
Signed-off-by: Takeshi <a86487817@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-21 09:33:15 +09:00
Yusuke Iwase
0d64e7f890 test_parser: Add test case for OFPQueuePropExperimenter
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:28:40 +09:00
Yusuke Iwase
742644a21d ofproto_v1_3_parser: Add OFPQueuePropExperimenter support
This patch is the implementation for the following TODO.
- # TODO: add ofp_queue_prop_experimenter

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:28:40 +09:00
Yusuke Iwase
f99d0cf84a ofproto_v1_3_parser: Backport OFPTableFeatureProp class
This patch backports OFPTableFeatureProp class from
ofproto_v1_[45]_parser.py.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:28:40 +09:00
Yusuke Iwase
1a6b3e75cb ofproto_v1_[45]_parser: Add missing OFPTFPT_EXPERIMENTER_MISS
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:28:40 +09:00
Yusuke Iwase
189d5d5bfd ofproto_v1_3_parser: Backport OFPPropBase/OFPPropCommonExperimenter4ByteData
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:28:40 +09:00
Yusuke Iwase
ec73df506e test_parser: Fix some expected json representations
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:28:40 +09:00
Yusuke Iwase
90f75158b0 ofproto_v1_[45]_parser: Fix to parse experimenter_data
This patch fixes to parse experimenter_data of ofp_*_prop_experimenter
as a list of uint32_t values at OFPPropCommonExperimenter4ByteData.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:28:40 +09:00
Yusuke Iwase
0b5dd61930 ofproto_v1_[345]: Define common structure for experimenter property
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:28:39 +09:00
Yusuke Iwase
e61ade46d9 ofproto_v1_4_parser: Move utility method to OFPPropBase
The backport from ofproto_v1_5_parser: This patch moves get_rest()
and serialize() from OFPTableFeatureProp to OFPPropBase in order
to share it with other subclass.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:28:39 +09:00
Yusuke Iwase
3af4f650f8 test_parser: Add test case for OFP15 packet_out
TODO: Because Open vSwitch (lib/ofp-util) does not support OF1.5
packet_out structure [EXT-427] yet, re-generate the packet data by
using packet_data_generator2 when Open vSwitch supports it.

Reference: OpenFlow 1.1+ support status of Open vSwitch
https://github.com/openvswitch/ovs/blob/master/OPENFLOW-1.1%2B.md

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:22:12 +09:00
Yusuke Iwase
3be0ac4b35 ofproto_v1_5_parser: Enable setting OFPMatch in OFPPacketOut message
OpenFlow 1.5 supports setting all pipeline field of the packet
in the Packet-Out message.

This patch adds match field in packet_out message and moves the
in_port field into the match field.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:22:12 +09:00
Yusuke Iwase
0841ac66ed test_parser: Add test case for OFP15 controller connection status messages
TODO: Because Open vSwitch (lib/ofp-util) does not support
controller connection status messages [EXT-454] yet,
re-generate the packet data by using packet_data_generator2
when Open vSwitch supports it.

Reference: OpenFlow 1.1+ support status of Open vSwitch
https://github.com/openvswitch/ovs/blob/master/OPENFLOW-1.1%2B.md

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:22:12 +09:00
Yusuke Iwase
0d9dfe33de test_parser: Add implemented type for OFPT_CONTROLLER_STATUS
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:22:12 +09:00
Yusuke Iwase
d7fd76fd0e ofproto_v1_5_parser: Add OFPControllerStatusStats support
OpenFlow Spec 1.5 introduces controller status multipart messages
to query status of controller connections.

This patch adds controller status multipart messages support.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:22:12 +09:00
Yusuke Iwase
57e1fa741e ofproto_v1_5_parser: Add OFPControllerStatus support
OpenFlow Spec 1.5 introduces controller status message to inform
controller of changes in connection status.

This patch adds controller status message support.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:22:12 +09:00
Yusuke Iwase
2a0d6862d2 ofproto_v1_5_parser: Add OFPControllerStatusProp support
OpenFlow Spec 1.5 introduces controller status property to describe
additional controller status information.

This patch add controller status property support.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:22:12 +09:00
Yusuke Iwase
7ec9537b06 ofproto_v1_5_parser: Enable OFPRoleRequest to set short_id
OpenFlow Spec 1.5 introduces short_id to identify controller
themselves and enables ofp_role_request to set short_id.

This patch adds short_id field into OFPRoleRequest message.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:22:11 +09:00
Takeshi
6cdc2720f1 Add register_service to topology events
If an application consumes topology event,  Switches application should
start automatically.

Signed-off-by: Takeshi <a86487817@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:14:22 +09:00
Takeshi
2281b7a6ae Add EventHostAdd event.
This event is generated when a new host is added to a switch.

Signed-off-by: Takeshi <a86487817@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 18:14:19 +09:00
Jason Kölker
59da77306c Allow specifing match fields in ClsRule.__init__
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 17:35:27 +09:00
Jason Kölker
1d30f0987f Sprinkle StringifyMixin
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 17:35:26 +09:00
Jason Kölker
2fb5871a56 PEP8 Line length
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 17:35:26 +09:00
Jason Kölker
31acdf8462 Remove unused import
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-20 17:35:26 +09:00
Jason Kölker
6921b54ac5 Stop old app on reconnection
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-18 00:11:04 +09:00
Jason Kölker
5c4a199c7c Use system_id from event
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-18 00:11:04 +09:00
Jason Kölker
2119e6c787 Handle disconnection during discover_system_id
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-18 00:11:04 +09:00
IWAMOTO Toshihiro
d71d84fe08 test_parser: Add tests generated by packet_data_generator3
This includes tests for recently added nicira extensions.

Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-11 13:17:15 +09:00
IWAMOTO Toshihiro
ea85625f63 Introduce packet_data_generator3
packet_data_generator3 works as a UNIX domain socket server and
executes ovs-ofctl to collect flow_mod packets.

Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-11 13:17:15 +09:00
IWAMOTO Toshihiro
68ed177295 test_parser: prepare for tests with packet_data_generator3
Be able to specify xid in packet.json files, as data generated by
packet_data_generator3 have non-zero xid.  Also, give some detail
on data mismatch in order to ease debugging.

Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-11 13:17:15 +09:00
IWAMOTO Toshihiro
94750b9092 Add register0 for nicira extensions
It was missing in the previous commit.

Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-11 13:17:15 +09:00
Yusuke Iwase
e0c19a2ecd packet_data_generator2: Add Makefile for GNU environment
The existing Makefile seems to suppose the BSD environment.
This patch renames existing Makefile into "Makefile.BSD" and
adds "Makefile.GNU" for GNU environment.

Usage Example:

 - For BSD environment
   $ make -f Makefile.BSD

 - For GNU environment
   $ make -f Makefile.GNU

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2015-08-11 10:50:54 +09:00