py-pve-cloud-backup 0.0.2__tar.gz → 0.0.4__tar.gz

{py_pve_cloud_backup-0.0.2 → py_pve_cloud_backup-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-pve-cloud-backup
-Version: 0.0.2
+Version: 0.0.4
 Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
 License-Expression: GPL-3.0-or-later
 Requires-Dist: proxmoxer==2.2.0

{py_pve_cloud_backup-0.0.2 → py_pve_cloud_backup-0.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "py-pve-cloud-backup"
-version = "0.0.2"
+version = "0.0.4"
 authors = [{ name = "Tobias Huebner", email = "tobias.huebner@vmzberlin.com" }]
 license = "GPL-3.0-or-later"
 license-files = ["LICENSE"]

{py_pve_cloud_backup-0.0.2 → py_pve_cloud_backup-0.0.4}/src/pve_cloud_backup/daemon/bdd.py

@@ -2,7 +2,7 @@ from tinydb import TinyDB
 import subprocess
 from pathlib import Path
 import logging
-from shared import IMAGE_META_DB_PATH, STACK_META_DB_PATH, BACKUP_DIR, copy_backup_generic, RBD_REPO_TYPES
+from pve_cloud_backup.daemon.shared import IMAGE_META_DB_PATH, STACK_META_DB_PATH, BACKUP_DIR, copy_backup_generic, RBD_REPO_TYPES
 import os
 from enum import Enum
 import asyncio

{py_pve_cloud_backup-0.0.2 → py_pve_cloud_backup-0.0.4}/src/pve_cloud_backup/daemon/brctl.py

@@ -2,7 +2,7 @@ import argparse
 import logging
 from kubernetes import client
 from kubernetes.config.kube_config import KubeConfigLoader
-import shared
+import pve_cloud_backup.daemon.shared as shared
 from proxmoxer import ProxmoxAPI
 from tinydb import TinyDB, Query
 from pprint import pformat

{py_pve_cloud_backup-0.0.2 → py_pve_cloud_backup-0.0.4}/src/pve_cloud_backup/fetcher/funcs.py

@@ -10,7 +10,7 @@ import os
 from pprint import pformat
 from kubernetes import client
 from kubernetes.config.kube_config import KubeConfigLoader
-import net
+import pve_cloud_backup.fetcher.net as net
 import asyncio
 
 
@@ -124,26 +124,30 @@ def get_vm_configs(metas, pkey):
     ssh = paramiko.SSHClient()
     ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
   
-    ssh.connect(host_ip, username="root", pkey=pkey)
-  
-    for meta in metas:
-      sftp = ssh.open_sftp()
+    try:
+      ssh.connect(host_ip, username="root", pkey=pkey)
+    
+      for meta in metas:
+        sftp = ssh.open_sftp()
 
-      vmid = meta["vmid"]
+        vmid = meta["vmid"]
 
-      if meta["type"] == "lxc":
-        config_path = f"/etc/pve/lxc/{vmid}.conf"
-      elif meta["type"] == "qemu":
-        config_path = f"/etc/pve/qemu-server/{vmid}.conf"
-      
-      with sftp.open(config_path, "r") as file:
-        config = file.read() 
-      
-      sftp.close()
+        if meta["type"] == "lxc":
+          config_path = f"/etc/pve/lxc/{vmid}.conf"
+        elif meta["type"] == "qemu":
+          config_path = f"/etc/pve/qemu-server/{vmid}.conf"
+        
+        with sftp.open(config_path, "r") as file:
+          config = file.read() 
+        
+        sftp.close()
 
-      vm_conf_map[vmid] = base64.b64encode(config).decode("utf-8")
+        vm_conf_map[vmid] = base64.b64encode(config).decode("utf-8")
 
-    ssh.close()
+    except TimeoutError as e:
+      logger.error(f"error connecting to vm {host_ip} vm {e}")
+    finally:
+      ssh.close()
 
   return vm_conf_map
 

{py_pve_cloud_backup-0.0.2 → py_pve_cloud_backup-0.0.4}/src/pve_cloud_backup/fetcher/git.py

@@ -3,7 +3,7 @@ import shutil
 import subprocess
 import tarfile
 import logging
-from net import archive
+from pve_cloud_backup.fetcher.net import archive
 
 
 logger = logging.getLogger("fetcher")

{py_pve_cloud_backup-0.0.2 → py_pve_cloud_backup-0.0.4}/src/pve_cloud_backup/fetcher/main.py

@@ -1,8 +1,8 @@
 from datetime import datetime
 import logging
-import funcs
-from nextcloud import backup_nextcloud
-from git import backup_git
+import pve_cloud_backup.fetcher.funcs as funcs
+from pve_cloud_backup.fetcher.nextcloud import backup_nextcloud
+from pve_cloud_backup.fetcher.git import backup_git
 from proxmoxer import ProxmoxAPI
 import os
 import yaml

{py_pve_cloud_backup-0.0.2 → py_pve_cloud_backup-0.0.4}/src/pve_cloud_backup/fetcher/nextcloud.py

@@ -2,7 +2,7 @@ import requests
 from requests.auth import HTTPBasicAuth
 import os
 import logging
-from net import archive
+from pve_cloud_backup.fetcher.net import archive
 
 
 logger = logging.getLogger("fetcher")

{py_pve_cloud_backup-0.0.2 → py_pve_cloud_backup-0.0.4}/src/py_pve_cloud_backup.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-pve-cloud-backup
-Version: 0.0.2
+Version: 0.0.4
 Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
 License-Expression: GPL-3.0-or-later
 Requires-Dist: proxmoxer==2.2.0

{py_pve_cloud_backup-0.0.2 → py_pve_cloud_backup-0.0.4}/src/py_pve_cloud_backup.egg-info/SOURCES.txt

@@ -1,10 +1,8 @@
 README.md
 pyproject.toml
-src/pve_cloud_backup/daemon/__init__.py
 src/pve_cloud_backup/daemon/bdd.py
 src/pve_cloud_backup/daemon/brctl.py
 src/pve_cloud_backup/daemon/shared.py
-src/pve_cloud_backup/fetcher/__init__.py
 src/pve_cloud_backup/fetcher/funcs.py
 src/pve_cloud_backup/fetcher/git.py
 src/pve_cloud_backup/fetcher/main.py