monitor/scanapi.py

   1 #!/usr/bin/python
   2
   3 import os
   4 import sys
   5 import string
   6 import time
   7 from datetime import datetime,timedelta
   8 import threadpool
   9 import threading
  10
  11 import socket
  12 from pcucontrol import reboot
  13
  14 from pcucontrol.util import command
  15 from monitor import config
  16
  17 from monitor.database.info.model import *
  18
  19 from monitor.sources import comon
  20 from monitor.wrapper import plc, plccache
  21
  22 import traceback
  23 from monitor.common import nmap_port_status, email_exception
  24
  25 COMON_COTOPURL= "http://summer.cs.princeton.edu/status/tabulator.cgi?" + \
  26                         "table=table_nodeview&" + \
  27                         "dumpcols='name,resptime,sshstatus,uptime,lastcotop,cpuspeed,memsize,disksize'&" + \
  28                         "formatcsv"
  29
  30 api = plc.getAuthAPI()
  31 plc_lock = threading.Lock()
  32 round = 1
  33 global_round = round
  34 count = 0
  35
  36
  37 def get_pcu(pcuname):
  38         plc_lock.acquire()
  39         try:
  40                 #print "GetPCU from PLC %s" % pcuname
  41                 l_pcu  = plc.GetPCUs({'pcu_id' : pcuname})
  42                 #print l_pcu
  43                 if len(l_pcu) > 0:
  44                         l_pcu = l_pcu[0]
  45         except:
  46                 try:
  47                         #print "GetPCU from file %s" % pcuname
  48                         l_pcus = plccache.l_pcus
  49                         for i in l_pcus:
  50                                 if i['pcu_id'] == pcuname:
  51                                         l_pcu = i
  52                 except:
  53                         traceback.print_exc()
  54                         l_pcu = None
  55
  56         plc_lock.release()
  57         return l_pcu
  58
  59 def get_nodes(node_ids):
  60         plc_lock.acquire()
  61         l_node = []
  62         try:
  63                 l_node = plc.getNodes(node_ids, ['hostname', 'last_contact', 'node_id', 'ports'])
  64         except:
  65                 try:
  66                         plc_nodes = plccache.l_nodes
  67                         for n in plc_nodes:
  68                                 if n['node_id'] in node_ids:
  69                                         l_node.append(n)
  70                 except:
  71                         traceback.print_exc()
  72                         l_node = None
  73
  74         plc_lock.release()
  75         if l_node == []:
  76                 l_node = None
  77         return l_node
  78
  79
  80 def get_plc_pcu_values(pcuname):
  81         """
  82                 Try to contact PLC to get the PCU info.
  83                 If that fails, try a backup copy from the last run.
  84                 If that fails, return None
  85         """
  86         values = {}
  87
  88         l_pcu = get_pcu(pcuname)
  89
  90         if l_pcu is not None:
  91                 site_id = l_pcu['site_id']
  92                 node_ids = l_pcu['node_ids']
  93                 l_node = get_nodes(node_ids)
  94
  95                 if l_node is not None:
  96                         for node in l_node:
  97                                 values[node['hostname']] = node['ports'][0]
  98
  99                         values['nodenames'] = [node['hostname'] for node in l_node]
 100
 101                         # NOTE: this is for a dry run later. It doesn't matter which node.
 102                         values['node_id'] = l_node[0]['node_id']
 103
 104                 values.update(l_pcu)
 105         else:
 106                 values = None
 107
 108         return values
 109
 110 class ScanInterface(object):
 111         recordclass = None
 112         syncclass = None
 113         primarykey = 'hostname'
 114
 115         def __init__(self, round=1):
 116                 self.round = round
 117                 self.count = 1
 118
 119         def __getattr__(self, name):
 120                 if 'collect' in name or 'record' in name:
 121                         method = getattr(self, name, None)
 122                         if method is None:
 123                                 raise Exception("No such method %s" % name)
 124                         return method
 125                 else:
 126                         raise Exception("No such method %s" % name)
 127
 128         def collect(self, nodename, data):
 129                 pass
 130
 131         def record(self, request, (nodename, values) ):
 132
 133                 try:
 134                         if values is None:
 135                                 return
 136
 137                         if self.syncclass:
 138                                 fbnodesync = self.syncclass.findby_or_create(
 139                                                                                                 #if_new_set={'round' : self.round},
 140                                                                                                 **{ self.primarykey : nodename})
 141                         # NOTE: This code will either add a new record for the new self.round,
 142                         #       OR it will find the previous value, and update it with new information.
 143                         #       The data that is 'lost' is not that important, b/c older
 144                         #       history still exists.
 145                         fbrec = self.recordclass.findby_or_create(
 146                                                 **{ self.primarykey:nodename})
 147
 148                         fbrec.set( **values )
 149
 150                         fbrec.flush()
 151                         if self.syncclass:
 152                                 fbnodesync.round = self.round
 153                                 fbnodesync.flush()
 154
 155                         print "%d %s %s" % (self.count, nodename, values)
 156                         self.count += 1
 157
 158                 except:
 159                         print "ERROR:"
 160                         email_exception(str(nodename))
 161                         print traceback.print_exc()
 162                         pass
 163
 164 class ScanNodeInternal(ScanInterface):
 165         recordclass = FindbadNodeRecord
 166         #syncclass = FindbadNodeRecordSync
 167         syncclass = None
 168         primarykey = 'hostname'
 169
 170         def collectPorts(self, nodename, port_list=[22,80,806]):
 171                 values = {}
 172                 for port in port_list:
 173                         ret = os.system("nc -w 5 -z %s %s > /dev/null" % (nodename, port) )
 174                         if ret == 0:
 175                                 values[str(port)] = "open"
 176                         else:
 177                                 values[str(port)] = "closed"
 178                 return {'port_status' : values }
 179
 180         def collectNMAP(self, nodename, cohash):
 181                 #### RUN NMAP ###############################
 182                 # NOTE: run the same command three times and take the best of three
 183                 #               runs.  NMAP can drop packets, and especially so when it runs many
 184                 #               commands at once.
 185                 values = {}
 186                 nmap = command.CMD()
 187                 print "nmap -oG - -P0 -p22,80,806 %s | grep Host:" % nodename
 188                 (oval1,eval) = nmap.run_noexcept("nmap -oG - -P0 -p22,80,806 %s | grep Host:" % nodename)
 189                 (oval2,eval) = nmap.run_noexcept("nmap -oG - -P0 -p22,80,806 %s | grep Host:" % nodename)
 190                 (oval3,eval) = nmap.run_noexcept("nmap -oG - -P0 -p22,80,806 %s | grep Host:" % nodename)
 191                 # NOTE: an empty / error value for oval, will still work.
 192                 values['port_status'] = {}
 193                 (o1,continue_probe) = nmap_port_status(oval1)
 194                 (o2,continue_probe) = nmap_port_status(oval2)
 195                 (o3,continue_probe) = nmap_port_status(oval3)
 196                 for p in ['22', '80', '806']:
 197                         l = [ o1[p], o2[p], o3[p] ]
 198                         if len(filter(lambda x: x == 'open', l)) > 1:
 199                                 values['port_status'][p] = 'open'
 200                         else:
 201                                 values['port_status'][p] = o1[p]
 202
 203                 print values['port_status']
 204                 return (nodename, values)
 205
 206         def collectPING(self, nodename, cohash):
 207                 values = {}
 208                 ping = command.CMD()
 209                 (oval,errval) = ping.run_noexcept("ping -c 1 -q %s | grep rtt" % nodename)
 210
 211                 values = {}
 212                 if oval == "":
 213                         # An error occurred
 214                         values['ping_status'] = False
 215                 else:
 216                         values['ping_status'] = True
 217
 218                 return values
 219
 220         def collectTRACEROUTE(self, nodename, cohash):
 221                 values = {}
 222                 trace = command.CMD()
 223                 (oval,errval) = trace.run_noexcept("traceroute %s" % nodename)
 224
 225                 values['traceroute'] = oval
 226
 227                 return values
 228
 229         def collectSSH(self, nodename, cohash):
 230                 values = {}
 231                 try:
 232                         for port in [22, 806]:
 233                                 ssh = command.SSH('root', nodename, port)
 234
 235                                 (oval, errval) = ssh.run_noexcept2(""" <<\EOF
 236                                         echo "{"
 237                                         echo '  "kernel_version":"'`uname -a`'",'
 238                                         echo '  "bmlog":"'`ls /tmp/bm.log`'",'
 239                                         echo '  "bootcd_version":"'`cat /mnt/cdrom/bootme/ID`'",'
 240                                         echo '  "boot_server":"'`cat /mnt/cdrom/bootme/BOOTSERVER`'",'
 241                                         echo '  "install_date":"'`python -c "import os,time,stat; print time.ctime(os.stat('/usr/boot/plnode.txt')[stat.ST_CTIME])"`'",'
 242                                         echo '  "nm_status":"'`ps ax | grep nm.py | grep -v grep`'",'
 243                                         echo '  "dns_status":"'`host boot.planet-lab.org 2>&1`'",'
 244                                         echo '  "iptables_status":"'`iptables -t mangle -nL | awk '$1~/^[A-Z]+$/ {modules[$1]=1;}END{for (k in modules) {if (k) printf "%s ",k;}}'`'",'
 245                                         echo '  "princeton_comon_dir":"'`ls -d /vservers/princeton_comon`'",'
 246                                         echo '  "uptime":"'`cat /proc/uptime`'",'
 247
 248                                         ID=`grep princeton_comon /etc/passwd | awk -F : '{if ( $3 > 500 ) { print $3}}'`
 249                                         echo '  "princeton_comon_running":"'`ls -d /proc/virtual/$ID`'",'
 250                                         echo '  "princeton_comon_procs":"'`vps ax | grep $ID | grep -v grep | wc -l`'",'
 251                                         echo '  "fs_status":"'`grep proc /proc/mounts | grep ro, ; if [ -x /usr/bin/timeout.pl ] ; then timeout.pl 20 touch /var/log/monitor 2>&1 ; if [ -d /vservers/ ] ; then timeout.pl 20 touch /vservers/monitor.log 2>&1  ; fi ; fi`'",'
 252                                         echo '  "rpm_version":"'`if [ -x /usr/bin/timeout.pl ] ; then timeout.pl 30 rpm -q NodeManager ; fi`'",'
 253                                         echo '  "rpm_versions":"'`if [ -x /usr/bin/timeout.pl ] ; then timeout.pl 45 rpm -q -a ; fi`'",'
 254                                         echo "}"
 255 EOF                     """)
 256
 257                                 values['ssh_error'] = errval
 258                                 if len(oval) > 0:
 259                                         #print "OVAL: %s" % oval
 260                                         values.update(eval(oval))
 261                                         values['ssh_portused'] = port
 262                                         break
 263                                 else:
 264                                         values.update({'kernel_version': "", 'bmlog' : "", 'bootcd_version' : '',
 265                                                                         'boot_server' : '',
 266                                                                         'install_date' : '',
 267                                                                         'nm_status' : '',
 268                                                                         'fs_status' : '',
 269                                                                         'uptime' : '',
 270                                                                         'dns_status' : '',
 271                                                                         'rpm_version' : '',
 272                                                                         'rpm_versions' : '',
 273                                                                         'princeton_comon_dir' : "",
 274                                                                         'princeton_comon_running' : "",
 275                                                                         'princeton_comon_procs' : "", 'ssh_portused' : None})
 276
 277                         oval = values['nm_status']
 278                         if "nm.py" in oval:
 279                                 values['nm_status'] = "Y"
 280                         else:
 281                                 values['nm_status'] = "N"
 282
 283                         continue_slice_check = True
 284                         oval = values['princeton_comon_dir']
 285                         if "princeton_comon" in oval:
 286                                 values['princeton_comon_dir'] = True
 287                         else:
 288                                 values['princeton_comon_dir'] = False
 289                                 continue_slice_check = False
 290
 291                         if continue_slice_check:
 292                                 oval = values['princeton_comon_running']
 293                                 if len(oval) > len('/proc/virtual/'):
 294                                         values['princeton_comon_running'] = True
 295                                 else:
 296                                         values['princeton_comon_running'] = False
 297                                         continue_slice_check = False
 298                         else:
 299                                 values['princeton_comon_running'] = False
 300
 301                         if continue_slice_check:
 302                                 oval = values['princeton_comon_procs']
 303                                 values['princeton_comon_procs'] = int(oval)
 304                         else:
 305                                 values['princeton_comon_procs'] = None
 306                 except:
 307                         print traceback.print_exc()
 308                         sys.exit(1)
 309
 310                 return values
 311
 312         def collectPLC(self, nodename, cohash):
 313                 values = {}
 314                 ### GET PLC NODE ######################
 315                 d_node = plccache.GetNodeByName(nodename)
 316                 values['plc_node_stats'] = d_node
 317
 318                 ### GET PLC PCU ######################
 319                 site_id = -1
 320                 d_pcu = None
 321                 if d_node and len(d_node['pcu_ids']) > 0:
 322                         d_pcu = d_node['pcu_ids'][0]
 323
 324                 site_id = d_node['site_id']
 325
 326                 values['plc_pcuid'] = d_pcu
 327
 328                 ### GET PLC SITE ######################
 329                 print "SITEID: %s" % site_id
 330                 d_site = plccache.GetSitesById([ site_id ])[0]
 331                 values['loginbase'] = d_site['login_base']
 332                 values['plc_site_stats'] = d_site
 333
 334                 return values
 335
 336         def evaluate(self, nodename, values):
 337                 # TODO: this section can probably be reduced to a policy statement
 338                 #               using patterns and values collected so far.
 339                 # NOTE: A node is "DOWN" if
 340                 #       * cannot ssh into it.
 341                 #   * all ports are not open for a 'BOOT' node
 342                 #   * dns for hostname does not exist.
 343                 b_getbootcd_id = True
 344
 345                 oval = values['kernel_version']
 346                 values['ssh_status'] = True
 347                 if "2.6.17" in oval or "2.6.2" in oval:
 348                         values['observed_category'] = 'PROD'
 349                         if "bm.log" in values['bmlog']:
 350                                 values['observed_status'] = 'DEBUG'
 351                         else:
 352                                 values['observed_status'] = 'BOOT'
 353                 elif "2.6.12" in oval or "2.6.10" in oval:
 354                         values['observed_category'] = 'OLDPROD'
 355                         if "bm.log" in values['bmlog']:
 356                                 values['observed_status'] = 'DEBUG'
 357                         else:
 358                                 values['observed_status'] = 'BOOT'
 359
 360                 # NOTE: on 2.6.8 kernels, with 4.2 bootstrapfs, the chroot
 361                 #       command fails.  I have no idea why.
 362                 elif "2.4" in oval or "2.6.8" in oval:
 363                         b_getbootcd_id = False
 364                         values['observed_category'] = 'OLDBOOTCD'
 365                         values['observed_status'] = 'DEBUG'
 366                 elif oval != "":
 367                         values['observed_category'] = 'UNKNOWN'
 368                         if "bm.log" in values['bmlog']:
 369                                 values['observed_status'] = 'DEBUG'
 370                         else:
 371                                 values['observed_status'] = 'BOOT'
 372                 else:
 373                         # An error occurred.
 374                         b_getbootcd_id = False
 375                         values['ssh_status'] = False
 376                         values['observed_category'] = 'ERROR'
 377                         values['observed_status'] = 'DOWN'
 378                         values['kernel_version'] = ""
 379
 380                 values['firewall'] = False
 381
 382                 # NOTE: A node is down if some of the public ports are not open
 383                 if values['observed_status'] == "BOOT":
 384                         # verify that all ports are open.  Else, report node as down.
 385                         if not ( values['port_status']['22']  == "open" and \
 386                                          values['port_status']['80']  == "open" and \
 387                                          values['port_status']['806'] == "open") :
 388                                 #email_exception(nodename, "%s FILTERED HOST" % nodename)
 389                                 values['observed_status'] = 'DOWN'
 390                                 values['firewall'] = True
 391
 392                         #if   values['port_status']['22']  == "open" and \
 393                         #        values['port_status']['80']  == "closed" and \
 394                         #        values['port_status']['806'] == "open" :
 395                         #       email_exception("%s port 80 blocked" % nodename, "possible VSERVER ref blocked")
 396
 397                 #if not values['external_dns_status']:
 398                 #       email_exception("%s DNS down" % nodename)
 399
 400                 if b_getbootcd_id:
 401                         # try to get BootCD for all nodes that are not 2.4 nor inaccessible
 402                         oval = values['bootcd_version']
 403                         if "BootCD" in oval:
 404                                 values['bootcd_version'] = oval
 405                                 if "v2" in oval and \
 406                                         ( nodename is not "planetlab1.cs.unc.edu" and \
 407                                           nodename is not "planetlab2.cs.unc.edu" ):
 408                                         values['observed_category'] = 'OLDBOOTCD'
 409                         else:
 410                                 values['bootcd_version'] = ""
 411                 else:
 412                         values['bootcd_version'] = ""
 413
 414                 return values
 415
 416         def collectDNS(self, nodename, cohash):
 417                 values = {}
 418                 try:
 419                         ipaddr = socket.gethostbyname(nodename)
 420                         # TODO: check that IP returned matches IP in plc db.
 421                         values['external_dns_status'] = True
 422                 except Exception, err:
 423                         values['external_dns_status'] = False
 424
 425                 return values
 426
 427         def collectInternal(self, nodename, cohash):
 428                 try:
 429                         values = {}
 430
 431                         v = self.collectPING(nodename, cohash)
 432                         values.update(v)
 433
 434                         v = self.collectPorts(nodename)
 435                         values.update(v)
 436
 437                         v = self.collectSSH(nodename, cohash)
 438                         values.update(v)
 439
 440                         v = self.collectDNS(nodename, cohash)
 441                         values.update(v)
 442
 443                         v = self.collectTRACEROUTE(nodename, cohash)
 444                         values.update(v)
 445
 446                         v = self.collectPLC(nodename, cohash)
 447                         values.update(v)
 448
 449                         if nodename in cohash:
 450                                 values['comon_stats'] = cohash[nodename]
 451                         else:
 452                                 values['comon_stats'] = {'resptime':  '-1',
 453                                                                                 'uptime':    '-1',
 454                                                                                 'sshstatus': '-1',
 455                                                                                 'lastcotop': '-1',
 456                                                                                 'cpuspeed' : "null",
 457                                                                                 'disksize' : 'null',
 458                                                                                 'memsize'  : 'null'}
 459
 460                         values['rpms'] = values['rpm_versions']
 461                         print "ALLVERSIONS: %s %s" % (nodename, values['rpm_versions'])
 462                         print "RPMVERSION: %s %s" % (nodename, values['rpm_version'])
 463                         print "UPTIME: %s %s" % (nodename, values['uptime'])
 464
 465                         values = self.evaluate(nodename, values)
 466                         values['date_checked'] = datetime.now()
 467
 468                 except:
 469                         print traceback.print_exc()
 470
 471                 return (nodename, values)
 472
 473
 474 def internalprobe(hostname):
 475         scannode = ScanNodeInternal()
 476         try:
 477                 (nodename, values) = scannode.collectInternal(hostname, {})
 478                 scannode.record(None, (nodename, values))
 479                 session.flush()
 480                 return True
 481         except:
 482                 print traceback.print_exc()
 483                 return False
 484
 485 def externalprobe(hostname):
 486         scannode = ScanNodeInternal()
 487         try:
 488                 values = self.collectPorts(hostname)
 489                 scannode.record(None, (hostname, values))
 490                 session.flush()
 491                 return True
 492         except:
 493                 print traceback.print_exc()
 494                 return False
 495
 496 class ScanPCU(ScanInterface):
 497         recordclass = FindbadPCURecord
 498         syncclass = None
 499         primarykey = 'plc_pcuid'
 500
 501         def collectInternal(self, pcuname, cohash):
 502
 503                 continue_probe = True
 504                 errors = None
 505                 values = {'reboot_trial_status' : 'novalue'}
 506                 ### GET PCU ######################
 507                 try:
 508                         b_except = False
 509                         try:
 510                                 v = get_plc_pcu_values(pcuname)
 511                                 if v['hostname'] is not None: v['hostname'] = v['hostname'].strip()
 512                                 if v['ip'] is not None: v['ip'] = v['ip'].strip()
 513
 514                                 if v is not None:
 515                                         values['plc_pcu_stats'] = v
 516                                 else:
 517                                         continue_probe = False
 518                         except:
 519                                 b_except = True
 520                                 traceback.print_exc()
 521                                 continue_probe = False
 522
 523                         if b_except or not continue_probe: return (None, None, None)
 524
 525                         #### RUN NMAP ###############################
 526                         if continue_probe:
 527                                 nmap = command.CMD()
 528                                 print "nmap -oG - -P0 -p22,23,80,443,5869,9100,16992 %s | grep Host:" % reboot.pcu_name(values['plc_pcu_stats'])
 529                                 (oval,eval) = nmap.run_noexcept("nmap -oG - -P0 -p22,23,80,443,5869,9100,16992 %s | grep Host:" % reboot.pcu_name(values['plc_pcu_stats']))
 530                                 # NOTE: an empty / error value for oval, will still work.
 531                                 (values['port_status'], continue_probe) = nmap_port_status(oval)
 532                         else:
 533                                 values['port_status'] = None
 534
 535                         #### COMPLETE ENTRY   #######################
 536
 537                         values['entry_complete'] = []
 538                         #if values['protocol'] is None or values['protocol'] is "":
 539                         #       values['entry_complete'] += ["protocol"]
 540                         if values['plc_pcu_stats']['model'] is None or values['plc_pcu_stats']['model'] is "":
 541                                 values['entry_complete'] += ["model"]
 542                                 # Cannot continue due to this condition
 543                                 continue_probe = False
 544
 545                         if values['plc_pcu_stats']['password'] is None or values['plc_pcu_stats']['password'] is "":
 546                                 values['entry_complete'] += ["password"]
 547                                 # Cannot continue due to this condition
 548                                 continue_probe = False
 549
 550                         if len(values['entry_complete']) > 0:
 551                                 continue_probe = False
 552
 553                         if values['plc_pcu_stats']['hostname'] is None or values['plc_pcu_stats']['hostname'] is "":
 554                                 values['entry_complete'] += ["hostname"]
 555                         if values['plc_pcu_stats']['ip'] is None or values['plc_pcu_stats']['ip'] is "":
 556                                 values['entry_complete'] += ["ip"]
 557
 558                         # If there are no nodes associated with this PCU, then we cannot continue.
 559                         if len(values['plc_pcu_stats']['node_ids']) == 0:
 560                                 continue_probe = False
 561                                 values['entry_complete'] += ['nodeids']
 562
 563
 564                         #### DNS and IP MATCH #######################
 565                         if values['plc_pcu_stats']['hostname'] is not None and values['plc_pcu_stats']['hostname'] is not "" and \
 566                            values['plc_pcu_stats']['ip'] is not None and values['plc_pcu_stats']['ip'] is not "":
 567                                 try:
 568                                         ipaddr = socket.gethostbyname(values['plc_pcu_stats']['hostname'])
 569                                         if ipaddr == values['plc_pcu_stats']['ip']:
 570                                                 values['dns_status'] = "DNS-OK"
 571                                         else:
 572                                                 values['dns_status'] = "DNS-MISMATCH"
 573                                                 values['plc_pcu_stats']['hostname'] = values['plc_pcu_stats']['ip']
 574
 575                                 except Exception, err:
 576                                         values['dns_status'] = "DNS-NOENTRY"
 577                                         values['plc_pcu_stats']['hostname'] = values['plc_pcu_stats']['ip']
 578                         else:
 579                                 if values['plc_pcu_stats']['ip'] is not None and values['plc_pcu_stats']['ip'] is not "":
 580                                         values['dns_status'] = "NOHOSTNAME"
 581                                         values['plc_pcu_stats']['hostname'] = values['plc_pcu_stats']['ip']
 582                                 else:
 583                                         values['dns_status'] = "NO-DNS-OR-IP"
 584                                         values['plc_pcu_stats']['hostname'] = "No_entry_in_DB"
 585                                         continue_probe = False
 586
 587
 588                         ######  DRY RUN  ############################
 589                         if continue_probe and 'node_ids' in values['plc_pcu_stats'] and \
 590                                 len(values['plc_pcu_stats']['node_ids']) > 0:
 591                                 rb_ret = reboot.reboot_test_new(values['plc_pcu_stats']['nodenames'][0],
 592                                                                                                 values, 1, True)
 593                         else:
 594                                 rb_ret = "Not_Run" # No nodes to test"
 595
 596                         values['reboot_trial_status'] = rb_ret
 597
 598                 except:
 599                         print "____________________________________"
 600                         print values
 601                         errors = values
 602                         print "____________________________________"
 603                         errors['traceback'] = traceback.format_exc()
 604                         print errors['traceback']
 605                         values['reboot_trial_status'] = str(errors['traceback'])
 606                         print values
 607
 608                 values['entry_complete']=" ".join(values['entry_complete'])
 609
 610                 values['date_checked'] = datetime.now()
 611                 return (pcuname, values)
 612