createst: rename add-version to simply version

This is a more consistent mapping to the documented name in test.yaml.

Also add --cfg to the README which was missing.

diff --git a/README.md b/README.md
index e796465b7ebc631b3a9e4ebbbc16a66bea3a2857..145574f49b30a2ac9520c13e08406741d8fcac43 100644 (file)
--- a/README.md
+++ b/README.md
@@ -185,9 +185,11 @@ optional arguments:
                         This means that just the events listed will be checked
                         against in the test
   --strictcsums         Strictly validate checksum
+  --midstream           Allow midstream session pickups
   --min-version <min-version>
                         Adds a global minimum required version
-  --midstream           Allow midstream session pickups
+  --version <version>   Adds a global version requirement
+  --cfg <suricata.yaml> Add a suricata.yaml to the test
   --features [FEATS]    Required features (comma separated list)
 ```
 

diff --git a/createst.py b/createst.py
index 46092da11c38c154f42b6de8471d0c03bfff5e5c..77554174c9b4db02cc7afc170cce6914160e51c0 100755 (executable)
--- a/createst.py
+++ b/createst.py
@@ -150,8 +150,8 @@ def write_to_file(data):
             fp.write("   features:\n")
             for item in feature_list:
                 fp.write("     - %s\n" % item)
-        if args["add_version"]:
-            fp.write("   version: %s\n\n" % args["add_version"])
+        if args["version"]:
+            fp.write("   version: %s\n\n" % args["version"])
         suricata_args = []
         if not args["strictcsums"]:
             suricata_args.append("-k none")
@@ -164,7 +164,7 @@ def write_to_file(data):
         fp.write(data)
 
 def check_requires():
-    features = ["min_version", "add_version","features"]
+    features = ["min_version", "version", "features"]
     for item in features:
         if args[item]:
             return True
@@ -373,7 +373,7 @@ def parse_args():
                         help="Allow midstream session pickups")
     parser.add_argument("--min-version", default=None, metavar="<min-version>",
                         help="Adds a global minimum required version")
-    parser.add_argument("--add-version", default=None, metavar="<add-version>",
+    parser.add_argument("--version", default=None, metavar="<add-version>",
                         help="Adds a global suricata version")
     parser.add_argument("--cfg", metavar="<path-to-suricata.yaml>",
                         help="Adds a suricata.yaml to the test")