mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 11:52:28 +01:00
f60f3cec34
Previously, the ethernet device index was used as rt_table index and packet marking id/integer. With eth0 that is sometimes used as link-local interface, the rt_table index `0` would fail as `0` is already defined as a catchall (unspecified). The fwmarking on packets on eth0 with 0x0 would also fail. This fixes the routing issues, by adding 100 to the ethernet device index so the value is a non-zero, for example then the relationship between rt_table index and ethernet would be like: 100 -> Table_eth0 -> eth0 -> fwmark 100 or 0x64 101 -> Table_eth1 -> eth1 -> fwmark 101 or 0x65 102 -> Table_eth2 -> eth2 -> fwmark 102 or 0x66 This would maintain the legacy design of routing based on packet mark and appropriate routing table rules per table/ids. This also fixes a minor NPE issue around listing of snapshots. This also backports fixes to smoketests from master. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
121 lines
4.5 KiB
Python
Executable File
121 lines
4.5 KiB
Python
Executable File
# -- coding: utf-8 --
|
|
# Licensed to the Apache Software Foundation (ASF) under one
|
|
# or more contributor license agreements. See the NOTICE file
|
|
# distributed with this work for additional information
|
|
# regarding copyright ownership. The ASF licenses this file
|
|
# to you 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.
|
|
import CsHelper
|
|
import logging
|
|
|
|
|
|
class CsRoute:
|
|
|
|
""" Manage routes """
|
|
|
|
def __init__(self):
|
|
self.table_prefix = "Table_"
|
|
|
|
def get_tablename(self, name):
|
|
return self.table_prefix + name
|
|
|
|
def add_table(self, devicename):
|
|
tablenumber = 100 + int(devicename[3:])
|
|
tablename = self.get_tablename(devicename)
|
|
str = "%s %s" % (tablenumber, tablename)
|
|
filename = "/etc/iproute2/rt_tables"
|
|
logging.info("Adding route table: " + str + " to " + filename + " if not present ")
|
|
if not CsHelper.definedinfile(filename, str):
|
|
CsHelper.execute("sudo echo " + str + " >> /etc/iproute2/rt_tables")
|
|
# remove "from all table tablename" if exists, else it will interfer with
|
|
# routing of unintended traffic
|
|
if self.findRule("from all lookup " + tablename):
|
|
CsHelper.execute("sudo ip rule delete from all table " + tablename)
|
|
|
|
def flush_table(self, tablename):
|
|
CsHelper.execute("ip route flush table %s" % (tablename))
|
|
CsHelper.execute("ip route flush cache")
|
|
|
|
def add_route(self, dev, address):
|
|
""" Wrapper method that adds table name and device to route statement """
|
|
# ip route add dev eth1 table Table_eth1 10.0.2.0/24
|
|
table = self.get_tablename(dev)
|
|
logging.info("Adding route: dev " + dev + " table: " +
|
|
table + " network: " + address + " if not present")
|
|
cmd = "dev %s table %s %s" % (dev, table, address)
|
|
cmd = "default via %s table %s proto static" % (address, table)
|
|
self.set_route(cmd)
|
|
|
|
def add_network_route(self, dev, address):
|
|
""" Wrapper method that adds table name and device to route statement """
|
|
# ip route add dev eth1 table Table_eth1 10.0.2.0/24
|
|
table = self.get_tablename(dev)
|
|
logging.info("Adding route: dev " + dev + " table: " +
|
|
table + " network: " + address + " if not present")
|
|
cmd = "throw %s table %s proto static" % (address, table)
|
|
self.set_route(cmd)
|
|
|
|
def set_route(self, cmd, method="add"):
|
|
""" Add a route if it is not already defined """
|
|
found = False
|
|
search = cmd
|
|
if "throw" in search:
|
|
search = "type " + search
|
|
for i in CsHelper.execute("ip route show " + search):
|
|
found = True
|
|
if not found and method == "add":
|
|
logging.info("Add " + cmd)
|
|
cmd = "ip route add " + cmd
|
|
elif found and method == "delete":
|
|
logging.info("Delete " + cmd)
|
|
cmd = "ip route delete " + cmd
|
|
else:
|
|
return
|
|
CsHelper.execute(cmd)
|
|
|
|
def add_defaultroute(self, gateway):
|
|
""" Add a default route
|
|
:param str gateway
|
|
:return: bool
|
|
"""
|
|
if not gateway:
|
|
raise Exception("Gateway cannot be None.")
|
|
|
|
if self.defaultroute_exists():
|
|
return False
|
|
else:
|
|
cmd = "default via " + gateway
|
|
logging.info("Adding default route")
|
|
self.set_route(cmd)
|
|
return True
|
|
|
|
def defaultroute_exists(self):
|
|
""" Return True if a default route is present
|
|
:return: bool
|
|
"""
|
|
logging.info("Checking if default ipv4 route is present")
|
|
route_found = CsHelper.execute("ip -4 route list 0/0")
|
|
|
|
if len(route_found) > 0:
|
|
logging.info("Default route found: " + route_found[0])
|
|
return True
|
|
else:
|
|
logging.warn("No default route found!")
|
|
return False
|
|
|
|
def findRule(self, rule):
|
|
for i in CsHelper.execute("ip rule show"):
|
|
if rule in i.strip():
|
|
return True
|
|
return False
|