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

CLOUDSTACK-8991 - Remove public IP form interface in case add = false

Browse Source
This commit is contained in:
Wilder Rodrigues 2015-10-27 19:46:13 +01:00
parent 99318caa67
commit 7197cf2e24
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
View File

@ -103,6 +103,7 @@ class CsAddress(CsDataBag):
for address in self.dbag[dev]:
ip.setAddress(address)
logging.info("Address found in DataBag ==> %s" % address)
if ip.configured():
logging.info(
@ -263,10 +264,17 @@ class CsIP:
return self.address
def configure(self, address):
logging.info(
"Configuring address %s on device %s", self.ip(), self.dev)
cmd = "ip addr add dev %s %s brd +" % (self.dev, self.ip())
subprocess.call(cmd, shell=True)
# When "add" is false, it means that the IP has to be removed.
if address["add"]:
try:
logging.info("Configuring address %s on device %s", self.ip(), self.dev)
cmd = "ip addr add dev %s %s brd +" % (self.dev, self.ip())
subprocess.call(cmd, shell=True)
except Exception as e:
logging.info("Exception occurred ==> %s" % e)
else:
self.delete(self.ip())
self.post_configure(address)
def post_configure(self, address):
@ -602,9 +610,8 @@ class CsIP:
if self.dev in bag.keys():
for address in bag[self.dev]:
self.setAddress(address)
if self.hasIP(ip):
found = True
if self.is_guest_gateway(address, ip):
if (self.hasIP(ip) or self.is_guest_gateway(address, ip)) and addess["add"]:
logging.debig("The IP address in '%s' will be configured" % address)
found = True
if not found:
self.delete(ip)
@ -620,7 +627,7 @@ class CsIP:
gw = interface.get_gateway()
logging.info("Interface has the following gateway ==> %s", gw)
if bag['nw_type'] == "guest" and rip == gw:
return True
return False