working version

Author: debbabi

bin/cube-console-2.0.jar

@@ -2,6 +2,7 @@
 
 import fr.liglab.adele.cube.autonomicmanager.ArchetypeResolver;
 import fr.liglab.adele.cube.autonomicmanager.Communicator;
+import fr.liglab.adele.cube.autonomicmanager.ExternalInstancesHandler;
 import fr.liglab.adele.cube.autonomicmanager.RuntimeModelController;
 import fr.liglab.adele.cube.archetype.Archetype;
 import fr.liglab.adele.cube.metamodel.ManagedElement;
@@ -54,6 +55,8 @@ public interface AutonomicManager {
      */
     public ArchetypeResolver getArchetypeResolver();
 
+    public ExternalInstancesHandler getExternalInstancesHandler();
+
     public void addProperty(String name, String value);
 
     public String getProperty(String name);

bin/cube-rm-monitoring-extension-2.0.jar

@@ -34,7 +34,7 @@ public class Configuration {
     public static final String DEFAULT_HOST = "localhost";
     public static final long DEFAULT_PORT = 38000;
     public static final long DEFAULT_PULSE = 3000;
-    private static final long DEFAULT_KAINTERVAL = 5000;
+    private static final long DEFAULT_KAINTERVAL = 3000;
     private static final long DEFAULT_KARETRY = 1;
     public static final String DEFAULT_RESOLVER = "default-resolver";
     public static final String DEFAULT_COMMUNICATOR = "socket-communicator";

bin/cube-runtime-2.0.jar

@@ -0,0 +1,25 @@
+package fr.liglab.adele.cube.autonomicmanager;
+
+import java.util.List;
+
+/**
+ * Created by debbabi on 12/5/13.
+ */
+public interface ExternalInstancesHandler {
+
+    public void start();
+
+    public void stop();
+
+    public void destroy();
+
+    public void keepAliveReceived(String am);
+
+    public  void addExternalInstance(String uuid, String autonomicManagerUri);
+
+    public String getAutonomicManagerOfExternalInstance(String uuid) ;
+
+    public void removeExternalAutonomicManagerInstances(String agent_uri);
+
+    public List<String> getExternalAutonomicManagers();
+}

bin/cube-script-extension-2.0.jar

@@ -35,5 +35,9 @@ public interface RuntimeModel {
 
     void manage(String uuid);
 
+    public void removeReferencedElements(List<String> refs);
+
+    public void removeReferencedElement(String ref);
+
     void removeUnmanagedElements();
 }

src/cube-runtime/src/main/java/fr/liglab/adele/cube/AutonomicManager.java

@@ -1,7 +1,6 @@
 package fr.liglab.adele.cube.autonomicmanager;
 
 import fr.liglab.adele.cube.AutonomicManager;
-import fr.liglab.adele.cube.autonomicmanager.rmc.ExternalInstancesHandler;
 import fr.liglab.adele.cube.extensions.ManagedElementExtensionPoint;
 import fr.liglab.adele.cube.metamodel.*;
 
@@ -47,7 +46,7 @@ public interface RuntimeModelController {
     void addManagedElementFactory(ManagedElementExtensionPoint exp);
     void receiveMessage(CMessage msg);
     AutonomicManager getAutonomicManager();
-    ExternalInstancesHandler getExternalInstancesHandler();
+
 
 
     boolean removeManagedElement(String uuid);

src/cube-runtime/src/main/java/fr/liglab/adele/cube/Configuration.java

@@ -23,6 +23,7 @@
 import fr.liglab.adele.cube.Configuration;
 import fr.liglab.adele.cube.autonomicmanager.*;
 import fr.liglab.adele.cube.autonomicmanager.comm.CommunicatorImpl;
+import fr.liglab.adele.cube.autonomicmanager.life.ExternalInstancesHandlerImpl;
 import fr.liglab.adele.cube.autonomicmanager.me.MonitorExecutorImpl;
 import fr.liglab.adele.cube.autonomicmanager.resolver.ArchetypeResolverImpl;
 import fr.liglab.adele.cube.autonomicmanager.rmc.RuntimeModelCheckerImpl;
@@ -89,6 +90,8 @@ public class AutonomicManagerImpl implements AutonomicManager, Runnable {
      * Life Controller.
      */
     private LifeController lifeController;
+    private ExternalInstancesHandler externalInstancesHandler;
+
     private RuntimeModelChecker checker;
 
     /**
@@ -173,7 +176,7 @@ public AutonomicManagerImpl(AdministrationService admin, Configuration config) t
 
         // Life Controller
         this.lifeController = new LifeController(this);
-
+        externalInstancesHandler = new ExternalInstancesHandlerImpl(this);
         // __resolver
         this.resolver = new ArchetypeResolverImpl(this);
 
@@ -196,7 +199,7 @@ public void receiveMessage(CMessage msg) {
                                 } else if (msg.getObject().equalsIgnoreCase("runtimemodel")) {
                                     AutonomicManagerImpl.this.rmController.receiveMessage(msg);
                                 } else if (msg.getObject().equalsIgnoreCase("keepalive")) {
-                                    AutonomicManagerImpl.this.lifeController.keepAliveReceived(msg.getFrom());
+                                    AutonomicManagerImpl.this.externalInstancesHandler.keepAliveReceived(msg.getFrom());
                                 }
                             }
                         } else {
@@ -240,6 +243,10 @@ private void init() throws AutonomicManagerException {
 
     }
 
+    public ExternalInstancesHandler getExternalInstancesHandler() {
+        return externalInstancesHandler;
+    }
+
     private void addExtension(Extension ex) {
         if (ex != null) {
             extensions.add(ex);
@@ -359,11 +366,11 @@ public void start() {
         if (this.checker != null) {
             this.checker.start();
         }
-        /*
-        if (this.lifeController != null) {
-            this.lifeController.start();
+
+        if (this.externalInstancesHandler != null) {
+            this.externalInstancesHandler.start();
         }
-        */
+
     }
 
     public void stop() {
@@ -376,14 +383,15 @@ public void stop() {
         if (this.checker != null) {
             this.checker.stop();
         }
-        /*
-        if (this.lifeController != null) {
-            this.lifeController.stop();
+
+        if (this.externalInstancesHandler != null) {
+            this.externalInstancesHandler.stop();
         }
-        */
+
     }
 
     public void destroy() {
+        stop();
         System.out.println("[INFO] >>>>>>>>> destroying autonomic manager: " + uri.toString());
         this.working = false;
         this.destroyRequested = true;
@@ -395,10 +403,10 @@ public void destroy() {
             this.checker.destroy();
         }
 
-        /*
-        if (this.lifeController != null) {
-            this.lifeController.destroy();
-        }*/
+
+        if (this.externalInstancesHandler != null) {
+            this.externalInstancesHandler.destroy();
+        }
     }
 
     public ArchetypeResolver getArchetypeResolver() {