mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
c9ce3e2344
Since the CloudStack virtual router was redesigned on version 4.6 it has been observed that the DHCP leases file is not persistent across network operations. This causes conflicts on guest VMs static IPs, causing these static IPs to not be renewed by the DHCP server running on isolated and VPC networks' virtual routers (dnsmasq). On stopping or destroying a VM, its dhcp/dns records are not removed from the virtual router causing ghost effects. Fixes #3272 Fixes #3354 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
49 lines
1.7 KiB
Python
Executable File
49 lines
1.7 KiB
Python
Executable File
# 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 logging
|
|
from netaddr import *
|
|
|
|
|
|
def merge(dbag, data):
|
|
# A duplicate ip address wil clobber the old value
|
|
# This seems desirable ....
|
|
if "add" in data and data['add'] is False and "ipv4_address" in data:
|
|
if data['ipv4_address'] in dbag:
|
|
del(dbag[data['ipv4_address']])
|
|
else:
|
|
remove_keys = set()
|
|
for key, entry in dbag.iteritems():
|
|
if key != 'id' and entry['host_name'] == data['host_name']:
|
|
remove_keys.add(key)
|
|
break
|
|
|
|
for key, entry in dbag.iteritems():
|
|
if key != 'id' and entry['mac_address'] == data['mac_address']:
|
|
remove_keys.add(key)
|
|
break
|
|
|
|
if data['remove'] and key not in remove_keys:
|
|
remove_keys.add(key)
|
|
|
|
for remove_key in remove_keys:
|
|
del(dbag[remove_key])
|
|
|
|
dbag[data['ipv4_address']] = data
|
|
|
|
return dbag
|