From e67d137d2c0f208613c58eefb3131dbfd82c8bf5 Mon Sep 17 00:00:00 2001
From: Simon Eismann <eismannsimon@googlemail.com>
Date: Thu, 10 Mar 2016 19:50:19 +0100
Subject: [PATCH] updated remaining models to work with Piotrs changes
---
BlueYonder/blueyonder.resourcelandscape | 16 +++++------
BlueYonder/predict.deployment | 10 +++----
SPECjEnterprise2010/specjent2010.deployment | 28 +++++++++----------
.../specjent2010.resourcelandscape | 28 +++++++++----------
4 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/BlueYonder/blueyonder.resourcelandscape b/BlueYonder/blueyonder.resourcelandscape
index d383768..8a209db 100644
--- a/BlueYonder/blueyonder.resourcelandscape
+++ b/BlueYonder/blueyonder.resourcelandscape
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="_FE29UEnuEeOWVc_o6w1CBw" name="ddc">
<consistsOf id="_zIwxkM_dEeWKS626lCi-9g" name="BYLAN">
- <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="_0KAMJc_dEeWKS626lCi-9g" name="desc2 DatabaseServer">
+ <containsComputeNodes id="_0KAMJc_dEeWKS626lCi-9g" name="desc2 DatabaseServer">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_1jK-gM_dEeWKS626lCi-9g" name="CPU" schedulingPolicy="PROCESSOR_SHARING" processingRate="2700.0">
<processingResourceType href="blueyonder.resourcetype#_wb33sEibEeOUHduTkzq26A"/>
<nrOfParProcUnits id="_2B460M_dEeWKS626lCi-9g" name="2" number="2"/>
@@ -10,8 +10,8 @@
<processingResourceType href="blueyonder.resourcetype#_2AqisCRlEeS6t8oIpPE2Zg"/>
<nrOfParProcUnits id="_ZiCb8NASEeWKS626lCi-9g" name="1" number="1"/>
</configSpec>
- </contains>
- <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="_SH9QANASEeWKS626lCi-9g" name="desc1 PredictionServerSlow">
+ </containsComputeNodes>
+ <containsComputeNodes id="_SH9QANASEeWKS626lCi-9g" name="desc1 PredictionServerSlow">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_1jK-gM_dEeWKS626lCi-9g1" name="CPU" schedulingPolicy="PROCESSOR_SHARING" processingRate="2700.0">
<processingResourceType href="blueyonder.resourcetype#_wb33sEibEeOUHduTkzq26A"/>
<nrOfParProcUnits id="_2B460M_dEeWKS626lCi-9g1" name="2" number="2"/>
@@ -20,8 +20,8 @@
<processingResourceType href="blueyonder.resourcetype#_2AqisCRlEeS6t8oIpPE2Zg"/>
<nrOfParProcUnits id="_ZiCb8NASEeWKS626lCi-9g1" name="1" number="1"/>
</configSpec>
- </contains>
- <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="_pMaDENASEeWKS626lCi-9g" name="desc3 GatewayServer">
+ </containsComputeNodes>
+ <containsComputeNodes id="_pMaDENASEeWKS626lCi-9g" name="desc3 GatewayServer">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_tPL8ANASEeWKS626lCi-9g" name="CPU" schedulingPolicy="PROCESSOR_SHARING" processingRate="4050.0">
<processingResourceType href="blueyonder.resourcetype#_wb33sEibEeOUHduTkzq26A"/>
<nrOfParProcUnits id="_4E0o0NASEeWKS626lCi-9g" name="8" number="8"/>
@@ -30,8 +30,8 @@
<processingResourceType href="blueyonder.resourcetype#_2AqisCRlEeS6t8oIpPE2Zg"/>
<nrOfParProcUnits id="__a6soNASEeWKS626lCi-9g" name="1" number="1"/>
</configSpec>
- </contains>
- <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="_BL_BoNATEeWKS626lCi-9g" name="desc4 PredictionServerFast">
+ </containsComputeNodes>
+ <containsComputeNodes id="_BL_BoNATEeWKS626lCi-9g" name="desc4 PredictionServerFast">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_HhFigNATEeWKS626lCi-9g" name="CPU" schedulingPolicy="PROCESSOR_SHARING" processingRate="4050.0">
<processingResourceType href="blueyonder.resourcetype#_wb33sEibEeOUHduTkzq26A"/>
<nrOfParProcUnits id="_Lrl0ENATEeWKS626lCi-9g" name="8" number="8"/>
@@ -40,6 +40,6 @@
<processingResourceType href="blueyonder.resourcetype#_2AqisCRlEeS6t8oIpPE2Zg"/>
<nrOfParProcUnits id="_QSdRgNATEeWKS626lCi-9g" name="1" number="1"/>
</configSpec>
- </contains>
+ </containsComputeNodes>
</consistsOf>
</resourcelandscape:DistributedDataCenter>
diff --git a/BlueYonder/predict.deployment b/BlueYonder/predict.deployment
index 86cb94c..393be61 100644
--- a/BlueYonder/predict.deployment
+++ b/BlueYonder/predict.deployment
@@ -4,22 +4,22 @@
<targetResourceLandscape href="blueyonder.resourcelandscape#_FE29UEnuEeOWVc_o6w1CBw"/>
<deploymentContexts id="_hRgeQNCwEeWQ75T-bDlPFQ" name="Allocation_Assembly_PredictionServer <PredictionServer> <PredictionServer>">
<assemblyContext href="predict.system#_skjf0NCwEeWQ75T-bDlPFQ"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="blueyonder.resourcelandscape#_SH9QANASEeWKS626lCi-9g"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="blueyonder.resourcelandscape#_SH9QANASEeWKS626lCi-9g"/>
</deploymentContexts>
<deploymentContexts id="_4xWh8NCyEeWQ75T-bDlPFQ" name="Allocation_Assembly_Database <Database> <Database>">
<assemblyContext href="predict.system#_xwgAQNCwEeWQ75T-bDlPFQ"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="blueyonder.resourcelandscape#_0KAMJc_dEeWKS626lCi-9g"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="blueyonder.resourcelandscape#_0KAMJc_dEeWKS626lCi-9g"/>
</deploymentContexts>
<deploymentContexts id="_87Ae8NCyEeWQ75T-bDlPFQ" name="Allocation_Assembly_GatewayServer <GatewayServer> <GatewayServer>">
<assemblyContext href="predict.system#_zU05wNCwEeWQ75T-bDlPFQ"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="blueyonder.resourcelandscape#_pMaDENASEeWKS626lCi-9g"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="blueyonder.resourcelandscape#_pMaDENASEeWKS626lCi-9g"/>
</deploymentContexts>
<deploymentContexts id="_AUMoUNCzEeWQ75T-bDlPFQ" name="Allocation_Assembly_ServiceCaller <ServiceCaller> <ServiceCaller>">
<assemblyContext href="predict.system#_0vxNwNCwEeWQ75T-bDlPFQ"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="blueyonder.resourcelandscape#_0KAMJc_dEeWKS626lCi-9g"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="blueyonder.resourcelandscape#_0KAMJc_dEeWKS626lCi-9g"/>
</deploymentContexts>
<deploymentContexts id="_FYrO0NCzEeWQ75T-bDlPFQ" name="Allocation_Assembly_PredictJobSplitter <PredictJobSplitter> <PredictJobSplitter>">
<assemblyContext href="predict.system#_3Q6U0NCwEeWQ75T-bDlPFQ"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="blueyonder.resourcelandscape#_0KAMJc_dEeWKS626lCi-9g"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="blueyonder.resourcelandscape#_0KAMJc_dEeWKS626lCi-9g"/>
</deploymentContexts>
</deployment:Deployment>
diff --git a/SPECjEnterprise2010/specjent2010.deployment b/SPECjEnterprise2010/specjent2010.deployment
index f3878b8..990cb67 100644
--- a/SPECjEnterprise2010/specjent2010.deployment
+++ b/SPECjEnterprise2010/specjent2010.deployment
@@ -4,58 +4,58 @@
<targetResourceLandscape href="specjent2010.resourcelandscape#_j-L_kFuDEeWXr89qK1HeXA"/>
<deploymentContexts id="_iF5G0GwOEeWxPr4eA8ksEw" name="datasource/mysql@i41pc158">
<assemblyContext href="specjent2010.system#AssemblyContext_datasource_mysql"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="specjent2010.resourcelandscape#_iFs5kGwOEeWxPr4eA8ksEw"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="specjent2010.resourcelandscape#_iFs5kGwOEeWxPr4eA8ksEw"/>
</deploymentContexts>
<deploymentContexts id="_89F9UmwPEeWXT6fe2tN28g" name="specj-mfg/specj-mfg@specj-mfgsupplier-1">
<assemblyContext href="specjent2010.system#_ZajCUH1cEeWxGJu5ZQdeGQ"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="specjent2010.resourcelandscape#_7svvwWwPEeWXT6fe2tN28g"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="specjent2010.resourcelandscape#_7svvwWwPEeWXT6fe2tN28g"/>
</deploymentContexts>
<deploymentContexts id="_89GkYGwPEeWXT6fe2tN28g" name="/specj-mfg/WorkOrderSessionService@specj-mfgsupplier-1">
<assemblyContext href="specjent2010.system#_q3U-EH1jEeWxGJu5ZQdeGQ"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="specjent2010.resourcelandscape#_7svvwWwPEeWXT6fe2tN28g"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="specjent2010.resourcelandscape#_7svvwWwPEeWXT6fe2tN28g"/>
</deploymentContexts>
<deploymentContexts id="_MXw7kGwQEeWNm_Ma13nxMA" name="FulfillOrderQueue@specj-fulfillorder-1">
<assemblyContext href="specjent2010.system#AssemblyContext_FulfillOrderQueue"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="specjent2010.resourcelandscape#_8wLisWwPEeWNm_Ma13nxMA"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="specjent2010.resourcelandscape#_8wLisWwPEeWNm_Ma13nxMA"/>
</deploymentContexts>
<deploymentContexts id="_Eg3QwmwQEeWXT6fe2tN28g" name="specj-supplier/specj-supplier@specj-mfgsupplier-1">
<assemblyContext href="specjent2010.system#_VZkRcH1iEeWxGJu5ZQdeGQ"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="specjent2010.resourcelandscape#_7svvwWwPEeWXT6fe2tN28g"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="specjent2010.resourcelandscape#_7svvwWwPEeWXT6fe2tN28g"/>
</deploymentContexts>
<deploymentContexts id="_Eg3Qw2wQEeWXT6fe2tN28g" name="BuyerQueue@specj-mfgsupplier-1">
<assemblyContext href="specjent2010.system#AssemblyContext_BuyerQueue"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="specjent2010.resourcelandscape#_7svvwWwPEeWXT6fe2tN28g"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="specjent2010.resourcelandscape#_7svvwWwPEeWXT6fe2tN28g"/>
</deploymentContexts>
<deploymentContexts id="_MXwUgmwQEeWNm_Ma13nxMA" name="specj-fulfillorder/specj-fulfillorder@specj-fulfillorder-1">
<assemblyContext href="specjent2010.system#_eBMZIH1jEeWxGJu5ZQdeGQ"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="specjent2010.resourcelandscape#_8wLisWwPEeWNm_Ma13nxMA"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="specjent2010.resourcelandscape#_8wLisWwPEeWNm_Ma13nxMA"/>
</deploymentContexts>
<deploymentContexts id="_MF2FJmwQEeWJhvNbj7xb_w" name="specj-order/specj-order@specj-order-1">
<assemblyContext href="specjent2010.system#_uLq5IH1iEeWxGJu5ZQdeGQ"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="specjent2010.resourcelandscape#_9Tnm8GwPEeWJhvNbj7xb_w"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="specjent2010.resourcelandscape#_9Tnm8GwPEeWJhvNbj7xb_w"/>
</deploymentContexts>
<deploymentContexts id="_FATl1GwQEeWXT6fe2tN28g" name="PurchaseOrderQueue@specj-mfgsupplier-1">
<assemblyContext href="specjent2010.system#AssemblyContext_PurchaseOrderQueue"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="specjent2010.resourcelandscape#_7svvwWwPEeWXT6fe2tN28g"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="specjent2010.resourcelandscape#_7svvwWwPEeWXT6fe2tN28g"/>
</deploymentContexts>
<deploymentContexts id="_MDpFsGwQEeWXT6fe2tN28g" name="LargeOrderQueue@specj-mfgsupplier-1">
<assemblyContext href="specjent2010.system#AssemblyContext_LargeOrderQueue"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="specjent2010.resourcelandscape#_7svvwWwPEeWXT6fe2tN28g"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="specjent2010.resourcelandscape#_7svvwWwPEeWXT6fe2tN28g"/>
</deploymentContexts>
<deploymentContexts id="_G5t-g2wQEeW0tqW9Tyn6MA" name="/specj/app@specj-web-1">
<assemblyContext href="specjent2010.system#AssemblyContext__specj_app"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="specjent2010.resourcelandscape#_9vtGAWwPEeW0tqW9Tyn6MA"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="specjent2010.resourcelandscape#_9vtGAWwPEeW0tqW9Tyn6MA"/>
</deploymentContexts>
<deploymentContexts id="_HCpRBmwQEeWH2qIjdveD6Q" name="specj-customer/specj-customer@specj-customer-1">
<assemblyContext href="specjent2010.system#_TdFhMH1jEeWxGJu5ZQdeGQ"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="specjent2010.resourcelandscape#_9c1NUWwPEeWH2qIjdveD6Q"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="specjent2010.resourcelandscape#_9c1NUWwPEeWH2qIjdveD6Q"/>
</deploymentContexts>
<deploymentContexts id="_I2NgYWwQEeWCYNLM2TRs5A" name="specj-itembrowser/specj-itembrowser@specj-itembrowser-1">
<assemblyContext href="specjent2010.system#_FPHmoH1jEeWxGJu5ZQdeGQ"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="specjent2010.resourcelandscape#_8qNdkWwPEeWCYNLM2TRs5A"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="specjent2010.resourcelandscape#_8qNdkWwPEeWCYNLM2TRs5A"/>
</deploymentContexts>
<deploymentContexts id="_LI9mJGwQEeWXT6fe2tN28g" name="ReceiveQueue@specj-mfgsupplier-1">
<assemblyContext href="specjent2010.system#AssemblyContext_ReceiveQueue"/>
- <resourceContainer xsi:type="resourcelandscape:ComputingInfrastructure" href="specjent2010.resourcelandscape#_7svvwWwPEeWXT6fe2tN28g"/>
+ <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="specjent2010.resourcelandscape#_7svvwWwPEeWXT6fe2tN28g"/>
</deploymentContexts>
</deployment:Deployment>
diff --git a/SPECjEnterprise2010/specjent2010.resourcelandscape b/SPECjEnterprise2010/specjent2010.resourcelandscape
index b366517..5099daf 100644
--- a/SPECjEnterprise2010/specjent2010.resourcelandscape
+++ b/SPECjEnterprise2010/specjent2010.resourcelandscape
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="_j-L_kFuDEeWXr89qK1HeXA" name="specjent2010">
<consistsOf id="_iFrEYGwOEeWxPr4eA8ksEw" name="default">
- <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="_iFs5kGwOEeWxPr4eA8ksEw" name="specj-database-1">
+ <containsComputeNodes id="_iFs5kGwOEeWxPr4eA8ksEw" name="specj-database-1">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_iFuuwGwOEeWxPr4eA8ksEw" name="cpu" schedulingPolicy="PROCESSOR_SHARING">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDvUwFiDEeWAC-JU0rDUdg"/>
<nrOfParProcUnits id="_iFvV0GwOEeWxPr4eA8ksEw" name="cpu" number="2"/>
@@ -10,8 +10,8 @@
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDxxAFiDEeWAC-JU0rDUdg"/>
<nrOfParProcUnits id="_eg54EH4gEeW6SfhJ5ch4Pg" name="delay"/>
</configSpec>
- </contains>
- <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="_7svvwWwPEeWXT6fe2tN28g" name="specj-mfgsupplier-1">
+ </containsComputeNodes>
+ <containsComputeNodes id="_7svvwWwPEeWXT6fe2tN28g" name="specj-mfgsupplier-1">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_7tOQ4GwPEeWXT6fe2tN28g" name="cpu" schedulingPolicy="PROCESSOR_SHARING">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDvUwFiDEeWAC-JU0rDUdg"/>
<nrOfParProcUnits id="_7tPfAGwPEeWXT6fe2tN28g" name="cpu" number="2"/>
@@ -20,8 +20,8 @@
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDxxAFiDEeWAC-JU0rDUdg"/>
<nrOfParProcUnits id="_jj8UIH4gEeW6SfhJ5ch4Pg" name="delay"/>
</configSpec>
- </contains>
- <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="_8qNdkWwPEeWCYNLM2TRs5A" name="specj-itembrowser-1">
+ </containsComputeNodes>
+ <containsComputeNodes id="_8qNdkWwPEeWCYNLM2TRs5A" name="specj-itembrowser-1">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_8qw3MGwPEeWCYNLM2TRs5A" name="cpu" schedulingPolicy="PROCESSOR_SHARING">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDvUwFiDEeWAC-JU0rDUdg"/>
<nrOfParProcUnits id="_8qzTcGwPEeWCYNLM2TRs5A" name="cpu" number="1"/>
@@ -30,8 +30,8 @@
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDxxAFiDEeWAC-JU0rDUdg"/>
<nrOfParProcUnits id="_mHDKEH4gEeW6SfhJ5ch4Pg" name="delay"/>
</configSpec>
- </contains>
- <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="_8wLisWwPEeWNm_Ma13nxMA" name="specj-fulfillorder-1">
+ </containsComputeNodes>
+ <containsComputeNodes id="_8wLisWwPEeWNm_Ma13nxMA" name="specj-fulfillorder-1">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_8w24IGwPEeWNm_Ma13nxMA" name="cpu" schedulingPolicy="PROCESSOR_SHARING">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDvUwFiDEeWAC-JU0rDUdg"/>
<nrOfParProcUnits id="_8w8XsGwPEeWNm_Ma13nxMA" name="cpu" number="1"/>
@@ -40,8 +40,8 @@
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDxxAFiDEeWAC-JU0rDUdg"/>
<nrOfParProcUnits id="_owJTQH4gEeW6SfhJ5ch4Pg" name="delay"/>
</configSpec>
- </contains>
- <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="_9Tnm8GwPEeWJhvNbj7xb_w" name="specj-order-1">
+ </containsComputeNodes>
+ <containsComputeNodes id="_9Tnm8GwPEeWJhvNbj7xb_w" name="specj-order-1">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_9T-zUGwPEeWJhvNbj7xb_w" name="cpu" schedulingPolicy="PROCESSOR_SHARING">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDvUwFiDEeWAC-JU0rDUdg"/>
<nrOfParProcUnits id="_9UCdsGwPEeWJhvNbj7xb_w" name="cpu" number="1"/>
@@ -50,8 +50,8 @@
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDxxAFiDEeWAC-JU0rDUdg"/>
<nrOfParProcUnits id="_vadPIH4gEeW6SfhJ5ch4Pg" name="delay"/>
</configSpec>
- </contains>
- <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="_9c1NUWwPEeWH2qIjdveD6Q" name="specj-customer-1">
+ </containsComputeNodes>
+ <containsComputeNodes id="_9c1NUWwPEeWH2qIjdveD6Q" name="specj-customer-1">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_9dKkgGwPEeWH2qIjdveD6Q" name="cpu" schedulingPolicy="PROCESSOR_SHARING">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDvUwFiDEeWAC-JU0rDUdg"/>
<nrOfParProcUnits id="_9dLLkGwPEeWH2qIjdveD6Q" name="cpu" number="1"/>
@@ -60,8 +60,8 @@
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDxxAFiDEeWAC-JU0rDUdg"/>
<nrOfParProcUnits id="_yoppcH4gEeW6SfhJ5ch4Pg" name="delay"/>
</configSpec>
- </contains>
- <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="_9vtGAWwPEeW0tqW9Tyn6MA" name="specj-web-1">
+ </containsComputeNodes>
+ <containsComputeNodes id="_9vtGAWwPEeW0tqW9Tyn6MA" name="specj-web-1">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_9wLAEGwPEeW0tqW9Tyn6MA" name="cpu" schedulingPolicy="PROCESSOR_SHARING">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDvUwFiDEeWAC-JU0rDUdg"/>
<nrOfParProcUnits id="_9wOqcGwPEeW0tqW9Tyn6MA" name="cpu" number="1"/>
@@ -70,6 +70,6 @@
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDxxAFiDEeWAC-JU0rDUdg"/>
<nrOfParProcUnits id="_2SO_QH4gEeW6SfhJ5ch4Pg" name="delay"/>
</configSpec>
- </contains>
+ </containsComputeNodes>
</consistsOf>
</resourcelandscape:DistributedDataCenter>
--
GitLab