Răsfoiți Sursa

Add crypto options to augeas lense & add make check

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2727 fd59a12c-fef9-0310-b244-a6a79926bd2f
Angus Salkeld 16 ani în urmă
părinte
comite
b3a2952088
3 a modificat fișierele cu 17 adăugiri și 0 ștergeri
  1. 11 0
      Makefile.am
  2. 2 0
      conf/lenses/corosync.aug
  3. 4 0
      conf/lenses/tests/test_corosync.aug

+ 11 - 0
Makefile.am

@@ -71,6 +71,17 @@ uninstall-local:
 	rmdir $(DESTDIR)/${localstatedir}/lib/corosync || :;
 	rmdir $(DESTDIR)/${SOCKETDIR} || :;
 
+
+check_SCRIPTS = test_lense.sh
+TESTS = $(check_SCRIPTS)
+
+test_lense.sh:
+	echo "augparse -I $(srcdir)/conf/lenses/ $(srcdir)/conf/lenses/tests/test_corosync.aug" > $@
+	chmod +x $@
+
+CLEANFILES = test_lense.sh
+
+
 lint:
 	for dir in lcr lib exec services tools test; do make -C $$dir lint; done
 

+ 2 - 0
conf/lenses/corosync.aug

@@ -53,6 +53,8 @@ let totem =
     |kv "rrp_mode" /none|active|passive/
     |kv "vsftype" /none|ykd/
     |kv "secauth" /on|off/
+    |kv "crypto_type" /nss|sober/
+    |kv "crypto_accept" /new|old/
     |kv "transport" /udp|iba/
     |kv "version" Rx.integer
     |kv "nodeid" Rx.integer

+ 4 - 0
conf/lenses/tests/test_corosync.aug

@@ -6,6 +6,8 @@ compatibility: whitetank
 totem {
 	version: 2
 	secauth: off
+    crypto_type: nss
+    crypto_accept: new
 	threads: 0
     clear_node_high_bit: no
     rrp_mode: none
@@ -53,6 +55,8 @@ test Corosync.lns get conf =
   { "totem"
 	{ "version" = "2" }
 	{ "secauth" = "off" }
+	{ "crypto_type" = "nss" }
+	{ "crypto_accept" = "new" }
 	{ "threads" = "0" }
     { "clear_node_high_bit" = "no" }
     { "rrp_mode" = "none" }