Adjusted Output

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");	
 						}
 					}
 				}

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);

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);