From 91242cf8bd2e29cdc3e22b090524320dd4cd5b30 Mon Sep 17 00:00:00 2001
From: erbel <johannes.erbel@cs.uni-goettingen.de>
Date: Mon, 21 Jan 2019 16:29:30 +0100
Subject: [PATCH] Adjusted Output
---
.../java/de/ugoe/cs/rwm/mocci/DownScaler.java | 22 ++-----------------
.../ugoe/cs/rwm/mocci/InitialDeployment.java | 1 -
.../java/de/ugoe/cs/rwm/mocci/UpScaler.java | 18 +++++++--------
3 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/DownScaler.java b/src/main/java/de/ugoe/cs/rwm/mocci/DownScaler.java
index 118c833..57468c2 100644
--- a/src/main/java/de/ugoe/cs/rwm/mocci/DownScaler.java
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/DownScaler.java
@@ -79,29 +79,16 @@ public class DownScaler extends AbsScaler {
}
for(Link link: linksToDelete) {
- System.out.println("Deleting: " + link);
- System.out.println(link);
EcoreUtil.delete(link);
}
-
-
- System.out.println(config.getResources());
-
- System.out.println("");
-
-
-
+
config.getResources().removeAll(resourcesToDelete);
for(org.eclipse.cmf.occi.core.Resource res: resourcesToDelete) {
- System.out.println(res);
EcoreUtil.delete(res);
}
Resource rM = runtimeModel;
- System.out.println(rM);
-
- System.out.println("");
- System.out.println(config.getResources());
+ MAPE.newComp = null;
CachedResourceSet.getCache().clear();
return rM;
@@ -126,7 +113,6 @@ public class DownScaler extends AbsScaler {
for(Link link: comp.getRlinks()) {
if(link.getSource() instanceof Component) {
- System.out.println(link);
resourcesToDelete.add(link.getSource());
linksToDelete.addAll(link.getSource().getLinks());
linksToDelete.addAll(link.getSource().getRlinks());
@@ -137,17 +123,13 @@ public class DownScaler extends AbsScaler {
}
for(Link link: comp.getLinks()) {
- System.out.println(link);
if(link instanceof Networkinterface) {
Networkinterface nwi = (Networkinterface) link;
- System.out.println(nwi.getAttributes());
for(MixinBase mixB: nwi.getParts()) {
if(mixB instanceof Ipnetworkinterface) {
- System.out.println(mixB);
Ipnetworkinterface ipnwi = (Ipnetworkinterface) mixB;
if(ipnwi.getOcciNetworkinterfaceAddress().startsWith("100.254.1")) {
interfaces.add(ipnwi.getOcciNetworkinterfaceAddress());
- System.out.println("Addin ip to interface list");
}
}
}
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/InitialDeployment.java b/src/main/java/de/ugoe/cs/rwm/mocci/InitialDeployment.java
index da69966..35ff940 100644
--- a/src/main/java/de/ugoe/cs/rwm/mocci/InitialDeployment.java
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/InitialDeployment.java
@@ -48,7 +48,6 @@ public class InitialDeployment {
System.out.println("Initial Deployment");
Path occiPath = getModelPath("de/ugoe/cs/rwm/mocci/occi/hadoopClusterNewExtWithMem.occic");
Resource model = ModelUtility.loadOCCIintoEMFResource(occiPath);
- System.out.println(model.getResourceSet().getResources());
Transformator trans = TransformatorFactory.getTransformator("OCCI2OCCI");
trans.transform(model, occiPath);
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/UpScaler.java b/src/main/java/de/ugoe/cs/rwm/mocci/UpScaler.java
index f90b1a6..bc2b854 100644
--- a/src/main/java/de/ugoe/cs/rwm/mocci/UpScaler.java
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/UpScaler.java
@@ -66,10 +66,10 @@ public class UpScaler extends AbsScaler {
Compute comp = iFactory.createCompute();
comp.setOcciComputeState(ComputeStatus.ACTIVE);
- AttributeState attr = factory.createAttributeState();
- attr.setName("occi.compute.state");
- attr.setValue("active");
- comp.getAttributes().add(attr);
+ AttributeState state = factory.createAttributeState();
+ state.setName("occi.compute.state");
+ state.setValue("active");
+ comp.getAttributes().add(state);
config.getResources().add(comp);
Ubuntu_xenialxerus mixOs = osFactory.createUbuntu_xenialxerus();
@@ -83,16 +83,16 @@ public class UpScaler extends AbsScaler {
mixB.setOcciNetworkinterfaceAddress(ip);
nwi.getParts().add(mixB);
AttributeState ipAttr = factory.createAttributeState();
- attr.setName("occi.networkinterface.address");
- attr.setValue(ip);
- nwi.getAttributes().add(attr);
+ ipAttr.setName("occi.networkinterface.address");
+ ipAttr.setValue(ip);
+ nwi.getAttributes().add(ipAttr);
String ipadjusted = ip.replace(".", "-");
comp.setTitle("hadoop-worker-additional-" + ipadjusted);
AttributeState hostname = factory.createAttributeState();
- attr.setName("occi.compute.hostname");
- attr.setValue("hadoop-worker-additional-" + ipadjusted);
+ hostname.setName("occi.compute.hostname");
+ hostname.setValue("hadoop-worker-additional-" + ipadjusted);
comp.getAttributes().add(hostname);
--
GitLab