summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2014-05-10packet/bgp: bug fix of route target nlri classISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10bgp: fix bug of accessing dead socketISHIDA Wataru
BGP session can be closed by sending inappropriate messages. So touching socket by get_peername() after sending messages may cause an exception. Though we can handle this by try..exception, I fixed to simply call get_peername() before sending messages because session disconnection by sending messages is an ordinary procedure and not an exception(the peer will send notification before disconnection). Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10bgp: improve how to show ribISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10bgp: fix typoISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10packet/bgp: enhanced route refresh supportISHIDA Wataru
Enhanced Route Refresh(draft-ietf-idr-bgp-enhanced-route-refresh) uses reserved fields in a Route Refresh message as demarcation fileds. Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10packet/bgp: fix bug in serializing AS PATH path attributeISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10bgp: add ssh clientISHIDA Wataru
add ssh client which has basic bash keybinds and tab complement. to use, you have to create ssh key at first then specify the location of the key in ryu configuration files. configuration file will be like this. > ryu.conf > == > [DEFAULT] > cli_ssh_hostkey=/home/user/.ssh/id_rsa after this, run operator/ssh.py with application.py $ ryu-manager --config-file=ryu.conf application.py operator/ssh.py you can login by $ ssh ryu@localhost -p 4990 Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10bgp: fix wrong module pathISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10packet/bgp: add helper methods to nlri class for bgp ssh clientISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10bgp: don't block at start methodISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10bgp: bug fix when the peer initiated the connection.ISHIDA Wataru
set binded ip and port properly regardless of the direction of connection Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10bgp: remove unnecessary log messageISHIDA Wataru
update msg without MpReachNlri or MpUnReachNlri is now normal Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10set default attributes for OFPPortModYuichi Ito
Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
2014-05-10sw test tool: pylintYuichi Ito
W:546,14: Access to a protected member _send_msg of a client class (protected-access) Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
2014-05-10sw test tool: Remove unused codesYuichi Ito
Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
2014-05-10sw test tool: Reduce similar methodsYuichi Ito
- _test_flow_install() - _test_meter_install() are merged as - _test_msg_install() Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
2014-05-09Added queue stats requestKiyonari Harigae
Here is added queue status request to ofctl. Signed-off-by: Kiyonari Harigae <lakshmi@cloudysunny14.org> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-09Added ovs-vsctl commands of QoS-relatedKiyonari Harigae
Here is added the command of QoS-related, such as the following: ovs-vsctl -- set port eth1 qos=@newqos \ -- --id=@newqos create qos type=linux-htb other-config:max-rate=30000000 queues=0=@q0,1=@q1 \ -- --id=@q0 create queue other-config:min-rate=1000000 other-config:max-rate=1000000 \ -- --id=@q1 create queue other-config:min-rate=2000000 other-config:max-rate=2000000 Also, operation that delete QoS is supported. Note that It supports only deletion of relationships with QoS record. Signed-off-by: Kiyonari Harigae <lakshmi@cloudysunny14.org> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-01Ryu 3.9FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-25sw test tool: Modify lengths of pad fields for ARPYuichi Ito
Wireshark may misunderstand a MAC frame (including ARP) whose length is 64 bytes or more, as a frame with the FCS field. This patch fixes the issue by modifying lengths of pad fields for ARP. This patch modifies lengths of pad fields as follows: - Add 18 bytes for MAC frames (including ARP, without VLAN/MPLS/PBB). - Add 18 bytes for MAC frames related to POP_MPLS/POP_PBB. Reported-by: Arne Goetje <arne_goetje@accton.com> Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-25sw test tool: Revert changes of test filesYuichi Ito
This reverts commit d1b9e371dbfd130cf6685046de287bfd79d8a164. Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-25tests/integrated: Enable MPLS set-field and push MPLS testsSimon Horman
Enable disabled MPLS tests, they appear to be supported by Open vSwitch. I noticed this when using Open vSwitch's "make ryu-check" as Open vSwitch enforces action consistency for the set NW TTL action. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-25tests/integrated: Match on MPLS dl_type for flows with MPLS TTL actionsSimon Horman
OpenFlow 1.2 section 6.7 describes inconsistent action in a flow as an action whose operation is inconsistent with the flows match. In terms of the above MPLS TTL actions are inconsistent if the flow does not match on one of the MPLS dl_types. This patch add such a match for the flows that have MPLS TTL actions. Also enable these tests, they appear to be supported by Open vSwitch. I noticed this when using Open vSwitch's "make ryu-check" as Open vSwitch enforces action consistency for the set NW TTL action. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-25tests/integrated: Match on MPLS dl_type for flows with pop MPLS actionsSimon Horman
OpenFlow 1.2 section 6.7 describes inconsistent action in a flow as an action whose operation is inconsistent with the flows match. In terms of the above pop MPLS actions are inconsistent if the flow does not match on one of the MPLS dl_types. This patch add such a match for the flow that has a pop MPLS action. Also enable the pop MPLS test, it appears to be supported by Open vSwitch. I noticed this when using Open vSwitch's "make ryu-check" as Open vSwitch enforces action consistency for the set NW TTL action. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-25tests/integrated: Match on IP dl_type for flows with set IPv6 addressesSimon Horman
OpenFlow 1.2 section 6.7 describes inconsistent action in a flow as an action whose operation is inconsistent with the flows match. In terms of the above the set-field actions for IPv6 addresses are inconsistent if it the flow does not match on the IPv6 dl_type. This patch add such a match for those that have set-field actions for IPv6 addresses. Also enable these tests, they appear to be supported by Open vSwitch. I noticed this when using Open vSwitch's "make ryu-check" as Open vSwitch enforces action consistency for the set NW TTL action. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-25tests/integrated: Enable ARP testsSimon Horman
Enable ARP tests, they appear to be supported by Open vSwitch. I noticed this when using Open vSwitch's "make ryu-check" as Open vSwitch enforces action consistency for the set NW TTL action. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-25tests/integrated: Match on IP dl_type for flows with set NW TTL actionsSimon Horman
OpenFlow 1.2 section 6.7 describes inconsistent action in a flow as an action whose operation is inconsistent with the flows match. In terms of the above the set NW TTL action is inconsistent if it the flow does not match on the IPv4 or IPv6 dl_type because the action manipulates either the IPv4 TTL or the IPv6 hop limit. This patch splits the testing of the set NW TTL action into two tests, one for each of IPv4 and IPv6, including a match on the corresponding dl_type in the flow. Also enable these tests, they appear to be supported by Open vSwitch. I noticed this when using Open vSwitch's "make ryu-check" as Open vSwitch enforces action consistency for the set NW TTL action. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-25tests/integrated: Match on VLAN tag for flows which set VLAN tagsSimon Horman
OpenFlow 1.2 section 6.7 describes inconsistent action in a flow as an action whose operation is inconsistent with the flows match. In terms of the above a set-field action for a VLAN tag is considered inconsistent if it the flow does not match on a VLAN tag. This patch add such a match for the flow that has a set-field action for a VLAN tag. I noticed this when using Open vSwitch's "make ryu-check" as Open vSwitch enforces action consistency for set-field actions for VLAN tags. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-25tests/integrated: Match on VLAN tag for flows with pop VLAN TTL actionsSimon Horman
OpenFlow 1.2 section 6.7 describes inconsistent action in a flow as an action whose operation is inconsistent with the flows match. In terms of the above the pop ttl action is considered inconsistent if it the flow does not match on a VLAN tag. This patch add such a match for the flow that has a pop VLAN action. I noticed this when using Open vSwitch's "make ryu-check" as Open vSwitch enforces action consistency for the pop VLAN TTL action. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-25tests/integrated: Match on IP dl_type for flows with dec NW TTL actionsSimon Horman
OpenFlow 1.2 section 6.7 describes inconsistent action in a flow as an action whose operation is inconsistent with the flows match. In terms of the above the dec NW TTL action is inconsistent if it the flow does not match on the IPv4 or IPv6 dl_type because the action manipulates either the IPv4 TTL or the IPv6 hop limit. This patch splits the testing of the dec NW TTL action into two tests, one for each of IPv4 and IPv6, including a match on the corresponding dl_type in the flow. I noticed this when using Open vSwitch's "make ryu-check" as Open vSwitch enforces action consistency for the dec NW TTL action. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-25tests/integrated: Do not verify buffer_id of packet_in resulting from packet_outSimon Horman
When a packet_in message results from a packet_out message there is no particular relationship between the buffer_ids of the two messages. I noticed this when using Open vSwitch's "make ryu-check". Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-24sw test tool: Modify lengths of pad fields for ARPYuichi Ito
Wireshark may misunderstand a MAC frame (including ARP) whose length is 64 bytes or more, as a frame with the FCS field. This patch fixes the issue by modifying lengths of pad fields for ARP. Reported-by: Arne Goetje <arne_goetje@accton.com> Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-24packet lib: ipv6: support Routing header (type3)takahashi.minoru
Signed-off-by: TAKAHASHI Minoru <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-24sw test tool: Fix MAC addresses used in testsYuichi Ito
IEEE 802.3-2012 (3.2.3 Address fields) says: b) The first bit (LSB) shall be used in the Destination Address field as an address type designation bit to identify the Destination Address either as an individual or as a group address. If this bit is 0, it shall indicate that the address field contains an individual address. If this bit is 1, it shall indicate that the address field contains a group address that identifies none, one or more, or all of the stations connected to the LAN. In the Source Address field, the first bit is reserved and set to 0. c) The second bit shall be used to distinguish between locally or globally administered addresses. For globally administered (or U, universal) addresses, the bit is set to 0. If an address is to be assigned locally, this bit shall be set to 1. Note that for the broadcast address, this bit is also a 1. This patch fixes MAC addresses used in tests as follows: - set the first bit to 0 - set the second bit to 1 Reported-by: Arne Goetje <arne_goetje@accton.com> Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-24tests/integrated: Use table_id greater than the current table for goto-table ↵Simon Horman
instruction For a goto-table instruction use a table_id greater than the table in which a flow will be inserted. OpenFlow 1.2 section 5.6 stipulates that this is required. I noticed this when using Open vSwitch's "make ryu-check" as Open vSwitch enforces the above stipulation. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-24tests/integrated: Specify table_id for flow_mod modify testsSimon Horman
Use actual table ids rather than OFPTT_ALL for flow_mod modify tests as OpenFlow 1.2 section A3.4.1 stipulates that OFPTT_ALL is only valid for flow_mod delete requests. I noticed this when using Open vSwitch's "make ryu-check" as Open vSwitch enforces the above stipulation. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-24bgp: fix connect timeout errorFUJITA Tomonori
RROR 2014-04-23 11:54:59,239 hub 58 hub: uncaught exception: Traceback (most recent c\ all last): File "/Users/fujita/git/ryu/ryu/lib/hub.py", line 50, in _launch func(*args, **kwargs) File "/Users/fujita/git/ryu/ryu/services/protocols/bgp/base.py", line 239, in start self._run(*args, **kwargs) File "/Users/fujita/git/ryu/ryu/services/protocols/bgp/peer.py", line 448, in _run self._connect_loop(client_factory) File "/Users/fujita/git/ryu/ryu/services/protocols/bgp/peer.py", line 820, in _conne\ ct_loop bind_address=bind_addr) File "/Users/fujita/git/ryu/ryu/services/protocols/bgp/base.py", line 354, in _conne\ ct_tcp return sock UnboundLocalError: local variable 'sock' referenced before assignment Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-24bgp: add __init__.py filesFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-21packet lib: ipv6: Fix to calculate AH lengthtakahashi.minoru
RFC2402 says: All IPv6 extension headers, as per RFC 1883, encode the "Hdr Ext Len" field by first subtracting 1 (64-bit word) from the header length (measured in 64-bit words). AH is an IPv6 extension header. However, since its length is measured in 32-bit words, the "Payload Length" is calculated by subtracting 2 (32 bit words). This patch fixes as follows: return (int(size) - 1) * 8 -> return (int(size) + 2) * 4 ^ ^ ^ And, this patch also fixes a default argument of length. Signed-off-by: TAKAHASHI Minoru <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-21bgp: fix pep8ISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-21bgp: add sample configuration fileISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-21bgp: improve log visibilityISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-21bgp: avoid the trouble of having to explicitly specify IDs in configurationISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-21bgp: enable to use system IP addr implicitly for bindingISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-21bgp: enable default label rangeISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-21bgp: make bgpspeaker RyuAppISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-21bgp: use ryu.lib.hub instead of the direct use of eventletISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-21bgp: clean up codes which constructs an update messageISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-21bgp: fix typoISHIDA Wataru
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-04-21remove obsolete man pages (rpc_cli and neutron_ofagent_agent)FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>