Bugfix

michiari · Jul 7, 2022 · a61b54a · a61b54a
1 parent 1a430d1
commit a61b54a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/mc_openapi/assets/doml_meta.yaml b/mc_openapi/assets/doml_meta.yaml
@@ -99,7 +99,7 @@ application:
                 type: String
                 multiplicity: "0..1"
     DBMS:
-        superclass: application_SoftwarePackage
+        superclass: application_SoftwareComponent
     SaaSDBMS:
         superclass: application_SaaS
 
@@ -142,8 +142,8 @@ infrastructure:
             os: 
                 type: String 
                 multiplicity: "0..1"
-            memory_mb: 
-                type: String 
+            memory_mb:
+                type: Integer 
                 multiplicity: "0..1"
             storage: 
                 type: String 

diff --git a/mc_openapi/doml_mc/example_faas.ipynb b/mc_openapi/doml_mc/example_faas.ipynb
@@ -195,7 +195,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# solver.push()"
+    "solver.push()"
    ]
   },
   {
@@ -266,7 +266,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# solver.unsat_core()"
+    "solver.unsat_core()"
    ]
   },
   {
@@ -597,13 +597,10 @@
   }
  ],
  "metadata": {
-  "interpreter": {
-   "hash": "a6678cf6b5907da3ee1c64f7f36cf1b3f0e5fe51f4038e28403f1c01345fc5bd"
-  },
   "kernelspec": {
-   "display_name": "mc_openapi",
+   "display_name": "Python 3.10.4 ('mc-openapi-dl7Bx6Lh-py3.10')",
    "language": "python",
-   "name": "mc_openapi"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -615,9 +612,14 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.13"
+   "version": "3.10.4"
   },
-  "orig_nbformat": 4
+  "orig_nbformat": 4,
+  "vscode": {
+   "interpreter": {
+    "hash": "ad63ed7e22c54016fdab5faefd8d83d59c3e39bc25e97a3e7b72bed4daaf83ed"
+   }
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 2

diff --git a/mc_openapi/doml_mc/xmi_parser/doml_model.py b/mc_openapi/doml_mc/xmi_parser/doml_model.py
@@ -56,7 +56,8 @@ def parse_network_address_range(arange: str) -> Attributes:
 
     sp = SpecialParser(mm, {
         ("infrastructure_Network", "addressRange"): parse_network_address_range,
-        ("infrastructure_NetworkInterface", "endPoint"): lambda addr: {"endPoint": [int(ip_address(addr))]}
+        ("infrastructure_NetworkInterface", "endPoint"): lambda addr: {"endPoint": [int(ip_address(addr))]},
+        ("infrastructure_ComputingNode", "memory_mb"): lambda mem: {"memory_mb": int(mem), "memory_kb": int(mem * 1024)}
     })
     elp = ELayerParser(mm, sp)
     elp.parse_elayer(model.application)