mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
b25823213b
This PR fixes #5058 when start a vm, the old entries in databag for the vm (with same mac addresses) should be removed then set again, to avoid duplicated records in dhcpentry databag and also /etc/dhcphosts.txt Testing with Isolated networks: (1) stop vm, change vm ip address, start vm vm info is updated in /etc/dhcphosts.txt and /etc/cloudstack/dhcpentry.json (2) stop vm, expunge vm. vm is removed from /etc/dhcphosts.txt and /var/lib/misc/dnsmasq.leases Testing with VPC: (1) create vm in 2 vpc tiers vm has 2 entries in /etc/dhcphosts.txt, and /etc/cloudstack/dhcpentry.json (2) stop vm, change ip addresses, change nics order, start vm entries are updated in /etc/dhcphosts.txt and /etc/cloudstack/dhcpentry.json (3) remove a nic from vm (hot unplug) vm nic is removed from /etc/dhcphosts.txt and /var/lib/misc/dnsmasq.leases entry in /etc/cloudstack/dhcpentry.json is updated.
41 lines
1.4 KiB
Python
Executable File
41 lines
1.4 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['mac_address'] == data['mac_address']:
|
|
remove_keys.add(key)
|
|
break
|
|
|
|
for remove_key in remove_keys:
|
|
del(dbag[remove_key])
|
|
|
|
dbag[data['ipv4_address']] = data
|
|
|
|
return dbag
|