Skip to content
Snippets Groups Projects
Unverified Commit ae577f8d authored by Andrea Franchini's avatar Andrea Franchini
Browse files

Add env DOML_VERSION to force version in Webserver

parent 4bc8e973
Branches
No related tags found
No related merge requests found
......@@ -55,7 +55,7 @@ else:
doml_ver = None
if args.doml_version is not None:
try:
doml_ver = DOMLVersion[args.doml_version]
doml_ver = DOMLVersion.get(args.doml_version)
except:
# Suggest valid DOML versions
print(f"Unknown DOML version '{args.doml_version}'")
......
......@@ -73,7 +73,8 @@ def parse_doml_model(raw_model: bytes, doml_version: Optional[DOMLVersion]) -> T
if doml_version is None:
doml_versions = [x for x in DOMLVersion]
print(doml_versions)
# Use the most recent DOML version first
doml_versions.reverse()
def get_model(raw_model, doml_version):
try:
......
import datetime
import os
from mc_openapi.doml_mc.domlr_parser.parser import DOMLRTransformer, Parser
from mc_openapi.doml_mc.imc import RequirementStore
......@@ -18,8 +19,14 @@ def make_error(user_msg, debug_msg=None):
def post(body):
doml_xmi = body
try:
dmc = ModelChecker(doml_xmi)
doml_version = None
try:
doml_version: str = os.environ["DOML_VERSION"]
doml_version = DOMLVersion.get(doml_version)
print("Setting DOML version from DOML_VERSION")
except:
pass
dmc = ModelChecker(doml_xmi, doml_version)
user_req_store = None
user_req_str_consts = []
......
......@@ -28,8 +28,8 @@
<cidr>0.0.0.0/0</cidr>
</rules>
</securityGroups>
<networks name="vpc" protocol="tcp/ip" addressRange="/24" connectedIfaces="//@infrastructure/@groups.0/@machineDefinition/@ifaces.0">
<subnets name="vpc_subnet" protocol="tcp/ip" addressRange="/24"/>
<networks name="vpc" protocol="tcp/ip" addressRange="0.0.0.0/24" connectedIfaces="//@infrastructure/@groups.0/@machineDefinition/@ifaces.0">
<subnets name="vpc_subnet" protocol="tcp/ip" addressRange="0.0.0.0/24"/>
</networks>
</infrastructure>
<concretizations name="con_infra">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment