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

Refactor and fix test suite

parent 2a0796ec
No related branches found
No related tags found
No related merge requests found
Pipeline #119151 failed
Stage: variable-generation
Stage: build
Stage: security
Stage: functional-tests
Stage: integration-tests-publish-deploy
Pipeline: DOML Model Checker

#119152

    Show whitespace changes
    Inline Side-by-side
    mc_openapi/__main__.py
    + 1
    − 3
    View file @ dcd35fd8
    ......@@ -134,9 +134,7 @@ else:
    print("Failed to parse the DOMLR.", file=sys.stderr)
    exit(-1)
    if (doml_ver == DOMLVersion.V2_2
    or doml_ver == DOMLVersion.V2_2_1
    or doml_ver == DOMLVersion.V2_3):
    if DOMLVersion.has_DOMLR_support(doml_ver):
    model = get_pyecore_model(doml_xmi, doml_ver)
    func_reqs = model.functionalRequirements.items
    for req in func_reqs:
    ......
    mc_openapi/doml_mc/intermediate_model/metamodel.py
    + 4
    − 1
    View file @ dcd35fd8
    ......@@ -21,11 +21,14 @@ class DOMLVersion(Enum):
    """Retrieve DOML version from string.
    Try to be less pedantic about versions
    e.g.: 2.0 becomes V2_0"""
    doml_ver = v.replace(".", "_")
    doml_ver = v.replace(".", "_").replace("v", "V")
    if doml_ver[0] != "V":
    doml_ver = "V" + doml_ver
    return DOMLVersion[doml_ver]
    def has_DOMLR_support(v: "DOMLVersion"):
    return v != DOMLVersion.V2_0 and v != DOMLVersion.V2_1
    Multiplicity = tuple[Literal["0", "1"], Literal["1", "*"]]
    ......
    mc_openapi/doml_mc/xmi_parser/doml_model.py
    + 20
    − 3
    View file @ dcd35fd8
    ......@@ -82,11 +82,28 @@ def parse_doml_model(raw_model: bytes, doml_version: Optional[DOMLVersion]) -> T
    try:
    dv = doml_versions.pop(0)
    doml_version = dv
    parsed_xmi_model = parse_xmi_model(raw_model, dv)
    # Try to extract the user-specified version from the DOML
    try:
    model_version = parsed_xmi_model.version
    if model_version:
    try:
    dv = DOMLVersion.get(model_version)
    return parse_xmi_model(raw_model, dv), dv
    except:
    MSG_ERR_INVALID_DOML_VERSION = f"DOML requires version \"{model_version}\", but could not parse it with that version. Is the version valid?"
    logging.error(MSG_ERR_INVALID_DOML_VERSION)
    raise RuntimeError(MSG_ERR_INVALID_DOML_VERSION)
    except:
    pass
    # DOML version is not specified, proceed as usual
    return parsed_xmi_model, dv
    except Exception as e:
    logging.info(f"Couldn't parse with DOML {dv.value}. Trying another version...")
    if len(doml_versions) == 0:
    raise e
    MSG_ERR_NO_DOML_VERSIONS = "No other compatible DOML versions found!"
    logging.error(MSG_ERR_NO_DOML_VERSIONS)
    raise RuntimeError(MSG_ERR_NO_DOML_VERSIONS)
    else:
    return get_model(raw_model, doml_version)
    ......@@ -95,7 +112,7 @@ def parse_doml_model(raw_model: bytes, doml_version: Optional[DOMLVersion]) -> T
    try:
    model = parse_xmi_model(raw_model, doml_version)
    except:
    raise Exception("Parsing of DOML failed. Perhaps you are using the wrong DOML version or IDE?")
    raise RuntimeError("Parsing of DOML failed. Perhaps you are using the wrong DOML version or IDE?")
    logging.info(f"Model '{model.name}' parsed as DOML {doml_version.value}")
    ......
    mc_openapi/handlers.py
    + 1
    − 3
    View file @ dcd35fd8
    ......@@ -37,9 +37,7 @@ def post(body, version=None):
    user_req_str_consts = []
    # Add support for Requirements in DOML
    if (dmc.doml_version == DOMLVersion.V2_2
    or dmc.doml_version == DOMLVersion.V2_2_1
    or dmc.doml_version == DOMLVersion.V2_3):
    if DOMLVersion.has_DOMLR_support(dmc.doml_version):
    domlr_parser = Parser(DOMLRTransformer)
    model = get_pyecore_model(doml_xmi, dmc.doml_version)
    func_reqs = model.functionalRequirements.items
    ......
    tests/doml/v2.2/nginx_func_req.doml
    + 27
    − 26
    View file @ dcd35fd8
    doml nginx_func_req
    version "v2.2"
    application app {
    ......@@ -122,28 +123,28 @@ optimization opt {
    functional_requirements {
    req_ext ```
    > "example requirement to test"
    # Expr to parse
    not (
    vm is class infrastructure.VirtualMachine
    # + "VM must have iface and iface is connected to network"
    # forall vm (
    # vm is class abstract.VirtualMachine
    # implies
    # (
    # vm has abstract.ComputingNode.ifaces iface
    # and
    # iface has abstract.NetworkInterface.belongsTo net
    # )
    # )
    # error: "TEST ERROR"
    - "VM must have iface and iface is connected to network"
    vm is class abstract.VirtualMachine
    and
    vm is not class infrastructure.Storage
    or
    vm is not class infrastructure.Storage
    implies
    vm is class infrastructure.Storage
    )
    iff
    not exists iface, apple (
    forall orange (
    vm has association infrastructure.ComputingNode->ifaces iface
    or
    vm has association infrastructure.ComputingNode->ifaces iface
    )
    not exists iface, net (
    vm has abstract.ComputingNode.ifaces iface
    and
    vm has attribute infrastructure.ComputingNode->os Os1
    iface has abstract.NetworkInterface.belongsTo net
    )
    ---
    "Virtual Machine {vm} has no iface"
    ```;
    }
    error: "TEST ERROR"
    ```;}
    tests/doml/v2.2/nginx_func_req.domlx
    + 2
    − 2
    View file @ dcd35fd8
    <?xml version="1.0" encoding="ASCII"?>
    <commons:DOMLModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:app="http://www.piacere-project.eu/doml/application" xmlns:commons="http://www.piacere-project.eu/doml/commons" xmlns:infra="http://www.piacere-project.eu/doml/infrastructure" xmlns:optimization="http://www.piacere-project.eu/doml/optimization" name="nginx_func_req" activeConfiguration="//@configurations.0" activeInfrastructure="//@concretizations.0">
    <commons:DOMLModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:app="http://www.piacere-project.eu/doml/application" xmlns:commons="http://www.piacere-project.eu/doml/commons" xmlns:infra="http://www.piacere-project.eu/doml/infrastructure" xmlns:optimization="http://www.piacere-project.eu/doml/optimization" name="nginx_func_req" version="v2.2" activeConfiguration="//@configurations.0" activeInfrastructure="//@concretizations.0">
    <application name="app">
    <components xsi:type="app:SoftwareComponent" name="nginx">
    <annotations xsi:type="commons:SProperty" key="source_code" value="/usr/share/nginx/html/index.html"/>
    ......@@ -55,5 +55,5 @@
    <configurations name="conf">
    <deployments component="//@application/@components.0" node="//@infrastructure/@groups.0/@machineDefinition"/>
    </configurations>
    <functionalRequirements name="req_ext" description="```&#xA;&#xA; + &quot;VM must have iface and iface is connected to network&quot;&#xA; &#x9;forall vm (&#xA; &#x9;&#x9;vm is class abstract.VirtualMachine&#xA; &#x9;implies&#xA; (&#xA; &#x9;vm has abstract.ComputingNode.ifaces iface&#xA; &#x9;and&#xA; &#x9;iface has abstract.NetworkInterface.belongsTo net&#xA; )&#xA; )&#xA; error: &quot;TEST ERROR&quot;&#xA; &#xA; ```"/>
    <functionalRequirements name="req_ext" description="```&#xA;&#xA;# + &quot;VM must have iface and iface is connected to network&quot;&#xA;# &#x9;forall vm (&#xA;# &#x9;&#x9;vm is class abstract.VirtualMachine&#xA;# &#x9;implies&#xA;# (&#xA;# &#x9;vm has abstract.ComputingNode.ifaces iface&#xA;# &#x9;and&#xA;# &#x9;iface has abstract.NetworkInterface.belongsTo net&#xA;# )&#xA;# )&#xA;# error: &quot;TEST ERROR&quot;&#xA;&#xA;- &quot;VM must have iface and iface is connected to network&quot;&#xA;&#x9;vm is class abstract.VirtualMachine&#xA;&#x9;and&#xA;&#x9;not exists iface, net (&#xA; &#x9;vm has abstract.ComputingNode.ifaces iface&#xA; &#x9;and&#xA; &#x9;iface has abstract.NetworkInterface.belongsTo net&#xA; &#xA; )&#xA; error: &quot;TEST ERROR&quot;&#xA; &#xA; ```"/>
    </commons:DOMLModel>
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment