diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json index efc4280179..b95393d6f0 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json @@ -3,7 +3,7 @@ "Driver": { "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p11/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p11_partial_config/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -11,12 +11,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11_partial_config", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "4f16872c-aee8-11e9-8815-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p11/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p11/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p11_partial_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p11_partial_config/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/hyperkit.json deleted file mode 100644 index 38b7db487f..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p3","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p3/p3.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p3/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p3/bzImage","initrd":"/Users/someuser/.minikube/machines/p3/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13669,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p3/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p3/p3.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p3/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p3/tty,log=/Users/someuser/.minikube/machines/p3/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p3/bzImage,/Users/someuser/.minikube/machines/p3/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p3/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p3/p3.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p3/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p3/tty,log=/Users/someuser/.minikube/machines/p3/console-ring -f kexec,/Users/someuser/.minikube/machines/p3/bzImage,/Users/someuser/.minikube/machines/p3/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/config.json similarity index 87% rename from pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/config.json index 84e8fbfaaa..e387da62d9 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.52", - "MachineName": "p3", + "MachineName": "p3_empty", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p3/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p3_empty/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_empty", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p3/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p3/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p3_empty/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p3_empty/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p3" + "Name": "p3_empty" } diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/hyperkit.json new file mode 100644 index 0000000000..31f09ed93e --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p3_empty","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p3_empty/p3_empty.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p3_empty/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p3_empty/bzImage","initrd":"/Users/someuser/.minikube/machines/p3_empty/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13669,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p3_empty/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p3_empty/p3_empty.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p3_empty/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p3_empty/tty,log=/Users/someuser/.minikube/machines/p3_empty/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p3_empty/bzImage,/Users/someuser/.minikube/machines/p3_empty/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_empty"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p3_empty/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p3_empty/p3_empty.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p3_empty/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p3_empty/tty,log=/Users/someuser/.minikube/machines/p3_empty/console-ring -f kexec,/Users/someuser/.minikube/machines/p3_empty/bzImage,/Users/someuser/.minikube/machines/p3_empty/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_empty"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/hyperkit.json deleted file mode 100644 index 8489ab0646..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p4","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"759044c8-aee4-11e9-bd0a-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p4/p4.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p4/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p4/bzImage","initrd":"/Users/someuser/.minikube/machines/p4/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13752,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p4/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","759044c8-aee4-11e9-bd0a-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p4/p4.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p4/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p4/tty,log=/Users/someuser/.minikube/machines/p4/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p4/bzImage,/Users/someuser/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p4/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 759044c8-aee4-11e9-bd0a-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p4/p4.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p4/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p4/tty,log=/Users/someuser/.minikube/machines/p4/console-ring -f kexec,/Users/someuser/.minikube/machines/p4/bzImage,/Users/someuser/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/config.json similarity index 86% rename from pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/config.json index 5eedd16a38..cf7f38defa 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.53", - "MachineName": "p4", + "MachineName": "p4_invalid_file", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p4/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p4_invalid_file/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_invalid_file", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "759044c8-aee4-11e9-bd0a-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p4/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p4/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p4_invalid_file/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p4_invalid_file/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p4" + "Name": "p4_invalid_file" } diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/hyperkit.json new file mode 100644 index 0000000000..281dcf5822 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p4_invalid_file","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"759044c8-aee4-11e9-bd0a-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p4_invalid_file/p4_invalid_file.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p4_invalid_file/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p4_invalid_file/bzImage","initrd":"/Users/someuser/.minikube/machines/p4_invalid_file/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13752,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p4_invalid_file/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","759044c8-aee4-11e9-bd0a-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p4_invalid_file/p4_invalid_file.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p4_invalid_file/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p4_invalid_file/tty,log=/Users/someuser/.minikube/machines/p4_invalid_file/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p4_invalid_file/bzImage,/Users/someuser/.minikube/machines/p4_invalid_file/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_invalid_file"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p4_invalid_file/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 759044c8-aee4-11e9-bd0a-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p4_invalid_file/p4_invalid_file.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p4_invalid_file/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p4_invalid_file/tty,log=/Users/someuser/.minikube/machines/p4_invalid_file/console-ring -f kexec,/Users/someuser/.minikube/machines/p4_invalid_file/bzImage,/Users/someuser/.minikube/machines/p4_invalid_file/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_invalid_file"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/hyperkit.json deleted file mode 100644 index 70960a3aa5..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p5","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"faf8face-aee4-11e9-9ba1-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p5/p5.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p5/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p5/bzImage","initrd":"/Users/someuser/.minikube/machines/p5/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13829,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p5/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","faf8face-aee4-11e9-9ba1-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p5/p5.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p5/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p5/tty,log=/Users/someuser/.minikube/machines/p5/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p5/bzImage,/Users/someuser/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p5/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U faf8face-aee4-11e9-9ba1-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p5/p5.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p5/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p5/tty,log=/Users/someuser/.minikube/machines/p5/console-ring -f kexec,/Users/someuser/.minikube/machines/p5/bzImage,/Users/someuser/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/config.json similarity index 86% rename from pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/config.json index 4d058d4b1f..bf01fde29e 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.54", - "MachineName": "p5", + "MachineName": "p5_partial_config", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p5/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p5_partial_config/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "faf8face-aee4-11e9-9ba1-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p5/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p5/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p5_partial_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p5_partial_config/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p5" + "Name": "p5_partial_config" } diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/hyperkit.json new file mode 100644 index 0000000000..8ac2881b79 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p5_partial_config","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"faf8face-aee4-11e9-9ba1-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p5_partial_config/p5_partial_config.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p5_partial_config/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p5_partial_config/bzImage","initrd":"/Users/someuser/.minikube/machines/p5_partial_config/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13829,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p5_partial_config/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","faf8face-aee4-11e9-9ba1-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p5_partial_config/p5_partial_config.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p5_partial_config/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p5_partial_config/tty,log=/Users/someuser/.minikube/machines/p5_partial_config/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p5_partial_config/bzImage,/Users/someuser/.minikube/machines/p5_partial_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p5_partial_config/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U faf8face-aee4-11e9-9ba1-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p5_partial_config/p5_partial_config.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p5_partial_config/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p5_partial_config/tty,log=/Users/someuser/.minikube/machines/p5_partial_config/console-ring -f kexec,/Users/someuser/.minikube/machines/p5_partial_config/bzImage,/Users/someuser/.minikube/machines/p5_partial_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json index 2b7fd6fc94..d7b31cea7b 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json @@ -1 +1 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p8","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p8/p8.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p8/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p8/bzImage","initrd":"/Users/someuser/.minikube/machines/p8/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14123,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p8/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p8/p8.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p8/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p8/tty,log=/Users/someuser/.minikube/machines/p8/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p8/bzImage,/Users/someuser/.minikube/machines/p8/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p8/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 7f30e71e-aee7-11e9-96c9-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p8/p8.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p8/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p8/tty,log=/Users/someuser/.minikube/machines/p8/console-ring -f kexec,/Users/someuser/.minikube/machines/p8/bzImage,/Users/someuser/.minikube/machines/p8/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8"} +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p8_empty_config","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p8_empty_config/p8_empty_config.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p8_empty_config/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p8_empty_config/bzImage","initrd":"/Users/someuser/.minikube/machines/p8_empty_config/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14123,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p8_empty_config/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p8_empty_config/p8_empty_config.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p8_empty_config/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p8_empty_config/tty,log=/Users/someuser/.minikube/machines/p8_empty_config/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p8_empty_config/bzImage,/Users/someuser/.minikube/machines/p8_empty_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_empty_config"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p8_empty_config/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 7f30e71e-aee7-11e9-96c9-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p8_empty_config/p8_empty_config.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p8_empty_config/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p8_empty_config/tty,log=/Users/someuser/.minikube/machines/p8_empty_config/console-ring -f kexec,/Users/someuser/.minikube/machines/p8_empty_config/bzImage,/Users/someuser/.minikube/machines/p8_empty_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_empty_config"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json index b6f1aa2fc4..1f5e919815 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.58", - "MachineName": "p9", + "MachineName": "p9_empty_driver", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p9/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p9_empty_driver/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p9", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p9_empty_driver", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "bc3426d0-aee7-11e9-b24a-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p9/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p9/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p9_empty_driver/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p9_empty_driver/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p9" + "Name": "p9_empty_driver" } diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p10/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p10_invalid_file/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p10/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p10_invalid_file/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p11/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p11_partial_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p11/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p11_partial_config/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_empty/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_empty/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_empty_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_empty_config/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9_empty_driver/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9_empty_driver/config.json