diff --git a/mc_openapi/assets/doml_meta_v2.1.1.yaml b/mc_openapi/assets/doml_meta_v2.1.1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..010918c26d9d30828a30c18662efbdf9a4dbcf62
--- /dev/null
+++ b/mc_openapi/assets/doml_meta_v2.1.1.yaml
@@ -0,0 +1,541 @@
+commons:
+ DOMLElement:
+ attributes:
+ name:
+ type: String
+ multiplicity: "0..1"
+ description:
+ type: String
+ multiplicity: "0..1"
+ associations:
+ annotations:
+ class: commons_Property
+ multiplicity: "0..*"
+ Property:
+ attributes:
+ key:
+ type: String
+ multiplicity: "0..1"
+ associations:
+ reference:
+ class: commons_DOMLElement
+ multiplicity: "0..1"
+ IProperty:
+ superclass: commons_Property
+ attributes:
+ value:
+ type: Integer
+ multiplicity: "0..1"
+ SProperty:
+ superclass: commons_Property
+ attributes:
+ value:
+ type: String
+ multiplicity: "0..1"
+ FProperty:
+ superclass: commons_Property
+ attributes:
+ value:
+ type: String
+ multiplicity: "0..1"
+ BProperty:
+ superclass: commons_Property
+ attributes:
+ value:
+ type: Boolean
+ multiplicity: "0..1"
+ Configuration:
+ superclass: commons_DOMLElement
+ associations:
+ deployments:
+ class: commons_Deployment
+ multiplicity: "0..*"
+ Credentials:
+ abstract: true
+ superclass: commons_DOMLElement
+ DeployableElement:
+ abstract: true
+ superclass: commons_DOMLElement # It's not present in the ECore, but without it breaks.
+ Deployment:
+ associations:
+ component:
+ class: commons_DeployableElement
+ multiplicity: "1"
+ node:
+ class: infrastructure_InfrastructureElement
+ multiplicity: "1"
+ KeyPair:
+ superclass: commons_Credentials
+ attributes:
+ user:
+ type: String
+ multiplicity: "0..1"
+ keyfile:
+ type: String
+ multiplicity: "0..1"
+ algorithm:
+ type: String
+ multiplicity: "0..1"
+ bits:
+ type: Integer
+ multiplicity: "0..1"
+ UserPass:
+ superclass: commons_Credentials
+ attributes:
+ user:
+ type: String
+ multiplicity: "0..1"
+ password:
+ type: String
+ multiplicity: "0..1"
+ Source:
+ superclass: commons_DOMLElement
+ attributes:
+ engine:
+ type: String
+ multiplicity: "0..*"
+ uri:
+ type: String
+ multiplicity: "0..*"
+ entry:
+ type: String
+ multiplicity: "0..*"
+ backend:
+ type: String
+ multiplicity: "0..*"
+ associations:
+ credential:
+ class: commons_Credentials
+application:
+ ApplicationLayer:
+ superclass: commons_DOMLElement
+ associations:
+ components:
+ class: application_ApplicationComponent
+ multiplicity: "0..*"
+ ApplicationComponent:
+ superclass: commons_DOMLElement
+ SoftwareComponent:
+ superclass: application_ApplicationComponent # and commons_DeployableElement, but we can't handle multiple parent classes, can't we?
+ attributes:
+ isPersistent:
+ type: Boolean
+ multiplicity: "1"
+ default: false
+ licenseCost:
+ type: String
+ multiplicity: "0..1"
+ associations:
+ exposedInterfaces:
+ class: application_SoftwareInterface
+ multiplicity: "0..*"
+ consumedInterfaces:
+ class: application_SoftwareInterface
+ multiplicity: "0..*"
+ src:
+ class: commons_Source
+ multiplicity: "0..1"
+ SaaS:
+ superclass: application_ApplicationComponent
+ attributes:
+ licenseCost:
+ type: String
+ multiplicity: "0..1"
+ associations:
+ exposedInterfaces:
+ class: application_SoftwareInterface
+ mutiplicity: "0..*"
+ SoftwareInterface:
+ superclass: application_ApplicationComponent
+ attributes:
+ endPoint:
+ type: String
+ multiplicity: "0..1"
+ DBMS:
+ superclass: application_SoftwareComponent
+ SaaSDBMS:
+ superclass: application_SaaS
+
+infrastructure:
+ InfrastructureLayer:
+ superclass: commons_DOMLElement
+ associations:
+ nodes:
+ class: infrastructure_ComputingNode
+ multiplicity: "0..*"
+ generators:
+ class: infrastructure_ComputingNodeGenerator
+ multiplicity: "0..*"
+ storages:
+ class: infrastructure_Storage
+ multiplicity: "0..*"
+ faas:
+ class: infrastructure_FunctionAsAService
+ multiplicity: "0..*"
+ credentials:
+ class: commons_Credentials
+ multiplicity: "0..*"
+ groups:
+ class: infrastructure_ComputingGroup
+ multiplicity: "0..*"
+ securityGroups:
+ class: infrastructure_SecurityGroup
+ multiplicity: "0..*"
+ networks:
+ class: infrastructure_Network
+ multiplicity: "0..*"
+ rules:
+ class: infrastructure_MonitoringRule
+ multiplicity: "0..*"
+ MonitoringRule:
+ superclass: commons_DOMLElement
+ attributes:
+ condition:
+ type: String
+ multiplicity: "1"
+ strategy:
+ type: String
+ multiplicity: "1"
+ strategyConfigurationString:
+ type: String
+ multiplicity: "0..1"
+ InfrastructureElement:
+ superclass: commons_DeployableElement
+ ComputingNode:
+ superclass: infrastructure_InfrastructureElement
+ attributes:
+ architecture:
+ type: String
+ multiplicity: "0..1"
+ os:
+ type: String
+ multiplicity: "0..1"
+ memory_mb:
+ type: Integer
+ multiplicity: "0..1"
+ memory_kb: # Missing in official Ecore, added by parser
+ type: Integer
+ multiplicity: "0..1"
+ storage:
+ type: String
+ multiplicity: "0..1"
+ cpu_count:
+ type: Integer
+ multiplicity: "0..1"
+ cost:
+ type: Integer # in cents
+ multiplicity: "0..1"
+ disabledMonitorings:
+ type: String
+ multiplicity: "0..1"
+ associations:
+ ifaces:
+ class: infrastructure_NetworkInterface
+ multiplicity: "0..*"
+ location:
+ class: infrastructure_Location
+ multiplicity: "0..1"
+ credentials:
+ class: commons_Credentials
+ multiplicity: "0..1"
+ group:
+ class: infrastructure_ComputingGroup
+ multiplicity: "0..1"
+ inverse_of: infrastructure_ComputingGroup::groupedNodes
+ PhysicalComputingNode:
+ superclass: infrastructure_ComputingNode
+ VirtualMachine:
+ superclass: infrastructure_ComputingNode
+ attributes:
+ sizeDescription:
+ type: String
+ multiplicity: "0..1"
+ associations:
+ generatedFrom:
+ class: infrastructure_VMImage
+ multiplicity: "0..1"
+ Location:
+ superclass: commons_DOMLElement
+ attributes:
+ region:
+ type: String
+ multiplicity: "0..1"
+ zone:
+ type: String
+ multiplicity: "0..1"
+ ContainerConfig:
+ superclass: commons_DOMLElement
+ attributes:
+ container_port:
+ type: Integer
+ multiplicity: "0..1"
+ vm_port:
+ type: Integer
+ multiplicity: "0..1"
+ associations:
+ host:
+ class: infrastructure_ComputingNode
+ multiplicity: "0..1"
+ iface:
+ class: infrastructure_NewtorkInterface
+ multiplicity: "0..1"
+ Container:
+ superclass: infrastructure_ComputingNode
+ associations:
+ generatedFrom:
+ class: infrastructure_ContainerImage
+ multiplicity: "0..1"
+ configs:
+ class: infrastructure_ContainerConfig
+ multiplicity: "0..*"
+ ComputingNodeGenerator:
+ superclass: commons_DOMLElement
+ attributes:
+ uri:
+ type: String
+ multiplicity: "0..1"
+ kind:
+ type: GeneratorKind # enum { SCRIPT, IMAGE }
+ VMImage:
+ superclass: infrastructure_ComputingNodeGenerator
+ associations:
+ generatedVMs:
+ class: infrastructure_VirtualMachine
+ multiplicity: "0..*"
+ inverse_of: infrastructure_VirtualMachine::generatedFrom
+ ContainerImage:
+ superclass: infrastructure_ComputingNodeGenerator
+ associations:
+ generatedContainers:
+ class: infrastructure_Container
+ multiplicity: "0..*"
+ inverse_of: infrastructure_Container::generatedFrom
+ AutoScalingGroup:
+ superclass: infrastructure_ComputingGroup
+ attributes:
+ min:
+ type: Integer
+ multiplicity: "0..1"
+ max:
+ type: Integer
+ multiplicity: "0..1"
+ loadBalancer:
+ type: String
+ multiplicity: "0..1"
+ associations:
+ machineDefinition:
+ class: infrastructure_VirtualMachine
+ multiplicity: "1"
+ securityGroup:
+ class: infrastructure_SecurityGroup
+ multiplicity: "0..1"
+ Storage:
+ superclass: infrastructure_InfrastructureElement
+ attributes:
+ label:
+ type: String
+ multiplicity: "0..1"
+ size_gb:
+ type: Integer # in GBs
+ multiplicity: "0..1"
+ cost:
+ type: Integer # in cents
+ multiplicity: "0..1"
+ associations:
+ ifaces:
+ class: infrastructure_NetworkInterface
+ multiplicity: "0..*"
+ FunctionAsAService:
+ superclass: infrastructure_InfrastructureElement
+ attributes:
+ cost:
+ type: Integer # in cents
+ multiplicity: "0..1"
+ associations:
+ ifaces:
+ class: infrastructure_NetworkInterface
+ multiplicity: "0..*"
+ Network:
+ superclass: commons_DOMLElement
+ attributes:
+ protocol:
+ type: String
+ multiplicity: "0..1"
+ addressRange:
+ type: String
+ multiplicity: "0..1"
+ cidr:
+ type: Integer
+ multiplicity: "0..1"
+ associations:
+ connectedIfaces:
+ class: infrastructure_NetworkInterface
+ multiplicity: "0..*"
+ inverse_of: infrastructure_NetworkInterface::belongsTo
+ igws:
+ class: infrastructure_InternetGateway
+ multiplicity: "0..*"
+ subnets:
+ class: infrastructure_Subnet
+ multiplicity: "0..*"
+ Subnet:
+ superclass: infrastructure_Network
+ associations:
+ connectedTo:
+ class: infrastructure_Network
+ multiplicity: "0..1"
+ NetworkInterface:
+ superclass: infrastructure_InfrastructureElement
+ attributes:
+ endPoint:
+ type: Integer
+ multiplicity: "0..1"
+ speed:
+ type: String
+ multiplicity: "0..1"
+ associations:
+ belongsTo:
+ class: infrastructure_Network
+ multiplicity: "0..1" # This should be "1", but it would break InternetGateway
+ associated:
+ class: infrastructure_SecurityGroup
+ multiplicity: "0..1" # TODO: try putting this to 1 and see why it fails
+ InternetGateway:
+ superclass: infrastructure_NetworkInterface
+ ComputingGroup:
+ superclass: commons_DOMLElement
+ associations:
+ groupedNodes:
+ class: infrastructure_ComputingNode
+ multiplicity: "0..*"
+ inverse_of: infrastructure_ComputingNode::group
+ SecurityGroup:
+ superclass: commons_DOMLElement
+ associations:
+ rules:
+ class: infrastructure_Rule
+ multiplicity: "0..*"
+ ifaces:
+ class: infrastructure_NetworkInterface
+ multiplicity: "0..*"
+ inverse_of: infrastructure_NetworkInterface::associated
+ Rule:
+ superclass: commons_DOMLElement
+ attributes:
+ kind:
+ type: String
+ multiplicity: "1"
+ protocol:
+ type: String
+ multiplicity: "1"
+ fromPort:
+ type: Integer
+ multiplicity: "1"
+ toPort:
+ type: Integer
+ multiplicity: "1"
+ cidr:
+ type: String
+ multiplicity: "0..*"
+ SwarmRole:
+ superclass: commons_DOMLElement
+ attributes:
+ kind:
+ type: String
+ multiplicity: "1"
+ associations:
+ nodes:
+ class: infrastructure_ComputingNode
+ multiplicity: "0..*"
+ Swarm:
+ superclass: infrastructure_ComputingGroup
+ associations:
+ roles:
+ class: infrastructure_SwarmRole
+ multiplicity: "0..*"
+ ExtInfrastructureElement:
+ superclass: infrastructure_InfrastructureElement
+
+concrete:
+ ConcreteInfrastructure:
+ superclass: commons_DOMLElement
+ associations:
+ providers:
+ class: concrete_RuntimeProvider
+ multiplicity: "0..*"
+ ConcreteElement:
+ superclass: commons_DOMLElement
+ attributes:
+ configurationScript:
+ type: String
+ multiplicity: "0..1"
+ preexisting:
+ multiplicity: "1"
+ type: Boolean
+ default: false
+ RuntimeProvider:
+ superclass: commons_DOMLElement
+ associations:
+ vms:
+ class: concrete_VirtualMachine
+ multiplicity: "0..*"
+ vmImages:
+ class: concrete_VMImage
+ multiplicity: "0..*"
+ containerImages:
+ class: concrete_ContainerImage
+ multiplicity: "0..*"
+ networks:
+ class: concrete_Network
+ multiplicity: "0..*"
+ storages:
+ class: concrete_Storage
+ multiplicity: "0..*"
+ faas:
+ class: concrete_FunctionAsAService
+ multiplicity: "0..*"
+ group:
+ class: concrete_ComputingGroup
+ multiplicity: "0..*"
+ VirtualMachine:
+ superclass: concrete_ConcreteElement
+ associations:
+ maps:
+ class: infrastructure_VirtualMachine
+ multiplicity: "0..1"
+ VMImage:
+ superclass: concrete_ConcreteElement
+ associations:
+ maps:
+ class: infrastructure_VMImage
+ multiplicity: "0..1"
+ ContainerImage:
+ superclass: concrete_ConcreteElement
+ associations:
+ maps:
+ class: infrastructure_ContainerImage
+ multiplicity: "0..1"
+ Network:
+ superclass: concrete_ConcreteElement
+ associations:
+ maps:
+ class: infrastructure_Network
+ multiplicity: "0..1"
+ Storage:
+ superclass: concrete_ConcreteElement
+ associations:
+ maps:
+ class: infrastructure_Storage
+ multiplicity: "0..1"
+ FunctionAsAService:
+ superclass: concrete_ConcreteElement
+ associations:
+ maps:
+ class: infrastructure_FunctionAsAService
+ multiplicity: "0..1"
+ ComputingGroup:
+ superclass: concrete_ConcreteElement
+ associations:
+ maps:
+ class: infrastructure_ComputingGroup
+ multiplicity: "1"
diff --git a/mc_openapi/assets/doml_v2.1.1.ecore b/mc_openapi/assets/doml_v2.1.1.ecore
new file mode 100644
index 0000000000000000000000000000000000000000..a60a074bc835051b98255dfb978200656e955ef9
--- /dev/null
+++ b/mc_openapi/assets/doml_v2.1.1.ecore
@@ -0,0 +1,419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="doml" nsURI="http://www.piacere-project.eu/doml" nsPrefix="doml">
+ <eAnnotations source="emf.gen">
+ <details key="basePackage" value="eu.piacere.doml"/>
+ <details key="fileExtensions" value="domlx"/>
+ <details key="complianceLevel" value="JDK80"/>
+ </eAnnotations>
+ <eSubpackages name="commons" nsURI="http://www.piacere-project.eu/doml/commons"
+ nsPrefix="commons">
+ <eClassifiers xsi:type="ecore:EClass" name="DOMLModel" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral="2.1.1"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="application" eType="#//application/ApplicationLayer"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="infrastructure" eType="#//infrastructure/InfrastructureLayer"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="concretizations" upperBound="-1"
+ eType="#//concrete/ConcreteInfrastructure" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="optimization" eType="#//optimization/OptimizationLayer"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="configurations" upperBound="-1"
+ eType="#//commons/Configuration" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activeConfiguration"
+ eType="#//commons/Configuration"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="activeInfrastructure"
+ eType="#//concrete/ConcreteInfrastructure"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="functionalRequirements"
+ upperBound="-1" eType="#//commons/Requirement" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Property" abstract="true">
+ <eOperations name="getValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="#//commons/DOMLElement"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="IProperty" eSuperTypes="#//commons/Property">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SProperty" eSuperTypes="#//commons/Property">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="FProperty" eSuperTypes="#//commons/Property">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloatObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="BProperty" eSuperTypes="#//commons/Property">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ExtensionElement" abstract="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="metaclassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DOMLElement" abstract="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1"
+ eType="#//commons/Property" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="contributesTo" upperBound="-1"
+ eType="#//commons/Requirement" eOpposite="#//commons/Requirement/predicatesOn"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Configuration" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="deployments" upperBound="-1"
+ eType="#//commons/Deployment" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DeployableElement" abstract="true"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Deployment">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="component" lowerBound="1"
+ eType="#//commons/DeployableElement"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="node" lowerBound="1"
+ eType="#//infrastructure/InfrastructureElement"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Requirement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="property" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="predicatesOn" upperBound="-1"
+ eType="#//commons/DOMLElement" eOpposite="#//commons/DOMLElement/contributesTo"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="RangedRequirement" eSuperTypes="#//commons/Requirement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="min" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloatObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="max" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloatObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="EnumeratedRequirement" eSuperTypes="#//commons/Requirement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="values" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DeploymentRequirement" abstract="true"
+ eSuperTypes="#//commons/Requirement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="DeploymentToNodeTypeRequirement" eSuperTypes="#//commons/DeploymentRequirement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="validTypes" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DeploymentToNodeWithPropertyRequirement"
+ eSuperTypes="#//commons/DeploymentRequirement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="min" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloatObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="max" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloatObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="values" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DeploymentToSpecificNodeRequirement"
+ eSuperTypes="#//commons/DeploymentRequirement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="validElements" upperBound="-1"
+ eType="#//infrastructure/InfrastructureElement"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Credentials" abstract="true" eSuperTypes="#//commons/DOMLElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="KeyPair" eSuperTypes="#//commons/Credentials">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="user" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="keyfile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="algorithm" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="bits" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="UserPass" eSuperTypes="#//commons/Credentials">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="username" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="password" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Source" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="engine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="entry" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="backend" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="credential" eType="#//commons/Credentials"
+ containment="true"/>
+ </eClassifiers>
+ </eSubpackages>
+ <eSubpackages name="application" nsURI="http://www.piacere-project.eu/doml/application"
+ nsPrefix="app">
+ <eClassifiers xsi:type="ecore:EClass" name="ApplicationLayer" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="components" upperBound="-1"
+ eType="#//application/ApplicationComponent" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ApplicationComponent" abstract="true"
+ eSuperTypes="#//commons/DOMLElement #//commons/DeployableElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="SoftwareComponent" eSuperTypes="#//application/ApplicationComponent">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="isPersistent" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+ defaultValueLiteral="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="licenseCost" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloatObject"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="exposedInterfaces" upperBound="-1"
+ eType="#//application/SoftwareInterface" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="consumedInterfaces" upperBound="-1"
+ eType="#//application/SoftwareInterface"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="src" eType="#//commons/Source"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DBMS" eSuperTypes="#//application/SoftwareComponent"/>
+ <eClassifiers xsi:type="ecore:EClass" name="SaaS" eSuperTypes="#//application/ApplicationComponent">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="licenseCost" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloatObject"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="exposedInterfaces" upperBound="-1"
+ eType="#//application/SoftwareInterface" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SaaSDBMS" eSuperTypes="#//application/SaaS"/>
+ <eClassifiers xsi:type="ecore:EClass" name="SoftwareInterface" eSuperTypes="#//application/ApplicationComponent">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="endPoint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ExtApplicationComponent" eSuperTypes="#//application/ApplicationComponent #//commons/ExtensionElement"/>
+ </eSubpackages>
+ <eSubpackages name="infrastructure" nsURI="http://www.piacere-project.eu/doml/infrastructure"
+ nsPrefix="infra">
+ <eClassifiers xsi:type="ecore:EClass" name="InfrastructureLayer" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
+ eType="#//infrastructure/ComputingNode" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="generators" upperBound="-1"
+ eType="#//infrastructure/ComputingNodeGenerator" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="storages" upperBound="-1"
+ eType="#//infrastructure/Storage" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="faas" upperBound="-1"
+ eType="#//infrastructure/FunctionAsAService" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="credentials" upperBound="-1"
+ eType="#//commons/Credentials" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="groups" upperBound="-1"
+ eType="#//infrastructure/ComputingGroup" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="securityGroups" upperBound="-1"
+ eType="#//infrastructure/SecurityGroup" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="networks" upperBound="-1"
+ eType="#//infrastructure/Network" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="rules" upperBound="-1"
+ eType="#//infrastructure/MonitoringRule" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="MonitoringRule" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="condition" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="strategy" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="strategyConfigurationString"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ComputingGroup" abstract="true" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="groupedNodes" upperBound="-1"
+ eType="#//infrastructure/ComputingNode" eOpposite="#//infrastructure/ComputingNode/group"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AutoScalingGroup" eSuperTypes="#//infrastructure/ComputingGroup">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="machineDefinition" lowerBound="1"
+ eType="#//infrastructure/VirtualMachine" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="min" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"
+ defaultValueLiteral="1"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="max" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"
+ defaultValueLiteral="1"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="securityGroup" eType="#//infrastructure/SecurityGroup"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="loadBalancer" eType="#//infrastructure/LoadBalancerKind"
+ defaultValueLiteral="DEFAULT"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="LoadBalancerKind">
+ <eLiterals name="DEFAULT"/>
+ <eLiterals name="INTERNAL" value="1"/>
+ <eLiterals name="EXTERNAL" value="2"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Rule" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//infrastructure/RuleKind"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="protocol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="fromPort" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="toPort" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cidr" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="RuleKind">
+ <eLiterals name="EGRESS"/>
+ <eLiterals name="INGRESS" value="1"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SecurityGroup" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="rules" upperBound="-1"
+ eType="#//infrastructure/Rule" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ifaces" upperBound="-1"
+ eType="#//infrastructure/NetworkInterface" eOpposite="#//infrastructure/NetworkInterface/associated"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AvailabilityGroup" eSuperTypes="#//infrastructure/ComputingGroup"/>
+ <eClassifiers xsi:type="ecore:EClass" name="InfrastructureElement" abstract="true"
+ eSuperTypes="#//commons/DOMLElement #//commons/DeployableElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ComputingNode" abstract="true" eSuperTypes="#//infrastructure/InfrastructureElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="architecture" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="os" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="memory_mb" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloatObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="storage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cpu_count" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloatObject"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ifaces" upperBound="-1"
+ eType="#//infrastructure/NetworkInterface" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="location" eType="#//infrastructure/Location"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="credentials" eType="#//commons/Credentials"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="group" eType="#//infrastructure/ComputingGroup"
+ eOpposite="#//infrastructure/ComputingGroup/groupedNodes"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="disabledMonitorings"
+ upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ComputingNodeGenerator" abstract="true"
+ eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//infrastructure/GeneratorKind"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="GeneratorKind">
+ <eLiterals name="SCRIPT"/>
+ <eLiterals name="IMAGE" value="1"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="VMImage" eSuperTypes="#//infrastructure/ComputingNodeGenerator">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="generatedVMs" upperBound="-1"
+ eType="#//infrastructure/VirtualMachine" eOpposite="#//infrastructure/VirtualMachine/generatedFrom"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ContainerImage" eSuperTypes="#//infrastructure/ComputingNodeGenerator">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="generatedContainers"
+ upperBound="-1" eType="#//infrastructure/Container" eOpposite="#//infrastructure/Container/generatedFrom"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PhysicalComputingNode" eSuperTypes="#//infrastructure/ComputingNode"/>
+ <eClassifiers xsi:type="ecore:EClass" name="VirtualMachine" eSuperTypes="#//infrastructure/ComputingNode">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="sizeDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="generatedFrom" eType="#//infrastructure/VMImage"
+ eOpposite="#//infrastructure/VMImage/generatedVMs"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Location" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="region" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="zone" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ContainerConfig" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="container_port" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="vm_port" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="host" eType="#//infrastructure/ComputingNode"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="iface" eType="#//infrastructure/NetworkInterface"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Container" eSuperTypes="#//infrastructure/ComputingNode">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="generatedFrom" eType="#//infrastructure/ContainerImage"
+ eOpposite="#//infrastructure/ContainerImage/generatedContainers"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="configs" upperBound="-1"
+ eType="#//infrastructure/ContainerConfig" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Network" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="protocol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="addressRange" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="connectedIfaces" upperBound="-1"
+ eType="#//infrastructure/NetworkInterface" eOpposite="#//infrastructure/NetworkInterface/belongsTo"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="igws" upperBound="-1"
+ eType="#//infrastructure/InternetGateway" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="subnets" upperBound="-1"
+ eType="#//infrastructure/Subnet" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Subnet" eSuperTypes="#//infrastructure/Network">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="connectedTo" upperBound="-1"
+ eType="#//infrastructure/Subnet"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="NetworkInterface" eSuperTypes="#//infrastructure/InfrastructureElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="speed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="endPoint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="belongsTo" eType="#//infrastructure/Network"
+ eOpposite="#//infrastructure/Network/connectedIfaces"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="associated" eType="#//infrastructure/SecurityGroup"
+ eOpposite="#//infrastructure/SecurityGroup/ifaces"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="InternetGateway" eSuperTypes="#//infrastructure/NetworkInterface"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Storage" eSuperTypes="#//infrastructure/InfrastructureElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="size_gb" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ifaces" upperBound="-1"
+ eType="#//infrastructure/NetworkInterface" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="FunctionAsAService" eSuperTypes="#//infrastructure/InfrastructureElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ifaces" upperBound="-1"
+ eType="#//infrastructure/NetworkInterface" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="RoleKind">
+ <eLiterals name="NONE"/>
+ <eLiterals name="MANAGER" value="1"/>
+ <eLiterals name="WORKER" value="2"/>
+ <eLiterals name="MASTER" value="3"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SwarmRole" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//infrastructure/RoleKind"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
+ eType="#//infrastructure/ComputingNode" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Swarm" eSuperTypes="#//infrastructure/ComputingGroup">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="roles" upperBound="-1"
+ eType="#//infrastructure/SwarmRole" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ExtInfrastructureElement" eSuperTypes="#//infrastructure/InfrastructureElement #//commons/ExtensionElement"/>
+ </eSubpackages>
+ <eSubpackages name="concrete" nsURI="http://www.piacere-project.eu/doml/concrete"
+ nsPrefix="concrete">
+ <eClassifiers xsi:type="ecore:EClass" name="ConcreteInfrastructure" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="providers" upperBound="-1"
+ eType="#//concrete/RuntimeProvider" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="RuntimeProvider" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="vms" upperBound="-1"
+ eType="#//concrete/VirtualMachine" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="vmImages" upperBound="-1"
+ eType="#//concrete/VMImage" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="containerImages" upperBound="-1"
+ eType="#//concrete/ContainerImage" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="networks" upperBound="-1"
+ eType="#//concrete/Network" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="storages" upperBound="-1"
+ eType="#//concrete/Storage" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="faas" upperBound="-1"
+ eType="#//concrete/FunctionAsAService" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="group" upperBound="-1"
+ eType="#//concrete/ComputingGroup" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ConcreteElement" abstract="true" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="configurationScript"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="preexisting" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+ defaultValueLiteral="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="VirtualMachine" eSuperTypes="#//concrete/ConcreteElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="maps" eType="#//infrastructure/VirtualMachine"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="VMImage" eSuperTypes="#//concrete/ConcreteElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="maps" eType="#//infrastructure/VMImage"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ContainerImage" eSuperTypes="#//concrete/ConcreteElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="maps" eType="#//infrastructure/ContainerImage"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Network" eSuperTypes="#//concrete/ConcreteElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="maps" eType="#//infrastructure/Network"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Storage" eSuperTypes="#//concrete/ConcreteElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="maps" eType="#//infrastructure/Storage"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="FunctionAsAService" eSuperTypes="#//concrete/ConcreteElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="maps" eType="#//infrastructure/FunctionAsAService"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ComputingGroup" eSuperTypes="#//concrete/ConcreteElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="maps" eType="#//infrastructure/ComputingGroup"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ExtConcreteElement" eSuperTypes="#//concrete/ConcreteElement #//commons/ExtensionElement"/>
+ </eSubpackages>
+ <eSubpackages name="optimization" nsURI="http://www.piacere-project.eu/doml/optimization"
+ nsPrefix="optimization">
+ <eClassifiers xsi:type="ecore:EClass" name="OptimizationLayer" eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="startingHint" eType="#//commons/Configuration"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="solutions" upperBound="-1"
+ eType="#//optimization/OptimizationSolution" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="objectives" upperBound="-1"
+ eType="#//optimization/OptimizationObjective" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="nonfunctionalRequirements"
+ upperBound="-1" eType="#//commons/Requirement" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ObjectiveValue">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloatObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="availability" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloatObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="performance" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloatObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="OptimizationSolution" eSuperTypes="#//commons/Configuration">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="objectives" eType="#//optimization/ObjectiveValue"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="decisions" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="OptimizationObjective" abstract="true"
+ eSuperTypes="#//commons/DOMLElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral="Max"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="property" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CountObjective" eSuperTypes="#//optimization/OptimizationObjective"/>
+ <eClassifiers xsi:type="ecore:EClass" name="MeasurableObjective" eSuperTypes="#//optimization/OptimizationObjective"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ExtOptimizationObjective" eSuperTypes="#//optimization/OptimizationObjective #//commons/ExtensionElement"/>
+ </eSubpackages>
+</ecore:EPackage>
diff --git a/mc_openapi/doml_mc/common_reqs.py b/mc_openapi/doml_mc/common_reqs.py
index e237ed1c4e8bf261ba19002aa8c7b4e93f3853d8..73ac95c104e2df2dff92447648a881089cf9b6e0 100644
--- a/mc_openapi/doml_mc/common_reqs.py
+++ b/mc_openapi/doml_mc/common_reqs.py
@@ -452,6 +452,14 @@ RequirementLists = {
(all_infrastructure_elements_deployed, "all_infrastructure_elements_deployed", "All abstract infrastructure elements are mapped to an element in the active concretization.", ed_all_infrastructure_elements_deployed),
(all_concrete_map_something, "all_concrete_map_something", "All elements in the active concretization are mapped to some abstract infrastructure element.", ed_all_concrete_map_something)
],
+ DOMLVersion.V2_1_1: [
+ (vm_iface, "vm_iface", "All virtual machines must be connected to at least one network interface.", ed_vm_iface),
+ (software_package_iface_net_v2_1, "software_package_iface_net", "All software packages can see the interfaces they need through a common network.", ed_software_package_iface_net),
+ (iface_uniq, "iface_uniq", "There are no duplicated interfaces.", ed_iface_uniq),
+ (all_SoftwareComponents_deployed, "all_SoftwareComponents_deployed", "All software components have been deployed to some node.", ed_all_SoftwareComponents_deployed),
+ (all_infrastructure_elements_deployed, "all_infrastructure_elements_deployed", "All abstract infrastructure elements are mapped to an element in the active concretization.", ed_all_infrastructure_elements_deployed),
+ (all_concrete_map_something, "all_concrete_map_something", "All elements in the active concretization are mapped to some abstract infrastructure element.", ed_all_concrete_map_something)
+ ],
}
diff --git a/mc_openapi/doml_mc/intermediate_model/metamodel.py b/mc_openapi/doml_mc/intermediate_model/metamodel.py
index 378395b994bdbaef0279a1a1a47ffb70c6a6be89..ef6e478ba1c323b0b65255525710438300eea5c2 100644
--- a/mc_openapi/doml_mc/intermediate_model/metamodel.py
+++ b/mc_openapi/doml_mc/intermediate_model/metamodel.py
@@ -13,6 +13,7 @@ class DOMLVersion(Enum):
V1_0 = "v1.0"
V2_0 = "v2.0"
V2_1 = "v2.1"
+ V2_1_1 = "v2.1.1"
Multiplicity = tuple[Literal["0", "1"], Literal["1", "*"]]
@@ -211,6 +212,7 @@ def _find_attribute_class(
if aname in c.attributes:
return c
elif c.superclass is None:
+ print(c)
raise AttributeNotFound(
f"Attribute {aname} not found in subclasses of {cname}."
)
diff --git a/mc_openapi/doml_mc/xmi_parser/special_parsers.py b/mc_openapi/doml_mc/xmi_parser/special_parsers.py
index 4427aae18fb61baa51875aa87bf55376cca11382..26f497398a030a5f3073aa2d5cd2524580e290b2 100644
--- a/mc_openapi/doml_mc/xmi_parser/special_parsers.py
+++ b/mc_openapi/doml_mc/xmi_parser/special_parsers.py
@@ -60,6 +60,12 @@ def init_special_parsers():
("infrastructure_ComputingNode", "memory_mb"): parse_memory_mb,
("commons_FProperty", "value"): parse_fproperty,
},
+ DOMLVersion.V2_1_1: {
+ ("infrastructure_Network", "addressRange"): parse_cidr,
+ ("infrastructure_NetworkInterface", "endPoint"): parse_iface_address,
+ ("infrastructure_ComputingNode", "memory_mb"): parse_memory_mb,
+ ("commons_FProperty", "value"): parse_fproperty,
+ },
}
for ver in DOMLVersion:
SpecialParsers[ver] = SpecialParser(MetaModels[ver], attribute_parsers[ver])
diff --git a/tests/doml/v2.1.1/.project b/tests/doml/v2.1.1/.project
new file mode 100644
index 0000000000000000000000000000000000000000..96bcdb7a1076c114a39e5046f8f7d8a1b7c96daa
--- /dev/null
+++ b/tests/doml/v2.1.1/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>domlTests</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+ </natures>
+</projectDescription>
diff --git a/tests/doml/v2.1.1/faas.doml b/tests/doml/v2.1.1/faas.doml
new file mode 100644
index 0000000000000000000000000000000000000000..9345cc7d776cafd80d1a0af2553202e6f8ea112d
--- /dev/null
+++ b/tests/doml/v2.1.1/faas.doml
@@ -0,0 +1,177 @@
+doml faas_app
+
+application ImageResizeApp {
+
+ software_component image_resize {
+ provides {
+ handle_image
+ }
+ consumes {
+ storage_interface,
+ bucket_in,
+ bucket_out
+ }
+ properties {
+ source_code = "path/lambda/function/image_resize.py";
+ }
+ }
+
+ saas s1 {
+ provides {
+ storage_interface
+ bucket_in
+ }
+ }
+
+ saas s2 {
+ provides {
+ storage_interface
+ bucket_out
+ }
+ }
+
+ software_component notification {
+ consumes {
+ handle_image,
+ bucket_in
+ }
+ }
+
+ software_component web {
+ consumes {
+ storage_interface,
+ bucket_out
+ }
+ properties {
+ source_code = "path/web_app";
+ }
+ }
+}
+
+infrastructure infra {
+ vm vm1 {
+ iface i1 {
+ address "10.0.0.1"
+ belongs_to vpc
+ security sg
+ }
+ credentials ssh_key
+ loc {
+ region "eu-central-1"
+ }
+ }
+
+ vm_image v_img {
+ generates vm1
+ image "ami-xxxxxxxxxxxxxxxxx"
+ }
+
+ container c {
+ host vm1
+ }
+
+ cont_image c_img {
+ generates c
+ image "web-app:0.1.0"
+ }
+
+ faas f { }
+
+ sto st1 { }
+
+ sto st2 { }
+
+ net vpc {
+ cidr "/24"
+ protocol "tcp/ip"
+ subnet vpc_subnet {
+ cidr "/24"
+ protocol "tcp/ip"
+ }
+ }
+
+ security_group sg {
+ egress icmp {
+ from_port -1
+ to_port -1
+ protocol "icmp"
+ cidr ["0.0.0.0/0"]
+ }
+ ingress http {
+ from_port 80
+ to_port 80
+ protocol "tcp"
+ cidr ["0.0.0.0/0"]
+ }
+ ingress https {
+ from_port 443
+ to_port 443
+ protocol "tcp"
+ cidr ["0.0.0.0/0"]
+ }
+ ingress ssh {
+ from_port 22
+ to_port 22
+ protocol "tcp"
+ cidr ["0.0.0.0/0"]
+ }
+ ifaces i1
+ }
+
+ key_pair ssh_key {
+ user "ec2-user"
+ keyfile "/tmp/ssh_key_file"
+ algorithm "RSA"
+ bits 4096
+ }
+}
+
+deployment config1 {
+ image_resize -> f,
+ web -> c,
+ s1 -> st1,
+ s2 -> st2
+}
+
+active deployment config1
+
+concretizations {
+ concrete_infrastructure con_infra {
+ provider aws {
+ vm concrete_vm {
+ properties {
+ instance_type = "t2.micro";
+ ssh_key_name = "demo-key";
+ ec2_role_name = "demo-ec2-role";
+ }
+ maps vm1
+ }
+ faas concrete_f {
+ properties {
+ lambda_role_name = "DemoLambdaRole";
+ lambda_runtime = "python3.8";
+ lambda_handler = "image_resize.lambda_handler";
+ lambda_timeout = 5;
+ lambda_memory = 128;
+ }
+ maps f
+ }
+ storage s3_bucket_in {
+ properties {
+ bucket_name = "bucket_in";
+ }
+ maps st1
+ }
+ storage s3_bucket_out {
+ properties {
+ bucket_name = "bucket_out";
+ }
+ maps st2
+ }
+ net concrete_net {
+ maps vpc
+ }
+ }
+ }
+ active con_infra
+}
\ No newline at end of file
diff --git a/tests/doml/v2.1.1/faas.domlx b/tests/doml/v2.1.1/faas.domlx
new file mode 100644
index 0000000000000000000000000000000000000000..dc83d7135253786f5e7d1fbb9180c0ab1da9e2ca
--- /dev/null
+++ b/tests/doml/v2.1.1/faas.domlx
@@ -0,0 +1,82 @@
+<?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" name="faas_app" activeConfiguration="//@configurations.0" activeInfrastructure="//@concretizations.0">
+ <application name="ImageResizeApp">
+ <components xsi:type="app:SoftwareComponent" name="image_resize" consumedInterfaces="//@application/@components.1/@exposedInterfaces.0 //@application/@components.1/@exposedInterfaces.1 //@application/@components.2/@exposedInterfaces.1">
+ <annotations xsi:type="commons:SProperty" key="source_code" value="path/lambda/function/image_resize.py"/>
+ <exposedInterfaces name="handle_image"/>
+ </components>
+ <components xsi:type="app:SaaS" name="s1">
+ <exposedInterfaces name="storage_interface"/>
+ <exposedInterfaces name="bucket_in"/>
+ </components>
+ <components xsi:type="app:SaaS" name="s2">
+ <exposedInterfaces name="storage_interface"/>
+ <exposedInterfaces name="bucket_out"/>
+ </components>
+ <components xsi:type="app:SoftwareComponent" name="notification" consumedInterfaces="//@application/@components.0/@exposedInterfaces.0 //@application/@components.1/@exposedInterfaces.1"/>
+ <components xsi:type="app:SoftwareComponent" name="web" consumedInterfaces="//@application/@components.1/@exposedInterfaces.0 //@application/@components.2/@exposedInterfaces.1">
+ <annotations xsi:type="commons:SProperty" key="source_code" value="path/web_app"/>
+ </components>
+ </application>
+ <infrastructure name="infra">
+ <nodes xsi:type="infra:VirtualMachine" name="vm1" credentials="//@infrastructure/@credentials.0" generatedFrom="//@infrastructure/@generators.0">
+ <ifaces name="i1" endPoint="10.0.0.1" belongsTo="//@infrastructure/@networks.0" associated="//@infrastructure/@securityGroups.0"/>
+ <location region="eu-central-1"/>
+ </nodes>
+ <nodes xsi:type="infra:Container" name="c" generatedFrom="//@infrastructure/@generators.1">
+ <configs host="//@infrastructure/@nodes.0"/>
+ </nodes>
+ <generators xsi:type="infra:VMImage" name="v_img" uri="ami-xxxxxxxxxxxxxxxxx" kind="IMAGE" generatedVMs="//@infrastructure/@nodes.0"/>
+ <generators xsi:type="infra:ContainerImage" name="c_img" uri="web-app:0.1.0" kind="IMAGE" generatedContainers="//@infrastructure/@nodes.1"/>
+ <storages name="st1"/>
+ <storages name="st2"/>
+ <faas name="f"/>
+ <credentials xsi:type="commons:KeyPair" name="ssh_key" user="ec2-user" keyfile="/tmp/ssh_key_file" algorithm="RSA" bits="4096"/>
+ <securityGroups name="sg" ifaces="//@infrastructure/@nodes.0/@ifaces.0">
+ <rules name="icmp" protocol="icmp" fromPort="-1" toPort="-1">
+ <cidr>0.0.0.0/0</cidr>
+ </rules>
+ <rules name="http" kind="INGRESS" protocol="tcp" fromPort="80" toPort="80">
+ <cidr>0.0.0.0/0</cidr>
+ </rules>
+ <rules name="https" kind="INGRESS" protocol="tcp" fromPort="443" toPort="443">
+ <cidr>0.0.0.0/0</cidr>
+ </rules>
+ <rules name="ssh" kind="INGRESS" protocol="tcp" fromPort="22" toPort="22">
+ <cidr>0.0.0.0/0</cidr>
+ </rules>
+ </securityGroups>
+ <networks name="vpc" protocol="tcp/ip" addressRange="/24" connectedIfaces="//@infrastructure/@nodes.0/@ifaces.0">
+ <subnets name="vpc_subnet" protocol="tcp/ip" addressRange="/24"/>
+ </networks>
+ </infrastructure>
+ <concretizations name="con_infra">
+ <providers name="aws">
+ <vms name="concrete_vm" maps="//@infrastructure/@nodes.0">
+ <annotations xsi:type="commons:SProperty" key="instance_type" value="t2.micro"/>
+ <annotations xsi:type="commons:SProperty" key="ssh_key_name" value="demo-key"/>
+ <annotations xsi:type="commons:SProperty" key="ec2_role_name" value="demo-ec2-role"/>
+ </vms>
+ <networks name="concrete_net" maps="//@infrastructure/@networks.0"/>
+ <storages name="s3_bucket_in" maps="//@infrastructure/@storages.0">
+ <annotations xsi:type="commons:SProperty" key="bucket_name" value="bucket_in"/>
+ </storages>
+ <storages name="s3_bucket_out" maps="//@infrastructure/@storages.1">
+ <annotations xsi:type="commons:SProperty" key="bucket_name" value="bucket_out"/>
+ </storages>
+ <faas name="concrete_f" maps="//@infrastructure/@faas.0">
+ <annotations xsi:type="commons:SProperty" key="lambda_role_name" value="DemoLambdaRole"/>
+ <annotations xsi:type="commons:SProperty" key="lambda_runtime" value="python3.8"/>
+ <annotations xsi:type="commons:SProperty" key="lambda_handler" value="image_resize.lambda_handler"/>
+ <annotations xsi:type="commons:IProperty" key="lambda_timeout" value="5"/>
+ <annotations xsi:type="commons:IProperty" key="lambda_memory" value="128"/>
+ </faas>
+ </providers>
+ </concretizations>
+ <configurations name="config1">
+ <deployments component="//@application/@components.0" node="//@infrastructure/@faas.0"/>
+ <deployments component="//@application/@components.4" node="//@infrastructure/@nodes.1"/>
+ <deployments component="//@application/@components.1" node="//@infrastructure/@storages.0"/>
+ <deployments component="//@application/@components.2" node="//@infrastructure/@storages.1"/>
+ </configurations>
+</commons:DOMLModel>
diff --git a/tests/doml/v2.1.1/iot_simple_app.doml b/tests/doml/v2.1.1/iot_simple_app.doml
new file mode 100644
index 0000000000000000000000000000000000000000..4dca09ac6ec52afa070731e6942535354b8eb5b4
--- /dev/null
+++ b/tests/doml/v2.1.1/iot_simple_app.doml
@@ -0,0 +1,52 @@
+doml iot_simple_app
+
+application iot_simple_app {
+ dbms oracle {
+ provides { sql_interface }
+ }
+
+ software_component web_server {
+ provides { sensor_info }
+ consumes { sql_interface, get_weather }
+ }
+
+ software_component iot_provider {
+ consumes { sensor_info }
+ }
+
+ saas external_meteo {
+ provides { get_weather @ "https://api.mymeteo.com/get" }
+ }
+}
+
+infrastructure infra {
+ vm vm1 {}
+ vm vm2 {}
+ node iot_device1 {}
+ node iot_device2 {}
+}
+
+deployment config1 {
+ oracle -> vm1,
+ web_server -> vm2,
+ iot_provider -> iot_device1,
+ iot_provider -> iot_device2
+}
+
+active deployment config1
+
+concretizations {
+ concrete_infrastructure con_infra1 {
+ provider aws {
+ vm concrete_vm1 {
+ properties { instance_type = "t2.micro"; }
+ maps vm1
+ }
+ vm concrete_vm2 {
+ properties {}
+ maps vm2
+ }
+ }
+ }
+ active con_infra1
+}
\ No newline at end of file
diff --git a/tests/doml/v2.1.1/iot_simple_app.domlx b/tests/doml/v2.1.1/iot_simple_app.domlx
new file mode 100644
index 0000000000000000000000000000000000000000..d750eee5e1487c0b0097e48b3a92453dc3da95d2
--- /dev/null
+++ b/tests/doml/v2.1.1/iot_simple_app.domlx
@@ -0,0 +1,35 @@
+<?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" name="iot_simple_app" activeConfiguration="//@configurations.0" activeInfrastructure="//@concretizations.0">
+ <application name="iot_simple_app">
+ <components xsi:type="app:DBMS" name="oracle">
+ <exposedInterfaces name="sql_interface"/>
+ </components>
+ <components xsi:type="app:SoftwareComponent" name="web_server" consumedInterfaces="//@application/@components.0/@exposedInterfaces.0 //@application/@components.3/@exposedInterfaces.0">
+ <exposedInterfaces name="sensor_info"/>
+ </components>
+ <components xsi:type="app:SoftwareComponent" name="iot_provider" consumedInterfaces="//@application/@components.1/@exposedInterfaces.0"/>
+ <components xsi:type="app:SaaS" name="external_meteo">
+ <exposedInterfaces name="get_weather" endPoint="https://api.mymeteo.com/get"/>
+ </components>
+ </application>
+ <infrastructure name="infra">
+ <nodes xsi:type="infra:VirtualMachine" name="vm1"/>
+ <nodes xsi:type="infra:VirtualMachine" name="vm2"/>
+ <nodes xsi:type="infra:PhysicalComputingNode" name="iot_device1"/>
+ <nodes xsi:type="infra:PhysicalComputingNode" name="iot_device2"/>
+ </infrastructure>
+ <concretizations name="con_infra1">
+ <providers name="aws">
+ <vms name="concrete_vm1" maps="//@infrastructure/@nodes.0">
+ <annotations xsi:type="commons:SProperty" key="instance_type" value="t2.micro"/>
+ </vms>
+ <vms name="concrete_vm2" maps="//@infrastructure/@nodes.1"/>
+ </providers>
+ </concretizations>
+ <configurations name="config1">
+ <deployments component="//@application/@components.0" node="//@infrastructure/@nodes.0"/>
+ <deployments component="//@application/@components.1" node="//@infrastructure/@nodes.1"/>
+ <deployments component="//@application/@components.2" node="//@infrastructure/@nodes.2"/>
+ <deployments component="//@application/@components.2" node="//@infrastructure/@nodes.3"/>
+ </configurations>
+</commons:DOMLModel>
diff --git a/tests/doml/v2.1.1/nginx-aws-ec2.doml b/tests/doml/v2.1.1/nginx-aws-ec2.doml
new file mode 100644
index 0000000000000000000000000000000000000000..8b1f7635abe55981f613ee869c490d364fd236a0
--- /dev/null
+++ b/tests/doml/v2.1.1/nginx-aws-ec2.doml
@@ -0,0 +1,121 @@
+doml nginx_aws_ec2
+
+application app {
+
+ software_component nginx {
+ properties {
+ source_code="/usr/share/nginx/html/index.html";
+ }
+ }
+}
+
+infrastructure infra {
+
+ vm_image vm_img {
+ generates vm1
+ image "ami-xxxxxxxxxxxxxxxxx"
+ }
+
+ net vpc {
+ cidr "/24"
+ protocol "tcp/ip"
+ subnet vpc_subnet {
+ cidr "/24"
+ protocol "tcp/ip"
+ }
+ }
+
+ security_group sg {
+ egress icmp {
+ from_port -1
+ to_port -1
+ protocol "icmp"
+ cidr ["0.0.0.0/0"]
+ }
+ ingress http {
+ from_port 80
+ to_port 80
+ protocol "tcp"
+ cidr ["0.0.0.0/0"]
+ }
+ ingress https {
+ from_port 443
+ to_port 443
+ protocol "tcp"
+ cidr ["0.0.0.0/0"]
+ }
+ ingress ssh {
+ from_port 22
+ to_port 22
+ protocol "tcp"
+ cidr ["0.0.0.0/0"]
+ }
+ ifaces i1
+ }
+
+ key_pair ssh_key {
+ user "ec2-user"
+ keyfile "/tmp/ssh_key_file"
+ algorithm "RSA"
+ bits 4096
+ }
+
+ autoscale_group ag {
+ vm vm1 {
+ iface i1 {
+ address "10.0.0.1"
+ belongs_to vpc
+ security sg
+ }
+ credentials ssh_key
+ loc {
+ region "eu-central-1"
+ }
+ }
+ }
+}
+
+deployment conf {
+ nginx -> vm1
+}
+
+active deployment conf
+
+concretizations {
+ concrete_infrastructure con_infra {
+ provider aws {
+ vm ec2_vm {
+ properties {
+ vm_name = "nginx-host";
+ instance_type = "t2.micro";
+ ssh_key_name = "demo-key";
+ ec2_role_name = "demo-ec2-role";
+ }
+ maps vm1
+ }
+
+ vm_image concrete_vm_image {
+ maps vm_img
+ }
+
+ net concrete_net {
+ properties {
+ vm_name = "nginx-host";
+ }
+ maps vpc
+ }
+ }
+ }
+ active con_infra
+}
+
+optimization opt {
+ objectives {
+ "cost" => min
+ "availability" => max
+ }
+ nonfunctional_requirements {
+ req1 "Cost <= 70.0" max 70.0 => "cost";
+ req2 "Availability >= 66.5%" min 66.5 => "availability";
+ }
+}
diff --git a/tests/doml/v2.1.1/nginx-aws-ec2.domlx b/tests/doml/v2.1.1/nginx-aws-ec2.domlx
new file mode 100644
index 0000000000000000000000000000000000000000..14660f0286d3bb24560cccada553c121e06cd4e9
--- /dev/null
+++ b/tests/doml/v2.1.1/nginx-aws-ec2.domlx
@@ -0,0 +1,58 @@
+<?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_aws_ec2" 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"/>
+ </components>
+ </application>
+ <infrastructure name="infra">
+ <generators xsi:type="infra:VMImage" name="vm_img" uri="ami-xxxxxxxxxxxxxxxxx" kind="IMAGE" generatedVMs="//@infrastructure/@groups.0/@machineDefinition"/>
+ <credentials xsi:type="commons:KeyPair" name="ssh_key" user="ec2-user" keyfile="/tmp/ssh_key_file" algorithm="RSA" bits="4096"/>
+ <groups xsi:type="infra:AutoScalingGroup" name="ag">
+ <machineDefinition name="vm1" credentials="//@infrastructure/@credentials.0" generatedFrom="//@infrastructure/@generators.0">
+ <ifaces name="i1" endPoint="10.0.0.1" belongsTo="//@infrastructure/@networks.0" associated="//@infrastructure/@securityGroups.0"/>
+ <location region="eu-central-1"/>
+ </machineDefinition>
+ </groups>
+ <securityGroups name="sg" ifaces="//@infrastructure/@groups.0/@machineDefinition/@ifaces.0">
+ <rules name="icmp" protocol="icmp" fromPort="-1" toPort="-1">
+ <cidr>0.0.0.0/0</cidr>
+ </rules>
+ <rules name="http" kind="INGRESS" protocol="tcp" fromPort="80" toPort="80">
+ <cidr>0.0.0.0/0</cidr>
+ </rules>
+ <rules name="https" kind="INGRESS" protocol="tcp" fromPort="443" toPort="443">
+ <cidr>0.0.0.0/0</cidr>
+ </rules>
+ <rules name="ssh" kind="INGRESS" protocol="tcp" fromPort="22" toPort="22">
+ <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>
+ </infrastructure>
+ <concretizations name="con_infra">
+ <providers name="aws">
+ <vms name="ec2_vm" maps="//@infrastructure/@groups.0/@machineDefinition">
+ <annotations xsi:type="commons:SProperty" key="vm_name" value="nginx-host"/>
+ <annotations xsi:type="commons:SProperty" key="instance_type" value="t2.micro"/>
+ <annotations xsi:type="commons:SProperty" key="ssh_key_name" value="demo-key"/>
+ <annotations xsi:type="commons:SProperty" key="ec2_role_name" value="demo-ec2-role"/>
+ </vms>
+ <vmImages name="concrete_vm_image" maps="//@infrastructure/@generators.0"/>
+ <networks name="concrete_net" maps="//@infrastructure/@networks.0">
+ <annotations xsi:type="commons:SProperty" key="vm_name" value="nginx-host"/>
+ </networks>
+ </providers>
+ </concretizations>
+ <optimization name="opt">
+ <objectives xsi:type="optimization:MeasurableObjective" kind="min" property="cost"/>
+ <objectives xsi:type="optimization:MeasurableObjective" kind="max" property="availability"/>
+ <nonfunctionalRequirements xsi:type="commons:RangedRequirement" name="req1" description="Cost <= 70.0" property="cost" max="70.0"/>
+ <nonfunctionalRequirements xsi:type="commons:RangedRequirement" name="req2" description="Availability >= 66.5%" property="availability" min="66.5"/>
+ </optimization>
+ <configurations name="conf">
+ <deployments component="//@application/@components.0" node="//@infrastructure/@groups.0/@machineDefinition"/>
+ </configurations>
+</commons:DOMLModel>
diff --git a/tests/doml/v2.1.1/nginx_func_req.doml b/tests/doml/v2.1.1/nginx_func_req.doml
new file mode 100644
index 0000000000000000000000000000000000000000..f810a6be84417f7a40da07b084b08c4e5f50db8a
--- /dev/null
+++ b/tests/doml/v2.1.1/nginx_func_req.doml
@@ -0,0 +1,149 @@
+doml nginx_func_req
+
+application app {
+
+ software_component nginx {
+ properties {
+ source_code="/usr/share/nginx/html/index.html";
+ }
+ }
+}
+
+infrastructure infra {
+
+ vm_image vm_img {
+ generates vm1
+ image "ami-xxxxxxxxxxxxxxxxx"
+ }
+
+ net vpc {
+ cidr "/24"
+ protocol "tcp/ip"
+ subnet vpc_subnet {
+ cidr "/24"
+ protocol "tcp/ip"
+ }
+ }
+
+ security_group sg {
+ egress icmp {
+ from_port -1
+ to_port -1
+ protocol "icmp"
+ cidr ["0.0.0.0/0"]
+ }
+ ingress http {
+ from_port 80
+ to_port 80
+ protocol "tcp"
+ cidr ["0.0.0.0/0"]
+ }
+ ingress https {
+ from_port 443
+ to_port 443
+ protocol "tcp"
+ cidr ["0.0.0.0/0"]
+ }
+ ingress ssh {
+ from_port 22
+ to_port 22
+ protocol "tcp"
+ cidr ["0.0.0.0/0"]
+ }
+ ifaces i1
+ }
+
+ key_pair ssh_key {
+ user "ec2-user"
+ keyfile "/tmp/ssh_key_file"
+ algorithm "RSA"
+ bits 4096
+ }
+
+ autoscale_group ag {
+ vm vm1 {
+ iface i1 {
+ address "10.0.0.1"
+ belongs_to vpc
+ security sg
+ }
+ credentials ssh_key
+ loc {
+ region "eu-central-1"
+ }
+ }
+ }
+}
+
+deployment conf {
+ nginx -> vm1
+}
+
+active deployment conf
+
+concretizations {
+ concrete_infrastructure con_infra {
+ provider aws {
+ vm ec2_vm {
+ properties {
+ vm_name = "nginx-host";
+ instance_type = "t2.micro";
+ ssh_key_name = "demo-key";
+ ec2_role_name = "demo-ec2-role";
+ }
+ maps vm1
+ }
+
+ vm_image concrete_vm_image {
+ maps vm_img
+ }
+
+ net concrete_net {
+ properties {
+ vm_name = "nginx-host";
+ }
+ maps vpc
+ }
+ }
+ }
+ active con_infra
+}
+
+optimization opt {
+ objectives {
+ "cost" => min
+ "availability" => max
+ }
+ nonfunctional_requirements {
+ req1 "Cost <= 70.0" max 70.0 => "cost";
+ req2 "Availability >= 66.5%" min 66.5 => "availability";
+ }
+}
+
+functional_requirements {
+ req_ext ```
+ > "example requirement to test"
+ # Expr to parse
+ not (
+ vm is class infrastructure.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
+ )
+ and
+ vm has attribute infrastructure.ComputingNode->os Os1
+ )
+ ---
+ "Virtual Machine {vm} has no iface"
+ ```;
+}
diff --git a/tests/doml/v2.1.1/nginx_func_req.domlx b/tests/doml/v2.1.1/nginx_func_req.domlx
new file mode 100644
index 0000000000000000000000000000000000000000..06e934aef363c4f9ebb82bf224ccaec8a4829967
--- /dev/null
+++ b/tests/doml/v2.1.1/nginx_func_req.domlx
@@ -0,0 +1,59 @@
+<?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">
+ <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"/>
+ </components>
+ </application>
+ <infrastructure name="infra">
+ <generators xsi:type="infra:VMImage" name="vm_img" uri="ami-xxxxxxxxxxxxxxxxx" kind="IMAGE" generatedVMs="//@infrastructure/@groups.0/@machineDefinition"/>
+ <credentials xsi:type="commons:KeyPair" name="ssh_key" user="ec2-user" keyfile="/tmp/ssh_key_file" algorithm="RSA" bits="4096"/>
+ <groups xsi:type="infra:AutoScalingGroup" name="ag">
+ <machineDefinition name="vm1" credentials="//@infrastructure/@credentials.0" generatedFrom="//@infrastructure/@generators.0">
+ <ifaces name="i1" endPoint="10.0.0.1" belongsTo="//@infrastructure/@networks.0" associated="//@infrastructure/@securityGroups.0"/>
+ <location region="eu-central-1"/>
+ </machineDefinition>
+ </groups>
+ <securityGroups name="sg" ifaces="//@infrastructure/@groups.0/@machineDefinition/@ifaces.0">
+ <rules name="icmp" protocol="icmp" fromPort="-1" toPort="-1">
+ <cidr>0.0.0.0/0</cidr>
+ </rules>
+ <rules name="http" kind="INGRESS" protocol="tcp" fromPort="80" toPort="80">
+ <cidr>0.0.0.0/0</cidr>
+ </rules>
+ <rules name="https" kind="INGRESS" protocol="tcp" fromPort="443" toPort="443">
+ <cidr>0.0.0.0/0</cidr>
+ </rules>
+ <rules name="ssh" kind="INGRESS" protocol="tcp" fromPort="22" toPort="22">
+ <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>
+ </infrastructure>
+ <concretizations name="con_infra">
+ <providers name="aws">
+ <vms name="ec2_vm" maps="//@infrastructure/@groups.0/@machineDefinition">
+ <annotations xsi:type="commons:SProperty" key="vm_name" value="nginx-host"/>
+ <annotations xsi:type="commons:SProperty" key="instance_type" value="t2.micro"/>
+ <annotations xsi:type="commons:SProperty" key="ssh_key_name" value="demo-key"/>
+ <annotations xsi:type="commons:SProperty" key="ec2_role_name" value="demo-ec2-role"/>
+ </vms>
+ <vmImages name="concrete_vm_image" maps="//@infrastructure/@generators.0"/>
+ <networks name="concrete_net" maps="//@infrastructure/@networks.0">
+ <annotations xsi:type="commons:SProperty" key="vm_name" value="nginx-host"/>
+ </networks>
+ </providers>
+ </concretizations>
+ <optimization name="opt">
+ <objectives xsi:type="optimization:MeasurableObjective" kind="min" property="cost"/>
+ <objectives xsi:type="optimization:MeasurableObjective" kind="max" property="availability"/>
+ <nonfunctionalRequirements xsi:type="commons:RangedRequirement" name="req1" description="Cost <= 70.0" property="cost" max="70.0"/>
+ <nonfunctionalRequirements xsi:type="commons:RangedRequirement" name="req2" description="Availability >= 66.5%" property="availability" min="66.5"/>
+ </optimization>
+ <configurations name="conf">
+ <deployments component="//@application/@components.0" node="//@infrastructure/@groups.0/@machineDefinition"/>
+ </configurations>
+ <functionalRequirements name="req_ext" description="```
 > "example requirement to test"
 # Expr to parse
 not ( 
 vm is class infrastructure.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
 )
 and
 vm has attribute infrastructure.ComputingNode->os Os1
 )
 ---
 "Virtual Machine {vm} has no iface"
	```"/>
+</commons:DOMLModel>