Remove api to core

core/client/cert_func.py

@@ -26,7 +26,7 @@ import hashlib
 from client_class import HTTPSClientCertTransport
 from cert_verify import VerifyError
 import urllib2
-from calculate.api.datavars import DataVarsApi
+from calculate.core.datavars import DataVarsCore
 
 VERSION = 0.11
 
@@ -199,8 +199,8 @@ def client_get_cert(cert_path, args):
     print 'OK. Certificate save. Your certificate id = %s' %req_id
     
     if ca_root:
-        clVars = DataVarsApi()
-        clVars.importApi()
+        clVars = DataVarsCore()
+        clVars.importCore()
         clVars.flIniFile()
         system_ca_db = clVars.Get('cl_glob_root_cert')
         if os.path.exists(system_ca_db):

core/client/cert_verify.py

@@ -17,7 +17,7 @@
 import os, re, glob
 import OpenSSL
 
-from calculate.api.datavars import DataVarsApi
+from calculate.core.datavars import DataVarsCore
 
 class VerifyError(Exception):
     def __init__(self, value):
@@ -100,8 +100,8 @@ def get_CRL(path_to_cert):
                 sys.exit()
         os.makedirs(CRL_path)
     
-    clVars = DataVarsApi()
-    clVars.importApi()
+    clVars = DataVarsCore()
+    clVars.importCore()
     clVars.flIniFile()
     # user and system  ca and root certificates
     user_root_cert = clVars.Get('cl_user_root_cert')
@@ -138,7 +138,7 @@ def get_CRL(path_to_cert):
                 CN = subj[1]
         
         if url:
-            from calculate.api.client.client_class import Client_suds
+            from calculate.core.client.client_class import Client_suds
             from client_class import HTTPSClientCertTransport
             # connect to ca server (url get from certificates)
             try:
@@ -207,8 +207,8 @@ def find_ca_in_crl (CRL_path, all_ca_certs_list):
                 rm_ca_from_trusted(ca)
 
 def rm_ca_from_trusted(ca_cert):
-    clVars = DataVarsApi()
-    clVars.importApi()
+    clVars = DataVarsCore()
+    clVars.importCore()
     clVars.flIniFile()
     
     user_ca_dir = clVars.Get('cl_client_cert_dir')
@@ -220,7 +220,7 @@ def rm_ca_from_trusted(ca_cert):
     homePath = clVars.Get('ur_home_path')
     user_ca_db = user_ca_db.replace("~",homePath)
     
-    system_ca_dir = clVars.Get('cl_api_cert_path')
+    system_ca_dir = clVars.Get('cl_core_cert_path')
     system_ca_list = os.path.join(system_ca_dir, 'cert_list')
     system_ca_db = clVars.Get('cl_glob_root_cert')
     

core/client/cl_client.py

@@ -18,21 +18,21 @@
 from suds import WebFault
 from suds.transport import TransportError
 
-from calculate.api.client.client_class import Client_suds
+from calculate.core.client.client_class import Client_suds
 import traceback as tb
 import time, logging
 import os
 import re, threading
-from calculate.api.client.function import *
-from calculate.api.client.pid_information import *
-from calculate.api.client.cert_func import *
-from calculate.api.client.cert_verify import get_CRL
-from calculate.api.client.sid_func import *
+from calculate.core.client.function import *
+from calculate.core.client.pid_information import *
+from calculate.core.client.cert_func import *
+from calculate.core.client.cert_verify import get_CRL
+from calculate.core.client.sid_func import *
 
 from calculate.lib.datavars import DataVars
-from calculate.api.datavars import DataVarsApi
+from calculate.core.datavars import DataVarsCore
 
-from calculate.api.client.client_class import HTTPSClientCertTransport
+from calculate.core.client.client_class import HTTPSClientCertTransport
 
 t = time
             
@@ -113,11 +113,11 @@ def client_shut (client):
         return 1
     
 def client_signal(client):
-    Vars = DataVarsApi()
-    Vars.importApi()
+    Vars = DataVarsCore()
+    Vars.importCore()
     Vars.flIniFile()
     try:
-        client_active = Vars.Get('cl_api_client_active_period')
+        client_active = Vars.Get('cl_core_client_active_period')
     except:
         client_active = 15
     while True:
@@ -317,13 +317,13 @@ def https_server(client, signaling):
             print help_
 
         elif command in ['q', 'quit', 'exit']:
-            print _("Closing\n")
+            print _("Closing") + "\n"
             signaling._Thread__stop()
             time.sleep(0.3)
             num = client_list_pid(client)
             if num:
                 print _('at closing session, '
-                        'data %d processes will be deleted!' %num)
+                        'data %d processes will be deleted!') %num
             c = raw_input (_("Close your session y/[n]: "))
             if c in ['y', 'yes', 'Y', 'YES']:
                 client_del_sid(client)
@@ -343,7 +343,7 @@ def translate(lang = None):
     
     if lang:
         try:
-            language = gettext.translation ('calculate_api', languages = [lang])
+            language = gettext.translation ('cl_core', languages = [lang])
             language.install()
             return 0
         except:
@@ -352,14 +352,14 @@ def translate(lang = None):
     try:
         current_locale, encoding = locale.getdefaultlocale()
 
-        language = gettext.translation ('calculate_api', \
+        language = gettext.translation ('cl_core', \
                                                 languages = [current_locale] )
         language.install()
         
         print "set translate", current_locale
         return 0
     except:
-        language = gettext.translation ('calculate_api', languages = ['en'] )
+        language = gettext.translation ('cl_core', languages = ['en'] )
         language.install()
     return 0
     
@@ -458,11 +458,11 @@ def main():
 
             client.set_parameters (path_to_cert, CERT_FILE, CERT_KEY)
             
-        Vars = DataVarsApi()
-        Vars.importApi()
+        Vars = DataVarsCore()
+        Vars.importCore()
         Vars.flIniFile()
         try:
-            client.frame_period = Vars.Get('cl_api_get_frame_period')
+            client.frame_period = Vars.Get('cl_core_get_frame_period')
         except:
             client.frame_period = 2
         

core/client/client_class.py

@@ -21,7 +21,7 @@ import httplib
 from httplib import HTTPConnection
 import socket, ssl
 import OpenSSL, hashlib
-from calculate.api.datavars import DataVarsApi
+from calculate.core.datavars import DataVarsCore
 from calculate.lib.datavars import DataVars
 from suds.client import Client
 from suds.cache import ObjectCache
@@ -103,13 +103,13 @@ class clientHTTPSConnection (httplib.HTTPSConnection):
     
     def add_all_ca_cert(self, list_ca_certs):
         # so root cert be first, ca after
-        clVarsApi = DataVarsApi()
-        clVarsApi.importApi()
-        clVarsApi.flIniFile()
+        clVarsCore = DataVarsCore()
+        clVarsCore.importCore()
+        clVarsCore.flIniFile()
         
         list_ca_certs.reverse()
         for cert in list_ca_certs:
-            system_ca_db = clVarsApi.Get('cl_glob_root_cert')
+            system_ca_db = clVarsCore.Get('cl_glob_root_cert')
             if os.path.exists(system_ca_db):
                 if cert in open(system_ca_db, 'r').read():
                     continue
@@ -118,13 +118,13 @@ class clientHTTPSConnection (httplib.HTTPSConnection):
             clVars.flIniFile()
             homePath = clVars.Get('ur_home_path') 
             
-            user_root_cert = clVarsApi.Get('cl_user_root_cert')
+            user_root_cert = clVarsCore.Get('cl_user_root_cert')
             user_root_cert = user_root_cert.replace("~",homePath)
             if os.path.exists(user_root_cert):
                 if cert in open(user_root_cert, 'r').read():
                     continue
             
-            cl_client_cert_dir = clVarsApi.Get('cl_client_cert_dir')
+            cl_client_cert_dir = clVarsCore.Get('cl_client_cert_dir')
             
             cl_client_cert_dir = cl_client_cert_dir.replace("~",homePath)
             root_cert_md5 = cl_client_cert_dir + "/ca/cert_list"
@@ -331,8 +331,8 @@ class clientHTTPSConnection (httplib.HTTPSConnection):
             fcl.write(host + ' ' + filename + '\n')
             fcl.close()
         if choice.lower() == 'c':
-            clVars = DataVarsApi()
-            clVars.importApi()
+            clVars = DataVarsCore()
+            clVars.importCore()
             clVars.flIniFile()
             cl_client_cert_dir = clVars.Get('cl_client_cert_dir')
             homePath = clVars.Get('ur_home_path')
@@ -449,8 +449,8 @@ class clientHTTPSConnection (httplib.HTTPSConnection):
             self.sock = sock
             self._tunnel()
         
-        clVars = DataVarsApi()
-        clVars.importApi()
+        clVars = DataVarsCore()
+        clVars.importCore()
         clVars.flIniFile()
         
         user_root_cert = clVars.Get('cl_user_root_cert')

core/client/function.py

@@ -20,7 +20,7 @@ import fcntl, socket, struct
 from OpenSSL import crypto
 import shlex
 import suds
-from calculate.api.server.cert_cmd import getHwAddr, getIpLocal
+from calculate.core.server.cert_cmd import getHwAddr, getIpLocal
 
 # get list of certificate and session id
 def get_sid (SID_FILE):

core/datavars.py

@@ -15,17 +15,17 @@
 #  limitations under the License.
 
 __version__ = "3.0.0"
-__app__ = "calculate-api"
+__app__ = "calculate-core"
 
 from calculate.lib.datavars import DataVars
 
-class DataVarsApi(DataVars):
-    """Variable class for api"""
+class DataVarsCore(DataVars):
+    """Variable class for core"""
 
-    def importApi(self, **args):
+    def importCore(self, **args):
         """
-        Import lib and api variables
+        Import lib and core variables
         """
         self.importData()
-        self.importData('calculate.api.variables')
+        self.importData('calculate.core.variables')
 

core/server/api_types.py

@@ -23,7 +23,7 @@ from itertools import *
 from calculate.lib.datavars import SourceReadonlyVariable
 
 from calculate.lib.cl_lang import setLocalTranslate
-setLocalTranslate('calculate_api',sys.modules[__name__])
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 ################# API ########################
 class DataVarsSerializer(ClassSerializer):

core/server/baseClass.py

@@ -20,9 +20,9 @@ import socket
 from soaplib.service import rpc
 from soaplib.service import DefinitionBase
 from soaplib.serializers.primitive import String, Integer
-from calculate.api.server.api_types import ReturnedMessage
-from calculate.api.server.api_types import ChoiceValue, Table, Option, Field, \
-                                           GroupField, ViewInfo
+from calculate.core.server.api_types import ReturnedMessage
+from calculate.core.server.api_types import (ChoiceValue, Table, Option,
+                                             Field, GroupField, ViewInfo)
 
 from soaplib.wsgi import Application
 from soaplib.serializers.clazz import Array, ClassSerializer

core/server/bootstrap.py

@@ -18,9 +18,9 @@
 import cert_cmd
 import post_request
 
-from calculate.api.client.cert_func import new_key_req
-from calculate.api.client.function import get_ip_mac_type
-from calculate.api.datavars import DataVarsApi
+from calculate.core.client.cert_func import new_key_req
+from calculate.core.client.function import get_ip_mac_type
+from calculate.core.datavars import DataVarsCore
 
 from calculate.lib.utils import ip as ip_mod
 import os, hashlib, OpenSSL, pwd, socket

core/server/cert_cmd.py

@@ -121,7 +121,7 @@ def check_server_certificate(cert, key, cert_path, args, port, auto = False):
     # use self root certificate as server certificate
     elif args.use_root_cert:
         if not os.path.exists(cert_path+'/root.crt'):
-            print _('root certificate not found (use cl-api-server with key '
+            print _('root certificate not found (use cl-core with key '
                     '--gen-root-cert)')
             return 1
         

core/server/certificate.py

@@ -21,11 +21,12 @@ import OpenSSL
 from soaplib.serializers.primitive import String, Integer, Boolean
 from soaplib.serializers.clazz import Array, ClassSerializer
 from soaplib.service import rpc
-from calculate.api.server.api_types import ReturnedMessage
-from calculate.api.server.api_types import Field, GroupField, ViewInfo, ViewParams
+from calculate.core.server.api_types import ReturnedMessage
+from calculate.core.server.api_types import (Field, GroupField,
+                ViewInfo, ViewParams)
 from calculate.lib.datavars import VariableError
 
-from calculate.api import datavars
+from calculate.core import datavars
 import traceback
 
 class CertificateInfo(ClassSerializer):
@@ -65,9 +66,9 @@ class ApiWsdl:
         """ rights for the selected certificate """
         try:
             cert_id = dv.Get('cl_cert_id')
-            data_path = dv.Get('cl_api_data')
-            group_rights = dv.Get('cl_api_group_rights')
-            rights = dv.Get('cl_api_rights')
+            data_path = dv.Get('cl_core_data')
+            group_rights = dv.Get('cl_core_group_rights')
+            rights = dv.Get('cl_core_rights')
             
             # Помещение данных в словарь процессов
             self.briefParams('cert_view')
@@ -217,8 +218,8 @@ class ApiWsdl:
                                       message = mess))
         return errors
 
-    from calculate.api.server.baseClass import Basic
-    from calculate.api.server.decorators import Dec
+    from calculate.core.server.baseClass import Basic
+    from calculate.core.server.decorators import Dec
 
     def certificateCommon(self,sid,info,methodname):
         """

core/server/cl_server.py

@@ -27,7 +27,7 @@ from signal import SIGTERM
 import threading
 
 from calculate.lib.datavars import DataVars
-from calculate.api.datavars import DataVarsApi
+from calculate.core.datavars import DataVarsCore
 
 from clean import clean
 import cert_cmd
@@ -120,7 +120,7 @@ def main(*args, **keywords):
     
     if not os.path.exists('/var/log/calculate'):
         os.makedirs('/var/log/calculate')
-    LOG_FILENAME = '/var/log/calculate/logging_cl_api_server.out'
+    LOG_FILENAME = '/var/log/calculate/logging_cl_core_server.out'
     file_logger = logging.getLogger('MyLogger')
     file_logger.setLevel(logging.DEBUG)
 
@@ -132,8 +132,8 @@ def main(*args, **keywords):
     
     # debug
     if debug:
-        logging.basicConfig(level=logging.DEBUG)                                                                             
-        logger = logging.getLogger('soaplib.wsgi')                                                                           
+        logging.basicConfig(level=logging.DEBUG)
+        logger = logging.getLogger('soaplib.wsgi')
         logger.setLevel(logging.DEBUG) 
 
     port = args.port
@@ -143,21 +143,21 @@ def main(*args, **keywords):
     # set var env
     ob.flIniFile()
     cl_wsdl = ob.Get('cl_wsdl')
-    data_path = ob.Get('cl_api_data')
-    certbase = ob.Get('cl_api_database')
-    serv_certbase = ob.Get('cl_api_serv_database')
-    rights = ob.Get('cl_api_rights')
-    group_rights = ob.Get('cl_api_group_rights')
-    sids = ob.Get('cl_api_sids_path')
-    pids = ob.Get('cl_api_pids_path')
-    sids_pids = ob.Get('cl_api_sids_pids')
-    sids_file = ob.Get('cl_api_sids_file')
-    pids_file = ob.Get('cl_api_pids_file')
-    max_sid = ob.Get('cl_api_max_sid')
-    max_pid = ob.Get('cl_api_max_pid')
-    cert_path = ob.Get('cl_api_cert_path')
-    cert = ob.Get('cl_api_cert')
-    key = ob.Get('cl_api_key')
+    data_path = ob.Get('cl_core_data')
+    certbase = ob.Get('cl_core_database')
+    serv_certbase = ob.Get('cl_core_serv_database')
+    rights = ob.Get('cl_core_rights')
+    group_rights = ob.Get('cl_core_group_rights')
+    sids = ob.Get('cl_core_sids_path')
+    pids = ob.Get('cl_core_pids_path')
+    sids_pids = ob.Get('cl_core_sids_pids')
+    sids_file = ob.Get('cl_core_sids_file')
+    pids_file = ob.Get('cl_core_pids_file')
+    max_sid = ob.Get('cl_core_max_sid')
+    max_pid = ob.Get('cl_core_max_pid')
+    cert_path = ob.Get('cl_core_cert_path')
+    cert = ob.Get('cl_core_cert')
+    key = ob.Get('cl_core_key')
     cl_ver = ob.Get('cl_ver')
     
     # delete all sid and pid informations file
@@ -204,15 +204,15 @@ def main(*args, **keywords):
     # importing other modules
     other_mod = initialization(cl_wsdl)
     #try:
-    pack = "calculate.api.server"
+    pack = "calculate.core.server"
     func_metaclass = importlib.import_module('%s.func_metaclass' %pack)
     
     other_mod.append(func_metaclass.Func_MetaClass)
     
-    from calculate.api.server.cl_vers_api import VERS
+    from calculate.core.server.cl_vers_api import VERS
     other_mod.append(VERS)
     
-    from calculate.api.server.baseClass import Basic
+    from calculate.core.server.baseClass import Basic
     other_mod.append(Basic)
     other_mod.append(object)
     # make server metaclass
@@ -271,7 +271,7 @@ def main(*args, **keywords):
         print e
     except SSLError, e:
         print '\n',_('Server certificate not found')#, e
-        print _('use cl-api-server with key --gen-cert-by HOST '
+        print _('use cl-core with key --gen-cert-by HOST '
                 '(--get-cert-from HOST) '
                 'or --use-root-as-server)')
     except KeyboardInterrupt:
@@ -286,7 +286,7 @@ def translate(lang = None):
     
     if lang:
         try:
-            language = gettext.translation ('calculate_api', languages = [lang])
+            language = gettext.translation ('cl_core', languages = [lang])
             language.install()
             return 0
         except:
@@ -295,12 +295,12 @@ def translate(lang = None):
     try:
         current_locale, encoding = locale.getdefaultlocale()
 
-        language = gettext.translation ('calculate_api', \
+        language = gettext.translation ('cl_core', \
                                                 languages = [current_locale] )
         language.install()
         return 0
     except:
-        language = gettext.translation ('calculate_api', languages = ['en'] )
+        language = gettext.translation ('cl_core', languages = ['en'] )
         language.install()
     return 0
     #print _("set locale"), current_locale

core/server/cl_template.py

@@ -22,11 +22,11 @@ from soaplib.serializers.primitive import String, Integer, Any, Boolean
 from soaplib.serializers.clazz import Array, ClassSerializer
 from soaplib.service import rpc, DefinitionBase
 
-from calculate.api.server.api_types import ReturnedMessage
-from calculate.api.server.api_types import ChoiceValue, Table, Option, Field, \
-                                           GroupField, ViewInfo
+from calculate.core.server.api_types import ReturnedMessage
+from calculate.core.server.api_types import (ChoiceValue, Table, Option,
+                                             Field, GroupField, ViewInfo)
 
-from calculate.api.server.baseClass import Basic
+from calculate.core.server.baseClass import Basic
 
 class ClTemplate (ClassSerializer):
     args = String
@@ -79,16 +79,16 @@ class ApiWsdl:
             self.printERROR (e)
             return False
 
-    from calculate.api.server.baseClass import Basic
-    from calculate.api.server.decorators import Dec
+    from calculate.core.server.baseClass import Basic
+    from calculate.core.server.decorators import Dec
 
     @rpc(Integer, ClTemplate, _returns = Array(ReturnedMessage)) 
     @Dec.check_permissions(['cl_template'])
     @Dec.console('cl-template')
     @Dec.gui(_('Utilities'),'Overlay Templates', 'tab-duplicate,edit-copy')
     def cl_template ( self, sid, cltemplate):
-        cl_template_meth = type("CommonInstall",(self.Common, ApiWsdl, object), {})
-        
+        cl_template_meth = type("CommonInstall",
+                                (self.Common, ApiWsdl, object), {})
         try:
             args = cltemplate.args
         except:

core/server/clean.py

@@ -75,15 +75,16 @@ def monitor(certbase, SID_FILE):
     cert_live = 10080
     # Get value of period and lifetime session from DataVars
     try:
-        from calculate.api.datavars import DataVarsApi
-        ob = DataVarsApi()
-        ob.importApi()
+        from calculate.core.datavars import DataVarsCore
+        ob = DataVarsCore()
+        ob.importCore()
 
         ob.flIniFile()
-        period = float(ob.Get('cl_api_monitor_period'))
-        sid_live = float(ob.Get('cl_api_sid_live'))
+        period = float(ob.Get('cl_core_monitor_period'))
+        sid_live = float(ob.Get('cl_core_sid_live'))
     except:
-        print _("Variables cl_api_monitor_period or cl_api_sid_live not found")
+        print _("Variables cl_core_monitor_period "
+                "or cl_core_sid_live not found")
         raise
         return 1
     # Check lifetime. if necessary, remove

core/server/client_class.py

@@ -194,7 +194,7 @@ class clientHTTPSConnection (httplib.HTTPSConnection):
             self.sock = sock
             self._tunnel()
         
-        from calculate.api.datavars import DataVarsApi
+        from calculate.core.datavars import DataVarsApi
         clVars = DataVarsApi()
         clVars.importApi()
         clVars.flIniFile()

core/server/edit_groups.py

@@ -20,12 +20,13 @@ import subprocess
 from soaplib.serializers.primitive import String, Integer, Boolean
 from soaplib.serializers.clazz import Array, ClassSerializer
 from soaplib.service import rpc
-from calculate.api.server.api_types import ReturnedMessage
-from calculate.api.server.api_types import Field, GroupField, ViewInfo, ViewParams
+from calculate.core.server.api_types import ReturnedMessage
+from calculate.core.server.api_types import (Field, GroupField, ViewInfo,
+                                             ViewParams)
 from calculate.lib.datavars import VariableError
 from calculate.lib.utils.files import readLinesFile
 
-from calculate.api import datavars
+from calculate.core import datavars
 import traceback
 
 class GroupInfo(ClassSerializer):
@@ -160,8 +161,8 @@ class ApiWsdl:
                                       message = mess))
         return errors
 
-    from calculate.api.server.baseClass import Basic
-    from calculate.api.server.decorators import Dec
+    from calculate.core.server.baseClass import Basic
+    from calculate.core.server.decorators import Dec
 
     def groupCommon(self,sid,info,methodname):
         """
@@ -315,7 +316,7 @@ class ApiWsdl:
 
     def change_group_meth(self, dv):
         try:
-            group_rights_file = dv.Get('cl_api_group_rights')
+            group_rights_file = dv.Get('cl_core_group_rights')
             
             cl_group_name = str(dv.Get('cl_group_name'))
             cl_group_rights = dv.Get('cl_group_rights')
@@ -427,7 +428,7 @@ class ApiWsdl:
 
     def del_group_meth(self, dv):
         try:
-            group_rights_file = dv.Get('cl_api_group_rights')
+            group_rights_file = dv.Get('cl_core_group_rights')
             cl_group_name = str(dv.Get('cl_group_name'))
 
             result = []
@@ -530,7 +531,7 @@ class ApiWsdl:
 
     def add_group_meth(self, dv):
         try:
-            group_rights_file = dv.Get('cl_api_group_rights')
+            group_rights_file = dv.Get('cl_core_group_rights')
             cl_group_add = str(dv.Get('cl_group_add'))
 
             self.printSUCCESS ("cl_group_add = %s" %cl_group_add)

core/server/func.py

@@ -506,9 +506,9 @@ def initialization(cl_wsdl):
             module_name = \
                 '%s.cl_wsdl_%s'% (pack.replace("-","."),pack.rpartition("-")[2])
             #try:
-            cl_wsdl_api = importlib.import_module(module_name)
+            cl_wsdl_core = importlib.import_module(module_name)
             try:
-                cl_apis.append (cl_wsdl_api.Wsdl)
+                cl_apis.append (cl_wsdl_core.Wsdl)
             except ImportError:
                 sys.stderr.write(_("Unable import %s")%module_name)
     return cl_apis

core/server/func_metaclass.py

@@ -44,7 +44,7 @@ list_module = ["clean", "gen_pid", "check_rights", "cl_template", \
                'system_update', 'request', 'certificate', 'edit_groups']
 
 imported_modules = []
-pack = "calculate.api.server"
+pack = "calculate.core.server"
 for module_name in list_module:
     imported_modules.append (importlib.import_module('%s.%s'\
                              %(pack, module_name)).ApiWsdl)

core/server/request.py

@@ -20,11 +20,12 @@ import subprocess
 from soaplib.serializers.primitive import String, Integer, Boolean
 from soaplib.serializers.clazz import Array, ClassSerializer
 from soaplib.service import rpc
-from calculate.api.server.api_types import ReturnedMessage
-from calculate.api.server.api_types import Field, GroupField, ViewInfo, ViewParams
+from calculate.core.server.api_types import ReturnedMessage
+from calculate.core.server.api_types import (Field, GroupField, ViewInfo,
+                                             ViewParams)
 from calculate.lib.datavars import VariableError
 
-from calculate.api import datavars
+from calculate.core import datavars
 import traceback
 
 class RequestInfo(ClassSerializer):
@@ -162,8 +163,8 @@ class ApiWsdl:
                                       message = mess))
         return errors
 
-    from calculate.api.server.baseClass import Basic
-    from calculate.api.server.decorators import Dec
+    from calculate.core.server.baseClass import Basic
+    from calculate.core.server.decorators import Dec
 
     def requestCommon(self,sid,info,methodname):
         """
@@ -326,8 +327,8 @@ class ApiWsdl:
 
     def confirm_request_meth(self, dv):
         try:
-            data_path = dv.Get('cl_api_data')
-            cert_path = dv.Get('cl_api_cert_path')
+            data_path = dv.Get('cl_core_data')
+            cert_path = dv.Get('cl_core_cert_path')
 
             cl_req_id = str(dv.Get('cl_req_id'))
             cl_req_group = str(dv.Get('cl_req_group'))
@@ -477,8 +478,8 @@ class ApiWsdl:
         # set var env
         #ob.flIniFile()
         try:
-            data_path = dv.Get('cl_api_data')
-            certbase = dv.Get('cl_api_database')
+            data_path = dv.Get('cl_core_data')
+            certbase = dv.Get('cl_core_database')
 
             id_del_req = str(dv.Get('cl_req_id'))
             self.startTask("id_del_req = %s" %id_del_req)

core/server/system_update.py

@@ -16,15 +16,15 @@
 
 import soaplib, sys, time, os
 
-from soaplib.serializers.primitive import String, Integer, Any, Boolean                                                                         
+from soaplib.serializers.primitive import String, Integer, Any, Boolean
 from soaplib.serializers.clazz import Array, ClassSerializer
 from soaplib.service import rpc, DefinitionBase
 
-from calculate.api.server.api_types import ReturnedMessage
-from calculate.api.server.api_types import ChoiceValue, Table, Option, Field, \
+from calculate.core.server.api_types import ReturnedMessage
+from calculate.core.server.api_types import ChoiceValue, Table, Option, Field, \
                                            GroupField, ViewInfo
 
-from calculate.api.server.baseClass import Basic
+from calculate.core.server.baseClass import Basic
 
 class SU (ClassSerializer):
     name = String
@@ -80,8 +80,8 @@ class ApiWsdl:
             return False
 
             
-    from calculate.api.server.baseClass import Basic
-    from calculate.api.server.decorators import Dec
+    from calculate.core.server.baseClass import Basic
+    from calculate.core.server.decorators import Dec
 
     @rpc(Integer, _returns = Array(ReturnedMessage))
     def system_update_tray(self, sid):

core/server/test.py

@@ -16,15 +16,15 @@
 
 import soaplib, sys, time, os
 
-from soaplib.serializers.primitive import String, Integer, Any, Boolean                                                                         
+from soaplib.serializers.primitive import String, Integer, Any, Boolean
 from soaplib.serializers.clazz import Array, ClassSerializer
 from soaplib.service import rpc, DefinitionBase
 
-from calculate.api.server.api_types import ChoiceValue, Table, Field, \
-                                           GroupField, ViewInfo, ViewParams, \
-                                           ReturnedMessage
+from calculate.core.server.api_types import (ChoiceValue, Table, Field,
+                                             GroupField, ViewInfo, ViewParams,
+                                             ReturnedMessage)
 
-from calculate.api.server.baseClass import Basic
+from calculate.core.server.baseClass import Basic
 
 class SH (ClassSerializer):
     name = String
@@ -163,8 +163,8 @@ class ApiWsdl:
         #return errors
                 ##dv.Set('os_location_data',rrr.disk)
             
-    from calculate.api.server.baseClass import Basic
-    from calculate.api.server.decorators import Dec
+    from calculate.core.server.baseClass import Basic
+    from calculate.core.server.decorators import Dec
 
     @rpc(Integer, SH, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["test"])
@@ -604,4 +604,4 @@ class ApiWsdl:
             #'/usr/share/wallpapers/Horos/contents/screenshot.png,system-log-out')
     #def apitest ( self, l, t):
         #print '==>', l
-        #print '++>', t
+        #print '++>', t

core/server/test2.py

@@ -16,17 +16,17 @@
 
 import soaplib, sys, time, os
 
-from soaplib.serializers.primitive import String, Integer, Any, Boolean                                                                         
+from soaplib.serializers.primitive import String, Integer, Any, Boolean
 from soaplib.serializers.clazz import Array, ClassSerializer
 from soaplib.service import rpc, DefinitionBase
 
-from calculate.api.server.api_types import ReturnedMessage
-from calculate.api.server.api_types import ChoiceValue, Table, Option, Field, \
-                                           GroupField, ViewInfo
+from calculate.core.server.api_types import ReturnedMessage
+from calculate.core.server.api_types import (ChoiceValue, Table, Option, Field,
+                                             GroupField, ViewInfo)
 from calculate.lib.datavars import VariableError, DataVarsError
 
 from calculate.install.cl_install import DataVarsInstall
-from calculate.api.server.baseClass import Basic
+from calculate.core.server.baseClass import Basic
 
 class SH2 (ClassSerializer):
     #name = String
@@ -130,13 +130,13 @@ class ApiWsdl:
         return errors
                 #dv.Set('os_location_data',rrr.disk)
             
-    from calculate.api.server.baseClass import Basic
-    from calculate.api.server.decorators import Dec
+    from calculate.core.server.baseClass import Basic
+    from calculate.core.server.decorators import Dec
 
     @rpc(Integer, SH2, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["test2"])
     @Dec.console('cl-test2')
-    @Dec.gui('Api.Test', 'test2 install', \
+    @Dec.gui('Core.Test', 'test2 install', \
             'voicecall,system-software-install,system-log-out')
     def test2 ( self, sid, rrr):
         import threading

core/variables/__init__.py

@@ -15,14 +15,14 @@
 #  limitations under the License.
 
 from calculate.lib.datavars import ReadonlyVariable
-from calculate.api.datavars import __version__,__app__
+from calculate.core.datavars import __version__,__app__
 
-import api
+import core
 import request
 import certificate
 import edit_groups
 
-section = "api"
+section = "core"
 
 class VariableClName(ReadonlyVariable):
     """

core/variables/certificate.py

@@ -27,12 +27,12 @@ import OpenSSL
 from calculate.lib.cl_lang import setLocalTranslate
 from calculate.lib.utils.files import readLinesFile
 #from calculate.api.cert_cmd import find_id_cert
-setLocalTranslate('cl_api',sys.modules[__name__])
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 class VariableClAllCertId(Variable):
 
     def get(self):
-        data_path = self.Get('cl_api_data')
+        data_path = self.Get('cl_core_data')
         result = []
         cert_dir =  data_path + '/client_certs/'
         for filename in glob.glob(cert_dir+"*"):

core/variables/core.py

@@ -25,148 +25,148 @@ import sys
 from os import path
 
 from calculate.lib.cl_lang import setLocalTranslate
-setLocalTranslate('cl_api',sys.modules[__name__])
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 
-class VariableClApiMonitorPeriod(Variable):
+class VariableClCoreMonitorPeriod(Variable):
     """
     Variable store period monitoring session
     """
     type = "int"
     value = "30"
 
-class VariableClApiSidLive(Variable):
+class VariableClCoreSidLive(Variable):
     """
     Variable store time session live
     """
     type = "int"
     value = "1440"
 
-class VariableClApiRights(Variable):
+class VariableClCoreRights(Variable):
     """
     Variable store path to file with rights
     """
     def get(self):
-        return path.join(self.Get('cl_api_data'),"conf/right.conf")
+        return path.join(self.Get('cl_core_data'),"conf/right.conf")
 
-class VariableClApiGroupRights(Variable):
+class VariableClCoreGroupRights(Variable):
     """
     Variable store path to file with group rights
     """
     def get(self):
-        return path.join(self.Get('cl_api_data'),"conf/group_right.conf")
+        return path.join(self.Get('cl_core_data'),"conf/group_right.conf")
 
-class VariableClApiData(Variable):
+class VariableClCoreData(Variable):
     """
     Variable store path to data files
     """
     value = '/var/calculate/server'
 
-class VariableClApiDatabase(Variable):
+class VariableClCoreDatabase(Variable):
     """
     Variable store name files containing clients certificates
     """
     def get(self):
-        return path.join(self.Get('cl_api_data'),"client_certs/Database")
+        return path.join(self.Get('cl_core_data'),"client_certs/Database")
 
-class VariableClApiServDatabase(Variable):
+class VariableClCoreServDatabase(Variable):
     """
     Variable store name files containing signed servers certificates
     """
     def get(self):
-        return path.join(self.Get('cl_api_data'),"server_certs/Database")
+        return path.join(self.Get('cl_core_data'),"server_certs/Database")
 
-class VariableClApiSidsPath(Variable):
+class VariableClCoreSidsPath(Variable):
     """
     Variable store path to sessions id files
     """
     def get(self):
-        return path.join(self.Get('cl_api_data'),"sids")
+        return path.join(self.Get('cl_core_data'),"sids")
 
-class VariableClApiPidsPath(Variable):
+class VariableClCorePidsPath(Variable):
     """
     Variable store path to process id files
     """
     def get(self):
-        return path.join(self.Get('cl_api_data'),"pids")
+        return path.join(self.Get('cl_core_data'),"pids")
 
-class VariableClApiSidsFile(Variable):
+class VariableClCoreSidsFile(Variable):
     """
     Variable store name sessions database files
     """
     def get(self):
-        return path.join(self.Get('cl_api_data'),"sid.db")
+        return path.join(self.Get('cl_core_data'),"sid.db")
 
-class VariableClApiPidsFile(Variable):
+class VariableClCorePidsFile(Variable):
     """
     Variable store name process id database files
     """
     def get(self):
-        return path.join(self.Get('cl_api_data'),"pid.db")
+        return path.join(self.Get('cl_core_data'),"pid.db")
 
-class VariableClApiSidsPids(Variable):
+class VariableClCoreSidsPids(Variable):
     """
     Variable store name file comparison sessions and process 
     """
     def get(self):
-        return path.join(self.Get('cl_api_data'),"sid_pid")
+        return path.join(self.Get('cl_core_data'),"sid_pid")
 
-class VariableClApiMaxSid(Variable):
+class VariableClCoreMaxSid(Variable):
     """
     Variable store maximum session id
     """
     value = "10000"
 
-class VariableClApiMaxPid(Variable):
+class VariableClCoreMaxPid(Variable):
     """
     Variable store maximum process id
     """
     value = "100000"
 
 
-class VariableClApiCert(Variable):
+class VariableClCoreCert(Variable):
     """
     Server certificate
     """
     def get(self):
-        return path.join(self.Get('cl_api_cert_path'),"server.crt")
+        return path.join(self.Get('cl_core_cert_path'),"server.crt")
 
-class VariableClApiCertPath(Variable):
+class VariableClCoreCertPath(Variable):
     """
     Server certificate path
     """
     def get(self):
-        return path.join(self.Get('cl_api_data'),"ca")
+        return path.join(self.Get('cl_core_data'),"ca")
 
-class VariableClApiKey(Variable):
+class VariableClCoreKey(Variable):
     """
     Private server key
     """
     def get(self):
-        return path.join(self.Get('cl_api_cert_path'),"server.key")
+        return path.join(self.Get('cl_core_cert_path'),"server.key")
 
-class VariableClApiSidLive(Variable):
+class VariableClCoreSidLive(Variable):
     """
     Max time live sessions (in minutes)
     """
     type = "int"
     value = "1440"
 
-class VariableClApiCertLive(Variable):
+class VariableClCoreCertLive(Variable):
     """
     Max time live sessions (in minutes)
     """
     type = "int"
     value = "1576800"
 
-class VariableClApiClientActivePeriod(Variable):
+class VariableClCoreClientActivePeriod(Variable):
     """
     Period client activity (in seconds)
     """
     type = "int"
     value = "15"
 
-class VariableClApiGetFramePeriod(Variable):
+class VariableClCoreGetFramePeriod(Variable):
     """
     Period request frames (in seconds)
     """
@@ -191,4 +191,4 @@ class VariableClGlobRootCert(Variable):
     Trusted certificates installed in system
     """
     def get(self):
-        return path.join(self.Get('cl_api_cert_path'),"sys_ca.crt")
+        return path.join(self.Get('cl_core_cert_path'),"sys_ca.crt")

core/variables/edit_groups.py

@@ -26,9 +26,9 @@ import OpenSSL
 
 from calculate.lib.cl_lang import setLocalTranslate
 from calculate.lib.utils.files import readLinesFile
-from calculate.api.server.decorators import Dec
+from calculate.core.server.decorators import Dec
 #from calculate.api.cert_cmd import find_id_cert
-setLocalTranslate('cl_api',sys.modules[__name__])
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 class VariableClGroupName(Variable):
     """
@@ -43,7 +43,7 @@ class VariableClGroupName(Variable):
         self.label = _("Group name")
 
     def choice(self):
-        group_rights = self.Get('cl_api_group_rights')
+        group_rights = self.Get('cl_core_group_rights')
 
         t = open(group_rights, 'r').read()
         result = []
@@ -58,7 +58,7 @@ class VariableClGroupName(Variable):
 
     #def get(self):
         #req_id = self.Get('cl_req_id')
-        #data_path = self.Get('cl_api_data')
+        #data_path = self.Get('cl_core_data')
         
         #cert_file =  data_path + '/client_certs/%s.crt' %req_id
         #if os.path.exists(cert_file):
@@ -72,7 +72,7 @@ class VariableClGroupName(Variable):
         #return ''
 
     def check(self, group):
-        group_rights = self.Get('cl_api_group_rights')
+        group_rights = self.Get('cl_core_group_rights')
 
         if group == 'all':
             return
@@ -114,7 +114,7 @@ class VariableClGroupRights(Variable):
 
     def get(self):
         group_name = self.Get('cl_group_name')
-        group_rights = self.Get('cl_api_group_rights')
+        group_rights = self.Get('cl_core_group_rights')
 
         t = open(group_rights, 'r').read()
         results = []

core/variables/request.py

@@ -27,11 +27,11 @@ import OpenSSL
 from calculate.lib.cl_lang import setLocalTranslate
 from calculate.lib.utils.files import readLinesFile
 #from calculate.api.cert_cmd import find_id_cert
-setLocalTranslate('cl_api',sys.modules[__name__])
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 class VariableClAllReqId(Variable):
     def get(self):
-        data_path = self.Get('cl_api_data')
+        data_path = self.Get('cl_core_data')
         result = []
         cert_dir =  data_path + '/client_certs/'
         for filename in glob.glob(cert_dir+"*"):
@@ -128,8 +128,8 @@ class VariableClReqBaseData(Variable):
     """
     def get(self):
         req_id = self.Get('cl_req_id')
-        serv_certbase = self.Get('cl_api_serv_database')
-        certbase = self.Get('cl_api_database')
+        serv_certbase = self.Get('cl_core_serv_database')
+        certbase = self.Get('cl_core_database')
 
         for line in readLinesFile(certbase):
             if line.split()[0] == str(req_id):
@@ -141,7 +141,7 @@ class VariableClReqData(Variable):
     """
     def get(self):
         req_id = self.Get('cl_req_id')
-        data_path = self.Get('cl_api_data')
+        data_path = self.Get('cl_core_data')
         
         req_file =  data_path + '/client_certs/%s.csr' %req_id
         if os.path.exists(req_file):
@@ -251,7 +251,7 @@ class VariableClReqGroup(Variable):
         self.label = _("Certificate group")
 
     def choice(self):
-        group_rights = self.Get('cl_api_group_rights')
+        group_rights = self.Get('cl_core_group_rights')
 
         t = open(group_rights, 'r').read()
         result = []
@@ -266,7 +266,7 @@ class VariableClReqGroup(Variable):
 
     def get(self):
         req_id = self.Get('cl_req_id')
-        data_path = self.Get('cl_api_data')
+        data_path = self.Get('cl_core_data')
         
         cert_file =  data_path + '/client_certs/%s.crt' %req_id
         if os.path.exists(cert_file):
@@ -280,7 +280,7 @@ class VariableClReqGroup(Variable):
         return ''
 
     def check(self, group):
-        group_rights = self.Get('cl_api_group_rights')
+        group_rights = self.Get('cl_core_group_rights')
 
         if group == 'all':
             return

scripts/calculate3

@@ -19,14 +19,14 @@ depend() {
 }
 
 start() {
-        ebegin "Start cl-api-server"
-        cl-api-server &
-        eend $? "Another cl-api-server is running"
+        ebegin "Start calculate core"
+        cl-core &
+        eend $? "Another cl-core is running"
 }
 
 stop(){
-        ebegin "Stop cl-api-server"
-        killall cl-api-server
+        ebegin "Stop calculate core"
+        killall cl-core
         eend 0
 }
 

scripts/cl-core

@@ -15,7 +15,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from calculate.api.server.cl_server import translate, main
+from calculate.core.server.cl_server import translate, main
 
 if __name__=='__main__':
     translate()

setup.py

@@ -31,10 +31,10 @@ import distutils.command.install_egg_info
 
 var_data_files = []
 
-data_files = [('/etc/init.d', ['scripts/calculate-api'])]
+data_files = [('/etc/init.d', ['scripts/calculate3'])]
 
 __version__ = "0.1"
-__app__ = "calculate-api"
+__app__ = "calculate-core"
 
 locales = ("ru",'en')
 
@@ -83,10 +83,10 @@ class install_man( install_data ) :
                 self.data_files += [(path.join(self.install_dir,root[6:]),
                                     [path.join(root,filename)])]
 
-class cl_api_data(install_data):
+class cl_core_data(install_data):
     def run (self):
         install_data.run(self)
-        data_file = [("/etc/init.d/calculate-api",0755)]
+        data_file = [("/etc/init.d/calculate3",0755)]
         fileNames = map(lambda x: os.path.split(x[0])[1], data_file)
         listNames = map(lambda x: filter(lambda y: y, x[0].split("/")),
                         data_file)
@@ -180,11 +180,11 @@ setup(
         (path.join('/usr/share/locale',locale,"LC_MESSAGES"),
          glob.glob(path.join("build",locale,"LC_MESSAGES/*.mo")))
          for locale in locales ],
-    package_dir = {'calculate.api': "api"},
-    packages = ['calculate.api','calculate.api.variables',
-                'calculate.api.server','calculate.api.client'],
-    scripts = ['./scripts/cl-api-server', './scripts/sudsclient'],
-    cmdclass={'cl_api_data': cl_api_data,'build': build,'build_po':build_po, \
+    package_dir = {'calculate.core': "core"},
+    packages = ['calculate.core','calculate.core.variables',
+                'calculate.core.server','calculate.core.client'],
+    scripts = ['./scripts/cl-core', './scripts/sudsclient'],
+    cmdclass={'cl_core_data': cl_core_data,'build': build,'build_po':build_po, \
                 'install_egg_info':empty_egg_info,'build_man':build_man, \
               'install':install,'install_man':install_man}
 )