run parameters prototype

jar-connector/src/main/java/com/sixsq/slipstream/connector/CliConnectorBase.java

@@ -164,7 +164,7 @@ public void terminate(Run run, User user) throws SlipStreamException {
 
 		validateCredentials(user);
 
-		List<String> instanceIds = getCloudNodeInstanceIds(run);
+		List<String> instanceIds = getCloudNodeInstanceIds(run); //TODO KB extract ids for each cloud service for terminate
 		if(instanceIds.isEmpty()){
 			throw new SlipStreamClientException("There is no instances to terminate");
 		}

jar-connector/src/main/java/com/sixsq/slipstream/util/Terminator.java

@@ -25,7 +25,7 @@
 import com.sixsq.slipstream.persistence.Run;
 import com.sixsq.slipstream.persistence.User;
 import com.sixsq.slipstream.persistence.UserParameter;
-import com.sixsq.slipstream.statemachine.StateMachine;
+//import com.sixsq.slipstream.statemachine.StateMachine;
 import com.sixsq.slipstream.statemachine.States;
 
 public class Terminator {
@@ -44,7 +44,7 @@ public static int purge() throws ConfigurationException, ValidationException {
 				u = User.loadByName(u.getName());
 				int timeout = u.getTimeout();
 
-				List<Run> old = Run.listOldTransient(u, timeout);
+				List<Run> old = Run.listOldTransient(u, timeout); //TODO kb search for timeout on ssclj deployment
 				for (Run r : old) {
 					EntityManager em = PersistenceUtil.createEntityManager();
 					try {
@@ -68,7 +68,7 @@ public static int purge() throws ConfigurationException, ValidationException {
 	public static void purgeRun(Run run) throws SlipStreamException {
 		Run.abort("The run has timed out", run.getUuid());
 
-		boolean isGarbageCollected = Run.isGarbageCollected(run);
+		boolean isGarbageCollected = Run.isGarbageCollected(run); //TODO kb Garbage collected run
 		Run.setGarbageCollected(run);
 		run = run.store();
 
@@ -94,18 +94,20 @@ public static void terminate(String runResourceUri) throws SlipStreamException {
 		Run run = Run.load(runResourceUri, em);
 		User user = User.loadByName(run.getUser());
 
-		StateMachine sc = StateMachine.createStateMachine(run);
+		//StateMachine sc = StateMachine.createStateMachine(run);
 
-		if (sc.canCancel()) {
-			sc.tryAdvanceToCancelled();
-			terminateInstances(run, user);
-		} else {
-			if (sc.getState() == States.Ready) {
-				sc.tryAdvanceToFinalizing();
-			}
-			terminateInstances(run, user);
-			sc.tryAdvanceState(true);
-		}
+		//if (sc.canCancel()) {
+		//	sc.tryAdvanceToCancelled();
+		//	terminateInstances(run, user);
+		//} else {
+		//	if (sc.getState() == States.Ready) {
+		//		sc.tryAdvanceToFinalizing();
+		//	}
+		//	terminateInstances(run, user);
+		//	sc.tryAdvanceState(true);
+		//}
+
+		terminateInstances(run, user);
 
 		em.close();
 	}

jar-persistence/src/main/java/com/sixsq/slipstream/persistence/Deployment.java

@@ -0,0 +1,180 @@
+package com.sixsq.slipstream.persistence;
+
+import com.google.gson.annotations.SerializedName;
+import com.sixsq.slipstream.acl.TypePrincipal;
+import com.sixsq.slipstream.acl.TypePrincipalRight;
+import com.sixsq.slipstream.util.SscljProxy;
+import com.sixsq.slipstream.acl.ACL;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+public class Deployment {
+    private static final String DEPLOYMENT_RESOURCE = "api/deployment";
+
+    @SuppressWarnings("unused")
+    private String id;
+
+    @SuppressWarnings("unused")
+    @SerializedName("module-resource-uri")
+    private String moduleResourceUri;
+
+    @SuppressWarnings("unused")
+    private String type;
+
+    @SuppressWarnings("unused")
+    private String category;
+
+    @SuppressWarnings("unused")
+    private boolean mutable;
+
+    @SuppressWarnings("unused")
+    @SerializedName("keep-running")
+    private boolean keepRunning;
+
+    @SuppressWarnings("unused")
+    private ArrayList<String> tags;
+
+    @SuppressWarnings("unused")
+    private ACL acl;
+
+    @SuppressWarnings("unused")
+    private String state;
+
+    @SuppressWarnings("unused")
+    private HashMap<String, Node> nodes = new HashMap<>();
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setModuleResourceUri(String moduleResourceUri) {
+        this.moduleResourceUri = moduleResourceUri;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public void setMutable(boolean mutable) {
+        this.mutable = mutable;
+    }
+
+    public void setAcl(ACL acl) {
+        this.acl = acl;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public void setKeepRunning(boolean keepRunning) {
+        this.keepRunning = keepRunning;
+    }
+
+    public void setNodes(HashMap<String, Node> nodes) {
+        this.nodes = nodes;
+    }
+
+    public void setTags(ArrayList<String> tags) {
+        this.tags = tags;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getModuleResourceUri() {
+        return moduleResourceUri;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public boolean isMutable() {
+        return mutable;
+    }
+
+    public ACL getAcl() {
+        return acl;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public boolean isKeepRunning() {
+        return keepRunning;
+    }
+
+    public ArrayList<String> getTags() {
+        return tags;
+    }
+
+    public HashMap<String, Node> getNodes() {
+        return nodes;
+    }
+
+    class Node {
+        class Parameter {
+            String description;
+            String value;
+
+            Parameter (String value, String description) {
+                this.value = value;
+                this.description = description;
+            }
+        }
+        @SerializedName("runtime-parameters")
+        HashMap<String, Parameter> runtimeParameters = new HashMap<>();
+
+        Node (String nodeName, Run run) {
+            for (RuntimeParameter rp : run.getRuntimeParameters().values()) {
+                if (rp.getGroup().equals(nodeName)) {
+                    runtimeParameters.put(rp.getName(), new Parameter(rp.getValue(), rp.getDescription()));
+                }
+            }
+        }
+    }
+
+    public Deployment(Run run) {
+        this.id = "deployment/" + run.getUuid();
+        this.moduleResourceUri = run.getRefqname();
+        this.type = run.getType().name();
+        this.category = run.getCategory().name();
+        this.mutable = run.isMutable();
+        this.state = run.getState().name();
+
+        for (String nodeName: run.getNodeNamesList()) {
+            this.nodes.put(nodeName, new Node(nodeName, run));
+        }
+
+        try {
+            this.tags = new ArrayList<>(Arrays.asList(run.getRuntimeParameterValue("ss:tags").split(",")));
+        } catch (Exception ignored) { }
+
+        TypePrincipal owner = new TypePrincipal(TypePrincipal.PrincipalType.USER, run.getUser());
+        List<TypePrincipalRight> rules = new ArrayList<TypePrincipalRight>();
+        rules.add(new TypePrincipalRight(TypePrincipal.PrincipalType.USER, run.getUser(), TypePrincipalRight.Right.MODIFY));
+        this.acl = new ACL(owner, rules);
+    }
+
+    public String toJson() {
+        return SscljProxy.toJson(this);
+    }
+
+    public static void post(Deployment deployment) {
+        SscljProxy.post(DEPLOYMENT_RESOURCE, "internal ADMIN", deployment);
+    }
+}

jar-persistence/src/main/java/com/sixsq/slipstream/persistence/Run.java

@@ -128,7 +128,7 @@ public class Run extends Parameterized<Run, RunParameter> {
     private static final Set<States> STOP_ACCOUNTING_STATES = new HashSet<States>(Arrays.asList(STOP_VALUES));
 
 
-    public static Run abortOrReset(String abortMessage, String nodename,
+    public static Run abortOrReset(String abortMessage, String nodename, //TODO kb
                                    String uuid) {
         EntityManager em = PersistenceUtil.createEntityManager();
         EntityTransaction transaction = em.getTransaction();
@@ -142,7 +142,7 @@ public static Run abortOrReset(String abortMessage, String nodename,
         return run;
     }
 
-    public static Run abortOrReset(String abortMessage, String nodename,
+    public static Run abortOrReset(String abortMessage, String nodename,  //TODO kb
                                    EntityManager em, String uuid) {
 
         Run run = Run.loadFromUuid(uuid, em);
@@ -177,7 +177,7 @@ public static Run abortOrReset(String abortMessage, String nodename,
         return run;
     }
 
-    private static void setGlobalAbortState(String abortMessage,
+    private static void setGlobalAbortState(String abortMessage,  //TODO kb
                                             RuntimeParameter globalAbort) {
         globalAbort.setValue(abortMessage);
         globalAbort.store();
@@ -192,7 +192,7 @@ public static Run abort(String abortMessage, String uuid) {
         if (!globalAbort.isSet()) {
             setGlobalAbortState(abortMessage, globalAbort);
         }
-        if (run.state == States.Provisioning) {
+        if (run.state == States.Provisioning) {  //TODO kb recovery mode
             setRecoveryMode(run);
         }
         em.close();
@@ -210,7 +210,7 @@ private static String getNodeAbortKey(String nodeName) {
                 + RuntimeParameter.ABORT_KEY;
     }
 
-    private static RuntimeParameter getRecoveryModeParameter(Run run) {
+    private static RuntimeParameter getRecoveryModeParameter(Run run) {  //TODO kb
         return run.getRuntimeParameters().get(
                 RuntimeParameter.GLOBAL_RECOVERY_MODE_KEY);
     }
@@ -331,7 +331,7 @@ private static List<RunView> convertRunsToRunViews(List<Run> runs, Map<String, L
         return views;
     }
 
-    private static RunView convertRunToRunView(Run run, Map<String, Long> vmCountPerRun) {
+    private static RunView convertRunToRunView(Run run, Map<String, Long> vmCountPerRun) {  //TODO kb UI
 
         if (run == null) {
             return null;
@@ -480,7 +480,7 @@ public static List<Run> listOldTransient(User user) throws ConfigurationExceptio
     }
 
     @SuppressWarnings("unchecked")
-    public static List<Run> listOldTransient(User user, int timeout) throws ConfigurationException,
+    public static List<Run> listOldTransient(User user, int timeout) throws ConfigurationException, //TODO kb search for old  transient deployment on ssclj
             ValidationException {
         if (timeout <= 0) {
             timeout = DEFAULT_TIMEOUT;
@@ -1135,7 +1135,7 @@ public void addGroup(String group, String serviceName) {
     @Attribute
     @Column(length = 1024)
     public String getGroups() {
-        getRuntimeParameters().get(RuntimeParameter.GLOBAL_NODE_GROUPS_KEY).setValue(groups);
+        getRuntimeParameters().get(RuntimeParameter.GLOBAL_NODE_GROUPS_KEY).setInitValue(groups);
         return groups;
     }