Allow "@" in elabinelab attribute values.

sql/database-fill.sql

@@ -1177,7 +1177,7 @@ REPLACE INTO table_regex VALUES ('virt_lans','implemented_by_link','text','redir
 
 REPLACE INTO table_regex VALUES ('elabinelab_attributes','role','text','regex','^(boss|router|ops|fs|node)$',0,0,NULL);
 REPLACE INTO table_regex VALUES ('elabinelab_attributes','attrkey','text','regex','^[-\\w\\.]+$',1,32,NULL);
-REPLACE INTO table_regex VALUES ('elabinelab_attributes','attrvalue','text','regex','^[-\\w\\.\\+,\\s\\/:]+$',0,255,NULL);
+REPLACE INTO table_regex VALUES ('elabinelab_attributes','attrvalue','text','regex','^[-\\w\\.\\+,\\s\\/:\\@]+$',0,255,NULL);
 REPLACE INTO table_regex VALUES ('elabinelab_attributes','ordering','int','redirect','default:tinyint',0,0,NULL);
 
 REPLACE INTO table_regex VALUES ('images','auth_key','text','regex','^[0-9a-fA-F,]+$',0,0,NULL);

sql/updates/4/319

+#
+# Minor change to elabinelab attributes
+#
+use strict;
+use libdb;
+
+sub DoUpdate($$$)
+{
+    my ($dbhandle, $dbname, $version) = @_;
+
+    DBQueryFatal("REPLACE INTO table_regex VALUES ".
+		 "('elabinelab_attributes','attrvalue','text','regex', ".
+		 " '^[-\\\\w\\\\.\\\\+,\\\\s\\\\/:\\\\@]+\$',0,255,NULL)");
+    
+    return 0;
+}
+1;
+
+# Local Variables:
+# mode:perl
+# End:

tbsetup/ns2ir/tb_compat.tcl.in

@@ -155,7 +155,7 @@ namespace eval TBCOMPAT {
     set elabinelab_attributes {}
     variable EINEROLE  {^(all|boss|ops|fs|router|node)$}
     variable EINEKEY   {^([-\w\.]+)$}
-    variable EINEVALUE {^([-\w\.\+\,\s\/:]+)$}
+    variable EINEVALUE {^([-\w\.\+\,\s\/:\@]+)$}
     variable EINEORDER {^\d+$}
 
     # virt blobs stuff