Merge pull request #179 from pixxelhq/master

v5.10.9-Pixxel-5.7.2
pixxelhq · Dec 2, 2024 · 0437a08 · 0437a08
2 parents 48d7a2c + e377818
commit 0437a08
Show file tree

Hide file tree

Showing 147 changed files with 3,010 additions and 1,035 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,7 @@
+Version 5.10.9 released 1-Dec-2024
+- Add stack step to insert arbitrary text
+- Add stack step to insert telemetry verifications
+
 Version 5.10.8 released 21-Nov-2024
 - Bug fix in the parameter archive: when rebuilding intervals with gaps, the gaps would not be properly encoded, causing errors in retrieval.
   Implemented a consistency check which will inform if the parameter archive is corrupted and will suggest a rebuild of the specific interval.

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>distribution</artifactId>

diff --git a/examples/cascading/pom.xml b/examples/cascading/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>cascading</artifactId>

diff --git a/examples/ccsds-frames/pom.xml b/examples/ccsds-frames/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>ccsds-frames</artifactId>

diff --git a/examples/cfdp-udp/pom.xml b/examples/cfdp-udp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>cfdp-udp</artifactId>

diff --git a/examples/cfdp/pom.xml b/examples/cfdp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>cfdp</artifactId>

diff --git a/examples/perftest1/pom.xml b/examples/perftest1/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>perftest1</artifactId>

diff --git a/examples/perftest2/pom.xml b/examples/perftest2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>perftest2</artifactId>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <groupId>org.yamcs.examples</groupId>

diff --git a/examples/pus/pom.xml b/examples/pus/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>pus</artifactId>

diff --git a/examples/replication1/pom.xml b/examples/replication1/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>replication1</artifactId>

diff --git a/examples/replication2/pom.xml b/examples/replication2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>replication2</artifactId>

diff --git a/examples/replication3/pom.xml b/examples/replication3/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>replication3</artifactId>

diff --git a/examples/simulation/pom.xml b/examples/simulation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>simulation</artifactId>

diff --git a/examples/snippets/pom.xml b/examples/snippets/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>snippets</artifactId>

diff --git a/examples/templates/pom.xml b/examples/templates/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>templates</artifactId>

diff --git a/packet-viewer/pom.xml b/packet-viewer/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>packet-viewer</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.yamcs</groupId>
 	<artifactId>yamcs</artifactId>
-	<version>5.10.8-Pixxel-5.7.1</version>
+	<version>5.10.9-Pixxel-5.7.2</version>
 
 	<packaging>pom</packaging>
 

diff --git a/simulator/pom.xml b/simulator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>simulator</artifactId>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yamcs</groupId>
 		<artifactId>yamcs</artifactId>
-		<version>5.10.8-Pixxel-5.7.1</version>
+		<version>5.10.9-Pixxel-5.7.2</version>
 	</parent>
 
 	<artifactId>tests</artifactId>

diff --git a/yamcs-api/pom.xml b/yamcs-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>yamcs-api</artifactId>

diff --git a/yamcs-client/pom.xml b/yamcs-client/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>yamcs-client</artifactId>

diff --git a/yamcs-client/src/main/java/org/yamcs/client/base/WebSocketClient.java b/yamcs-client/src/main/java/org/yamcs/client/base/WebSocketClient.java
@@ -291,6 +291,9 @@ public Future<?> shutdown() {
         return group.shutdownGracefully(0, 5, TimeUnit.SECONDS);
     }
 
+    /**
+     * Returns true if the TCP connection is opened (even before the websocket handshake has been established FIXME) 
+     */
     public boolean isConnected() {
         return nettyChannel != null && nettyChannel.isOpen();
     }

diff --git a/yamcs-core/pom.xml b/yamcs-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.8-Pixxel-5.7.1</version>
+    <version>5.10.9-Pixxel-5.7.2</version>
   </parent>
 
   <artifactId>yamcs-core</artifactId>

diff --git a/yamcs-core/src/main/java/org/yamcs/activities/CommandStack.java b/yamcs-core/src/main/java/org/yamcs/activities/CommandStack.java
@@ -12,7 +12,7 @@
 
 public class CommandStack {
 
-    private List<StackedCommand> commands = new ArrayList<>();
+    private List<Step> steps = new ArrayList<>();
     private String acknowledgment = CommandHistoryPublisher.AcknowledgeQueued_KEY;
     private int waitTime = 0;
 
@@ -32,12 +32,12 @@ public void setWaitTime(int waitTime) {
         this.waitTime = waitTime;
     }
 
-    public void addCommand(StackedCommand command) {
-        commands.add(command);
+    public void addStep(Step step) {
+        steps.add(step);
     }
 
-    public List<StackedCommand> getCommands() {
-        return commands;
+    public List<Step> getSteps() {
+        return steps;
     }
 
     public static CommandStack fromJson(String json, Mdb mdb) throws CommandStackParseException {
@@ -63,21 +63,68 @@ public static CommandStack fromJson(String json, Mdb mdb) throws CommandStackPar
         if (stackObject.has("steps")) { // v2
             for (var stepEl : stackObject.getAsJsonArray("steps")) {
                 var stepObject = stepEl.getAsJsonObject();
-                if (stepObject.get("type").getAsString().equals("command")) {
+                var stepType = stepObject.get("type").getAsString();
+                if (stepType.equals("command")) {
                     var command = parseCommand(mdb, stepObject);
-                    stack.addCommand(command);
+                    stack.addStep(command);
+                } else if (stepType.equals("verify")) {
+                    var verify = parseVerify(mdb, stepObject);
+                    stack.addStep(verify);
                 }
             }
         } else if (stackObject.has("commands")) { // v1
             for (var commandEl : stackObject.getAsJsonArray("commands")) {
                 var command = parseCommand(mdb, commandEl.getAsJsonObject());
-                stack.addCommand(command);
+                stack.addStep(command);
             }
         }
 
         return stack;
     }
 
+    private static StackedVerify parseVerify(Mdb mdb, JsonObject verifyObject) throws CommandStackParseException {
+        var stackedVerify = new StackedVerify();
+
+        if (verifyObject.has("condition")) {
+            var comparisonsArray = verifyObject.get("condition").getAsJsonArray();
+            for (var comparisonEl : comparisonsArray) {
+                var comparisonObject = comparisonEl.getAsJsonObject();
+
+                var parameterName = comparisonObject.get("parameter").getAsString();
+                var parameter = mdb.getParameter(parameterName);
+                if (parameter == null) {
+                    throw new CommandStackParseException(
+                            "Parameter " + parameterName + " does not exist in MDB");
+                }
+
+                var operator = comparisonObject.get("operator").getAsString();
+
+                Object value;
+                var jsonValue = comparisonObject.get("value").getAsJsonPrimitive();
+                if (jsonValue.isBoolean()) {
+                    value = jsonValue.getAsBoolean();
+                } else if (jsonValue.isNumber()) {
+                    value = jsonValue.getAsNumber();
+                } else if (jsonValue.isString()) {
+                    value = jsonValue.getAsString();
+                } else {
+                    throw new CommandStackParseException("Unexpected comparand of class " + jsonValue.getClass());
+                }
+
+                stackedVerify.addComparison(parameter, operator, value);
+            }
+        }
+
+        if (verifyObject.has("delay")) {
+            stackedVerify.setDelay(verifyObject.get("delay").getAsLong());
+        }
+        if (verifyObject.has("timeout")) {
+            stackedVerify.setTimeout(verifyObject.get("timeout").getAsLong());
+        }
+
+        return stackedVerify;
+    }
+
     private static StackedCommand parseCommand(Mdb mdb, JsonObject commandObject) throws CommandStackParseException {
         var name = commandObject.get("name").getAsString();