Changeset 4763

Timestamp:

May 15, 2017, 4:33:39 PM (2 years ago)

Author:

daduve

Message:

Client support updates

File:

• lliurex-remote-installer/trunk/fuentes/lliurex-remote-installer-client.install/usr/share/n4d/python-plugins/LliurexRemoteInstallerClient.py (modified) (10 diffs)

lliurex-remote-installer/trunk/fuentes/lliurex-remote-installer-client.install/usr/share/n4d/python-plugins/LliurexRemoteInstallerClient.py

@@ -5 +5 @@
 import apt.debfile
 import types
+import datetime
+import threading
 
 class LliureXRemoteInstallerClient:
@@ -23 +25 @@
         LIST='packages'
         URL='url'
+        UPDATE='update'
         
         #Essential package for provides
@@ -31 +34 @@
         
         def __init__(self):
-                self.dbg=0
+                self.dbg=1
                 pass
         #def __init__
@@ -39 +42 @@
 
         def _debug(self,message):
-                if self.dbg==1:
+                if self.dbg==0:
                         print("RemoteInstallerClient: "+str(message))
                         self._log(message)
@@ -59 +62 @@
                         if options["controlled"]:
                                 if os.system("host server")==0:
-                                        objects["LliureXRemoteInstallerClient"].test_system()
+                                        try:
+                                                t=threading.Thread(target=self.test_system)
+                                                t.daemon=True
+                                                t.start()
+                                        except Exception as e:
+                                                print e
+
         #def startup
         
@@ -133 +142 @@
 #                       if  VALOR in [None,'','None']:
                         if  not VALOR:
-                                list_dict=[self.APT,self.DEB,self.SH]
-                                VALOR=self.create_dict ([self.APT,self.DEB,self.SH])[2]
+                                list_dict=[self.APT,self.DEB,self.SH,self.UPDATE]
+                                VALOR=self.create_dict ([self.APT,self.DEB,self.SH,self.UPDATE])[2]
                                 if objects["VariablesManager"].add_variable(namevar,VALOR,"",namevar,[],False,False)[0]:
                                         COMMENT = ("[LLXRemoteInstallerClient] (test_var) Added variable %s to VariablesManager with valor %s" %(namevar,VALOR))
@@ -596 +605 @@
                 return(result_sh)
         #def sh_test
+        
+        
+        
+        
+        def update_test(self,appDict,dictOrig):
+                
+                self._debug("update_test")
+                updated="False"
+                #Get dict values
+                try:
+                        updateDict=appDict[self.UPDATE]
+                except:
+                        self._debug("Update Test: Creating new dictionary")
+                        version_installed=subprocess.Popen(["lliurex-version -n"],shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE).communicate()[0]
+                        version_installed=version_installed.split()[0]
+                        updateDict={'version':version_installed,'datetime':"None",'url':"Mirror"}
+                
+                self._debug("Update Test: Continue......")
+                        
+                version_installed=subprocess.Popen(["lliurex-version -n"],shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE).communicate()[0]
+                version_installed=version_installed.split()[0]
+                version_programed=appDict[self.UPDATE]['version']
+                
+                self._debug("Update Test: Version installed %s"%version_installed)
+                self._debug("Update Test: Version programed %s"%version_programed)
+                
+                if ( version_installed < version_programed ):
+                        #actualizo repos y updateo
+                        if appDict[self.UPDATE]['url']=='Lliurex.net':
+                                self._debug("(update_test) Updating your system to Lliurex.net, please wait........")
+                                #proc = subprocess.Popen(["lliurex-upgrade -u -r"],shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE).communicate()
+                                #ret=os.system("http_proxy=http://proxy:3128 /usr/sbin/lliurex-upgrade -u -r 2>/dev/null 1>/dev/null")
+                                #ret=int(ret)
+                                proc = subprocess.Popen('http_proxy=http://proxy:3128 /usr/sbin/lliurex-upgrade -u -r', shell=True, stdin=None, stdout=open("/dev/null", "w"), stderr=None, executable="/bin/bash")
+                                proc.wait()
+                                date=datetime.datetime.now()
+                                date_update=date.strftime("%d-%m-%Y %H:%M:%S")
+                                print ("Actualizacion terminada...... %s"%date_update)
+                                if proc.returncode == 1:
+                                        print "Fallo actulalizacion"
+                        else:
+                                proc = subprocess.Popen('http_proxy=http://proxy:3128 /usr/sbin/lliurex-upgrade -u', shell=True, stdin=None, stdout=open("/dev/null", "w"), stderr=None, executable="/bin/bash")
+                                proc.wait()
+                                date=datetime.datetime.now()
+                                date_update=date.strftime("%d-%m-%Y %H:%M:%S")
+                                print ("Actualizacion terminada...... %s"%date_update)
+                                if proc.returncode == 1:
+                                        print "Fallo actulalizacion"
+                        
+                        updated="True"
+                        update_url=appDict[self.UPDATE]['url']
+                        new_version=subprocess.Popen(["lliurex-version -n"],shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE).communicate()[0]
+                        new_version=new_version.split()[0]
+                        date=datetime.datetime.now()
+                        date_update=date.strftime("%d-%m-%Y %H:%M")
+                        updateDict={'version':new_version,'datetime':date_update,'url':update_url}
+                
+                self._debug("Update Test: New dict %s"%updateDict)
+                
+                return [updateDict, updated]
+                
+        #def deb_test
+
+
 
         def _refine_apt_repoList(self,appDict,dictOrig):
@@ -675 +748 @@
         #def apt_test
 
-        def _update_results(self,dict_orig,result_deb,result_sh,result_apt):
+        def _update_results(self,dict_orig,result_deb,result_sh,result_apt,result_update,updated):
                 if not dict_orig:
                         #Create dict if doesn't exists
                         self._debug("[LLXRemoteInstallerClient](test_system) Creando el diccionario.......")
-                        dict_new=self.create_dict ([self.APT,self.DEB,self.SH])[2]
+                        dict_new=self.create_dict ([self.APT,self.DEB,self.SH,self.UPDATE])[2]
                         dict_new[self.APT]=list(result_apt)
                         dict_new[self.DEB]=list(result_deb[2])
                         dict_new[self.SH]=list(result_sh[2])
+                        dict_new[self.UPDATE]=result_update
                         self.update_var_dict (self.N4D_INSTALLED,dict_new,"localhost")
                 else:
                         #Update dict
+                        try:
+                                updateDict=dict_orig[self.UPDATE]
+                        except:
+                                self._debug("Update Result: Creating new dictionarie")
+                                version_installed=subprocess.Popen(["lliurex-version -n"],shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE).communicate()[0]
+                                version_installed=version_installed.split()[0]
+                                updateDict={'version':version_installed,'datetime':"None",'url':"Mirror"}
+                                dict_orig[self.UPDATE]=[]
+                                dict_orig[self.UPDATE]=updateDict
+                                
+                        
                         dict_new=dict_orig
-                        log="[LLXRemoteInstallerClient](test_system) Will add APT: %s ** DEBS: %s ** SH: %s "%(result_apt,result_deb[2],result_sh[2])
+                        log="[LLXRemoteInstallerClient](test_system) Will add APT: %s ** DEBS: %s ** SH: %s ** UPDATE: %s "%(result_apt,result_deb[2],result_sh[2],result_update)
                         self._debug(log)
                         #Check the dict against a tuple
-                        dict_help=self.create_dict ([self.APT,self.DEB,self.SH])[2]
+                        dict_help=self.create_dict ([self.APT,self.DEB,self.SH,self.UPDATE])[2]
                         dict_help[self.APT]=list(result_apt)
                         dict_help[self.DEB]=list(result_deb[2])
                         dict_help[self.SH]=list(result_sh[2])
-                        self._debug("[LLXRemoteInstallerClient](test_system) dict to compare is "+str(dict_help))
+                        #dict_help[self.UPDATE]=result_update
+                        #self._debug("[LLXRemoteInstallerClient](test_system) dict to compare is "+str(dict_help))
                         #Check values
+                        if updated == 'True':
+                                log="[LLXRemoteInstallerClient](test_system) System has been updated to version: %s"%result_update['version']
+                                self._debug(log)
+                                dict_new[self.UPDATE]=result_update
                         for valor_dict in dict_help:
                                 self._debug("[LLXRemoteInstallerClient](test_system) Test APP from: "+valor_dict)
@@ -717 +807 @@
                                 except Exception as e:
                                         self._debug("ERROR: "+str(e))
-                        return (dict_new)
+                return (dict_new)
         #def _update_results
 
@@ -749 +839 @@
                         self._debug("Call apt_test")
                         result_apt=self.apt_test(appDict,dict_orig)
+                        #TEST UPDATE
+                        self._debug("Call update_test")
+                        if appDict[self.UPDATE]['activate']=="True":
+                                try:
+                                        result_update_vector=self.update_test(appDict,dict_orig)
+                                        result_update=result_update_vector[0]
+                                        updated=result_update_vector[1]
+                                except Exception as e:
+                                        print e
+                        else:
+                                result_update={'version':dict_orig[self.UPDATE]['version'],'url':dict_orig[self.UPDATE]['url'],'datetime':dict_orig[self.UPDATE]['datetime']}
+                                updated="False"
+                        self._debug("Updated is %s"%updated)
                         
                         #Check that it's a list
                         sh_installed=list(result_sh[2])
                         #Add results to N4D dict
-                        dict_new=self._update_results(dict_orig,result_deb,result_sh,result_apt)
+                        dict_new=self._update_results(dict_orig,result_deb,result_sh,result_apt,result_update,updated)
 #                       if dict_orig in ["",None,{}]:
                         log="Dict now is %s"%dict_new
                         self._debug(log)
-                        self._debug("Updating.......")
+                        self._debug("Updating N4D Variable.......")
                         #Add installed apps to N4D
                         self.update_var_dict (self.N4D_INSTALLED,dict_new,"localhost")
-                        COMMENT="The system has been configured with the APPS: %s * has executed the scripts: %s * Installed new DEBS: %s"%(result_apt,sh_installed,result_deb[2])
+                        if updated == 'False':
+                                COMMENT="The system has been configured with the APPS: %s * has executed the scripts: %s * Installed new DEBS: %s"%(result_apt,sh_installed,result_deb[2])
+                        else:
+                                COMMENT="The system has been configured with the APPS: %s * has executed the scripts: %s * Installed new DEBS: %s * Updated to: %s"%(result_apt,sh_installed,result_deb[2],result_update['version'])
                         self._debug(COMMENT)
-                        return [True,str(COMMENT),result_apt,result_sh[2],result_deb[2],dict_new]
-                except Exception as e:
+                        return [True,str(COMMENT),result_apt,result_sh[2],result_deb[2],updated,dict_new]
+                except Exception as e:
+                        print e,"!!!!!!!!!!"
                         return[False,str(e)]