From: Isaku Yamahata <[email protected]> Signed-off-by: Isaku Yamahata <[email protected]> --- Changes v3 -> v4: - eventlet - comment
Changes v2 -> v3: - VRRP Linux device tests with sample manager/router Signed-off-by: YAMAMOTO Takashi <[email protected]> --- ryu/tests/integrated/test_vrrp.py | 135 ++++++++++++++++++ ryu/tests/integrated/test_vrrp_linux.py | 112 +++++++++++++++ ryu/tests/integrated/test_vrrp_linux_multi.py | 161 ++++++++++++++++++++++ ryu/tests/integrated/test_vrrp_multi.py | 189 ++++++++++++++++++++++++++ 4 files changed, 597 insertions(+) create mode 100644 ryu/tests/integrated/test_vrrp.py create mode 100644 ryu/tests/integrated/test_vrrp_linux.py create mode 100644 ryu/tests/integrated/test_vrrp_linux_multi.py create mode 100644 ryu/tests/integrated/test_vrrp_multi.py diff --git a/ryu/tests/integrated/test_vrrp.py b/ryu/tests/integrated/test_vrrp.py new file mode 100644 index 0000000..8dca20c --- /dev/null +++ b/ryu/tests/integrated/test_vrrp.py @@ -0,0 +1,135 @@ +# Copyright (C) 2013 Nippon Telegraph and Telephone Corporation. +# Copyright (C) 2013 Isaku Yamahata <yamahata at valinux co jp> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +""" +Usage: +PYTHONPATH=. ./bin/ryu-manager --verbose \ + ./ryu/topology/switches.py \ + ./ryu/services/vrrp/manager.py \ + ./ryu/tests/integrated/test_vrrp.py \ + ./ryu/services/vrrp/dumper.py + +./ryu/services/vrrp/dumper.py is optional. +And then configure OF switch to connect Ryu. + +Example: +Use namespace not to send VRRP packet to outside +another vrrp daemon can be run under vrrpd-dump name space if you like. + + ----- ---------------------- + |OVS|<--veth-->|vrrp-dump name space| + ----- ---------------------- + +# ip netns add vrrp-dump +# ip link add veth-ovs type veth peer name veth-dump +# ip link set netns vrrp-dump veth-dump +# ip netns exec vrrp-dump tshark -i veth-dump +# ovs-vsctl add-br s0 +# ovs-vsctl add-port s0 veth-ovs +# ovs-vsctl set bridge s0 protocols='[OpenFlow12]' +# ovs-vsctl set-controller s0 tcp:127.0.0.1:6633 +# ip link set veth-ovs up +# ip link set veth-dump up + +If you like, vrrpd can be run in vrrp-dump netns +# ip netns exec vrrp-dump vrrpd -i veth-dump -v 7 10.0.0.1 +NOTE: vrid: 7 and ip address: 10.0.0.1 are hardcoded below +""" + +import netaddr +import time + +from ryu.base import app_manager +from ryu.controller import handler +from ryu.lib import dpid as lib_dpid +from ryu.lib import hub +from ryu.lib import mac as lib_mac +from ryu.lib.packet import vrrp +from ryu.services.vrrp import api as vrrp_api +from ryu.services.vrrp import event as vrrp_event +from ryu.topology import event as topo_event + + +_VRID = 7 +_IP_ADDRESS = '10.0.0.1' + + +class VRRPConfigApp(app_manager.RyuApp): + def __init__(self, *args, **kwargs): + super(VRRPConfigApp, self).__init__(*args, **kwargs) + self.start_main = False + + @handler.set_ev_cls(topo_event.EventSwitchEnter) + def _switch_enter_handler(self, ev): + if not self.start_main: + self.start_main = True + hub.spawn(self._main) + + def _main(self): + time.sleep(1) + self._main_version(vrrp.VRRP_VERSION_V3) + time.sleep(5) + self._main_version(vrrp.VRRP_VERSION_V2) + + def _main_version(self, vrrp_version): + self._main_version_priority(vrrp_version, + vrrp.VRRP_PRIORITY_ADDRESS_OWNER) + time.sleep(5) + self._main_version_priority(vrrp_version, + vrrp.VRRP_PRIORITY_BACKUP_DEFAULT) + + def _main_version_priority(self, vrrp_version, priority): + self._main_version_priority_sleep(vrrp_version, priority, False) + time.sleep(5) + self._main_version_priority_sleep(vrrp_version, priority, True) + + def _main_version_priority_sleep(self, vrrp_version, priority, do_sleep): + app_mgr = app_manager.AppManager.get_instance() + self.logger.debug('%s', app_mgr.applications) + vrrp_mgr = app_mgr.applications['VRRPManager'] + switches = app_mgr.applications['switches'] + + self.logger.debug('%s', switches.dps) + dpid = switches.dps.keys()[0] + self.logger.debug('%s', lib_dpid.dpid_to_str(dpid)) + self.logger.debug('%s', switches.port_state) + port_no = switches.port_state[dpid].keys()[0] + self.logger.debug('%d', port_no) + port = switches.port_state[dpid][port_no] + self.logger.debug('%s', port) + mac = port.hw_addr + self.logger.debug('%s', lib_mac.haddr_to_str(mac)) + + ip_addr = _IP_ADDRESS + ip_addr = netaddr.IPAddress(ip_addr).value + interface = vrrp_event.VRRPInterfaceOpenFlow( + mac, ip_addr, None, dpid, port_no) + self.logger.debug('%s', interface) + + config = vrrp_event.VRRPConfig( + version=vrrp_version, vrid=_VRID, priority=priority, + ip_addresses=[ip_addr]) + self.logger.debug('%s', config) + + rep = vrrp_api.vrrp_config(self, interface, config) + self.logger.debug('%s', rep) + + self.logger.debug('%s', vrrp_mgr._instances) + + if do_sleep: + time.sleep(10) + + vrrp_api.vrrp_shutdown(self, rep.instance_name) diff --git a/ryu/tests/integrated/test_vrrp_linux.py b/ryu/tests/integrated/test_vrrp_linux.py new file mode 100644 index 0000000..699ee1c --- /dev/null +++ b/ryu/tests/integrated/test_vrrp_linux.py @@ -0,0 +1,112 @@ +# Copyright (C) 2013 Nippon Telegraph and Telephone Corporation. +# Copyright (C) 2013 Isaku Yamahata <yamahata at valinux co jp> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +""" +Usage: +PYTHONPATH=. ./bin/ryu-manager --verbose \ + ./ryu/services/vrrp/manager.py \ + ./ryu/tests/integrated/test_vrrp_linux.py \ + ./ryu/services/vrrp/dumper.py + +./ryu/services/vrrp/dumper.py is optional. + +Example: +Use namespace not to send VRRP packet to outside +another vrrp daemon can be run under vrrpd-dump name space if you like. + + ----- ---------------------- + |Ryu|<--veth-->|vrrp-dump name space| + ----- ---------------------- + +# ip netns add vrrp-dump +# ip link add veth0 type veth peer name veth0-dump +# ip link set netns vrrp-dump veth0-dump +# ip netns exec vrrp-dump tshark -i veth0-dump +# ip link set veth0 up +# ip link set veth0-dump up + +If you like, vrrpd can be run in vrrp-dump netns +# ip netns exec vrrp-dump vrrpd -i veth0-dump -v 7 10.0.0.1 +NOTE: vrid: 7 and ip address: 10.0.0.1 are hardcoded below +""" + +import netaddr +import time + +from ryu.base import app_manager +from ryu.lib import hub +from ryu.lib import mac as lib_mac +from ryu.lib.packet import vrrp +from ryu.services.vrrp import api as vrrp_api +from ryu.services.vrrp import event as vrrp_event + + +_IFNAME = 'veth0' +_VRID = 7 +_IP_ADDRESS = '10.0.0.1' + + +class VRRPConfigApp(app_manager.RyuApp): + def __init__(self, *args, **kwargs): + super(VRRPConfigApp, self).__init__(*args, **kwargs) + + def start(self): + hub.spawn(self._main) + + def _main(self): + time.sleep(1) + self._main_version(vrrp.VRRP_VERSION_V3) + time.sleep(5) + self._main_version(vrrp.VRRP_VERSION_V2) + + def _main_version(self, vrrp_version): + self._main_version_priority(vrrp_version, + vrrp.VRRP_PRIORITY_ADDRESS_OWNER) + time.sleep(5) + self._main_version_priority(vrrp_version, + vrrp.VRRP_PRIORITY_BACKUP_DEFAULT) + + def _main_version_priority(self, vrrp_version, priority): + self._main_version_priority_sleep(vrrp_version, priority, False) + time.sleep(5) + self._main_version_priority_sleep(vrrp_version, priority, True) + + def _main_version_priority_sleep(self, vrrp_version, priority, do_sleep): + app_mgr = app_manager.AppManager.get_instance() + self.logger.debug('%s', app_mgr.applications) + vrrp_mgr = app_mgr.applications['VRRPManager'] + + ip_addr = _IP_ADDRESS + ip_addr = netaddr.IPAddress(ip_addr).value + ifname = _IFNAME + interface = vrrp_event.VRRPInterfaceNetworkDevice( + lib_mac.DONTCARE, ip_addr, None, ifname) + self.logger.debug('%s', interface) + + config = vrrp_event.VRRPConfig( + version=vrrp_version, vrid=_VRID, priority=priority, + ip_addresses=[ip_addr]) + self.logger.debug('%s', config) + + rep = vrrp_api.vrrp_config(self, interface, config) + self.logger.debug('%s', rep) + + self.logger.debug('%s', vrrp_mgr._instances) + + if do_sleep: + time.sleep(10) + + vrrp_api.vrrp_shutdown(self, rep.instance_name) diff --git a/ryu/tests/integrated/test_vrrp_linux_multi.py b/ryu/tests/integrated/test_vrrp_linux_multi.py new file mode 100644 index 0000000..833b65c --- /dev/null +++ b/ryu/tests/integrated/test_vrrp_linux_multi.py @@ -0,0 +1,161 @@ +# Copyright (C) 2013 Nippon Telegraph and Telephone Corporation. +# Copyright (C) 2013 Isaku Yamahata <yamahata at valinux co jp> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +""" +Usage: +PYTHONPATH=. ./bin/ryu-manager --verbose \ + ./ryu/services/vrrp/manager.py \ + ./ryu/services/vrrp/dumper.py \ + ./ryu/services/vrrp/sample_manager.py \ + ./ryu/tests/integrated/test_vrrp_linux_multi.py + +./ryu/services/vrrp/dumper.py is optional. + + ---------------- + /--<--veth-->| | + Ryu | linux bridge |<--veth--> command to generate packets + \--<--veth-->| | + ---------------- + + +# ip link add veth0 type veth peer name veth0-br +# ip link add veth1 type veth peer name veth1-br +# ip link add veth2 type veth peer name veth2-br + +# brctl addbr vrrpbr +# brctl addif vrrpbr veth0-br +# brctl addif vrrpbr veth1-br +# brctl addif vrrpbr veth2-br + + +# ip link set veth0 up +# ip link set veth0-br up +# ip link set veth1 up +# ip link set veth1-br up +# ip link set veth2 up +# ip link set veth2-br up +# ip link set vrrpbr up + +if you like, capture packets on each interfaces like +# tshark -i vrrpbr +# tshark -i veth0 +# tshark -i veth1 +# tshark -i veth2 + +virtual router mac address: 00:00:5E:00:01:{VRID} = 00:00:5E:00:01:07 +during working, send packets destined to mac address 00:00:5E:00:01:07 +from veth2 by packet generator like packeth + +NOTE: vrid: 7 and ip address: 10.0.0.1... are hardcoded below +""" + +import netaddr +import time + +from ryu.base import app_manager +from ryu.lib import hub +from ryu.lib import mac as lib_mac +from ryu.lib.packet import vrrp +from ryu.services.vrrp import api as vrrp_api +from ryu.services.vrrp import event as vrrp_event + + +_VRID = 7 +_IP_ADDRESS = '10.0.0.1' + +_IFNAME0 = 'veth0' +_PRIMARY_IP_ADDRESS0 = '10.0.0.2' + +_IFNAME1 = 'veth1' +_PRIMARY_IP_ADDRESS1 = '10.0.0.3' + +# _IFNAME = 'eth2' +# _VRID = 1 +# _IP_ADDRESS = '172.17.107.2' + + +class VRRPConfigApp(app_manager.RyuApp): + def __init__(self, *args, **kwargs): + super(VRRPConfigApp, self).__init__(*args, **kwargs) + self.logger.info( + 'virtual router mac address = %s', + lib_mac.haddr_to_str(vrrp.vrrp_ipv4_src_mac_address(_VRID))) + + def start(self): + hub.spawn(self._main) + + def _main(self): + time.sleep(1) + self._main_version(vrrp.VRRP_VERSION_V3) + time.sleep(5) + self._main_version(vrrp.VRRP_VERSION_V2) + + def _main_version(self, vrrp_version): + self._main_version_priority(vrrp_version, + vrrp.VRRP_PRIORITY_ADDRESS_OWNER) + time.sleep(5) + self._main_version_priority(vrrp_version, + vrrp.VRRP_PRIORITY_BACKUP_MAX) + time.sleep(5) + self._main_version_priority(vrrp_version, + vrrp.VRRP_PRIORITY_BACKUP_DEFAULT) + time.sleep(5) + self._main_version_priority(vrrp_version, + vrrp.VRRP_PRIORITY_BACKUP_MIN) + + def _main_version_priority(self, vrrp_version, priority): + self._main_version_priority_sleep(vrrp_version, priority, False) + time.sleep(5) + self._main_version_priority_sleep(vrrp_version, priority, True) + + def _configure_vrrp_router(self, vrrp_version, priority, + primary_ip_address, ifname): + primary_ip_address = netaddr.IPAddress(primary_ip_address) + interface = vrrp_event.VRRPInterfaceNetworkDevice( + lib_mac.DONTCARE, primary_ip_address, None, ifname) + self.logger.debug('%s', interface) + + ip_addresses = [netaddr.IPAddress(_IP_ADDRESS).value] + config = vrrp_event.VRRPConfig( + version=vrrp_version, vrid=_VRID, priority=priority, + ip_addresses=ip_addresses) + self.logger.debug('%s', config) + + rep = vrrp_api.vrrp_config(self, interface, config) + self.logger.debug('%s', rep) + + return rep + + def _main_version_priority_sleep(self, vrrp_version, priority, do_sleep): + app_mgr = app_manager.AppManager.get_instance() + self.logger.debug('%s', app_mgr.applications) + vrrp_mgr = app_mgr.applications['VRRPManager'] + + rep0 = self._configure_vrrp_router(vrrp_version, priority, + _PRIMARY_IP_ADDRESS0, _IFNAME0) + rep1 = self._configure_vrrp_router( + vrrp_version, vrrp.VRRP_PRIORITY_BACKUP_DEFAULT, + _PRIMARY_IP_ADDRESS1, _IFNAME1) + + self.logger.debug('%s', vrrp_mgr._instances) + + if do_sleep: + time.sleep(10) + + vrrp_api.vrrp_shutdown(self, rep0.instance_name) + if do_sleep: + time.sleep(10) + vrrp_api.vrrp_shutdown(self, rep1.instance_name) diff --git a/ryu/tests/integrated/test_vrrp_multi.py b/ryu/tests/integrated/test_vrrp_multi.py new file mode 100644 index 0000000..bf6414e --- /dev/null +++ b/ryu/tests/integrated/test_vrrp_multi.py @@ -0,0 +1,189 @@ +# Copyright (C) 2013 Nippon Telegraph and Telephone Corporation. +# Copyright (C) 2013 Isaku Yamahata <yamahata at valinux co jp> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +""" +Usage: +PYTHONPATH=. ./bin/ryu-manager --verbose \ + ./ryu/topology/switches.py \ + ./ryu/services/vrrp/manager.py \ + ./ryu/tests/integrated/test_vrrp.py \ + ./ryu/services/vrrp/dumper.py + +./ryu/services/vrrp/dumper.py is optional. + + ----- -------------- ----- + |OVS|<--veth-->|Linux bridge|<--veth-->|OVS| + ----- -------------- ----- + +configure OVSs to connect ryu +example +# brctl addbr b0 +# ip link add veth0-ovs type veth peer name veth0-br +# ip link add veth1-ovs type veth peer name veth1-br +# brctl addif b0 veth0-br +# brctl addif b0 veth1-br +# brctl show +bridge name bridge id STP enabled interfaces +b0 8000.6642e5822497 no veth0-br + veth1-br +ovs-system 0000.122038293b55 no + +# ovs-vsctl add-br s0 +# ovs-vsctl add-port s0 veth0-ovs +# ovs-vsctl add-br s1 +# ovs-vsctl add-port s1 veth1-ovs +# ovs-vsctl set-controller s0 tcp:127.0.0.1:6633 +# ovs-vsctl set bridge s0 protocols='[OpenFlow12]' +# ovs-vsctl set-controller s1 tcp:127.0.0.1:6633 +# ovs-vsctl set bridge s1 protocols='[OpenFlow12]' +# ovs-vsctl show +20c2a046-ae7e-4453-a576-11034db24985 + Manager "ptcp:6634" + Bridge "s0" + Controller "tcp:127.0.0.1:6633" + is_connected: true + Port "veth0-ovs" + Interface "veth0-ovs" + Port "s0" + Interface "s0" + type: internal + Bridge "s1" + Controller "tcp:127.0.0.1:6633" + is_connected: true + Port "veth1-ovs" + Interface "veth1-ovs" + Port "s1" + Interface "s1" + type: internal + ovs_version: "1.9.90" +# ip link veth0-br set up +# ip link veth0-ovs set up +# ip link veth1-br set up +# ip link veth1-ovs set up +# ip link b0 set up +""" + +import netaddr +import time + +from ryu.base import app_manager +from ryu.controller import handler +from ryu.lib import dpid as lib_dpid +from ryu.lib import hub +from ryu.lib import mac as lib_mac +from ryu.lib.packet import vrrp +from ryu.services.vrrp import api as vrrp_api +from ryu.services.vrrp import event as vrrp_event +from ryu.topology import event as topo_event +from ryu.topology import api as topo_api + + +class VRRPConfigApp(app_manager.RyuApp): + def __init__(self, *args, **kwargs): + super(VRRPConfigApp, self).__init__(*args, **kwargs) + self.start_main = False + + @handler.set_ev_cls(topo_event.EventSwitchEnter) + def _switch_enter_handler(self, ev): + if self.start_main: + return + + switches = topo_api.get_switch(self) + if len(switches) < 2: + return + + self.start_main = True + hub.spawn(self._main) + + def _main(self): + time.sleep(1) + self.logger.debug('########## test start ##########') + self._main_version(vrrp.VRRP_VERSION_V3) + time.sleep(5) + self._main_version(vrrp.VRRP_VERSION_V2) + self.logger.debug('########## test done ##########') + + def _main_version(self, vrrp_version): + self._main_version_priority(vrrp_version, + vrrp.VRRP_PRIORITY_ADDRESS_OWNER) + time.sleep(5) + self._main_version_priority(vrrp_version, + vrrp.VRRP_PRIORITY_BACKUP_MAX) + time.sleep(5) + self._main_version_priority(vrrp_version, + vrrp.VRRP_PRIORITY_BACKUP_DEFAULT) + time.sleep(5) + self._main_version_priority(vrrp_version, + vrrp.VRRP_PRIORITY_BACKUP_MIN) + + def _main_version_priority(self, vrrp_version, priority): + self._main_version_priority_sleep(vrrp_version, priority, False) + time.sleep(5) + self._main_version_priority_sleep(vrrp_version, priority, True) + + def _config_switch(self, switches, switch_index, + vrrp_version, ip_addr, priority): + self.logger.debug('%s', switches.dps) + dpid = switches.dps.keys()[switch_index] + self.logger.debug('%s', lib_dpid.dpid_to_str(dpid)) + self.logger.debug('%s', switches.port_state) + port_no = switches.port_state[dpid].keys()[0] + self.logger.debug('%d', port_no) + port = switches.port_state[dpid][port_no] + self.logger.debug('%s', port) + mac = port.hw_addr + self.logger.debug('%s', lib_mac.haddr_to_str(mac)) + + ip_addr = netaddr.IPAddress(ip_addr).value + interface = vrrp_event.VRRPInterfaceOpenFlow( + mac, ip_addr, None, dpid, port_no) + self.logger.debug('%s', interface) + + config = vrrp_event.VRRPConfig( + version=vrrp_version, vrid=7, priority=priority, + ip_addresses=[ip_addr]) + self.logger.debug('%s', config) + + rep = vrrp_api.vrrp_config(self, interface, config) + self.logger.debug('%s', rep) + return rep + + def _main_version_priority_sleep(self, vrrp_version, priority, do_sleep): + self.logger.debug('########## ' + 'test vrrp_verson %s priority %d do_sleep %d ' + '##########', + vrrp_version, priority, do_sleep) + app_mgr = app_manager.AppManager.get_instance() + self.logger.debug('%s', app_mgr.applications) + vrrp_mgr = app_mgr.applications['VRRPManager'] + switches = app_mgr.applications['switches'] + + rep1 = self._config_switch(switches, 1, vrrp_version, '10.0.0.2', + vrrp.VRRP_PRIORITY_BACKUP_DEFAULT) + if do_sleep: + time.sleep(5) + rep0 = self._config_switch(switches, 0, vrrp_version, '10.0.0.1', + priority) + + self.logger.debug('%s', vrrp_mgr._instances) + + if do_sleep: + time.sleep(10) + + vrrp_api.vrrp_shutdown(self, rep0.instance_name) + if do_sleep: + time.sleep(10) + vrrp_api.vrrp_shutdown(self, rep1.instance_name) -- 1.8.1.5 ------------------------------------------------------------------------------ Get your SQL database under version control now! Version control is standard for application code, but databases havent caught up. So what steps can you take to put your SQL databases under version control? Why should you start doing it? Read more to find out. http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
