apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: the update_config.py was not parsing the incoming guest net configuration properly

Browse Source 
Added comments to the CitrixResourceBase class: do not destroy the cd-rom
This commit is contained in:
wilderrodrigues 2015-01-17 19:50:40 +01:00
parent 2bb79b8115
commit 84ba06b87d
2 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
View File

@ -1622,6 +1622,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
if (result != null) {
return new CheckSshAnswer(cmd, "Can not ping System vm " + vmName + "due to:" + result);
}
//Do not destroy the disk here! It will stio the patching process. Please, don't!
//destroyPatchVbd(conn, vmName);
} catch (final Exception e) {
return new CheckSshAnswer(cmd, e);

73
systemvm/patches/debian/config/opt/cloud/bin/update_config.py
View File

@ -51,52 +51,46 @@ def process_file():
# Converge
finish_config()
def is_guestnet_configured(guestnet_dict, key):
def is_guestnet_configured(guestnet_dict, keys):
existing_key = None
existing_keys = []
new_eth_key = None
for k1, v in guestnet_dict.iteritems():
for k2 in key:
if k1 == k2 and len(guestnet_dict[k1]) > 0:
existing_key = k1
if existing_key:
break
if not existing_key:
return False
for k1, v1 in guestnet_dict.iteritems():
if k1 in keys and len(v1) > 0:
existing_keys.append(k1)
file = open(jsonCmdConfigPath)
new_guestnet_dict = json.load(file)
for k1, v in new_guestnet_dict.iteritems():
for k2 in key:
if k1 == k2 and len(new_guestnet_dict[k1]) > 0:
new_eth_key = k1
if new_eth_key:
'''
Check if we have a new guest network ready to be setup
'''
device = new_guestnet_dict['device']
if device in existing_keys:
'''
Device already configured, ignore.
'''
return True
exists = False
for key in existing_keys:
for interface in guestnet_dict[key]:
new_mac = new_guestnet_dict["mac_address"].encode('utf-8')
old_mac = interface["mac_address"].encode('utf-8')
new_ip = new_guestnet_dict["router_guest_ip"].encode('utf-8')
old_ip = interface["router_guest_ip"].encode('utf-8')
if (new_mac == old_mac) and (new_ip == old_ip):
exists = True
break
if exists:
break
if not new_eth_key:
'''
Why is the new guest net dictionary empty?
1. Might be a bug on the Java side.
Return True so we won't process an empty file. However, we have to investigate it!
'''
return True
old_eth = guestnet_dict[existing_key][0]
new_eth = new_guestnet_dict[new_eth_key][0]
new_mac = new_eth["mac_address"].encode('utf-8')
old_mac = old_eth["mac_address"].encode('utf-8')
new_ip = new_eth["router_guest_ip"].encode('utf-8')
old_ip = old_eth["router_guest_ip"].encode('utf-8')
if (new_mac == old_mac) and (new_ip == old_ip):
print "[WARN] Guest Network already configured. Will skip the file to avoid RTNETLINK errors."
return True
return False
return exists
if not (os.path.isfile(jsonCmdConfigPath) and os.access(jsonCmdConfigPath, os.R_OK)):
print "[ERROR]: You are telling me to process %s, but i can't access it" % jsonCmdConfigPath
@ -115,7 +109,8 @@ if sys.argv[1] == "guest_network.json":
file = open(currentGuestNetConfig)
guestnet_dict = json.load(file)
if not is_guestnet_configured(guestnet_dict, ['eth1', 'eth2', 'eth3', 'eth4', 'eth5']):
if not is_guestnet_configured(guestnet_dict, ['eth1', 'eth2', 'eth3', 'eth4', 'eth5', 'eth6', 'eth7', 'eth8', 'eth9']):
print "[INFO] Processing Guest Network."
process_file()
else:
print "[INFO] No need to process Guest Network."