fixing bugs on the perform method of binary constraint resolvers

Author: debbabi

bin/cube-cilia-extension-2.0.jar

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

bin/cube-console-2.0.jar

@@ -68,7 +68,6 @@ 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) {
@@ -80,7 +79,6 @@ public boolean perform(ManagedElement me, String value) {
             }
             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) {

bin/cube-joram-extension-2.0.jar

@@ -68,13 +68,17 @@ public boolean perform(ManagedElement me, String value) {
             if (r == null) {
                 try {
                     r = me.addReference(Node.CORE_NODE_SCOPE, false);
-                    RuntimeModelController rmc = getExtension().getAutonomicManager().getRuntimeModelController();
-                    rmc.addReferencedElement(value, Scope.CORE_SCOPE_NODES, me.getUUID());
                 } catch (InvalidNameException e) {
                     e.printStackTrace();
                 }
             }
             r.addReferencedElement(value);
+            RuntimeModelController rmc = getExtension().getAutonomicManager().getRuntimeModelController();
+            try {
+                rmc.addReferencedElement(value, Scope.CORE_SCOPE_NODES, me.getUUID());
+            } catch (InvalidNameException e) {
+                e.printStackTrace();
+            }
             return true;
         }
         return false;

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

@@ -65,9 +65,6 @@ public boolean perform(ManagedElement me, String value) {
             if (r == null) {
                 try {
                     r = me.addReference(Component.CORE_COMPONENT_NODE, true);
-                    RuntimeModelController rmc = getExtension().getAutonomicManager().getRuntimeModelController();
-
-                    rmc.addReferencedElement(value, Node.CORE_NODE_COMPONENTS, me.getUUID());
 
                 } catch (InvalidNameException e) {
                     e.printStackTrace();
@@ -79,6 +76,12 @@ public boolean perform(ManagedElement me, String value) {
                 me.setAutonomicManager(amUri);
             }
             r.addReferencedElement(value);
+            RuntimeModelController rmc = getExtension().getAutonomicManager().getRuntimeModelController();
+            try {
+                rmc.addReferencedElement(value, Node.CORE_NODE_COMPONENTS, me.getUUID());
+            } catch (InvalidNameException e) {
+                e.printStackTrace();
+            }
             return true;
         }
         return false;