fixed file naming; added build_client method

vpngen.py

@@ -82,7 +82,7 @@ class VpnGen:
 
     def get_client_dir(self, vpn_name, client_name):
         base_dir = self.get_base_dir(vpn_name)
-        return "%sclients%s%s%s" % (base_dir, os.sep, client_name, os.sep)
+        return "%sclients%s%s-%s%s" % (base_dir, os.sep, client_name, vpn_name, os.sep)
 
     def get_client_config_path(self, vpn_name, client_name):
         client_dir = self.get_client_dir(vpn_name, client_name)
@@ -198,19 +198,6 @@ class VpnGen:
         if os.path.exists(client_dir):
             return VpnGenError.ClientAlreadyExists
 
-        client_default_config_path = self.get_client_default_config_path(vpn_name)
-        with open(client_default_config_path, "r") as f:
-            client_default_config = f.read()
-
-        variables['name'] = vpn_name
-        variables['client'] = client_name
-        for variable in variables:
-            client_default_config = client_default_config.replace("${%s}" % variable, variables[variable])
-
-        os.makedirs(client_dir)
-        with open(client_conf_file, "w") as f:
-            f.write(client_default_config)
-
         curdir = os.curdir
         easyrsadir = self.get_easy_rsa_dir(vpn_name)
         pkitool = self.get_pkitool_path(vpn_name)
@@ -224,16 +211,7 @@ class VpnGen:
 
         os.chdir(curdir)
 
-        files_paths = self.get_all_needed_files_paths(vpn_name, client_name)
-        for file_path in files_paths:
-            split = os.path.splitext(file_path)
-            dest = "%s%s-%s%s" % (client_dir, os.path.basename(split[0]), vpn_name, split[1])
-            shutil.copy(file_path, dest)
-
-        files_names = list(map(lambda file_path: os.path.basename(file_path), files_paths))
-
-        call(["tar", "cfj", self.get_client_tarball_path(vpn_name, client_name),
-              "-C", self.get_easy_rsa_key_dir(vpn_name)] + files_names)
+        self.build_client(vpn_name, client_name, variables)
 
         return VpnGenError.Success
 
@@ -249,3 +227,31 @@ class VpnGen:
     def rebuild_clients(self, vpn_name):
         base_dir = self.get_base_dir(vpn_name)
         return VpnGenError.Success
+
+    def build_client(self, vpn_name, client_name, variables):
+        client_dir = self.get_client_dir(vpn_name, client_name)
+        client_conf_file = self.get_client_config_path(vpn_name, client_name)
+        client_default_config_path = self.get_client_default_config_path(vpn_name)
+
+        with open(client_default_config_path, "r") as f:
+            client_default_config = f.read()
+
+        variables['name'] = vpn_name
+        variables['client'] = client_name
+        for variable in variables:
+            client_default_config = client_default_config.replace("${%s}" % variable, variables[variable])
+
+        os.makedirs(client_dir)
+        with open(client_conf_file, "w") as f:
+            f.write(client_default_config)
+
+        files_paths = self.get_all_needed_files_paths(vpn_name, client_name)
+        for file_path in files_paths:
+            split = os.path.splitext(file_path)
+            dest = "%s%s-%s%s" % (client_dir, os.path.basename(split[0]), vpn_name, split[1])
+            shutil.copy(file_path, dest)
+
+        files_names = list(map(lambda file_path: os.path.basename(file_path), files_paths))
+
+        call(["tar", "cfj", self.get_client_tarball_path(vpn_name, client_name),
+              "-C", self.get_easy_rsa_key_dir(vpn_name)] + files_names)