generate better testing openvpn client configs in test/openvpn

diff --git a/lib/leap_cli/commands/test.rb b/lib/leap_cli/commands/test.rb
index dd505b6f3fbb3e1dbed6f4b2d7d61fb3f083514e..e895a5ec021391aceac0299a0b9a065709bb3c9d 100644 (file)
--- a/lib/leap_cli/commands/test.rb
+++ b/lib/leap_cli/commands/test.rb
@@ -24,8 +24,14 @@ module LeapCli; module Commands
 
   def generate_test_client_openvpn_config
     template = read_file! Path.find_file(:test_client_openvpn_template)
-    config = Util.erb_eval(template, binding)
-    write_file! :test_client_openvpn_config, config
+
+    ['production', 'testing', 'local'].each do |tag|
+      vpn_nodes = manager.nodes[:tags => tag][:services => 'openvpn']
+      if vpn_nodes.any?
+        config = Util.erb_eval(template, binding)
+        write_file! ('test_openvpn_'+tag).to_sym, config
+      end
+    end
   end
 
 end; end

diff --git a/lib/leap_cli/path.rb b/lib/leap_cli/path.rb
index bfd3c9a363955ada3a12c2e7ebc19ce023fcee87..7628628c8eccaa276114ea1e78a14e50aeaf676b 100644 (file)
--- a/lib/leap_cli/path.rb
+++ b/lib/leap_cli/path.rb
@@ -51,7 +51,9 @@ module LeapCli; module Path
     # testing files
     :test_client_key     => 'test/cert/client.key',
     :test_client_cert    => 'test/cert/client.crt',
-    :test_client_openvpn_config   => 'test/openvpn/client.ovpn',
+    :test_openvpn_production  => 'test/openvpn/production.ovpn',
+    :test_openvpn_testing     => 'test/openvpn/testing.ovpn',
+    :test_openvpn_local       => 'test/openvpn/local.ovpn',
     :test_client_openvpn_template => 'test/openvpn/client.ovpn.erb'
   }