From 453d7f707f2ea5cbb813ce4be3564e39c56f9dbb Mon Sep 17 00:00:00 2001
From: Tommy Persson <tommmy.persson@liu.se>
Date: Fri, 16 Jul 2021 09:04:58 +0200
Subject: [PATCH] Cleaning up, adding TSTSetUuidFlag and removing other service
 definitions.

---
 CMakeLists.txt                                      | 13 ++++++++-----
 srv/TSTSetApprovedFlag.srv                          | 10 ----------
 srv/TSTSetContinueExecutorFlag.srv                  | 11 -----------
 srv/TSTSetEnoughExecutorFlag.srv                    | 11 -----------
 srv/TSTSetPauseExecutorFlag.srv                     | 11 -----------
 ...TSetAbortExecutorFlag.srv => TSTSetUuidFlag.srv} |  2 +-
 6 files changed, 9 insertions(+), 49 deletions(-)
 delete mode 100644 srv/TSTSetApprovedFlag.srv
 delete mode 100644 srv/TSTSetContinueExecutorFlag.srv
 delete mode 100644 srv/TSTSetEnoughExecutorFlag.srv
 delete mode 100644 srv/TSTSetPauseExecutorFlag.srv
 rename srv/{TSTSetAbortExecutorFlag.srv => TSTSetUuidFlag.srv} (62%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70860ac..44f154d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,7 +89,6 @@ TSTInitUniqueNodeId.srv
 TSTMakeLocalCopy.srv
 TSTRemoveNode.srv
 TSTRemoveNodeWaitForFinished.srv
-TSTSetApprovedFlag.srv
 TSTSetTreeApprovedFlag.srv
 TSTSetConstraints.srv
 TSTSetExecInfo.srv
@@ -108,10 +107,7 @@ TSTSetNodeParameterString.srv
 TSTSetNodeParameterStrings.srv
 TSTSetFailReason.srv
 TSTSetStartExecutorFlag.srv
-TSTSetAbortExecutorFlag.srv
-TSTSetPauseExecutorFlag.srv
-TSTSetContinueExecutorFlag.srv
-TSTSetEnoughExecutorFlag.srv
+TSTSetUuidFlag.srv
 TSTSetTree.srv
 TSTSetTreeStartTime.srv
 TSTSetNodeStartTime.srv
@@ -132,6 +128,13 @@ TSTContinueTree.srv
 TSTExpandNodeFromJson.srv
 )
 
+# TSTSetAbortExecutorFlag.srv
+# TSTSetPauseExecutorFlag.srv
+# TSTSetContinueExecutorFlag.srv
+# TSTSetEnoughExecutorFlag.srv
+# TSTSetApprovedFlag.srv
+
+
 ## Generate actions in the 'action' folder
 # add_action_files(
 #   FILES
diff --git a/srv/TSTSetApprovedFlag.srv b/srv/TSTSetApprovedFlag.srv
deleted file mode 100644
index 24c6c1e..0000000
--- a/srv/TSTSetApprovedFlag.srv
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Set the node flag approved to the value val.
-#
-
-string node_uuid   # Node uuid in the factory
-bool   val
----
-bool success
-int32 error
-string reason
diff --git a/srv/TSTSetContinueExecutorFlag.srv b/srv/TSTSetContinueExecutorFlag.srv
deleted file mode 100644
index 5209eec..0000000
--- a/srv/TSTSetContinueExecutorFlag.srv
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Set the node flag abort_executor to the value val.
-#
-
-string node_uuid   # Node uuid in the factory
-bool   val
----
-string com_uuid
-bool success
-int32 error
-string reason
diff --git a/srv/TSTSetEnoughExecutorFlag.srv b/srv/TSTSetEnoughExecutorFlag.srv
deleted file mode 100644
index 08f1e95..0000000
--- a/srv/TSTSetEnoughExecutorFlag.srv
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Set the node flag enough_executor to the value val.
-#
-
-string node_uuid   # Node uuid in the factory
-bool   val
----
-string com_uuid
-bool success
-int32 error
-string reason
diff --git a/srv/TSTSetPauseExecutorFlag.srv b/srv/TSTSetPauseExecutorFlag.srv
deleted file mode 100644
index 5209eec..0000000
--- a/srv/TSTSetPauseExecutorFlag.srv
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Set the node flag abort_executor to the value val.
-#
-
-string node_uuid   # Node uuid in the factory
-bool   val
----
-string com_uuid
-bool success
-int32 error
-string reason
diff --git a/srv/TSTSetAbortExecutorFlag.srv b/srv/TSTSetUuidFlag.srv
similarity index 62%
rename from srv/TSTSetAbortExecutorFlag.srv
rename to srv/TSTSetUuidFlag.srv
index 5209eec..1b8dedc 100644
--- a/srv/TSTSetAbortExecutorFlag.srv
+++ b/srv/TSTSetUuidFlag.srv
@@ -1,5 +1,5 @@
 #
-# Set the node flag abort_executor to the value val.
+# Set the node flag to the value val for node with node-uuid node_uuid.
 #
 
 string node_uuid   # Node uuid in the factory
-- 
GitLab