Commit 4869595d authored by Petr Pudlak's avatar Petr Pudlak

Add a Python directory for RPC code to keep it at one place

Move rpc.py to rpc/node.py and modify imports in existing code.
Signed-off-by: default avatarPetr Pudlak <pudlak@google.com>
Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
parent dd4a4aa9
......@@ -87,6 +87,7 @@ httpdir = $(pkgpythondir)/http
masterddir = $(pkgpythondir)/masterd
confddir = $(pkgpythondir)/confd
rapidir = $(pkgpythondir)/rapi
rpcdir = $(pkgpythondir)/rpc
serverdir = $(pkgpythondir)/server
watcherdir = $(pkgpythondir)/watcher
impexpddir = $(pkgpythondir)/impexpd
......@@ -173,6 +174,7 @@ DIRS = \
lib/impexpd \
lib/masterd \
lib/rapi \
lib/rpc \
lib/server \
lib/storage \
lib/tools \
......@@ -359,7 +361,6 @@ pkgpython_PYTHON = \
lib/pathutils.py \
lib/qlang.py \
lib/query.py \
lib/rpc.py \
lib/rpc_defs.py \
lib/runtime.py \
lib/serializer.py \
......@@ -462,6 +463,10 @@ server_PYTHON = \
lib/server/noded.py \
lib/server/rapi.py
rpc_PYTHON = \
lib/rpc/__init__.py \
lib/rpc/node.py
pytools_PYTHON = \
lib/tools/__init__.py \
lib/tools/burnin.py \
......@@ -1545,6 +1550,7 @@ all_python_code = \
$(storage_PYTHON) \
$(rapi_PYTHON) \
$(server_PYTHON) \
$(rpc_PYTHON) \
$(pytools_PYTHON) \
$(http_PYTHON) \
$(confd_PYTHON) \
......
......@@ -31,7 +31,7 @@ import time
import tempfile
from ganeti.cmdlib import cluster
from ganeti import rpc
import ganeti.rpc.node as rpc
from ganeti import ssh
from ganeti import utils
from ganeti import errors
......
......@@ -37,7 +37,7 @@ from ganeti import errors
from ganeti import constants
from ganeti import opcodes
from ganeti import luxi
from ganeti import rpc
import ganeti.rpc.node as rpc
from ganeti import ssh
from ganeti import compat
from ganeti import netutils
......
......@@ -42,7 +42,7 @@ from ganeti import objects
from ganeti import opcodes
from ganeti import pathutils
from ganeti import query
from ganeti import rpc
import ganeti.rpc.node as rpc
from ganeti import runtime
from ganeti import ssh
from ganeti import uidpool
......
......@@ -32,7 +32,7 @@ from ganeti import locking
from ganeti import objects
from ganeti import opcodes
from ganeti import pathutils
from ganeti import rpc
import ganeti.rpc.node as rpc
from ganeti import ssconf
from ganeti import utils
......
......@@ -37,7 +37,7 @@ from ganeti import masterd
from ganeti import netutils
from ganeti import objects
from ganeti import pathutils
from ganeti import rpc
import ganeti.rpc.node as rpc
from ganeti import utils
from ganeti.cmdlib.base import NoHooksLU, LogicalUnit, ResultWithJobs
......
......@@ -34,7 +34,7 @@ from ganeti import locking
from ganeti.masterd import iallocator
from ganeti import objects
from ganeti import utils
from ganeti import rpc
import ganeti.rpc.node as rpc
from ganeti.cmdlib.base import LogicalUnit, NoHooksLU, Tasklet
from ganeti.cmdlib.common import INSTANCE_DOWN, INSTANCE_NOT_RUNNING, \
AnnotateDiskParams, CheckIAllocatorOrNode, ExpandNodeUuidAndName, \
......
......@@ -30,7 +30,7 @@ from ganeti import locking
from ganeti import netutils
from ganeti import objects
from ganeti import opcodes
from ganeti import rpc
import ganeti.rpc.node as rpc
from ganeti import utils
from ganeti.masterd import iallocator
......
......@@ -45,7 +45,7 @@ from ganeti import errors
from ganeti import locking
from ganeti import utils
from ganeti import constants
from ganeti import rpc
import ganeti.rpc.node as rpc
from ganeti import objects
from ganeti import serializer
from ganeti import uidpool
......
......@@ -55,7 +55,7 @@ from ganeti import errors
from ganeti import mcpu
from ganeti import utils
from ganeti import jstore
from ganeti import rpc
import ganeti.rpc.node as rpc
from ganeti import runtime
from ganeti import netutils
from ganeti import compat
......
......@@ -27,7 +27,7 @@ from ganeti import errors
from ganeti import ht
from ganeti import outils
from ganeti import opcodes
from ganeti import rpc
import ganeti.rpc.node as rpc
from ganeti import serializer
from ganeti import utils
......
#
#
# Copyright (C) 2013 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
"""Empty file for package definition.
"""
......@@ -52,7 +52,7 @@ from ganeti import utils
from ganeti import errors
from ganeti import ssconf
from ganeti import workerpool
from ganeti import rpc
import ganeti.rpc.node as rpc
from ganeti import bootstrap
from ganeti import netutils
from ganeti import objects
......
......@@ -35,7 +35,7 @@ from ganeti import errors
from ganeti import ht
from ganeti import opcodes
from ganeti import objects
from ganeti import rpc
from ganeti.rpc import node as rpc
from ganeti import utils
from ganeti.cmdlib import instance
......
......@@ -25,7 +25,7 @@
import mock
from ganeti import objects
from ganeti import rpc
from ganeti.rpc import node as rpc
from cmdlib.testsupport.util import patchModule
......
......@@ -34,7 +34,7 @@ from ganeti import hooksmaster
from ganeti import backend
from ganeti import constants
from ganeti import cmdlib
from ganeti import rpc
from ganeti.rpc import node as rpc
from ganeti import compat
from ganeti import pathutils
from ganeti.constants import HKR_SUCCESS, HKR_FAIL, HKR_SKIP
......
......@@ -29,7 +29,7 @@ import tempfile
from ganeti import constants
from ganeti import compat
from ganeti import rpc
from ganeti.rpc import node as rpc
from ganeti import rpc_defs
from ganeti import http
from ganeti import errors
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment