diff --git a/icgparser/doml/doml.ecore b/icgparser/doml/doml.ecore
index e8cc0d6e555f08f8fcf9b10522f40ffaecbcca7d..6a3f732a0620ef5ee80458ba003e9629f4f17017 100644
--- a/icgparser/doml/doml.ecore
+++ b/icgparser/doml/doml.ecore
@@ -26,12 +26,22 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="functionalRequirements"
upperBound="-1" eType="#//commons/Requirement" containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Property">
+ <eClassifiers xsi:type="ecore:EClass" name="Property" abstract="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" 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>
@@ -54,7 +64,6 @@
eType="#//infrastructure/InfrastructureElement"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Requirement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<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"/>
@@ -125,8 +134,6 @@
eType="#//infrastructure/ComputingNode" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="networks" upperBound="-1"
eType="#//infrastructure/VPC" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="secGroups" upperBound="-1"
- eType="#//infrastructure/SecurityGroup" 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"
@@ -135,6 +142,8 @@
eType="#//infrastructure/FunctionAsAService" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="credentials" upperBound="-1"
eType="#//infrastructure/Credentials" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="groups" upperBound="-1"
+ eType="#//infrastructure/ComputingGroup" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ComputingGroup" abstract="true" eSuperTypes="#//commons/DOMLElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="groupedNodes" upperBound="-1"
@@ -163,7 +172,7 @@
<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="addressRanges" upperBound="-1"
+ <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">
@@ -182,9 +191,9 @@
<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" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="memory" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
<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" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cpu" 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"/>
@@ -225,7 +234,8 @@
<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="host" eType="#//infrastructure/ComputingNode"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="hosts" upperBound="-1"
+ eType="#//infrastructure/ComputingNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Network" abstract="true" eSuperTypes="#//commons/DOMLElement">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="protocol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -253,7 +263,8 @@
</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="storage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <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" 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"/>
@@ -265,6 +276,8 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Credentials" abstract="true" eSuperTypes="#//commons/DOMLElement"/>
<eClassifiers xsi:type="ecore:EClass" name="KeyPair" eSuperTypes="#//infrastructure/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>
@@ -272,6 +285,21 @@
<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: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"
@@ -319,7 +347,7 @@
<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"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="maps" eType="#//infrastructure/AutoScalingGroup"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ExtConcreteElement" eSuperTypes="#//concrete/ConcreteElement #//commons/ExtensionElement"/>
</eSubpackages>
@@ -334,7 +362,17 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="nonfunctionalRequirements"
upperBound="-1" eType="#//commons/Requirement" containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="OptimizationSolution" eSuperTypes="#//commons/Configuration"/>
+ <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"
diff --git a/icgparser/doml/doml_old.ecore b/icgparser/doml/doml_old.ecore
new file mode 100644
index 0000000000000000000000000000000000000000..e8cc0d6e555f08f8fcf9b10522f40ffaecbcca7d
--- /dev/null
+++ b/icgparser/doml/doml_old.ecore
@@ -0,0 +1,349 @@
+<?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: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">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" 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="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="Deployment">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="component" lowerBound="1"
+ eType="#//application/ApplicationComponent"/>
+ <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="identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <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>
+ </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"/>
+ <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:EAttribute" name="configFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <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"/>
+ </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="networks" upperBound="-1"
+ eType="#//infrastructure/VPC" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="secGroups" upperBound="-1"
+ eType="#//infrastructure/SecurityGroup" 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="#//infrastructure/Credentials" containment="true"/>
+ </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/ComputingNode">
+ <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="deploymentNetwork" eType="#//infrastructure/Network"/>
+ <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="addressRanges" 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="#//infrastructure/ComputingGroup">
+ <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"/>
+ <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" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <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" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <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="#//infrastructure/Credentials"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="group" eType="#//infrastructure/ComputingGroup"
+ eOpposite="#//infrastructure/ComputingGroup/groupedNodes"/>
+ </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="Container" eSuperTypes="#//infrastructure/ComputingNode">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="generatedFrom" eType="#//infrastructure/ContainerImage"
+ eOpposite="#//infrastructure/ContainerImage/generatedContainers"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="host" eType="#//infrastructure/ComputingNode"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Network" abstract="true" 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"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="VPC" eSuperTypes="#//infrastructure/Network">
+ <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="storage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <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:EClass" name="Credentials" abstract="true" eSuperTypes="#//commons/DOMLElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="KeyPair" eSuperTypes="#//infrastructure/Credentials">
+ <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="#//infrastructure/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="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"/>
+ </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="OptimizationSolution" eSuperTypes="#//commons/Configuration"/>
+ <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/input_file_generated/ir.json b/input_file_generated/ir.json
index 51d42f2ba2862790ed0f12cf411dc060521120f2..5c701e47596b115bbfa6072c9d7a71da1f0cd5c9 100644
--- a/input_file_generated/ir.json
+++ b/input_file_generated/ir.json
@@ -3,11 +3,46 @@
"steps": [
{
"data": {
- "credentials": [
+ "computingGroup": [
{
- "algorithm": "RSA",
- "bits": 4096,
- "name": "ssh_key"
+ "cidr": [
+ "0.0.0.0/0"
+ ],
+ "fromPort": -1,
+ "kind": "EGRESS",
+ "name": "out_all",
+ "protocol": "-1",
+ "toPort": -1
+ },
+ {
+ "cidr": [
+ "0.0.0.0/0"
+ ],
+ "fromPort": 80,
+ "kind": "INGRESS",
+ "name": "http",
+ "protocol": "tcp",
+ "toPort": 80
+ },
+ {
+ "cidr": [
+ "0.0.0.0/0"
+ ],
+ "fromPort": 443,
+ "kind": "INGRESS",
+ "name": "https",
+ "protocol": "tcp",
+ "toPort": 443
+ },
+ {
+ "cidr": [
+ "0.0.0.0/0"
+ ],
+ "fromPort": 22,
+ "kind": "INGRESS",
+ "name": "ssh",
+ "protocol": "tcp",
+ "toPort": 22
}
],
"networks": [
@@ -39,11 +74,20 @@
},
"infra_element_name": "vm1",
"name": "concrete_vm",
- "ssh_key_file": "/home/user1/.ssh/openstack.key",
- "ssh_user": "ubuntu",
- "vm_flavor": "small",
- "vm_key_name": "user1",
- "vm_name": "nginx-host"
+ "os": "ubuntu-20.04.3",
+ "vm_Availability": 98,
+ "vm_Cost_Currency": 4.53,
+ "vm_Frequency_per_Core": 1500,
+ "vm_Instance_Storage": 40,
+ "vm_Memory": 0.5,
+ "vm_Optimized_for": "GEPU",
+ "vm_Region": "00EU",
+ "vm_Response_time_Virtual_Machine_Performance": 3,
+ "vm_Virtual_CPU_Cores": 1,
+ "vm_Zone": "IEEU",
+ "vm_flavor": "t2.nano",
+ "vm_provider_OU": "AMAZ",
+ "vm_public_IP_type": "IPV4"
}
]
},
diff --git a/output_file_example/nginx_openstack/ansible/config.yaml b/output_file_example/nginx_openstack/ansible/config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c5ca1ce28c5813eb4d537446288ad4da913c762f
--- /dev/null
+++ b/output_file_example/nginx_openstack/ansible/config.yaml
@@ -0,0 +1,5 @@
+---
+input: ~
+output: ~
+engine: ansible
+...
diff --git a/output_file_example/nginx_openstack/config.yaml b/output_file_example/nginx_openstack/config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ba7bee3769bb5e1f0c532d343d9bfb96e2163d8a
--- /dev/null
+++ b/output_file_example/nginx_openstack/config.yaml
@@ -0,0 +1,5 @@
+---
+iac:
+ - terraform
+ - ansible
+...
\ No newline at end of file
diff --git a/output_file_example/nginx_openstack/terraform/config.yaml b/output_file_example/nginx_openstack/terraform/config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..fb6f677bb489e5d73ccc2296f766b3ea4b6bfb1e
--- /dev/null
+++ b/output_file_example/nginx_openstack/terraform/config.yaml
@@ -0,0 +1,5 @@
+---
+input: ~
+output: ~
+engine: terraform
+...
diff --git a/output_file_example/nginx_openstack/terraform/main.tf b/output_file_example/nginx_openstack/terraform/main.tf
index c426a75ed3285675bfa7a8fc74a6d17659c18db8..a5517c0d31fde72b294c296dd6ce8100e65316c7 100644
--- a/output_file_example/nginx_openstack/terraform/main.tf
+++ b/output_file_example/nginx_openstack/terraform/main.tf
@@ -17,11 +17,6 @@ provider "openstack" {
insecure = true
}
-resource "openstack_compute_keypair_v2" "user_key" {
- name = "user1"
- public_key = var.ssh_key
-}
-
# Retrieve data
data "openstack_networking_network_v2" "external" {
name = "external"
@@ -35,21 +30,43 @@ data "openstack_networking_secgroup_v2" "default" {
name = "default"
tenant_id = data.openstack_identity_project_v3.test_tenant.id
}
+# Create virtual machine
+resource "openstack_compute_instance_v2" "nginx" {
+ name = "nginx-host"
+ image_name = "cirros"
+ flavor_name = "m1.tiny"
+ key_pair = openstack_compute_keypair_v2.user_key.name
+ network {
+ port = openstack_networking_port_v2.nginx.id
+ }
+}
-# Router creation. UUID external gateway
-resource "openstack_networking_router_v2" "generic" {
- name = "router-generic"
- external_network_id = data.openstack_networking_network_v2.external.id #External network id
+# Create ssh keys
+resource "openstack_compute_keypair_v2" "user_key" {
+ name = "user1"
+ public_key = var.ssh_key
}
-# Network creation
+# Create floating ip
+resource "openstack_networking_floatingip_v2" "nginx" {
+ pool = "external"
+
+}
+
+# Attach floating ip to instance
+resource "openstack_compute_floatingip_associate_v2" "nginx" {
+ floating_ip = openstack_networking_floatingip_v2.nginx.address
+ instance_id = openstack_compute_instance_v2.nginx.id
+}
+
+## Network
+
+# Create Network
resource "openstack_networking_network_v2" "generic" {
name = " "
}
-#### HTTP SUBNET ####
-
-# Subnet configuration
+# Create Subnet
resource "openstack_networking_subnet_v2" "nginx" {
name = "subnet-nginx"
network_id = openstack_networking_network_v2.generic.id
@@ -57,6 +74,24 @@ resource "openstack_networking_subnet_v2" "nginx" {
dns_nameservers = ["8.8.8.8", "8.8.8.4"]
}
+# Attach networking port
+resource "openstack_networking_port_v2" "nginx" {
+ name = "nginx"
+ network_id = openstack_networking_network_v2.generic.id
+ admin_state_up = true
+ security_group_ids = [
+ data.openstack_networking_secgroup_v2.default.id #default flavour id
+ ]
+ fixed_ip {
+ subnet_id = openstack_networking_subnet_v2.nginx.id
+ }
+}
+
+# Router creation. UUID external gateway
+resource "openstack_networking_router_v2" "generic" {
+ name = "router-generic"
+ external_network_id = data.openstack_networking_network_v2.external.id #External network id
+}
# Router interface configuration
resource "openstack_networking_router_interface_v2" "nginx" {
router_id = openstack_networking_router_v2.generic.id
@@ -84,40 +119,3 @@ resource "openstack_compute_secgroup_v2" "ssh" {
cidr = "0.0.0.0/0"
}
}
-
-#
-# Create instance
-#
-resource "openstack_compute_instance_v2" "nginx" {
- name = "nginx-host"
- image_name = "cirros"
- flavor_name = "m1.tiny"
- key_pair = openstack_compute_keypair_v2.user_key.name
- network {
- port = openstack_networking_port_v2.nginx.id
- }
-}
-
-# Create network port
-resource "openstack_networking_port_v2" "nginx" {
- name = "nginx"
- network_id = openstack_networking_network_v2.generic.id
- admin_state_up = true
- security_group_ids = [
- data.openstack_networking_secgroup_v2.default.id #default flavour id
- ]
- fixed_ip {
- subnet_id = openstack_networking_subnet_v2.nginx.id
- }
-}
-
-# Create floating ip
-resource "openstack_networking_floatingip_v2" "nginx" {
- pool = "external"
-}
-
-# Attach floating ip to instance
-resource "openstack_compute_floatingip_associate_v2" "nginx" {
- floating_ip = openstack_networking_floatingip_v2.nginx.address
- instance_id = openstack_compute_instance_v2.nginx.id
-}
diff --git a/output_files_generated/nginx_openstack/terraform/main.tf b/output_files_generated/nginx_openstack/terraform/main.tf
index 4b0f48d5433a21c675abb9dd9038a765c8c13e67..a85074e3f171f6dd4975e47be9a4a7b1ef2aea44 100644
--- a/output_files_generated/nginx_openstack/terraform/main.tf
+++ b/output_files_generated/nginx_openstack/terraform/main.tf
@@ -17,11 +17,6 @@ provider "openstack" {
insecure = true
}
-resource "openstack_compute_keypair_v2" "user_key" {
- name = "user1"
- public_key = var.ssh_key
-}
-
# Retrieve data
data "openstack_networking_network_v2" "external" {
name = "external"
@@ -37,9 +32,9 @@ data "openstack_networking_secgroup_v2" "default" {
}
# Create virtual machine
resource "openstack_compute_instance_v2" "vm1" {
- name = "nginx-host"
- image_name = "i1"
- flavor_name = "small"
+ name = ""
+ image_name = "ubuntu-20.04.3"
+ flavor_name = "t2.nano"
key_pair = openstack_compute_keypair_v2.ssh_key.name
network {
port = openstack_networking_port_v2.net1.id
@@ -48,8 +43,8 @@ resource "openstack_compute_instance_v2" "vm1" {
# Create ssh keys
resource "openstack_compute_keypair_v2" "ssh_key" {
- name = "ubuntu"
- public_key = "/home/user1/.ssh/openstack.key"
+ name = ""
+ public_key = ""
}
# Create floating ip
@@ -103,3 +98,47 @@ resource "openstack_networking_router_interface_v2" "net1_router_interface" {
subnet_id = openstack_networking_subnet_v2.net1_subnet.id
}
+resource "openstack_compute_secgroup_v2" "out_all" {
+ name = "out_all"
+ description = "Security group rule for port -1"
+ rule {
+ from_port = -1
+ to_port = -1
+ ip_protocol = "-1"
+ cidr = "0.0.0.0/0"
+ }
+}
+
+resource "openstack_compute_secgroup_v2" "http" {
+ name = "http"
+ description = "Security group rule for port 80"
+ rule {
+ from_port = 80
+ to_port = 80
+ ip_protocol = "tcp"
+ cidr = "0.0.0.0/0"
+ }
+}
+
+resource "openstack_compute_secgroup_v2" "https" {
+ name = "https"
+ description = "Security group rule for port 443"
+ rule {
+ from_port = 443
+ to_port = 443
+ ip_protocol = "tcp"
+ cidr = "0.0.0.0/0"
+ }
+}
+
+resource "openstack_compute_secgroup_v2" "ssh" {
+ name = "ssh"
+ description = "Security group rule for port 22"
+ rule {
+ from_port = 22
+ to_port = 22
+ ip_protocol = "tcp"
+ cidr = "0.0.0.0/0"
+ }
+}
+
diff --git a/templates/terraform/open_stack/init.tpl b/templates/terraform/open_stack/init.tpl
index 86341ab23d5fa08072d1221ee5613e9762b6793d..9b5464e9a122564aca63217639862c6a4928e2b0 100644
--- a/templates/terraform/open_stack/init.tpl
+++ b/templates/terraform/open_stack/init.tpl
@@ -17,11 +17,6 @@ provider "openstack" {
insecure = true
}
-resource "openstack_compute_keypair_v2" "user_key" {
- name = "user1"
- public_key = var.ssh_key
-}
-
# Retrieve data
data "openstack_networking_network_v2" "external" {
name = "external"
diff --git a/templates/terraform/open_stack/port_rule.tpl b/templates/terraform/open_stack/port_rule.tpl
index 1918f525102d35b2b093ee91e594d7b8bc11a1f9..0e54a7e0543d70b1021db34568d213c85589cbb3 100644
--- a/templates/terraform/open_stack/port_rule.tpl
+++ b/templates/terraform/open_stack/port_rule.tpl
@@ -1,14 +1,10 @@
resource "openstack_compute_secgroup_v2" "{{ name }}" {
name = "{{ name }}"
- description = "Security group rule for port {{ from_port }}-{{ to_port }}"
+ description = "Security group rule for port {{ fromPort }}"
rule {
from_port = {{ fromPort }}
to_port = {{ toPort }}
ip_protocol = "{{ protocol }}"
- cidr = [
- {% for range in addressRanges %}
- {{ range }},
- {% endfor %}
- ]
+ cidr = {% for range in cidr %}"{{ range }}"{% endfor %}
}
}
\ No newline at end of file
diff --git a/templates/terraform/open_stack/virtual_machine.tpl b/templates/terraform/open_stack/virtual_machine.tpl
index ffe03bc90bb13e9ff14113368377400e43909d67..9a3e8dc08c822209cbd70c6cc97d81c49c9290d2 100644
--- a/templates/terraform/open_stack/virtual_machine.tpl
+++ b/templates/terraform/open_stack/virtual_machine.tpl
@@ -1,7 +1,7 @@
# Create virtual machine
resource "openstack_compute_instance_v2" "{{ infra_element_name }}" {
name = "{{ vm_name }}"
- image_name = "{{ i1.name }}"
+ image_name = "{{ os }}"
flavor_name = "{{ vm_flavor }}"
key_pair = openstack_compute_keypair_v2.{{ credentials }}.name
network {