diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/MAPE.java b/src/main/java/de/ugoe/cs/rwm/mocci/MAPE.java index b07b59a459460024c4ba45c022b72450553170fe..1cfc449e4b813124ecab5f1a42085b1325b431b6 100644 --- a/src/main/java/de/ugoe/cs/rwm/mocci/MAPE.java +++ b/src/main/java/de/ugoe/cs/rwm/mocci/MAPE.java @@ -40,7 +40,7 @@ public class MAPE { static MartExecutor executor = new MartExecutor(conn); static Resource runtimeModel; static Component newComp; - static int interval = 10000; + static int interval = 5000; /** * Making javadoc happy. diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/RegistryAndLoggerSetup.java b/src/main/java/de/ugoe/cs/rwm/mocci/RegistryAndLoggerSetup.java index 4b1adc9007b51ac0d5f12d1fdf0e16c0a51ac21f..3d80c677ee099e5f684c2acb4f18044510947eaa 100644 --- a/src/main/java/de/ugoe/cs/rwm/mocci/RegistryAndLoggerSetup.java +++ b/src/main/java/de/ugoe/cs/rwm/mocci/RegistryAndLoggerSetup.java @@ -14,10 +14,12 @@ package de.ugoe.cs.rwm.mocci; import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.eclipse.cmf.occi.core.OCCIPackage; +import org.eclipse.cmf.occi.core.util.OCCIResourceFactoryImpl; import org.eclipse.cmf.occi.core.util.OcciRegistry; import org.eclipse.cmf.occi.crtp.CrtpPackage; import org.eclipse.cmf.occi.docker.DockerPackage; import org.eclipse.cmf.occi.infrastructure.InfrastructurePackage; +import org.eclipse.emf.ecore.resource.Resource; import org.modmacao.ansibleconfiguration.AnsibleconfigurationPackage; import org.modmacao.occi.platform.PlatformPackage; import org.modmacao.placement.PlacementPackage; @@ -50,7 +52,7 @@ public class RegistryAndLoggerSetup { } private static void loggerSetup() { - Logger.getLogger(Transformator.class.getName()).setLevel(Level.INFO); + Logger.getLogger(Transformator.class.getName()).setLevel(Level.OFF); Logger.getLogger(Connector.class.getName()).setLevel(Level.OFF); Logger.getLogger(ModelRetriever.class.getName()).setLevel(Level.OFF); Logger.getLogger(Comparator.class.getName()).setLevel(Level.OFF); @@ -89,7 +91,7 @@ public class RegistryAndLoggerSetup { OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/openstack/swe#", OCCIPackage.class.getClassLoader().getResource("model/openstackruntime.occie").toString()); OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/placement#", - OCCIPackage.class.getClassLoader().getResource("model/placement.occie").toString()); + PlacementPackage.class.getClassLoader().getResource("model/placement.occie").toString()); OcciRegistry.getInstance().registerExtension("http://schemas.ogf.org/occi/infrastructure#", OCCIPackage.class.getClassLoader().getResource("model/Infrastructure.occie").toString()); OcciRegistry.getInstance().registerExtension("http://schemas.ogf.org/occi/core#", @@ -111,8 +113,9 @@ public class RegistryAndLoggerSetup { } System.out.println(OcciRegistry.getInstance().getFileURI("http://schemas.ugoe.cs.rwm/domain/workload#")); - // Registry.INSTANCE.getExtensionToFactoryMap().put("*", new - // OCCIResourceFactoryImpl()); + System.out.println(OcciRegistry.getInstance().getFileURI("http://schemas.modmacao.org/placement#")); + Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE; + reg.INSTANCE.getExtensionToFactoryMap().put("*", new OCCIResourceFactoryImpl()); } } diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java b/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java index 1bcc20ef029eb462e9c51625844278a38c4d4d09..45d0ef67b2497224588715e8d33630b2c51ba879 100644 --- a/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java +++ b/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java @@ -10,6 +10,7 @@ import org.apache.log4j.PropertyConfigurator; import org.eclipse.cmf.occi.core.OCCIPackage; import org.eclipse.cmf.occi.core.util.OcciRegistry; import org.eclipse.cmf.occi.crtp.CrtpPackage; +import org.eclipse.cmf.occi.docker.DockerPackage; import org.eclipse.cmf.occi.infrastructure.InfrastructurePackage; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; @@ -23,6 +24,7 @@ import de.ugoe.cs.rwm.docci.Deployer; import de.ugoe.cs.rwm.docci.ModelUtility; import de.ugoe.cs.rwm.docci.connector.Connector; import de.ugoe.cs.rwm.docci.executor.Executor; +import de.ugoe.cs.rwm.domain.workload.WorkloadPackage; import modmacao.ModmacaoPackage; import monitoring.MonitoringPackage; import openstackruntime.OpenstackruntimePackage; @@ -41,7 +43,13 @@ public class TestUtility { MonitoringPackage.eINSTANCE.eClass(); CrtpPackage.eINSTANCE.eClass(); PlatformPackage.eINSTANCE.eClass(); + WorkloadPackage.eINSTANCE.eClass(); + DockerPackage.eINSTANCE.eClass(); + OcciRegistry.getInstance().registerExtension("http://occiware.org/occi/docker#", + OCCIPackage.class.getClassLoader().getResource("model/docker.occie").toString()); + OcciRegistry.getInstance().registerExtension("http://schemas.ugoe.cs.rwm/domain/workload#", + OCCIPackage.class.getClassLoader().getResource("model/workload.occie").toString()); OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/occi/platform#", PlatformPackage.class.getClassLoader().getResource("model/platform.occie").toString());