Merge tag 'rt-5gms-application-server-1.1.1-rc1'

5G-MAG · Apr 21, 2023 · c579758 · c579758
2 parents 0ba9599 + fb9bde3
commit c579758
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/build_scripts/endpoint_argument_definition.mustache b/build_scripts/endpoint_argument_definition.mustache
@@ -0,0 +1 @@
+{{#isPathParam}}{{baseName}}{{/isPathParam}}{{^isPathParam}}{{paramName}}{{/isPathParam}}: {{>param_type}} = {{#isPathParam}}Path{{/isPathParam}}{{#isHeaderParam}}Header{{/isHeaderParam}}{{#isFormParam}}Form{{/isFormParam}}{{#isQueryParam}}Query{{/isQueryParam}}{{#isCookieParam}}Cookie{{/isCookieParam}}{{#isBodyParam}}Body{{/isBodyParam}}({{^isPathParam}}{{defaultValue}}{{^defaultValue}}None{{/defaultValue}}, {{/isPathParam}}description="{{description}}"{{#isLong}}{{#minimum}}, ge={{.}}{{/minimum}}{{#maximum}}, le={{.}}{{/maximum}}{{/isLong}}{{#isInteger}}{{#minimum}}, ge={{.}}{{/minimum}}{{#maximum}}, le={{.}}{{/maximum}}{{/isInteger}}{{#pattern}}, regex=r"{{.}}"{{/pattern}}{{#minLength}}, min_length={{.}}{{/minLength}}{{#maxLength}}, max_length={{.}}{{/maxLength}})
diff --git a/pyproject.toml b/pyproject.toml
@@ -5,7 +5,7 @@ backend-path = ["build_scripts"]
 
 [project]
 name = "rt-5gms-application-server"
-version = "1.1.0"
+version = "1.1.1"
 dependencies = [
     'urllib3 >= 1.25.3',
     'python-dateutil',

diff --git a/src/rt_5gms_as/app.py b/src/rt_5gms_as/app.py
@@ -58,13 +58,16 @@ def get_arg_parser():
 
     Syntax:
       rt-5gsm-as -h
+      rt-5gms-as -v
       rt-5gsm-as [-c <app-config-file>]
 
     Options:
       -h         --help           Show the help text
+      -v         --version        Display the version information for the AS
       -c CONFIG  --config CONFIG  The application configuration file
     '''
     parser = argparse.ArgumentParser()
+    parser.add_argument('-v', '--version', action='store_true', help='Display the version information')
     parser.add_argument('-c', '--config', nargs=1, required=False, metavar='CONFIG', help='The application configuration file')
     return parser
 
@@ -240,6 +243,11 @@ def main():
     parser = get_arg_parser()
     args = parser.parse_args()
 
+    if args.version:
+        global __pkg_version
+        print(f'5G-MAG Reference Tools 5GMS Application Server version {__pkg_version}')
+        return 0
+
     # Create a logger instance
     log = logging.getLogger("rt-5gms-as")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{{#isPathParam}}{{baseName}}{{/isPathParam}}{{^isPathParam}}{{paramName}}{{/isPathParam}}: {{>param_type}} = {{#isPathParam}}Path{{/isPathParam}}{{#isHeaderParam}}Header{{/isHeaderParam}}{{#isFormParam}}Form{{/isFormParam}}{{#isQueryParam}}Query{{/isQueryParam}}{{#isCookieParam}}Cookie{{/isCookieParam}}{{#isBodyParam}}Body{{/isBodyParam}}({{^isPathParam}}{{defaultValue}}{{^defaultValue}}None{{/defaultValue}}, {{/isPathParam}}description="{{description}}"{{#isLong}}{{#minimum}}, ge={{.}}{{/minimum}}{{#maximum}}, le={{.}}{{/maximum}}{{/isLong}}{{#isInteger}}{{#minimum}}, ge={{.}}{{/minimum}}{{#maximum}}, le={{.}}{{/maximum}}{{/isInteger}}{{#pattern}}, regex=r"{{.}}"{{/pattern}}{{#minLength}}, min_length={{.}}{{/minLength}}{{#maxLength}}, max_length={{.}}{{/maxLength}})