Merge pull request #31 from jestabro/interstitial-set

T7737: add analogue of configfs for config tree updates during commit

2 files changed, 59 insertions, 41 deletions

diff --git a/data/vycall.proto b/data/vycall.proto
index 0037aa7..9517217 100644
--- a/data/vycall.proto
+++ b/data/vycall.proto
@@ -12,10 +12,12 @@ message Call {
 
 message Commit {
     required string session_id = 1;
-    required bool dry_run = 4;
-    required bool atomic = 5;
-    required bool background = 6;
-
-    optional Status init = 7;
-    repeated Call calls = 8;
+    required int32 session_pid = 2;
+    required string sudo_user = 3;
+    required string user = 4;
+    required bool dry_run = 5;
+    required bool atomic = 6;
+    required bool background = 7;
+    optional Status init = 8;
+    repeated Call calls = 9;
 }
diff --git a/data/vyconf.proto b/data/vyconf.proto
index 30f95aa..0cd2883 100644
--- a/data/vyconf.proto
+++ b/data/vyconf.proto
@@ -13,17 +13,19 @@ message Request {
   }
 
   message SetupSession {
-    required int32 ClientPid = 1;
-    optional string ClientApplication = 2;
-    optional int32 OnBehalfOf = 3;
+    required int32 client_pid = 1;
+    optional string client_application = 2;
+    optional int32 on_behalf_of = 3;
+    optional string client_user = 4;
+    optional string client_sudo_user = 5;
   }
 
   message SessionOfPid {
-    required int32 ClientPid = 1;
+    required int32 client_pid = 1;
   }
 
-  message SessionUpdatePid {
-    required int32 ClientPid = 1;
+  message SessionExists {
+    optional int32 dummy = 1;
   }
 
   message GetConfig {
@@ -31,7 +33,7 @@ message Request {
   }
 
   message Teardown {
-    optional int32 OnBehalfOf = 1;
+    optional int32 on_behalf_of = 1;
   }
 
   message Validate {
@@ -40,11 +42,23 @@ message Request {
   }
 
   message Set {
-    repeated string Path = 1;
+    repeated string path = 1;
   }
 
   message Delete {
-    repeated string Path = 1;
+    repeated string path = 1;
+  }
+
+  message AuxSet {
+    repeated string path = 1;
+    required string script_name = 2;
+    optional string tag_value = 3;
+  }
+
+  message AuxDelete {
+    repeated string path = 1;
+    required string script_name = 2;
+    optional string tag_value = 3;
   }
 
   message Discard {
@@ -56,76 +70,76 @@ message Request {
   }
 
   message Rename {
-    repeated string EditLevel = 1;
-    required string From = 2;
-    required string To = 3;
+    repeated string edit_level = 1;
+    required string source = 2;
+    required string destination = 3;
   }
 
   message Copy {
-    repeated string EditLevel = 1;
-    required string From = 2;
-    required string To = 3;
+    repeated string edit_level = 1;
+    required string source = 2;
+    required string destination = 3;
   }
 
   message Comment {
-    repeated string Path = 1;
-    required string Comment = 2;
+    repeated string path = 1;
+    required string comment = 2;
   }
 
   message Commit {
-    optional bool Confirm = 1;
-    optional int32 ConfirmTimeout = 2;
-    optional string Comment = 3;
-    optional bool DryRun = 4;
+    optional bool confirm = 1;
+    optional int32 confirm_timeout = 2;
+    optional string comment = 3;
+    optional bool dry_run = 4;
   }
 
   message Rollback {
-    required int32 Revision = 1;
+    required int32 revision = 1;
   }
 
   message Load {
-    required string Location = 1;
+    required string location = 1;
     required bool cached = 2;
     optional ConfigFormat format = 3;
   }
 
   message Merge {
-    required string Location = 1;
+    required string location = 1;
     required bool destructive = 2;
     optional ConfigFormat format = 3;
   }
 
   message Save {
-    required string Location = 1;
+    required string location = 1;
     optional ConfigFormat format = 2;
   }
 
   message ShowConfig {
-    repeated string Path = 1;
+    repeated string path = 1;
     optional ConfigFormat format = 2;
   }
 
   message Exists {
-    repeated string Path = 1;
+    repeated string path = 1;
   }
 
   message GetValue {
-    repeated string Path = 1;
+    repeated string path = 1;
     optional OutputFormat output_format = 2;
   }
 
   message GetValues {
-    repeated string Path = 1;
+    repeated string path = 1;
     optional OutputFormat output_format = 2;
   }
 
   message ListChildren {
-    repeated string Path = 1;
+    repeated string path = 1;
     optional OutputFormat output_format = 2;
   }
 
   message RunOpMode {
-    repeated string Path = 1;
+    repeated string path = 1;
     optional OutputFormat output_format = 2;
   }
 
@@ -133,8 +147,8 @@ message Request {
   }
 
   message EnterConfigurationMode {
-    required bool Exclusive = 1;
-    required bool OverrideExclusive = 2;
+    required bool exclusive = 1;
+    required bool override_exclusive = 2;
   }
 
   message ExitConfigurationMode {
@@ -143,7 +157,7 @@ message Request {
   message ReloadReftree {
     // this is a temporary workaround for a bug with empty messages, and
     // will be removed when the issue is resolved
-    optional int32 OnBehalfOf = 1;
+    optional int32 on_behalf_of = 1;
   }
 
 
@@ -175,8 +189,10 @@ message Request {
     Discard discard = 25;
     SessionChanged session_changed = 26;
     SessionOfPid session_of_pid = 27;
-    SessionUpdatePid session_update_pid = 28;
+    SessionExists session_exists = 28;
     GetConfig get_config = 29;
+    AuxSet aux_set = 30;
+    AuxDelete aux_delete = 31;
   }
 }