fixing a bug in hasComponent and hasSourceComponent constraint resolvers

Author: debbabi

bin/cube-cilia-extension-2.0.jar

@@ -64,12 +64,17 @@ public boolean perform(ManagedElement me, String value) {
             if (r == null) {
                 try {
                     r = me.addReference(Component.CORE_COMPONENT_INPUTS, false);
-                    RuntimeModelController rmc = getExtension().getAutonomicManager().getRuntimeModelController();
-                    rmc.addReferencedElement(value, Component.CORE_COMPONENT_OUTPUTS, me.getUUID());
+
                 } catch (InvalidNameException e) {
                     e.printStackTrace();
                 }
             }
+            RuntimeModelController rmc = getExtension().getAutonomicManager().getRuntimeModelController();
+            try {
+                rmc.addReferencedElement(value, Component.CORE_COMPONENT_OUTPUTS, me.getUUID());
+            } catch (InvalidNameException e) {
+                e.printStackTrace();
+            }
             r.addReferencedElement(value);
             return true;
         }

bin/cube-console-2.0.jar

@@ -68,18 +68,24 @@ public boolean check(ManagedElement me, String value) {
     }
 
     public boolean perform(ManagedElement me, String value) {
+        System.out.println("\n@@@@@ ---> performing holdComponent between node "+me.getUUID()+" and component "+ value + "\n");
         if (me != null && value != null) {
             Reference r = me.getReference(Node.CORE_NODE_COMPONENTS);
             if (r == null) {
                 try {
                     r = me.addReference(Node.CORE_NODE_COMPONENTS, false);
-                    RuntimeModelController rmc = getExtension().getAutonomicManager().getRuntimeModelController();
-                    rmc.addReferencedElement(value, Component.CORE_COMPONENT_NODE, me.getUUID());
                 } catch (InvalidNameException e) {
                     e.printStackTrace();
                 }
             }
             r.addReferencedElement(value);
+            RuntimeModelController rmc = getExtension().getAutonomicManager().getRuntimeModelController();
+            System.out.println("\n@@@@@ ===> adding node "+me.getUUID()+" to component "+ value + "\n");
+            try {
+                rmc.addReferencedElement(value, Component.CORE_COMPONENT_NODE, me.getUUID());
+            } catch (InvalidNameException e) {
+                e.printStackTrace();
+            }
             return true;
         }
         return false;

bin/cube-joram-extension-2.0.jar

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<cube>
+  <autonomic-manager>
+    <host value="localhost"/>
+    <port value="38000"/>
+    <keepalive-retry value="2"/>
+	<keepalive-interval value="2000"/>
+	<debug value="false"/>
+    <archetypeUrl value="file:../test.arch"/>
+
+	<extensions>
+		<extension id="fr.liglab.adele.cube.core">
+			<property name="master" value="true"/>
+		</extension>	
+	</extensions>
+  </autonomic-manager>
+</cube>
+
+
+
+

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

@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<cube>
+  <autonomic-manager>
+    <host value="localhost"/>
+    <port value="38001"/>
+    <keepalive-retry value="2"/>
+	<keepalive-interval value="2000"/>
+	<debug value="true"/>
+    <archetypeUrl value="file:../test.arch"/>
+
+	<extensions>
+		<extension id="fr.liglab.adele.cube.core"/>
+		<extension id="fr.liglab.adele.cube.script">
+			<property name="1" value="newi node type=pc"/>
+		</extension>
+		<extension id="fr.liglab.adele.cube.rm.monitoring">
+			<property name="auto-refresh" value="false"/>
+		</extension>	
+	</extensions>
+  </autonomic-manager>
+</cube>
+
+
+
+