shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-03-11 16:58:31 +03:00
Code Issues Projects Releases Wiki Activity

virt-install: Move more shared options to cli.py

Browse Source 
virt-xml will use these
This commit is contained in:
Cole Robinson 2014-01-21 16:26:35 -05:00
parent f9ab83a69e
commit 812c4c6d98
2 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
virt-install
View File

@ -884,17 +884,7 @@ def parse_args():
geng.add_argument("--description",
help=_("Human readable description of the VM to store in "
"the generated XML."))
geng.add_argument("--security",
help=_("Set domain security driver configuration."))
geng.add_argument("--numatune",
help=_("Tune NUMA policy for the domain process."))
geng.add_argument("--features",
help=_("Set domain <features> XML. Ex:\n"
"--features acpi=off\n"
"--features apic=on,eoi=on"))
geng.add_argument("--clock",
help=_("Set domain <clock> XML. Ex:\n"
"--clock offset=localtime,rtc_tickpolicy=catchup"))
cli.add_guest_xml_options(geng)
insg = parser.add_argument_group(_("Installation Method Options"))
insg.add_argument("-c", dest="cdrom_short", help=argparse.SUPPRESS)
@ -914,19 +904,11 @@ def parse_args():
insg.add_argument("--initrd-inject", action="append",
help=_("Add given file to root of initrd from --location"))
cli.add_distro_options(insg)
insg.add_argument("--boot",
help=_("Optionally configure post-install boot order, "
"menu, permanent kernel boot, etc. Ex:\n"
"--boot hd,cdrom,menu=on\n"
"--boot init=/sbin/init (for containers)"))
cli.add_boot_option(insg)
insg.add_argument("--init", help=argparse.SUPPRESS)
stog = parser.add_argument_group(_("Storage Configuration"))
stog.add_argument("--disk", action="append",
help=_("Specify storage with various options. Ex.\n"
"--disk path=/my/existing/disk\n"
"--disk path=/my/new/disk,size=5 (in gigabytes)\n"
"--disk vol=poolname/volname,device=cdrom,bus=scsi,..."))
cli.add_disk_option(stog)
stog.add_argument("--nodisks", action="store_true",
help=_("Don't set up any disks for the guest."))
cli.add_fs_option(stog)

48
virtinst/cli.py
View File

@ -771,11 +771,19 @@ def vcpu_cli_options(grp, backcompat=True):
grp.add_argument("--cpuset", help=argparse.SUPPRESS)
def add_gfx_option(devg):
devg.add_argument("--graphics", action="append",
help=_("Configure guest display settings. Ex:\n"
"--graphics vnc\n"
"--graphics spice,port=5901,tlsport=5902\n"
"--graphics none\n"
"--graphics vnc,password=foobar,port=5910,keymap=ja"))
def graphics_option_group(parser):
"""
Register vnc + sdl options for virt-install and virt-image
"""
vncg = parser.add_argument_group(_("Graphics Configuration"))
add_gfx_option(vncg)
vncg.add_argument("--vnc", action="store_true",
@ -862,15 +870,6 @@ def add_device_options(devg):
"--panic default"))
def add_gfx_option(devg):
devg.add_argument("--graphics", action="append",
help=_("Configure guest display settings. Ex:\n"
"--graphics vnc\n"
"--graphics spice,port=5901,tlsport=5902\n"
"--graphics none\n"
"--graphics vnc,password=foobar,port=5910,keymap=ja"))
def add_fs_option(devg):
devg.add_argument("--filesystem", action="append",
help=_("Pass host directory to the guest. Ex: \n"
@ -896,6 +895,35 @@ def add_old_feature_options(optg):
default=False, help=argparse.SUPPRESS)
def add_guest_xml_options(geng):
geng.add_argument("--security",
help=_("Set domain security driver configuration."))
geng.add_argument("--numatune",
help=_("Tune NUMA policy for the domain process."))
geng.add_argument("--features",
help=_("Set domain <features> XML. Ex:\n"
"--features acpi=off\n"
"--features apic=on,eoi=on"))
geng.add_argument("--clock",
help=_("Set domain <clock> XML. Ex:\n"
"--clock offset=localtime,rtc_tickpolicy=catchup"))
def add_boot_option(insg):
insg.add_argument("--boot",
help=_("Optionally configure post-install boot order, "
"menu, permanent kernel boot, etc. Ex:\n"
"--boot hd,cdrom,menu=on\n"
"--boot init=/sbin/init (for containers)"))
def add_disk_option(stog):
stog.add_argument("--disk", action="append",
help=_("Specify storage with various options. Ex.\n"
"--disk path=/my/existing/disk\n"
"--disk path=/my/new/disk,size=5 (in gigabytes)\n"
"--disk vol=poolname/volname,device=cdrom,bus=scsi,..."))
#############################################
# CLI complex parsing helpers #