j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2025-07-31 12:41:08 +00:00
Code Issues Projects Releases Wiki Activity

rearrange instance network to show ipv4 and ipv6 address. Add capability to show all ip address not one of them. Add ipv4 address to instance summary

Browse source
This commit is contained in:
catborise 2020-01-10 15:28:09 +03:00
parent f2ba2b58b0
commit 8b9fe4e887
2 changed files with 66 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

16
vrtManager/instance.py
View file

@ -287,8 +287,8 @@ class wvmInstance(wvmConnect):
leases = []
def extract_dom(info):
ipv4 = None
ipv6 = None
ipv4 = []
ipv6 = []
for addrs in info.values():
if addrs["hwaddr"] != iface_mac:
continue
@ -296,20 +296,20 @@ class wvmInstance(wvmConnect):
continue
for addr in addrs["addrs"]:
if addr["type"] == 0:
ipv4 = addr["addr"]
ipv4.append(addr["addr"])
elif (addr["type"] == 1 and
not str(addr["addr"]).startswith("fe80")):
ipv6 = addr["addr"] + "/" + str(addr["prefix"])
ipv6.append(addr["addr"] + "/" + str(addr["prefix"]))
return ipv4, ipv6
def extract_lease(info):
ipv4 = None
ipv6 = None
ipv4 = []
ipv6 = []
if info["mac"] == iface_mac:
if info["type"] == 0:
ipv4 = info["ipaddr"]
ipv4.append(info["ipaddr"])
elif info["type"] == 1:
ipv6 = info["ipaddr"]
ipv6.append(info["ipaddr"])
return ipv4, ipv6
for ips in ([qemuga] + leases + [arp]):