myplc gets a SHORTNAME - and shorter model names when running the stress test inshort...

diff --git a/system/config_main.py b/system/config_main.py
index c5a9099..65451bb 100644 (file)
--- a/system/config_main.py
+++ b/system/config_main.py
@@ -188,7 +188,8 @@ def plc (options,index) :
         'role' : 'root',
         'PLC_ROOT_USER' : 'root@test.onelab.eu',
         'PLC_ROOT_PASSWORD' : 'test++',
-        'PLC_NAME' : 'TestLab',
+        'PLC_NAME' : 'Regression TestLab',
+        'PLC_SHORTNAME' : 'Rlab',
         'PLC_MAIL_ENABLED':'true',
         'PLC_MAIL_SUPPORT_ADDRESS' : 'thierry.parmentelat@sophia.inria.fr',
         'PLC_DB_HOST' : 'deferred-myplc-hostname',

diff --git a/system/plcsh-stress-test.py b/system/plcsh-stress-test.py
index 8547e57..6f5049d 100755 (executable)
--- a/system/plcsh-stress-test.py
+++ b/system/plcsh-stress-test.py
@@ -163,7 +163,7 @@ def random_node(node_types,boot_states):
         'hostname': randhostname(),
         'node_type': random.sample(node_types,1)[0],
         'boot_state': random.sample(boot_states, 1)[0],
-        'model': randstr(255),
+        'model': randstr(namelengths['model']),
         'version': randstr(64),
         # for testing node tags
         'arch':randstr(10),
@@ -266,6 +266,7 @@ class Test:
         'login_base':20,
         'sitename':254,
         'abbreviated_name':50,
+        'model':255,
         }
 
     namelengths_short = {
@@ -276,6 +277,7 @@ class Test:
         'sitename_contents':letters+digits+whitespace+punctuation,
         'abbreviated_name':24,
         'abbreviated_name_contents':letters+digits+whitespace+punctuation,
+        'model':40,
         }
 
     def __init__(self, api, check = True, verbose = True, preserve = False):