Commit a119b184 authored by Antoine Millet's avatar Antoine Millet
Browse files

Moved ccserver to namespace package cloudcontrol

parent 51c8e89f
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ from getpass import getpass
from pwd import getpwnam
from grp import getgrnam
from optparse import OptionParser
from ccserver.conf import CCConf
from cloudcontrol.server.conf import CCConf

DEFAULT_ACCOUNT_DIRECTORY = '/var/lib/cc-server/'
DEFAULT_ROLE = 'cli'
+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ from grp import getgrnam
from daemon import DaemonContext
from daemon.pidlockfile import PIDLockFile

from ccserver.ccserver import CCServer
from ccserver import __version__
from cloudcontrol.server.ccserver import CCServer
from cloudcontrol.server import __version__


DEFAULT_CONFIG_FILE = '/etc/cc-server.conf'
+1 −0
Original line number Diff line number Diff line
__import__('pkg_resources').declare_namespace(__name__)
+10 −10
Original line number Diff line number Diff line
@@ -10,22 +10,22 @@ from fnmatch import fnmatch as glob
from sjrpc.server import SSLRpcServer
from sjrpc.utils import RpcHandler, pass_connection

from ccserver.conf import CCConf
from ccserver.exceptions import AlreadyRegistered, NotConnectedAccountError, AuthenticationError, BadRoleError
from ccserver.jobs import JobsManager
from ccserver.clients import Client
from cloudcontrol.server.conf import CCConf
from cloudcontrol.server.exceptions import AlreadyRegistered, NotConnectedAccountError, AuthenticationError, BadRoleError
from cloudcontrol.server.jobs import JobsManager
from cloudcontrol.server.clients import Client

#from cloudcontrol.common.tql.db.object import TqlObject
from ccserver.db import SObject, SRequestor
from cloudcontrol.server.db import SObject, SRequestor
from cloudcontrol.common.tql.db.tag import StaticTag
from cloudcontrol.common.tql.db.db import TqlDatabase

# Import all enabled roles
import ccserver.clients.cli
import ccserver.clients.host
import ccserver.clients.hv
import ccserver.clients.bootstrap
import ccserver.clients.spv
import cloudcontrol.server.clients.cli
import cloudcontrol.server.clients.host
import cloudcontrol.server.clients.hv
import cloudcontrol.server.clients.bootstrap
import cloudcontrol.server.clients.spv

class WelcomeHandler(RpcHandler):
    """ Default handler used on client connections of the server.
Loading