mv rand_id() -> neo4j_util.py

5 files changed, 12 insertions, 10 deletions

diff --git a/src/server-tests/neo4j_test_util.py b/src/server-tests/neo4j_test_util.py
index 6272af01..8f63a1a5 100644
--- a/src/server-tests/neo4j_test_util.py
+++ b/src/server-tests/neo4j_test_util.py
@@ -42,9 +42,6 @@ class DBO_random_data_generation(DB_op):
     def link_set_label(self):
         return self.r_label
 
-def rand_id():
-    return str(uuid.uuid4())
-
 def gen_random_name(size=8, char_set=string.ascii_uppercase + string.digits):
     """
     used for random node generation
diff --git a/src/server-tests/test_db_controller.py b/src/server-tests/test_db_controller.py
index 4b11559f..987abedb 100644
--- a/src/server-tests/test_db_controller.py
+++ b/src/server-tests/test_db_controller.py
@@ -21,7 +21,6 @@ from model.graph import Topo_Diff
 from model.model import Link
 from neo4j_test_util import DBO_random_data_generation
 from neo4j_test_util import flush_db
-from neo4j_test_util import rand_id
 import neo4j_test_util
 from neo4j_util import Neo4JException, DB_Query
 from neo4j_util import meta_attr_list_to_meta_attr_map
diff --git a/src/server-tests/test_rz_mesh.py b/src/server-tests/test_rz_mesh.py
index 14c53758..511db831 100644
--- a/src/server-tests/test_rz_mesh.py
+++ b/src/server-tests/test_rz_mesh.py
@@ -7,8 +7,8 @@ import urllib2
 
 from model.graph import Attr_Diff
 from model.graph import Topo_Diff
-from neo4j_test_util import rand_id
 import neo4j_test_util
+from neo4j_util import rand_id
 from rz_api_websocket import WebSocket_Graph_NS
 import test_util
 
diff --git a/src/server-tests/test_util.py b/src/server-tests/test_util.py
index e57a065f..c1ed2558 100644
--- a/src/server-tests/test_util.py
+++ b/src/server-tests/test_util.py
@@ -3,7 +3,8 @@ Various test utilities
 """
 import db_controller as dbc
 from model.model import Link
-from neo4j_test_util import rand_id, gen_random_name
+from neo4j_test_util import gen_random_name
+from neo4j_util import rand_id
 from rz_kernel import RZ_Kernel
 from rz_mesh import init_ws_interface
 from rz_server import init_webapp
diff --git a/src/server/neo4j_util.py b/src/server/neo4j_util.py
index 06b9d811..0ee1798e 100644
--- a/src/server/neo4j_util.py
+++ b/src/server/neo4j_util.py
@@ -3,16 +3,18 @@
 """
 
 import json
+import logging
 import six
-from six.moves.urllib import request
-import six.moves.urllib_error as urllib_error
-import model
 import string
 import time
-import logging
+import uuid
 
+import model
+from six.moves.urllib import request
+import six.moves.urllib_error as urllib_error
 from util import debug_log_duration
 
+
 log = logging.getLogger('rhizi')
 
 class Neo4JException(Exception):
@@ -310,6 +312,9 @@ def meta_attr_list_to_meta_attr_map(e_set, meta_attr='__label_set'):
 
     return ret
 
+def rand_id():
+    return str(uuid.uuid4())
+
 def __type_check_link_or_node_map(x_map):
     for k, v in x_map.iteritems():  # do some type sanity checking
         assert isinstance(k, six.string_types)