rpc: avoid duplicating config in virtlockd/virtlogd augeas tests

Most of the augeas test files use ::CONFIG:: to pull in the master
config file for testing. This ensures that entries added to the config
file are actually tested by augeas.

This identified the missing admin_max_clients example in the virtlogd
config file, which in turn prompted a change in description of the
max_clients parameter, since these daemons don't have separate
readonly & readwrite sockets.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/locking/test_virtlockd.aug.in b/src/locking/test_virtlockd.aug.in
index 35095b403c35f3f01fa26009d13209a1c210ee2a..ad75286be688c66d47eb35124750836d11e2599f 100644 (file)
--- a/src/locking/test_virtlockd.aug.in
+++ b/src/locking/test_virtlockd.aug.in
@@ -1,14 +1,9 @@
 module Test_virtlockd =
-  let conf = "log_level = 3
-log_filters=\"3:remote 4:event\"
-log_outputs=\"3:syslog:libvirtd\"
-max_clients = 10
-admin_max_clients = 10
-"
+   ::CONFIG::
 
    test Virtlockd.lns get conf =
         { "log_level" = "3" }
         { "log_filters" = "3:remote 4:event" }
-        { "log_outputs" = "3:syslog:libvirtd" }
-        { "max_clients" = "10" }
-        { "admin_max_clients" = "10" }
+        { "log_outputs" = "3:syslog:virtlockd" }
+        { "max_clients" = "1024" }
+        { "admin_max_clients" = "5" }

diff --git a/src/locking/virtlockd.conf b/src/locking/virtlockd.conf
index 1b897973443b91c398726dd7e4112ad5459c51b5..1a2b27d0b9a792e450034cc762d32850c1b7c5bd 100644 (file)
--- a/src/locking/virtlockd.conf
+++ b/src/locking/virtlockd.conf
@@ -53,14 +53,12 @@
 #
 
 # The maximum number of concurrent client connections to allow
-# over all sockets combined.
+# on primary socket
 # Each running virtual machine will require one open connection
 # to virtlockd. So 'max_clients' will affect how many VMs can
 # be run on a host
 #max_clients = 1024
 
-# Same processing controls, but this time for the admin interface.
-# For description of each option, be so kind to scroll few lines
-# upwards.
-
+# The maximum number of concurrent client connections to allow
+# on administrative socket
 #admin_max_clients = 5

diff --git a/src/logging/test_virtlogd.aug.in b/src/logging/test_virtlogd.aug.in
index 1eaab7be9ff9ce1d2892927da4f1b640935e3909..744f3246afd52b29d1bbdebde7af7916e9271548 100644 (file)
--- a/src/logging/test_virtlogd.aug.in
+++ b/src/logging/test_virtlogd.aug.in
@@ -1,18 +1,11 @@
 module Test_virtlogd =
-  let conf = "log_level = 3
-log_filters=\"3:remote 4:event\"
-log_outputs=\"3:syslog:virtlogd\"
-max_clients = 10
-admin_max_clients = 10
-max_size = 131072
-max_backups = 3
-"
+   ::CONFIG::
 
    test Virtlogd.lns get conf =
         { "log_level" = "3" }
         { "log_filters" = "3:remote 4:event" }
         { "log_outputs" = "3:syslog:virtlogd" }
-        { "max_clients" = "10" }
-        { "admin_max_clients" = "10" }
-        { "max_size" = "131072" }
+        { "max_clients" = "1024" }
+        { "admin_max_clients" = "5" }
+        { "max_size" = "2097152" }
         { "max_backups" = "3" }

diff --git a/src/logging/virtlogd.conf b/src/logging/virtlogd.conf
index 7ef1ac324f43310ecb27f088b104a6d2c3d43efb..c22b7737effb270446a1b3f66d081526055b1906 100644 (file)
--- a/src/logging/virtlogd.conf
+++ b/src/logging/virtlogd.conf
@@ -55,9 +55,12 @@
 #
 
 # The maximum number of concurrent client connections to allow
-# over all sockets combined.
+# on primary socket
 #max_clients = 1024
 
+# The maximum number of concurrent client connections to allow
+# on administrative socket
+#admin_max_clients = 5
 
 # Maximum file size before rolling over. Defaults to 2 MB
 #max_size = 2097152