clonebox 0.1.2__tar.gz → 0.1.3__tar.gz

{clonebox-0.1.2 → clonebox-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 0.1.2
+Version: 0.1.3
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0
@@ -65,7 +65,28 @@ CloneBox lets you create isolated virtual machines with only the applications, d
 
 ## Installation
 
-### Prerequisites
+### Quick Setup (Recommended)
+
+Run the setup script to automatically install dependencies and configure the environment:
+
+```bash
+# Clone the repository
+git clone https://github.com/wronai/clonebox.git
+cd clonebox
+
+# Run the setup script
+./setup.sh
+```
+
+The setup script will:
+- Install all required packages (QEMU, libvirt, Python, etc.)
+- Add your user to the necessary groups
+- Configure libvirt networks
+- Install clonebox in development mode
+
+### Manual Installation
+
+#### Prerequisites
 
 ```bash
 # Install libvirt and QEMU/KVM
@@ -82,7 +103,7 @@ newgrp libvirt
 sudo apt install genisoimage
 ```
 
-### Install CloneBox
+#### Install CloneBox
 
 ```bash
 # From source
@@ -296,6 +317,63 @@ clonebox detect --yaml --dedupe -o my-config.yaml
 - Python 3.8+
 - User in `libvirt` group
 
+## Troubleshooting
+
+### Network Issues
+
+If you encounter "Network not found" or "network 'default' is not active" errors:
+
+```bash
+# Run the network fix script
+./fix-network.sh
+
+# Or manually fix:
+virsh --connect qemu:///session net-destroy default 2>/dev/null
+virsh --connect qemu:///session net-undefine default 2>/dev/null
+virsh --connect qemu:///session net-define /tmp/default-network.xml
+virsh --connect qemu:///session net-start default
+```
+
+### Permission Issues
+
+If you get permission errors:
+
+```bash
+# Ensure user is in libvirt and kvm groups
+sudo usermod -aG libvirt $USER
+sudo usermod -aG kvm $USER
+
+# Log out and log back in for groups to take effect
+```
+
+### VM Already Exists
+
+If you get "domain already exists" error:
+
+```bash
+# List VMs
+clonebox list
+
+# Stop and delete the existing VM
+clonebox delete <vm-name>
+
+# Or use virsh directly
+virsh --connect qemu:///session destroy <vm-name>
+virsh --connect qemu:///session undefine <vm-name>
+```
+
+### virt-viewer not found
+
+If GUI doesn't open:
+
+```bash
+# Install virt-viewer
+sudo apt install virt-viewer
+
+# Then connect manually
+virt-viewer --connect qemu:///session <vm-name>
+```
+
 ## License
 
 MIT License - see [LICENSE](LICENSE) file.

{clonebox-0.1.2 → clonebox-0.1.3}/README.md

@@ -26,7 +26,28 @@ CloneBox lets you create isolated virtual machines with only the applications, d
 
 ## Installation
 
-### Prerequisites
+### Quick Setup (Recommended)
+
+Run the setup script to automatically install dependencies and configure the environment:
+
+```bash
+# Clone the repository
+git clone https://github.com/wronai/clonebox.git
+cd clonebox
+
+# Run the setup script
+./setup.sh
+```
+
+The setup script will:
+- Install all required packages (QEMU, libvirt, Python, etc.)
+- Add your user to the necessary groups
+- Configure libvirt networks
+- Install clonebox in development mode
+
+### Manual Installation
+
+#### Prerequisites
 
 ```bash
 # Install libvirt and QEMU/KVM
@@ -43,7 +64,7 @@ newgrp libvirt
 sudo apt install genisoimage
 ```
 
-### Install CloneBox
+#### Install CloneBox
 
 ```bash
 # From source
@@ -257,6 +278,63 @@ clonebox detect --yaml --dedupe -o my-config.yaml
 - Python 3.8+
 - User in `libvirt` group
 
+## Troubleshooting
+
+### Network Issues
+
+If you encounter "Network not found" or "network 'default' is not active" errors:
+
+```bash
+# Run the network fix script
+./fix-network.sh
+
+# Or manually fix:
+virsh --connect qemu:///session net-destroy default 2>/dev/null
+virsh --connect qemu:///session net-undefine default 2>/dev/null
+virsh --connect qemu:///session net-define /tmp/default-network.xml
+virsh --connect qemu:///session net-start default
+```
+
+### Permission Issues
+
+If you get permission errors:
+
+```bash
+# Ensure user is in libvirt and kvm groups
+sudo usermod -aG libvirt $USER
+sudo usermod -aG kvm $USER
+
+# Log out and log back in for groups to take effect
+```
+
+### VM Already Exists
+
+If you get "domain already exists" error:
+
+```bash
+# List VMs
+clonebox list
+
+# Stop and delete the existing VM
+clonebox delete <vm-name>
+
+# Or use virsh directly
+virsh --connect qemu:///session destroy <vm-name>
+virsh --connect qemu:///session undefine <vm-name>
+```
+
+### virt-viewer not found
+
+If GUI doesn't open:
+
+```bash
+# Install virt-viewer
+sudo apt install virt-viewer
+
+# Then connect manually
+virt-viewer --connect qemu:///session <vm-name>
+```
+
 ## License
 
 MIT License - see [LICENSE](LICENSE) file.

{clonebox-0.1.2 → clonebox-0.1.3}/pyproject.toml

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

{clonebox-0.1.2 → clonebox-0.1.3}/src/clonebox/cli.py

@@ -492,7 +492,7 @@ def deduplicate_list(items: list, key=None) -> list:
 
 
 def generate_clonebox_yaml(snapshot, detector, deduplicate: bool = True, 
-                           target_path: str = None, vm_name: str = None) -> str:
+                           target_path: str = None, vm_name: str = None, network_mode: str = "auto") -> str:
     """Generate YAML config from system snapshot."""
     sys_info = detector.get_system_info()
     
@@ -559,6 +559,7 @@ def generate_clonebox_yaml(snapshot, detector, deduplicate: bool = True,
             "vcpus": vcpus,
             "gui": True,
             "base_image": None,
+            "network_mode": network_mode,
         },
         "services": services,
         "packages": [
@@ -605,6 +606,7 @@ def create_vm_from_config(config: dict, start: bool = False, user_session: bool
         packages=config.get("packages", []),
         services=config.get("services", []),
         user_session=user_session,
+        network_mode=config["vm"].get("network_mode", "auto"),
     )
     
     cloner = SelectiveVMCloner(user_session=user_session)
@@ -655,7 +657,8 @@ def cmd_clone(args):
         snapshot, detector, 
         deduplicate=args.dedupe,
         target_path=str(target_path),
-        vm_name=vm_name
+        vm_name=vm_name,
+        network_mode=args.network
     )
     
     # Save config file
@@ -863,6 +866,8 @@ def main():
     clone_parser.add_argument("--dedupe", action="store_true", default=True, help="Remove duplicate entries")
     clone_parser.add_argument("--user", "-u", action="store_true", 
                              help="Use user session (qemu:///session) - no root required, stores in ~/.local/share/libvirt/")
+    clone_parser.add_argument("--network", choices=["auto", "default", "user"], default="auto",
+                             help="Network mode: auto (default), default (libvirt network), user (slirp)")
     clone_parser.set_defaults(func=cmd_clone)
     
     args = parser.parse_args()

{clonebox-0.1.2 → clonebox-0.1.3}/src/clonebox/cloner.py

@@ -32,6 +32,7 @@ class VMConfig:
     packages: list = field(default_factory=list)
     services: list = field(default_factory=list)
     user_session: bool = False  # Use qemu:///session instead of qemu:///system
+    network_mode: str = "auto"  # auto|default|user
     
     def to_dict(self) -> dict:
         return {
@@ -91,6 +92,25 @@ class SelectiveVMCloner:
             return self.USER_IMAGES_DIR
         return self.SYSTEM_IMAGES_DIR
     
+    def _default_network_active(self) -> bool:
+        """Check if libvirt default network is active."""
+        try:
+            net = self.conn.networkLookupByName("default")
+            return net.isActive() == 1
+        except libvirt.libvirtError:
+            return False
+    
+    def resolve_network_mode(self, config: VMConfig) -> str:
+        """Resolve network mode based on config and session type."""
+        mode = (config.network_mode or "auto").lower()
+        if mode == "auto":
+            if self.user_session and not self._default_network_active():
+                return "user"
+            return "default"
+        if mode in {"default", "user"}:
+            return mode
+        return "default"
+    
     def check_prerequisites(self) -> dict:
         """Check system prerequisites for VM creation."""
         images_dir = self.get_images_dir()
@@ -123,8 +143,11 @@ class SelectiveVMCloner:
         except libvirt.libvirtError:
             checks["network_error"] = (
                 "Default network not found or inactive.\n"
-                "  Start it with: sudo virsh net-start default\n"
-                "  Or create it: sudo virsh net-define /usr/share/libvirt/networks/default.xml"
+                "  For user session, CloneBox can use user-mode networking (slirp) automatically.\n"
+                "  Or create a user network:\n"
+                "    virsh --connect qemu:///session net-define /tmp/default-network.xml\n"
+                "    virsh --connect qemu:///session net-start default\n"
+                "  Or use system session: clonebox clone . (without --user)\n"
             )
         
         # Check images directory
@@ -215,6 +238,13 @@ class SelectiveVMCloner:
             cloudinit_iso = self._create_cloudinit_iso(vm_dir, config)
             log(f"[cyan]☁️  Created cloud-init ISO with {len(config.packages)} packages[/]")
         
+        # Resolve network mode
+        network_mode = self.resolve_network_mode(config)
+        if network_mode == "user":
+            log("[yellow]⚠️  Using user-mode networking (slirp) because default libvirt network is unavailable[/]")
+        else:
+            log(f"[dim]Network mode: {network_mode}[/]")
+        
         # Generate VM XML
         vm_xml = self._generate_vm_xml(config, root_disk, cloudinit_iso)
         
@@ -288,9 +318,14 @@ class SelectiveVMCloner:
                 ET.SubElement(fs, "target", dir=tag)
         
         # Network interface
-        iface = ET.SubElement(devices, "interface", type="network")
-        ET.SubElement(iface, "source", network="default")
-        ET.SubElement(iface, "model", type="virtio")
+        network_mode = self.resolve_network_mode(config)
+        if network_mode == "user":
+            iface = ET.SubElement(devices, "interface", type="user")
+            ET.SubElement(iface, "model", type="virtio")
+        else:
+            iface = ET.SubElement(devices, "interface", type="network")
+            ET.SubElement(iface, "source", network="default")
+            ET.SubElement(iface, "model", type="virtio")
         
         # Serial console
         serial = ET.SubElement(devices, "serial", type="pty")

{clonebox-0.1.2 → clonebox-0.1.3}/src/clonebox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 0.1.2
+Version: 0.1.3
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0
@@ -65,7 +65,28 @@ CloneBox lets you create isolated virtual machines with only the applications, d
 
 ## Installation
 
-### Prerequisites
+### Quick Setup (Recommended)
+
+Run the setup script to automatically install dependencies and configure the environment:
+
+```bash
+# Clone the repository
+git clone https://github.com/wronai/clonebox.git
+cd clonebox
+
+# Run the setup script
+./setup.sh
+```
+
+The setup script will:
+- Install all required packages (QEMU, libvirt, Python, etc.)
+- Add your user to the necessary groups
+- Configure libvirt networks
+- Install clonebox in development mode
+
+### Manual Installation
+
+#### Prerequisites
 
 ```bash
 # Install libvirt and QEMU/KVM
@@ -82,7 +103,7 @@ newgrp libvirt
 sudo apt install genisoimage
 ```
 
-### Install CloneBox
+#### Install CloneBox
 
 ```bash
 # From source
@@ -296,6 +317,63 @@ clonebox detect --yaml --dedupe -o my-config.yaml
 - Python 3.8+
 - User in `libvirt` group
 
+## Troubleshooting
+
+### Network Issues
+
+If you encounter "Network not found" or "network 'default' is not active" errors:
+
+```bash
+# Run the network fix script
+./fix-network.sh
+
+# Or manually fix:
+virsh --connect qemu:///session net-destroy default 2>/dev/null
+virsh --connect qemu:///session net-undefine default 2>/dev/null
+virsh --connect qemu:///session net-define /tmp/default-network.xml
+virsh --connect qemu:///session net-start default
+```
+
+### Permission Issues
+
+If you get permission errors:
+
+```bash
+# Ensure user is in libvirt and kvm groups
+sudo usermod -aG libvirt $USER
+sudo usermod -aG kvm $USER
+
+# Log out and log back in for groups to take effect
+```
+
+### VM Already Exists
+
+If you get "domain already exists" error:
+
+```bash
+# List VMs
+clonebox list
+
+# Stop and delete the existing VM
+clonebox delete <vm-name>
+
+# Or use virsh directly
+virsh --connect qemu:///session destroy <vm-name>
+virsh --connect qemu:///session undefine <vm-name>
+```
+
+### virt-viewer not found
+
+If GUI doesn't open:
+
+```bash
+# Install virt-viewer
+sudo apt install virt-viewer
+
+# Then connect manually
+virt-viewer --connect qemu:///session <vm-name>
+```
+
 ## License
 
 MIT License - see [LICENSE](LICENSE) file.

{clonebox-0.1.2 → clonebox-0.1.3}/src/clonebox.egg-info/SOURCES.txt

@@ -13,4 +13,5 @@ src/clonebox.egg-info/requires.txt
 src/clonebox.egg-info/top_level.txt
 tests/test_cli.py
 tests/test_cloner.py
-tests/test_detector.py
+tests/test_detector.py
+tests/test_network.py

{clonebox-0.1.2 → clonebox-0.1.3}/tests/test_cloner.py

@@ -104,9 +104,16 @@ class TestSelectiveVMClonerInit:
     
     @patch('clonebox.cloner.libvirt')
     def test_init_connection_failed(self, mock_libvirt):
-        import libvirt as real_libvirt
-        mock_libvirt.libvirtError = real_libvirt.libvirtError
-        mock_libvirt.open.side_effect = real_libvirt.libvirtError("Connection refused")
+        try:
+            import libvirt as real_libvirt
+            mock_libvirt.libvirtError = real_libvirt.libvirtError
+            mock_libvirt.open.side_effect = real_libvirt.libvirtError("Connection refused")
+        except ImportError:
+            # If libvirt is not installed, create a mock exception
+            class MockLibvirtError(Exception):
+                pass
+            mock_libvirt.libvirtError = MockLibvirtError
+            mock_libvirt.open.side_effect = MockLibvirtError("Connection refused")
         
         with pytest.raises(ConnectionError) as exc_info:
             SelectiveVMCloner()

clonebox-0.1.3/tests/test_network.py

@@ -0,0 +1,164 @@
+#!/usr/bin/env python3
+"""Tests for network mode functionality."""
+
+import pytest
+from pathlib import Path
+from unittest.mock import patch, MagicMock
+
+from clonebox.cloner import VMConfig, SelectiveVMCloner
+
+
+class TestNetworkMode:
+    """Test network mode resolution and fallback."""
+    
+    @patch('clonebox.cloner.libvirt')
+    def test_vm_config_network_mode_default(self, mock_libvirt):
+        config = VMConfig()
+        assert config.network_mode == "auto"
+    
+    @patch('clonebox.cloner.libvirt')
+    def test_vm_config_network_mode_custom(self, mock_libvirt):
+        config = VMConfig(network_mode="user")
+        assert config.network_mode == "user"
+    
+    @patch('clonebox.cloner.libvirt')
+    def test_resolve_network_mode_auto_system(self, mock_libvirt):
+        """Test auto mode with system session uses default network."""
+        mock_conn = MagicMock()
+        mock_libvirt.open.return_value = mock_conn
+        
+        cloner = SelectiveVMCloner(user_session=False)
+        config = VMConfig(network_mode="auto")
+        
+        mode = cloner.resolve_network_mode(config)
+        assert mode == "default"
+    
+    @patch('clonebox.cloner.libvirt')
+    def test_resolve_network_mode_auto_user_with_default(self, mock_libvirt):
+        """Test auto mode with user session and default network available."""
+        mock_conn = MagicMock()
+        mock_net = MagicMock()
+        mock_net.isActive.return_value = 1
+        mock_conn.networkLookupByName.return_value = mock_net
+        mock_libvirt.open.return_value = mock_conn
+        
+        cloner = SelectiveVMCloner(user_session=True)
+        config = VMConfig(network_mode="auto")
+        
+        mode = cloner.resolve_network_mode(config)
+        assert mode == "default"
+    
+    @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."""
+        import libvirt as real_libvirt
+        mock_conn = MagicMock()
+        mock_conn.networkLookupByName.side_effect = real_libvirt.libvirtError("No network")
+        mock_libvirt.open.return_value = mock_conn
+        
+        cloner = SelectiveVMCloner(user_session=True)
+        config = VMConfig(network_mode="auto")
+        
+        mode = cloner.resolve_network_mode(config)
+        assert mode == "user"
+    
+    @patch('clonebox.cloner.libvirt')
+    def test_resolve_network_mode_explicit_default(self, mock_libvirt):
+        """Test explicit default mode."""
+        mock_conn = MagicMock()
+        mock_libvirt.open.return_value = mock_conn
+        
+        cloner = SelectiveVMCloner(user_session=True)
+        config = VMConfig(network_mode="default")
+        
+        mode = cloner.resolve_network_mode(config)
+        assert mode == "default"
+    
+    @patch('clonebox.cloner.libvirt')
+    def test_resolve_network_mode_explicit_user(self, mock_libvirt):
+        """Test explicit user mode."""
+        mock_conn = MagicMock()
+        mock_libvirt.open.return_value = mock_conn
+        
+        cloner = SelectiveVMCloner(user_session=False)
+        config = VMConfig(network_mode="user")
+        
+        mode = cloner.resolve_network_mode(config)
+        assert mode == "user"
+    
+    @patch('clonebox.cloner.libvirt')
+    def test_resolve_network_mode_invalid(self, mock_libvirt):
+        """Test invalid network mode falls back to default."""
+        mock_conn = MagicMock()
+        mock_libvirt.open.return_value = mock_conn
+        
+        cloner = SelectiveVMCloner()
+        config = VMConfig(network_mode="invalid")
+        
+        mode = cloner.resolve_network_mode(config)
+        assert mode == "default"
+    
+    @patch('clonebox.cloner.libvirt')
+    def test_default_network_active_true(self, mock_libvirt):
+        """Test _default_network_active returns True when network is active."""
+        mock_conn = MagicMock()
+        mock_net = MagicMock()
+        mock_net.isActive.return_value = 1
+        mock_conn.networkLookupByName.return_value = mock_net
+        mock_libvirt.open.return_value = mock_conn
+        
+        cloner = SelectiveVMCloner()
+        assert cloner._default_network_active() is True
+    
+    @patch('clonebox.cloner.libvirt')
+    def test_default_network_active_false(self, mock_libvirt):
+        """Test _default_network_active returns False when network is inactive."""
+        import libvirt as real_libvirt
+        mock_conn = MagicMock()
+        mock_net = MagicMock()
+        mock_net.isActive.return_value = 0
+        mock_conn.networkLookupByName.return_value = mock_net
+        mock_libvirt.open.return_value = mock_conn
+        
+        cloner = SelectiveVMCloner()
+        assert cloner._default_network_active() is False
+    
+    @patch('clonebox.cloner.libvirt')
+    def test_default_network_active_not_found(self, mock_libvirt):
+        """Test _default_network_active returns False when network not found."""
+        import libvirt as real_libvirt
+        mock_conn = MagicMock()
+        mock_conn.networkLookupByName.side_effect = real_libvirt.libvirtError("Not found")
+        mock_libvirt.open.return_value = mock_conn
+        
+        cloner = SelectiveVMCloner()
+        assert cloner._default_network_active() is False
+    
+    @patch('clonebox.cloner.libvirt')
+    def test_generate_vm_xml_user_network(self, mock_libvirt):
+        """Test VM XML generation with user network."""
+        mock_conn = MagicMock()
+        mock_libvirt.open.return_value = mock_conn
+        
+        cloner = SelectiveVMCloner()
+        config = VMConfig(name="test-vm", network_mode="user")
+        
+        xml = cloner._generate_vm_xml(config, Path("/tmp/root.qcow2"), None)
+        
+        assert '<interface type="user">' in xml
+        assert '<interface type="network">' not in xml
+    
+    @patch('clonebox.cloner.libvirt')
+    def test_generate_vm_xml_default_network(self, mock_libvirt):
+        """Test VM XML generation with default network."""
+        mock_conn = MagicMock()
+        mock_libvirt.open.return_value = mock_conn
+        
+        cloner = SelectiveVMCloner()
+        config = VMConfig(name="test-vm", network_mode="default")
+        
+        xml = cloner._generate_vm_xml(config, Path("/tmp/root.qcow2"), None)
+        
+        assert '<interface type="network">' in xml
+        assert '<source network="default"/>' in xml
+        assert '<interface type="user">' not in xml