Commit 65f42bdb authored by Kyriakos Kritikos's avatar Kyriakos Kritikos

Updates to code due to CAMEL updates

parent cb9f7b72
<?xml version="1.0" encoding="ASCII"?>
<metric:MetricModel
xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://www.paasage.eu/camel"
xmlns:metric="http://www.paasage.eu/camel/metric"
xmlns:unit="http://www.paasage.eu/camel/unit"
xsi:schemaLocation="http://www.paasage.eu/camel camel.ecore http://www.paasage.eu/camel/metric camel.ecore#//metric http://www.paasage.eu/camel/unit camel.ecore#//unit"
name="Basic Metric Model">
<metrics
xsi:type="metric:RawMetric"
name="RAW_AVAIL"
valueDirection="1"
unit="//@units.1"
property="//@properties.3"/>
<metrics
xsi:type="metric:CompositeMetric"
name="AVG_AVAIL"
valueDirection="1"
unit="//@units.1"
property="//@properties.3">
<formula
name="AVG_AVAIL_FORMULA"
function="MEAN"
parameters="//@metrics.0"/>
</metrics>
<metrics
xsi:type="metric:RawMetric"
name="RAW_CPU_UTILIZATION"
unit="//@units.1"
layer="IaaS"
property="//@properties.8"/>
<metrics
xsi:type="metric:CompositeMetric"
name="AVG_CPU_UTILIZATION"
unit="//@units.1"
layer="IaaS"
property="//@properties.8">
<formula
name="AVG_CPU_FORMULA"
function="MEAN"
parameters="//@metrics.2"/>
</metrics>
<metrics
xsi:type="metric:RawMetric"
name="RAW_MEMORY_UTILIZATION"
unit="//@units.1"
layer="IaaS"
property="//@properties.9"/>
<metrics
xsi:type="metric:CompositeMetric"
name="AVG_MEMORY_UTILIZATION"
unit="//@units.1"
layer="IaaS"
property="//@properties.9">
<formula
name="MEAN_MEMORY_FORMULA"
function="MEAN"
parameters="//@metrics.4"/>
</metrics>
<metrics
xsi:type="metric:RawMetric"
name="RAW_DISK_UTILIZATION"
unit="//@units.1"
layer="IaaS"
property="//@properties.10"/>
<metrics
xsi:type="metric:CompositeMetric"
name="AVG_DISK_UTILIZATION"
unit="//@units.1"
layer="IaaS"
property="//@properties.10">
<formula
name="AVG_DISK_FORMULA"
function="MEAN"
parameters="//@metrics.6"/>
</metrics>
<metrics
xsi:type="metric:RawMetric"
name="RAW_NETWORK_LATENCY"
unit="//@units.2"
layer="IaaS"
property="//@properties.7"/>
<metrics
xsi:type="metric:CompositeMetric"
name="AVG_NETWORK_LATENCY"
unit="//@units.2"
layer="IaaS"
property="//@properties.7">
<formula
name="AVG_NETWORK_LAT_FORMULA"
function="MEAN"
parameters="//@metrics.8"/>
</metrics>
<metrics
xsi:type="metric:RawMetric"
name="RAW_EXECUTION_TIME"
unit="//@units.2"
property="//@properties.5"/>
<metrics
xsi:type="metric:CompositeMetric"
name="AVG_EXECUTION_TIME"
unit="//@units.2"
property="//@properties.5">
<formula
name="AVG_ET_FORMULA"
function="MEAN"
parameters="//@metrics.10"/>
</metrics>
<metrics
xsi:type="metric:CompositeMetric"
name="RAW_RESPONSE_TIME"
unit="//@units.2"
property="//@properties.6">
<formula
name="RAW_RT_Formula"
functionArity="BINARY"
parameters="//@metrics.8 //@metrics.10"/>
</metrics>
<metrics
xsi:type="metric:CompositeMetric"
name="AVG_RESPONSE_TIME"
unit="//@units.2"
property="//@properties.6">
<formula
name="AVG_RT_FORMULA"
function="MEAN"
parameters="//@metrics.12"/>
</metrics>
<metrics
xsi:type="metric:RawMetric"
name="RAW_MTBF"
valueDirection="1"
unit="//@units.0"
property="//@properties.12"/>
<metrics
xsi:type="metric:CompositeMetric"
name="AVG_MTBF"
valueDirection="1"
unit="//@units.2"
property="//@properties.12">
<formula
name="AVG_MTBF_FORMULA"
function="MEAN"
parameters="//@metrics.14"/>
</metrics>
<metrics
xsi:type="metric:RawMetric"
name="RAW_THR"
valueDirection="1"
unit="//@units.3"
property="//@properties.11"/>
<metrics
xsi:type="metric:CompositeMetric"
name="AVG_THR"
valueDirection="1"
unit="//@units.3"
property="//@properties.11">
<formula
name="AVG_THR_FORMULA"
function="MEAN"
parameters="//@metrics.16"/>
</metrics>
<properties
name="COST"
subProperties="//@properties.1 //@properties.2 //@properties.4"/>
<properties
name="VM_COST"/>
<properties
name="IO_COST"/>
<properties
name="AVAILABILITY"
type="MEASURABLE"/>
<properties
name="STORAGE_COST"/>
<properties
name="EXECUTION TIME"
type="MEASURABLE"/>
<properties
name="RESPONSE TIME"
type="MEASURABLE"/>
<properties
name="NETWORK LATENCY"
type="MEASURABLE"/>
<properties
name="CPU UTILIZATION"
type="MEASURABLE"/>
<properties
name="MEMORY UTILIZATION"
type="MEASURABLE"/>
<properties
name="DISK UTILIZATION"
type="MEASURABLE"/>
<properties
name="THROUGHPUT"
type="MEASURABLE"/>
<properties
name="RELIABILITY"
type="MEASURABLE"/>
<units xsi:type="unit:TimeIntervalUnit"
name="months"
unit="MONTHS"/>
<units xsi:type="unit:Dimensionless"
name="percentage"
unit="PERCENTAGE"/>
<units xsi:type="unit:TimeIntervalUnit"
name="SECONDS"
unit="SECONDS"/>
<units xsi:type="unit:ThroughputUnit"
name="Requests per second"
unit="REQUESTS_PER_SECOND"/>
<units xsi:type="unit:MonetaryUnit"
name="euros"
unit="EUROS"/>
</metric:MetricModel>
<?xml version="1.0" encoding="ASCII"?>
<location:LocationModel
xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:location="http://www.paasage.eu/camel/location"
xsi:schemaLocation="http://www.paasage.eu/camel/location camel.ecore#//location"
name="Cloud Location Model">
<cloudLocations
id="Virtual Data Center">
<subLocations
id="1ff16f43-4a82-34bf-8f07-ea6d210548ab"
parent="//@cloudLocations.0"/>
<subLocations
id="e92bb306-72cd-33a2-a952-908db2f47e98"
parent="//@cloudLocations.0"/>
</cloudLocations>
<cloudLocations
id="Region One">
<subLocations
id="Availability Zone Nova"
parent="//@cloudLocations.1"/>
</cloudLocations>
</location:LocationModel>
<?xml version="1.0" encoding="ASCII"?>
<camel:CamelModel
xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://www.paasage.eu/camel"
xmlns:provider="http://www.paasage.eu/camel/provider"
xmlns:type="http://www.paasage.eu/camel/type"
xsi:schemaLocation="http://www.paasage.eu/camel camel.ecore http://www.paasage.eu/camel/provider camel.ecore#//provider http://www.paasage.eu/camel/type camel.ecore#//type"
name="Flexiant Camel Model">
<locationModels
name="Flexiant Location">
<countries
id="UK"
name="United Kingdom"/>
</locationModels>
<organisationModels
name="Flexiant Organisation Model">
<provider
name="Flexiant"
www="www.flexiant.com"
postalAddress="Flexiant Limited, Geddes House, Kirkton North, Livingston, EH54 6GU, UK"
email="contact@flexiant.com"
public="true"
PaaS="true"
IaaS="true"
providerModel="//@providerModels.0"/>
<dataCentres
name="Flexiant Data Centre"
codeName="flexiant"
location="//@locationModels.0/@countries.0"
cloudProvider="//@organisationModels.0/@provider"/>
</organisationModels>
<providerModels
name="Flexiant Provider Model">
<constraints
xsi:type="provider:Implies"
name="LOWEST_VM_Constraint_Mapping"
from="//@providerModels.0/@rootFeature"
to="//@providerModels.0/@rootFeature">
<attributeConstraints
from="//@providerModels.0/@rootFeature/@attributes.0"
to="//@providerModels.0/@rootFeature/@attributes.1">
<fromValue
xsi:type="type:StringValue"
value="LOWEST"/>
<toValue
xsi:type="type:IntValue"
value="512"/>
</attributeConstraints>
<attributeConstraints
from="//@providerModels.0/@rootFeature/@attributes.0"
to="//@providerModels.0/@rootFeature/@attributes.3">
<fromValue
xsi:type="type:StringValue"
value="LOWEST"/>
<toValue
xsi:type="type:IntValue"
value="1"/>
</attributeConstraints>
</constraints>
<constraints
xsi:type="provider:Implies"
name="LOWER_VM_Constraint_Mapping"
from="//@providerModels.0/@rootFeature"
to="//@providerModels.0/@rootFeature">
<attributeConstraints
from="//@providerModels.0/@rootFeature/@attributes.0"
to="//@providerModels.0/@rootFeature/@attributes.1">
<fromValue
xsi:type="type:StringValue"
value="LOWER"/>
<toValue
xsi:type="type:IntValue"
value="1024"/>
</attributeConstraints>
<attributeConstraints
from="//@providerModels.0/@rootFeature/@attributes.0"
to="//@providerModels.0/@rootFeature/@attributes.3">
<fromValue
xsi:type="type:StringValue"
value="LOWER"/>
<toValue
xsi:type="type:IntValue"
value="1"/>
</attributeConstraints>
</constraints>
<constraints
xsi:type="provider:Implies"
name="LOW_VM_Constraint_Mapping"
from="//@providerModels.0/@rootFeature"
to="//@providerModels.0/@rootFeature">
<attributeConstraints
from="//@providerModels.0/@rootFeature/@attributes.0"
to="//@providerModels.0/@rootFeature/@attributes.1">
<fromValue
xsi:type="type:StringValue"
value="LOW"/>
<toValue
xsi:type="type:IntValue"
value="2048"/>
</attributeConstraints>
<attributeConstraints
from="//@providerModels.0/@rootFeature/@attributes.0"
to="//@providerModels.0/@rootFeature/@attributes.3">
<fromValue
xsi:type="type:StringValue"
value="LOW"/>
<toValue
xsi:type="type:IntValue"
value="1"/>
</attributeConstraints>
</constraints>
<constraints
xsi:type="provider:Implies"
name="MEDIUM_VM_Constraint_Mapping"
from="//@providerModels.0/@rootFeature"
to="//@providerModels.0/@rootFeature">
<attributeConstraints
from="//@providerModels.0/@rootFeature/@attributes.0"
to="//@providerModels.0/@rootFeature/@attributes.1">
<fromValue
xsi:type="type:StringValue"
value="MEDIUM"/>
<toValue
xsi:type="type:IntValue"
value="2048"/>
</attributeConstraints>
<attributeConstraints
from="//@providerModels.0/@rootFeature/@attributes.0"
to="//@providerModels.0/@rootFeature/@attributes.3">
<fromValue
xsi:type="type:StringValue"
value="MEDIUM"/>
<toValue
xsi:type="type:IntValue"
value="2"/>
</attributeConstraints>
</constraints>
<constraints
xsi:type="provider:Implies"
name="HIGH_VM_Constraint_Mapping"
from="//@providerModels.0/@rootFeature"
to="//@providerModels.0/@rootFeature">
<attributeConstraints
from="//@providerModels.0/@rootFeature/@attributes.0"
to="//@providerModels.0/@rootFeature/@attributes.1">
<fromValue
xsi:type="type:StringValue"
value="HIGH"/>
<toValue
xsi:type="type:IntValue"
value="4096"/>
</attributeConstraints>
<attributeConstraints
from="//@providerModels.0/@rootFeature/@attributes.0"
to="//@providerModels.0/@rootFeature/@attributes.3">
<fromValue
xsi:type="type:StringValue"
value="HIGH"/>
<toValue
xsi:type="type:IntValue"
value="2"/>
</attributeConstraints>
</constraints>
<constraints
xsi:type="provider:Implies"
name="HIGHER_VM_Constraint_Mapping"
from="//@providerModels.0/@rootFeature"
to="//@providerModels.0/@rootFeature">
<attributeConstraints
from="//@providerModels.0/@rootFeature/@attributes.0"
to="//@providerModels.0/@rootFeature/@attributes.1">
<fromValue
xsi:type="type:StringValue"
value="HIGHER"/>
<toValue
xsi:type="type:IntValue"
value="4096"/>
</attributeConstraints>
<attributeConstraints
from="//@providerModels.0/@rootFeature/@attributes.0"
to="//@providerModels.0/@rootFeature/@attributes.3">
<fromValue
xsi:type="type:StringValue"
value="HIGHER"/>
<toValue
xsi:type="type:IntValue"
value="3"/>
</attributeConstraints>
</constraints>
<constraints
xsi:type="provider:Implies"
name="HIGHEST_VM_Constraint_Mapping"
from="//@providerModels.0/@rootFeature"
to="//@providerModels.0/@rootFeature">
<attributeConstraints
from="//@providerModels.0/@rootFeature/@attributes.0"
to="//@providerModels.0/@rootFeature/@attributes.1">
<fromValue
xsi:type="type:StringValue"
value="HIGHEST"/>
<toValue
xsi:type="type:IntValue"
value="4096"/>
</attributeConstraints>
<attributeConstraints
from="//@providerModels.0/@rootFeature/@attributes.0"
to="//@providerModels.0/@rootFeature/@attributes.3">
<fromValue
xsi:type="type:StringValue"
value="HIGHEST"/>
<toValue
xsi:type="type:IntValue"
value="4"/>
</attributeConstraints>
</constraints>
<rootFeature
name="VM">
<attributes
name="vmType"
valueType="//@typeModels.0/@dataTypes.1"/>
<attributes
name="vmMemory"
valueType="//@typeModels.0/@dataTypes.2"/>
<attributes
name="vmStorage"
valueType="//@typeModels.0/@dataTypes.3"/>
<attributes
name="vmCores"
valueType="//@typeModels.0/@dataTypes.4"/>
<attributes
name="vmOS"
valueType="//@typeModels.0/@dataTypes.0"/>
<featureCardinality
cardinalityMin="1"
cardinalityMax="8"
value="1"/>
</rootFeature>
</providerModels>
<typeModels
name="FlexiantTypeModel">
<dataTypes
xsi:type="type:Enumeration"
name="VM_OS_ENUMERATION">
<values
name="CentOS 6.2"/>
<values
value="1"
name="Ubuntu 12.04"/>
<values
value="2"
name="Ubuntu 14.04"/>
<values
value="3"
name="Windows 2008 R2"/>
</dataTypes>
<dataTypes
xsi:type="type:Enumeration"
name="VM_TYPE_ENUMERATION">
<values
name="LOWEST"/>
<values
value="1"
name="LOWER"/>
<values
value="2"
name="LOW"/>
<values
value="3"
name="MEDIUM"/>
<values
value="4"
name="HIGH"/>
<values
value="5"
name="HIGHER"/>
<values
value="6"
name="HIGHEST"/>
</dataTypes>
<dataTypes
xsi:type="type:Range"
name="MemoryRange">
<lowerLimit
included="true">
<value
xsi:type="type:IntValue"
value="512"/>
</lowerLimit>
<upperLimit
included="true">
<value
xsi:type="type:IntValue"
value="4096"/>
</upperLimit>
</dataTypes>
<dataTypes
xsi:type="type:Range"
name="StorageRange">
<lowerLimit
included="true">
<value
xsi:type="type:IntValue"
value="1"/>
</lowerLimit>
<upperLimit
included="true">
<value
xsi:type="type:IntValue"
value="1000"/>
</upperLimit>
</dataTypes>
<dataTypes
xsi:type="type:Range"
name="CoresRange">
<lowerLimit
included="true">
<value
xsi:type="type:IntValue"
value="1"/>
</lowerLimit>
<upperLimit
included="true">
<value
xsi:type="type:IntValue"
value="4"/>
</upperLimit>
</dataTypes>
</typeModels>
</camel:CamelModel>
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment