mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
6749785cab
-when processing static nat rule, add a mangle table rule, to mark the traffic from the guest vm when it has associated static nat rule so that traffic gets routed using the route tabe of the device which has public ip associated -fix the case where nic_device_id is empty when ip is getting disassociated resulting in empty deviceid in ips.json -add utility methods in CsRule, and CsRoute to add 'ip rule' and 'ip route' rules respectivley -ensure traffic from all public interfaces are connection marked with device number, and restored for the reverse traffic. use the connection marked number to do device specific routing table lookup fill the device specific routing table with default route -component tests for testing multiple public interfaces of VR
50 lines
1.8 KiB
Python
Executable File
50 lines
1.8 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.
|
|
from pprint import pprint
|
|
from netaddr import *
|
|
|
|
|
|
def merge(dbag, ip):
|
|
added = False
|
|
nic_dev_id = None
|
|
for dev in dbag:
|
|
if dev == "id":
|
|
continue
|
|
for address in dbag[dev]:
|
|
if address['public_ip'] == ip['public_ip']:
|
|
if 'nic_dev_id' in address:
|
|
nic_dev_id = address['nic_dev_id']
|
|
dbag[dev].remove(address)
|
|
|
|
ipo = IPNetwork(ip['public_ip'] + '/' + ip['netmask'])
|
|
if 'nic_dev_id' in ip:
|
|
nic_dev_id = ip['nic_dev_id']
|
|
ip['device'] = 'eth' + str(nic_dev_id)
|
|
ip['broadcast'] = str(ipo.broadcast)
|
|
ip['cidr'] = str(ipo.ip) + '/' + str(ipo.prefixlen)
|
|
ip['size'] = str(ipo.prefixlen)
|
|
ip['network'] = str(ipo.network) + '/' + str(ipo.prefixlen)
|
|
if 'nw_type' not in ip.keys():
|
|
ip['nw_type'] = 'public'
|
|
if ip['nw_type'] == 'control':
|
|
dbag['eth' + str(nic_dev_id)] = [ip]
|
|
else:
|
|
dbag.setdefault('eth' + str(nic_dev_id), []).append(ip)
|
|
|
|
return dbag
|