parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Get both reservations in leases by default

This commit is contained in:
Joshua Boniface 2020-05-09 10:05:55 -04:00
parent 72a38fd437
commit 7b2180b626
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon-common/network.py
View File

@ -549,7 +549,8 @@ def get_list_dhcp(zk_conn, network, limit, only_static=False, is_fuzzy=True):
full_dhcp_list = getNetworkDHCPReservations(zk_conn, net_vni) full_dhcp_list = getNetworkDHCPReservations(zk_conn, net_vni)
reservations = True reservations = True
else: else:
full_dhcp_list = getNetworkDHCPLeases(zk_conn, net_vni) full_dhcp_list = getNetworkDHCPReservations(zk_conn, net_vni)
full_dhcp_list += getNetworkDHCPLeases(zk_conn, net_vni)
reservations = False reservations = False
if limit: if limit:
@ -579,7 +580,6 @@ def get_list_dhcp(zk_conn, network, limit, only_static=False, is_fuzzy=True):
if valid_lease: if valid_lease:
dhcp_list.append(getDHCPLeaseInformation(zk_conn, net_vni, lease)) dhcp_list.append(getDHCPLeaseInformation(zk_conn, net_vni, lease))
#output_string = formatDHCPLeaseList(zk_conn, net_vni, dhcp_list, reservations=reservations)
return True, dhcp_list return True, dhcp_list
def get_list_acl(zk_conn, network, limit, direction, is_fuzzy=True): def get_list_acl(zk_conn, network, limit, direction, is_fuzzy=True):