Move server-only files from grr/lib to grr/server.

grr/checks/cron_test.py

@@ -3,10 +3,10 @@
 """Tests for cron checks."""
 
 from grr.lib import flags
-from grr.lib.checks import checks
-from grr.lib.checks import checks_test_lib
 from grr.lib.rdfvalues import anomaly as rdf_anomaly
 from grr.parsers import config_file
+from grr.server.checks import checks
+from grr.server.checks import checks_test_lib
 from grr.test_lib import test_lib
 
 

grr/checks/format_test.py

@@ -7,7 +7,7 @@
 
 from grr import config
 from grr.lib import flags
-from grr.lib.checks import checks_test_lib
+from grr.server.checks import checks_test_lib
 from grr.test_lib import test_lib
 
 

grr/checks/mounts_test.py

@@ -3,8 +3,8 @@
 """Tests for service state checks."""
 
 from grr.lib import flags
-from grr.lib.checks import checks_test_lib
 from grr.parsers import config_file
+from grr.server.checks import checks_test_lib
 from grr.test_lib import test_lib
 
 

grr/checks/nfs_test.py

@@ -3,8 +3,8 @@
 """Tests for nfs export checks."""
 
 from grr.lib import flags
-from grr.lib.checks import checks_test_lib
 from grr.parsers import config_file
+from grr.server.checks import checks_test_lib
 from grr.test_lib import test_lib
 
 

grr/checks/pam_test.py

@@ -3,8 +3,8 @@
 """Tests for the PAM config checks."""
 
 from grr.lib import flags
-from grr.lib.checks import checks_test_lib
 from grr.parsers import linux_pam_parser
+from grr.server.checks import checks_test_lib
 from grr.test_lib import test_lib
 
 

grr/checks/paths_test.py

@@ -4,8 +4,8 @@
 
 
 from grr.lib import flags
-from grr.lib.checks import checks_test_lib
 from grr.parsers import linux_file_parser
+from grr.server.checks import checks_test_lib
 from grr.test_lib import test_lib
 
 

grr/checks/pkg_sources_test.py

@@ -4,8 +4,8 @@
 
 
 from grr.lib import flags
-from grr.lib.checks import checks_test_lib
 from grr.parsers import config_file
+from grr.server.checks import checks_test_lib
 from grr.test_lib import test_lib
 
 

grr/checks/rsyslog_test.py

@@ -4,8 +4,8 @@
 
 
 from grr.lib import flags
-from grr.lib.checks import checks_test_lib
 from grr.parsers import config_file
+from grr.server.checks import checks_test_lib
 from grr.test_lib import test_lib
 
 

grr/checks/services_test.py

@@ -3,10 +3,10 @@
 """Tests for service state checks."""
 
 from grr.lib import flags
-from grr.lib.checks import checks_test_lib
 from grr.lib.rdfvalues import client as rdf_client
 from grr.parsers import linux_service_parser
 from grr.parsers import parsers_test_lib
+from grr.server.checks import checks_test_lib
 from grr.test_lib import test_lib
 
 

grr/checks/sshd_test.py

@@ -4,8 +4,8 @@
 
 
 from grr.lib import flags
-from grr.lib.checks import checks_test_lib
 from grr.parsers import config_file
+from grr.server.checks import checks_test_lib
 from grr.test_lib import test_lib
 
 

grr/checks/stat_test.py

@@ -3,7 +3,7 @@
 """Tests for stat checks."""
 
 from grr.lib import flags
-from grr.lib.checks import checks_test_lib
+from grr.server.checks import checks_test_lib
 from grr.test_lib import test_lib
 
 

grr/checks/sysctl_test.py

@@ -3,8 +3,8 @@
 """Tests for sysctl checks."""
 
 from grr.lib import flags
-from grr.lib.checks import checks_test_lib
 from grr.parsers import linux_sysctl_parser
+from grr.server.checks import checks_test_lib
 from grr.test_lib import test_lib
 
 

grr/checks/time_test.py

@@ -3,8 +3,8 @@
 """Tests for the time synchronization state checks."""
 
 from grr.lib import flags
-from grr.lib.checks import checks_test_lib
 from grr.parsers import config_file
+from grr.server.checks import checks_test_lib
 from grr.test_lib import test_lib
 
 

grr/checks/unix_login_test.py

@@ -3,8 +3,8 @@
 """Tests for service state checks."""
 
 from grr.lib import flags
-from grr.lib.checks import checks_test_lib
 from grr.parsers import linux_file_parser
+from grr.server.checks import checks_test_lib
 from grr.test_lib import test_lib
 
 

grr/client/client_actions/admin.py

@@ -22,13 +22,13 @@
 from grr.client import actions
 from grr.client.client_actions import tempfiles
 from grr.lib import config_lib
-from grr.lib import queues
 from grr.lib import rdfvalue
 from grr.lib import stats
 from grr.lib import utils
 from grr.lib.rdfvalues import client as rdf_client
 from grr.lib.rdfvalues import flows as rdf_flows
 from grr.lib.rdfvalues import protodict as rdf_protodict
+from grr.server import queues
 
 
 class Echo(actions.ActionPlugin):

grr/client/client_actions/windows/windows_test.py

@@ -9,15 +9,15 @@
 
 from grr.client import vfs
 from grr.lib import action_mocks
-from grr.lib import aff4
-from grr.lib import client_fixture
 from grr.lib import flags
-from grr.lib import flow
 from grr.lib import utils
-from grr.lib.flows.general import filesystem
-from grr.lib.flows.general import registry as flow_registry
 from grr.lib.rdfvalues import paths as rdf_paths
 from grr.lib.rdfvalues import protodict as rdf_protodict
+from grr.server import aff4
+from grr.server import client_fixture
+from grr.server import flow
+from grr.server.flows.general import filesystem
+from grr.server.flows.general import registry as flow_registry
 from grr.test_lib import client_test_lib
 from grr.test_lib import flow_test_lib
 from grr.test_lib import test_lib

grr/client/comms.py

@@ -96,7 +96,6 @@
 from grr.client.components.rekall_support import rekall_types as rdf_rekall_types
 from grr.lib import communicator
 from grr.lib import flags
-from grr.lib import queues
 from grr.lib import rdfvalue
 from grr.lib import registry
 from grr.lib import stats
@@ -107,6 +106,7 @@
 from grr.lib.rdfvalues import crypto as rdf_crypto
 from grr.lib.rdfvalues import flows as rdf_flows
 from grr.lib.rdfvalues import protodict as rdf_protodict
+from grr.server import queues
 
 
 class HTTPObject(object):

grr/client/components/chipsec_support/grr_chipsec_stub.py

@@ -4,7 +4,7 @@
 __author__ = "[email protected] (Thiebaud Weksteen)"
 
 from grr.client.components.chipsec_support.actions import chipsec_types
-from grr.lib import server_stubs
+from grr.server import server_stubs
 
 
 class DumpFlashImage(server_stubs.ClientActionStub):

grr/client/components/rekall_support/grr_rekall_stubs.py

@@ -2,8 +2,8 @@
 """Stubs for client actions of the Rekall component."""
 
 from grr.client.components.rekall_support import rekall_types
-from grr.lib import server_stubs
 from grr.lib.rdfvalues import paths as rdf_paths
+from grr.server import server_stubs
 
 
 class WriteRekallProfile(server_stubs.ClientActionStub):

grr/client/components/rekall_support/grr_rekall_test.py

@@ -15,13 +15,13 @@
 from grr.client.components.rekall_support import rekall_types as rdf_rekall_types
 
 from grr.lib import action_mocks
-from grr.lib import aff4
 from grr.lib import flags
-from grr.lib import flow
 from grr.lib import utils
-from grr.lib.aff4_objects import aff4_grr
-from grr.lib.flows.general import memory
-from grr.lib.flows.general import transfer
+from grr.server import aff4
+from grr.server import flow
+from grr.server.aff4_objects import aff4_grr
+from grr.server.flows.general import memory
+from grr.server.flows.general import transfer
 
 from grr.test_lib import client_test_lib
 

grr/endtoend_tests/administrative.py

@@ -7,11 +7,11 @@
 import logging
 from grr import config
 from grr.endtoend_tests import base
-from grr.lib import aff4
-from grr.lib import maintenance_utils
-from grr.lib.aff4_objects import collects as aff4_collects
-from grr.lib.aff4_objects import stats as aff4_stats
-from grr.lib.flows.general import administrative
+from grr.server import aff4
+from grr.server import maintenance_utils
+from grr.server.aff4_objects import collects as aff4_collects
+from grr.server.aff4_objects import stats as aff4_stats
+from grr.server.flows.general import administrative
 
 
 class TestGetClientStats(base.AutomatedTest):

grr/endtoend_tests/artifacts.py

@@ -3,10 +3,10 @@
 
 
 from grr.endtoend_tests import base
-from grr.lib import aff4
-from grr.lib.aff4_objects import aff4_grr
-from grr.lib.flows.general import collectors
 from grr.lib.rdfvalues import client as rdf_client
+from grr.server import aff4
+from grr.server.aff4_objects import aff4_grr
+from grr.server.flows.general import collectors
 
 
 class TestDarwinPersistenceMechanisms(base.AutomatedTest):

grr/endtoend_tests/base.py

@@ -10,17 +10,17 @@
 
 
 from grr import config as grr_config
-from grr.lib import aff4
-from grr.lib import client_index
-from grr.lib import data_store
-from grr.lib import flow
-from grr.lib import flow_utils
 from grr.lib import rdfvalue
 from grr.lib import registry
-from grr.lib.aff4_objects import aff4_grr
-from grr.lib.flows.console import debugging
-from grr.lib.flows.general import discovery
 from grr.lib.rdfvalues import client as rdf_client
+from grr.server import aff4
+from grr.server import client_index
+from grr.server import data_store
+from grr.server import flow
+from grr.server import flow_utils
+from grr.server.aff4_objects import aff4_grr
+from grr.server.flows.console import debugging
+from grr.server.flows.general import discovery
 
 
 class Error(Exception):

grr/endtoend_tests/checks.py

@@ -3,8 +3,8 @@
 
 
 from grr.endtoend_tests import base
-from grr.lib.checks import checks as rdf_checks
-from grr.lib.flows.general import checks
+from grr.server.checks import checks as rdf_checks
+from grr.server.flows.general import checks
 
 
 class TestCheckRunner(base.AutomatedTest):

grr/endtoend_tests/chipsec.py

@@ -2,9 +2,9 @@
 """End to end tests for lib.flows.general.hardware."""
 
 from grr.endtoend_tests import base
-from grr.lib import aff4
-from grr.lib.flows.general import hardware
 from grr.lib.rdfvalues import client as rdf_client
+from grr.server import aff4
+from grr.server.flows.general import hardware
 
 
 class TestDumpFlashImage(base.AutomatedTest):

grr/endtoend_tests/collectors.py

@@ -3,8 +3,8 @@
 
 
 from grr.endtoend_tests import base
-from grr.lib.flows.general import collectors
 from grr.lib.rdfvalues import client as rdf_client
+from grr.server.flows.general import collectors
 
 
 class TestCollector(base.AutomatedTest):

grr/endtoend_tests/discovery.py

@@ -3,11 +3,11 @@
 
 
 from grr.endtoend_tests import base
-from grr.lib import aff4
-from grr.lib import data_store
 from grr.lib import utils
-from grr.lib.aff4_objects import aff4_grr
-from grr.lib.flows.general import discovery
+from grr.server import aff4
+from grr.server import data_store
+from grr.server.aff4_objects import aff4_grr
+from grr.server.flows.general import discovery
 
 
 class TestClientInterrogateEndToEnd(base.AutomatedTest):

grr/endtoend_tests/endtoend_mocks.py

@@ -2,8 +2,8 @@
 """Mocks for end to end testing."""
 
 from grr.endtoend_tests import base
-from grr.lib.flows.general import filesystem
 from grr.lib.rdfvalues import paths
+from grr.server.flows.general import filesystem
 from grr.test_lib import flow_test_lib
 
 

grr/endtoend_tests/file_finder.py

@@ -5,12 +5,12 @@
 
 from grr.client.client_actions import standard
 from grr.endtoend_tests import base
-from grr.lib import flow
-from grr.lib.flows.general import file_finder
-
 from grr.lib.rdfvalues import file_finder as rdf_file_finder
 from grr.lib.rdfvalues import flows as rdf_flows
+
 from grr.lib.rdfvalues import paths as rdf_paths
+from grr.server import flow
+from grr.server.flows.general import file_finder
 
 
 class TestFileFinderOSWindows(base.VFSPathContentIsPE):

grr/endtoend_tests/filesystem.py

@@ -3,12 +3,12 @@
 
 
 from grr.endtoend_tests import base
-from grr.lib import aff4
-from grr.lib.aff4_objects import standard
-from grr.lib.flows.general import filesystem
-from grr.lib.flows.general import find
 from grr.lib.rdfvalues import client as rdf_client
 from grr.lib.rdfvalues import paths as rdf_paths
+from grr.server import aff4
+from grr.server.aff4_objects import standard
+from grr.server.flows.general import filesystem
+from grr.server.flows.general import find
 
 ####################
 # Linux and Darwin #

grr/endtoend_tests/fingerprint.py

@@ -3,9 +3,9 @@
 
 
 from grr.endtoend_tests import base
-from grr.lib import aff4
-from grr.lib.flows.general import fingerprint
 from grr.lib.rdfvalues import paths as rdf_paths
+from grr.server import aff4
+from grr.server.flows.general import fingerprint
 
 
 class TestFingerprintFileOSLinux(base.AutomatedTest):