clonebox 1.1.11__tar.gz → 1.1.13__tar.gz

{clonebox-1.1.11/src/clonebox.egg-info → clonebox-1.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 1.1.11
+Version: 1.1.13
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0

{clonebox-1.1.11 → clonebox-1.1.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "clonebox"
-version = "1.1.11"
+version = "1.1.13"
 description = "Clone your workstation environment to an isolated VM with selective apps, paths and services"
 readme = "README.md"
 license = {text = "Apache-2.0"}

{clonebox-1.1.11 → clonebox-1.1.13}/src/clonebox/cli.py

@@ -1825,23 +1825,37 @@ def cmd_test(args):
     # Test 4: Check mounts (if running)
     if not quick and state == "running":
         console.print("[bold]4. Mount Points Check[/]")
-        all_paths = config.get("paths", {}).copy()
-        all_paths.update(config.get("app_data_paths", {}))
+        paths = config.get("paths", {})
+        app_data_paths = config.get("app_data_paths", {})
 
-        if all_paths:
+        if paths or app_data_paths:
             if not _qga_ping(vm_name, conn_uri):
                 console.print("[yellow]⚠️  QEMU guest agent not connected - cannot verify mounts[/]")
             else:
-                for idx, (host_path, guest_path) in enumerate(all_paths.items()):
+                # Check bind mounts
+                for idx, (host_path, guest_path) in enumerate(paths.items()):
                     try:
                         # Use the same QGA helper as diagnose/status
                         is_accessible = _qga_exec(
                             vm_name, conn_uri, f"test -d {guest_path} && echo yes || echo no", timeout=5
                         )
                         if is_accessible == "yes":
-                            console.print(f"[green]✅ {guest_path}[/]")
+                            console.print(f"[green]✅ {guest_path} (mount)[/]")
+                        else:
+                            console.print(f"[red]❌ {guest_path} (mount inaccessible)[/]")
+                    except Exception:
+                        console.print(f"[yellow]⚠️  {guest_path} (could not check)[/]")
+                
+                # Check copied paths
+                for idx, (host_path, guest_path) in enumerate(app_data_paths.items()):
+                    try:
+                        is_accessible = _qga_exec(
+                            vm_name, conn_uri, f"test -d {guest_path} && echo yes || echo no", timeout=5
+                        )
+                        if is_accessible == "yes":
+                            console.print(f"[green]✅ {guest_path} (copied)[/]")
                         else:
-                            console.print(f"[red]❌ {guest_path} (not accessible)[/]")
+                            console.print(f"[red]❌ {guest_path} (copy missing)[/]")
                     except Exception:
                         console.print(f"[yellow]⚠️  {guest_path} (could not check)[/]")
         else:
@@ -2521,14 +2535,22 @@ def cmd_clone(args):
             console.print("  [cyan]clonebox-health[/]  # Re-run health check")
 
             # Show mount instructions
-            all_paths = config.get("paths", {}).copy()
-            all_paths.update(config.get("app_data_paths", {}))
-            if all_paths:
-                console.print("\n[bold]📁 Mounted paths (automatic):[/]")
-                for idx, (host, guest) in enumerate(list(all_paths.items())[:5]):
+            paths = config.get("paths", {})
+            app_data_paths = config.get("app_data_paths", {})
+
+            if paths:
+                console.print("\n[bold]📁 Mounted paths (shared live):[/]")
+                for idx, (host, guest) in enumerate(list(paths.items())[:5]):
+                    console.print(f"  [dim]{host}[/] → [cyan]{guest}[/]")
+                if len(paths) > 5:
+                    console.print(f"  [dim]... and {len(paths) - 5} more paths[/]")
+
+            if app_data_paths:
+                console.print("\n[bold]📥 Copied paths (one-time import):[/]")
+                for idx, (host, guest) in enumerate(list(app_data_paths.items())[:5]):
                     console.print(f"  [dim]{host}[/] → [cyan]{guest}[/]")
-                if len(all_paths) > 5:
-                    console.print(f"  [dim]... and {len(all_paths) - 5} more paths[/]")
+                if len(app_data_paths) > 5:
+                    console.print(f"  [dim]... and {len(app_data_paths) - 5} more paths[/]")
         except PermissionError as e:
             console.print(f"[red]❌ Permission Error:[/]\n{e}")
             console.print("\n[yellow]💡 Try running with --user flag:[/]")

{clonebox-1.1.11 → clonebox-1.1.13}/src/clonebox/cloner.py

@@ -263,13 +263,21 @@ class SelectiveVMCloner:
 
             return cached_path
 
-    def _default_network_active(self) -> bool:
-        """Check if libvirt default network is active."""
+    def _default_network_state(self) -> str:
         try:
-            net = self.conn.networkLookupByName("default")
-            return net.isActive() == 1
+            active = self.conn.listNetworks() or []
+            if "default" in active:
+                return "active"
+            defined = self.conn.listDefinedNetworks() or []
+            if "default" in defined:
+                return "inactive"
+            return "missing"
         except Exception:
-            return False
+            return "unknown"
+
+    def _default_network_active(self) -> bool:
+        """Check if libvirt default network is active."""
+        return self._default_network_state() == "active"
 
     def resolve_network_mode(self, config: VMConfig) -> str:
         """Resolve network mode based on config and session type."""
@@ -310,10 +318,9 @@ class SelectiveVMCloner:
             )
 
         # Check default network
-        try:
-            net = self.conn.networkLookupByName("default")
-            checks["default_network"] = net.isActive() == 1
-        except libvirt.libvirtError:
+        default_net_state = self._default_network_state()
+        checks["default_network"] = default_net_state == "active"
+        if default_net_state in {"inactive", "missing", "unknown"}:
             checks["network_error"] = (
                 "Default network not found or inactive.\n"
                 "  For user session, CloneBox can use user-mode networking (slirp) automatically.\n"
@@ -1404,7 +1411,8 @@ fi
                     "  - chown -R 1000:1000 /home/ubuntu/.config /home/ubuntu/.cache /home/ubuntu/.local",
                     "  - chmod 700 /home/ubuntu/.config /home/ubuntu/.cache",
                     "  - systemctl set-default graphical.target",
-                    "  - systemctl enable gdm3 || systemctl enable gdm || true",
+                    "  - systemctl enable --now gdm3 || systemctl enable --now gdm || true",
+                    "  - systemctl start display-manager || true",
                 ]
             )
 

{clonebox-1.1.11 → clonebox-1.1.13/src/clonebox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 1.1.11
+Version: 1.1.13
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0

{clonebox-1.1.11 → clonebox-1.1.13}/tests/test_cloner.py

@@ -167,7 +167,8 @@ class TestSelectiveVMClonerMethods:
     def test_check_prerequisites_returns_dict(self, mock_libvirt):
         mock_conn = MagicMock()
         mock_conn.isAlive.return_value = True
-        mock_conn.networkLookupByName.return_value.isActive.return_value = 1
+        mock_conn.listNetworks.return_value = ["default"]
+        mock_conn.listDefinedNetworks.return_value = []
         mock_libvirt.open.return_value = mock_conn
         mock_libvirt.openAuth.return_value = mock_conn
 
@@ -272,6 +273,40 @@ class TestVMXMLGeneration:
         assert "filesystem" in xml
         assert "mount" in xml
 
+    @patch("clonebox.cloner.libvirt")
+    def test_generate_vm_xml_tuning_exclusion(self, mock_libvirt):
+        """Test that resource tuning elements are excluded in user session mode."""
+        mock_libvirt.open.return_value = MagicMock()
+        mock_libvirt.openAuth.return_value = MagicMock()
+
+        # 1. Test User Session (Should exclude tuning)
+        cloner_user = SelectiveVMCloner(user_session=True)
+        config = VMConfig(
+            name="test-vm",
+            ram_mb=2048,
+            vcpus=2,
+            resources={
+                "cpu": {"shares": 1024, "quota": 10000},
+                "memory": {"soft_limit": "1G"},
+                "disk": {"read_bps": "10M"},
+            }
+        )
+        
+        xml_user = cloner_user._generate_vm_xml(config, Path("/tmp/root.qcow2"), None)
+        
+        assert "cputune" not in xml_user
+        assert "memtune" not in xml_user
+        assert "iotune" not in xml_user
+
+        # 2. Test System Session (Should include tuning)
+        cloner_system = SelectiveVMCloner(user_session=False)
+        
+        xml_system = cloner_system._generate_vm_xml(config, Path("/tmp/root.qcow2"), None)
+        
+        assert "cputune" in xml_system
+        assert "memtune" in xml_system
+        assert "iotune" in xml_system
+
 
 class TestVMCreation:
     """Test VM creation (with mocked libvirt)."""

{clonebox-1.1.11 → clonebox-1.1.13}/tests/test_network.py

@@ -54,10 +54,8 @@ class TestNetworkMode:
         mock_conn = MagicMock()
         mock_libvirt.open.return_value = mock_conn
         mock_libvirt.openAuth.return_value = mock_conn
-        mock_net = MagicMock()
-        mock_net.isActive.return_value = 1
-        mock_conn.networkLookupByName.return_value = mock_net
-        mock_libvirt.open.return_value = mock_conn
+        mock_conn.listNetworks.return_value = ["default"]
+        mock_conn.listDefinedNetworks.return_value = []
 
         cloner = SelectiveVMCloner(user_session=True)
         config = VMConfig(network_mode="auto")
@@ -68,18 +66,9 @@ class TestNetworkMode:
     @patch("clonebox.cloner.libvirt")
     def test_resolve_network_mode_auto_user_no_default(self, mock_libvirt):
         """Test auto mode with user session and no default network falls back to user."""
-        # Handle missing libvirt module in test environment
-        try:
-            import libvirt as real_libvirt
-
-            libvirt_error = real_libvirt.libvirtError
-        except ImportError:
-
-            class libvirt_error(Exception):
-                pass
-
         mock_conn = MagicMock()
-        mock_conn.networkLookupByName.side_effect = libvirt_error("No network")
+        mock_conn.listNetworks.return_value = []
+        mock_conn.listDefinedNetworks.return_value = []
         mock_libvirt.open.return_value = mock_conn
         mock_libvirt.openAuth.return_value = mock_conn
 
@@ -134,10 +123,8 @@ class TestNetworkMode:
         mock_conn = MagicMock()
         mock_libvirt.open.return_value = mock_conn
         mock_libvirt.openAuth.return_value = mock_conn
-        mock_net = MagicMock()
-        mock_net.isActive.return_value = 1
-        mock_conn.networkLookupByName.return_value = mock_net
-        mock_libvirt.open.return_value = mock_conn
+        mock_conn.listNetworks.return_value = ["default"]
+        mock_conn.listDefinedNetworks.return_value = []
 
         cloner = SelectiveVMCloner()
         assert cloner._default_network_active() is True
@@ -149,10 +136,8 @@ class TestNetworkMode:
         mock_conn = MagicMock()
         mock_libvirt.open.return_value = mock_conn
         mock_libvirt.openAuth.return_value = mock_conn
-        mock_net = MagicMock()
-        mock_net.isActive.return_value = 0
-        mock_conn.networkLookupByName.return_value = mock_net
-        mock_libvirt.open.return_value = mock_conn
+        mock_conn.listNetworks.return_value = []
+        mock_conn.listDefinedNetworks.return_value = ["default"]
 
         cloner = SelectiveVMCloner()
         assert cloner._default_network_active() is False
@@ -160,18 +145,9 @@ class TestNetworkMode:
     @patch("clonebox.cloner.libvirt")
     def test_default_network_active_not_found(self, mock_libvirt):
         """Test _default_network_active returns False when network not found."""
-        # Handle missing libvirt module in test environment
-        try:
-            import libvirt as real_libvirt
-
-            libvirt_error = real_libvirt.libvirtError
-        except ImportError:
-
-            class libvirt_error(Exception):
-                pass
-
         mock_conn = MagicMock()
-        mock_conn.networkLookupByName.side_effect = libvirt_error("Not found")
+        mock_conn.listNetworks.return_value = []
+        mock_conn.listDefinedNetworks.return_value = []
         mock_libvirt.open.return_value = mock_conn
         mock_libvirt.openAuth.return_value = mock_conn