as their equivalents are included in "multi" variants. Signed-off-by: YAMAMOTO Takashi <[email protected]> --- ryu/tests/integrated/test_vrrp.py | 135 -------------------------------- ryu/tests/integrated/test_vrrp_linux.py | 112 -------------------------- 2 files changed, 247 deletions(-) delete mode 100644 ryu/tests/integrated/test_vrrp.py delete mode 100644 ryu/tests/integrated/test_vrrp_linux.py
diff --git a/ryu/tests/integrated/test_vrrp.py b/ryu/tests/integrated/test_vrrp.py deleted file mode 100644 index 8dca20c..0000000 --- a/ryu/tests/integrated/test_vrrp.py +++ /dev/null @@ -1,135 +0,0 @@ -# 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 deleted file mode 100644 index 699ee1c..0000000 --- a/ryu/tests/integrated/test_vrrp_linux.py +++ /dev/null @@ -1,112 +0,0 @@ -# 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) -- 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
