Certain modifications

1. Move the keyManagement API to its own folder
2. Refactor the TcManagedParameters (and Srs3ManagedParameters) class to propagate the instance name down to the keyManagement service

distribution/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>distribution</artifactId>

examples/cascading/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>cascading</artifactId>

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.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>ccsds-frames</artifactId>

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.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>cfdp-udp</artifactId>

examples/cfdp/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>cfdp</artifactId>

examples/perftest1/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>perftest1</artifactId>

examples/perftest2/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>perftest2</artifactId>

examples/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <groupId>org.yamcs.examples</groupId>

examples/pus/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>pus</artifactId>

examples/replication1/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>replication1</artifactId>

examples/replication2/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>replication2</artifactId>

examples/replication3/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>replication3</artifactId>

examples/simulation/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>simulation</artifactId>

examples/snippets/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>snippets</artifactId>

examples/templates/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>templates</artifactId>

packet-viewer/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>packet-viewer</artifactId>

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.0-keym3</version>
+	<version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
 
 	<packaging>pom</packaging>
 

simulator/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>simulator</artifactId>

tests/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yamcs</groupId>
 		<artifactId>yamcs</artifactId>
-		<version>5.10.8-Pixxel-5.7.0-keym3</version>
+		<version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
 	</parent>
 
 	<artifactId>tests</artifactId>

yamcs-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>yamcs-api</artifactId>

yamcs-api/src/main/proto/yamcs/protobuf/instances/instances_service.proto

@@ -101,20 +101,6 @@ service InstancesApi {
       post: "/api/instances/{instance}:restart"
     };
   }
-
-  // Update any type of key of the instance
-  rpc UpdateKey(UpdateKeyRequest) returns (UpdateKeyResponse) {
-    option (yamcs.api.route) = {
-      post: "/api/instances/{instance}:updateKey"
-    };
-  }
-
-  // Get the key of a family of the instance
-  rpc GetActiveKey(ActiveKeyRequest) returns (ActiveKeyResponse) {
-    option (yamcs.api.route) = {
-        get: "/api/instances/activeKey/{instance}"
-    };
-  }
 }
 
 message ListInstancesRequest {
@@ -182,38 +168,3 @@ message RestartInstanceRequest {
   // Yamcs instance name.
   optional string instance = 1;
 }
-
-message UpdateKeyRequest{
-  // Yamcs instance name.
-  optional string instance = 1;
-
-  // Type of the key
-  required string keyFamily = 2;
-
-  // Key ID to be updated to
-  required string keyId = 3;
-}
-
-message UpdateKeyResponse {
-    optional string keyId = 1;
-}
-
-message ActiveKeyRequest {
-  // Yamcs instance name.
-  optional string instance = 1;
-
-  // Type of the key
-  optional string family = 2;
-}
-
-message ActiveKeyResponse {
-  // Yamcs instance name.
-  optional string instance = 1;
-
-  // KeyID
-  optional string keyId = 2;
-
-  // Type of the key
-  optional string family = 3;
-
-}

yamcs-api/src/main/proto/yamcs/protobuf/keymanagement/keymanagement.proto

@@ -0,0 +1,69 @@
+syntax="proto2";
+
+package yamcs.protobuf.instances;
+
+option java_package = "org.yamcs.protobuf";
+option java_outer_classname = "KeyManagmentServiceProto";
+option java_multiple_files = true;
+
+import "google/protobuf/empty.proto";
+
+import "yamcs/api/annotations.proto";
+
+service KeyManagmentApi {
+
+    // Update any type of key of the instance
+    rpc UpdateKey(UpdateKeyRequest) returns (UpdateKeyResponse) {
+        option (yamcs.api.route) = {
+            post: "/api/instances/{instance}:updateKey"
+        };
+    }
+
+    // Get the key of a family of the instance
+    rpc GetActiveKey(ActiveKeyRequest) returns (ActiveKeyResponse) {
+        option (yamcs.api.route) = {
+            get: "/api/instances/activeKey/{instance}"
+        };
+    }
+}
+
+message UpdateKeyRequest{
+    // Yamcs instance name.
+    optional string instance = 1;
+
+    // Type of the key
+    required string keyFamily = 2;
+
+    // Key ID to be updated to
+    required string keyId = 3;
+}
+
+message UpdateKeyResponse {
+    optional string keyId = 1;
+
+    // Type of the key
+    optional string keyFamily = 2;
+
+    // Error message
+    optional string error = 3;
+}
+
+message ActiveKeyRequest {
+    // Yamcs instance name.
+    optional string instance = 1;
+
+    // Type of the key
+    optional string family = 2;
+}
+
+message ActiveKeyResponse {
+    // Yamcs instance name.
+    optional string instance = 1;
+
+    // KeyID
+    optional string keyId = 2;
+
+    // Type of the key
+    optional string family = 3;
+
+}

yamcs-client/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>yamcs-client</artifactId>

yamcs-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.8-Pixxel-5.7.0-keym3</version>
+    <version>5.10.8-Pixxel-5.7.0-keySwarup4</version>
   </parent>
 
   <artifactId>yamcs-core</artifactId>

yamcs-core/src/main/java/org/yamcs/http/HttpServer.java

@@ -39,6 +39,7 @@
 import org.yamcs.http.api.IamApi;
 import org.yamcs.http.api.IndexesApi;
 import org.yamcs.http.api.InstancesApi;
+import org.yamcs.http.api.KeyManagementApi;
 import org.yamcs.http.api.LinksApi;
 import org.yamcs.http.api.MdbApi;
 import org.yamcs.http.api.MdbOverrideApi;
@@ -290,6 +291,7 @@ public void init(String yamcsInstance, String serviceName, YConfiguration config
         addApi(new IamApi(auditLog, tokenStore));
         addApi(new IndexesApi());
         addApi(new InstancesApi());
+        addApi(new KeyManagementApi());
         addApi(new LinksApi(auditLog));
         addApi(new MdbApi());
         addApi(new MdbOverrideApi());