proxsync 2.0.8__tar.gz → 2.1.0__tar.gz

{proxsync-2.0.8/proxsync.egg-info → proxsync-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxsync
-Version: 2.0.8
+Version: 2.1.0
 Summary: NetBox plugin for Proxmox VE inventory synchronization
 Author-email: lixiujie85 <lixiujie85@gmail.com>
 License-Expression: MIT

{proxsync-2.0.8 → proxsync-2.1.0/proxsync.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxsync
-Version: 2.0.8
+Version: 2.1.0
 Summary: NetBox plugin for Proxmox VE inventory synchronization
 Author-email: lixiujie85 <lixiujie85@gmail.com>
 License-Expression: MIT

{proxsync-2.0.8 → proxsync-2.1.0}/pve_sync.py

@@ -177,12 +177,32 @@ class OptimizedPVEToNetBoxSync:
 🔌 MAC 位址: {mac_address}
 ❌ 錯誤: {error_message}
 
-⚠️ 該網卡的 MAC 位址與另一台已同步的 VM 重複（通常是複製 VM 時未重新產生 MAC），
-   IP 位址仍會照常同步，但 MAC 關聯需要手動處理
+⚠️ 該網卡的 MAC 位址與另一台已同步的 VM 重複（通常是複製 VM 時未重新產生 MAC）
 """
         self.send_telegram_notification(message)
         print(f"📧 已發送 MAC 衝突通知: {vm_name} - {mac_address}")
 
+    def log_vm_sync_error(self, vm_name: str, vm_id: int, error_message: str):
+        error_info = {
+            'timestamp': time.strftime("%Y-%m-%d %H:%M:%S"),
+            'vm_name': vm_name,
+            'ip_address': f"vmid {vm_id}",
+            'error': error_message
+        }
+        self.error_log.append(error_info)
+        message = f"""
+🚨 <b>PVE-NetBox 同步 VM 失敗警告</b>
+
+📅 時間: {error_info['timestamp']}
+🖥️ 虛擬機: {vm_name} (vmid {vm_id})
+🔀 叢集: {self.cluster_name}
+❌ 錯誤: {error_message}
+
+⚠️ 此 VM 本次同步未完成，下次同步會自動重試
+"""
+        self.send_telegram_notification(message)
+        print(f"📧 已發送 VM 同步失敗通知: {vm_name} - {error_message}")
+
     def send_enhanced_summary(self):
         if not hasattr(self, 'stats'):
             return
@@ -657,7 +677,8 @@ class OptimizedPVEToNetBoxSync:
             return None
 
     # ---------- IP 分配（改進版） ----------
-    def assign_ip_to_interface(self, interface, ip_address: str, dns_name: str = None, is_vm_interface: bool = False) -> Optional[Any]:
+    def assign_ip_to_interface(self, interface, ip_address: str, dns_name: str = None,
+                                is_vm_interface: bool = False, owner_name: str = None) -> Optional[Any]:
         try:
             if '/' not in ip_address:
                 ip_with_prefix = f"{ip_address}/24"
@@ -705,16 +726,24 @@ class OptimizedPVEToNetBoxSync:
         except Exception as e:
             error_msg = str(e)
             print(f"      分配 IP 位址失敗 {ip_address}: {error_msg}")
-            if "Cannot reassign IP address while it is designated as the primary IP" in error_msg:
-                vm_name = "Unknown"
+            # Any IP assignment failure needs a human to look at it, not just the
+            # one specific "reassign primary IP" error — otherwise conflicts with a
+            # different underlying cause (VRF/prefix validation, overlapping range,
+            # etc.) fail silently with nothing but a stdout line.
+            owner = owner_name or "Unknown"
+            if owner == "Unknown":
                 try:
                     if is_vm_interface:
                         vm_info = self.nb_api.virtualization.interfaces.get(interface.id)
                         if vm_info and vm_info.virtual_machine:
-                            vm_name = vm_info.virtual_machine.name
-                except:
+                            owner = vm_info.virtual_machine.name
+                    else:
+                        dev_info = self.nb_api.dcim.interfaces.get(interface.id)
+                        if dev_info and dev_info.device:
+                            owner = dev_info.device.name
+                except Exception:
                     pass
-                self.log_ip_conflict_error(vm_name, ip_address, error_msg)
+            self.log_ip_conflict_error(owner, ip_address, error_msg)
             return None
 
     # ---------- 節點網路介面同步 ----------
@@ -770,7 +799,8 @@ class OptimizedPVEToNetBoxSync:
                     continue
             cidr = iface_data.get('cidr')
             if cidr:
-                self.assign_ip_to_interface(nb_iface, cidr, dns_name=f"{node_name}.local", is_vm_interface=False)
+                self.assign_ip_to_interface(nb_iface, cidr, dns_name=f"{node_name}.local",
+                                            is_vm_interface=False, owner_name=device.name)
 
     # ---------- 節點同步 ----------
     def sync_pve_nodes_to_netbox(self) -> Tuple[bool, Dict[str, Any], Dict]:
@@ -1046,7 +1076,8 @@ class OptimizedPVEToNetBoxSync:
                             prefix_len = ip_info['prefix']
                             full_addr = f"{ip_addr}/{prefix_len}"
                             ip_obj = self.assign_ip_to_interface(
-                                vm_interface, full_addr, f"{vm.name}.local", is_vm_interface=True
+                                vm_interface, full_addr, f"{vm.name}.local",
+                                is_vm_interface=True, owner_name=vm.name
                             )
                             if ip_obj and not primary_ip:
                                 primary_ip = ip_obj
@@ -1770,13 +1801,29 @@ class OptimizedPVEToNetBoxSync:
                                 print(f"  ✓ VM {original_vm_name} 電源狀態更新: {current_status} → {status}")
                         except Exception as e:
                             print(f"  ✗ 更新 VM {original_vm_name} 關聯失敗: {e}")
+                    # MAC/IP 衝突檢查不受增量同步影響：即使 PVE 配置沒變，仍要每次
+                    # 重新檢查介面的 MAC/IP 位址，衝突就再次通知，而不是只在第一次配置
+                    # 變更時才發現。process_vm_interfaces 本身是冪等的（已存在的 MAC/IP
+                    # 不會重複建立），所以在跳過分支呼叫它不會產生多餘的 NetBox 寫入。
+                    _, skip_primary_ip, _ = self.process_vm_interfaces(
+                        cached_vm, vm_config, agent_interfaces, mac_to_interface, device
+                    )
+                    if skip_primary_ip:
+                        try:
+                            current_primary_ip4_id = getattr(getattr(cached_vm, 'primary_ip4', None), 'id', None)
+                            if current_primary_ip4_id != skip_primary_ip.id:
+                                cached_vm.primary_ip4 = skip_primary_ip.id
+                                cached_vm.save()
+                        except Exception as e:
+                            print(f"  設定 VM 主 IP 失敗: {e}")
                     print(f"  ℹ️  VM {original_vm_name} 無配置變更，跳過同步")
                     if self.state_db:
                         try:
                             config_hash = compute_config_hash(vm_config, tag_names, network_interfaces)
                             memory = int(vm_config.get('memory', 0))
                             vcpus_save = int(vm_config.get('vcpus', vcpus))
-                            cur_ip = getattr(getattr(cached_vm, 'primary_ip4', None), 'address', None) or ''
+                            cur_ip = getattr(skip_primary_ip, 'address', None) \
+                                or getattr(getattr(cached_vm, 'primary_ip4', None), 'address', None) or ''
                             self.state_db.save_vm_config_snapshot(
                                 vm_id=int(vm_id), cluster_name=self.cluster_name, config_hash=config_hash,
                                 memory=memory, vcpus=vcpus_save, tags=tag_names,
@@ -1901,6 +1948,7 @@ class OptimizedPVEToNetBoxSync:
         except Exception as e:
             error_msg = str(e)
             print(f"  處理虛擬機失敗: {error_msg}")
+            self.log_vm_sync_error(original_vm_name, int(vm_id), error_msg)
             # 即使 NetBox 同步失敗，仍需更新 snapshot 的非 hash 欄位（vm_name, node,
             # disk_summary, description, tags, memory, vcpus），並保留舊 config_hash，
             # 使下一輪不重複發送漂移通知，同時 should_sync_vm() 仍會返回 True 繼續重試。

{proxsync-2.0.8 → proxsync-2.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "proxsync"
-version = "2.0.8"
+version = "2.1.0"
 description = "NetBox plugin for Proxmox VE inventory synchronization"
 readme = "README.md"
 requires-python = ">=3.10"