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

Make hostname field into description

This commit is contained in:
Joshua Boniface 2018-09-30 11:08:39 -04:00
parent 9dbeaf8524
commit a673e38cff
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
router-daemon/pvcrd/DHCPServer.py
View File

@ -610,7 +610,7 @@ class CSVDatabase(object):
class ZKDatabase(object): class ZKDatabase(object):
# Store DHCP leases in zookeeper # Store DHCP leases in zookeeper
# /networks/<VNI>/dhcp_leases/<MAC>:<timestamp>/{ipaddr,hostname} # /networks/<VNI>/dhcp_leases/<MAC>:<timestamp>/{ipaddr,description/hostname}
# Line: # Line:
# ['52:54:00:21:34:11', '10.10.10.6', 'test1', '1538287572'] # ['52:54:00:21:34:11', '10.10.10.6', 'test1', '1538287572']
@ -626,13 +626,13 @@ class ZKDatabase(object):
def add(self, line): def add(self, line):
macaddr = line[0] macaddr = line[0]
ipaddr = line[1] ipaddr = line[1]
hostname = line[2] description = line[2]
timestamp = line[3] timestamp = line[3]
zkhandler.writedata(self.zk_conn, { zkhandler.writedata(self.zk_conn, {
'{}/{}'.format(self.key, macaddr): timestamp, '{}/{}'.format(self.key, macaddr): timestamp,
'{}/{}/ipaddr'.format(self.key, macaddr): ipaddr, '{}/{}/ipaddr'.format(self.key, macaddr): ipaddr,
'{}/{}/hostname'.format(self.key, macaddr): hostname '{}/{}/description'.format(self.key, macaddr): description
}) })
def delete(self, pattern): def delete(self, pattern):
@ -648,8 +648,8 @@ class ZKDatabase(object):
for macaddr in mac_list: for macaddr in mac_list:
timestamp = zkhandler.readdata(self.zk_conn, '{}/{}'.format(self.key, macaddr)) timestamp = zkhandler.readdata(self.zk_conn, '{}/{}'.format(self.key, macaddr))
ipaddr = zkhandler.readdata(self.zk_conn, '{}/{}/ipaddr'.format(self.key, macaddr)) ipaddr = zkhandler.readdata(self.zk_conn, '{}/{}/ipaddr'.format(self.key, macaddr))
hostname = zkhandler.readdata(self.zk_conn, '{}/{}/hostname'.format(self.key, macaddr)) description = zkhandler.readdata(self.zk_conn, '{}/{}/description'.format(self.key, macaddr))
leases.append([macaddr, ipaddr, hostname, timestamp]) leases.append([macaddr, ipaddr, description, timestamp])
return leases return leases