generate_random_node_dict(): include random name

2 files changed, 15 insertions, 6 deletions

diff --git a/src/server-tests/neo4j_test_util.py b/src/server-tests/neo4j_test_util.py
index 77adacd1..6272af01 100644
--- a/src/server-tests/neo4j_test_util.py
+++ b/src/server-tests/neo4j_test_util.py
@@ -1,4 +1,5 @@
 from random import choice
+import random
 import string
 import uuid
 
@@ -44,6 +45,12 @@ class DBO_random_data_generation(DB_op):
 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
+    """
+    return ''.join(random.choice(char_set) for _ in range(size))
+
 def rand_label(prefix='T_', length=8):
     """
     return a prefixed random label, where the default prefix is 'T_'
diff --git a/src/server-tests/test_util.py b/src/server-tests/test_util.py
index a3ca5ee1..e57a065f 100644
--- a/src/server-tests/test_util.py
+++ b/src/server-tests/test_util.py
@@ -1,13 +1,13 @@
 """
 Various test utilities
 """
-from rz_server import init_webapp
-from rz_mesh import init_ws_interface
 import db_controller as dbc
-
-from neo4j_test_util import rand_id
-from rz_kernel import RZ_Kernel
 from model.model import Link
+from neo4j_test_util import rand_id, gen_random_name
+from rz_kernel import RZ_Kernel
+from rz_mesh import init_ws_interface
+from rz_server import init_webapp
+
 
 def init_test_db_controller(cfg):
     ret = dbc.DB_Controller(cfg)
@@ -33,7 +33,9 @@ def generate_random_node_dict(n_type, nid=None):
     if None == nid:
         nid = rand_id()
 
-    return {'__label_set': [n_type], 'id': nid }, nid
+    return {'__label_set': [n_type],
+            'id': nid,
+            'name': gen_random_name() }, nid
 
 def generate_random_link_dict(l_type, src_id, dst_id, lid=None):
     """