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

Corrected a hole in my logic

Browse Source
This commit is contained in:
Ian Southam 2014-07-30 14:10:03 +02:00 committed by wilderrodrigues
parent 0bf7d54722
commit 9355dd7133
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
systemvm/patches/debian/config/opt/cloud/bin/cs_guestnetwork.py
View File

@ -5,8 +5,8 @@ def merge(dbag, gn):
for dev in dbag:
if dev == "id":
continue
if dev == n['device']:
dbag[dev].remove(dev)
if dbag[dev][0]['device'] == gn['device']:
dbag[dev].remove(dbag[dev][0])
if gn['add']:
dbag.setdefault(gn['device'], []).append( gn )
return dbag

14
systemvm/patches/debian/config/opt/cloud/bin/cs_ip.py
View File

@ -1,18 +1,4 @@
from pprint import pprint
#[{u'accountId': 2,
#u'add': True,
#u'broadcastUri': u'vlan://untagged',
#u'firstIP': False,
#u'networkRate': 200,
#u'newNic': False,
#u'nicDevId': 1,
#u'oneToOneNat': False,
#u'publicIp': u'10.0.2.102',
#u'sourceNat': True,
#u'trafficType': u'Public',
#u'vifMacAddress': u'06:f6:5e:00:00:03',
#u'vlanGateway': u'10.0.2.1',
#u'vlanNetmask': u'255.255.255.0'}]
def merge(dbag, ip):
added = False

2
systemvm/patches/debian/config/opt/cloud/bin/merge.py
View File

@ -58,7 +58,7 @@ class updateDataBag:
self.save(dbag)
def processGuestNetwork(self, dbag):
dbag = cs_guestnetwork.merge(dbag, self.qFile.data)
return cs_guestnetwork.merge(dbag, self.qFile.data)
def processIP(self, dbag):
for ip in self.qFile.data["ip_address"]: