Refactoring

client/cl_client.py

@@ -1116,21 +1116,27 @@ class Client(commandServer, encrypt):
             return umountResult
         return True
 
-    @safetyWrapper(native_errors=(TemplatesError,ClientError),
-                   man_int=__("Manually interrupted"),
-                   post_action=errorUmountUserRes)
-    def mountUserResAndSync(self,dv):
-        """Mount user resources and sync profile"""
-        self.initVars(dv)
+    def initEnv(self):
+        """
+        Init object variables
+        """
         try:
             self.uid = int(self.clVars.Get('ur_uid'))
             self.gid = int(self.clVars.Get('ur_gid'))
         except ValueError as e:
-            raise ClientError(_("Failed to determnate UID and GID"))
+            raise ClientError(_("Failed to determinate UID and GID"))
         self.sync = self.clVars.Get('cl_client_sync') == 'on'
         self.userName = self.clVars.Get("ur_login")
         self.homeDir = self.clVars.Get('ur_home_path')
         self.domain = self.clVars.Get("cl_remote_host")
+
+    @safetyWrapper(native_errors=(TemplatesError,ClientError),
+                   man_int=__("Manually interrupted"),
+                   post_action=errorUmountUserRes)
+    def mountUserResAndSync(self,dv):
+        """Mount user resources and sync profile"""
+        self.initVars(dv)
+        self.initEnv()
         if self.domain:
             foundMountRemote = isMount("/var/calculate/remote")
             if not foundMountRemote:
@@ -1541,15 +1547,7 @@ class Client(commandServer, encrypt):
         Umount user resouces and synchronizatoin user profile
         """
         self.initVars(dv)
-        try:
-            self.uid = int(self.clVars.Get('ur_uid'))
-            self.gid = int(self.clVars.Get('ur_gid'))
-        except ValueError as e:
-            raise ClientError(_("Failed to determnate UID and GID"))
-        self.sync = self.clVars.Get('cl_client_sync') == 'on'
-        self.userName = self.clVars.Get("ur_login")
-        self.homeDir = self.clVars.Get('ur_home_path')
-        self.domain = self.clVars.Get("cl_remote_host")
+        self.initEnv()
         try:
             passwdUsers = map(lambda x: x[0],
                               map(lambda x: x.split(':'),
@@ -2159,15 +2157,7 @@ class Client(commandServer, encrypt):
         Change user password on server
         """
         self.initVars(dv)
-        try:
-            self.uid = int(self.clVars.Get('ur_uid'))
-            self.gid = int(self.clVars.Get('ur_gid'))
-        except ValueError as e:
-            raise ClientError(_("Failed to determnate UID and GID"))
-        self.sync = self.clVars.Get('cl_client_sync') == 'on'
-        self.userName = self.clVars.Get("ur_login")
-        self.homeDir = self.clVars.Get('ur_home_path')
-        self.domain = self.clVars.Get("cl_remote_host")
+        self.initEnv()
 
         # check on root
         if self.uid == 0: