January 2017 - Kimchi-devel - oVirt List Archives

[PATCH] [Kimchi] Updated PO files with new translation strings
by rajgupta＠linux.vnet.ibm.com 20 Feb '17

20 Feb '17

From: Rajat Gupta <rajat.triumph(a)gmail.com> Signed-off-by: Rajat Gupta <rajat.triumph(a)gmail.com> --- po/de_DE.po | 149 +++++-- po/en_US.po | 129 ++++-- po/es_ES.po | 150 +++++-- po/fr_FR.po | 149 +++++-- po/it_IT.po | 148 +++++-- po/ja_JP.po | 1101 +++++++++++++++++++++++--------------------------- po/kimchi.pot | 129 ++++-- po/ko_KR.po | 145 +++++-- po/pt_BR.po | 149 +++++-- po/ru_RU.po | 149 +++++-- po/zh_CN.po | 1249 ++++++++++++++++++++++++++------------------------------- po/zh_TW.po | 1217 ++++++++++++++++++++++++++----------------------------- 12 files changed, 2650 insertions(+), 2214 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 10ebd44..d363cb2 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-03 11:51+0530\n" +"POT-Creation-Date: 2017-01-26 23:05+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -113,8 +113,9 @@ msgstr "" msgid "Unable to access remote ISO. Details: %(err)s" msgstr "" -msgid "An error occurred when probing image OS information." -msgstr "Beim Prüfen der OS-Informationen des Image ist ein Fehler aufgetreten." +#, python-format +msgid "Error probing image OS information: %(err)s" +msgstr "" #, python-format msgid "Unable to read image file %(filename)s" @@ -511,6 +512,9 @@ msgid "" "html ." msgstr "" +msgid "'enable_rdma' must be of type boolean (true or false)." +msgstr "" + #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." @@ -1350,13 +1354,6 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" -"Die virtuelle Maschine '%(vm)s' muss vor dem Erstellen eines Snapshots " -"gestoppt werden." - -#, python-format -msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1432,11 +1429,8 @@ msgid "The maximum number of vCPUs is too large for this system." msgstr "" msgid "" -"When CPU topology is defined, vCPUs must be a multiple of a product of cores " -"and threads." -msgstr "" - -msgid "The number of threads is too large for this system." +"When CPU topology is defined, CPUs must be a multiple of the 'threads' " +"number defined." msgstr "" msgid "" @@ -1454,6 +1448,13 @@ msgid "" "'cores', 'threads'." msgstr "" +msgid "Unable to update Max CPU or CPU topology when guest is running." +msgstr "" + +#, python-format +msgid "Unable to hot plug/unplug CPUs. Details: %(err)s" +msgstr "Speicherpools konnten nicht aufgelistet werden. Details: %(err)s" + #, python-format msgid "Invalid volume group name parameter: %(name)s." msgstr "" @@ -1744,18 +1745,18 @@ msgstr "" msgid "Snapshot" msgstr "" +msgid "Processor" +msgstr "Prozessor" + msgid "Name" msgstr "Name" -msgid "More" -msgstr "" - -msgid "Max CPU" -msgstr "" - msgid "Memory (MB)" msgstr "Speicher (MB)" +msgid "More" +msgstr "" + msgid "Max Memory (MB)" msgstr "" @@ -1768,6 +1769,9 @@ msgstr "Symbol" msgid "Console" msgstr "" +msgid "Nothing selected" +msgstr "" + msgid "sclp" msgstr "" @@ -1846,6 +1850,39 @@ msgstr "" msgid "Created" msgstr "Erstellt" +msgid "Current CPU Number" +msgstr "" + +msgid "" +"Current CPU must be equal or lower than the Maximum CPU value. If a topology " +"is set, it must be also be a multiple of the 'threads' value." +msgstr "" + +msgid "Max CPU" +msgstr "" + +msgid "" +"Unable to edit maximum CPU or CPU topology when editing a running or paused " +"virtual machine." +msgstr "" + +msgid "" +"If a topology is set, this value will be the product of sockets * times * " +"cores." +msgstr "" + +msgid "Manually set CPU topology" +msgstr "CPU-Topologie manuell festlegen" + +msgid "Sockets" +msgstr "" + +msgid "Cores" +msgstr "Kerne" + +msgid "Threads" +msgstr "Threads" + msgid "Save" msgstr "Speichern" @@ -1970,6 +2007,14 @@ msgstr "Kennwort" msgid "Password of the user in the remote host" msgstr "" +msgid "Use RDMA transport" +msgstr "" + +msgid "" +"Check this option only if RDMA is properly configured in both source and " +"destination hosts, otherwise migration will fail." +msgstr "" + msgid "Delete this VM when the migration is completed" msgstr "" @@ -2111,6 +2156,15 @@ msgstr "" msgid "Please check the invalid Storage Pools or Paths" msgstr "" +msgid "macvtap" +msgstr "" + +msgid "ovs" +msgstr "" + +msgid "network" +msgstr "Netz" + msgid "" "This will delete the %1 virtual machine and its virtual disks. This " "operation cannot be undone. Would you like to continue?" @@ -2155,7 +2209,9 @@ msgstr "" msgid "Memory value cannot be higher than Max Memory value" msgstr "" -msgid "Current CPUs value cannot be higher than Max CPU value" +msgid "" +"For better performance it is recommended a threads per core value not " +"greater than %1." msgstr "" msgid "" @@ -2208,6 +2264,15 @@ msgstr "" msgid "Following devices will be affected, confirm?" msgstr "" +msgid "Bridge" +msgstr "" + +msgid "Vepa" +msgstr "" + +msgid "None" +msgstr "" + msgid "unavailable" msgstr "nicht verfügbar" @@ -2551,6 +2616,21 @@ msgstr "" msgid "Ok" msgstr "" +msgid "Template Name" +msgstr "Vorlagen" + +msgid "" +"The name used to identify the template. If omitted, a name will be " +"automatically chosen." +msgstr "" +"Der für die Kennzeichnung der virtuellen Maschine verwendete Name. Falls er " +"ausgelassen wird, wird ein Name anhand der verwendeten Vorlage ausgewählt." + +msgid "" +"When selecting more than one Image Template, a name will be automatically " +"chosen for each Image Template selected." +msgstr "" + msgid "Where is the source media for this template? " msgstr "" @@ -2581,9 +2661,6 @@ msgstr "" msgid "Edit Template" msgstr "Vorlage bearbeiten" -msgid "Processor" -msgstr "Prozessor" - msgid "CDROM" msgstr "CD-ROM" @@ -2602,17 +2679,14 @@ msgstr "Plattenformat" msgid "Add Interface" msgstr "" -msgid "Current CPU Number" +msgid "pool" msgstr "" -msgid "Manually set CPU topology" -msgstr "CPU-Topologie manuell festlegen" - -msgid "Cores" -msgstr "Kerne" +msgid "bridge" +msgstr "" -msgid "Threads" -msgstr "Threads" +msgid "vepa" +msgstr "" msgid "State" msgstr "" @@ -2650,6 +2724,9 @@ msgstr "" msgid "Extending logical pool" msgstr "" +msgid "%" +msgstr "" + msgid "Deactivate" msgstr "" @@ -2697,3 +2774,9 @@ msgstr "" msgid "M" msgstr "" + +#~ msgid "" +#~ "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." +#~ msgstr "" +#~ "Die virtuelle Maschine '%(vm)s' muss vor dem Erstellen eines Snapshots " +#~ "gestoppt werden." diff --git a/po/en_US.po b/po/en_US.po index 366c30e..1fe6b84 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-03 11:51+0530\n" +"POT-Creation-Date: 2017-01-26 23:05+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -99,7 +99,8 @@ msgstr "" msgid "Unable to access remote ISO. Details: %(err)s" msgstr "" -msgid "An error occurred when probing image OS information." +#, python-format +msgid "Error probing image OS information: %(err)s" msgstr "" #, python-format @@ -456,6 +457,9 @@ msgid "" "html ." msgstr "" +msgid "'enable_rdma' must be of type boolean (true or false)." +msgstr "" + #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." @@ -1186,11 +1190,6 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" - -#, python-format -msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1250,11 +1249,8 @@ msgid "The maximum number of vCPUs is too large for this system." msgstr "" msgid "" -"When CPU topology is defined, vCPUs must be a multiple of a product of cores " -"and threads." -msgstr "" - -msgid "The number of threads is too large for this system." +"When CPU topology is defined, CPUs must be a multiple of the 'threads' " +"number defined." msgstr "" msgid "" @@ -1272,6 +1268,13 @@ msgid "" "'cores', 'threads'." msgstr "" +msgid "Unable to update Max CPU or CPU topology when guest is running." +msgstr "" + +#, python-format +msgid "Unable to hot plug/unplug CPUs. Details: %(err)s" +msgstr "" + #, python-format msgid "Invalid volume group name parameter: %(name)s." msgstr "" @@ -1560,16 +1563,16 @@ msgstr "" msgid "Snapshot" msgstr "" -msgid "Name" +msgid "Processor" msgstr "" -msgid "More" +msgid "Name" msgstr "" -msgid "Max CPU" +msgid "Memory (MB)" msgstr "" -msgid "Memory (MB)" +msgid "More" msgstr "" msgid "Max Memory (MB)" @@ -1584,6 +1587,9 @@ msgstr "" msgid "Console" msgstr "" +msgid "Nothing selected" +msgstr "" + msgid "sclp" msgstr "" @@ -1662,6 +1668,39 @@ msgstr "" msgid "Created" msgstr "" +msgid "Current CPU Number" +msgstr "" + +msgid "" +"Current CPU must be equal or lower than the Maximum CPU value. If a topology " +"is set, it must be also be a multiple of the 'threads' value." +msgstr "" + +msgid "Max CPU" +msgstr "" + +msgid "" +"Unable to edit maximum CPU or CPU topology when editing a running or paused " +"virtual machine." +msgstr "" + +msgid "" +"If a topology is set, this value will be the product of sockets * times * " +"cores." +msgstr "" + +msgid "Manually set CPU topology" +msgstr "" + +msgid "Sockets" +msgstr "" + +msgid "Cores" +msgstr "" + +msgid "Threads" +msgstr "" + msgid "Save" msgstr "" @@ -1786,6 +1825,14 @@ msgstr "" msgid "Password of the user in the remote host" msgstr "" +msgid "Use RDMA transport" +msgstr "" + +msgid "" +"Check this option only if RDMA is properly configured in both source and " +"destination hosts, otherwise migration will fail." +msgstr "" + msgid "Delete this VM when the migration is completed" msgstr "" @@ -1927,6 +1974,15 @@ msgstr "" msgid "Please check the invalid Storage Pools or Paths" msgstr "" +msgid "macvtap" +msgstr "" + +msgid "ovs" +msgstr "" + +msgid "network" +msgstr "" + msgid "" "This will delete the %1 virtual machine and its virtual disks. This " "operation cannot be undone. Would you like to continue?" @@ -1971,7 +2027,9 @@ msgstr "" msgid "Memory value cannot be higher than Max Memory value" msgstr "" -msgid "Current CPUs value cannot be higher than Max CPU value" +msgid "" +"For better performance it is recommended a threads per core value not " +"greater than %1." msgstr "" msgid "" @@ -2020,6 +2078,15 @@ msgstr "" msgid "Following devices will be affected, confirm?" msgstr "" +msgid "Bridge" +msgstr "" + +msgid "Vepa" +msgstr "" + +msgid "None" +msgstr "" + msgid "unavailable" msgstr "" @@ -2347,6 +2414,19 @@ msgstr "" msgid "Ok" msgstr "" +msgid "Template Name" +msgstr "" + +msgid "" +"The name used to identify the template. If omitted, a name will be " +"automatically chosen." +msgstr "" + +msgid "" +"When selecting more than one Image Template, a name will be automatically " +"chosen for each Image Template selected." +msgstr "" + msgid "Where is the source media for this template? " msgstr "" @@ -2377,9 +2457,6 @@ msgstr "" msgid "Edit Template" msgstr "" -msgid "Processor" -msgstr "" - msgid "CDROM" msgstr "" @@ -2398,16 +2475,13 @@ msgstr "" msgid "Add Interface" msgstr "" -msgid "Current CPU Number" -msgstr "" - -msgid "Manually set CPU topology" +msgid "pool" msgstr "" -msgid "Cores" +msgid "bridge" msgstr "" -msgid "Threads" +msgid "vepa" msgstr "" msgid "State" @@ -2446,6 +2520,9 @@ msgstr "" msgid "Extending logical pool" msgstr "" +msgid "%" +msgstr "" + msgid "Deactivate" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index d8bcd2a..2c251c7 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-03 11:51+0530\n" +"POT-Creation-Date: 2017-01-26 23:05+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -113,10 +113,9 @@ msgstr "" msgid "Unable to access remote ISO. Details: %(err)s" msgstr "" -msgid "An error occurred when probing image OS information." +#, python-format +msgid "Error probing image OS information: %(err)s" msgstr "" -"Se ha producido un error al analizar la información de sistema operativo de " -"las imágenes. " #, python-format msgid "Unable to read image file %(filename)s" @@ -492,6 +491,9 @@ msgid "" "html ." msgstr "" +msgid "'enable_rdma' must be of type boolean (true or false)." +msgstr "" + #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." @@ -1347,13 +1349,6 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" -"Se ha de detener la máquina virtual '%(vm)s' antes de crear una instantánea " -"de la misma. " - -#, python-format -msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1427,11 +1422,8 @@ msgid "The maximum number of vCPUs is too large for this system." msgstr "" msgid "" -"When CPU topology is defined, vCPUs must be a multiple of a product of cores " -"and threads." -msgstr "" - -msgid "The number of threads is too large for this system." +"When CPU topology is defined, CPUs must be a multiple of the 'threads' " +"number defined." msgstr "" msgid "" @@ -1449,6 +1441,14 @@ msgid "" "'cores', 'threads'." msgstr "" +msgid "Unable to update Max CPU or CPU topology when guest is running." +msgstr "" + +#, python-format +msgid "Unable to hot plug/unplug CPUs. Details: %(err)s" +msgstr "" +"No se pueden listar las agrupaciones de almacenamiento. Detalles: %(err)s" + #, python-format msgid "Invalid volume group name parameter: %(name)s." msgstr "" @@ -1739,18 +1739,18 @@ msgstr "" msgid "Snapshot" msgstr "" +msgid "Processor" +msgstr "Procesador" + msgid "Name" msgstr "Nombre" -msgid "More" -msgstr "" - -msgid "Max CPU" -msgstr "" - msgid "Memory (MB)" msgstr "Memoria (MB)" +msgid "More" +msgstr "" + msgid "Max Memory (MB)" msgstr "" @@ -1763,6 +1763,9 @@ msgstr "Icono" msgid "Console" msgstr "" +msgid "Nothing selected" +msgstr "" + msgid "sclp" msgstr "" @@ -1841,6 +1844,39 @@ msgstr "" msgid "Created" msgstr "Creado" +msgid "Current CPU Number" +msgstr "" + +msgid "" +"Current CPU must be equal or lower than the Maximum CPU value. If a topology " +"is set, it must be also be a multiple of the 'threads' value." +msgstr "" + +msgid "Max CPU" +msgstr "" + +msgid "" +"Unable to edit maximum CPU or CPU topology when editing a running or paused " +"virtual machine." +msgstr "" + +msgid "" +"If a topology is set, this value will be the product of sockets * times * " +"cores." +msgstr "" + +msgid "Manually set CPU topology" +msgstr "Establezca manualmente la topología de CPU" + +msgid "Sockets" +msgstr "" + +msgid "Cores" +msgstr "Núcleos" + +msgid "Threads" +msgstr "Hebras" + msgid "Save" msgstr "Guardar" @@ -1965,6 +2001,14 @@ msgstr "Contraseña" msgid "Password of the user in the remote host" msgstr "" +msgid "Use RDMA transport" +msgstr "" + +msgid "" +"Check this option only if RDMA is properly configured in both source and " +"destination hosts, otherwise migration will fail." +msgstr "" + msgid "Delete this VM when the migration is completed" msgstr "" @@ -2106,6 +2150,15 @@ msgstr "" msgid "Please check the invalid Storage Pools or Paths" msgstr "" +msgid "macvtap" +msgstr "" + +msgid "ovs" +msgstr "" + +msgid "network" +msgstr "Red" + msgid "" "This will delete the %1 virtual machine and its virtual disks. This " "operation cannot be undone. Would you like to continue?" @@ -2150,7 +2203,9 @@ msgstr "" msgid "Memory value cannot be higher than Max Memory value" msgstr "" -msgid "Current CPUs value cannot be higher than Max CPU value" +msgid "" +"For better performance it is recommended a threads per core value not " +"greater than %1." msgstr "" msgid "" @@ -2203,6 +2258,15 @@ msgstr "" msgid "Following devices will be affected, confirm?" msgstr "" +msgid "Bridge" +msgstr "" + +msgid "Vepa" +msgstr "" + +msgid "None" +msgstr "" + msgid "unavailable" msgstr "no disponible" @@ -2542,6 +2606,21 @@ msgstr "" msgid "Ok" msgstr "" +msgid "Template Name" +msgstr "Plantillas" + +msgid "" +"The name used to identify the template. If omitted, a name will be " +"automatically chosen." +msgstr "" +"El nombre que se utiliza para identificar la máquina virtual. Si se omite, " +"se elegirá un nombre basándose en la plantilla utilizada." + +msgid "" +"When selecting more than one Image Template, a name will be automatically " +"chosen for each Image Template selected." +msgstr "" + msgid "Where is the source media for this template? " msgstr "" @@ -2572,9 +2651,6 @@ msgstr "" msgid "Edit Template" msgstr "Editar plantilla" -msgid "Processor" -msgstr "Procesador" - msgid "CDROM" msgstr "CDROM" @@ -2593,17 +2669,14 @@ msgstr "Formato de disco" msgid "Add Interface" msgstr "" -msgid "Current CPU Number" +msgid "pool" msgstr "" -msgid "Manually set CPU topology" -msgstr "Establezca manualmente la topología de CPU" - -msgid "Cores" -msgstr "Núcleos" +msgid "bridge" +msgstr "" -msgid "Threads" -msgstr "Hebras" +msgid "vepa" +msgstr "" msgid "State" msgstr "" @@ -2641,6 +2714,9 @@ msgstr "" msgid "Extending logical pool" msgstr "" +msgid "%" +msgstr "" + msgid "Deactivate" msgstr "" @@ -2688,3 +2764,9 @@ msgstr "" msgid "M" msgstr "" + +#~ msgid "" +#~ "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." +#~ msgstr "" +#~ "Se ha de detener la máquina virtual '%(vm)s' antes de crear una " +#~ "instantánea de la misma. " diff --git a/po/fr_FR.po b/po/fr_FR.po index bb70866..63bdbcd 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-03 11:51+0530\n" +"POT-Creation-Date: 2017-01-26 23:05+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -118,10 +118,9 @@ msgstr "" msgid "Unable to access remote ISO. Details: %(err)s" msgstr "" -msgid "An error occurred when probing image OS information." +#, python-format +msgid "Error probing image OS information: %(err)s" msgstr "" -"Une erreur s'est produite lors de l'application d'une sonde aux informations " -"de système d'exploitation d'image." #, python-format msgid "Unable to read image file %(filename)s" @@ -509,6 +508,9 @@ msgid "" "html ." msgstr "" +msgid "'enable_rdma' must be of type boolean (true or false)." +msgstr "" + #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." @@ -1349,13 +1351,6 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" -"La machine virtuelle '%(vm)s' doit être arrêtée avant la création d'une " -"image instantanée de celle-ci." - -#, python-format -msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1432,11 +1427,8 @@ msgid "The maximum number of vCPUs is too large for this system." msgstr "" msgid "" -"When CPU topology is defined, vCPUs must be a multiple of a product of cores " -"and threads." -msgstr "" - -msgid "The number of threads is too large for this system." +"When CPU topology is defined, CPUs must be a multiple of the 'threads' " +"number defined." msgstr "" msgid "" @@ -1454,6 +1446,13 @@ msgid "" "'cores', 'threads'." msgstr "" +msgid "Unable to update Max CPU or CPU topology when guest is running." +msgstr "" + +#, python-format +msgid "Unable to hot plug/unplug CPUs. Details: %(err)s" +msgstr "Impossible de répertorier les pools de stockage. Détails : %(err)s" + #, python-format msgid "Invalid volume group name parameter: %(name)s." msgstr "" @@ -1744,18 +1743,18 @@ msgstr "" msgid "Snapshot" msgstr "" +msgid "Processor" +msgstr "Processeur" + msgid "Name" msgstr "Nom" -msgid "More" -msgstr "" - -msgid "Max CPU" -msgstr "" - msgid "Memory (MB)" msgstr "Mémoire (Mo)" +msgid "More" +msgstr "" + msgid "Max Memory (MB)" msgstr "" @@ -1768,6 +1767,9 @@ msgstr "Icône" msgid "Console" msgstr "" +msgid "Nothing selected" +msgstr "" + msgid "sclp" msgstr "" @@ -1846,6 +1848,39 @@ msgstr "" msgid "Created" msgstr "Créé" +msgid "Current CPU Number" +msgstr "" + +msgid "" +"Current CPU must be equal or lower than the Maximum CPU value. If a topology " +"is set, it must be also be a multiple of the 'threads' value." +msgstr "" + +msgid "Max CPU" +msgstr "" + +msgid "" +"Unable to edit maximum CPU or CPU topology when editing a running or paused " +"virtual machine." +msgstr "" + +msgid "" +"If a topology is set, this value will be the product of sockets * times * " +"cores." +msgstr "" + +msgid "Manually set CPU topology" +msgstr "Définir manuellement la topologie d'UC" + +msgid "Sockets" +msgstr "" + +msgid "Cores" +msgstr "Coeurs" + +msgid "Threads" +msgstr "Unités d'exécution" + msgid "Save" msgstr "Sauvegarder" @@ -1970,6 +2005,14 @@ msgstr "Mot de passe" msgid "Password of the user in the remote host" msgstr "" +msgid "Use RDMA transport" +msgstr "" + +msgid "" +"Check this option only if RDMA is properly configured in both source and " +"destination hosts, otherwise migration will fail." +msgstr "" + msgid "Delete this VM when the migration is completed" msgstr "" @@ -2111,6 +2154,15 @@ msgstr "" msgid "Please check the invalid Storage Pools or Paths" msgstr "" +msgid "macvtap" +msgstr "" + +msgid "ovs" +msgstr "" + +msgid "network" +msgstr "Réseau" + msgid "" "This will delete the %1 virtual machine and its virtual disks. This " "operation cannot be undone. Would you like to continue?" @@ -2155,7 +2207,9 @@ msgstr "" msgid "Memory value cannot be higher than Max Memory value" msgstr "" -msgid "Current CPUs value cannot be higher than Max CPU value" +msgid "" +"For better performance it is recommended a threads per core value not " +"greater than %1." msgstr "" msgid "" @@ -2208,6 +2262,15 @@ msgstr "" msgid "Following devices will be affected, confirm?" msgstr "" +msgid "Bridge" +msgstr "" + +msgid "Vepa" +msgstr "" + +msgid "None" +msgstr "" + msgid "unavailable" msgstr "non disponible" @@ -2551,6 +2614,21 @@ msgstr "" msgid "Ok" msgstr "" +msgid "Template Name" +msgstr "Modèles" + +msgid "" +"The name used to identify the template. If omitted, a name will be " +"automatically chosen." +msgstr "" +"Nom utilisé pour identifier la machine virtuelle. S'il est omis, un nom sera " +"choisi en fonction du modèle utilisé." + +msgid "" +"When selecting more than one Image Template, a name will be automatically " +"chosen for each Image Template selected." +msgstr "" + msgid "Where is the source media for this template? " msgstr "" @@ -2581,9 +2659,6 @@ msgstr "" msgid "Edit Template" msgstr "Editer le modèle" -msgid "Processor" -msgstr "Processeur" - msgid "CDROM" msgstr "CD-ROM" @@ -2602,17 +2677,14 @@ msgstr "Format de disque" msgid "Add Interface" msgstr "" -msgid "Current CPU Number" +msgid "pool" msgstr "" -msgid "Manually set CPU topology" -msgstr "Définir manuellement la topologie d'UC" - -msgid "Cores" -msgstr "Coeurs" +msgid "bridge" +msgstr "" -msgid "Threads" -msgstr "Unités d'exécution" +msgid "vepa" +msgstr "" msgid "State" msgstr "" @@ -2650,6 +2722,9 @@ msgstr "" msgid "Extending logical pool" msgstr "" +msgid "%" +msgstr "" + msgid "Deactivate" msgstr "" @@ -2697,3 +2772,9 @@ msgstr "" msgid "M" msgstr "" + +#~ msgid "" +#~ "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." +#~ msgstr "" +#~ "La machine virtuelle '%(vm)s' doit être arrêtée avant la création d'une " +#~ "image instantanée de celle-ci." diff --git a/po/it_IT.po b/po/it_IT.po index 46ef402..7236554 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-03 11:51+0530\n" +"POT-Creation-Date: 2017-01-26 23:05+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -110,9 +110,9 @@ msgstr "" msgid "Unable to access remote ISO. Details: %(err)s" msgstr "" -msgid "An error occurred when probing image OS information." +#, python-format +msgid "Error probing image OS information: %(err)s" msgstr "" -"Si è verificato un errore durante l'analisi delle informazioni SO immagine." #, python-format msgid "Unable to read image file %(filename)s" @@ -488,6 +488,9 @@ msgid "" "html ." msgstr "" +msgid "'enable_rdma' must be of type boolean (true or false)." +msgstr "" + #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." @@ -1308,13 +1311,6 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" -"La macchina virtuale '%(vm)s' deve essere arrestata prima di poterne creare " -"l'istantanea." - -#, python-format -msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1388,11 +1384,8 @@ msgid "The maximum number of vCPUs is too large for this system." msgstr "" msgid "" -"When CPU topology is defined, vCPUs must be a multiple of a product of cores " -"and threads." -msgstr "" - -msgid "The number of threads is too large for this system." +"When CPU topology is defined, CPUs must be a multiple of the 'threads' " +"number defined." msgstr "" msgid "" @@ -1410,6 +1403,13 @@ msgid "" "'cores', 'threads'." msgstr "" +msgid "Unable to update Max CPU or CPU topology when guest is running." +msgstr "" + +#, python-format +msgid "Unable to hot plug/unplug CPUs. Details: %(err)s" +msgstr "Impossibile elencare i pool di memoria. Dettagli: %(err)s" + #, python-format msgid "Invalid volume group name parameter: %(name)s." msgstr "" @@ -1700,18 +1700,18 @@ msgstr "" msgid "Snapshot" msgstr "" +msgid "Processor" +msgstr "Processore" + msgid "Name" msgstr "Nome" -msgid "More" -msgstr "" - -msgid "Max CPU" -msgstr "" - msgid "Memory (MB)" msgstr "Memoria (MB)" +msgid "More" +msgstr "" + msgid "Max Memory (MB)" msgstr "" @@ -1724,6 +1724,9 @@ msgstr "Icona" msgid "Console" msgstr "" +msgid "Nothing selected" +msgstr "" + msgid "sclp" msgstr "" @@ -1802,6 +1805,39 @@ msgstr "" msgid "Created" msgstr "Creato" +msgid "Current CPU Number" +msgstr "" + +msgid "" +"Current CPU must be equal or lower than the Maximum CPU value. If a topology " +"is set, it must be also be a multiple of the 'threads' value." +msgstr "" + +msgid "Max CPU" +msgstr "" + +msgid "" +"Unable to edit maximum CPU or CPU topology when editing a running or paused " +"virtual machine." +msgstr "" + +msgid "" +"If a topology is set, this value will be the product of sockets * times * " +"cores." +msgstr "" + +msgid "Manually set CPU topology" +msgstr "Imposta manualmente la topologia CPU" + +msgid "Sockets" +msgstr "" + +msgid "Cores" +msgstr "Core" + +msgid "Threads" +msgstr "Thread" + msgid "Save" msgstr "Salva" @@ -1926,6 +1962,14 @@ msgstr "Password" msgid "Password of the user in the remote host" msgstr "" +msgid "Use RDMA transport" +msgstr "" + +msgid "" +"Check this option only if RDMA is properly configured in both source and " +"destination hosts, otherwise migration will fail." +msgstr "" + msgid "Delete this VM when the migration is completed" msgstr "" @@ -2067,6 +2111,15 @@ msgstr "" msgid "Please check the invalid Storage Pools or Paths" msgstr "" +msgid "macvtap" +msgstr "" + +msgid "ovs" +msgstr "" + +msgid "network" +msgstr "Rete" + msgid "" "This will delete the %1 virtual machine and its virtual disks. This " "operation cannot be undone. Would you like to continue?" @@ -2111,7 +2164,9 @@ msgstr "" msgid "Memory value cannot be higher than Max Memory value" msgstr "" -msgid "Current CPUs value cannot be higher than Max CPU value" +msgid "" +"For better performance it is recommended a threads per core value not " +"greater than %1." msgstr "" msgid "" @@ -2164,6 +2219,15 @@ msgstr "" msgid "Following devices will be affected, confirm?" msgstr "" +msgid "Bridge" +msgstr "" + +msgid "Vepa" +msgstr "" + +msgid "None" +msgstr "" + msgid "unavailable" msgstr "non disponibile" @@ -2506,6 +2570,21 @@ msgstr "" msgid "Ok" msgstr "" +msgid "Template Name" +msgstr "Modelli" + +msgid "" +"The name used to identify the template. If omitted, a name will be " +"automatically chosen." +msgstr "" +"Il nome utilizzato per identificare la macchina virtuale. Se il nome viene " +"omesso ne verrà scelto uno in base al modello utilizzato." + +msgid "" +"When selecting more than one Image Template, a name will be automatically " +"chosen for each Image Template selected." +msgstr "" + msgid "Where is the source media for this template? " msgstr "" @@ -2536,9 +2615,6 @@ msgstr "" msgid "Edit Template" msgstr "Modifica modello" -msgid "Processor" -msgstr "Processore" - msgid "CDROM" msgstr "CDROM" @@ -2557,17 +2633,14 @@ msgstr "Formato disco" msgid "Add Interface" msgstr "" -msgid "Current CPU Number" +msgid "pool" msgstr "" -msgid "Manually set CPU topology" -msgstr "Imposta manualmente la topologia CPU" - -msgid "Cores" -msgstr "Core" +msgid "bridge" +msgstr "" -msgid "Threads" -msgstr "Thread" +msgid "vepa" +msgstr "" msgid "State" msgstr "" @@ -2605,6 +2678,9 @@ msgstr "" msgid "Extending logical pool" msgstr "" +msgid "%" +msgstr "" + msgid "Deactivate" msgstr "" @@ -2652,3 +2728,9 @@ msgstr "" msgid "M" msgstr "" + +#~ msgid "" +#~ "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." +#~ msgstr "" +#~ "La macchina virtuale '%(vm)s' deve essere arrestata prima di poterne " +#~ "creare l'istantanea." diff --git a/po/ja_JP.po b/po/ja_JP.po index 294ea14..abb2068 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-03 11:51+0530\n" +"POT-Creation-Date: 2017-01-26 23:05+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -93,25 +93,16 @@ msgstr "" "正しくありませんでした" #, python-format -msgid "" -"The hypervisor doesn't have permission to use this ISO %(filename)s. " -"Consider moving it under /var/lib/libvirt, or set the search permission to " -"file access control lists for '%(user)s' user if possible, or add the " -"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " -"'path_to_iso'.Details: %(err)s" -msgstr "" -"ハイパーバイザーにこの ISO %(filename)s を使用する権限がありません。これを /" -"var/lib/libvirt の下に移動するか、可能であれば「%(user)s」ユーザーのファイ" -"ル・アクセス制御リストに対する検索許可を設定するか、「%(user)s」を ISO パス・" -"グループに追加するか、または (非推奨ですが)「chmod -R o+x path_to_iso」を実行" -"することを検討します。詳細: %(err)s" +msgid "The hypervisor doesn't have permission to use this ISO %(filename)s. Consider moving it under /var/lib/libvirt, or set the search permission to file access control lists for '%(user)s' user if possible, or add the '%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x 'path_to_iso'.Details: %(err)s" +msgstr "ハイパーバイザーにこの ISO %(filename)s を使用する権限がありません。これを /var/lib/libvirt の下に移動することを検討してください。あるいは、「%(user)s」ユーザーのファイル・アクセス制御リストに検索許可を設定する (可能な場合) か、「%(user)s」を ISO パス・グループに追加するか、または (非推奨ですが)「chmod -R o+x 'path_to_iso'」を実行してください。詳細: %(err)s" #, python-format msgid "Unable to access remote ISO. Details: %(err)s" -msgstr "" +msgstr "リモート ISO にアクセスできません。詳細: %(err)s" -msgid "An error occurred when probing image OS information." -msgstr "イメージ OS 情報のプローブ時にエラーが発生しました。" +#, python-format +msgid "Error probing image OS information: %(err)s" +msgstr "" #, python-format msgid "Unable to read image file %(filename)s" @@ -263,28 +254,21 @@ msgid "Unable to resume VM '%(name)s'. Details: %(err)s" msgstr "VM「%(name)s」を再開できません。詳細: %(err)s" #, python-format -msgid "" -"Memory assigned is higher then the maximum allowed in the host: " -"%(maxmem)sMib." -msgstr "" +msgid "Memory assigned is higher then the maximum allowed in the host: %(maxmem)sMib." +msgstr "割り当てられたメモリーはホストで許可された最大を超えています: %(maxmem)sMib。" #, python-format -msgid "" -"Guest '%(name)s' does not support live memory update. Please, with the guest " -"offline, set Maximum Memory with a value greater then Memory to enable this " -"feature." -msgstr "" +msgid "Guest '%(name)s' does not support live memory update. Please, with the guest offline, set Maximum Memory with a value greater then Memory to enable this feature." +msgstr "ゲスト「%(name)s」はライブ・メモリー・アップデートをサポートしていません。この機能を使用可能にするには、このゲストをオフラインにした状態で、Maximum Memory を Memory より大きい値で設定してください。" msgid "Only increase memory is allowed in active VMs" msgstr "アクティブ VM ではメモリーの増加のみが許可されています" msgid "There are not enough free slots to add a new memory device." -msgstr "" +msgstr "新規メモリー・デバイスを追加するだけの十分なフリー・スロットがありません。" -msgid "" -"Host's libvirt or qemu version does not support memory devices and memory " -"hotplug. Libvirt must be >= 1.2.14 and QEMU must be >= 2.1." -msgstr "" +msgid "Host's libvirt or qemu version does not support memory devices and memory hotplug. Libvirt must be >= 1.2.14 and QEMU must be >= 2.1." +msgstr "ホストの libvirt または qemu のバージョンはデバイスやメモリー・ホット・プラグをサポートしていません。Libvirt は 1.2.14 以上でなければなりません。QEMU は 2.1 以上でなければなりません。" #, python-format msgid "Error attaching memory device. Details: %(error)s" @@ -310,170 +294,143 @@ msgstr "" "%(name)s をリセットできません。仮想マシンは既にシャットオフされています。" msgid "Boot order must be a list. Devices accepted: hd, cdrom, fd or network." -msgstr "" +msgstr "Boot order はリストになっていなければなりません。受け入れられるデバイス: hd、cdrom、fd、または network。" msgid "Bootmenu must be boolean. Values accepted: true of false." -msgstr "" +msgstr "Bootmenu はブール値になっていなければなりません。受け入れられる値: true または false。" msgid "Graphic type not valid. Values accepted: vnc or spice." -msgstr "" +msgstr "グラフィック・タイプが無効です。受け入れられる値: vnc または spice。" #, python-format msgid "Migrate to localhost %(host)s is not allowed." -msgstr "" +msgstr "ローカル・ホスト %(host)s へのマイグレーションは許可されていません。" #, python-format -msgid "" -"To migrate a virtual machine to the remote host %(host)s the user %(user)s " -"must have password-less login to the remote host." -msgstr "" +msgid "To migrate a virtual machine to the remote host %(host)s the user %(user)s must have password-less login to the remote host." +msgstr "ユーザー %(user)s がリモート・ホスト %(host)s に仮想マシンをマイグレーションするには、そのユーザーがリモート・ホストにパスワードなしでログインできなければなりません。" #, python-format msgid "Can not migrate virtual machine %(name)s when its in %(state)s state." -msgstr "" +msgstr "%(state)s 状態になっている仮想マシン %(name)s はマイグレーションできません。" #, python-format msgid "Failed to migrate virtual machine %(name)s due error: %(err)s" -msgstr "" +msgstr "エラーが発生したため、仮想マシン %(name)s をマイグレーションできませんでした: %(err)s" msgid "User name of the remote server must be a string." -msgstr "" +msgstr "リモート・サーバーのユーザー名はストリングでなければなりません。" msgid "Destination host of the migration must be a string." -msgstr "" +msgstr "マイグレーションの宛先ホストはストリングでなければなりません。" #, python-format msgid "Unable to create file %(path)s at %(host)s using user %(user)s." -msgstr "" +msgstr "ユーザー %(user)s を使用してホスト %(host)s でファイル %(path)s を作成できません。" #, python-format msgid "Unable to read disk size of %(path)s, error: %(error)s" -msgstr "" +msgstr "%(path)s のディスク・サイズを読み取れません。エラー: %(error)s" #, python-format -msgid "" -"Unable to create disk image %(path)s at %(host)s using user %(user)s. Error: " -"%(error)s" -msgstr "" +msgid "Unable to create disk image %(path)s at %(host)s using user %(user)s. Error: %(error)s" +msgstr "ユーザー %(user)s を使用して %(host)s でディスク・イメージ %(path)s を作成できません。エラー: %(error)s" #, python-format -msgid "" -"Unable to migrate virtual machine to remote host %(host)s with arch " -"%(destarch)s using localhost with arch %(srcarch)s." -msgstr "" +msgid "Unable to migrate virtual machine to remote host %(host)s with arch %(destarch)s using localhost with arch %(srcarch)s." +msgstr "アーキテクチャー %(srcarch)s のローカル・ホストを使用してアーキテクチャー %(destarch)s のリモート・ホスト %(host)s に仮想マシンをマイグレーションできません。" #, python-format -msgid "" -"Unable to migrate virtual machine to remote host %(host)s with hypervisor " -"%(desthyp)s because localhost uses hypervisor %(srchyp)s." -msgstr "" +msgid "Unable to migrate virtual machine to remote host %(host)s with hypervisor %(desthyp)s because localhost uses hypervisor %(srchyp)s." +msgstr "ローカル・ホストではハイパーバイザー %(srchyp)s が使用されているため、ハイパーバイザー %(desthyp)s のリモート・ホスト %(host)s に仮想マシンをマイグレーションできません。" #, python-format -msgid "" -"Unable to determine remote host hypervisor and architecture. Error: %(error)s" -msgstr "" +msgid "Unable to determine remote host hypervisor and architecture. Error: %(error)s" +msgstr "リモート・ホストのハイパーバイザーとアーキテクチャーを判別できません。エラー: %(error)s" #, python-format -msgid "" -"Unable to migrate virtual machine: subcores per core setting from " -"localhostand remote host %(host)s differs." -msgstr "" +msgid "Unable to migrate virtual machine: subcores per core setting from localhostand remote host %(host)s differs." +msgstr "仮想マシンをマイグレーションできません: コアあたりのサブコアの設定がローカル・ホストとリモート・ホスト %(host)s で異なります。" #, python-format -msgid "" -"Unable to setup password-less login at remote host %(host)s using user " -"%(user)s. Error: %(error)s" -msgstr "" +msgid "Unable to setup password-less login at remote host %(host)s using user %(user)s. Error: %(error)s" +msgstr "ユーザー %(user)s を使用したリモート・ホスト %(host)s へのパスワードなしのログインをセットアップできません。エラー: %(error)s" msgid "Password field must be a string." -msgstr "" +msgstr "「パスワード」フィールドの値はストリングでなければなりません。" msgid "Error creating local host ssh rsa key of user 'root'." -msgstr "" +msgstr "ユーザー「root」のローカル・ホスト ssh rsa 鍵を作成するときにエラーが発生しました。" #, python-format msgid "%(param)s value (%(mem)sMiB) must be aligned to %(alignment)sMiB." -msgstr "" +msgstr "%(param)s 値 (%(mem)sMiB) は %(alignment)sMiB に調整する必要があります。" #, python-format -msgid "" -"Unable to update the following parameters while the VM is offline: %(params)s" -msgstr "" +msgid "Unable to update the following parameters while the VM is offline: %(params)s" +msgstr "次のパラメーターは、VM がオフラインのときには更新できません: %(params)s" #, python-format -msgid "" -"Unable to update the following parameters while the VM is online: %(params)s" -msgstr "" +msgid "Unable to update the following parameters while the VM is online: %(params)s" +msgstr "次のパラメーターは、VM がオンラインのときには更新できません: %(params)s" #, python-format -msgid "" -"VM %(name)s must have serial and console defined to open a web serial console" -msgstr "" +msgid "VM %(name)s must have serial and console defined to open a web serial console" +msgstr "VM %(name)s には、Web シリアル・コンソールを開くために定義されているシリアルおよびコンソールが必要です" #, python-format msgid "Impossible to get the serial console of %(name)s" -msgstr "" +msgstr "%(name)s のシリアル・コンソールを取得できません" #, python-format -msgid "" -"Memory or Maximum Memory value is higher than amount supported by the host: " -"%(memHost)sMiB." -msgstr "" +msgid "Memory or Maximum Memory value is higher than amount supported by the host: %(memHost)sMiB." +msgstr "Memory または Maximum Memory の値が、ホストでサポートされている量 (%(memHost)sMiB) より大きい値です。" #, python-format -msgid "" -"Memory or Maximum Memory value is higher than maximum amount recommended: " -"%(value)sTiB" -msgstr "" +msgid "Memory or Maximum Memory value is higher than maximum amount recommended: %(value)sTiB" +msgstr "Memory または Maximum Memory の値が最大推奨量 (%(value)sTiB) より大きい値です" msgid "Cannot update Maximum Memory when guest is running." -msgstr "" +msgstr "ゲストで実行しているときは Maximum Memory は更新できません。" #, python-format msgid "Impossible to create %(dir)s directory." -msgstr "" +msgstr "%(dir)s ディレクトリーを作成できません。" #, python-format -msgid "" -"Either the guest %(name)s did not start to listen to the serial or it is not " -"configured to use the serial console." -msgstr "" +msgid "Either the guest %(name)s did not start to listen to the serial or it is not configured to use the serial console." +msgstr "ゲスト %(name)s はシリアルを listen し始めなかったか、またはシリアル・コンソールを使用するように構成されていません。" #, python-format -msgid "" -"Unable to retrieve Virt Viewer file for stopped virtual machine %(name)s" -msgstr "" +msgid "Unable to retrieve Virt Viewer file for stopped virtual machine %(name)s" +msgstr "停止した仮想マシン %(name)s の Virt ビューアー・ファイルを取得できません" #, python-format -msgid "" -"Error occured while retrieving the Virt Viewer file for virtual machine " -"%(name)s : %(err)s" -msgstr "" +msgid "Error occured while retrieving the Virt Viewer file for virtual machine %(name)s : %(err)s" +msgstr "仮想マシン %(name)s の Virt ビューアー・ファイルを取得するときにエラーが発生しました: %(err)s" msgid "Virtual machine title must be a string" -msgstr "" +msgstr "仮想マシン名はストリングでなければなりません" msgid "Virtual machine description must be a string" -msgstr "" +msgstr "仮想マシンの説明はストリングでなければなりません" msgid "console parameter is only supported for s390x/s390 architecture." -msgstr "" +msgstr "コンソール・パラメーターは s390x/s390 アーキテクチャーに対してのみサポートされています。" msgid "invalid console type, supported types are sclp/virtio." -msgstr "" +msgstr "コンソール・タイプが無効です。サポートされているタイプは sclp/virtio です。" #, python-format -msgid "" -"Unable to setup password-less login at remote host %(host)s using user " -"%(user)s: remote directory %(sshdir)s does not exist." -msgstr "" +msgid "Unable to setup password-less login at remote host %(host)s using user %(user)s: remote directory %(sshdir)s does not exist." +msgstr "ユーザー %(user)s を使用したリモート・ホスト %(host)s へのパスワードなしのログインをセットアップできません: リモート・ディレクトリー %(sshdir)s がありません。" #, python-format -msgid "" -"Unable to create a password-less libvirt connection to the remote libvirt " -"daemon at host %(host)s with the user %(user)s. Please verify the remote " -"server libvirt configuration. More information: http://libvirt.org/auth." -"html ." +msgid "Unable to create a password-less libvirt connection to the remote libvirt daemon at host %(host)s with the user %(user)s. Please verify the remote server libvirt configuration. More information: http://libvirt.org/auth.html ." +msgstr "リモート libvirt デーモンへのパスワード不要 libvirt 接続 (ホスト %(host)s、ユーザー %(user)s) を作成できません。リモート・サーバー libvirt 構成を確認してください。詳細は、http://libvirt.org/auth.html にあります。" + + +msgid "'enable_rdma' must be of type boolean (true or false)." msgstr "" #, python-format @@ -488,32 +445,23 @@ msgid "The host device %(dev_name)s is not allowed to directly assign to VM." msgstr "" "ホスト・デバイス %(dev_name)s は VM への直接割り当てを許可されていません。" -msgid "" -"No IOMMU groups found. Host PCI pass through needs IOMMU group to function " -"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify " -"the Kernel is compiled with IOMMU support. For Intel CPU, add " -"'intel_iommu=on' to GRUB_CMDLINE_LINUX parameter in /etc/default/grub file. " -"For AMD CPU, add 'iommu=pt iommu=1'." -msgstr "" +msgid "No IOMMU groups found. Host PCI pass through needs IOMMU group to function correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify the Kernel is compiled with IOMMU support. For Intel CPU, add 'intel_iommu=on' to GRUB_CMDLINE_LINUX parameter in /etc/default/grub file. For AMD CPU, add 'iommu=pt iommu=1'." +msgstr "IOMMU グループが見つかりません。ホスト PCI パススルーでは IOMMU グループが正しく機能しなければなりません。BIOS で Intel VT-d または AMD IOMMU を使用可能にして、カーネルが IOMMU サポートを使用してコンパイルされていることを確認してください。Intel CPU に関しては、/etc/default/grub ファイルにおいて「intel_iommu=on」を GRUB_CMDLINE_LINUX パラメーターに追加してください。AMD CPU に関しては、「iommu=pt iommu=1」を追加してください。" msgid "\"name\" should be a device name string" msgstr "「name」はデバイス名ストリングでなければなりません" #, python-format -msgid "" -"The device %(name)s is probably in use by the host. Unable to attach it to " -"the guest." -msgstr "" -"デバイス %(name)s はホストで使用中である可能性があります。ゲストに接続するこ" -"とはできません。" +msgid "The device %(name)s is probably in use by the host. Unable to attach it to the guest." +msgstr "デバイス %(name)s はホストで使用中である可能性があります。これはゲストに接続できません。" #, python-format msgid "Hot-(un)plug of device %(name)s is not supported." -msgstr "" +msgstr "デバイス %(name)s のホット・プラグ/アンプラグはサポートされていません。" #, python-format msgid "Failed to attach %(device)s to %(vm)s" -msgstr "" +msgstr "%(device)s を %(vm)s に接続できませんでした" #, python-format msgid "VM %(vmid)s does not have a USB controller to accept PCI hotplug." @@ -529,10 +477,8 @@ msgid "" msgstr "" "仮想マシン %(name)s に指定されたネットワーク %(network)s は存在しません" -msgid "" -"Supported virtual machine interfaces type are network, ovs and macvtap.Type " -"ovs and macvtap are only supported for s390x/s390 architecture." -msgstr "" +msgid "Supported virtual machine interfaces type are network, ovs and macvtap.Type ovs and macvtap are only supported for s390x/s390 architecture." +msgstr "サポートされている仮想マシン・インターフェース・タイプは network、ovs、および macvtap です。タイプ ovs および macvtap は s390x/s390 アーキテクチャーに対してのみサポートされています。" msgid "Network name for virtual machine interface must be a string" msgstr "" @@ -562,22 +508,22 @@ msgid "Cannot change MAC address of a running virtual machine" msgstr "実行中の仮想マシンの MAC アドレスは変更できません" msgid "Type macvtap and ovs are only supported on s390x/s390 architecture." -msgstr "" +msgstr "タイプ macvtap および ovs は s390x/s390 アーキテクチャーでのみサポートされています。" msgid "Source attribute is only supported on s390x/s390 architecture." -msgstr "" +msgstr "ソース属性は s390x/s390 アーキテクチャーでのみサポートされています。" msgid "If source is provided, only type supported are macvtap and ovs." -msgstr "" +msgstr "ソースが指定されている場合、サポートされているタイプは macvtap と ovs のみです。" msgid "For type macvtap and ovs, source has to be provided" -msgstr "" +msgstr "タイプ macvtap および ovs に関しては、ソースを指定する必要があります。" msgid "Source name for virtual machine interface must be string" -msgstr "" +msgstr "仮想マシン・インターフェースのソース名はストリングでなければなりません" msgid "Invalid source mode. Valid options are: bridge or vepa." -msgstr "" +msgstr "ソース・モードが無効です。有効なオプションは bridge または vepa です。" #, python-format msgid "Template %(name)s already exists" @@ -585,7 +531,7 @@ msgstr "テンプレート %(name)s は既に存在します" #, python-format msgid "Source media %(path)s not found" -msgstr "" +msgstr "ソース・メディア %(path)s が見つかりません" #, python-format msgid "" @@ -628,9 +574,8 @@ msgstr "" msgid "The number of CPUs must be an integer greater than 0" msgstr "CPU の数は 0 より大きい整数でなければなりません" -msgid "" -"Amount of memory and maximum memory (MB) must be an integer greater than 512" -msgstr "" +msgid "Amount of memory and maximum memory (MB) must be an integer greater than 512" +msgstr "メモリー量および最大メモリー量 (MB) は 512 を超える整数でなければなりません" msgid "Template CDROM must be a local or remote ISO file" msgstr "" @@ -642,9 +587,8 @@ msgid "Invalid storage pool URI %(value)s specified for template" msgstr "" "無効なストレージ・プール URI %(value)s がテンプレートに指定されています" -msgid "" -"Specify a path to source media (ISO, disk or remote ISO) to create a template" -msgstr "" +msgid "Specify a path to source media (ISO, disk or remote ISO) to create a template" +msgstr "テンプレートを作成するには、ソース・メディア (ISO、ディスク、またはリモート ISO) へのパスを指定してください" msgid "All networks for the template must be specified in a list." msgstr "テンプレート用のネットワークをすべてリストに指定する必要があります。" @@ -680,76 +624,56 @@ msgstr "" "CPU トポロジーを指定する場合、各エレメントはゼロより大きい整数でなければなり" "ません。" -msgid "" -"Invalid disk image format. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc." -msgstr "" +msgid "Invalid disk image format. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "ディスク・イメージ・フォーマットが無効です。有効なフォーマット: qcow、qcow2、qed、raw、vmdk、vpc。" -msgid "" -"When setting template disks, following parameters are required: 'index', " -"'pool name', 'format', 'size' or 'volume' (for scsi/iscsi pools)" -msgstr "" +msgid "When setting template disks, following parameters are required: 'index', 'pool name', 'format', 'size' or 'volume' (for scsi/iscsi pools)" +msgstr "テンプレート・ディスクを設定する場合は、次のパラメーターが必要です: 「index」、「pool name」、「format」、「size」、または「volume」(scsi/iscsi プールの場合)" msgid "Disk format must be 'raw', for logical, iscsi, and scsi pools." -msgstr "" +msgstr "論理プール、iscsi プール、および scsi プールに関しては、ディスク・フォーマットは「raw」でなければなりません。" -msgid "" -"Memory expects an object with one or both parameters: 'current' and " -"'maxmemory'" -msgstr "" +msgid "Memory expects an object with one or both parameters: 'current' and 'maxmemory'" +msgstr "Memory には、パラメーター「current」と「maxmemory」の一方または両方が指定されたオブジェクトが予想されます。" #, python-format -msgid "" -"Memory value (%(mem)sMiB) must be equal or lesser than maximum memory value " -"(%(maxmem)sMiB)" -msgstr "" +msgid "Memory value (%(mem)sMiB) must be equal or lesser than maximum memory value (%(maxmem)sMiB)" +msgstr "メモリー値 (%(mem)sMiB) は最大メモリー値 (%(maxmem)sMiB) 以下でなければなりません" #, python-format msgid "Unable to update template due error: %(err)s" -msgstr "" +msgstr "エラーが発生したため、テンプレートを更新できません: %(err)s" msgid "Parameter 'disks' requires at least one disk object" -msgstr "" +msgstr "パラメーター「disks」にはディスク・オブジェクトが少なくとも 1 つは必要です" -msgid "" -"Invalid interface type. Type should be 'macvtap' for host network interface " -"(Ethernet, Bond, VLAN) to be connected as direct MacVTap or 'ovs' for " -"openvswitch host network interface to be connected as virtual switch to a VM." -msgstr "" +msgid "Invalid interface type. Type should be 'macvtap' for host network interface (Ethernet, Bond, VLAN) to be connected as direct MacVTap or 'ovs' for openvswitch host network interface to be connected as virtual switch to a VM." +msgstr "インターフェース・タイプが無効です。タイプは、ホスト・ネットワーク・インターフェース (イーサネット、結合、VLAN) を直接 MacVTap として接続する場合は「macvtap」でなければならず、openvswitch ホスト・ネットワーク・インターフェースを VM に仮想スイッチとして接続する場合は「ovs」でなければなりません。" msgid "Interface name should be string." -msgstr "" +msgstr "インターフェース名はストリングでなければなりません。" msgid "Invalid interface mode. Valid options are: bridge or vepa." -msgstr "" +msgstr "インターフェース・モードが無効です。有効なオプションは bridge または vepa です。" -msgid "" -"Interfaces should be list of interfaces. Each interface should have name, " -"type and mode(optional, only applicable for interfcae type 'macvtap'." -msgstr "" +msgid "Interfaces should be list of interfaces. Each interface should have name, type and mode(optional, only applicable for interfcae type 'macvtap'." +msgstr "Interfaces はインターフェースのリストでなければなりません。各インターフェースには名前、タイプ、およびモード (インターフェース・タイプ「macvtap」の場合にのみ使用できるオプション) が必要です。" -msgid "" -"Interface expects an object with parameters: 'name', 'type' and 'mode'. Name " -"should be name of host network interface (Ethernet, Bond, VLAN) for type " -"'macvtap' or the name of host openvswitch bridge interface for type 'ovs'. " -"Mode (optional) is only applicable for interface type 'macvtap' to indicates " -"whether packets will be delivered directly to target device (bridge) or to " -"the external bridge (vepa-capable bridge)." -msgstr "" +msgid "Interface expects an object with parameters: 'name', 'type' and 'mode'. Name should be name of host network interface (Ethernet, Bond, VLAN) for type 'macvtap' or the name of host openvswitch bridge interface for type 'ovs'. Mode (optional) is only applicable for interface type 'macvtap' to indicates whether packets will be delivered directly to target device (bridge) or to the external bridge (vepa-capable bridge)." +msgstr "インターフェースには、パラメーター「name」、「type」、および「mode」が指定されたオブジェクトが予想されます。name は、タイプ「macvtap」の場合はホスト・ネットワーク・インターフェース (イーサネット、結合、VLAN) の名前でなければならず、タイプ「ovs」の場合はホスト openvswitch ブリッジ・インターフェースの名前でなければなりません。mode (オプション) は、インターフェース・タイプ「macvtap」の場合に限り、パケットをターゲット・デバイス (ブリッジ) に直接送信するのか外部ブリッジ (vepa 対応ブリッジ) に送信するのかを指示するために使用できます。" msgid "Interfaces parameter only supported on s390x or s390 architecture." -msgstr "" +msgstr "Interfaces パラメーターは s390x または s390 アーキテクチャーでのみサポートされています。" msgid "Storage without libvirt pool is not supported on this architecture" -msgstr "" +msgstr "libvirt プールがないストレージは、このアーキテクチャーではサポートされていません" #, python-format msgid "Error while creating the virtual disk for the guest. Details: %(err)s" -msgstr "" +msgstr "ゲスト用の仮想ディスクを作成するときにエラーが発生しました。詳細: %(err)s" -msgid "" -"When setting template disks without libvirt, following parameters are " -"required: 'index', 'format', 'path', 'size'" -msgstr "" +msgid "When setting template disks without libvirt, following parameters are required: 'index', 'format', 'path', 'size'" +msgstr "libvirt なしでテンプレート・ディスクを設定する場合は、次のパラメーターが必要です: 「index」、「format」、「path」、「size」" #, python-format msgid "Storage pool %(name)s already exists" @@ -852,12 +776,8 @@ msgid "Specify name and type to create a storage pool" msgstr "ストレージ・プールを作成するには、名前とタイプを指定してください" #, python-format -msgid "" -"%(disk)s is not a valid disk/partition. Could not add it to the pool " -"%(pool)s." -msgstr "" -"%(disk)s は有効なディスク/パーティションではありません。プール %(pool)s に追" -"加できませんでした。" +msgid "%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)s." +msgstr "%(disk)s は有効なディスク/パーティションではありません。これはプール %(pool)s に追加できませんでした。" #, python-format msgid "Unable to extend logical pool %(pool)s. Details: %(err)s" @@ -918,14 +838,12 @@ msgstr "" "%(err)s" #, python-format -msgid "" -"No volume group '%(name)s' found. Please, specify an existing volume group " -"to create the logical pool from." -msgstr "" +msgid "No volume group '%(name)s' found. Please, specify an existing volume group to create the logical pool from." +msgstr "ボリューム・グループ「%(name)s」が見つかりません。論理プールの作成元となる既存のボリューム・グループを指定してください。" #, python-format msgid "Unable to delete pool %(name)s as it is associated with guests: %(vms)s" -msgstr "" +msgstr "プール %(name)s はゲスト %(vms)s に関連付けられているため削除できません" #, python-format msgid "Storage volume %(name)s already exists" @@ -988,10 +906,8 @@ msgstr "ストレージ・ボリューム名はストリングでなければな msgid "Storage volume allocation must be an integer number" msgstr "ストレージ・ボリューム割り振りは整数でなければなりません" -msgid "" -"Storage volume format not supported. Valid formats: qcow, qcow2, qed, raw, " -"vmdk, vpc." -msgstr "" +msgid "Storage volume format not supported. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "ストレージ・ボリューム・フォーマットがサポートされていません。有効なフォーマット: qcow、qcow2、qed、raw、vmdk、vpc。" msgid "Storage volume requires a volume name" msgstr "ストレージ・ボリュームにはボリューム名が必要です" @@ -1067,10 +983,8 @@ msgid "Interface %(name)s does not exist" msgstr "インターフェース %(name)s は存在しません" #, python-format -msgid "" -"Failed to list interfaces. Invalid _inuse parameter. Supported options for " -"_inuse are: %(supported_inuse)s" -msgstr "" +msgid "Failed to list interfaces. Invalid _inuse parameter. Supported options for _inuse are: %(supported_inuse)s" +msgstr "インターフェースをリストできませんでした。_inuse パラメーターが無効です。_inuse に対してサポートされているオプションは次のとおりです: %(supported_inuse)s" #, python-format msgid "Network %(name)s already exists" @@ -1082,14 +996,14 @@ msgstr "ネットワーク %(name)s は存在しません" #, python-format msgid "Subnet %(subnet)s specified for network %(network)s is not valid." -msgstr "" +msgstr "ネットワーク %(network)s に指定されたサブネット %(subnet)s は無効です。" msgid "Specify a network interface to create bridged or macvtap networks." -msgstr "" +msgstr "ブリッジ・ネットワークまたは macvtap ネットワークを作成するには、ネットワーク・インターフェースを指定してください。" #, python-format msgid "Unable to delete or update active network %(name)s" -msgstr "" +msgstr "アクティブ・ネットワーク %(name)s を削除/更新できません" #, python-format msgid "Interface %(iface)s specified for network %(network)s is already in use" @@ -1104,7 +1018,7 @@ msgstr "" #, python-format msgid "Unable to create or update network %(name)s. Details: %(err)s" -msgstr "" +msgstr "ネットワーク %(name)s を作成/更新できません。詳細: %(err)s" #, python-format msgid "Unable to find a free IP address for network '%(name)s'" @@ -1119,10 +1033,8 @@ msgstr "" "ネットワーク名はスラッシュ (/) または引用符 (\") のないストリングでなければな" "りません" -msgid "" -"Supported network types are isolated, NAT, macvtap, bridge, vepa and " -"passthrough." -msgstr "" +msgid "Supported network types are isolated, NAT, macvtap, bridge, vepa and passthrough." +msgstr "サポートされているネットワーク・タイプは isolated、NAT、macvtap、bridge、vepa、および passthrough です。" msgid "Network subnet must be a string with IP address and prefix or netmask" msgstr "" @@ -1130,7 +1042,7 @@ msgstr "" "るストリングでなければなりません" msgid "Network interfaces must be an array." -msgstr "" +msgstr "ネットワーク・インターフェースは配列でなければなりません。" msgid "Network VLAN ID must be an integer between 1 and 4094" msgstr "ネットワーク VLAN ID は、1 から 4094 までの整数でなければなりません" @@ -1139,19 +1051,12 @@ msgid "Specify name and type to create a Network" msgstr "ネットワークを作成するには、名前とタイプを指定してください" #, python-format -msgid "" -"Unable to delete or update network %(name)s. There are some virtual machines " -"%(vms)s and/or templates linked to this network." -msgstr "" +msgid "Unable to delete or update network %(name)s. There are some virtual machines %(vms)s and/or templates linked to this network." +msgstr "ネットワーク %(name)s を削除/更新できません。このネットワークにリンクしている仮想マシン %(vms)s やテンプレートがいくつかあります。" #, python-format -msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines " -"%(vms)s and/or templates linked to this network." -msgstr "" -"ネットワーク %(name)s を非アクティブにできません。このネットワークにリンクし" -"ている仮想マシン %(vms)s とテンプレートのいずれかまたは両方がいくつかありま" -"す。" +msgid "Unable to deactivate network %(name)s. There are some virtual machines %(vms)s and/or templates linked to this network." +msgstr "ネットワーク %(name)s を非アクティブにできません。このネットワークにリンクしている仮想マシン %(vms)s やテンプレートがいくつかあります。" #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1163,12 +1068,8 @@ msgid "Failed to activate interface %(iface)s: %(err)s." msgstr "インターフェース %(iface)s のアクティブ化に失敗しました: %(err)s。" #, python-format -msgid "" -"Failed to activate interface %(iface)s. Please check the physical link " -"status." -msgstr "" -"インターフェース %(iface)s のアクティブ化に失敗しました。物理リンク状況を確認" -"してください。" +msgid "Failed to activate interface %(iface)s. Please check the physical link status." +msgstr "インターフェース %(iface)s のアクティブ化に失敗しました。物理リンク状況を調べてください。" #, python-format msgid "Failed to start network %(name)s. Details: %(err)s" @@ -1176,33 +1077,29 @@ msgstr "ネットワーク %(name)s の開始に失敗しました。詳細: %(e #, python-format msgid "Unable to redefine interface %(name)s. Details: %(err)s" -msgstr "" +msgstr "インターフェース %(name)s を再定義できません。詳細: %(err)s" #, python-format msgid "Unable to create bridge %(name)s. Details: %(err)s" -msgstr "" +msgstr "ブリッジ %(name)s を作成できません。詳細: %(err)s" -msgid "" -"Unable to create bridge with NetworkManager enabled. Disable it and try " -"again." -msgstr "" +msgid "Unable to create bridge with NetworkManager enabled. Disable it and try again." +msgstr "ネットワーク・マネージャーを使用可能にしてブリッジを作成することができません。これを使用不可にして、再試行してください。" msgid "Interface should be bare NIC or bonding." -msgstr "" +msgstr "インターフェースはベア NIC または結合でなければなりません。" msgid "Network interfaces parameter must contain at least one interface." -msgstr "" +msgstr "Network interfaces パラメーターには 1 つ以上のインターフェースが含まれていなければなりません。" msgid "Only one interface is allowed for 'bridge' and 'macvtap' networks." -msgstr "" +msgstr "「bridge」ネットワークおよび「macvtap」ネットワークに使用できるインターフェースは 1 つのみです。" msgid "Subnet is not a valid parameter for this type of virtual network." -msgstr "" +msgstr "Subnet は、このタイプの仮想ネットワークには有効なパラメーターではありません。" -msgid "" -"VLAN ID and interfaces are not valid parameters for this type of virtual " -"network." -msgstr "" +msgid "VLAN ID and interfaces are not valid parameters for this type of virtual network." +msgstr "VLAN ID および interfaces は、このタイプの仮想ネットワークには有効なパラメーターではありません。" #, python-format msgid "Storage server %(server)s was not used by Kimchi" @@ -1223,7 +1120,7 @@ msgid "Unable to choose a virtual machine name" msgstr "仮想マシン名を選択できません" msgid "Cannot upgrade objectstore data." -msgstr "" +msgstr "オブジェクト・ストア・データをアップグレードできません。" msgid "Invalid storage type. Types supported: 'cdrom', 'disk'" msgstr "" @@ -1239,11 +1136,8 @@ msgid "Only CDROM path can be update." msgstr "CDROM パスのみが更新可能です。" #, python-format -msgid "" -"The storage device %(dev_name)s does not exist in the virtual machine " -"%(vm_name)s" -msgstr "" -"ストレージ・デバイス %(dev_name)s が仮想マシン %(vm_name)s に存在しません" +msgid "The storage device %(dev_name)s does not exist in the virtual machine %(vm_name)s" +msgstr "ストレージ・デバイス %(dev_name)s は仮想マシン %(vm_name)s には存在していません" #, python-format msgid "Error while creating new storage device: %(error)s" @@ -1283,12 +1177,8 @@ msgstr "" msgid "Volume already in use by other virtual machine." msgstr "ボリュームは既に他の仮想マシンで使用中です。" -msgid "" -"Only one of path or pool/volume can be specified to add a new virtual " -"machine disk" -msgstr "" -"新規仮想マシン・ディスクを追加するために指定できるのはパスまたはプール/ボ" -"リュームのうち 1 つだけです" +msgid "Only one of path or pool/volume can be specified to add a new virtual machine disk" +msgstr "新規仮想マシン・ディスクを追加するために指定できるパスやプール/ボリュームは 1 つのみです" #, python-format msgid "" @@ -1299,23 +1189,14 @@ msgstr "" "適合しません" msgid "On s390x arch one of pool, path of dir_path must be specified" -msgstr "" +msgstr "s390x アーキテクチャーでは、pool、path、または dir_path のいずれかを指定する必要があります" -msgid "" -"On s390x arch 'format' must be specified while attaching disk to virtual " -"machine" -msgstr "" +msgid "On s390x arch 'format' must be specified while attaching disk to virtual machine" +msgstr "s390x アーキテクチャーでは、ディスクを仮想マシンに接続するときに「format」を指定する必要があります" #, python-format msgid "Virtual disk already exists on the system: %(disk_path)s" -msgstr "" - -#, python-format -msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" -"仮想マシン「%(vm)s」はそのスナップショットを作成する前に停止しなければなりま" -"せん。" +msgstr "仮想ディスクは既にシステム上に存在しています: %(disk_path)s" #, python-format msgid "" @@ -1374,249 +1255,240 @@ msgstr "" "め、この仮想マシンのスナップショットを作成できません。「qcow2」のみがサポート" "されています。" -msgid "" -"The number of vCPUs must be less than or equal the maximum number of vCPUs " -"specified." -msgstr "" +msgid "The number of vCPUs must be less than or equal the maximum number of vCPUs specified." +msgstr "vCPU の数は、指定された vCPU の最大数以下でなければなりません。" -msgid "" -"When CPU topology is defined, maximum number of vCPUs must be a product of " -"sockets, cores, and threads." -msgstr "" +msgid "When CPU topology is defined, maximum number of vCPUs must be a product of sockets, cores, and threads." +msgstr "CPU トポロジーが定義されている場合、vCPU の最大数はソケット、コア、およびスレッドの積でなければなりません。" msgid "This host (or current configuration) does not allow CPU topology." msgstr "このホスト (または現行構成) では CPU トポロジーは許可されていません。" msgid "The maximum number of vCPUs is too large for this system." -msgstr "" +msgstr "vCPU の最大数がこのシステムには大きすぎます。" msgid "" -"When CPU topology is defined, vCPUs must be a multiple of a product of cores " -"and threads." -msgstr "" - -msgid "The number of threads is too large for this system." +"When CPU topology is defined, CPUs must be a multiple of the 'threads' " +"number defined." msgstr "" msgid "" "When CPU topology is specified, sockets, cores and threads are required " "paramaters." -msgstr "" +msgstr "CPU トポロジーが指定される場合、sockets、cores、および threads は必須パラメーターです。" -msgid "" -"Parameter 'cpu_info' expects an object with fields among: 'vcpus', " -"'maxvcpus', 'topology'." -msgstr "" +msgid "Parameter 'cpu_info' expects an object with fields among: 'vcpus', 'maxvcpus', 'topology'." +msgstr "パラメーター「cpu_info」では、「vcpus」、「maxvcpus」、「topology」のいずれかのフィールドでオブジェクトが予想されます。" -msgid "" -"Parameter 'topology' expects an object with fields among: 'sockets', " -"'cores', 'threads'." +msgid "Parameter 'topology' expects an object with fields among: 'sockets', 'cores', 'threads'." +msgstr "パラメーター「topology」では、「sockets」、「cores」、「threads」のいずれかのフィールドでオブジェクトが予想されます。" + + +msgid "Unable to update Max CPU or CPU topology when guest is running." msgstr "" #, python-format +msgid "Unable to hot plug/unplug CPUs. Details: %(err)s" +msgstr "ストレージ・プールをリストできません。詳細: %(err)s" + +#, python-format msgid "Invalid volume group name parameter: %(name)s." -msgstr "" +msgstr "ボリューム・グループ名パラメーターが無効です: %(name)s。" -msgid "" -"Unable to establish connection with libvirt. Please check your libvirt URI " -"which is often defined in /etc/libvirt/libvirt.conf" -msgstr "" +msgid "Unable to establish connection with libvirt. Please check your libvirt URI which is often defined in /etc/libvirt/libvirt.conf" +msgstr "libvirt との接続を確立できません。libvirt URI (多くの場合、/etc/libvirt/libvirt.conf に定義されています) を調べてください。" -msgid "" -"Libvirt service is not active. Please start the libvirt service in your host " -"system." -msgstr "" +msgid "Libvirt service is not active. Please start the libvirt service in your host system." +msgstr "Libvirt サービスがアクティブではありません。ご使用のホスト・システムで libvirt サービスを開始してください。" msgid "Failed to register the default event implementation." -msgstr "" +msgstr "デフォルト・イベント実装環境を登録できませんでした。" msgid "Failed to register timeout event." -msgstr "" +msgstr "タイムアウト・イベントを登録できませんでした。" msgid "Failed to Run the default event implementation." -msgstr "" +msgstr "デフォルト・イベント実装を実行できませんでした。" #, python-format -msgid "" -"I/O error on guest '%(vm)s': storage pool out of space for %(devAlias)s " -"(%(srcPath)s)." -msgstr "" +msgid "I/O error on guest '%(vm)s': storage pool out of space for %(devAlias)s (%(srcPath)s)." +msgstr "ゲスト「%(vm)s」で入出力エラーが発生しました: %(devAlias)s (%(srcPath)s) 用のスペースがストレージ・プールにありません。" #, python-format msgid "Create virtual network '%(name)s' type '%(connection)s'" -msgstr "" +msgstr "仮想ネットワーク「%(name)s」タイプ「%(connection)s」の作成" #, python-format msgid "Remove virtual network '%(ident)s'" -msgstr "" +msgstr "仮想ネットワーク「%(ident)s」の除去" #, python-format msgid "Update virtual network '%(ident)s'" -msgstr "" +msgstr "仮想ネットワーク「%(ident)s」の更新" #, python-format msgid "Activate virtual network '%(ident)s'" -msgstr "" +msgstr "仮想ネットワーク「%(ident)s」のアクティブ化" #, python-format msgid "Deactivate virtual network '%(ident)s'" -msgstr "" +msgstr "仮想ネットワーク「%(ident)s」の非アクティブ化" #, python-format msgid "Create storage pool '%(name)s' type '%(type)s'" -msgstr "" +msgstr "ストレージ・プール「%(name)s」タイプ「%(type)s」の作成" #, python-format msgid "Remove storage pool '%(ident)s'" -msgstr "" +msgstr "ストレージ・プール「%(ident)s」の除去" #, python-format msgid "Update storage pool '%(ident)s'" -msgstr "" +msgstr "ストレージ・プール「%(ident)s」の更新" #, python-format msgid "Activate storage pool '%(ident)s'" -msgstr "" +msgstr "ストレージ・プール「%(ident)s」のアクティブ化" #, python-format msgid "Deactivate storage pool '%(ident)s'" -msgstr "" +msgstr "ストレージ・プール「%(ident)s」の非アクティブ化" #, python-format msgid "Create snapshot '%(name)s' at guest '%(vm)s'" -msgstr "" +msgstr "スナップショット「%(name)s」をゲスト「%(vm)s」で作成" #, python-format msgid "Remove snapshot '%(ident)s' from guest '%(vm)s'" -msgstr "" +msgstr "スナップショット「%(ident)s」をゲスト「%(vm)s」から除去" #, python-format msgid "Revert guest '%(vm)s' to snapshot '%(ident)s'" -msgstr "" +msgstr "ゲスト「%(vm)s」をスナップショット「%(ident)s」に戻す" #, python-format msgid "Create template '%(name)s'" -msgstr "" +msgstr "テンプレート「%(name)s」の作成" #, python-format msgid "Remove template '%(ident)s'" -msgstr "" +msgstr "テンプレート「%(ident)s」の除去" #, python-format msgid "Update template '%(ident)s'" -msgstr "" +msgstr "テンプレート「%(ident)s」の更新" #, python-format msgid "Clone template '%(ident)s'" -msgstr "" +msgstr "テンプレート「%(ident)s」のクローンを作成" #, python-format msgid "Create guest '%(name)s' from template '%(template)s'" -msgstr "" +msgstr "ゲスト「%(name)s」をテンプレート「%(template)s」から作成" #, python-format msgid "Remove guest '%(ident)s'" -msgstr "" +msgstr "ゲスト「%(ident)s」の除去" #, python-format msgid "Edit guest '%(ident)s'" -msgstr "" +msgstr "ゲスト「%(ident)s」の編集" #, python-format msgid "Start guest '%(ident)s'" -msgstr "" +msgstr "ゲスト「%(ident)s」の開始" #, python-format msgid "Power off guest '%(ident)s'" -msgstr "" +msgstr "ゲスト「%(ident)s」の電源をオフにする" #, python-format msgid "Shutdown guest '%(ident)s'" -msgstr "" +msgstr "ゲスト「%(ident)s」のシャットダウン" #, python-format msgid "Restart guest '%(ident)s'" -msgstr "" +msgstr "ゲスト「%(ident)s」の再始動" #, python-format msgid "Connect to guest '%(ident)s' through novnc/spice" -msgstr "" +msgstr "novnc/spice を使用してゲスト「%(ident)s」に接続" #, python-format msgid "Clone guest '%(ident)s'" -msgstr "" +msgstr "ゲスト「%(ident)s」のクローンを作成" #, python-format msgid "Migrate guest '%(ident)s' to '%(remote_host)s'" -msgstr "" +msgstr "ゲスト「%(ident)s」を「%(remote_host)s」にマイグレーション" #, python-format msgid "Suspend guest '%(ident)s'" -msgstr "" +msgstr "ゲスト「%(ident)s」の中断" #, python-format msgid "Resume guest '%(ident)s'" -msgstr "" +msgstr "ゲスト「%(ident)s」の再開" #, python-format msgid "Connect to guest '%(ident)s' through serial" -msgstr "" +msgstr "シリアルを使用してゲスト「%(ident)s」に接続" #, python-format msgid "Attach host device '%(name)s' to guest '%(vmid)s'" -msgstr "" +msgstr "ホスト・デバイス「%(name)s」をゲスト「%(vmid)s」に接続" #, python-format msgid "Detach host device '%(ident)s' from guest '%(vmid)s'" -msgstr "" +msgstr "ホスト・デバイス「%(ident)s」をゲスト「%(vmid)s」から切り離す" #, python-format msgid "Attach network interface '%(network)s' to guest '%(vm)s'" -msgstr "" +msgstr "ネットワーク・インターフェース「%(network)s」をゲスト「%(vm)s」に接続" #, python-format msgid "Detach network interface '%(ident)s' from guest '%(vm)s'" -msgstr "" +msgstr "ネットワーク・インターフェース「%(ident)s」をゲスト「%(vm)s」から切り離す" #, python-format msgid "Update network interface '%(ident)s' at guest '%(vm)s'" -msgstr "" +msgstr "ゲスト「%(vm)s」でネットワーク・インターフェース「%(ident)s」を更新" #, python-format msgid "Attach %(type)s storage '%(path)s' to guest '%(vm)s'" -msgstr "" +msgstr "%(type)s ストレージ「%(path)s」をゲスト「%(vm)s」に接続" #, python-format msgid "Remove storage '%(ident)s' from guest '%(vm)s'" -msgstr "" +msgstr "ストレージ「%(ident)s」をゲスト「%(vm)s」から除去" #, python-format msgid "Update storage '%(ident)s' at guest '%(vm)s'" -msgstr "" +msgstr "ゲスト「%(vm)s」でストレージ「%(ident)s」を更新" #, python-format msgid "Create storage volume '%(name)s' at pool '%(pool)s'" -msgstr "" +msgstr "ストレージ・ボリューム「%(name)s」をプール「%(pool)s」に作成" #, python-format msgid "Remove storage volume '%(ident)s' from pool '%(pool)s'" -msgstr "" +msgstr "ストレージ・ボリューム「%(ident)s」をプール「%(pool)s」から除去" #, python-format msgid "Update storage volume '%(ident)s' at pool '%(pool)s'" -msgstr "" +msgstr "プール「%(pool)s」でストレージ・ボリューム「%(ident)s」を更新" #, python-format msgid "Wipe storage volume '%(ident)s' off pool '%(pool)s'" -msgstr "" +msgstr "ストレージ・ボリューム「%(ident)s」をプール「%(pool)s」からワイプ" #, python-format msgid "Resize storage volume '%(ident)s' at pool '%(pool)s' with size %(size)s" -msgstr "" +msgstr "プール「%(pool)s」にあるストレージ・ボリューム「%(ident)s」のサイズをサイズ %(size)s で変更" #, python-format msgid "Clone storage volume '%(ident)s' at pool '%(pool)s'" -msgstr "" +msgstr "ストレージ・ボリューム「%(ident)s」のクローンをプール「%(pool)s」に作成" msgid "Create a New Virtual Machine" msgstr "新規仮想マシンの作成" @@ -1624,12 +1496,8 @@ msgstr "新規仮想マシンの作成" msgid "Virtual Machine Name" msgstr "仮想マシン名" -msgid "" -"The name used to identify the virtual machine. If omitted, a name will be " -"chosen based on the template used." -msgstr "" -"名前は仮想マシンを識別するために使用されます。省略すると、使用されているテン" -"プレートに基づいて選択されます。" +msgid "The name used to identify the virtual machine. If omitted, a name will be chosen based on the template used." +msgstr "この名前は仮想マシンを識別するために使用されます。省略されると、使用しているテンプレートを基準に選択されます。" msgid "Please create a template first." msgstr "まずテンプレートを作成してください。" @@ -1641,10 +1509,10 @@ msgid "Please choose a template." msgstr "テンプレートを選択してください。" msgid "This template has invalid parameters." -msgstr "" +msgstr "このテンプレートには、無効なパラメーターがあります。" msgid "This template has invalid parameters" -msgstr "" +msgstr "このテンプレートには、無効なパラメーターがあります" msgid "OS" msgstr "OS" @@ -1653,7 +1521,7 @@ msgid "Version" msgstr "バージョン" msgid "Current CPUs" -msgstr "" +msgstr "現行 CPU" msgid "Memory" msgstr "メモリー" @@ -1668,19 +1536,16 @@ msgid "Cancel" msgstr "取消" msgid "Clone a Guest" -msgstr "" +msgstr "ゲストのクローンを作成" -msgid "" -"When the target guest has SCSI or iSCSI volumes, they will be cloned on the " -"default storage pool. The same will happen when the target pool does not " -"have enough space to clone the volumes. Do you want to continue?" -msgstr "" +msgid "When the target guest has SCSI or iSCSI volumes, they will be cloned on the default storage pool. The same will happen when the target pool does not have enough space to clone the volumes. Do you want to continue?" +msgstr "ターゲット・ゲストに SCSI ボリュームまたは iSCSI ボリュームがある場合は、そのボリュームのクローンがデフォルト・ストレージ・プール上に作成されます。ボリュームのクローンを作成するだけの十分なスペースがターゲット・プールにない場合も同様です。続行しますか ?" msgid "Number of times to clone" -msgstr "" +msgstr "クローンを作成する回数" msgid "Continue" -msgstr "" +msgstr "続行" msgid "Edit Guest" msgstr "ゲストの編集" @@ -1695,43 +1560,46 @@ msgid "Interface" msgstr "インターフェース" msgid "Permission" -msgstr "" +msgstr "許可" msgid "Pci" -msgstr "" +msgstr "Pci" msgid "Snapshot" -msgstr "" +msgstr "スナップショット" msgid "Name" msgstr "名前" msgid "More" -msgstr "" +msgstr "詳細" msgid "Max CPU" -msgstr "" +msgstr "最大 CPU" msgid "Memory (MB)" msgstr "メモリー (MB)" msgid "Max Memory (MB)" -msgstr "" +msgstr "最大メモリー (MB)" msgid "Host does not support memory hotplug" -msgstr "" +msgstr "ホストはメモリー・ホット・プラグをサポートしていません" msgid "Icon" msgstr "アイコン" msgid "Console" -msgstr "" +msgstr "コンソール" + +msgid "Nothing selected" +msgstr "何も選択されていません" msgid "sclp" -msgstr "" +msgstr "sclp" msgid "virtio" -msgstr "" +msgstr "virtio" msgid "Add" msgstr "追加" @@ -1755,13 +1623,13 @@ msgid "MAC Address" msgstr "MAC アドレス" msgid "IP Address" -msgstr "" +msgstr "IP アドレス" msgid "Network/Interface" -msgstr "" +msgstr "ネットワーク/インターフェース" msgid "Mode" -msgstr "" +msgstr "モード" msgid "Available system users and groups" msgstr "使用可能なシステム・ユーザーおよびグループ" @@ -1788,10 +1656,10 @@ msgid "Added" msgstr "追加済み" msgid "Filter" -msgstr "" +msgstr "フィルター" msgid "Status" -msgstr "" +msgstr "状況" msgid "Product" msgstr "製品" @@ -1800,16 +1668,46 @@ msgid "Vendor" msgstr "ベンダー" msgid "Loading" -msgstr "" +msgstr "ロード中" msgid "Created" msgstr "作成日" +msgid "Current CPU Number" +msgstr "現行 CPU 数" + +msgid "" +"Current CPU must be equal or lower than the Maximum CPU value. If a topology " +"is set, it must be also be a multiple of the 'threads' value." +msgstr "" + +msgid "" +"Unable to edit maximum CPU or CPU topology when editing a running or paused " +"virtual machine." +msgstr "" + +msgid "" +"If a topology is set, this value will be the product of sockets * times * " +"cores." +msgstr "" + +msgid "Manually set CPU topology" +msgstr "CPU トポロジーを手動で設定" + +msgid "Sockets" +msgstr "" + +msgid "Cores" +msgstr "コア" + +msgid "Threads" +msgstr "スレッド" + msgid "Save" msgstr "保存" msgid "Replace" -msgstr "交換" +msgstr "置換" msgid "Detach" msgstr "切り離し" @@ -1824,43 +1722,43 @@ msgid "LDAP User ID,e.g.foo(a)foo.com" msgstr "LDAP ユーザー ID (例: foo(a)foo.com)" msgid "Revert" -msgstr "" +msgstr "戻す" msgid "Running" -msgstr "" +msgstr "実行中" msgid "Disconnected" -msgstr "" +msgstr "切断済み" msgid "Starting" -msgstr "" +msgstr "開始中" msgid "Crashed" -msgstr "" +msgstr "異常終了" msgid "Unknown" -msgstr "" +msgstr "不明" msgid "Paused" -msgstr "" +msgstr "一時停止" msgid "Suspended" -msgstr "" +msgstr "中断状態" msgid "Resetting" -msgstr "" +msgstr "リセット中" msgid "View Console" -msgstr "" +msgstr "コンソールの表示" msgid "View Serial" -msgstr "" +msgstr "シリアルの表示" msgid "Clone" msgstr "クローン" msgid "Migrate" -msgstr "" +msgstr "マイグレーション" msgid "Reset" msgstr "リセット" @@ -1884,103 +1782,102 @@ msgid "Delete" msgstr "削除" msgid "No Data Available" -msgstr "" +msgstr "使用可能なデータがありません" msgid "Processors Utilization" -msgstr "" +msgstr "プロセッサー使用状況" msgid "Memory Utilization" -msgstr "" +msgstr "メモリー使用状況" msgid "Storage I/O" -msgstr "" +msgstr "ストレージ入出力" msgid "Network I/O" msgstr "ネットワーク入出力" msgid "Migrate a Guest" -msgstr "" +msgstr "ゲストのマイグレーション" -msgid "" -"Disclaimer: This process cannot be stopped after started, can take a long " -"time to complete and will turn off the VM on this Hypervisor when it is " -"successfully migrated to the remote destination." -msgstr "" +msgid "Disclaimer: This process cannot be stopped after started, can take a long time to complete and will turn off the VM on this Hypervisor when it is successfully migrated to the remote destination." +msgstr "特記事項: このプロセスは開始後は停止できません。完了までに長い時間がかかる可能性があります。リモート宛先へのマイグレーションが正常に行われると、このハイパーバイザー上の VM はオフになります。" msgid "Remote Server" -msgstr "" +msgstr "リモート・サーバー" msgid "IP Address or Hostname" -msgstr "" +msgstr "IP アドレスまたはホスト名" -msgid "" -"The following fields are optional. Fill them if you want Kimchi to setup a " -"password-less ssh session between the localhost and the remote host. The " -"setup process will only be successful if the user has 'SUDO ALL' permission " -"in the remote machine." -msgstr "" +msgid "The following fields are optional. Fill them if you want Kimchi to setup a password-less ssh session between the localhost and the remote host. The setup process will only be successful if the user has 'SUDO ALL' permission in the remote machine." +msgstr "次のフィールドはオプションです。ローカル・ホストとリモート・ホストの間でパスワードなしの ssh セッションを Kimchi にセットアップさせたい場合は、これらのフィールドに値を入力してください。リモート・マシンにおいてユーザーに「SUDO ALL」許可がある場合に限り、セットアップ・プロセスは正常に行われます。" msgid "Username of the remote host" -msgstr "" +msgstr "リモート・ホストのユーザー名" msgid "Password" msgstr "パスワード" msgid "Password of the user in the remote host" +msgstr "リモート・ホストのユーザーのパスワード" + +msgid "Use RDMA transport" msgstr "" -msgid "Delete this VM when the migration is completed" +msgid "" +"Check this option only if RDMA is properly configured in both source and " +"destination hosts, otherwise migration will fail." msgstr "" +msgid "Delete this VM when the migration is completed" +msgstr "マイグレーションが完了したときに、この VM を削除" + msgid "Add a Storage Device to VM" msgstr "VM にストレージ・デバイスを追加" msgid "Device Type" msgstr "デバイス・タイプ" -msgid "" -"The device type. Currently, \"cdrom\" and \"disk\" are supported. If the " -"guest is running, only \"disk\" is supported." -msgstr "" +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported. If the guest is running, only \"disk\" is supported." +msgstr "デバイス・タイプを示します。現在、「cdrom」と「disk」がサポート対象です。ゲストで実行している場合は、「disk」のみがサポートされます。" msgid "Create a new disk" -msgstr "" +msgstr "新規ディスクの作成" msgid "Select an existing disk" -msgstr "" +msgstr "既存ディスクの選択" msgid "Source" -msgstr "" +msgstr "ソース" msgid "Storage based on Libvirt pool or direct block device" -msgstr "" +msgstr "Libvirt プールまたは直接ブロック・デバイスに基づくストレージ" msgid "Storage Pool" msgstr "ストレージ・プール" msgid "Storage pool to create the volume in" -msgstr "" +msgstr "ボリュームの作成先のストレージ・プール" msgid "Disk Size (GB)" -msgstr "" +msgstr "ディスク・サイズ (GB)" msgid "New disk size to be created" -msgstr "" +msgstr "作成される新規ディスクのサイズ" msgid "Format" -msgstr "" +msgstr "フォーマット" msgid "Format of the new disk to be created" -msgstr "" +msgstr "作成される新規ディスクのフォーマット" msgid "Directory Path" -msgstr "" +msgstr "ディレクトリー・パス" msgid "Provide a directory path" -msgstr "" +msgstr "ディレクトリー・パスの指定" msgid "Storage pool in which the volume is located in" -msgstr "" +msgstr "当該ボリュームがあるストレージ・プール" msgid "Storage Volume" msgstr "ストレージ・ボリューム" @@ -1989,10 +1886,10 @@ msgid "Storage volume to be attached" msgstr "接続されるストレージ・ボリューム" msgid "Disk Path" -msgstr "" +msgstr "ディスク・パス" msgid "Provide a block device" -msgstr "" +msgstr "ブロック・デバイスの指定" msgid "File Path" msgstr "ファイル・パス" @@ -2037,10 +1934,10 @@ msgid "Cloning..." msgstr "クローン作成中..." msgid "Saving..." -msgstr "" +msgstr "保存中..." msgid "Migrating..." -msgstr "" +msgstr "マイグレーション中..." msgid "No ISO found" msgstr "ISO が見つかりません" @@ -2051,70 +1948,73 @@ msgstr "テンプレートの追加" msgid "This may take a long time. Do you want to continue?" msgstr "これには時間がかかることがあります。続行しますか ?" -msgid "" -"This will permanently delete the %1 template. Would you like to continue?" -msgstr "" +msgid "This will permanently delete the %1 template. Would you like to continue?" +msgstr "これにより %1 テンプレートは完全に削除されます。続行しますか?" msgid "View Table" -msgstr "" +msgstr "テーブルの表示" msgid "View Gallery" -msgstr "" +msgstr "ギャラリーの表示" msgid "Not Available" -msgstr "" +msgstr "使用不可" msgid "Please check the invalid Storage Pools" -msgstr "" +msgstr "無効なストレージ・プールを確認してください" msgid "Please check the invalid Storage Pools or Paths" -msgstr "" +msgstr "無効なストレージ・プールまたはパスを確認してください" -msgid "" -"This will delete the %1 virtual machine and its virtual disks. This " -"operation cannot be undone. Would you like to continue?" -msgstr "" +msgid "macvtap" +msgstr "macvtap" + +msgid "ovs" +msgstr "ovs" + +msgid "network" +msgstr "ネットワーク" + +msgid "This will delete the %1 virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?" +msgstr "これにより、%1 仮想マシンとその仮想ディスクが削除されます。この操作は元に戻すことができません。続行しますか?" msgid "Power off Confirmation" msgstr "電源オフの確認" -msgid "" -"This action may produce undesirable results, for example unflushed disk " -"cache in the %1 guest. Would you like to continue?" -msgstr "" +msgid "This action may produce undesirable results, for example unflushed disk cache in the %1 guest. Would you like to continue?" +msgstr "このアクションでは、望ましくない結果 (例えば、ゲストにおいて %1 ディスク・キャッシュがフラッシュされないなど) になる可能性があります。続行しますか?" msgid "Reset Confirmation" msgstr "リセットの確認" -msgid "" -"There is a risk of data loss caused by reset without the %1 guest OS " -"shutdown. Would you like to continue?" -msgstr "" +msgid "There is a risk of data loss caused by reset without the %1 guest OS shutdown. Would you like to continue?" +msgstr "%1 ゲスト OS をシャットダウンせずにリセットするとデータが失われる危険性があります。続行しますか?" msgid "Shut Down Confirmation" msgstr "シャットダウンの確認" -msgid "" -"Note the %1 guest OS may ignore this request. Would you like to continue?" -msgstr "" +msgid "Note the %1 guest OS may ignore this request. Would you like to continue?" +msgstr "%1 ゲスト OS ではこの要求が無視される可能性があることに注意してください。続行しますか?" msgid "Virtual Machine delete Confirmation" msgstr "仮想マシンの削除確認" msgid "" "The %1 virtual machine is not persistent. Power Off will delete it. Continue?" -msgstr "" +msgstr "%1 仮想マシンは永続的ではありません。電源オフにより削除されます。続行しますか?" msgid "Add Guest" msgstr "" msgid "Input is not a number" -msgstr "" +msgstr "入力が数値ではありません" msgid "Memory value cannot be higher than Max Memory value" -msgstr "" +msgstr "メモリー値は最大メモリー値よりも大きくすることはできません" -msgid "Current CPUs value cannot be higher than Max CPU value" +msgid "" +"For better performance it is recommended a threads per core value not " +"greater than %1." msgstr "" msgid "" @@ -2155,24 +2055,31 @@ msgid "Affected devices:" msgstr "影響を受けるデバイス:" msgid "Less" -msgstr "" +msgstr "省略" msgid "Successfully attached device to VM" -msgstr "" +msgstr "デバイスは VM に正常に接続されました" msgid "Successfully detached device from VM" -msgstr "" +msgstr "デバイスは正常に VM から切り離されました" msgid "Following devices will be affected, confirm?" -msgstr "" +msgstr "次のデバイスが影響を受けます。確認しますか?" + +msgid "Bridge" +msgstr "ブリッジ" + +msgid "Vepa" +msgstr "Vepa" + +msgid "None" +msgstr "なし" msgid "unavailable" msgstr "使用不可" -msgid "" -"This action will interrupt network connectivity for any virtual machine that " -"depend on the %1 network." -msgstr "" +msgid "This action will interrupt network connectivity for any virtual machine that depend on the %1 network." +msgstr "このアクションを実行すると、%1 ネットワークに依存するすべての仮想マシンのネットワーク接続が中断されます。" msgid "Add Network" msgstr "" @@ -2180,7 +2087,7 @@ msgstr "" msgid "" "The %1 network is not persistent. Instead of stop, this action will " "permanently delete it. Would you like to continue?" -msgstr "" +msgstr "%1 ネットワークは永続的ではありません。このアクションを実行すると、停止ではなく完全削除が行われます。続行しますか?" msgid "" "The bridged VLAN tag may not work well with NetworkManager enabled. You " @@ -2189,9 +2096,8 @@ msgstr "" "ブリッジ VLAN タグは NetworkManager が使用可能になっている場合は正しく機能し" "ない可能性があります。使用不可にすることを検討してください。" -msgid "" -"This will permanently delete the %1 storage pool. Would you like to continue?" -msgstr "" +msgid "This will permanently delete the %1 storage pool. Would you like to continue?" +msgstr "これにより、%1 ストレージ・プールは完全に削除されます。続行しますか?" msgid "This storage pool is empty." msgstr "このストレージ・プールは空です。" @@ -2218,18 +2124,25 @@ msgid "Failed to load iSCSI targets." msgstr "iSCSI ターゲットのロードに失敗しました。" msgid "Would you like to continue?" -msgstr "" +msgstr "続行しますか?" msgid "This will permanently delete the following storage volumes: %1" -msgstr "" +msgstr "これにより、次のストレージ・ボリュームは完全に削除されます: %1" + +msgid "Invalid NFS mount path." +msgstr "NFS マウント・パスが無効です。" + +msgid "No logical device selected." +msgstr "論理デバイスが選択されていません。" + +msgid "This is not a valid Server Name or IP. Please, modify it." +msgstr "これは有効なサーバー名または IP ではありません。変更してください。" msgid "No available partitions found." msgstr "使用可能なパーティションが見つかりません。" -msgid "" -"The %1 storage pool is not persistent. Instead of deactivate, this action " -"will permanently delete it. Would you like to continue?" -msgstr "" +msgid "The %1 storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?" +msgstr "%1 ストレージ・プールは永続的ではありません。このアクションを実行すると、非アクティブ化ではなく完全削除が行われます。続行しますか?" msgid "Unable to retrieve partitions information." msgstr "パーティション情報を取得できません。" @@ -2241,52 +2154,40 @@ msgid "Failed!" msgstr "失敗しました" msgid "No LVM found in the system." -msgstr "" +msgstr "LVM がシステムに見つかりません。" msgid "This will permanently wipe the following storage volumes: %1" -msgstr "" +msgstr "これにより、次のストレージ・プールは完全にワイプされます: %1" msgid "Wipe Confirmation" -msgstr "" +msgstr "ワイプ確認" msgid "Select one or more partitions to be added to the logical pool %1:" -msgstr "" - -msgid "Add Storage" -msgstr "" +msgstr "論理プール %1 に追加する 1 つ以上のパーティションを選択してください:" msgid "DIR" -msgstr "" +msgstr "DIR" msgid "NFS" -msgstr "" +msgstr "NFS" msgid "iSCSI" -msgstr "" +msgstr "iSCSI" msgid "LOGICAL" -msgstr "" +msgstr "論理" msgid "device" -msgstr "" +msgstr "デバイス" msgid "path" -msgstr "" +msgstr "パス" msgid "size (GiB)" -msgstr "" +msgstr "サイズ (GiB)" msgid "free size (GiB)" -msgstr "" - -msgid "Invalid NFS mount path." -msgstr "NFS マウント・パスが無効です。" - -msgid "No logical device selected." -msgstr "論理デバイスが選択されていません。" - -msgid "This is not a valid Server Name or IP. Please, modify it." -msgstr "これは有効なサーバー名または IP ではありません。変更してください。" +msgstr "フリー・サイズ (GiB)" msgid "CDROM path needs to be a valid local/remote path and cannot be blank." msgstr "" @@ -2296,46 +2197,44 @@ msgstr "" msgid "Disk pool or volume cannot be blank." msgstr "ディスク・プールまたはボリュームはブランクにはできません。" -msgid "" -"Disk size or Format or Directory path cannot be blank and Directory path " -"needs to be a valid local/remote path." -msgstr "" +msgid "Disk size or Format or Directory path cannot be blank and Directory path needs to be a valid local/remote path." +msgstr "ディスク・サイズ、フォーマット、ディレクトリー・パスはブランクにできません。ディレクトリー・パスは有効なローカル/リモート・パスでなければなりません。" msgid "Disk path needs to be a valid local/remote path and cannot be blank." -msgstr "" +msgstr "ディスク・パスは有効なローカル/リモート・パスでなければならず、ブランクにはできません。" msgid "Storage pool or Disk size or Format cannot be blank." -msgstr "" +msgstr "ストレージ・プール、ディスク・サイズ、フォーマットはブランクにはできません。" msgid "cdrom" -msgstr "" +msgstr "cdrom" msgid "disk" -msgstr "" +msgstr "プール/ボリュームを指定してください" msgid "Pool" -msgstr "" +msgstr "プール" msgid "qcow" -msgstr "" +msgstr "qcow" msgid "qcow2" -msgstr "" +msgstr "qcow2" msgid "qed" -msgstr "" +msgstr "qed" msgid "raw" -msgstr "" +msgstr "raw" msgid "vmdk" -msgstr "" +msgstr "vmdk" msgid "vpc" -msgstr "" +msgstr "vpc" msgid "Peers" -msgstr "" +msgstr "ピア" msgid "Create a network" msgstr "ネットワークの作成" @@ -2356,20 +2255,16 @@ msgid "NAT: outbound physical network connection only" msgstr "NAT: アウトバウンド物理ネットワーク接続のみ" msgid "Macvtap: Virtual machines are connected to physical network directly" -msgstr "" +msgstr "Macvtap: 仮想マシンは物理ネットワークに直接接続されます" -msgid "" -"Passthrough: Virtual machines are connected using a macvtap connection in " -"passthrough mode." -msgstr "" +msgid "Passthrough: Virtual machines are connected using a macvtap connection in passthrough mode." +msgstr "パススルー: 仮想マシンは macvtap 接続を使用してパススルー・モードで接続されます。" -msgid "" -"VEPA: special mode where virtual machines are connected to a VEPA-enabled " -"switch" -msgstr "" +msgid "VEPA: special mode where virtual machines are connected to a VEPA-enabled switch" +msgstr "VEPA: 仮想マシンが VEPA 対応スイッチに接続される特殊なモード" msgid "Bridged: Virtual machines are connected through a network bridge" -msgstr "" +msgstr "ブリッジ: 仮想マシンはネットワーク・ブリッジを使用して接続されます" msgid "(No interfaces found)" msgstr "(インターフェースが見つかりません)" @@ -2378,7 +2273,7 @@ msgid "Destination" msgstr "宛先" msgid "Select an Interface" -msgstr "" +msgstr "インターフェースの選択" msgid "Enable VLAN" msgstr "VLAN を使用可能にしてください" @@ -2387,10 +2282,10 @@ msgid "VLAN ID" msgstr "VLAN ID" msgid "Edit Network" -msgstr "" +msgstr "ネットワークの編集" msgid "Address Space" -msgstr "" +msgstr "アドレス・スペース" msgid "Define a New Storage Pool" msgstr "新規ストレージ・プールの定義" @@ -2415,18 +2310,14 @@ msgid "" msgstr "" "ストレージ・プールのパス。各ストレージ・プールには固有のパスが必要です。" -msgid "" -"Kimchi will try to create the directory when it does not already exist in " -"your system." -msgstr "" -"ディレクトリーがシステムに存在しない場合、Kimchi がその作成を試みます。" +msgid "Kimchi will try to create the directory when it does not already exist in your system." +msgstr "ディレクトリーがシステムにまだ存在していない場合は、Kimchi がディレクトリーを作成しようとします。" msgid "NFS Server IP" msgstr "NFS サーバー IP" msgid "NFS server IP or hostname. It can be input or chosen from history." -msgstr "" -"NFS サーバー IP またはホスト名。入力するか、ヒストリーから選択できます。" +msgstr "NFS サーバー IP またはホスト名。入力するか、履歴から選択できます。" msgid "NFS Path" msgstr "NFS パス" @@ -2435,13 +2326,13 @@ msgid "The NFS exported path on NFS server." msgstr "NFS がパスを NFS サーバーにエクスポートしました。" msgid "Create from existing LVM" -msgstr "" +msgstr "既存の LVM から作成" msgid "Create from raw disk" -msgstr "" +msgstr "ロー・ディスクから作成" msgid "Looking for existing lvms ..." -msgstr "" +msgstr "既存の lvm を検索しています..." msgid "Looking for available partitions ..." msgstr "愛用可能なパーティションを検索中..." @@ -2492,25 +2383,40 @@ msgid "Choose the file you want to upload." msgstr "アップロードするファイルを選択してください。" msgid "Resize Volume" -msgstr "" +msgstr "ボリューム・サイズの変更" msgid "Size" -msgstr "" +msgstr "サイズ" msgid "The total space which can be used to store data. The unit is megabytes." -msgstr "" +msgstr "データの保管に使用できる合計スペース。単位はメガバイトです。" msgid "Ok" +msgstr "OK" + +msgid "Template Name" +msgstr "テンプレート" + +msgid "" +"The name used to identify the template. If omitted, a name will be " +"automatically chosen." msgstr "" +"名前は仮想マシンを識別するために使用されます。省略すると、使用されているテン" +"プレートに基づいて選択されます。" -msgid "Where is the source media for this template? " +msgid "" +"When selecting more than one Image Template, a name will be automatically " +"chosen for each Image Template selected." msgstr "" +msgid "Where is the source media for this template? " +msgstr "このテンプレートのソース・メディアを指定してください。" + msgid "Image Template" -msgstr "" +msgstr "イメージ・テンプレート" msgid "Netboot Template" -msgstr "" +msgstr "Netboot テンプレート" msgid "File Path:" msgstr "ファイル・パス:" @@ -2522,20 +2428,17 @@ msgid "The following ISOs are available:" msgstr "次の ISO が使用可能です:" msgid "QEMU does not have enough permission to work with this file" -msgstr "" +msgstr "QEMU には、このファイルを操作するだけの十分な許可がありません" msgid "Search more ISOs" msgstr "ISO をさらに検索" msgid "Loading..." -msgstr "" +msgstr "ロード中..." msgid "Edit Template" msgstr "テンプレートの編集" -msgid "Processor" -msgstr "プロセッサー" - msgid "CDROM" msgstr "CDROM" @@ -2552,100 +2455,100 @@ msgid "Disk Format" msgstr "ディスク・フォーマット" msgid "Add Interface" -msgstr "" +msgstr "インターフェースの追加" -msgid "Current CPU Number" -msgstr "" +msgid "pool" +msgstr "プール" -msgid "Manually set CPU topology" -msgstr "CPU トポロジーを手動で設定" +msgid "bridge" +msgstr "ブリッジ" -msgid "Cores" -msgstr "コア" - -msgid "Threads" -msgstr "スレッド" +msgid "vepa" +msgstr "vepa" msgid "State" -msgstr "" +msgstr "状態" msgid "Guest Name ID" -msgstr "" +msgstr "ゲスト名 ID" msgid "OS Type" -msgstr "" +msgstr "OS タイプ" msgid "VNC" -msgstr "" +msgstr "VNC" msgid "No guests found." -msgstr "" +msgstr "ゲストが見つかりません。" msgid "Stop" -msgstr "" +msgstr "停止" msgid "Location" -msgstr "" +msgstr "ロケーション" msgid "%Used" -msgstr "" +msgstr "使用率 (%)" msgid "Allocated" -msgstr "" +msgstr "割り当て済み" msgid "Capacity" -msgstr "" +msgstr "容量" msgid "Disks" -msgstr "" +msgstr "ディスク" msgid "Extending logical pool" -msgstr "" +msgstr "論理プールの拡張中" + +msgid "%" +msgstr "%" msgid "Deactivate" -msgstr "" +msgstr "非アクティブ化" msgid "Activate" -msgstr "" +msgstr "アクティブ化" msgid "Extend" -msgstr "" +msgstr "拡張" msgid "Undefine" -msgstr "" +msgstr "定義の解除" msgid "Add Volume" -msgstr "" +msgstr "ボリュームの追加" msgid "Resize" -msgstr "" +msgstr "サイズ変更" msgid "Wipe" -msgstr "" +msgstr "ワイプ" msgid "Filter:" -msgstr "" +msgstr "フィルター:" msgid "Used By" -msgstr "" +msgstr "使用元" msgid "Used" -msgstr "" +msgstr "使用" msgid "Progress" -msgstr "" +msgstr "進捗状況" msgid "Used by the following VMs:" -msgstr "" +msgstr "次の VM で使用:" msgid "Allocation" -msgstr "" +msgstr "割り振り" msgid "Template Name (ID)" -msgstr "" +msgstr "テンプレート名 (ID)" msgid "No templates found." -msgstr "" +msgstr "テンプレートが見つかりません。" msgid "M" -msgstr "" +msgstr "M" diff --git a/po/kimchi.pot b/po/kimchi.pot index 663d6a7..7f31bb2 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-03 11:51+0530\n" +"POT-Creation-Date: 2017-01-26 23:05+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -99,7 +99,8 @@ msgstr "" msgid "Unable to access remote ISO. Details: %(err)s" msgstr "" -msgid "An error occurred when probing image OS information." +#, python-format +msgid "Error probing image OS information: %(err)s" msgstr "" #, python-format @@ -456,6 +457,9 @@ msgid "" "html ." msgstr "" +msgid "'enable_rdma' must be of type boolean (true or false)." +msgstr "" + #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." @@ -1186,11 +1190,6 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" - -#, python-format -msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1250,11 +1249,8 @@ msgid "The maximum number of vCPUs is too large for this system." msgstr "" msgid "" -"When CPU topology is defined, vCPUs must be a multiple of a product of cores " -"and threads." -msgstr "" - -msgid "The number of threads is too large for this system." +"When CPU topology is defined, CPUs must be a multiple of the 'threads' " +"number defined." msgstr "" msgid "" @@ -1272,6 +1268,13 @@ msgid "" "'cores', 'threads'." msgstr "" +msgid "Unable to update Max CPU or CPU topology when guest is running." +msgstr "" + +#, python-format +msgid "Unable to hot plug/unplug CPUs. Details: %(err)s" +msgstr "" + #, python-format msgid "Invalid volume group name parameter: %(name)s." msgstr "" @@ -1560,16 +1563,16 @@ msgstr "" msgid "Snapshot" msgstr "" -msgid "Name" +msgid "Processor" msgstr "" -msgid "More" +msgid "Name" msgstr "" -msgid "Max CPU" +msgid "Memory (MB)" msgstr "" -msgid "Memory (MB)" +msgid "More" msgstr "" msgid "Max Memory (MB)" @@ -1584,6 +1587,9 @@ msgstr "" msgid "Console" msgstr "" +msgid "Nothing selected" +msgstr "" + msgid "sclp" msgstr "" @@ -1662,6 +1668,39 @@ msgstr "" msgid "Created" msgstr "" +msgid "Current CPU Number" +msgstr "" + +msgid "" +"Current CPU must be equal or lower than the Maximum CPU value. If a topology " +"is set, it must be also be a multiple of the 'threads' value." +msgstr "" + +msgid "Max CPU" +msgstr "" + +msgid "" +"Unable to edit maximum CPU or CPU topology when editing a running or paused " +"virtual machine." +msgstr "" + +msgid "" +"If a topology is set, this value will be the product of sockets * times * " +"cores." +msgstr "" + +msgid "Manually set CPU topology" +msgstr "" + +msgid "Sockets" +msgstr "" + +msgid "Cores" +msgstr "" + +msgid "Threads" +msgstr "" + msgid "Save" msgstr "" @@ -1786,6 +1825,14 @@ msgstr "" msgid "Password of the user in the remote host" msgstr "" +msgid "Use RDMA transport" +msgstr "" + +msgid "" +"Check this option only if RDMA is properly configured in both source and " +"destination hosts, otherwise migration will fail." +msgstr "" + msgid "Delete this VM when the migration is completed" msgstr "" @@ -1927,6 +1974,15 @@ msgstr "" msgid "Please check the invalid Storage Pools or Paths" msgstr "" +msgid "macvtap" +msgstr "" + +msgid "ovs" +msgstr "" + +msgid "network" +msgstr "" + msgid "" "This will delete the %1 virtual machine and its virtual disks. This " "operation cannot be undone. Would you like to continue?" @@ -1971,7 +2027,9 @@ msgstr "" msgid "Memory value cannot be higher than Max Memory value" msgstr "" -msgid "Current CPUs value cannot be higher than Max CPU value" +msgid "" +"For better performance it is recommended a threads per core value not " +"greater than %1." msgstr "" msgid "" @@ -2020,6 +2078,15 @@ msgstr "" msgid "Following devices will be affected, confirm?" msgstr "" +msgid "Bridge" +msgstr "" + +msgid "Vepa" +msgstr "" + +msgid "None" +msgstr "" + msgid "unavailable" msgstr "" @@ -2347,6 +2414,19 @@ msgstr "" msgid "Ok" msgstr "" +msgid "Template Name" +msgstr "" + +msgid "" +"The name used to identify the template. If omitted, a name will be " +"automatically chosen." +msgstr "" + +msgid "" +"When selecting more than one Image Template, a name will be automatically " +"chosen for each Image Template selected." +msgstr "" + msgid "Where is the source media for this template? " msgstr "" @@ -2377,9 +2457,6 @@ msgstr "" msgid "Edit Template" msgstr "" -msgid "Processor" -msgstr "" - msgid "CDROM" msgstr "" @@ -2398,16 +2475,13 @@ msgstr "" msgid "Add Interface" msgstr "" -msgid "Current CPU Number" -msgstr "" - -msgid "Manually set CPU topology" +msgid "pool" msgstr "" -msgid "Cores" +msgid "bridge" msgstr "" -msgid "Threads" +msgid "vepa" msgstr "" msgid "State" @@ -2446,6 +2520,9 @@ msgstr "" msgid "Extending logical pool" msgstr "" +msgid "%" +msgstr "" + msgid "Deactivate" msgstr "" diff --git a/po/ko_KR.po b/po/ko_KR.po index 1a626fa..373f34f 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-03 11:51+0530\n" +"POT-Creation-Date: 2017-01-26 23:05+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -108,8 +108,9 @@ msgstr "" msgid "Unable to access remote ISO. Details: %(err)s" msgstr "" -msgid "An error occurred when probing image OS information." -msgstr "이미지 OS 정보를 프로브하는 중에 오류가 발생했습니다." +#, python-format +msgid "Error probing image OS information: %(err)s" +msgstr "" #, python-format msgid "Unable to read image file %(filename)s" @@ -471,6 +472,9 @@ msgid "" "html ." msgstr "" +msgid "'enable_rdma' must be of type boolean (true or false)." +msgstr "" + #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." @@ -1242,11 +1246,6 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "가상 머신 '%(vm)s'은(는) 스냅샷을 작성하기 전에 중지해야 합니다." - -#, python-format -msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1317,11 +1316,8 @@ msgid "The maximum number of vCPUs is too large for this system." msgstr "" msgid "" -"When CPU topology is defined, vCPUs must be a multiple of a product of cores " -"and threads." -msgstr "" - -msgid "The number of threads is too large for this system." +"When CPU topology is defined, CPUs must be a multiple of the 'threads' " +"number defined." msgstr "" msgid "" @@ -1339,6 +1335,13 @@ msgid "" "'cores', 'threads'." msgstr "" +msgid "Unable to update Max CPU or CPU topology when guest is running." +msgstr "" + +#, python-format +msgid "Unable to hot plug/unplug CPUs. Details: %(err)s" +msgstr "스토리지 풀을 나열할 수 없습니다. 세부사항: %(err)s" + #, python-format msgid "Invalid volume group name parameter: %(name)s." msgstr "" @@ -1629,18 +1632,18 @@ msgstr "" msgid "Snapshot" msgstr "" +msgid "Processor" +msgstr "프로세서" + msgid "Name" msgstr "이름" -msgid "More" -msgstr "" - -msgid "Max CPU" -msgstr "" - msgid "Memory (MB)" msgstr "메모리(MB)" +msgid "More" +msgstr "" + msgid "Max Memory (MB)" msgstr "" @@ -1653,6 +1656,9 @@ msgstr "아이콘" msgid "Console" msgstr "" +msgid "Nothing selected" +msgstr "" + msgid "sclp" msgstr "" @@ -1731,6 +1737,39 @@ msgstr "" msgid "Created" msgstr "작성됨" +msgid "Current CPU Number" +msgstr "" + +msgid "" +"Current CPU must be equal or lower than the Maximum CPU value. If a topology " +"is set, it must be also be a multiple of the 'threads' value." +msgstr "" + +msgid "Max CPU" +msgstr "" + +msgid "" +"Unable to edit maximum CPU or CPU topology when editing a running or paused " +"virtual machine." +msgstr "" + +msgid "" +"If a topology is set, this value will be the product of sockets * times * " +"cores." +msgstr "" + +msgid "Manually set CPU topology" +msgstr "CPU 토폴로지 수동 설정" + +msgid "Sockets" +msgstr "" + +msgid "Cores" +msgstr "코어" + +msgid "Threads" +msgstr "스레드" + msgid "Save" msgstr "저장" @@ -1855,6 +1894,14 @@ msgstr "비밀번호" msgid "Password of the user in the remote host" msgstr "" +msgid "Use RDMA transport" +msgstr "" + +msgid "" +"Check this option only if RDMA is properly configured in both source and " +"destination hosts, otherwise migration will fail." +msgstr "" + msgid "Delete this VM when the migration is completed" msgstr "" @@ -1996,6 +2043,15 @@ msgstr "" msgid "Please check the invalid Storage Pools or Paths" msgstr "" +msgid "macvtap" +msgstr "" + +msgid "ovs" +msgstr "" + +msgid "network" +msgstr "네트워크" + msgid "" "This will delete the %1 virtual machine and its virtual disks. This " "operation cannot be undone. Would you like to continue?" @@ -2040,7 +2096,9 @@ msgstr "" msgid "Memory value cannot be higher than Max Memory value" msgstr "" -msgid "Current CPUs value cannot be higher than Max CPU value" +msgid "" +"For better performance it is recommended a threads per core value not " +"greater than %1." msgstr "" msgid "" @@ -2093,6 +2151,15 @@ msgstr "" msgid "Following devices will be affected, confirm?" msgstr "" +msgid "Bridge" +msgstr "" + +msgid "Vepa" +msgstr "" + +msgid "None" +msgstr "" + msgid "unavailable" msgstr "사용 불가능" @@ -2425,6 +2492,21 @@ msgstr "" msgid "Ok" msgstr "" +msgid "Template Name" +msgstr "템플리트" + +msgid "" +"The name used to identify the template. If omitted, a name will be " +"automatically chosen." +msgstr "" +"가상 머신을 식별하는 데 사용되는 이름입니다. 생략되면 이름은 사용된 템플리트" +"를 기반으로 선택됩니다." + +msgid "" +"When selecting more than one Image Template, a name will be automatically " +"chosen for each Image Template selected." +msgstr "" + msgid "Where is the source media for this template? " msgstr "" @@ -2455,9 +2537,6 @@ msgstr "" msgid "Edit Template" msgstr "템플리트 편집" -msgid "Processor" -msgstr "프로세서" - msgid "CDROM" msgstr "CDROM" @@ -2476,17 +2555,14 @@ msgstr "디스크 형식" msgid "Add Interface" msgstr "" -msgid "Current CPU Number" +msgid "pool" msgstr "" -msgid "Manually set CPU topology" -msgstr "CPU 토폴로지 수동 설정" - -msgid "Cores" -msgstr "코어" +msgid "bridge" +msgstr "" -msgid "Threads" -msgstr "스레드" +msgid "vepa" +msgstr "" msgid "State" msgstr "" @@ -2524,6 +2600,9 @@ msgstr "" msgid "Extending logical pool" msgstr "" +msgid "%" +msgstr "" + msgid "Deactivate" msgstr "" @@ -2571,3 +2650,7 @@ msgstr "" msgid "M" msgstr "" + +#~ msgid "" +#~ "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." +#~ msgstr "가상 머신 '%(vm)s'은(는) 스냅샷을 작성하기 전에 중지해야 합니다." diff --git a/po/pt_BR.po b/po/pt_BR.po index 2590afa..542bfcf 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-03 11:51+0530\n" +"POT-Creation-Date: 2017-01-26 23:05+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -113,8 +113,9 @@ msgstr "" msgid "Unable to access remote ISO. Details: %(err)s" msgstr "" -msgid "An error occurred when probing image OS information." -msgstr "Ocorreu um erro com a imagem de análise das informações de S.O." +#, python-format +msgid "Error probing image OS information: %(err)s" +msgstr "" #, python-format msgid "Unable to read image file %(filename)s" @@ -482,6 +483,9 @@ msgid "" "html ." msgstr "" +msgid "'enable_rdma' must be of type boolean (true or false)." +msgstr "" + #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." @@ -1313,13 +1317,6 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" -"A máquina virtual '%(vm)s' deve ser interrompida antes da criação de uma " -"captura instantânea nela." - -#, python-format -msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1395,11 +1392,8 @@ msgid "The maximum number of vCPUs is too large for this system." msgstr "" msgid "" -"When CPU topology is defined, vCPUs must be a multiple of a product of cores " -"and threads." -msgstr "" - -msgid "The number of threads is too large for this system." +"When CPU topology is defined, CPUs must be a multiple of the 'threads' " +"number defined." msgstr "" msgid "" @@ -1417,6 +1411,13 @@ msgid "" "'cores', 'threads'." msgstr "" +msgid "Unable to update Max CPU or CPU topology when guest is running." +msgstr "" + +#, python-format +msgid "Unable to hot plug/unplug CPUs. Details: %(err)s" +msgstr "Não é possível listar os bancos de armazenamento. Detalhes: %(err)s" + #, python-format msgid "Invalid volume group name parameter: %(name)s." msgstr "" @@ -1707,18 +1708,18 @@ msgstr "" msgid "Snapshot" msgstr "" +msgid "Processor" +msgstr "Processador" + msgid "Name" msgstr "Nome" -msgid "More" -msgstr "" - -msgid "Max CPU" -msgstr "" - msgid "Memory (MB)" msgstr "Memória (megabyte)" +msgid "More" +msgstr "" + msgid "Max Memory (MB)" msgstr "" @@ -1731,6 +1732,9 @@ msgstr "Ícone" msgid "Console" msgstr "" +msgid "Nothing selected" +msgstr "" + msgid "sclp" msgstr "" @@ -1809,6 +1813,39 @@ msgstr "" msgid "Created" msgstr "Criado" +msgid "Current CPU Number" +msgstr "" + +msgid "" +"Current CPU must be equal or lower than the Maximum CPU value. If a topology " +"is set, it must be also be a multiple of the 'threads' value." +msgstr "" + +msgid "Max CPU" +msgstr "" + +msgid "" +"Unable to edit maximum CPU or CPU topology when editing a running or paused " +"virtual machine." +msgstr "" + +msgid "" +"If a topology is set, this value will be the product of sockets * times * " +"cores." +msgstr "" + +msgid "Manually set CPU topology" +msgstr "Configurar manualmente a topologia da CPU" + +msgid "Sockets" +msgstr "" + +msgid "Cores" +msgstr "Núcleos" + +msgid "Threads" +msgstr "Encadeamentos" + msgid "Save" msgstr "Salvar" @@ -1933,6 +1970,14 @@ msgstr "Senha" msgid "Password of the user in the remote host" msgstr "" +msgid "Use RDMA transport" +msgstr "" + +msgid "" +"Check this option only if RDMA is properly configured in both source and " +"destination hosts, otherwise migration will fail." +msgstr "" + msgid "Delete this VM when the migration is completed" msgstr "" @@ -2074,6 +2119,15 @@ msgstr "" msgid "Please check the invalid Storage Pools or Paths" msgstr "" +msgid "macvtap" +msgstr "" + +msgid "ovs" +msgstr "" + +msgid "network" +msgstr "Rede" + msgid "" "This will delete the %1 virtual machine and its virtual disks. This " "operation cannot be undone. Would you like to continue?" @@ -2118,7 +2172,9 @@ msgstr "" msgid "Memory value cannot be higher than Max Memory value" msgstr "" -msgid "Current CPUs value cannot be higher than Max CPU value" +msgid "" +"For better performance it is recommended a threads per core value not " +"greater than %1." msgstr "" msgid "" @@ -2171,6 +2227,15 @@ msgstr "" msgid "Following devices will be affected, confirm?" msgstr "" +msgid "Bridge" +msgstr "" + +msgid "Vepa" +msgstr "" + +msgid "None" +msgstr "" + msgid "unavailable" msgstr "indisponível" @@ -2511,6 +2576,21 @@ msgstr "" msgid "Ok" msgstr "" +msgid "Template Name" +msgstr "Modelos" + +msgid "" +"The name used to identify the template. If omitted, a name will be " +"automatically chosen." +msgstr "" +"O nome usado para identificar a máquina virtual. Se omitido, um nome será " +"escolhido com base no modelo usado." + +msgid "" +"When selecting more than one Image Template, a name will be automatically " +"chosen for each Image Template selected." +msgstr "" + msgid "Where is the source media for this template? " msgstr "" @@ -2541,9 +2621,6 @@ msgstr "" msgid "Edit Template" msgstr "Editar modelo" -msgid "Processor" -msgstr "Processador" - msgid "CDROM" msgstr "CD-ROM" @@ -2562,17 +2639,14 @@ msgstr "Formato do disco" msgid "Add Interface" msgstr "Incluir Interface" -msgid "Current CPU Number" +msgid "pool" msgstr "" -msgid "Manually set CPU topology" -msgstr "Configurar manualmente a topologia da CPU" - -msgid "Cores" -msgstr "Núcleos" +msgid "bridge" +msgstr "" -msgid "Threads" -msgstr "Encadeamentos" +msgid "vepa" +msgstr "" msgid "State" msgstr "" @@ -2610,6 +2684,9 @@ msgstr "" msgid "Extending logical pool" msgstr "" +msgid "%" +msgstr "" + msgid "Deactivate" msgstr "" @@ -2657,3 +2734,9 @@ msgstr "" msgid "M" msgstr "" + +#~ msgid "" +#~ "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." +#~ msgstr "" +#~ "A máquina virtual '%(vm)s' deve ser interrompida antes da criação de uma " +#~ "captura instantânea nela." diff --git a/po/ru_RU.po b/po/ru_RU.po index 2cbba5d..05f80f3 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-03 11:51+0530\n" +"POT-Creation-Date: 2017-01-26 23:05+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -108,8 +108,9 @@ msgstr "" msgid "Unable to access remote ISO. Details: %(err)s" msgstr "" -msgid "An error occurred when probing image OS information." -msgstr "Ошибка проверки информации об ОС образа." +#, python-format +msgid "Error probing image OS information: %(err)s" +msgstr "" #, python-format msgid "Unable to read image file %(filename)s" @@ -482,6 +483,9 @@ msgid "" "html ." msgstr "" +msgid "'enable_rdma' must be of type boolean (true or false)." +msgstr "" + #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." @@ -1271,13 +1275,6 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" -"Виртуальная машина '%(vm)s' должна быть остановлена перед созданием ее " -"моментальной копии." - -#, python-format -msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1354,11 +1351,8 @@ msgid "The maximum number of vCPUs is too large for this system." msgstr "" msgid "" -"When CPU topology is defined, vCPUs must be a multiple of a product of cores " -"and threads." -msgstr "" - -msgid "The number of threads is too large for this system." +"When CPU topology is defined, CPUs must be a multiple of the 'threads' " +"number defined." msgstr "" msgid "" @@ -1376,6 +1370,13 @@ msgid "" "'cores', 'threads'." msgstr "" +msgid "Unable to update Max CPU or CPU topology when guest is running." +msgstr "" + +#, python-format +msgid "Unable to hot plug/unplug CPUs. Details: %(err)s" +msgstr "Не удалось вывести список пулов памяти. Сведения: %(err)s" + #, python-format msgid "Invalid volume group name parameter: %(name)s." msgstr "" @@ -1666,18 +1667,18 @@ msgstr "" msgid "Snapshot" msgstr "" +msgid "Processor" +msgstr "Процессор" + msgid "Name" msgstr "Имя" -msgid "More" -msgstr "" - -msgid "Max CPU" -msgstr "" - msgid "Memory (MB)" msgstr "Объем памяти (МБ)" +msgid "More" +msgstr "" + msgid "Max Memory (MB)" msgstr "" @@ -1690,6 +1691,9 @@ msgstr "Значок" msgid "Console" msgstr "" +msgid "Nothing selected" +msgstr "" + msgid "sclp" msgstr "" @@ -1768,6 +1772,39 @@ msgstr "" msgid "Created" msgstr "Дата создания" +msgid "Current CPU Number" +msgstr "" + +msgid "" +"Current CPU must be equal or lower than the Maximum CPU value. If a topology " +"is set, it must be also be a multiple of the 'threads' value." +msgstr "" + +msgid "Max CPU" +msgstr "" + +msgid "" +"Unable to edit maximum CPU or CPU topology when editing a running or paused " +"virtual machine." +msgstr "" + +msgid "" +"If a topology is set, this value will be the product of sockets * times * " +"cores." +msgstr "" + +msgid "Manually set CPU topology" +msgstr "Вручную настроить топологию процессоров" + +msgid "Sockets" +msgstr "" + +msgid "Cores" +msgstr "Ядра" + +msgid "Threads" +msgstr "Нити" + msgid "Save" msgstr "Сохранить" @@ -1892,6 +1929,14 @@ msgstr "Пароль" msgid "Password of the user in the remote host" msgstr "" +msgid "Use RDMA transport" +msgstr "" + +msgid "" +"Check this option only if RDMA is properly configured in both source and " +"destination hosts, otherwise migration will fail." +msgstr "" + msgid "Delete this VM when the migration is completed" msgstr "" @@ -2033,6 +2078,15 @@ msgstr "" msgid "Please check the invalid Storage Pools or Paths" msgstr "" +msgid "macvtap" +msgstr "" + +msgid "ovs" +msgstr "" + +msgid "network" +msgstr "Сеть" + msgid "" "This will delete the %1 virtual machine and its virtual disks. This " "operation cannot be undone. Would you like to continue?" @@ -2077,7 +2131,9 @@ msgstr "" msgid "Memory value cannot be higher than Max Memory value" msgstr "" -msgid "Current CPUs value cannot be higher than Max CPU value" +msgid "" +"For better performance it is recommended a threads per core value not " +"greater than %1." msgstr "" msgid "" @@ -2127,6 +2183,15 @@ msgstr "" msgid "Following devices will be affected, confirm?" msgstr "" +msgid "Bridge" +msgstr "" + +msgid "Vepa" +msgstr "" + +msgid "None" +msgstr "" + msgid "unavailable" msgstr "недоступно" @@ -2462,6 +2527,21 @@ msgstr "" msgid "Ok" msgstr "" +msgid "Template Name" +msgstr "Шаблоны" + +msgid "" +"The name used to identify the template. If omitted, a name will be " +"automatically chosen." +msgstr "" +"Имя для идентификации виртуальной машины. Если не указано, имя будет выбрано " +"в зависимости от используемого шаблона." + +msgid "" +"When selecting more than one Image Template, a name will be automatically " +"chosen for each Image Template selected." +msgstr "" + msgid "Where is the source media for this template? " msgstr "" @@ -2492,9 +2572,6 @@ msgstr "" msgid "Edit Template" msgstr "Изменить шаблон" -msgid "Processor" -msgstr "Процессор" - msgid "CDROM" msgstr "CDROM" @@ -2513,17 +2590,14 @@ msgstr "Формат диска" msgid "Add Interface" msgstr "" -msgid "Current CPU Number" +msgid "pool" msgstr "" -msgid "Manually set CPU topology" -msgstr "Вручную настроить топологию процессоров" - -msgid "Cores" -msgstr "Ядра" +msgid "bridge" +msgstr "" -msgid "Threads" -msgstr "Нити" +msgid "vepa" +msgstr "" msgid "State" msgstr "" @@ -2561,6 +2635,9 @@ msgstr "" msgid "Extending logical pool" msgstr "" +msgid "%" +msgstr "" + msgid "Deactivate" msgstr "" @@ -2608,3 +2685,9 @@ msgstr "" msgid "M" msgstr "" + +#~ msgid "" +#~ "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." +#~ msgstr "" +#~ "Виртуальная машина '%(vm)s' должна быть остановлена перед созданием ее " +#~ "моментальной копии." diff --git a/po/zh_CN.po b/po/zh_CN.po index 5f32d78..e884ecd 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-03 11:51+0530\n" +"POT-Creation-Date: 2017-01-26 23:05+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -43,7 +43,7 @@ msgstr "“_available_only”应该为“true”或“false”" #, python-format msgid "Unable to find distro file: %(filename)s" -msgstr "找不到 Distro 文件：%(filename)s" +msgstr "找不到 distro 文件：%(filename)s" #, python-format msgid "" @@ -76,45 +76,35 @@ msgstr "ISO %(filename)s 中的 El Torito 验证条目无效" #, python-format msgid "Invalid El Torito boot indicator in ISO %(filename)s" -msgstr "ISO %(filename)s 中的 El Torito 引导指示符无效" +msgstr "ISO %(filename)s 中的 El Torito 引导指示器无效" #, python-format msgid "Unexpected volume type for primary volume in ISO %(filename)s" -msgstr "ISO %(filename)s 中的主卷具有意外的卷类型" +msgstr "ISO %(filename)s 中主要卷具有意外的卷类型" #, python-format msgid "Bad format while reading volume descriptor in ISO %(filename)s" -msgstr "在 ISO %(filename)s 中读取卷描述符时格式不正确" +msgstr "在 ISO %(filename)s 中读取卷描述符时格式错误" #, python-format -msgid "" -"The hypervisor doesn't have permission to use this ISO %(filename)s. " -"Consider moving it under /var/lib/libvirt, or set the search permission to " -"file access control lists for '%(user)s' user if possible, or add the " -"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " -"'path_to_iso'.Details: %(err)s" -msgstr "" -"管理程序不具使用此 ISO %(filename)s 的许可权。请考虑将其移至 /var/lib/" -"libvirt 下，或者为“%(user)s”用户设置对文件访问控制表的搜索许可权（如果可以设" -"置），或者将“%(user)s”添加至 ISO 路径组，或者（不建议）执行“chmod -R o+x " -"path_to_iso”。详细信息：%(err)s" +msgid "The hypervisor doesn't have permission to use this ISO %(filename)s. Consider moving it under /var/lib/libvirt, or set the search permission to file access control lists for '%(user)s' user if possible, or add the '%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x 'path_to_iso'.Details: %(err)s" +msgstr "管理程序不具使用此 ISO %(filename)s 的许可权。考虑在 /var/lib/libvirt 下移动该 ISO、设置对“%(user)s”用户的文件访问控制表的搜索许可权（如果可能）、将“%(user)s”添加至 ISO 路径组或者（不推荐）使用 'chmod -R o+x 'path_to_iso'。详细信息：%(err)s" #, python-format msgid "Unable to access remote ISO. Details: %(err)s" -msgstr "" +msgstr "无法访问远程 ISO。详细信息：%(err)s" -msgid "An error occurred when probing image OS information." -msgstr "探测映像操作系统信息时发生错误。" +#, python-format +msgid "Error probing image OS information: %(err)s" +msgstr "" #, python-format msgid "Unable to read image file %(filename)s" msgstr "无法读取映像文件 %(filename)s" #, python-format -msgid "" -"Image file must be an existing file on system. %(filename)s is not a valid " -"input." -msgstr "映像文件必须是系统上的现有文件。%(filename)s 为无效输入。" +msgid "Image file must be an existing file on system. %(filename)s is not a valid input." +msgstr "映像文件必须是系统上的现有文件。%(filename)s 是无效输入。" #, python-format msgid "Virtual machine %(name)s already exists" @@ -126,7 +116,7 @@ msgstr "虚拟机 %(name)s 不存在" #, python-format msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s" -msgstr "无法检索已停止虚拟机 %(name)s 的屏幕快照" +msgstr "无法检索已停止的虚拟机 %(name)s 的屏幕快照" msgid "Remote ISO image is not supported by this server." msgstr "远程 ISO 映像不受此服务器支持。" @@ -177,7 +167,7 @@ msgstr "无法启动虚拟机 %(name)s。详细信息：%(err)s" #, python-format msgid "Unable to power off virtual machine %(name)s. Details: %(err)s" -msgstr "无法关闭虚拟机 %(name)s 的电源。详细信息：%(err)s" +msgstr "无法对虚拟机 %(name)s 断电。详细信息：%(err)s" #, python-format msgid "Unable to delete virtual machine %(name)s. Details: %(err)s" @@ -250,28 +240,21 @@ msgid "Unable to resume VM '%(name)s'. Details: %(err)s" msgstr "无法恢复 VM“%(name)s”。详细信息：%(err)s" #, python-format -msgid "" -"Memory assigned is higher then the maximum allowed in the host: " -"%(maxmem)sMib." -msgstr "" +msgid "Memory assigned is higher then the maximum allowed in the host: %(maxmem)sMib." +msgstr "所分配内存高于主机中允许的最大内存：%(maxmem)sMiB。" #, python-format -msgid "" -"Guest '%(name)s' does not support live memory update. Please, with the guest " -"offline, set Maximum Memory with a value greater then Memory to enable this " -"feature." -msgstr "" +msgid "Guest '%(name)s' does not support live memory update. Please, with the guest offline, set Maximum Memory with a value greater then Memory to enable this feature." +msgstr "访客“%(name)s”不支持实时内存更新。在访客脱机的情况下，请将“最大内存”设置为大于“内存”的值以启用此功能。" msgid "Only increase memory is allowed in active VMs" msgstr "仅允许在活动 VM 中增加内存" msgid "There are not enough free slots to add a new memory device." -msgstr "" +msgstr "没有足够的可用插槽来添加新的内存设备。" -msgid "" -"Host's libvirt or qemu version does not support memory devices and memory " -"hotplug. Libvirt must be >= 1.2.14 and QEMU must be >= 2.1." -msgstr "" +msgid "Host's libvirt or qemu version does not support memory devices and memory hotplug. Libvirt must be >= 1.2.14 and QEMU must be >= 2.1." +msgstr "主机的 libvirt 或 qemu 版本不支持内存设备和内存热插拔。Libvirt 至少是 1.2.14，QEMU 至少是 2.1。" #, python-format msgid "Error attaching memory device. Details: %(error)s" @@ -283,7 +266,7 @@ msgstr "无法启动 %(name)s。虚拟机正在运行。" #, python-format msgid "Cannot power off %(name)s. Virtual machine is shut off." -msgstr "无法关闭 %(name)s。虚拟机已关机。" +msgstr "无法关闭 %(name)s 电源。虚拟机已关机。" #, python-format msgid "Cannot shutdown %(name)s. Virtual machine is shut off." @@ -294,163 +277,136 @@ msgid "Cannot reset %(name)s. Virtual machine is already shut off." msgstr "无法重置 %(name)s。虚拟机已关机。" msgid "Boot order must be a list. Devices accepted: hd, cdrom, fd or network." -msgstr "" +msgstr "引导顺序必须为列表。接受的设备：硬盘、CD-ROM、软盘或网络。" msgid "Bootmenu must be boolean. Values accepted: true of false." -msgstr "" +msgstr "Bootmenu 必须为布尔值。接受的值：true 或 false。" msgid "Graphic type not valid. Values accepted: vnc or spice." -msgstr "" +msgstr "图形类型无效。接受的值：vnc 或 spice。" #, python-format msgid "Migrate to localhost %(host)s is not allowed." -msgstr "" +msgstr "不允许迁移至本地主机 %(host)s。" #, python-format -msgid "" -"To migrate a virtual machine to the remote host %(host)s the user %(user)s " -"must have password-less login to the remote host." -msgstr "" +msgid "To migrate a virtual machine to the remote host %(host)s the user %(user)s must have password-less login to the remote host." +msgstr "要将虚拟机迁移至远程主机 %(host)s，用户 %(user)s 必须以无密码方式登录远程主机。" #, python-format msgid "Can not migrate virtual machine %(name)s when its in %(state)s state." -msgstr "" +msgstr "虚拟机 %(name)s 处于 %(state)s 状态时，无法迁移该虚拟机。" #, python-format msgid "Failed to migrate virtual machine %(name)s due error: %(err)s" -msgstr "" +msgstr "无法迁移虚拟机 %(name)s，因为发生了错误：%(err)s" msgid "User name of the remote server must be a string." -msgstr "" +msgstr "远程服务器的用户名必须为字符串。" msgid "Destination host of the migration must be a string." -msgstr "" +msgstr "迁移的目标主机必须为字符串。" #, python-format msgid "Unable to create file %(path)s at %(host)s using user %(user)s." -msgstr "" +msgstr "无法在 %(host)s 上使用用户 %(user)s 创建文件 %(path)s。" #, python-format msgid "Unable to read disk size of %(path)s, error: %(error)s" -msgstr "" +msgstr "无法读取 %(path)s 的磁盘大小，因为发生了错误：%(error)s" #, python-format -msgid "" -"Unable to create disk image %(path)s at %(host)s using user %(user)s. Error: " -"%(error)s" -msgstr "" +msgid "Unable to create disk image %(path)s at %(host)s using user %(user)s. Error: %(error)s" +msgstr "无法在 %(host)s 上使用用户 %(user)s 创建磁盘映像 %(path)s。错误：%(error)s" #, python-format -msgid "" -"Unable to migrate virtual machine to remote host %(host)s with arch " -"%(destarch)s using localhost with arch %(srcarch)s." -msgstr "" +msgid "Unable to migrate virtual machine to remote host %(host)s with arch %(destarch)s using localhost with arch %(srcarch)s." +msgstr "无法使用体系结构为 %(srcarch)s 的本地主机将虚拟机迁移至体系结构为 %(destarch)s 的远程主机 %(host)s。" #, python-format -msgid "" -"Unable to migrate virtual machine to remote host %(host)s with hypervisor " -"%(desthyp)s because localhost uses hypervisor %(srchyp)s." -msgstr "" +msgid "Unable to migrate virtual machine to remote host %(host)s with hypervisor %(desthyp)s because localhost uses hypervisor %(srchyp)s." +msgstr "无法将虚拟机迁移至管理程序为 %(desthyp)s 的远程主机 %(host)s，因为本地主机使用管理程序 %(srchyp)s。" #, python-format -msgid "" -"Unable to determine remote host hypervisor and architecture. Error: %(error)s" -msgstr "" +msgid "Unable to determine remote host hypervisor and architecture. Error: %(error)s" +msgstr "无法确定远程主机管理程序和体系结构。错误：%(error)s" #, python-format -msgid "" -"Unable to migrate virtual machine: subcores per core setting from " -"localhostand remote host %(host)s differs." -msgstr "" +msgid "Unable to migrate virtual machine: subcores per core setting from localhostand remote host %(host)s differs." +msgstr "无法迁移虚拟机：远程主机和本地主机 %(host)s 中的每个核心的子核心数设置不同。" #, python-format -msgid "" -"Unable to setup password-less login at remote host %(host)s using user " -"%(user)s. Error: %(error)s" -msgstr "" +msgid "Unable to setup password-less login at remote host %(host)s using user %(user)s. Error: %(error)s" +msgstr "无法通过用户 %(user)s 在远程主机 %(host)s 上设置无密码登录。错误：%(error)s" msgid "Password field must be a string." -msgstr "" +msgstr "密码字段必须为字符串。" msgid "Error creating local host ssh rsa key of user 'root'." -msgstr "" +msgstr "创建用户“root”的本地主机 ssh rsa 密钥时出错。" #, python-format msgid "%(param)s value (%(mem)sMiB) must be aligned to %(alignment)sMiB." -msgstr "" +msgstr "%(param)s 值 (%(mem)sMiB) 必须与 %(alignment)sMiB 匹配。" #, python-format -msgid "" -"Unable to update the following parameters while the VM is offline: %(params)s" -msgstr "" +msgid "Unable to update the following parameters while the VM is offline: %(params)s" +msgstr "VM 脱机时无法更新以下参数：%(params)s" #, python-format -msgid "" -"Unable to update the following parameters while the VM is online: %(params)s" -msgstr "" +msgid "Unable to update the following parameters while the VM is online: %(params)s" +msgstr "VM 联机时无法更新以下参数：%(params)s" #, python-format -msgid "" -"VM %(name)s must have serial and console defined to open a web serial console" -msgstr "" +msgid "VM %(name)s must have serial and console defined to open a web serial console" +msgstr "VM %(name)s 必须已定义串行线路和控制台以打开 Web 串行控制台" #, python-format msgid "Impossible to get the serial console of %(name)s" -msgstr "" +msgstr "无法获取 %(name)s 的串行控制台" #, python-format -msgid "" -"Memory or Maximum Memory value is higher than amount supported by the host: " -"%(memHost)sMiB." -msgstr "" +msgid "Memory or Maximum Memory value is higher than amount supported by the host: %(memHost)sMiB." +msgstr "“内存”或“最大内存”值高于主机支持的量：%(memHost)sMiB。" #, python-format -msgid "" -"Memory or Maximum Memory value is higher than maximum amount recommended: " -"%(value)sTiB" -msgstr "" +msgid "Memory or Maximum Memory value is higher than maximum amount recommended: %(value)sTiB" +msgstr "“内存”或“最大内存”值高于建议的最大量：%(value)sTiB。" msgid "Cannot update Maximum Memory when guest is running." -msgstr "" +msgstr "访客正在运行时，无法更新最大内存。" #, python-format msgid "Impossible to create %(dir)s directory." -msgstr "" +msgstr "无法创建 %(dir)s 目录。" #, python-format -msgid "" -"Either the guest %(name)s did not start to listen to the serial or it is not " -"configured to use the serial console." -msgstr "" +msgid "Either the guest %(name)s did not start to listen to the serial or it is not configured to use the serial console." +msgstr "访客 %(name)s 未开始侦听串行线路或它未配置为使用串行控制台。" #, python-format -msgid "" -"Unable to retrieve Virt Viewer file for stopped virtual machine %(name)s" -msgstr "" +msgid "Unable to retrieve Virt Viewer file for stopped virtual machine %(name)s" +msgstr "无法检索已停止虚拟机 %(name)s 的 Virt Viewer 文件" #, python-format -msgid "" -"Error occured while retrieving the Virt Viewer file for virtual machine " -"%(name)s : %(err)s" -msgstr "" +msgid "Error occured while retrieving the Virt Viewer file for virtual machine %(name)s : %(err)s" +msgstr "检索虚拟机 %(name)s 的 Virt Viewer 文件时发生了错误：%(err)s" msgid "Virtual machine title must be a string" -msgstr "" +msgstr "虚拟机标题必须为字符串" msgid "Virtual machine description must be a string" -msgstr "" +msgstr "虚拟机描述必须为字符串" msgid "console parameter is only supported for s390x/s390 architecture." -msgstr "" +msgstr "仅 s390x/s390 体系结构支持控制台参数。" msgid "invalid console type, supported types are sclp/virtio." -msgstr "" +msgstr "无效控制台类型，受支持类型为 sclp/virtio。" #, python-format -msgid "" -"Unable to setup password-less login at remote host %(host)s using user " -"%(user)s: remote directory %(sshdir)s does not exist." -msgstr "" +msgid "Unable to setup password-less login at remote host %(host)s using user %(user)s: remote directory %(sshdir)s does not exist." +msgstr "无法通过用户 %(user)s 在远程主机 %(host)s 上设置无密码登录：远程目录 %(sshdir)s 不存在。" #, python-format msgid "" @@ -458,6 +414,9 @@ msgid "" "daemon at host %(host)s with the user %(user)s. Please verify the remote " "server libvirt configuration. More information: http://libvirt.org/auth." "html ." +msgstr "无法通过用户 %(user)s 在主机 %(host)s 上创建与远程 libvirt 守护程序的无密码 libvirt 连接。请验证远程服务器 libvirt 配置。有关更多信息，请参阅 http://libvirt.org/auth.html。" + +msgid "'enable_rdma' must be of type boolean (true or false)." msgstr "" #, python-format @@ -469,30 +428,23 @@ msgstr "VM %(vmid)s 不包含直接分配的主机设备 %(dev_name)s。" msgid "The host device %(dev_name)s is not allowed to directly assign to VM." msgstr "不允许将主机设备 %(dev_name)s 直接分配给 VM。" -msgid "" -"No IOMMU groups found. Host PCI pass through needs IOMMU group to function " -"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify " -"the Kernel is compiled with IOMMU support. For Intel CPU, add " -"'intel_iommu=on' to GRUB_CMDLINE_LINUX parameter in /etc/default/grub file. " -"For AMD CPU, add 'iommu=pt iommu=1'." -msgstr "" +msgid "No IOMMU groups found. Host PCI pass through needs IOMMU group to function correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify the Kernel is compiled with IOMMU support. For Intel CPU, add 'intel_iommu=on' to GRUB_CMDLINE_LINUX parameter in /etc/default/grub file. For AMD CPU, add 'iommu=pt iommu=1'." +msgstr "找不到 IOMMU 组。主机 PCI 传递要求 IOMMU 组正常工作。请在 BIOS 中启用 Intel VT-d 或 AMD IOMMU，然后验证内核在编译时是否带有 IOMMU 支持。对于 Intel CPU，将“intel_iommu=on”添加至 /etc/default/grub 文件中的 GRUB_CMDLINE_LINUX 参数。对于 AMD CPU，添加“iommu=pt iommu=1”。" msgid "\"name\" should be a device name string" msgstr "“name”应该为设备名字符串" #, python-format -msgid "" -"The device %(name)s is probably in use by the host. Unable to attach it to " -"the guest." -msgstr "主机可能正在使用设备 %(name)s。无法将该设备连接到访客。" +msgid "The device %(name)s is probably in use by the host. Unable to attach it to the guest." +msgstr "主机可能正在使用设备 %(name)s。无法将其连接至访客。" #, python-format msgid "Hot-(un)plug of device %(name)s is not supported." -msgstr "" +msgstr "不支持设备 %(name)s 的热插拔。" #, python-format msgid "Failed to attach %(device)s to %(vm)s" -msgstr "" +msgstr "无法将 %(device)s 连接至 %(vm)s" #, python-format msgid "VM %(vmid)s does not have a USB controller to accept PCI hotplug." @@ -503,14 +455,11 @@ msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "接口 %(iface)s 在虚拟机 %(name)s 中不存在" #, python-format -msgid "" -"Network %(network)s specified for virtual machine %(name)s does not exist" -msgstr "为以下虚拟机指定的网络 %(network)s 不存在：%(name)s" +msgid "Network %(network)s specified for virtual machine %(name)s does not exist" +msgstr "为虚拟机 %(name)s 所指定的网络 %(network)s 不存在" -msgid "" -"Supported virtual machine interfaces type are network, ovs and macvtap.Type " -"ovs and macvtap are only supported for s390x/s390 architecture." -msgstr "" +msgid "Supported virtual machine interfaces type are network, ovs and macvtap.Type ovs and macvtap are only supported for s390x/s390 architecture." +msgstr "受支持虚拟机接口类型为 network、ovs 和 macvtap。仅 s390x/s390 体系结构支持类型 ovs 和 macvtap。" msgid "Network name for virtual machine interface must be a string" msgstr "虚拟机接口的网络名必须是字符串" @@ -535,22 +484,22 @@ msgid "Cannot change MAC address of a running virtual machine" msgstr "无法更改正在运行的虚拟机的 MAC 地址" msgid "Type macvtap and ovs are only supported on s390x/s390 architecture." -msgstr "" +msgstr "仅 s390x/s390 体系结构支持类型 macvtap 和 ovs。" msgid "Source attribute is only supported on s390x/s390 architecture." -msgstr "" +msgstr "仅 s390x/s390 体系结构支持源属性。" msgid "If source is provided, only type supported are macvtap and ovs." -msgstr "" +msgstr "如果提供了源，那么仅支持类型 macvtap 和 ovs。" msgid "For type macvtap and ovs, source has to be provided" -msgstr "" +msgstr "对于类型 macvtap 和 ovs，必须提供源" msgid "Source name for virtual machine interface must be string" -msgstr "" +msgstr "虚拟机接口的源名称必须是字符串" msgid "Invalid source mode. Valid options are: bridge or vepa." -msgstr "" +msgstr "无效源方式。有效选项为：bridge 或 vepa。" #, python-format msgid "Template %(name)s already exists" @@ -558,25 +507,23 @@ msgstr "模板 %(name)s 已存在" #, python-format msgid "Source media %(path)s not found" -msgstr "" +msgstr "找不到源介质 %(path)s" #, python-format -msgid "" -"Network '%(network)s' specified for template %(template)s does not exist" -msgstr "为以下模板指定的网络“%(network)s”不存在：%(template)s" +msgid "Network '%(network)s' specified for template %(template)s does not exist" +msgstr "为模板 %(template)s 所指定的网络“%(network)s”不存在" #, python-format -msgid "" -"Storage pool %(pool)s specified for template %(template)s does not exist" -msgstr "为以下模板指定的存储池 %(pool)s 不存在：%(template)s" +msgid "Storage pool %(pool)s specified for template %(template)s does not exist" +msgstr "为模板 %(template)s 所指定的存储池“%(pool)s”不存在" #, python-format msgid "Invalid parameter '%(param)s' specified for CDROM." -msgstr "为 CDROM 指定的参数“%(param)s”无效。" +msgstr "为 CDROM 所指定的参数“%(param)s”无效。" #, python-format msgid "Network %(network)s specified for template %(template)s is not active" -msgstr "为以下模板指定的网络 %(network)s 未处于活动状态：%(template)s" +msgstr "为模板 %(template)s 所指定的网络 %(network)s 处于不活动状态" msgid "Template name must be a string" msgstr "模板名称必须是字符串" @@ -585,31 +532,29 @@ msgid "Template icon must be a path to the image" msgstr "模板图标必须是映像的路径" msgid "Template distribution must be a string" -msgstr "模板分发版必须是字符串" +msgstr "模板分发必须是字符串" msgid "Template distribution version must be a string" -msgstr "模板分发版版本必须是字符串" +msgstr "模板分发版本必须是字符串" msgid "The number of CPUs must be an integer greater than 0" msgstr "CPU 的数目必须是一个大于 0 的整数" -msgid "" -"Amount of memory and maximum memory (MB) must be an integer greater than 512" -msgstr "" +msgid "Amount of memory and maximum memory (MB) must be an integer greater than 512" +msgstr "内存量和最大内存量 (MB) 必须是大于 512 的整数" msgid "Template CDROM must be a local or remote ISO file" msgstr "模板 CDROM 必须是一个本地或远程 ISO 文件" #, python-format msgid "Invalid storage pool URI %(value)s specified for template" -msgstr "为模板指定的存储池 URI %(value)s 无效" +msgstr "为模板所指定的存储池 URI %(value)s 无效" -msgid "" -"Specify a path to source media (ISO, disk or remote ISO) to create a template" -msgstr "" +msgid "Specify a path to source media (ISO, disk or remote ISO) to create a template" +msgstr "指定源介质（ISO、磁盘或远程 ISO）的路径以创建模板" msgid "All networks for the template must be specified in a list." -msgstr "必须指定列表中模板的所有网络。" +msgstr "必须以列表格式指定模板的所有网络。" msgid "Specify a volume to a template when storage pool is iSCSI or SCSI" msgstr "当存储池为 iSCSI 或 SCSI 时，请对模板指定卷。" @@ -620,11 +565,11 @@ msgstr "卷 %(volume)s 不在存储池 %(pool)s 中" #, python-format msgid "Unable to create template due error: %(err)s" -msgstr "无法创建模板，因为发生了错误：%(err)s" +msgstr "无法创建模板，因为错误：%(err)s" #, python-format msgid "Unable to delete template due error: %(err)s" -msgstr "无法删除模板，因为发生了错误：%(err)s" +msgstr "无法删除模板，因为错误：%(err)s" msgid "Disk size must be an integer greater than 1GB." msgstr "磁盘大小必须是大于 1 GB 的整数。" @@ -633,81 +578,59 @@ msgstr "磁盘大小必须是大于 1 GB 的整数。" msgid "Cannot identify base image %(path)s format" msgstr "无法识别基本映像 %(path)s 格式" -msgid "" -"When specifying CPU topology, each element must be an integer greater than " -"zero." -msgstr "指定 CPU 拓扑时，每个元素都必须是大于零的整数。" +msgid "When specifying CPU topology, each element must be an integer greater than zero." +msgstr "指定 CPU 拓扑时，每个元素必须是大于零的整数。" -msgid "" -"Invalid disk image format. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc." -msgstr "" +msgid "Invalid disk image format. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "无效磁盘映像格式。有效格式为：qcow、qcow2、qed、raw、vmdk 和 vpc。" -msgid "" -"When setting template disks, following parameters are required: 'index', " -"'pool name', 'format', 'size' or 'volume' (for scsi/iscsi pools)" -msgstr "" +msgid "When setting template disks, following parameters are required: 'index', 'pool name', 'format', 'size' or 'volume' (for scsi/iscsi pools)" +msgstr "设置模板磁盘时，需要以下参数：“index”、“pool name”、“format”、“size”或“volume”（对于 scsi/iscsi 池）" msgid "Disk format must be 'raw', for logical, iscsi, and scsi pools." -msgstr "" +msgstr "对于逻辑池，iSCSI 池和 SCSI 池，磁盘格式必须为“raw”。" -msgid "" -"Memory expects an object with one or both parameters: 'current' and " -"'maxmemory'" -msgstr "" +msgid "Memory expects an object with one or both parameters: 'current' and 'maxmemory'" +msgstr "内存需要具有下列一个或两个参数的对象：“current”和“maxmemory”" #, python-format -msgid "" -"Memory value (%(mem)sMiB) must be equal or lesser than maximum memory value " -"(%(maxmem)sMiB)" -msgstr "" +msgid "Memory value (%(mem)sMiB) must be equal or lesser than maximum memory value (%(maxmem)sMiB)" +msgstr "内存值 (%(mem)sMiB) 必须等于或小于最大内存值 (%(maxmem)sMiB)" #, python-format msgid "Unable to update template due error: %(err)s" -msgstr "" +msgstr "无法更新模板，因为发生了错误：%(err)s" msgid "Parameter 'disks' requires at least one disk object" -msgstr "" +msgstr "参数“disks”需要至少一个磁盘对象" -msgid "" -"Invalid interface type. Type should be 'macvtap' for host network interface " -"(Ethernet, Bond, VLAN) to be connected as direct MacVTap or 'ovs' for " -"openvswitch host network interface to be connected as virtual switch to a VM." -msgstr "" +msgid "Invalid interface type. Type should be 'macvtap' for host network interface (Ethernet, Bond, VLAN) to be connected as direct MacVTap or 'ovs' for openvswitch host network interface to be connected as virtual switch to a VM." +msgstr "无效接口类型。对于主机网络接口（Ethernet、Bond 和 VLAN），类型应该为“macvtap”才能作为直接 MacVTap 进行连接，对于 openvswitch，类型应该为“ovs”以作为虚拟交换机连接至 VM。" msgid "Interface name should be string." -msgstr "" +msgstr "接口名称应该为字符串。" msgid "Invalid interface mode. Valid options are: bridge or vepa." -msgstr "" +msgstr "无效接口方式。有效选项为：bridge 或 vepa。" -msgid "" -"Interfaces should be list of interfaces. Each interface should have name, " -"type and mode(optional, only applicable for interfcae type 'macvtap'." -msgstr "" +msgid "Interfaces should be list of interfaces. Each interface should have name, type and mode(optional, only applicable for interfcae type 'macvtap'." +msgstr "接口应该为接口列表。每个接口应该具有名称、类型和方式（可选，仅当接口类型为“macvtap”时才适用）。" -msgid "" -"Interface expects an object with parameters: 'name', 'type' and 'mode'. Name " -"should be name of host network interface (Ethernet, Bond, VLAN) for type " -"'macvtap' or the name of host openvswitch bridge interface for type 'ovs'. " -"Mode (optional) is only applicable for interface type 'macvtap' to indicates " -"whether packets will be delivered directly to target device (bridge) or to " -"the external bridge (vepa-capable bridge)." -msgstr "" +msgid "Interface expects an object with parameters: 'name', 'type' and 'mode'. Name should be name of host network interface (Ethernet, Bond, VLAN) for type 'macvtap' or the name of host openvswitch bridge interface for type 'ovs'. Mode (optional) is only applicable for interface type 'macvtap' to indicates whether packets will be delivered directly to target device (bridge) or to the external bridge (vepa-capable bridge)." +msgstr "接口需要带有以下参数的对象：“name”、“type”和“mode”。对于类型“macvtap”，名称应该为主机网络接口（Ethernet、Bond 和 VLAN）的名称，对于类型“ovs”，名称应该为主机 openvswitch 网桥接口的名称。方式（可选）仅对接口类型“macvtap”适用，用于指示是直接将包传送至目标设备（网桥）还是传送至外部网桥（支持 vepa 的网桥）。" msgid "Interfaces parameter only supported on s390x or s390 architecture." -msgstr "" +msgstr "仅 s390x 或 s390 体系结构支持接口参数。" msgid "Storage without libvirt pool is not supported on this architecture" -msgstr "" +msgstr "此体系结构不支持不带 libvirt 池的存储器" #, python-format msgid "Error while creating the virtual disk for the guest. Details: %(err)s" -msgstr "" +msgstr "为访客创建虚拟盘时出错。详细信息：%(err)s" -msgid "" -"When setting template disks without libvirt, following parameters are " -"required: 'index', 'format', 'path', 'size'" -msgstr "" +msgid "When setting template disks without libvirt, following parameters are required: 'index', 'format', 'path', 'size'" +msgstr "设置不带 libvirt 的模板磁盘时，需要以下参数：“index”、“format”、“path”和“size”。" #, python-format msgid "Storage pool %(name)s already exists" @@ -752,7 +675,7 @@ msgstr "无法创建 NFS 池，因为导出路径 %(path)s 可能在安装期间 #, python-format msgid "Unable to create NFS Pool as export path %(path)s mount failed" -msgstr "无法创建 NFS 池，因为安装导出路径 %(path)s 失败" +msgstr "无法创建 NFS 池，因为导出路径 %(path)s 安装失败" #, python-format msgid "Unsupported storage pool type: %(type)s" @@ -798,10 +721,8 @@ msgid "Specify name and type to create a storage pool" msgstr "指定名称和类型以创建存储池" #, python-format -msgid "" -"%(disk)s is not a valid disk/partition. Could not add it to the pool " -"%(pool)s." -msgstr "%(disk)s 不是有效磁盘/分区。无法将其添加至池%(pool)s." +msgid "%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)s." +msgstr "%(disk)s 是无效磁盘/分区。无法将其添加至池 %(pool)s。" #, python-format msgid "Unable to extend logical pool %(pool)s. Details: %(err)s" @@ -835,27 +756,23 @@ msgstr "无法取消激活池 %(name)s，因为它与某些模板相关联" #, python-format msgid "Unable to delete pool %(name)s as it is associated with some templates" -msgstr "无法删除池 %(name)s，因为它与某些模板相关联" +msgstr "无法删除池 %(name)s，因为该池与某些模板关联" #, python-format -msgid "" -"A volume group named '%(name)s' already exists. Please, choose another name " -"to create the logical pool." -msgstr "名为“%(name)s”的卷组已存在。请选择其他名称以创建逻辑池。" +msgid "A volume group named '%(name)s' already exists. Please, choose another name to create the logical pool." +msgstr "名为“%(name)s”的卷组已存在。请选择另一名称以创建逻辑池。" #, python-format msgid "Unable to update database with deep scan information due error: %(err)s" msgstr "无法使用深度扫描信息更新数据库，因为发生了错误：%(err)s" #, python-format -msgid "" -"No volume group '%(name)s' found. Please, specify an existing volume group " -"to create the logical pool from." -msgstr "" +msgid "No volume group '%(name)s' found. Please, specify an existing volume group to create the logical pool from." +msgstr "找不到卷组“%(name)s”。请指定现有卷组以通过其创建逻辑池。" #, python-format msgid "Unable to delete pool %(name)s as it is associated with guests: %(vms)s" -msgstr "" +msgstr "无法删除池 %(name)s，因为它与访客 %(vms)s 相关联" #, python-format msgid "Storage volume %(name)s already exists" @@ -866,19 +783,16 @@ msgid "Storage volume %(name)s does not exist in storage pool %(pool)s" msgstr "存储卷 %(name)s 在存储池 %(pool)s 中不存在" #, python-format -msgid "" -"Unable to create storage volume %(volume)s because storage pool %(pool)s is " -"not active" -msgstr "无法创建存储卷 %(volume)s，因为存储池 %(pool)s未处于活动状态" +msgid "Unable to create storage volume %(volume)s because storage pool %(pool)s is not active" +msgstr "无法创建存储卷 %(volume)s，因为存储池 %(pool)s 处于不活动状态" #, python-format msgid "Specify %(item)s in order to create storage volume %(volume)s" msgstr "指定 %(item)s 以创建存储卷 %(volume)s" #, python-format -msgid "" -"Unable to list storage volumes because storage pool %(pool)s is not active" -msgstr "无法列示存储卷，因为存储池 %(pool)s 未处于活动状态" +msgid "Unable to list storage volumes because storage pool %(pool)s is not active" +msgstr "无法列示存储卷，因为存储池 %(pool)s 处于不活动状态" #, python-format msgid "" @@ -908,18 +822,15 @@ msgstr "存储卷名称必须是字符串" msgid "Storage volume allocation must be an integer number" msgstr "存储卷分配必须是一个整数数字" -msgid "" -"Storage volume format not supported. Valid formats: qcow, qcow2, qed, raw, " -"vmdk, vpc." -msgstr "" +msgid "Storage volume format not supported. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "存储卷格式不受支持。有效格式为：qcow、qcow2、qed、raw、vmdk 和 vpc。" msgid "Storage volume requires a volume name" -msgstr "存储卷需要一个卷名" +msgstr "存储卷需要卷名" #, python-format -msgid "" -"Unable to update database with storage volume information due error: %(err)s" -msgstr "无法使用存储卷信息更新数据库，因为发生了错误：%(err)s" +msgid "Unable to update database with storage volume information due error: %(err)s" +msgstr "无法使用存储卷信息更新数据库，因为错误：%(err)s" #, python-format msgid "Only one of parameter %(param)s can be specified" @@ -930,7 +841,7 @@ msgid "Create volume from %(param)s is not supported" msgstr "不支持根据 %(param)s 创建卷" msgid "Storage volume capacity must be an integer number." -msgstr "存储卷容量必须是整数数字。" +msgstr "存储卷容量必须是整数。" msgid "Storage volume URL must be http://, https://, ftp:// or ftps://." msgstr "存储卷 URL 必须是 http://、https://、ftp:// 或 ftps://。" @@ -972,10 +883,8 @@ msgid "Interface %(name)s does not exist" msgstr "接口 %(name)s 不存在" #, python-format -msgid "" -"Failed to list interfaces. Invalid _inuse parameter. Supported options for " -"_inuse are: %(supported_inuse)s" -msgstr "" +msgid "Failed to list interfaces. Invalid _inuse parameter. Supported options for _inuse are: %(supported_inuse)s" +msgstr "无法列示接口。无效 _inuse 参数。_inuse 的受支持选项为：%(supported_inuse)s" #, python-format msgid "Network %(name)s already exists" @@ -987,25 +896,25 @@ msgstr "网络 %(name)s 不存在" #, python-format msgid "Subnet %(subnet)s specified for network %(network)s is not valid." -msgstr "" +msgstr "对网络 %(network)s 指定的子网 %(subnet)s 无效。" msgid "Specify a network interface to create bridged or macvtap networks." -msgstr "" +msgstr "指定用于创建桥接网络或 macvtap 网络的网络接口。" #, python-format msgid "Unable to delete or update active network %(name)s" -msgstr "" +msgstr "无法删除或更新活动网络 %(name)s" #, python-format msgid "Interface %(iface)s specified for network %(network)s is already in use" -msgstr "为以下网络指定的接口 %(iface)s 已在使用中：%(network)s" +msgstr "为网络 %(network)s 指定的接口 %(iface)s 已在使用中" msgid "Interface should be bare NIC, bonding or bridge device." -msgstr "接口应该是空的 NIC、绑定或网桥设备。" +msgstr "接口应该是空的 NIC、bonding 或网桥设备。" #, python-format msgid "Unable to create or update network %(name)s. Details: %(err)s" -msgstr "" +msgstr "无法创建或更新网络 %(name)s。详细信息：%(err)s" #, python-format msgid "Unable to find a free IP address for network '%(name)s'" @@ -1018,35 +927,28 @@ msgstr "接口 %(iface)s 已存在。" msgid "Network name must be a string without slashes (/) or quotes (\")" msgstr "网络名必须是不带斜杠 (/) 或引号 (\") 的字符串" -msgid "" -"Supported network types are isolated, NAT, macvtap, bridge, vepa and " -"passthrough." -msgstr "" +msgid "Supported network types are isolated, NAT, macvtap, bridge, vepa and passthrough." +msgstr "受支持的网络类型为：isolated、NAT、macvtap、bridge、vepa 和 passthrough。" msgid "Network subnet must be a string with IP address and prefix or netmask" -msgstr "网络子网是一个具有 IP 地址以及前缀或网络掩码的字符串" +msgstr "网络子网必须是具有 IP 地址以及前缀或网络掩码的字符串" msgid "Network interfaces must be an array." -msgstr "" +msgstr "网络接口必须为数组。" msgid "Network VLAN ID must be an integer between 1 and 4094" -msgstr "网络 VLAN 标识必须是一个介于 1 到 4094 之间的整数" +msgstr "网络 VLAN 标识必须为 1 到 4094 之间的整数" msgid "Specify name and type to create a Network" msgstr "指定名称和类型以创建网络" #, python-format -msgid "" -"Unable to delete or update network %(name)s. There are some virtual machines " -"%(vms)s and/or templates linked to this network." -msgstr "" +msgid "Unable to delete or update network %(name)s. There are some virtual machines %(vms)s and/or templates linked to this network." +msgstr "无法删除或更新网络 %(name)s。有一些虚拟机 %(vms)s 和/或模板链接至此网络。" #, python-format -msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines " -"%(vms)s and/or templates linked to this network." -msgstr "" -"无法取消激活网络 %(name)s。一些虚拟机 %(vms)s 和/或模板已链接至此网络。" +msgid "Unable to deactivate network %(name)s. There are some virtual machines %(vms)s and/or templates linked to this network." +msgstr "无法取消激活网络 %(name)s。有一些虚拟机 %(vms)s 和/或模板链接至此网络。" #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1068,33 +970,29 @@ msgstr "未能启动网络 %(name)s。详细信息：%(err)s" #, python-format msgid "Unable to redefine interface %(name)s. Details: %(err)s" -msgstr "" +msgstr "无法重新定义接口 %(name)s。详细信息：%(err)s" #, python-format msgid "Unable to create bridge %(name)s. Details: %(err)s" -msgstr "" +msgstr "无法创建网桥 %(name)s。详细信息：%(err)s" -msgid "" -"Unable to create bridge with NetworkManager enabled. Disable it and try " -"again." -msgstr "" +msgid "Unable to create bridge with NetworkManager enabled. Disable it and try again." +msgstr "无法创建已启用网络管理器的网桥。请禁用它并重试。" msgid "Interface should be bare NIC or bonding." -msgstr "" +msgstr "接口应该是裸 NIC 或 bonding。" msgid "Network interfaces parameter must contain at least one interface." -msgstr "" +msgstr "网络接口参数必须包含至少一个接口。" msgid "Only one interface is allowed for 'bridge' and 'macvtap' networks." -msgstr "" +msgstr "“bridge”和“macvtap”网络只允许使用一个接口。" msgid "Subnet is not a valid parameter for this type of virtual network." -msgstr "" +msgstr "子网对于此类型的虚拟网络是无效参数。" -msgid "" -"VLAN ID and interfaces are not valid parameters for this type of virtual " -"network." -msgstr "" +msgid "VLAN ID and interfaces are not valid parameters for this type of virtual network." +msgstr "VLAN 标识和接口对于此类型的虚拟网络是无效参数。" #, python-format msgid "Storage server %(server)s was not used by Kimchi" @@ -1115,10 +1013,10 @@ msgid "Unable to choose a virtual machine name" msgstr "无法选择虚拟机名称" msgid "Cannot upgrade objectstore data." -msgstr "" +msgstr "无法升级对象库数据。" msgid "Invalid storage type. Types supported: 'cdrom', 'disk'" -msgstr "存储类型无效。受支持的类型：“cdrom”和“disk”" +msgstr "无效存储类型。受支持的类型为：“cdrom”和“disk”" #, python-format msgid "The path '%(value)s' is not a valid local/remote path for the device" @@ -1128,10 +1026,8 @@ msgid "Only CDROM path can be update." msgstr "只能更新 CDROM 路径。" #, python-format -msgid "" -"The storage device %(dev_name)s does not exist in the virtual machine " -"%(vm_name)s" -msgstr "存储设备 %(dev_name)s 在虚拟机 %(vm_name)s" +msgid "The storage device %(dev_name)s does not exist in the virtual machine %(vm_name)s" +msgstr "存储设备 %(dev_name)s 在虚拟机 %(vm_name)s 中不存在" #, python-format msgid "Error while creating new storage device: %(error)s" @@ -1143,15 +1039,13 @@ msgstr "更新存储设备时出错：%(error)s" #, python-format msgid "Error while removing storage device: %(error)s" -msgstr "移除存储设备时出错：%(error)s" +msgstr "除去存储设备时出错：%(error)s" msgid "Do not support IDE device hot plug" msgstr "不支持 IDE 设备热插拔" -msgid "" -"Specify type and path or type and pool/volume to add a new virtual machine " -"disk" -msgstr "指定类型和路径或输入池/卷以以添加新虚拟机磁盘" +msgid "Specify type and path or type and pool/volume to add a new virtual machine disk" +msgstr "指定类型和路径或者类型和池/卷以添加新的虚拟机磁盘" msgid "Specify path to update virtual machine disk" msgstr "指定路径以更新虚拟机磁盘" @@ -1165,35 +1059,24 @@ msgid "Cannot retrieve disk path information for given pool/volume: %(error)s" msgstr "无法检索给定池/卷的磁盘路径信息：%(error)s" msgid "Volume already in use by other virtual machine." -msgstr "其他虚拟机已在使用该卷。" +msgstr "其他虚拟机已在使用卷。" -msgid "" -"Only one of path or pool/volume can be specified to add a new virtual " -"machine disk" -msgstr "仅能指定一个路径或池/卷以添加至虚拟机磁盘" +msgid "Only one of path or pool/volume can be specified to add a new virtual machine disk" +msgstr "只能指定路径或池/卷中的一个以添加新的虚拟机磁盘" #, python-format -msgid "" -"Volume chosen with format %(format)s does not fit in the storage type " -"%(type)s" -msgstr "选择的格式为 %(format)s 的卷不适合于存储类型 %(type)s" +msgid "Volume chosen with format %(format)s does not fit in the storage type %(type)s" +msgstr "格式为 %(format)s 的所选卷无法拟合存储类型 %(type)s" msgid "On s390x arch one of pool, path of dir_path must be specified" -msgstr "" +msgstr "在 s390x 体系结构上，必须指定池和路径 dir_path 的其中之一" -msgid "" -"On s390x arch 'format' must be specified while attaching disk to virtual " -"machine" -msgstr "" +msgid "On s390x arch 'format' must be specified while attaching disk to virtual machine" +msgstr "在 s390x 体系结构上，将磁盘连接至虚拟机时必须指定“format”" #, python-format msgid "Virtual disk already exists on the system: %(disk_path)s" -msgstr "" - -#, python-format -msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "在创建虚拟机“%(vm)s”的快照之前，必须将其停止。" +msgstr "虚拟盘已存在于系统上：%(disk_path)s" #, python-format msgid "" @@ -1241,249 +1124,241 @@ msgstr "" "无法创建虚拟机“%(vm)s”的快照，因为它包含格式为“%(format)s”的磁盘；仅“qcow2”受" "支持。" -msgid "" -"The number of vCPUs must be less than or equal the maximum number of vCPUs " -"specified." -msgstr "" +msgid "The number of vCPUs must be less than or equal the maximum number of vCPUs specified." +msgstr "vCPU 数必须小于或等于所指定最大 vCPU 数。" -msgid "" -"When CPU topology is defined, maximum number of vCPUs must be a product of " -"sockets, cores, and threads." -msgstr "" +msgid "When CPU topology is defined, maximum number of vCPUs must be a product of sockets, cores, and threads." +msgstr "定义 CPU 拓扑后，最大 vCPU 数必须为套接字数、核心数和线程数的乘积。" msgid "This host (or current configuration) does not allow CPU topology." msgstr "此主机（或当前配置）不允许使用 CPU 拓扑。" msgid "The maximum number of vCPUs is too large for this system." -msgstr "" +msgstr "最大 vCPU 数对于此系统太大。" msgid "" -"When CPU topology is defined, vCPUs must be a multiple of a product of cores " -"and threads." -msgstr "" - -msgid "The number of threads is too large for this system." +"When CPU topology is defined, CPUs must be a multiple of the 'threads' " +"number defined." msgstr "" msgid "" "When CPU topology is specified, sockets, cores and threads are required " "paramaters." -msgstr "" +msgstr "指定 CPU 拓扑后，sockets、cores 和 threads 是必需参数。" -msgid "" -"Parameter 'cpu_info' expects an object with fields among: 'vcpus', " -"'maxvcpus', 'topology'." -msgstr "" +msgid "Parameter 'cpu_info' expects an object with fields among: 'vcpus', 'maxvcpus', 'topology'." +msgstr "参数“cpu_info”需要带有以下字段的对象：“vcpus”、“maxvcpus”和“topology”。" msgid "" "Parameter 'topology' expects an object with fields among: 'sockets', " "'cores', 'threads'." +msgstr "参数“topology”需要带有以下字段的对象：“sockets”、“cores”和“threads”。" + +msgid "Unable to update Max CPU or CPU topology when guest is running." msgstr "" #, python-format +msgid "Unable to hot plug/unplug CPUs. Details: %(err)s" +msgstr "无法列示存储池。详细信息：%(err)s" + +#, python-format msgid "Invalid volume group name parameter: %(name)s." -msgstr "" +msgstr "无效卷组名称参数：%(name)s。" -msgid "" -"Unable to establish connection with libvirt. Please check your libvirt URI " -"which is often defined in /etc/libvirt/libvirt.conf" -msgstr "" +msgid "Unable to establish connection with libvirt. Please check your libvirt URI which is often defined in /etc/libvirt/libvirt.conf" +msgstr "无法建立与 libvirt 的连接。请检查 libvirt URI，它通常是在 /etc/libvirt/libvirt.conf 中定义的" -msgid "" -"Libvirt service is not active. Please start the libvirt service in your host " -"system." -msgstr "" +msgid "Libvirt service is not active. Please start the libvirt service in your host system." +msgstr "Libvirt 服务不活动。请在主机系统中启动 libvirt 服务。" msgid "Failed to register the default event implementation." -msgstr "" +msgstr "无法注册缺省事件实现。" msgid "Failed to register timeout event." -msgstr "" +msgstr "无法注册超时事件。" msgid "Failed to Run the default event implementation." -msgstr "" +msgstr "无法运行缺省事件实现。" #, python-format -msgid "" -"I/O error on guest '%(vm)s': storage pool out of space for %(devAlias)s " -"(%(srcPath)s)." -msgstr "" +msgid "I/O error on guest '%(vm)s': storage pool out of space for %(devAlias)s (%(srcPath)s)." +msgstr "访客“%(vm)s”上发生 I/O 错误：存储池空间不足，无法供 %(devAlias)s (%(srcPath)s) 使用。" #, python-format msgid "Create virtual network '%(name)s' type '%(connection)s'" -msgstr "" +msgstr "创建虚拟网络“%(name)s”类型“%(connection)s”" #, python-format msgid "Remove virtual network '%(ident)s'" -msgstr "" +msgstr "移除虚拟网络“%(ident)s”" #, python-format msgid "Update virtual network '%(ident)s'" -msgstr "" +msgstr "更新虚拟网络“%(ident)s”" #, python-format msgid "Activate virtual network '%(ident)s'" -msgstr "" +msgstr "激活虚拟网络“%(ident)s”" #, python-format msgid "Deactivate virtual network '%(ident)s'" -msgstr "" +msgstr "取消激活虚拟网络“%(ident)s”" #, python-format msgid "Create storage pool '%(name)s' type '%(type)s'" -msgstr "" +msgstr "创建存储池“%(name)s”类型“%(type)s”" #, python-format msgid "Remove storage pool '%(ident)s'" -msgstr "" +msgstr "移除存储池“%(ident)s”" #, python-format msgid "Update storage pool '%(ident)s'" -msgstr "" +msgstr "更新存储池“%(ident)s”" #, python-format msgid "Activate storage pool '%(ident)s'" -msgstr "" +msgstr "激活存储池“%(ident)s”" #, python-format msgid "Deactivate storage pool '%(ident)s'" -msgstr "" +msgstr "取消激活存储池“%(ident)s”" #, python-format msgid "Create snapshot '%(name)s' at guest '%(vm)s'" -msgstr "" +msgstr "在访客“%(vm)s”上创建快照“%(name)s”" #, python-format msgid "Remove snapshot '%(ident)s' from guest '%(vm)s'" -msgstr "" +msgstr "从访客“%(vm)s”中移除快照“%(ident)s”" #, python-format msgid "Revert guest '%(vm)s' to snapshot '%(ident)s'" -msgstr "" +msgstr "将访客“%(vm)s”还原至快照“%(ident)s”" #, python-format msgid "Create template '%(name)s'" -msgstr "" +msgstr "创建模板“%(name)s”" #, python-format msgid "Remove template '%(ident)s'" -msgstr "" +msgstr "移除模板“%(ident)s”" #, python-format msgid "Update template '%(ident)s'" -msgstr "" +msgstr "更新模板“%(ident)s”" #, python-format msgid "Clone template '%(ident)s'" -msgstr "" +msgstr "克隆模板“%(ident)s”" #, python-format msgid "Create guest '%(name)s' from template '%(template)s'" -msgstr "" +msgstr "通过模板“%(template)s”创建访客“%(name)s”" #, python-format msgid "Remove guest '%(ident)s'" -msgstr "" +msgstr "移除访客“%(ident)s”" #, python-format msgid "Edit guest '%(ident)s'" -msgstr "" +msgstr "编辑访客“%(ident)s”" #, python-format msgid "Start guest '%(ident)s'" -msgstr "" +msgstr "启动访客“%(ident)s”" #, python-format msgid "Power off guest '%(ident)s'" -msgstr "" +msgstr "关闭访客“%(ident)s”电源" #, python-format msgid "Shutdown guest '%(ident)s'" -msgstr "" +msgstr "关闭访客“%(ident)s”" #, python-format msgid "Restart guest '%(ident)s'" -msgstr "" +msgstr "重新启动访客“%(ident)s”" #, python-format msgid "Connect to guest '%(ident)s' through novnc/spice" -msgstr "" +msgstr "通过 novnc/spice 连接至访客“%(ident)s”" #, python-format msgid "Clone guest '%(ident)s'" -msgstr "" +msgstr "克隆访客“%(ident)s”" #, python-format msgid "Migrate guest '%(ident)s' to '%(remote_host)s'" -msgstr "" +msgstr "将访客“%(ident)s”迁移至“%(remote_host)s”" #, python-format msgid "Suspend guest '%(ident)s'" -msgstr "" +msgstr "暂挂访客“%(ident)s”" #, python-format msgid "Resume guest '%(ident)s'" -msgstr "" +msgstr "恢复访客“%(ident)s”" #, python-format msgid "Connect to guest '%(ident)s' through serial" -msgstr "" +msgstr "通过串行线路连接至访客“%(ident)s”" #, python-format msgid "Attach host device '%(name)s' to guest '%(vmid)s'" -msgstr "" +msgstr "将主机设备“%(name)s”连接至访客“%(vmid)s”" #, python-format msgid "Detach host device '%(ident)s' from guest '%(vmid)s'" -msgstr "" +msgstr "从访客“%(vmid)s”拆离主机设备“%(ident)s”" #, python-format msgid "Attach network interface '%(network)s' to guest '%(vm)s'" -msgstr "" +msgstr "将网络接口“%(network)s”连接至访客“%(vm)s”" #, python-format msgid "Detach network interface '%(ident)s' from guest '%(vm)s'" -msgstr "" +msgstr "从访客“%(vm)s”拆离网络接口“%(ident)s”" #, python-format msgid "Update network interface '%(ident)s' at guest '%(vm)s'" -msgstr "" +msgstr "更新访客“%(vm)s”上的网络接口“%(ident)s”" #, python-format msgid "Attach %(type)s storage '%(path)s' to guest '%(vm)s'" -msgstr "" +msgstr "将 %(type)s 存储器“%(path)s”连接至访客“%(vm)s”" #, python-format msgid "Remove storage '%(ident)s' from guest '%(vm)s'" -msgstr "" +msgstr "从访客“%(vm)s”中移除存储器“%(ident)s”" #, python-format msgid "Update storage '%(ident)s' at guest '%(vm)s'" -msgstr "" +msgstr "更新访客“%(vm)s”上的存储器“%(ident)s”" #, python-format msgid "Create storage volume '%(name)s' at pool '%(pool)s'" -msgstr "" +msgstr "在池“%(pool)s”上创建存储卷“%(name)s”" #, python-format msgid "Remove storage volume '%(ident)s' from pool '%(pool)s'" -msgstr "" +msgstr "从池“%(pool)s”中移除存储卷“%(ident)s”" #, python-format msgid "Update storage volume '%(ident)s' at pool '%(pool)s'" -msgstr "" +msgstr "在池“%(pool)s”上更新存储卷“%(ident)s”" #, python-format msgid "Wipe storage volume '%(ident)s' off pool '%(pool)s'" -msgstr "" +msgstr "从池“%(pool)s”中擦除存储卷“%(ident)s”" #, python-format msgid "Resize storage volume '%(ident)s' at pool '%(pool)s' with size %(size)s" -msgstr "" +msgstr "将池“%(pool)s”上的存储卷“%(ident)s”调整为 %(size)s 大小" #, python-format msgid "Clone storage volume '%(ident)s' at pool '%(pool)s'" -msgstr "" +msgstr "在池“%(pool)s”上克隆存储卷“%(ident)s”" msgid "Create a New Virtual Machine" msgstr "创建新虚拟机" @@ -1491,10 +1366,8 @@ msgstr "创建新虚拟机" msgid "Virtual Machine Name" msgstr "虚拟机名称" -msgid "" -"The name used to identify the virtual machine. If omitted, a name will be " -"chosen based on the template used." -msgstr "用于标识虚拟机的名称。如果省略，那么将根据所使用的模板选择一个名称。" +msgid "The name used to identify the virtual machine. If omitted, a name will be chosen based on the template used." +msgstr "用于标识虚拟机的名称。如果省略，那么将根据所使用模板选择名称。" msgid "Please create a template first." msgstr "请先创建模板。" @@ -1503,13 +1376,13 @@ msgid "Create a Template" msgstr "创建模板" msgid "Please choose a template." -msgstr "请选择一个模板。" +msgstr "请选择模板。" msgid "This template has invalid parameters." -msgstr "" +msgstr "此模板具有无效参数。" msgid "This template has invalid parameters" -msgstr "" +msgstr "此模板具有无效参数" msgid "OS" msgstr "操作系统" @@ -1518,7 +1391,7 @@ msgid "Version" msgstr "版本" msgid "Current CPUs" -msgstr "" +msgstr "当前 CPU 数" msgid "Memory" msgstr "内存" @@ -1533,19 +1406,16 @@ msgid "Cancel" msgstr "取消" msgid "Clone a Guest" -msgstr "" +msgstr "克隆访客" -msgid "" -"When the target guest has SCSI or iSCSI volumes, they will be cloned on the " -"default storage pool. The same will happen when the target pool does not " -"have enough space to clone the volumes. Do you want to continue?" -msgstr "" +msgid "When the target guest has SCSI or iSCSI volumes, they will be cloned on the default storage pool. The same will happen when the target pool does not have enough space to clone the volumes. Do you want to continue?" +msgstr "目标访客具有 SCSI 或 iSCSI 卷时，将在缺省存储池上克隆这些卷。如果目标池没有足够空间来克隆这些卷，那么会发生同样的事情。要继续吗？" msgid "Number of times to clone" -msgstr "" +msgstr "要克隆的次数" msgid "Continue" -msgstr "" +msgstr "继续" msgid "Edit Guest" msgstr "编辑访客" @@ -1560,43 +1430,46 @@ msgid "Interface" msgstr "接口" msgid "Permission" -msgstr "" +msgstr "许可权" msgid "Pci" -msgstr "" +msgstr "PCI" msgid "Snapshot" -msgstr "" +msgstr "快照" + +msgid "Processor" +msgstr "处理器" msgid "Name" msgstr "名称" -msgid "More" -msgstr "" - -msgid "Max CPU" -msgstr "" - msgid "Memory (MB)" -msgstr "内存（MB）" +msgstr "内存 (MB)" + +msgid "More" +msgstr "更多" msgid "Max Memory (MB)" -msgstr "" +msgstr "最大内存 (MB)" msgid "Host does not support memory hotplug" -msgstr "" +msgstr "主机不支持内存热插拔" msgid "Icon" msgstr "图标" msgid "Console" -msgstr "" +msgstr "控制台" + +msgid "Nothing selected" +msgstr "未选择任何内容" msgid "sclp" -msgstr "" +msgstr "sclp" msgid "virtio" -msgstr "" +msgstr "virtio" msgid "Add" msgstr "添加" @@ -1620,13 +1493,13 @@ msgid "MAC Address" msgstr "MAC 地址" msgid "IP Address" -msgstr "" +msgstr "IP 地址" msgid "Network/Interface" -msgstr "" +msgstr "网络/接口" msgid "Mode" -msgstr "" +msgstr "方式" msgid "Available system users and groups" msgstr "可用的系统用户和组" @@ -1638,13 +1511,13 @@ msgid "Groups" msgstr "组" msgid "Selected system users and groups" -msgstr "所选的系统用户和组" +msgstr "所选系统用户和组" msgid "User" msgstr "用户" msgid "All" -msgstr "全部" +msgstr "所有" msgid "To Add" msgstr "待添加" @@ -1653,10 +1526,10 @@ msgid "Added" msgstr "已添加" msgid "Filter" -msgstr "" +msgstr "过滤器" msgid "Status" -msgstr "" +msgstr "状态" msgid "Product" msgstr "产品" @@ -1665,10 +1538,43 @@ msgid "Vendor" msgstr "供应商" msgid "Loading" -msgstr "" +msgstr "正在装入" msgid "Created" -msgstr "创建时间" +msgstr "已创建" + +msgid "Current CPU Number" +msgstr "当前 CPU 数" + +msgid "" +"Current CPU must be equal or lower than the Maximum CPU value. If a topology " +"is set, it must be also be a multiple of the 'threads' value." +msgstr "" + +msgid "Max CPU" +msgstr "最大 CPU 数" + +msgid "" +"Unable to edit maximum CPU or CPU topology when editing a running or paused " +"virtual machine." +msgstr "" + +msgid "" +"If a topology is set, this value will be the product of sockets * times * " +"cores." +msgstr "" + +msgid "Manually set CPU topology" +msgstr "手动设置 CPU 拓扑" + +msgid "Sockets" +msgstr "" + +msgid "Cores" +msgstr "核心数" + +msgid "Threads" +msgstr "线程数" msgid "Save" msgstr "保存" @@ -1680,7 +1586,7 @@ msgid "Detach" msgstr "拆离" msgid "Remove" -msgstr "除去" +msgstr "移除" msgid "Edit" msgstr "编辑" @@ -1689,43 +1595,43 @@ msgid "LDAP User ID,e.g.foo(a)foo.com" msgstr "LDAP 用户标识，如 foo(a)foo.com" msgid "Revert" -msgstr "" +msgstr "还原" msgid "Running" -msgstr "" +msgstr "正在运行" msgid "Disconnected" -msgstr "" +msgstr "已断开连接" msgid "Starting" -msgstr "" +msgstr "正在启动" msgid "Crashed" -msgstr "" +msgstr "已崩溃" msgid "Unknown" -msgstr "" +msgstr "未知" msgid "Paused" -msgstr "" +msgstr "已暂停" msgid "Suspended" -msgstr "" +msgstr "已暂挂" msgid "Resetting" -msgstr "" +msgstr "正在重置" msgid "View Console" -msgstr "" +msgstr "查看控制台" msgid "View Serial" -msgstr "" +msgstr "查看序列号" msgid "Clone" msgstr "克隆" msgid "Migrate" -msgstr "" +msgstr "迁移" msgid "Reset" msgstr "重置" @@ -1743,109 +1649,108 @@ msgid "Start" msgstr "启动" msgid "Power Off" -msgstr "关闭电源" +msgstr "断电" msgid "Delete" msgstr "删除" msgid "No Data Available" -msgstr "" +msgstr "没有可用数据" msgid "Processors Utilization" -msgstr "" +msgstr "处理器利用率" msgid "Memory Utilization" -msgstr "" +msgstr "内存利用率" msgid "Storage I/O" -msgstr "" +msgstr "存储器 I/O" msgid "Network I/O" msgstr "网络 I/O" msgid "Migrate a Guest" -msgstr "" +msgstr "迁移访客" -msgid "" -"Disclaimer: This process cannot be stopped after started, can take a long " -"time to complete and will turn off the VM on this Hypervisor when it is " -"successfully migrated to the remote destination." -msgstr "" +msgid "Disclaimer: This process cannot be stopped after started, can take a long time to complete and will turn off the VM on this Hypervisor when it is successfully migrated to the remote destination." +msgstr "免责声明：此进程启动后无法停止，可能需要很长时间完成，成功迁移至远程目标后将在此管理程序上关闭 VM。" msgid "Remote Server" -msgstr "" +msgstr "远程服务器" msgid "IP Address or Hostname" -msgstr "" +msgstr "IP 地址或主机名" -msgid "" -"The following fields are optional. Fill them if you want Kimchi to setup a " -"password-less ssh session between the localhost and the remote host. The " -"setup process will only be successful if the user has 'SUDO ALL' permission " -"in the remote machine." -msgstr "" +msgid "The following fields are optional. Fill them if you want Kimchi to setup a password-less ssh session between the localhost and the remote host. The setup process will only be successful if the user has 'SUDO ALL' permission in the remote machine." +msgstr "下列字段是可选的。如果希望 Kimchi 设置本地主机与远程主机之间的无密码 ssh 会话，请填写这些字段。仅当用户在远程机器中具有“SUDO ALL”许可权时，此设置过程才会成功。" msgid "Username of the remote host" -msgstr "" +msgstr "远程主机的用户名" msgid "Password" msgstr "密码" msgid "Password of the user in the remote host" +msgstr "远程主机中的用户的密码" + +msgid "Use RDMA transport" msgstr "" -msgid "Delete this VM when the migration is completed" +msgid "" +"Check this option only if RDMA is properly configured in both source and " +"destination hosts, otherwise migration will fail." msgstr "" +msgid "Delete this VM when the migration is completed" +msgstr "迁移完成时删除此 VM" + msgid "Add a Storage Device to VM" msgstr "将存储设备添加至 VM" msgid "Device Type" msgstr "设备类型" -msgid "" -"The device type. Currently, \"cdrom\" and \"disk\" are supported. If the " -"guest is running, only \"disk\" is supported." -msgstr "" +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported. If the guest is running, only \"disk\" is supported." +msgstr "设备类型。目前，“cdrom”和“disk”受支持。如果访客正在运行，那么仅“disk”受支持。" msgid "Create a new disk" -msgstr "" +msgstr "创建新的磁盘" msgid "Select an existing disk" -msgstr "" +msgstr "选择现有磁盘" msgid "Source" -msgstr "" +msgstr "源" msgid "Storage based on Libvirt pool or direct block device" -msgstr "" +msgstr "基于 Libvirt 池的存储器或直接块设备" msgid "Storage Pool" msgstr "存储池" msgid "Storage pool to create the volume in" -msgstr "" +msgstr "用于创建卷的存储池" msgid "Disk Size (GB)" -msgstr "" +msgstr "磁盘大小 (GB)" msgid "New disk size to be created" -msgstr "" +msgstr "要创建的新磁盘大小" msgid "Format" -msgstr "" +msgstr "格式" msgid "Format of the new disk to be created" -msgstr "" +msgstr "要创建的新磁盘的格式" msgid "Directory Path" -msgstr "" +msgstr "目录路径" msgid "Provide a directory path" -msgstr "" +msgstr "提供目录路径" msgid "Storage pool in which the volume is located in" -msgstr "" +msgstr "卷所在的存储池" msgid "Storage Volume" msgstr "存储卷" @@ -1854,10 +1759,10 @@ msgid "Storage volume to be attached" msgstr "要连接的存储卷" msgid "Disk Path" -msgstr "" +msgstr "磁盘路径" msgid "Provide a block device" -msgstr "" +msgstr "提供块设备" msgid "File Path" msgstr "文件路径" @@ -1878,7 +1783,7 @@ msgid "Templates" msgstr "模板" msgid "This is not a valid Linux path" -msgstr "这不是有效的 Linux 路径" +msgstr "这是无效 Linux 路径" msgid "Unable to read file." msgstr "无法读取文件。" @@ -1902,10 +1807,10 @@ msgid "Cloning..." msgstr "正在克隆..." msgid "Saving..." -msgstr "" +msgstr "正在保存..." msgid "Migrating..." -msgstr "" +msgstr "正在迁移..." msgid "No ISO found" msgstr "找不到 ISO" @@ -1914,86 +1819,85 @@ msgid "Add Template" msgstr "添加模板" msgid "This may take a long time. Do you want to continue?" -msgstr "这可能需要较长时间。要继续吗？" +msgstr "可能需要较长时间。要继续吗？" -msgid "" -"This will permanently delete the %1 template. Would you like to continue?" -msgstr "" +msgid "This will permanently delete the %1 template. Would you like to continue?" +msgstr "这将永久删除 %1 模板。要继续吗？" msgid "View Table" -msgstr "" +msgstr "查看表" msgid "View Gallery" -msgstr "" +msgstr "查看库" msgid "Not Available" -msgstr "" +msgstr "不可用" msgid "Please check the invalid Storage Pools" -msgstr "" +msgstr "请检查无效存储池" msgid "Please check the invalid Storage Pools or Paths" -msgstr "" +msgstr "请检查无效存储池或路径" -msgid "" -"This will delete the %1 virtual machine and its virtual disks. This " -"operation cannot be undone. Would you like to continue?" -msgstr "" +msgid "macvtap" +msgstr "macvtap" + +msgid "ovs" +msgstr "ovs" + +msgid "network" +msgstr "网络" + +msgid "This will delete the %1 virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?" +msgstr "这将删除 %1 虚拟机及其虚拟盘。此操作无法撤销。要继续吗？" msgid "Power off Confirmation" -msgstr "关闭电源确认" +msgstr "断电确认" -msgid "" -"This action may produce undesirable results, for example unflushed disk " -"cache in the %1 guest. Would you like to continue?" -msgstr "" +msgid "This action may produce undesirable results, for example unflushed disk cache in the %1 guest. Would you like to continue?" +msgstr "此操作可能产生意外结果，例如，%1 访客中出现未刷新的磁盘高速缓存。要继续吗？" msgid "Reset Confirmation" msgstr "重置确认" -msgid "" -"There is a risk of data loss caused by reset without the %1 guest OS " -"shutdown. Would you like to continue?" -msgstr "" +msgid "There is a risk of data loss caused by reset without the %1 guest OS shutdown. Would you like to continue?" +msgstr "如果不关闭 %1 访客操作系统，那么会有因为重置而导致的数据丢失风险。要继续吗？" msgid "Shut Down Confirmation" msgstr "关闭确认" -msgid "" -"Note the %1 guest OS may ignore this request. Would you like to continue?" -msgstr "" +msgid "Note the %1 guest OS may ignore this request. Would you like to continue?" +msgstr "注意，%1 访客操作系统可能会忽略此请求。要继续吗？" msgid "Virtual Machine delete Confirmation" msgstr "虚拟机删除确认" msgid "" "The %1 virtual machine is not persistent. Power Off will delete it. Continue?" -msgstr "" +msgstr "%1 虚拟机不是持久虚拟机。断电会将其删除。要继续吗？" msgid "Add Guest" msgstr "" msgid "Input is not a number" -msgstr "" +msgstr "输入不是数字" msgid "Memory value cannot be higher than Max Memory value" -msgstr "" +msgstr "内存值不能高于最大内存值" -msgid "Current CPUs value cannot be higher than Max CPU value" +msgid "" +"For better performance it is recommended a threads per core value not " +"greater than %1." msgstr "" -msgid "" -"This CDROM will be detached permanently and you can re-attach it. Continue " -"to detach it?" -msgstr "此 CDROM 将被永久拆离但您可以对其进行重新连接。要继续拆离吗？" +msgid "This CDROM will be detached permanently and you can re-attach it. Continue to detach it?" +msgstr "此 CDROM 将永久拆离，您可重新连接该 CDROM。要继续拆离吗？" msgid "Attaching..." msgstr "正在连接..." -msgid "" -"This disk will be detached permanently and you can re-attach it. Continue to " -"detach it?" -msgstr "此磁盘将被永久拆离但您可以对其进行重新连接。要继续拆离吗？" +msgid "This disk will be detached permanently and you can re-attach it. Continue to detach it?" +msgstr "此磁盘将永久拆离，您可重新连接该磁盘。要继续拆离吗？" msgid "interface:" msgstr "接口：" @@ -2011,30 +1915,37 @@ msgid "drive_type:" msgstr "驱动类型：" msgid "model:" -msgstr "模型：" +msgstr "型号：" msgid "Affected devices:" msgstr "受影响的设备：" msgid "Less" -msgstr "" +msgstr "更少" msgid "Successfully attached device to VM" -msgstr "" +msgstr "已将设备成功连接至 VM" msgid "Successfully detached device from VM" -msgstr "" +msgstr "已成功从 VM 拆离设备" msgid "Following devices will be affected, confirm?" -msgstr "" +msgstr "以下设备将受影响，是否确认？" + +msgid "Bridge" +msgstr "网桥" + +msgid "Vepa" +msgstr "Vepa" + +msgid "None" +msgstr "无" msgid "unavailable" msgstr "不可用" -msgid "" -"This action will interrupt network connectivity for any virtual machine that " -"depend on the %1 network." -msgstr "" +msgid "This action will interrupt network connectivity for any virtual machine that depend on the %1 network." +msgstr "此操作将中断依赖于 %1 网络的任何虚拟机的网络连接。" msgid "Add Network" msgstr "" @@ -2042,26 +1953,19 @@ msgstr "" msgid "" "The %1 network is not persistent. Instead of stop, this action will " "permanently delete it. Would you like to continue?" -msgstr "" +msgstr "%1 网络不是持久网络。此操作将永久删除此网络，而不是停止此网络。要继续吗？" -msgid "" -"The bridged VLAN tag may not work well with NetworkManager enabled. You " -"should consider disabling it." -msgstr "" -"在启用了网络管理器的情况下，桥接 VLAN 标记的工作情况可能不良。您应该考虑禁用" -"网络管理器。" +msgid "The bridged VLAN tag may not work well with NetworkManager enabled. You should consider disabling it." +msgstr "在启用了网络管理器的情况下，桥接 VLAN 标记的工作情况可能不良。应考虑将其禁用。" -msgid "" -"This will permanently delete the %1 storage pool. Would you like to continue?" -msgstr "" +msgid "This will permanently delete the %1 storage pool. Would you like to continue?" +msgstr "这将永久删除 %1 存储池。要继续吗？" msgid "This storage pool is empty." msgstr "此存储池为空。" -msgid "" -"It will format your disk and you will loose any data in there, are you sure " -"to continue? " -msgstr "这将对磁盘进行格式化并且您将丢失其中的任何数据，确定要继续吗？" +msgid "It will format your disk and you will loose any data in there, are you sure to continue? " +msgstr "它将格式化磁盘，并且您将丢失其中的所有数据，确定要继续吗？" msgid "SCSI Fibre Channel" msgstr "SCSI 光纤通道" @@ -2073,81 +1977,79 @@ msgid "Loading iSCSI targets..." msgstr "正在装入 iSCSI 目标..." msgid "No iSCSI found. Please input one." -msgstr "找不到 iSCSI。请输入一个 iSCSI。" +msgstr "找不到 iSCSI。请输入一个。" msgid "Failed to load iSCSI targets." -msgstr "未能装入 iSCSI 目标。" +msgstr "无法装入 iSCSI 目标。" msgid "Would you like to continue?" -msgstr "" +msgstr "要继续吗？" msgid "This will permanently delete the following storage volumes: %1" -msgstr "" +msgstr "这将永久删除以下存储卷：%1" + +msgid "Invalid NFS mount path." +msgstr "无效 NFS 安装路径。" + +msgid "No logical device selected." +msgstr "未选择任何逻辑设备。" + +msgid "This is not a valid Server Name or IP. Please, modify it." +msgstr "这是无效服务器名称或 IP。请对其进行修改。" msgid "No available partitions found." msgstr "找不到任何可用分区。" -msgid "" -"The %1 storage pool is not persistent. Instead of deactivate, this action " -"will permanently delete it. Would you like to continue?" -msgstr "" +msgid "The %1 storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?" +msgstr "%1 存储池不是持久存储池。此操作将永久删除此存储池，而不是取消激活此存储池。要继续吗？" msgid "Unable to retrieve partitions information." msgstr "无法检索分区信息。" msgid "In progress..." -msgstr "正在进行中..." +msgstr "正在进行..." msgid "Failed!" msgstr "失败！" msgid "No LVM found in the system." -msgstr "" +msgstr "在系统中找不到 LVM。" msgid "This will permanently wipe the following storage volumes: %1" -msgstr "" +msgstr "这将永久擦除以下存储卷：%1" msgid "Wipe Confirmation" -msgstr "" +msgstr "擦除确认" msgid "Select one or more partitions to be added to the logical pool %1:" -msgstr "" +msgstr "选择一个或多个要添加到逻辑池 %1 的分区：" msgid "Add Storage" -msgstr "" +msgstr "添加存储器" msgid "DIR" -msgstr "" +msgstr "DIR" msgid "NFS" -msgstr "" +msgstr "NFS" msgid "iSCSI" -msgstr "" +msgstr "iSCSI" msgid "LOGICAL" -msgstr "" +msgstr "LOGICAL" msgid "device" -msgstr "" +msgstr "设备" msgid "path" -msgstr "" +msgstr "路径" msgid "size (GiB)" -msgstr "" +msgstr "大小 (GiB)" msgid "free size (GiB)" -msgstr "" - -msgid "Invalid NFS mount path." -msgstr "NFS 安装路径无效。" - -msgid "No logical device selected." -msgstr "未选择任何逻辑设备。" - -msgid "This is not a valid Server Name or IP. Please, modify it." -msgstr "这不是有效的服务器名称或 IP。请对其进行修改。" +msgstr "可用大小 (GiB)" msgid "CDROM path needs to be a valid local/remote path and cannot be blank." msgstr "CDROM 路径必须是有效的本地/远程路径，并且不能为空白。" @@ -2155,52 +2057,50 @@ msgstr "CDROM 路径必须是有效的本地/远程路径，并且不能为空 msgid "Disk pool or volume cannot be blank." msgstr "磁盘池或卷不能为空白。" -msgid "" -"Disk size or Format or Directory path cannot be blank and Directory path " -"needs to be a valid local/remote path." -msgstr "" +msgid "Disk size or Format or Directory path cannot be blank and Directory path needs to be a valid local/remote path." +msgstr "磁盘大小、格式或目录路径不能为空白，目录路径必须为有效本地/远程路径。" msgid "Disk path needs to be a valid local/remote path and cannot be blank." -msgstr "" +msgstr "磁盘路径必须是有效的本地/远程路径，并且不能为空白。" msgid "Storage pool or Disk size or Format cannot be blank." -msgstr "" +msgstr "存储池、磁盘大小或格式不能为空白。" msgid "cdrom" -msgstr "" +msgstr "cdrom" msgid "disk" -msgstr "" +msgstr "磁盘" msgid "Pool" -msgstr "" +msgstr "池" msgid "qcow" -msgstr "" +msgstr "qcow" msgid "qcow2" -msgstr "" +msgstr "qcow2" msgid "qed" -msgstr "" +msgstr "qed" msgid "raw" -msgstr "" +msgstr "原始" msgid "vmdk" -msgstr "" +msgstr "vmdk" msgid "vpc" -msgstr "" +msgstr "vpc" msgid "Peers" -msgstr "" +msgstr "同级" msgid "Create a network" msgstr "创建网络" msgid "Network Name" -msgstr "网络名" +msgstr "网络名称" msgid "Name should not contain '/' and '\"'." msgstr "名称不应包含“/”和“\"”。" @@ -2215,29 +2115,25 @@ msgid "NAT: outbound physical network connection only" msgstr "NAT：仅适用于出站物理网络连接" msgid "Macvtap: Virtual machines are connected to physical network directly" -msgstr "" +msgstr "Macvtap：虚拟机直接连接至物理网络" -msgid "" -"Passthrough: Virtual machines are connected using a macvtap connection in " -"passthrough mode." -msgstr "" +msgid "Passthrough: Virtual machines are connected using a macvtap connection in passthrough mode." +msgstr "Passthrough：虚拟机以传递方式使用 macvtap 连接进行连接。" -msgid "" -"VEPA: special mode where virtual machines are connected to a VEPA-enabled " -"switch" -msgstr "" +msgid "VEPA: special mode where virtual machines are connected to a VEPA-enabled switch" +msgstr "VEPA：特殊方式，虚拟机以此方式连接至支持 VEPA 的交换机" msgid "Bridged: Virtual machines are connected through a network bridge" -msgstr "" +msgstr "Bridged：虚拟机通过网桥连接" msgid "(No interfaces found)" msgstr "（找不到任何接口）" msgid "Destination" -msgstr "目的地" +msgstr "目标" msgid "Select an Interface" -msgstr "" +msgstr "选择接口" msgid "Enable VLAN" msgstr "启用 VLAN" @@ -2246,10 +2142,10 @@ msgid "VLAN ID" msgstr "VLAN 标识" msgid "Edit Network" -msgstr "" +msgstr "编辑网络" msgid "Address Space" -msgstr "" +msgstr "地址空间" msgid "Define a New Storage Pool" msgstr "定义新存储池" @@ -2267,35 +2163,32 @@ msgstr "存储池类型" msgid "Storage Path" msgstr "存储路径" -msgid "" -"The path of the Storage Pool. Each Storage Pool must have a unique path." -msgstr "存储池的路径。每个存储池都必须具有唯一路径。" +msgid "The path of the Storage Pool. Each Storage Pool must have a unique path." +msgstr "存储池的路径。每个存储池必须具有唯一路径。" -msgid "" -"Kimchi will try to create the directory when it does not already exist in " -"your system." -msgstr "Kimchi 将尝试在目录在系统中尚不存在时对其进行创建。" +msgid "Kimchi will try to create the directory when it does not already exist in your system." +msgstr "Kimchi 将尝试创建目录（如果您的系统中还没有目录）。" msgid "NFS Server IP" msgstr "NFS 服务器 IP" msgid "NFS server IP or hostname. It can be input or chosen from history." -msgstr "NFS 服务器 IP 或主机名。可以输入该值，也可以从历史记录中选择。" +msgstr "NFS 服务器 IP 或主机名。您可输入，也可从历史记录中选择。" msgid "NFS Path" msgstr "NFS 路径" msgid "The NFS exported path on NFS server." -msgstr "NFS 服务器中 NFS 已导出路径。" +msgstr "NFS 服务器中的 NFS 已导出的路径。" msgid "Create from existing LVM" -msgstr "" +msgstr "通过现有 LVM 创建" msgid "Create from raw disk" -msgstr "" +msgstr "通过原始磁盘创建" msgid "Looking for existing lvms ..." -msgstr "" +msgstr "正在查找现有 lvm..." msgid "Looking for available partitions ..." msgstr "正在查找可用分区..." @@ -2346,25 +2239,38 @@ msgid "Choose the file you want to upload." msgstr "选择要上载的文件。" msgid "Resize Volume" -msgstr "" +msgstr "调整卷大小" msgid "Size" -msgstr "" +msgstr "大小" msgid "The total space which can be used to store data. The unit is megabytes." -msgstr "" +msgstr "可用于存储数据的总空间。单位为兆字节。" msgid "Ok" +msgstr "确定" + +msgid "Template Name" +msgstr "模板" + +msgid "" +"The name used to identify the template. If omitted, a name will be " +"automatically chosen." +msgstr "用于标识虚拟机的名称。如果省略，那么将根据所使用的模板选择一个名称。" + +msgid "" +"When selecting more than one Image Template, a name will be automatically " +"chosen for each Image Template selected." msgstr "" msgid "Where is the source media for this template? " -msgstr "" +msgstr "此模板的源介质在哪里？" msgid "Image Template" -msgstr "" +msgstr "映像模板" msgid "Netboot Template" -msgstr "" +msgstr "网络引导模板" msgid "File Path:" msgstr "文件路径：" @@ -2376,25 +2282,22 @@ msgid "The following ISOs are available:" msgstr "以下 ISO 可用：" msgid "QEMU does not have enough permission to work with this file" -msgstr "" +msgstr "QEMU 没有足够的许可权来处理此文件" msgid "Search more ISOs" msgstr "搜索更多 ISO" msgid "Loading..." -msgstr "" +msgstr "正在装入..." msgid "Edit Template" msgstr "编辑模板" -msgid "Processor" -msgstr "处理器" - msgid "CDROM" msgstr "CDROM" msgid "Image File" -msgstr "映象文件" +msgstr "映像文件" msgid "Graphics" msgstr "图形" @@ -2406,100 +2309,100 @@ msgid "Disk Format" msgstr "磁盘格式" msgid "Add Interface" -msgstr "" +msgstr "添加接口" -msgid "Current CPU Number" -msgstr "" +msgid "pool" +msgstr "池" -msgid "Manually set CPU topology" -msgstr "手动设置 CPU 拓扑" +msgid "bridge" +msgstr "网桥" -msgid "Cores" -msgstr "核心" - -msgid "Threads" -msgstr "线程" +msgid "vepa" +msgstr "vepa" msgid "State" -msgstr "" +msgstr "状态" msgid "Guest Name ID" -msgstr "" +msgstr "访客名称标识" msgid "OS Type" -msgstr "" +msgstr "操作系统类型" msgid "VNC" -msgstr "" +msgstr "VNC" msgid "No guests found." -msgstr "" +msgstr "找不到访客。" msgid "Stop" msgstr "" msgid "Location" -msgstr "" +msgstr "位置" msgid "%Used" -msgstr "" +msgstr "使用百分比" msgid "Allocated" -msgstr "" +msgstr "已分配" msgid "Capacity" -msgstr "" +msgstr "容量" msgid "Disks" -msgstr "" +msgstr "磁盘" msgid "Extending logical pool" -msgstr "" +msgstr "正在扩展逻辑池" + +msgid "%" +msgstr "%" msgid "Deactivate" -msgstr "" +msgstr "取消激活" msgid "Activate" -msgstr "" +msgstr "激活" msgid "Extend" -msgstr "" +msgstr "扩展" msgid "Undefine" -msgstr "" +msgstr "取消定义" msgid "Add Volume" -msgstr "" +msgstr "添加卷" msgid "Resize" -msgstr "" +msgstr "调整大小" msgid "Wipe" -msgstr "" +msgstr "擦除" msgid "Filter:" -msgstr "" +msgstr "过滤器：" msgid "Used By" -msgstr "" +msgstr "使用者" msgid "Used" -msgstr "" +msgstr "使用率" msgid "Progress" -msgstr "" +msgstr "进度" msgid "Used by the following VMs:" -msgstr "" +msgstr "由以下 VM 使用：" msgid "Allocation" -msgstr "" +msgstr "分配" msgid "Template Name (ID)" -msgstr "" +msgstr "模板名称（标识）" msgid "No templates found." -msgstr "" +msgstr "找不到模板。" msgid "M" -msgstr "" +msgstr "M" diff --git a/po/zh_TW.po b/po/zh_TW.po index f0082e0..c1bb07d 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-03 11:51+0530\n" +"POT-Creation-Date: 2017-01-26 23:05+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -80,31 +80,23 @@ msgstr "ISO %(filename)s 中有無效的 El Torito 啟動指示器" #, python-format msgid "Unexpected volume type for primary volume in ISO %(filename)s" -msgstr "ISO %(filename)s 中有主要磁碟區的非預期磁區類型" +msgstr "ISO %(filename)s 中主要磁區有非預期磁區類型" #, python-format msgid "Bad format while reading volume descriptor in ISO %(filename)s" -msgstr "讀取 ISO %(filename)s 中的磁區描述子時遇到不當的格式" +msgstr "讀取 ISO %(filename)s 中的磁區描述子時格式錯誤" #, python-format -msgid "" -"The hypervisor doesn't have permission to use this ISO %(filename)s. " -"Consider moving it under /var/lib/libvirt, or set the search permission to " -"file access control lists for '%(user)s' user if possible, or add the " -"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " -"'path_to_iso'.Details: %(err)s" -msgstr "" -"Hypervisor 無權使用此 ISO %(filename)s。請考量將其移動至 /var/lib/libvirt " -"下、將搜尋許可權設為'%(user)s' 使用者的檔案存取控制清單（若有可能）、將 " -"'%(user)s' 新增至 ISO 路徑群組或（建議不要執行此動作）'chmod -R o+x " -"'path_to_iso'。詳細資料：%(err)s" +msgid "The hypervisor doesn't have permission to use this ISO %(filename)s. Consider moving it under /var/lib/libvirt, or set the search permission to file access control lists for '%(user)s' user if possible, or add the '%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x 'path_to_iso'.Details: %(err)s" +msgstr "Hypervisor 無權使用此 ISO %(filename)s。請考量將其在 /var/lib/libvirt 下面移動，或者為 '%(user)s' 使用者設定檔案存取控制清單的搜尋權限（如果可能的話），或者將 '%(user)s' 新增至 ISO 路徑群組，或者（不建議）執行 'chmod -R o+x 'path_to_iso' 指令。詳細資料：%(err)s" #, python-format msgid "Unable to access remote ISO. Details: %(err)s" -msgstr "" +msgstr "無法存取遠端 ISO。詳細資料：%(err)s" -msgid "An error occurred when probing image OS information." -msgstr "探測映像檔 OS 資訊時發生錯誤。" +#, python-format +msgid "Error probing image OS information: %(err)s" +msgstr "" #, python-format msgid "Unable to read image file %(filename)s" @@ -166,10 +158,10 @@ msgid "Supported virtual machine graphics are Spice or VNC" msgstr "受支援的虛擬機器圖形是 Spice 或 VNC" msgid "Graphics address to listen on must be IPv4 or IPv6" -msgstr "要接聽的圖形卡位址必須是 IPv4 或 IPv6" +msgstr "要接聽的圖形位址必須是 IPv4 或 IPv6" msgid "Specify a template to create a virtual machine from" -msgstr "指定用於建立虛擬機器的範本" +msgstr "指定範本，以根據該範本建立虛擬機器" #, python-format msgid "Unable to start virtual machine %(name)s. Details: %(err)s" @@ -250,28 +242,21 @@ msgid "Unable to resume VM '%(name)s'. Details: %(err)s" msgstr "無法回復 VM '%(name)s'。詳細資料：%(err)s" #, python-format -msgid "" -"Memory assigned is higher then the maximum allowed in the host: " -"%(maxmem)sMib." -msgstr "" +msgid "Memory assigned is higher then the maximum allowed in the host: %(maxmem)sMib." +msgstr "指派的記憶體高於主機中容許的上限：%(maxmem)sMib。" #, python-format -msgid "" -"Guest '%(name)s' does not support live memory update. Please, with the guest " -"offline, set Maximum Memory with a value greater then Memory to enable this " -"feature." -msgstr "" +msgid "Guest '%(name)s' does not support live memory update. Please, with the guest offline, set Maximum Memory with a value greater then Memory to enable this feature." +msgstr "客體 '%(name)s' 不支援即時記憶體更新。請在客體處於離線狀態的情況下，將「記憶體上限」設定為大於「記憶體」的值，以啟用此功能。" msgid "Only increase memory is allowed in active VMs" msgstr "作用中的 VM 只容許增加記憶體" msgid "There are not enough free slots to add a new memory device." -msgstr "" +msgstr "可用插槽不足，無法新增記憶體裝置。" -msgid "" -"Host's libvirt or qemu version does not support memory devices and memory " -"hotplug. Libvirt must be >= 1.2.14 and QEMU must be >= 2.1." -msgstr "" +msgid "Host's libvirt or qemu version does not support memory devices and memory hotplug. Libvirt must be >= 1.2.14 and QEMU must be >= 2.1." +msgstr "主機的 libvirt 或 qemu 版本不支援記憶體裝置及記憶體熱插拔。Libvirt 必須至少是 1.2.14，且 QEMU 必須至少是 2.1。" #, python-format msgid "Error attaching memory device. Details: %(error)s" @@ -283,174 +268,147 @@ msgstr "無法啟動 %(name)s。虛擬機器已在執行中。" #, python-format msgid "Cannot power off %(name)s. Virtual machine is shut off." -msgstr "無法關閉 %(name)s。關閉虛擬機器。" +msgstr "無法關閉 %(name)s。虛擬機器已關閉。" #, python-format msgid "Cannot shutdown %(name)s. Virtual machine is shut off." -msgstr "無法關閉 %(name)s。關閉虛擬機器。" +msgstr "無法關閉 %(name)s。虛擬機器已關閉。" #, python-format msgid "Cannot reset %(name)s. Virtual machine is already shut off." -msgstr "無法重設 %(name)s。已關閉虛擬機器。" +msgstr "無法重設 %(name)s。虛擬機器已關閉。" msgid "Boot order must be a list. Devices accepted: hd, cdrom, fd or network." -msgstr "" +msgstr "開機順序必須是清單。接受的裝置：硬碟、CDROM、FD 或網路。" msgid "Bootmenu must be boolean. Values accepted: true of false." -msgstr "" +msgstr "開機功能表必須是布林值。接受的值：true 或 false。" msgid "Graphic type not valid. Values accepted: vnc or spice." -msgstr "" +msgstr "圖形類型無效。接受的值：VNC 或 Spice。" #, python-format msgid "Migrate to localhost %(host)s is not allowed." -msgstr "" +msgstr "不容許移轉至本端主機 %(host)s。" #, python-format -msgid "" -"To migrate a virtual machine to the remote host %(host)s the user %(user)s " -"must have password-less login to the remote host." -msgstr "" +msgid "To migrate a virtual machine to the remote host %(host)s the user %(user)s must have password-less login to the remote host." +msgstr "如果要將虛擬機器移轉至遠端主機 %(host)s，使用者 %(user)s 必須具有遠端主機的無密碼登入權限。" #, python-format msgid "Can not migrate virtual machine %(name)s when its in %(state)s state." -msgstr "" +msgstr "當虛擬機器 %(name)s 處於%(state)s狀態時，無法移轉該虛擬機器。" #, python-format msgid "Failed to migrate virtual machine %(name)s due error: %(err)s" -msgstr "" +msgstr "由於下列錯誤，無法移轉虛擬機器 %(name)s：%(err)s" msgid "User name of the remote server must be a string." -msgstr "" +msgstr "遠端伺服器的使用者名稱必須是字串。" msgid "Destination host of the migration must be a string." -msgstr "" +msgstr "移轉的目的地主機必須是字串。" #, python-format msgid "Unable to create file %(path)s at %(host)s using user %(user)s." -msgstr "" +msgstr "無法利用使用者 %(user)s 在 %(host)s 處建立檔案 %(path)s。" #, python-format msgid "Unable to read disk size of %(path)s, error: %(error)s" -msgstr "" +msgstr "無法讀取 %(path)s 的磁碟大小，錯誤：%(error)s" #, python-format -msgid "" -"Unable to create disk image %(path)s at %(host)s using user %(user)s. Error: " -"%(error)s" -msgstr "" +msgid "Unable to create disk image %(path)s at %(host)s using user %(user)s. Error: %(error)s" +msgstr "無法利用使用者 %(user)s 在 %(host)s 處建立磁碟映像檔 %(path)s。錯誤：%(error)s" #, python-format -msgid "" -"Unable to migrate virtual machine to remote host %(host)s with arch " -"%(destarch)s using localhost with arch %(srcarch)s." -msgstr "" +msgid "Unable to migrate virtual machine to remote host %(host)s with arch %(destarch)s using localhost with arch %(srcarch)s." +msgstr "無法使用架構為 %(srcarch)s 的本端主機，將虛擬機器移轉至架構為 %(destarch)s 的遠端主機 %(host)s。" #, python-format -msgid "" -"Unable to migrate virtual machine to remote host %(host)s with hypervisor " -"%(desthyp)s because localhost uses hypervisor %(srchyp)s." -msgstr "" +msgid "Unable to migrate virtual machine to remote host %(host)s with hypervisor %(desthyp)s because localhost uses hypervisor %(srchyp)s." +msgstr "無法將虛擬機器移轉至 Hypervisor 為 %(desthyp)s 的遠端主機 %(host)s，因為本端主機使用 Hypervisor %(srchyp)s。" #, python-format -msgid "" -"Unable to determine remote host hypervisor and architecture. Error: %(error)s" -msgstr "" +msgid "Unable to determine remote host hypervisor and architecture. Error: %(error)s" +msgstr "無法判定遠端主機 Hypervisor 及架構。錯誤：%(error)s" #, python-format -msgid "" -"Unable to migrate virtual machine: subcores per core setting from " -"localhostand remote host %(host)s differs." -msgstr "" +msgid "Unable to migrate virtual machine: subcores per core setting from localhostand remote host %(host)s differs." +msgstr "無法移轉虛擬機器：本端主機與遠端主機 %(host)s 中每個核心的子核心數目設定不同。" #, python-format -msgid "" -"Unable to setup password-less login at remote host %(host)s using user " -"%(user)s. Error: %(error)s" -msgstr "" +msgid "Unable to setup password-less login at remote host %(host)s using user %(user)s. Error: %(error)s" +msgstr "無法利用使用者 %(user)s 在遠端主機 %(host)s 處設定無密碼登入。錯誤：%(error)s" msgid "Password field must be a string." -msgstr "" +msgstr "密碼欄位必須是字串。" msgid "Error creating local host ssh rsa key of user 'root'." -msgstr "" +msgstr "建立使用者 'root' 的本端主機 SSH RSA 金鑰時發生錯誤。" #, python-format msgid "%(param)s value (%(mem)sMiB) must be aligned to %(alignment)sMiB." -msgstr "" +msgstr "%(param)s 值 (%(mem)sMiB) 必須與 %(alignment)sMiB 相同。" #, python-format -msgid "" -"Unable to update the following parameters while the VM is offline: %(params)s" -msgstr "" +msgid "Unable to update the following parameters while the VM is offline: %(params)s" +msgstr "當 VM 處於離線狀態時，無法更新下列參數：%(params)s" #, python-format -msgid "" -"Unable to update the following parameters while the VM is online: %(params)s" -msgstr "" +msgid "Unable to update the following parameters while the VM is online: %(params)s" +msgstr "當 VM 處於線上狀態時，無法更新下列參數：%(params)s" #, python-format -msgid "" -"VM %(name)s must have serial and console defined to open a web serial console" -msgstr "" +msgid "VM %(name)s must have serial and console defined to open a web serial console" +msgstr "VM %(name)s 必須已定義了序列和主控台，才能開啟 Web 序列主控台" #, python-format msgid "Impossible to get the serial console of %(name)s" -msgstr "" +msgstr "無法取得 %(name)s 的序列主控台" #, python-format -msgid "" -"Memory or Maximum Memory value is higher than amount supported by the host: " -"%(memHost)sMiB." -msgstr "" +msgid "Memory or Maximum Memory value is higher than amount supported by the host: %(memHost)sMiB." +msgstr "「記憶體」或「記憶體上限」值大於主機支援的數量：%(memHost)sMiB。" #, python-format -msgid "" -"Memory or Maximum Memory value is higher than maximum amount recommended: " -"%(value)sTiB" -msgstr "" +msgid "Memory or Maximum Memory value is higher than maximum amount recommended: %(value)sTiB" +msgstr "「記憶體」或「記憶體上限」值大於建議的數量上限：%(value)sTiB" msgid "Cannot update Maximum Memory when guest is running." -msgstr "" +msgstr "當客體處於執行中狀態時，無法更新「記憶體上限」。" #, python-format msgid "Impossible to create %(dir)s directory." -msgstr "" +msgstr "無法建立 %(dir)s 目錄。" #, python-format -msgid "" -"Either the guest %(name)s did not start to listen to the serial or it is not " -"configured to use the serial console." -msgstr "" +msgid "Either the guest %(name)s did not start to listen to the serial or it is not configured to use the serial console." +msgstr "客體 %(name)s 未開始接聽序列，或者未將其配置成使用序列主控台。" #, python-format -msgid "" -"Unable to retrieve Virt Viewer file for stopped virtual machine %(name)s" -msgstr "" +msgid "Unable to retrieve Virt Viewer file for stopped virtual machine %(name)s" +msgstr "無法擷取已停止虛擬機器 %(name)s 的「Virt 檢視器」檔案" #, python-format -msgid "" -"Error occured while retrieving the Virt Viewer file for virtual machine " -"%(name)s : %(err)s" -msgstr "" +msgid "Error occured while retrieving the Virt Viewer file for virtual machine %(name)s : %(err)s" +msgstr "擷取虛擬機器 %(name)s 的「Virt 檢視器」檔案時發生錯誤：%(err)s" msgid "Virtual machine title must be a string" -msgstr "" +msgstr "虛擬機器標題必須是字串" msgid "Virtual machine description must be a string" -msgstr "" +msgstr "虛擬機器說明必須是字串" msgid "console parameter is only supported for s390x/s390 architecture." -msgstr "" +msgstr "只有 s390x/s390 架構才支援主控台參數。" msgid "invalid console type, supported types are sclp/virtio." -msgstr "" +msgstr "主控台類型無效，支援的類型為 sclp/virtio。" #, python-format -msgid "" -"Unable to setup password-less login at remote host %(host)s using user " -"%(user)s: remote directory %(sshdir)s does not exist." -msgstr "" +msgid "Unable to setup password-less login at remote host %(host)s using user %(user)s: remote directory %(sshdir)s does not exist." +msgstr "無法利用使用者 %(user)s 在遠端主機 %(host)s 處設定無密碼登入：遠端目錄 %(sshdir)s 不存在。" #, python-format msgid "" @@ -458,6 +416,9 @@ msgid "" "daemon at host %(host)s with the user %(user)s. Please verify the remote " "server libvirt configuration. More information: http://libvirt.org/auth." "html ." +msgstr "藉由使用者 %(user)s，無法與主機 %(host)s 處的遠端 libvirt 常駐程式建立無密碼 libvirt 連線。請驗證遠端伺服器 libvirt 配置。相關資訊：http://libvirt.org/auth.html。" + +msgid "'enable_rdma' must be of type boolean (true or false)." msgstr "" #, python-format @@ -469,13 +430,8 @@ msgstr "VM %(vmid)s 不包含直接指派的主機裝置 %(dev_name)s。" msgid "The host device %(dev_name)s is not allowed to directly assign to VM." msgstr "不容許將主機裝置 %(dev_name)s 直接指派給 VM。" -msgid "" -"No IOMMU groups found. Host PCI pass through needs IOMMU group to function " -"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify " -"the Kernel is compiled with IOMMU support. For Intel CPU, add " -"'intel_iommu=on' to GRUB_CMDLINE_LINUX parameter in /etc/default/grub file. " -"For AMD CPU, add 'iommu=pt iommu=1'." -msgstr "" +msgid "No IOMMU groups found. Host PCI pass through needs IOMMU group to function correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify the Kernel is compiled with IOMMU support. For Intel CPU, add 'intel_iommu=on' to GRUB_CMDLINE_LINUX parameter in /etc/default/grub file. For AMD CPU, add 'iommu=pt iommu=1'." +msgstr "找不到 IOMMU 群組。主機 PCI 透通需要 IOMMU 群組才能正常運作。請在 BIOS 中啟用 Intel VT-d 或 AMD IOMMU，然後確認已使用 IOMMU 支援編譯了核心。若為 Intel CPU，請在 /etc/default/grub 檔中，將 'intel_iommu=on' 新增至 GRUB_CMDLINE_LINUX 參數。若為 AMD CPU，請新增 'iommu=pt iommu=1'。" msgid "\"name\" should be a device name string" msgstr "\"name\" 應該是裝置名稱字串" @@ -488,11 +444,11 @@ msgstr "主機可能正在使用裝置 %(name)s。無法將該裝置連接至客 #, python-format msgid "Hot-(un)plug of device %(name)s is not supported." -msgstr "" +msgstr "不支援裝置 %(name)s 的熱插拔。" #, python-format msgid "Failed to attach %(device)s to %(vm)s" -msgstr "" +msgstr "無法將 %(device)s 連接至 %(vm)s" #, python-format msgid "VM %(vmid)s does not have a USB controller to accept PCI hotplug." @@ -507,10 +463,8 @@ msgid "" "Network %(network)s specified for virtual machine %(name)s does not exist" msgstr "為虛擬機器 %(name)s 指定的網路 %(network)s 不存在" -msgid "" -"Supported virtual machine interfaces type are network, ovs and macvtap.Type " -"ovs and macvtap are only supported for s390x/s390 architecture." -msgstr "" +msgid "Supported virtual machine interfaces type are network, ovs and macvtap.Type ovs and macvtap are only supported for s390x/s390 architecture." +msgstr "支援的虛擬機器介面類型為網路、OVS 和 macvtap。只有 s390x/s390 架構才支援類型 OVS 和 macvtap。" msgid "Network name for virtual machine interface must be a string" msgstr "虛擬機器介面的網路名稱必須是字串" @@ -535,22 +489,22 @@ msgid "Cannot change MAC address of a running virtual machine" msgstr "無法變更執行中虛擬機器的 MAC 位址" msgid "Type macvtap and ovs are only supported on s390x/s390 architecture." -msgstr "" +msgstr "類型 macvtap 和 OVS 只在 s390x/s390 架構上受支援。" msgid "Source attribute is only supported on s390x/s390 architecture." -msgstr "" +msgstr "來源屬性只在 s390x/s390 架構上受支援。" msgid "If source is provided, only type supported are macvtap and ovs." -msgstr "" +msgstr "如果提供了來源，則僅支援類型 macvtap 和 OVS。" msgid "For type macvtap and ovs, source has to be provided" -msgstr "" +msgstr "若為類型 macvtap 和 OVS，必須提供來源" msgid "Source name for virtual machine interface must be string" -msgstr "" +msgstr "虛擬機器介面的來源名稱必須是字串" msgid "Invalid source mode. Valid options are: bridge or vepa." -msgstr "" +msgstr "來源模式無效。有效的選項為：橋接器或 VEPA。" #, python-format msgid "Template %(name)s already exists" @@ -558,7 +512,7 @@ msgstr "範本 %(name)s 已經存在" #, python-format msgid "Source media %(path)s not found" -msgstr "" +msgstr "找不到來源媒體 %(path)s" #, python-format msgid "" @@ -576,13 +530,13 @@ msgstr "為 CDROM 指定的參數 '%(param)s' 無效。" #, python-format msgid "Network %(network)s specified for template %(template)s is not active" -msgstr "為範本 %(template)s 指定的網路 %(network)s 處於非作用中狀態" +msgstr "為範本 %(template)s 指定的網路 %(network)s 未處於作用中狀態" msgid "Template name must be a string" msgstr "範本名稱必須是字串" msgid "Template icon must be a path to the image" -msgstr "範本圖示必須是影像的路徑" +msgstr "範本圖示必須是映像檔的路徑" msgid "Template distribution must be a string" msgstr "範本發行套件必須是字串" @@ -593,20 +547,18 @@ msgstr "範本發行版本必須是字串" msgid "The number of CPUs must be an integer greater than 0" msgstr "CPU 數目必須是大於 0 的整數" -msgid "" -"Amount of memory and maximum memory (MB) must be an integer greater than 512" -msgstr "" +msgid "Amount of memory and maximum memory (MB) must be an integer greater than 512" +msgstr "記憶體及記憶體上限的數量 (MB) 必須是大於 512 的整數" msgid "Template CDROM must be a local or remote ISO file" -msgstr "範本 CDROM 必須是本端或遠端 ISO 檔案" +msgstr "範本 CDROM 必須是本端或遠端 ISO 檔" #, python-format msgid "Invalid storage pool URI %(value)s specified for template" msgstr "為範本指定的儲存區 URI %(value)s 無效" -msgid "" -"Specify a path to source media (ISO, disk or remote ISO) to create a template" -msgstr "" +msgid "Specify a path to source media (ISO, disk or remote ISO) to create a template" +msgstr "指定來源媒體（ISO、磁碟或遠端 ISO）的路徑，以建立範本" msgid "All networks for the template must be specified in a list." msgstr "範本的所有網路都必須在清單中指定。" @@ -620,14 +572,14 @@ msgstr "磁區 %(volume)s 不在儲存區 %(pool)s 中" #, python-format msgid "Unable to create template due error: %(err)s" -msgstr "由於發生錯誤，無法建立範本：%(err)s" +msgstr "由於下列錯誤，無法建立範本：%(err)s" #, python-format msgid "Unable to delete template due error: %(err)s" -msgstr "由於發生錯誤，無法刪除範本：%(err)s" +msgstr "由於下列錯誤，無法刪除範本：%(err)s" msgid "Disk size must be an integer greater than 1GB." -msgstr "磁碟大小必須是大於 1 GB 的整數。" +msgstr "磁碟大小必須是大於 1GB 的整數。" #, python-format msgid "Cannot identify base image %(path)s format" @@ -638,76 +590,56 @@ msgid "" "zero." msgstr "指定 CPU 拓蹼時，每一個元素都必須是大於 0 的整數。" -msgid "" -"Invalid disk image format. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc." -msgstr "" +msgid "Invalid disk image format. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "磁碟映像檔格式無效。有效的格式：qcow、qcow2、qed、raw、vmdk、vpc。" -msgid "" -"When setting template disks, following parameters are required: 'index', " -"'pool name', 'format', 'size' or 'volume' (for scsi/iscsi pools)" -msgstr "" +msgid "When setting template disks, following parameters are required: 'index', 'pool name', 'format', 'size' or 'volume' (for scsi/iscsi pools)" +msgstr "設定範本磁碟時，下列參數是必要的：「索引」、「儲存區名稱」、「格式」、「大小」或「磁區」（適用於 SCSI/iSCSI 儲存區）" msgid "Disk format must be 'raw', for logical, iscsi, and scsi pools." -msgstr "" +msgstr "若為邏輯儲存區、iSCSI 儲存區和 SCSI 儲存區，磁碟格式必須是 'raw'。" -msgid "" -"Memory expects an object with one or both parameters: 'current' and " -"'maxmemory'" -msgstr "" +msgid "Memory expects an object with one or both parameters: 'current' and 'maxmemory'" +msgstr "記憶體預期具有「現行」參數及/或「最大記憶體」參數的物件" #, python-format -msgid "" -"Memory value (%(mem)sMiB) must be equal or lesser than maximum memory value " -"(%(maxmem)sMiB)" -msgstr "" +msgid "Memory value (%(mem)sMiB) must be equal or lesser than maximum memory value (%(maxmem)sMiB)" +msgstr "記憶體值 (%(mem)sMiB) 必須等於或小於記憶體上限值 (%(maxmem)sMiB)" #, python-format msgid "Unable to update template due error: %(err)s" -msgstr "" +msgstr "由於下列錯誤，無法更新範本：%(err)s" msgid "Parameter 'disks' requires at least one disk object" -msgstr "" +msgstr "參數「磁碟」需要至少一個磁碟物件" -msgid "" -"Invalid interface type. Type should be 'macvtap' for host network interface " -"(Ethernet, Bond, VLAN) to be connected as direct MacVTap or 'ovs' for " -"openvswitch host network interface to be connected as virtual switch to a VM." -msgstr "" +msgid "Invalid interface type. Type should be 'macvtap' for host network interface (Ethernet, Bond, VLAN) to be connected as direct MacVTap or 'ovs' for openvswitch host network interface to be connected as virtual switch to a VM." +msgstr "介面類型無效。對於要作為直接 MacVTap 進行連接的主機網路介面（乙太網路、Bond、VLAN），類型應該是 'macvtap'；或者，對於要作為虛擬交換器而連接至 VM 的 Open vSwitch 主機橋接器介面，類型應該是 'ovs'。" msgid "Interface name should be string." -msgstr "" +msgstr "介面名稱應該是字串。" msgid "Invalid interface mode. Valid options are: bridge or vepa." -msgstr "" +msgstr "介面模式無效。有效的選項為：橋接器或 VEPA。" -msgid "" -"Interfaces should be list of interfaces. Each interface should have name, " -"type and mode(optional, only applicable for interfcae type 'macvtap'." -msgstr "" +msgid "Interfaces should be list of interfaces. Each interface should have name, type and mode(optional, only applicable for interfcae type 'macvtap'." +msgstr "介面應該是一個介面清單。每一個介面都應該具有名稱、類型和模式（選用項目，僅適用於介面類型 'macvtap'）。" -msgid "" -"Interface expects an object with parameters: 'name', 'type' and 'mode'. Name " -"should be name of host network interface (Ethernet, Bond, VLAN) for type " -"'macvtap' or the name of host openvswitch bridge interface for type 'ovs'. " -"Mode (optional) is only applicable for interface type 'macvtap' to indicates " -"whether packets will be delivered directly to target device (bridge) or to " -"the external bridge (vepa-capable bridge)." -msgstr "" +msgid "Interface expects an object with parameters: 'name', 'type' and 'mode'. Name should be name of host network interface (Ethernet, Bond, VLAN) for type 'macvtap' or the name of host openvswitch bridge interface for type 'ovs'. Mode (optional) is only applicable for interface type 'macvtap' to indicates whether packets will be delivered directly to target device (bridge) or to the external bridge (vepa-capable bridge)." +msgstr "介面預期具有下列參數的物件：「名稱」、「類型」和「模式」。「名稱」應該是主機網路介面（乙太網路、Bond、VLAN）的名稱（適用於類型 'macvtap'）或主機 Open vSwitch 橋接器介面的名稱（適用於類型 'ovs'）。「模式」（選用）僅適用於介面類型 'macvtap'，以指示是將封包直接遞送至目標裝置（橋接器），還是遞送至外部橋接器（支援 VEPA 的橋接器）。" msgid "Interfaces parameter only supported on s390x or s390 architecture." -msgstr "" +msgstr "介面參數只在 s390x 或 s390 架構上受支援。" msgid "Storage without libvirt pool is not supported on this architecture" -msgstr "" +msgstr "這種架構不支援不含 libvirt 儲存區的儲存體" #, python-format msgid "Error while creating the virtual disk for the guest. Details: %(err)s" -msgstr "" +msgstr "為客體建立虛擬磁碟時發生錯誤。詳細資料：%(err)s" -msgid "" -"When setting template disks without libvirt, following parameters are " -"required: 'index', 'format', 'path', 'size'" -msgstr "" +msgid "When setting template disks without libvirt, following parameters are required: 'index', 'format', 'path', 'size'" +msgstr "設定不含 libvirt 的範本磁碟時，下列參數是必要的：「索引」、「格式」、「路徑」、「大小」" #, python-format msgid "Storage pool %(name)s already exists" @@ -765,10 +697,8 @@ msgstr "擷取儲存區 XML 至 %(pool)s 時發生錯誤" msgid "Storage pool name must be a string without slashes (/)" msgstr "儲存區名稱必須是不含斜線 (/) 的字串" -msgid "" -"Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-" -"iso" -msgstr "受支援的儲存區類型是 dir、netfs、邏輯、iscsi、isci 和 kimchi-iso" +msgid "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-iso" +msgstr "支援的儲存區類型為 dir、netfs、邏輯、iscsi、isci 及 kimchi-iso" msgid "Storage pool path must be a string" msgstr "儲存區路徑必須是字串" @@ -798,35 +728,29 @@ msgid "Specify name and type to create a storage pool" msgstr "指定名稱和類型以建立儲存區" #, python-format -msgid "" -"%(disk)s is not a valid disk/partition. Could not add it to the pool " -"%(pool)s." -msgstr "%(disk)s 不是有效的磁碟/分割區。無法將其新增至儲存區%(pool)s." +msgid "%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)s." +msgstr "%(disk)s 不是有效的磁碟/分割區。無法將其新增至儲存區 %(pool)s。" #, python-format msgid "Unable to extend logical pool %(pool)s. Details: %(err)s" msgstr "無法延伸邏輯儲存區 %(pool)s。詳細資料：%(err)s" msgid "The parameter disks only can be updated for logical storage pool." -msgstr "只能針對邏輯儲存區更新「僅限磁碟」參數。" +msgstr "只能針對邏輯儲存區更新參數磁碟。" msgid "The SCSI host adapter name must be a string." msgstr "SCSI 主機配接卡名稱必須是字串。" msgid "The storage pool kimchi_isos is reserved for internal use" -msgstr "儲存區 kimchi_isos 保留供內部使用" +msgstr "已保留儲存區 kimchi_isos 供內部使用" #, python-format -msgid "" -"Unable to activate NFS storage pool %(name)s. NFS server %(server)s is " -"unreachable." -msgstr "無法啟動 NFS 儲存區 %(name)s。NFS 伺服器 %(server)s無法連線。" +msgid "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is unreachable." +msgstr "無法啟動 NFS 儲存區 %(name)s。無法呼叫到 NFS 伺服器 %(server)s。" #, python-format -msgid "" -"Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is " -"unreachable." -msgstr "無法取消啟動 NFS 儲存區 %(name)s。NFS 伺服器 %(server)s無法連線。" +msgid "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is unreachable." +msgstr "無法取消啟動 NFS 儲存區 %(name)s。無法呼叫到 NFS 伺服器 %(server)s。" #, python-format msgid "" @@ -838,24 +762,20 @@ msgid "Unable to delete pool %(name)s as it is associated with some templates" msgstr "無法刪除儲存區 %(name)s，因為它與部分範本相關聯" #, python-format -msgid "" -"A volume group named '%(name)s' already exists. Please, choose another name " -"to create the logical pool." -msgstr "名為 '%(name)s' 的磁區群組已存在。請選擇另一個名稱以建立邏輯儲存區。" +msgid "A volume group named '%(name)s' already exists. Please, choose another name to create the logical pool." +msgstr "名為 '%(name)s' 的磁區群組已經存在。請選擇另一個名稱來建立邏輯儲存區。" #, python-format msgid "Unable to update database with deep scan information due error: %(err)s" msgstr "由於下列錯誤，無法使用深層掃描資訊來更新資料庫：%(err)s" #, python-format -msgid "" -"No volume group '%(name)s' found. Please, specify an existing volume group " -"to create the logical pool from." -msgstr "" +msgid "No volume group '%(name)s' found. Please, specify an existing volume group to create the logical pool from." +msgstr "找不到磁區群組 '%(name)s'。請指定現有磁區群組，以根據該磁區群組建立邏輯儲存區。" #, python-format msgid "Unable to delete pool %(name)s as it is associated with guests: %(vms)s" -msgstr "" +msgstr "無法刪除儲存區 %(name)s，因為它與下列客體相關聯：%(vms)s" #, python-format msgid "Storage volume %(name)s already exists" @@ -908,10 +828,8 @@ msgstr "儲存磁區名稱必須是字串" msgid "Storage volume allocation must be an integer number" msgstr "儲存磁區配置必須是整數" -msgid "" -"Storage volume format not supported. Valid formats: qcow, qcow2, qed, raw, " -"vmdk, vpc." -msgstr "" +msgid "Storage volume format not supported. Valid formats: qcow, qcow2, qed, raw, vmdk, vpc." +msgstr "儲存磁區格式不受支援。有效的格式：qcow、qcow2、qed、raw、vmdk、vpc。" msgid "Storage volume requires a volume name" msgstr "儲存磁區需要磁區名稱" @@ -927,7 +845,7 @@ msgstr "只能指定其中一個參數 %(param)s" #, python-format msgid "Create volume from %(param)s is not supported" -msgstr "不支援從 %(param)s 建立磁區" +msgstr "不支援透過 %(param)s 建立磁區" msgid "Storage volume capacity must be an integer number." msgstr "儲存磁區容量必須是整數。" @@ -949,7 +867,7 @@ msgid "Specify chunk data and its size to upload a file." msgstr "指定區塊資料及其大小以上傳檔案。" msgid "In order to upload a storage volume, specify the 'upload' parameter." -msgstr "若要上傳儲存磁區，請指定 'upload' 參數。" +msgstr "若要上傳儲存磁區，請指定「上傳」參數。" msgid "" "Unable to upload chunk data as it does not match with requested chunk size." @@ -957,7 +875,7 @@ msgstr "無法上傳區塊資料，因為該區塊資料與所要求的區塊大 #, python-format msgid "The storage volume %(vol)s is not under an upload process." -msgstr "儲存磁區 %(vol)s 未在上傳過程中。" +msgstr "未在上傳儲存磁區 %(vol)s。" msgid "The upload chunk data will exceed the storage volume size." msgstr "上傳區塊資料將超過儲存磁區大小。" @@ -971,10 +889,8 @@ msgid "Interface %(name)s does not exist" msgstr "介面 %(name)s 不存在" #, python-format -msgid "" -"Failed to list interfaces. Invalid _inuse parameter. Supported options for " -"_inuse are: %(supported_inuse)s" -msgstr "" +msgid "Failed to list interfaces. Invalid _inuse parameter. Supported options for _inuse are: %(supported_inuse)s" +msgstr "無法列出介面。_inuse 參數無效。_inuse 支援的選項為：%(supported_inuse)s" #, python-format msgid "Network %(name)s already exists" @@ -986,25 +902,25 @@ msgstr "網路 %(name)s 不存在" #, python-format msgid "Subnet %(subnet)s specified for network %(network)s is not valid." -msgstr "" +msgstr "為網路 %(network)s 指定的子網路 %(subnet)s 無效。" msgid "Specify a network interface to create bridged or macvtap networks." -msgstr "" +msgstr "指定網路介面，以建立橋接或 macvtap 網路。" #, python-format msgid "Unable to delete or update active network %(name)s" -msgstr "" +msgstr "無法刪除或更新作用中網路 %(name)s" #, python-format msgid "Interface %(iface)s specified for network %(network)s is already in use" -msgstr "為網路 %(network)s 指定的介面 %(iface)s 已在使用中。" +msgstr "為網路 %(network)s 指定的介面 %(iface)s 已在使用中" msgid "Interface should be bare NIC, bonding or bridge device." -msgstr "介面應該是裸露 NIC、接合裝置或橋接器裝置。" +msgstr "介面應該是裸露 NIC、bonding 或橋接器裝置。" #, python-format msgid "Unable to create or update network %(name)s. Details: %(err)s" -msgstr "" +msgstr "無法建立或更新網路 %(name)s。詳細資料：%(err)s" #, python-format msgid "Unable to find a free IP address for network '%(name)s'" @@ -1017,16 +933,14 @@ msgstr "介面 %(iface)s 已經存在。" msgid "Network name must be a string without slashes (/) or quotes (\")" msgstr "網路名稱必須是不含斜線 (/) 或引號 (\") 的字串" -msgid "" -"Supported network types are isolated, NAT, macvtap, bridge, vepa and " -"passthrough." -msgstr "" +msgid "Supported network types are isolated, NAT, macvtap, bridge, vepa and passthrough." +msgstr "支援的網路類型為：已隔離、NAT、macvtap、橋接器、VEPA 和透通。" msgid "Network subnet must be a string with IP address and prefix or netmask" msgstr "網路的子網路必須是含有 IP 位址、字首或網路遮罩的字串" msgid "Network interfaces must be an array." -msgstr "" +msgstr "網路介面必須是陣列。" msgid "Network VLAN ID must be an integer between 1 and 4094" msgstr "網路 VLAN ID 必須是介於 1 和 4094 之間的整數" @@ -1035,17 +949,12 @@ msgid "Specify name and type to create a Network" msgstr "指定名稱和類型以建立網路" #, python-format -msgid "" -"Unable to delete or update network %(name)s. There are some virtual machines " -"%(vms)s and/or templates linked to this network." -msgstr "" +msgid "Unable to delete or update network %(name)s. There are some virtual machines %(vms)s and/or templates linked to this network." +msgstr "無法刪除或更新網路 %(name)s。部分虛擬機器 %(vms)s 及/或範本已鏈結至此網路。" #, python-format -msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines " -"%(vms)s and/or templates linked to this network." -msgstr "" -"無法取消啟動網路 %(name)s。有一些虛擬機器%(vms)s 及/或範本已鏈結至此網路。" +msgid "Unable to deactivate network %(name)s. There are some virtual machines %(vms)s and/or templates linked to this network." +msgstr "無法取消啟動網路 %(name)s。部分虛擬機器 %(vms)s 及/或範本已鏈結至此網路。" #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1056,10 +965,8 @@ msgid "Failed to activate interface %(iface)s: %(err)s." msgstr "無法啟動介面 %(iface)s：%(err)s。" #, python-format -msgid "" -"Failed to activate interface %(iface)s. Please check the physical link " -"status." -msgstr "無法啟動介面 %(iface)s。請檢查實際鏈結狀態。" +msgid "Failed to activate interface %(iface)s. Please check the physical link status." +msgstr "無法啟動介面 %(iface)s。請檢查實體鏈結狀態。" #, python-format msgid "Failed to start network %(name)s. Details: %(err)s" @@ -1067,33 +974,29 @@ msgstr "無法啟動網路 %(name)s。詳細資料：%(err)s" #, python-format msgid "Unable to redefine interface %(name)s. Details: %(err)s" -msgstr "" +msgstr "無法重新定義介面 %(name)s。詳細資料：%(err)s" #, python-format msgid "Unable to create bridge %(name)s. Details: %(err)s" -msgstr "" +msgstr "無法建立橋接器 %(name)s。詳細資料：%(err)s" -msgid "" -"Unable to create bridge with NetworkManager enabled. Disable it and try " -"again." -msgstr "" +msgid "Unable to create bridge with NetworkManager enabled. Disable it and try again." +msgstr "啟用網路管理程式時，無法建立橋接器。請將其停用，然後再試一次。" msgid "Interface should be bare NIC or bonding." -msgstr "" +msgstr "介面應該是裸露 NIC 或 Bonding。" msgid "Network interfaces parameter must contain at least one interface." -msgstr "" +msgstr "網路介面參數必須包含至少一個介面。" msgid "Only one interface is allowed for 'bridge' and 'macvtap' networks." -msgstr "" +msgstr "對於 'bridge' 和 'macvtap' 網路，只容許一個介面。" msgid "Subnet is not a valid parameter for this type of virtual network." -msgstr "" +msgstr "對於這種類型的虛擬網路，子網路不是有效參數。" -msgid "" -"VLAN ID and interfaces are not valid parameters for this type of virtual " -"network." -msgstr "" +msgid "VLAN ID and interfaces are not valid parameters for this type of virtual network." +msgstr "對於這種類型的虛擬網路，VLAN ID 和介面不是有效參數。" #, python-format msgid "Storage server %(server)s was not used by Kimchi" @@ -1114,10 +1017,10 @@ msgid "Unable to choose a virtual machine name" msgstr "無法選擇虛擬機器名稱" msgid "Cannot upgrade objectstore data." -msgstr "" +msgstr "無法升級物件儲存庫資料。" msgid "Invalid storage type. Types supported: 'cdrom', 'disk'" -msgstr "儲存體類型無效。支援的類型：'cdrom' 和 'disk'" +msgstr "儲存體類型無效。支援的類型：'cdrom'、'disk'" #, python-format msgid "The path '%(value)s' is not a valid local/remote path for the device" @@ -1127,10 +1030,8 @@ msgid "Only CDROM path can be update." msgstr "只能更新 CDROM 路徑。" #, python-format -msgid "" -"The storage device %(dev_name)s does not exist in the virtual machine " -"%(vm_name)s" -msgstr "儲存裝置 %(dev_name)s 不在下列虛擬機器中：%(vm_name)s" +msgid "The storage device %(dev_name)s does not exist in the virtual machine %(vm_name)s" +msgstr "儲存裝置 %(dev_name)s 不在虛擬機器 %(vm_name)s 中" #, python-format msgid "Error while creating new storage device: %(error)s" @@ -1147,17 +1048,15 @@ msgstr "移除儲存裝置時發生錯誤：%(error)s" msgid "Do not support IDE device hot plug" msgstr "請勿支援 IDE 裝置熱插拔" -msgid "" -"Specify type and path or type and pool/volume to add a new virtual machine " -"disk" -msgstr "指定類型和路徑，或者鍵入儲存區/磁區，以新增虛擬機器磁碟" +msgid "Specify type and path or type and pool/volume to add a new virtual machine disk" +msgstr "指定類型與路徑或類型與儲存區/磁區，以新增虛擬機器磁碟" msgid "Specify path to update virtual machine disk" msgstr "指定路徑以更新虛擬機器磁碟" #, python-format msgid "Controller type %(type)s limitation of %(limit)s devices reached" -msgstr "已達到控制器類型 %(type)s 限制：%(limit)s 個裝置" +msgstr "已達到控制器類型 %(type)s 限制（%(limit)s 個裝置）" #, python-format msgid "Cannot retrieve disk path information for given pool/volume: %(error)s" @@ -1166,10 +1065,8 @@ msgstr "無法擷取給定儲存區/磁區的磁碟路徑資訊：%(error)s" msgid "Volume already in use by other virtual machine." msgstr "其他虛擬機器已在使用該磁區。" -msgid "" -"Only one of path or pool/volume can be specified to add a new virtual " -"machine disk" -msgstr "僅可以指定一個路徑或集區/磁區以新增到虛擬機器磁碟" +msgid "Only one of path or pool/volume can be specified to add a new virtual machine disk" +msgstr "只能指定其中一個路徑或儲存區/磁區，以新增虛擬機器磁碟" #, python-format msgid "" @@ -1178,21 +1075,14 @@ msgid "" msgstr "所選格式為 %(format)s 的磁區不適合儲存體類型%(type)s" msgid "On s390x arch one of pool, path of dir_path must be specified" -msgstr "" +msgstr "在 s390x 架構上，必須指定其中一個儲存區和 dir_path 的路徑" -msgid "" -"On s390x arch 'format' must be specified while attaching disk to virtual " -"machine" -msgstr "" +msgid "On s390x arch 'format' must be specified while attaching disk to virtual machine" +msgstr "在 s390x 架構上，將磁碟連接至虛擬機器時，必須指定「格式」" #, python-format msgid "Virtual disk already exists on the system: %(disk_path)s" -msgstr "" - -#, python-format -msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "必須先停止虛擬機器 '%(vm)s'，然後再建立該虛擬機器的 Snapshot。" +msgstr "虛擬磁碟已經在系統上：%(disk_path)s" #, python-format msgid "" @@ -1233,256 +1123,244 @@ msgid "" msgstr "無法將虛擬機器 '%(vm)s' 回復至 Snapshot '%(name)s'。詳細資料：%(err)s" #, python-format -msgid "" -"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " -"disk with format '%(format)s'; only 'qcow2' is supported." -msgstr "" -"無法建立虛擬機器 '%(vm)s' 的 Snapshot，因為該虛擬機器包含格式為 '%(format)s' " -"的磁碟；僅支援 'qcow2'。" +msgid "Unable to create snapshot of virtual machine '%(vm)s' because it contains a disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "無法建立虛擬機器 '%(vm)s' 的 Snapshot，因為該虛擬機器包含格式為 '%(format)s' 的磁碟；但卻僅支援 'qcow2'。" -msgid "" -"The number of vCPUs must be less than or equal the maximum number of vCPUs " -"specified." -msgstr "" +msgid "The number of vCPUs must be less than or equal the maximum number of vCPUs specified." +msgstr "vCPU 數目必須小於或等於指定的 vCPU 數目上限。" -msgid "" -"When CPU topology is defined, maximum number of vCPUs must be a product of " -"sockets, cores, and threads." -msgstr "" +msgid "When CPU topology is defined, maximum number of vCPUs must be a product of sockets, cores, and threads." +msgstr "定義 CPU 拓蹼時，vCPU 數目上限必須是 Socket 數目、核心數目與執行緒數目的乘積。" msgid "This host (or current configuration) does not allow CPU topology." msgstr "此主機（或現行配置）不容許使用 CPU 拓蹼。" msgid "The maximum number of vCPUs is too large for this system." -msgstr "" +msgstr "這個系統的 vCPU 數目上限太大。" msgid "" -"When CPU topology is defined, vCPUs must be a multiple of a product of cores " -"and threads." -msgstr "" - -msgid "The number of threads is too large for this system." +"When CPU topology is defined, CPUs must be a multiple of the 'threads' " +"number defined." msgstr "" msgid "" "When CPU topology is specified, sockets, cores and threads are required " "paramaters." -msgstr "" +msgstr "指定 CPU 拓蹼時，Socket、核心及執行緒是必要參數。" -msgid "" -"Parameter 'cpu_info' expects an object with fields among: 'vcpus', " -"'maxvcpus', 'topology'." -msgstr "" +msgid "Parameter 'cpu_info' expects an object with fields among: 'vcpus', 'maxvcpus', 'topology'." +msgstr "參數 'cpu_info' 預期具有下列欄位的物件：'vcpus'、'maxvcpus'、'topology'。" msgid "" "Parameter 'topology' expects an object with fields among: 'sockets', " "'cores', 'threads'." +msgstr "參數「拓蹼」預期具有下列欄位的物件：'sockets'、'cores'、'threads'。" + +msgid "Unable to update Max CPU or CPU topology when guest is running." msgstr "" #, python-format +msgid "Unable to hot plug/unplug CPUs. Details: %(err)s" +msgstr "無法列出儲存區。詳細資料：%(err)s" + +#, python-format msgid "Invalid volume group name parameter: %(name)s." -msgstr "" +msgstr "磁區群組名稱參數無效：%(name)s。" -msgid "" -"Unable to establish connection with libvirt. Please check your libvirt URI " -"which is often defined in /etc/libvirt/libvirt.conf" -msgstr "" +msgid "Unable to establish connection with libvirt. Please check your libvirt URI which is often defined in /etc/libvirt/libvirt.conf" +msgstr "無法與 libvirt 建立連線。請檢查 libvirt URI，該 URI 通常是在 /etc/libvirt/libvirt.conf 中予以定義" -msgid "" -"Libvirt service is not active. Please start the libvirt service in your host " -"system." -msgstr "" +msgid "Libvirt service is not active. Please start the libvirt service in your host system." +msgstr "libvirt 服務處於非作用中狀態。請在主機系統中啟動 libvirt 服務。" msgid "Failed to register the default event implementation." -msgstr "" +msgstr "無法登錄預設事件實作。" msgid "Failed to register timeout event." -msgstr "" +msgstr "無法登錄逾時事件。" msgid "Failed to Run the default event implementation." -msgstr "" +msgstr "無法執行預設事件實作。" #, python-format -msgid "" -"I/O error on guest '%(vm)s': storage pool out of space for %(devAlias)s " -"(%(srcPath)s)." -msgstr "" +msgid "I/O error on guest '%(vm)s': storage pool out of space for %(devAlias)s (%(srcPath)s)." +msgstr "客體 '%(vm)s' 上發生 I/O 錯誤：%(devAlias)s (%(srcPath)s) 的儲存區空間已用完。" #, python-format msgid "Create virtual network '%(name)s' type '%(connection)s'" -msgstr "" +msgstr "建立虛擬網路 '%(name)s' 類型 '%(connection)s'" #, python-format msgid "Remove virtual network '%(ident)s'" -msgstr "" +msgstr "移除虛擬網路 '%(ident)s'" #, python-format msgid "Update virtual network '%(ident)s'" -msgstr "" +msgstr "更新虛擬網路 '%(ident)s'" #, python-format msgid "Activate virtual network '%(ident)s'" -msgstr "" +msgstr "啟動虛擬網路 '%(ident)s'" #, python-format msgid "Deactivate virtual network '%(ident)s'" -msgstr "" +msgstr "取消啟動虛擬網路 '%(ident)s'" #, python-format msgid "Create storage pool '%(name)s' type '%(type)s'" -msgstr "" +msgstr "建立儲存區 '%(name)s' 類型 '%(type)s'" #, python-format msgid "Remove storage pool '%(ident)s'" -msgstr "" +msgstr "移除儲存區 '%(ident)s'" #, python-format msgid "Update storage pool '%(ident)s'" -msgstr "" +msgstr "更新儲存區 '%(ident)s'" #, python-format msgid "Activate storage pool '%(ident)s'" -msgstr "" +msgstr "啟動儲存區 '%(ident)s'" #, python-format msgid "Deactivate storage pool '%(ident)s'" -msgstr "" +msgstr "取消啟動儲存區 '%(ident)s'" #, python-format msgid "Create snapshot '%(name)s' at guest '%(vm)s'" -msgstr "" +msgstr "在客體 '%(vm)s' 處建立 Snapshot '%(name)s'" #, python-format msgid "Remove snapshot '%(ident)s' from guest '%(vm)s'" -msgstr "" +msgstr "從客體 '%(vm)s' 中移除 Snapshot '%(ident)s'" #, python-format msgid "Revert guest '%(vm)s' to snapshot '%(ident)s'" -msgstr "" +msgstr "將客體 '%(vm)s' 回復至 Snapshot '%(ident)s'" #, python-format msgid "Create template '%(name)s'" -msgstr "" +msgstr "建立範本 '%(name)s'" #, python-format msgid "Remove template '%(ident)s'" -msgstr "" +msgstr "移除範本 '%(ident)s'" #, python-format msgid "Update template '%(ident)s'" -msgstr "" +msgstr "更新範本 '%(ident)s'" #, python-format msgid "Clone template '%(ident)s'" -msgstr "" +msgstr "複製範本 '%(ident)s'" #, python-format msgid "Create guest '%(name)s' from template '%(template)s'" -msgstr "" +msgstr "根據範本 '%(template)s' 建立客體 '%(name)s'" #, python-format msgid "Remove guest '%(ident)s'" -msgstr "" +msgstr "移除客體 '%(ident)s'" #, python-format msgid "Edit guest '%(ident)s'" -msgstr "" +msgstr "編輯客體 '%(ident)s'" #, python-format msgid "Start guest '%(ident)s'" -msgstr "" +msgstr "啟動客體 '%(ident)s'" #, python-format msgid "Power off guest '%(ident)s'" -msgstr "" +msgstr "關閉客體 '%(ident)s' 的電源" #, python-format msgid "Shutdown guest '%(ident)s'" -msgstr "" +msgstr "關閉客體 '%(ident)s'" #, python-format msgid "Restart guest '%(ident)s'" -msgstr "" +msgstr "重新啟動客體 '%(ident)s'" #, python-format msgid "Connect to guest '%(ident)s' through novnc/spice" -msgstr "" +msgstr "透過 novnc/spice 連接至客體 '%(ident)s'" #, python-format msgid "Clone guest '%(ident)s'" -msgstr "" +msgstr "複製客體 '%(ident)s'" #, python-format msgid "Migrate guest '%(ident)s' to '%(remote_host)s'" -msgstr "" +msgstr "將客體 '%(ident)s' 移轉至 '%(remote_host)s'" #, python-format msgid "Suspend guest '%(ident)s'" -msgstr "" +msgstr "暫停客體 '%(ident)s'" #, python-format msgid "Resume guest '%(ident)s'" -msgstr "" +msgstr "回復客體 '%(ident)s'" #, python-format msgid "Connect to guest '%(ident)s' through serial" -msgstr "" +msgstr "透過序列連接至客體 '%(ident)s'" #, python-format msgid "Attach host device '%(name)s' to guest '%(vmid)s'" -msgstr "" +msgstr "將主機裝置 '%(name)s' 連接至客體 '%(vmid)s'" #, python-format msgid "Detach host device '%(ident)s' from guest '%(vmid)s'" -msgstr "" +msgstr "將主機裝置 '%(ident)s' 從客體 '%(vmid)s' 分離" #, python-format msgid "Attach network interface '%(network)s' to guest '%(vm)s'" -msgstr "" +msgstr "將網路介面 '%(network)s' 連接至客體 '%(vm)s'" #, python-format msgid "Detach network interface '%(ident)s' from guest '%(vm)s'" -msgstr "" +msgstr "將網路介面 '%(ident)s' 從客體 '%(vm)s' 分離" #, python-format msgid "Update network interface '%(ident)s' at guest '%(vm)s'" -msgstr "" +msgstr "更新客體 '%(vm)s' 處的網路介面 '%(ident)s'" #, python-format msgid "Attach %(type)s storage '%(path)s' to guest '%(vm)s'" -msgstr "" +msgstr "將 %(type)s 儲存體 '%(path)s' 連接至客體 '%(vm)s'" #, python-format msgid "Remove storage '%(ident)s' from guest '%(vm)s'" -msgstr "" +msgstr "從客體 '%(vm)s' 中移除儲存體 '%(ident)s'" #, python-format msgid "Update storage '%(ident)s' at guest '%(vm)s'" -msgstr "" +msgstr "更新客體 '%(vm)s' 處的儲存體 '%(ident)s'" #, python-format msgid "Create storage volume '%(name)s' at pool '%(pool)s'" -msgstr "" +msgstr "在儲存區 '%(pool)s' 處建立儲存磁區 '%(name)s'" #, python-format msgid "Remove storage volume '%(ident)s' from pool '%(pool)s'" -msgstr "" +msgstr "從儲存區 '%(pool)s' 中移除儲存磁區 '%(ident)s'" #, python-format msgid "Update storage volume '%(ident)s' at pool '%(pool)s'" -msgstr "" +msgstr "在儲存區 '%(pool)s' 處更新儲存磁區 '%(ident)s'" #, python-format msgid "Wipe storage volume '%(ident)s' off pool '%(pool)s'" -msgstr "" +msgstr "從儲存區 '%(pool)s' 中清除儲存磁區 '%(ident)s'" #, python-format msgid "Resize storage volume '%(ident)s' at pool '%(pool)s' with size %(size)s" -msgstr "" +msgstr "將儲存區 '%(pool)s' 處儲存磁區 '%(ident)s' 的大小調整為 %(size)s" #, python-format msgid "Clone storage volume '%(ident)s' at pool '%(pool)s'" -msgstr "" +msgstr "在儲存區 '%(pool)s' 處複製儲存磁區 '%(ident)s'" msgid "Create a New Virtual Machine" msgstr "建立新的虛擬機器" @@ -1490,10 +1368,8 @@ msgstr "建立新的虛擬機器" msgid "Virtual Machine Name" msgstr "虛擬機器名稱" -msgid "" -"The name used to identify the virtual machine. If omitted, a name will be " -"chosen based on the template used." -msgstr "用來識別虛擬機器的名稱。如果省略，則會根據所用的範本選擇名稱。" +msgid "The name used to identify the virtual machine. If omitted, a name will be chosen based on the template used." +msgstr "用於識別虛擬機器的名稱。如果省略，則將根據所使用的範本來選擇一個名稱。" msgid "Please create a template first." msgstr "請先建立範本。" @@ -1505,19 +1381,19 @@ msgid "Please choose a template." msgstr "請選擇範本。" msgid "This template has invalid parameters." -msgstr "" +msgstr "這個範本具有無效參數。" msgid "This template has invalid parameters" -msgstr "" +msgstr "這個範本具有無效參數" msgid "OS" -msgstr "OS" +msgstr "作業系統" msgid "Version" msgstr "版本" msgid "Current CPUs" -msgstr "" +msgstr "現行 CPU 數目" msgid "Memory" msgstr "記憶體" @@ -1529,28 +1405,25 @@ msgid "Creating..." msgstr "正在建立..." msgid "Cancel" -msgstr "取消 " +msgstr "取消" msgid "Clone a Guest" -msgstr "" +msgstr "複製客體" -msgid "" -"When the target guest has SCSI or iSCSI volumes, they will be cloned on the " -"default storage pool. The same will happen when the target pool does not " -"have enough space to clone the volumes. Do you want to continue?" -msgstr "" +msgid "When the target guest has SCSI or iSCSI volumes, they will be cloned on the default storage pool. The same will happen when the target pool does not have enough space to clone the volumes. Do you want to continue?" +msgstr "當目標客體具有 SCSI 或 iSCSI 磁區時，將在預設儲存區上複製這些磁區。當目標儲存區沒有足夠的空間來複製磁區時，也會發生相同的事件。要繼續嗎？" msgid "Number of times to clone" -msgstr "" +msgstr "複製的次數" msgid "Continue" -msgstr "" +msgstr "繼續" msgid "Edit Guest" msgstr "編輯客體" msgid "General" -msgstr "一般" +msgstr "一般 " msgid "Storage" msgstr "儲存體" @@ -1559,43 +1432,46 @@ msgid "Interface" msgstr "介面" msgid "Permission" -msgstr "" +msgstr "許可權" msgid "Pci" -msgstr "" +msgstr "PCI" msgid "Snapshot" -msgstr "" +msgstr "Snapshot" + +msgid "Processor" +msgstr "處理器" msgid "Name" msgstr "名稱" -msgid "More" -msgstr "" - -msgid "Max CPU" -msgstr "" - msgid "Memory (MB)" msgstr "記憶體 (MB)" +msgid "More" +msgstr "更多" + msgid "Max Memory (MB)" -msgstr "" +msgstr "記憶體上限 (MB)" msgid "Host does not support memory hotplug" -msgstr "" +msgstr "主機不支援記憶體熱插拔" msgid "Icon" msgstr "圖示" msgid "Console" -msgstr "" +msgstr "主控台" + +msgid "Nothing selected" +msgstr "未選取任何項目" msgid "sclp" -msgstr "" +msgstr "sclp" msgid "virtio" -msgstr "" +msgstr "virtio" msgid "Add" msgstr "新增" @@ -1619,13 +1495,13 @@ msgid "MAC Address" msgstr "MAC 位址" msgid "IP Address" -msgstr "" +msgstr "IP 位址" msgid "Network/Interface" -msgstr "" +msgstr "網路/介面" msgid "Mode" -msgstr "" +msgstr "模式" msgid "Available system users and groups" msgstr "可用的系統使用者及群組" @@ -1652,10 +1528,10 @@ msgid "Added" msgstr "已新增" msgid "Filter" -msgstr "" +msgstr "過濾器" msgid "Status" -msgstr "" +msgstr "狀態" msgid "Product" msgstr "產品" @@ -1664,10 +1540,43 @@ msgid "Vendor" msgstr "供應商" msgid "Loading" -msgstr "" +msgstr "載入中" msgid "Created" -msgstr "建立時間" +msgstr "已建立" + +msgid "Current CPU Number" +msgstr "現行 CPU 數目" + +msgid "" +"Current CPU must be equal or lower than the Maximum CPU value. If a topology " +"is set, it must be also be a multiple of the 'threads' value." +msgstr "" + +msgid "Max CPU" +msgstr "CPU 數目上限" + +msgid "" +"Unable to edit maximum CPU or CPU topology when editing a running or paused " +"virtual machine." +msgstr "" + +msgid "" +"If a topology is set, this value will be the product of sockets * times * " +"cores." +msgstr "" + +msgid "Manually set CPU topology" +msgstr "手動設定 CPU 拓蹼" + +msgid "Sockets" +msgstr "" + +msgid "Cores" +msgstr "核心數目" + +msgid "Threads" +msgstr "執行緒數目" msgid "Save" msgstr "儲存" @@ -1688,43 +1597,43 @@ msgid "LDAP User ID,e.g.foo(a)foo.com" msgstr "LDAP 使用者 ID，例如 foo(a)foo.com" msgid "Revert" -msgstr "" +msgstr "回復" msgid "Running" -msgstr "" +msgstr "執行中" msgid "Disconnected" -msgstr "" +msgstr "已斷線" msgid "Starting" -msgstr "" +msgstr "啟動中" msgid "Crashed" -msgstr "" +msgstr "已當機" msgid "Unknown" -msgstr "" +msgstr "不明" msgid "Paused" -msgstr "" +msgstr "已暫停" msgid "Suspended" -msgstr "" +msgstr "已暫停" msgid "Resetting" -msgstr "" +msgstr "正在重設" msgid "View Console" -msgstr "" +msgstr "檢視主控台" msgid "View Serial" -msgstr "" +msgstr "檢視序列" msgid "Clone" msgstr "複製" msgid "Migrate" -msgstr "" +msgstr "移轉" msgid "Reset" msgstr "重設" @@ -1739,7 +1648,7 @@ msgid "Shut Down" msgstr "關閉" msgid "Start" -msgstr "開始" +msgstr "啟動" msgid "Power Off" msgstr "關閉電源" @@ -1748,103 +1657,102 @@ msgid "Delete" msgstr "刪除" msgid "No Data Available" -msgstr "" +msgstr "沒有資料可用" msgid "Processors Utilization" -msgstr "" +msgstr "處理器使用率 " msgid "Memory Utilization" -msgstr "" +msgstr "記憶體使用率" msgid "Storage I/O" -msgstr "" +msgstr "儲存體 I/O" msgid "Network I/O" msgstr "網路 I/O" msgid "Migrate a Guest" -msgstr "" +msgstr "移轉客體" -msgid "" -"Disclaimer: This process cannot be stopped after started, can take a long " -"time to complete and will turn off the VM on this Hypervisor when it is " -"successfully migrated to the remote destination." -msgstr "" +msgid "Disclaimer: This process cannot be stopped after started, can take a long time to complete and will turn off the VM on this Hypervisor when it is successfully migrated to the remote destination." +msgstr "免責聲明：此程序在啟動之後無法停止，可能花費較長的時間才能完成，並且將在順利移轉至遠端目的地時關閉在 Hypervisor 上的 VM。" msgid "Remote Server" -msgstr "" +msgstr "遠端伺服器" msgid "IP Address or Hostname" -msgstr "" +msgstr "IP 位址或主機名稱" -msgid "" -"The following fields are optional. Fill them if you want Kimchi to setup a " -"password-less ssh session between the localhost and the remote host. The " -"setup process will only be successful if the user has 'SUDO ALL' permission " -"in the remote machine." -msgstr "" +msgid "The following fields are optional. Fill them if you want Kimchi to setup a password-less ssh session between the localhost and the remote host. The setup process will only be successful if the user has 'SUDO ALL' permission in the remote machine." +msgstr "下列欄位是選用項目。如果您要讓 Kimchi 在本端主機與遠端主機之間設定無密碼 SSH 階段作業，請填寫這些欄位。設定程序將只在使用者於遠端機器中具有 'SUDO ALL' 權限時才會成功。" msgid "Username of the remote host" -msgstr "" +msgstr "遠端主機的使用者名稱" msgid "Password" msgstr "密碼" msgid "Password of the user in the remote host" +msgstr "遠端主機中使用者的密碼" + +msgid "Use RDMA transport" msgstr "" -msgid "Delete this VM when the migration is completed" +msgid "" +"Check this option only if RDMA is properly configured in both source and " +"destination hosts, otherwise migration will fail." msgstr "" +msgid "Delete this VM when the migration is completed" +msgstr "在移轉完成時刪除此 VM" + msgid "Add a Storage Device to VM" msgstr "將儲存裝置新增至 VM" msgid "Device Type" msgstr "裝置類型" -msgid "" -"The device type. Currently, \"cdrom\" and \"disk\" are supported. If the " -"guest is running, only \"disk\" is supported." -msgstr "" +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported. If the guest is running, only \"disk\" is supported." +msgstr "裝置類型。目前，支援 \"cdrom\" 和「磁碟」。如果客體處於執行中狀態，則僅支援「磁碟」。" msgid "Create a new disk" -msgstr "" +msgstr "建立新磁碟" msgid "Select an existing disk" -msgstr "" +msgstr "選取現有磁碟" msgid "Source" -msgstr "" +msgstr "來源" msgid "Storage based on Libvirt pool or direct block device" -msgstr "" +msgstr "基於 libvirt 儲存區的儲存體或直接區塊裝置" msgid "Storage Pool" msgstr "儲存區" msgid "Storage pool to create the volume in" -msgstr "" +msgstr "要在其中建立磁區的儲存區" msgid "Disk Size (GB)" -msgstr "" +msgstr "磁碟大小 (GB)" msgid "New disk size to be created" -msgstr "" +msgstr "要建立的新磁碟大小" msgid "Format" -msgstr "" +msgstr "格式" msgid "Format of the new disk to be created" -msgstr "" +msgstr "要建立之新磁碟的格式" msgid "Directory Path" -msgstr "" +msgstr "目錄路徑" msgid "Provide a directory path" -msgstr "" +msgstr "提供目錄路徑" msgid "Storage pool in which the volume is located in" -msgstr "" +msgstr "磁區所在的儲存區" msgid "Storage Volume" msgstr "儲存磁區" @@ -1853,16 +1761,16 @@ msgid "Storage volume to be attached" msgstr "要連接的儲存磁區" msgid "Disk Path" -msgstr "" +msgstr "磁碟路徑" msgid "Provide a block device" -msgstr "" +msgstr "提供區塊裝置" msgid "File Path" msgstr "檔案路徑" msgid "The ISO file path in the server for CDROM." -msgstr "CDROM 的 ISO 檔案路徑在伺服器中。" +msgstr "CDROM 的 ISO 檔在伺服器中的路徑。" msgid "Attach" msgstr "連接" @@ -1877,7 +1785,7 @@ msgid "Templates" msgstr "範本" msgid "This is not a valid Linux path" -msgstr "這是無效的 Linux 路徑" +msgstr "這不是有效的 Linux 路徑" msgid "Unable to read file." msgstr "無法讀取檔案。" @@ -1886,7 +1794,7 @@ msgid "Error while uploading file." msgstr "上傳檔案時發生錯誤。" msgid "Delete Confirmation" -msgstr "刪除確認" +msgstr "確認刪除" msgid "OK" msgstr "確定" @@ -1901,10 +1809,10 @@ msgid "Cloning..." msgstr "正在複製..." msgid "Saving..." -msgstr "" +msgstr "正在儲存..." msgid "Migrating..." -msgstr "" +msgstr "正在移轉..." msgid "No ISO found" msgstr "找不到 ISO" @@ -1913,87 +1821,79 @@ msgid "Add Template" msgstr "新增範本" msgid "This may take a long time. Do you want to continue?" -msgstr "這可能花費較長時間。您要繼續嗎？" +msgstr "這可能花費較長時間。要繼續嗎？" -msgid "" -"This will permanently delete the %1 template. Would you like to continue?" -msgstr "" +msgid "This will permanently delete the %1 template. Would you like to continue?" +msgstr "這將永久地刪除 %1 範本。您要繼續嗎？" msgid "View Table" -msgstr "" +msgstr "檢視表格" msgid "View Gallery" -msgstr "" +msgstr "檢視展示區" msgid "Not Available" -msgstr "" +msgstr "無法使用" msgid "Please check the invalid Storage Pools" -msgstr "" +msgstr "請檢查無效的儲存區" msgid "Please check the invalid Storage Pools or Paths" -msgstr "" +msgstr "請檢查無效的「儲存區」或「路徑」" -msgid "" -"This will delete the %1 virtual machine and its virtual disks. This " -"operation cannot be undone. Would you like to continue?" -msgstr "" +msgid "macvtap" +msgstr "macvtap" + +msgid "ovs" +msgstr "ovs" + +msgid "network" +msgstr "網路" + +msgid "This will delete the %1 virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?" +msgstr "這將刪除 %1 虛擬機器及其虛擬磁碟。這項作業將無法復原。您要繼續嗎？" msgid "Power off Confirmation" msgstr "確認關閉電源" -msgid "" -"This action may produce undesirable results, for example unflushed disk " -"cache in the %1 guest. Would you like to continue?" -msgstr "" +msgid "This action may produce undesirable results, for example unflushed disk cache in the %1 guest. Would you like to continue?" +msgstr "此動作可能會產生不想要的結果，例如取消清除 %1 客體中的磁碟快取。您要繼續嗎？" msgid "Reset Confirmation" msgstr "確認重設" -msgid "" -"There is a risk of data loss caused by reset without the %1 guest OS " -"shutdown. Would you like to continue?" -msgstr "" +msgid "There is a risk of data loss caused by reset without the %1 guest OS shutdown. Would you like to continue?" +msgstr "如果在不關閉 %1 客體作業系統的情況下進行重設，則可能會導致資料流失。您要繼續嗎？" msgid "Shut Down Confirmation" msgstr "確認關閉" -msgid "" -"Note the %1 guest OS may ignore this request. Would you like to continue?" -msgstr "" +msgid "Note the %1 guest OS may ignore this request. Would you like to continue?" +msgstr "請注意，%1 客體作業系統可能會忽略此要求。您要繼續嗎？" msgid "Virtual Machine delete Confirmation" msgstr "虛擬機器刪除確認" -msgid "" -"The %1 virtual machine is not persistent. Power Off will delete it. Continue?" -msgstr "" - -msgid "Add Guest" -msgstr "" +msgid "The %1 virtual machine is not persistent. Power Off will delete it. Continue?" +msgstr "%1 虛擬機器不是持續性的。「關閉電源」會將其刪除。要繼續嗎？" msgid "Input is not a number" -msgstr "" +msgstr "輸入不是數字" msgid "Memory value cannot be higher than Max Memory value" -msgstr "" +msgstr "「記憶體」值不能高於「記憶體上限」值" msgid "Current CPUs value cannot be higher than Max CPU value" -msgstr "" +msgstr "「現行 CPU 數目」值不能高於「CPU 數目上限」值" -msgid "" -"This CDROM will be detached permanently and you can re-attach it. Continue " -"to detach it?" -msgstr "" -"將會永久地分離此 CDROM，但是您可以將其重新連接。要繼續分離此 CDROM 嗎？" +msgid "This CDROM will be detached permanently and you can re-attach it. Continue to detach it?" +msgstr "此 CDROM 將永久予以分離，並且您可以重新連接它。要繼續分離它嗎？" msgid "Attaching..." msgstr "正在連接..." -msgid "" -"This disk will be detached permanently and you can re-attach it. Continue to " -"detach it?" -msgstr "將會永久地分離此磁碟，但是您可以將其重新連接。要繼續分離操作嗎？" +msgid "This disk will be detached permanently and you can re-attach it. Continue to detach it?" +msgstr "此磁碟將永久予以分離，並且您可以重新連接它。要繼續分離它嗎？" msgid "interface:" msgstr "介面：" @@ -2011,30 +1911,37 @@ msgid "drive_type:" msgstr "磁碟機類型：" msgid "model:" -msgstr "模型：" +msgstr "型號：" msgid "Affected devices:" msgstr "受影響的裝置：" msgid "Less" -msgstr "" +msgstr "更少" msgid "Successfully attached device to VM" -msgstr "" +msgstr "已順利將裝置連接至 VM" msgid "Successfully detached device from VM" -msgstr "" +msgstr "已順利從 VM 分離裝置" msgid "Following devices will be affected, confirm?" -msgstr "" +msgstr "下列裝置將受影響，要確認嗎？" + +msgid "Bridge" +msgstr "橋接器" + +msgid "Vepa" +msgstr "VEPA" + +msgid "None" +msgstr "無" msgid "unavailable" msgstr "無法使用" -msgid "" -"This action will interrupt network connectivity for any virtual machine that " -"depend on the %1 network." -msgstr "" +msgid "This action will interrupt network connectivity for any virtual machine that depend on the %1 network." +msgstr "這個動作將岔斷依賴於 %1 網路之任何虛擬機器的網路連線。" msgid "Add Network" msgstr "" @@ -2042,25 +1949,19 @@ msgstr "" msgid "" "The %1 network is not persistent. Instead of stop, this action will " "permanently delete it. Would you like to continue?" -msgstr "" +msgstr "%1 網路不是持續性的。這個動作會將其永久地刪除，而不是將其停止。您要繼續嗎？" -msgid "" -"The bridged VLAN tag may not work well with NetworkManager enabled. You " -"should consider disabling it." -msgstr "" -"啟用 NetworkManager 時，橋接 VLAN 標籤可能不正常工作。您應該考量將其停用。" +msgid "The bridged VLAN tag may not work well with NetworkManager enabled. You should consider disabling it." +msgstr "啟用網路管理程式時，橋接 VLAN 標籤可能不正常工作。應該考量將其停用。" -msgid "" -"This will permanently delete the %1 storage pool. Would you like to continue?" -msgstr "" +msgid "This will permanently delete the %1 storage pool. Would you like to continue?" +msgstr "這將永久地刪除 %1 儲存區。您要繼續嗎？" msgid "This storage pool is empty." msgstr "此儲存區是空的。" -msgid "" -"It will format your disk and you will loose any data in there, are you sure " -"to continue? " -msgstr "此動作會格式化您的磁碟，而您將會遺失磁碟中的所有資料。確定要繼續嗎？" +msgid "It will format your disk and you will loose any data in there, are you sure to continue? " +msgstr "它會將磁碟進行格式化，並且您會遺失該磁碟中的所有資料，您確定要繼續嗎？" msgid "SCSI Fibre Channel" msgstr "SCSI 光纖通道" @@ -2078,18 +1979,25 @@ msgid "Failed to load iSCSI targets." msgstr "無法載入 iSCSI 目標。" msgid "Would you like to continue?" -msgstr "" +msgstr "您要繼續嗎？" msgid "This will permanently delete the following storage volumes: %1" -msgstr "" +msgstr "這將永久地刪除下列儲存磁區：%1" + +msgid "Invalid NFS mount path." +msgstr "NFS 裝載路徑無效。" + +msgid "No logical device selected." +msgstr "未選取邏輯裝置。" + +msgid "This is not a valid Server Name or IP. Please, modify it." +msgstr "這不是有效的「伺服器名稱」或 IP。請進行修改。" msgid "No available partitions found." msgstr "找不到可用的分割區。" -msgid "" -"The %1 storage pool is not persistent. Instead of deactivate, this action " -"will permanently delete it. Would you like to continue?" -msgstr "" +msgid "The %1 storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?" +msgstr "%1 儲存區不是持續性的。這個動作會將其永久地刪除，而不是將其取消啟動。您要繼續嗎？" msgid "Unable to retrieve partitions information." msgstr "無法擷取分割區資訊。" @@ -2101,52 +2009,43 @@ msgid "Failed!" msgstr "失敗！" msgid "No LVM found in the system." -msgstr "" +msgstr "在系統中找不到 LVM。" msgid "This will permanently wipe the following storage volumes: %1" -msgstr "" +msgstr "這將永久地清除下列儲存磁區：%1" msgid "Wipe Confirmation" -msgstr "" +msgstr "確認清除" msgid "Select one or more partitions to be added to the logical pool %1:" -msgstr "" +msgstr "選取要新增至邏輯儲存區 %1 的一個以上分割區：" msgid "Add Storage" -msgstr "" +msgstr "新增儲存體" msgid "DIR" -msgstr "" +msgstr "DIR" msgid "NFS" -msgstr "" +msgstr "NFS" msgid "iSCSI" -msgstr "" +msgstr "iSCSI" msgid "LOGICAL" -msgstr "" +msgstr "邏輯" msgid "device" -msgstr "" +msgstr "裝置" msgid "path" -msgstr "" +msgstr "路徑" msgid "size (GiB)" -msgstr "" +msgstr "大小 (GiB)" msgid "free size (GiB)" -msgstr "" - -msgid "Invalid NFS mount path." -msgstr "NFS 裝載路徑無效。" - -msgid "No logical device selected." -msgstr "未選取邏輯裝置。" - -msgid "This is not a valid Server Name or IP. Please, modify it." -msgstr "這不是有效的「伺服器名稱」或 IP。請進行修改。" +msgstr "可用大小 (GiB)" msgid "CDROM path needs to be a valid local/remote path and cannot be blank." msgstr "CDROM 路徑需要是有效的本端/遠端路徑，並且不能空白。" @@ -2154,46 +2053,44 @@ msgstr "CDROM 路徑需要是有效的本端/遠端路徑，並且不能空白 msgid "Disk pool or volume cannot be blank." msgstr "磁碟儲存區或磁區不能空白。" -msgid "" -"Disk size or Format or Directory path cannot be blank and Directory path " -"needs to be a valid local/remote path." -msgstr "" +msgid "Disk size or Format or Directory path cannot be blank and Directory path needs to be a valid local/remote path." +msgstr "「磁碟大小」、「格式」或「目錄路徑」不能空白，並且「目錄路徑」需要是有效的本端/遠端路徑。" msgid "Disk path needs to be a valid local/remote path and cannot be blank." -msgstr "" +msgstr "磁碟路徑需要是有效的本端/遠端路徑，並且不能空白。" msgid "Storage pool or Disk size or Format cannot be blank." -msgstr "" +msgstr "「儲存區」、「磁碟大小」或「格式」不能空白。" msgid "cdrom" -msgstr "" +msgstr "CDROM" msgid "disk" -msgstr "" +msgstr "磁碟" msgid "Pool" -msgstr "" +msgstr "儲存區" msgid "qcow" -msgstr "" +msgstr "qcow" msgid "qcow2" -msgstr "" +msgstr "qcow2" msgid "qed" -msgstr "" +msgstr "qed" msgid "raw" -msgstr "" +msgstr "原始" msgid "vmdk" -msgstr "" +msgstr "vmdk" msgid "vpc" -msgstr "" +msgstr "vpc" msgid "Peers" -msgstr "" +msgstr "同層級" msgid "Create a network" msgstr "建立網路" @@ -2214,20 +2111,16 @@ msgid "NAT: outbound physical network connection only" msgstr "NAT：僅限出埠實體網路連線" msgid "Macvtap: Virtual machines are connected to physical network directly" -msgstr "" +msgstr "Macvtap：虛擬機器直接連接至實體網路" -msgid "" -"Passthrough: Virtual machines are connected using a macvtap connection in " -"passthrough mode." -msgstr "" +msgid "Passthrough: Virtual machines are connected using a macvtap connection in passthrough mode." +msgstr "透通：在透通模式下，使用 macvtap 連線連接虛擬機器。" -msgid "" -"VEPA: special mode where virtual machines are connected to a VEPA-enabled " -"switch" -msgstr "" +msgid "VEPA: special mode where virtual machines are connected to a VEPA-enabled switch" +msgstr "VEPA：特殊模式，虛擬機器在其中連接至支援 VEPA 的交換器" msgid "Bridged: Virtual machines are connected through a network bridge" -msgstr "" +msgstr "橋接：透過網路橋接器來連接虛擬機器" msgid "(No interfaces found)" msgstr "（找不到介面）" @@ -2236,7 +2129,7 @@ msgid "Destination" msgstr "目的地" msgid "Select an Interface" -msgstr "" +msgstr "選取介面" msgid "Enable VLAN" msgstr "啟用 VLAN" @@ -2245,10 +2138,10 @@ msgid "VLAN ID" msgstr "VLAN ID" msgid "Edit Network" -msgstr "" +msgstr "編輯網路" msgid "Address Space" -msgstr "" +msgstr "位址空間" msgid "Define a New Storage Pool" msgstr "定義新的儲存區" @@ -2256,9 +2149,8 @@ msgstr "定義新的儲存區" msgid "Storage Pool Name" msgstr "儲存區名稱" -msgid "" -"The name used to identify the storage pools, and it should not be empty." -msgstr "用來識別儲存區的名稱，不應該是空的。" +msgid "The name used to identify the storage pools, and it should not be empty." +msgstr "該名稱用來識別儲存區，並且不應該是空的。" msgid "Storage Pool Type" msgstr "儲存區類型" @@ -2266,20 +2158,17 @@ msgstr "儲存區類型" msgid "Storage Path" msgstr "儲存體路徑" -msgid "" -"The path of the Storage Pool. Each Storage Pool must have a unique path." -msgstr "儲存區的路徑。每一個儲存區都必須有一個唯一的路徑。" +msgid "The path of the Storage Pool. Each Storage Pool must have a unique path." +msgstr "儲存區的路徑。每一個儲存區都必須具有唯一的路徑。" -msgid "" -"Kimchi will try to create the directory when it does not already exist in " -"your system." -msgstr "Kimchi 將嘗試建立該目錄（當該目錄尚不存在於系統中時）。" +msgid "Kimchi will try to create the directory when it does not already exist in your system." +msgstr "當系統中還不存在目錄時，Kimchi 將嘗試建立該目錄。" msgid "NFS Server IP" msgstr "NFS 伺服器 IP" msgid "NFS server IP or hostname. It can be input or chosen from history." -msgstr "NFS 伺服器 IP 或主機名稱。可以直接輸入，也可以從歷程中選擇。" +msgstr "NFS 伺服器 IP 或主機名稱。可以輸入該 IP 或主機名稱，也可以從歷程中進行選擇。" msgid "NFS Path" msgstr "NFS 路徑" @@ -2288,13 +2177,13 @@ msgid "The NFS exported path on NFS server." msgstr "NFS 伺服器上 NFS 匯出的路徑。" msgid "Create from existing LVM" -msgstr "" +msgstr "從現有 LVM 進行建立" msgid "Create from raw disk" -msgstr "" +msgstr "從原始磁碟進行建立" msgid "Looking for existing lvms ..." -msgstr "" +msgstr "正在尋找現有 LVM ..." msgid "Looking for available partitions ..." msgstr "正在尋找可用的分割區 ..." @@ -2309,7 +2198,7 @@ msgid "Port" msgstr "埠" msgid "iSCSI server IP or hostname. It should not be empty." -msgstr "iSCSI 伺服器 IP 或主機名稱。它不應該是空的。" +msgstr "iSCSI 伺服器 IP 或主機名稱。它不應是空的。" msgid "Target" msgstr "目標" @@ -2345,25 +2234,38 @@ msgid "Choose the file you want to upload." msgstr "選擇要上傳的檔案。" msgid "Resize Volume" -msgstr "" +msgstr "調整磁區的大小" msgid "Size" -msgstr "" +msgstr "大小" msgid "The total space which can be used to store data. The unit is megabytes." -msgstr "" +msgstr "可用於儲存資料的總計空間。單位是 MB。" msgid "Ok" +msgstr "確定" + +msgid "Template Name" +msgstr "範本" + +msgid "" +"The name used to identify the template. If omitted, a name will be " +"automatically chosen." +msgstr "用來識別虛擬機器的名稱。如果省略，則會根據所用的範本選擇名稱。" + +msgid "" +"When selecting more than one Image Template, a name will be automatically " +"chosen for each Image Template selected." msgstr "" msgid "Where is the source media for this template? " -msgstr "" +msgstr "此範本的來源媒體位於何處？" msgid "Image Template" -msgstr "" +msgstr "映像範本" msgid "Netboot Template" -msgstr "" +msgstr "網路開機範本" msgid "File Path:" msgstr "檔案路徑：" @@ -2375,20 +2277,17 @@ msgid "The following ISOs are available:" msgstr "下列 ISO 可用：" msgid "QEMU does not have enough permission to work with this file" -msgstr "" +msgstr "QEMU 沒有足夠的權限，無法使用此檔案" msgid "Search more ISOs" msgstr "搜尋更多 ISO" msgid "Loading..." -msgstr "" +msgstr "載入中..." msgid "Edit Template" msgstr "編輯範本" -msgid "Processor" -msgstr "處理器" - msgid "CDROM" msgstr "CDROM" @@ -2396,7 +2295,7 @@ msgid "Image File" msgstr "映像檔" msgid "Graphics" -msgstr "圖形卡" +msgstr "圖形" msgid "Disk(GB)" msgstr "磁碟 (GB)" @@ -2405,100 +2304,100 @@ msgid "Disk Format" msgstr "磁碟格式" msgid "Add Interface" -msgstr "" +msgstr "新增介面" -msgid "Current CPU Number" -msgstr "" - -msgid "Manually set CPU topology" -msgstr "手動設定 CPU 拓蹼" +msgid "pool" +msgstr "儲存區" -msgid "Cores" -msgstr "核心" +msgid "bridge" +msgstr "橋接器" -msgid "Threads" -msgstr "執行緒" +msgid "vepa" +msgstr "VEPA" msgid "State" -msgstr "" +msgstr "狀態" msgid "Guest Name ID" -msgstr "" +msgstr "客體名稱 ID" msgid "OS Type" -msgstr "" +msgstr "作業系統類型" msgid "VNC" -msgstr "" +msgstr "VNC" msgid "No guests found." -msgstr "" +msgstr "找不到客體。" msgid "Stop" -msgstr "" +msgstr "停止" msgid "Location" -msgstr "" +msgstr "位置" msgid "%Used" -msgstr "" +msgstr "已用百分比" msgid "Allocated" -msgstr "" +msgstr "已配置" msgid "Capacity" -msgstr "" +msgstr "容量" msgid "Disks" -msgstr "" +msgstr "磁碟" msgid "Extending logical pool" -msgstr "" +msgstr "延伸邏輯儲存區" + +msgid "%" +msgstr "%" msgid "Deactivate" -msgstr "" +msgstr "取消啟動" msgid "Activate" -msgstr "" +msgstr "啟動" msgid "Extend" -msgstr "" +msgstr "延伸" msgid "Undefine" -msgstr "" +msgstr "取消定義" msgid "Add Volume" -msgstr "" +msgstr "新增磁區" msgid "Resize" -msgstr "" +msgstr "調整大小" msgid "Wipe" -msgstr "" +msgstr "清除" msgid "Filter:" -msgstr "" +msgstr "過濾：" msgid "Used By" -msgstr "" +msgstr "使用者" msgid "Used" -msgstr "" +msgstr "已用" msgid "Progress" -msgstr "" +msgstr "進度" msgid "Used by the following VMs:" -msgstr "" +msgstr "已由下列 VM 使用：" msgid "Allocation" -msgstr "" +msgstr "配置" msgid "Template Name (ID)" -msgstr "" +msgstr "範本名稱 (ID)" msgid "No templates found." -msgstr "" +msgstr "找不到範本。" msgid "M" -msgstr "" +msgstr "M" -- 2.1.0

3 3

[PATCH v2] [WoK 00/10] '/config/plugins' API implementation
by dhbarboza82＠gmail.com 03 Feb '17

03 Feb '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v2: - added User Log capabilities on /config/plugins/enable|disable actions - added 'enable=' as a valid entry in the parsing of the conf file This patch set implements the '/config/plugins' API. The idea of this API is to replace the current '/plugins' API while adding a new attribute called 'enabled' in its return value, representing the current state of the plug-in. It will also return all the plug-ins, regardless of whether it is loaded or not. New actions /config/plugin/*name*/enable and /config/plugin/*name*/disable were implemented to enable/disable the plug-in *name* by editing the plug-in .conf file. This is the API in action: [danielhb@arthas wok_all_plugins]$ curl -k -u danielhb -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://localhost:8001/config/plugins'Enter host password for user 'danielhb': [ { "enabled":true, "name":"gingerbase" }, { "enabled":true, "name":"kimchi" }, { "enabled":true, "name":"ginger" } ][danielhb@arthas wok_all_plugins]$ [danielhb@arthas wok_all_plugins]$ curl -k -u danielhb -H "Content-Type: application/json" -H "Accept: application/json" -X POST 'https://localhost:8001/config/plugins/ginger/disable' -d'{}' Enter host password for user 'danielhb': { "enabled":false, "name":"ginger" }[danielhb@arthas wok_all_plugins]$ [danielhb@arthas wok_all_plugins]$ curl -k -u danielhb -H "Content-Type: applicationjson" -H "Accept: application/json" -X POST 'https://localhost:8001/config/plugins/ginger/enable' -d'{}' Enter host password for user 'danielhb': { "enabled":true, "name":"ginger" }[danielhb@arthas wok_all_plugins]$ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Daniel Henrique Barboza (10): /config/plugins API: docs changes /config/plugins API: utils changes /config/plugins: changes in config model /config/plugins API: model changes /config/plugins API: test changes Removing old /plugins API /config/plugins: changing existing UI calls /config/plugins: exclude 'sample' plug-in when not in test_mode Removing configobj, use file operations to edit conf files /config/plugins API: user log and parser improvements docs/API/config.md | 31 ++++++++++++++++++++ docs/API/plugins.md | 13 --------- src/wok/control/config.py | 33 +++++++++++++++++++-- src/wok/control/plugins.py | 29 ------------------- src/wok/i18n.py | 4 +++ src/wok/model/plugins.py | 32 +++++++++++++++------ src/wok/server.py | 7 ++++- src/wok/utils.py | 65 ++++++++++++++++++++++++++++++++++++----- tests/test_api.py | 47 +++++++++++++++++++++++++++++- tests/test_utils.py | 72 +++++++++++++++++++++++++++++++++++++++++++++- ui/js/src/wok.api.js | 4 +-- ui/js/src/wok.logos.js | 11 ++++--- ui/js/src/wok.main.js | 12 +++++--- 13 files changed, 288 insertions(+), 72 deletions(-) delete mode 100644 docs/API/plugins.md delete mode 100644 src/wok/control/plugins.py -- 2.7.4

4 29

[RFC] Validating entries at login
by Ramon Medeiros 03 Feb '17

03 Feb '17

Propose: valid strings username and password with API.json Issue: validator is not recognizing method Just saw that src/wok/control/utils.py has a method validate_params, that reads API and validate the output of request_params. I've added this changes to code: diff --git a/src/wok/API.json b/src/wok/API.json index 8965db9..3faa31b 100644 --- a/src/wok/API.json +++ b/src/wok/API.json @@ -2,5 +2,24 @@ "$schema": "http://json-schema.org/draft-03/schema#", "title": "Wok API", "description": "Json schema for Wok API", - "type": "object" + "type": "object", + "properties": { + "login": { + "type": "object", + "properties": { + "username": { + "description": "Username", + "required": true, + "type": "string", + "error": "WOKAUTH0003E" + }, + "password": { + "description": "Password", + "required": true, + "type": "string", + "error": "WOKAUTH0003E" + } + } + } + } } diff --git a/src/wok/root.py b/src/wok/root.py index e4cecae..55e1886 100644 --- a/src/wok/root.py +++ b/src/wok/root.py @@ -32,7 +32,7 @@ from wok.i18n import messages from wok.config import paths as wok_paths from wok.control import sub_nodes from wok.control.base import Resource -from wok.control.utils import parse_request +from wok.control.utils import parse_request, validate_params from wok.exception import MissingParameter, UnauthorizedError from wok.reqlogger import log_request @@ -170,6 +170,8 @@ class WokRoot(Root): try: params = parse_request() + validate_params(params, self, "login") username = params['username'] password = params['password'] except KeyError, item: Debugging the code, i just saw that the action_name passed to validate_params (login) is not found by the validator: /root/WOK/src/wok/control/utils.py(109)validate_params() -> validator.validate(request) (Pdb) s --Call-- > /usr/lib/python2.7/site-packages/jsonschema/validators.py(121)validate() -> def validate(self, *args, **kwargs): (Pdb) n > /usr/lib/python2.7/site-packages/jsonschema/validators.py(122)validate() -> for error in self.iter_errors(*args, **kwargs): (Pdb) s --Call-- > /usr/lib/python2.7/site-packages/jsonschema/validators.py(78)iter_errors() -> def iter_errors(self, instance, _schema=None): (Pdb) n > /usr/lib/python2.7/site-packages/jsonschema/validators.py(79)iter_errors() -> if _schema is None: (Pdb) > /usr/lib/python2.7/site-packages/jsonschema/validators.py(80)iter_errors() -> _schema = self.schema (Pdb) > /usr/lib/python2.7/site-packages/jsonschema/validators.py(82)iter_errors() -> scope = _schema.get(u"id") (Pdb) > /usr/lib/python2.7/site-packages/jsonschema/validators.py(83)iter_errors() -> if scope: (Pdb) print _schema {u'$schema': u'http://json-schema.org/draft-03/schema#', u'type': u'object', u'description': u'Json schema for Wok API', u'properties': {u'wokroot_login': {u'type': u'object', u'properties': {u'username': {u'required': True, u'type': u'string', u'description': u'Username', u'error': u'WOKAUTH0003E'}, u'password': {u'required': True, u'type': u'string', u'description': u'Password', u'error': u'WOKAUTH0003E'}}}}, u'title': u'Wok API'} (Pdb) n > /usr/lib/python2.7/site-packages/jsonschema/validators.py(85)iter_errors() -> try: (Pdb) > /usr/lib/python2.7/site-packages/jsonschema/validators.py(86)iter_errors() -> ref = _schema.get(u"$ref") How i can know the correct one?

2 11

[PATCH] [Kimchi 0/3] Multiple string truncation issue fixed
by rajgupta＠linux.vnet.ibm.com 03 Feb '17

03 Feb '17

From: Rajat Gupta <rajat.triumph(a)gmail.com> Rajat Gupta (3): Fixed for Truncation occurs in edit a guest panel console row Fixed Truncation appeared on Virtualization->add network of Japanese language Fixed truncation for Guest Interface GUI OVS network/interface scroll bar ui/css/src/modules/_edit-guests.scss | 2 +- ui/css/src/modules/_network.scss | 8 ++++++++ ui/js/src/kimchi.guest_edit_main.js | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) -- 2.1.0

3 8

[PATCH V2] [Kimchi] Fix for the kimchi #1102
by jkatta＠linux.vnet.ibm.com 03 Feb '17

03 Feb '17

From: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> Fix given to the kimchi plugin to avoid multiple continuos error message to the log in case of VMs created outside of WoK. Signed-off-by: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> --- model/vms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index 7729af0..e7ed7c2 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1300,7 +1300,7 @@ class VMModel(object): with self.objstore as session: try: - extra_info = session.get('vm', dom.UUIDString()) + extra_info = session.get('vm', dom.UUIDString(), True) except NotFoundError: extra_info = {} icon = extra_info.get('icon') -- 2.7.4

3 2

[PATCH V2] [Wok] Fix to the WoK for the Kimchi issue #1102
by jkatta＠linux.vnet.ibm.com 03 Feb '17

03 Feb '17

From: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> As a fix to the Kimchi issue #1102, some fix needs to be given for the WoK framework as well. Signed-off-by: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> --- src/wok/objectstore.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py index a571e5f..c46aaf0 100644 --- a/src/wok/objectstore.py +++ b/src/wok/objectstore.py @@ -52,7 +52,7 @@ class ObjectStoreSession(object): objects.sort(key=lambda (_, obj): obj[sort_key]) return [ident for ident, _ in objects] - def get(self, obj_type, ident): + def get(self, obj_type, ident, ignore_missing=False): c = self.conn.cursor() res = c.execute('SELECT json FROM objects WHERE type=? AND id=?', (obj_type, ident)) @@ -60,7 +60,10 @@ class ObjectStoreSession(object): jsonstr = res.fetchall()[0][0] except IndexError: self.conn.rollback() - raise NotFoundError("WOKOBJST0001E", {'item': ident}) + data = {"":""} + jsonstr = json.dumps(data) + if not ignore_missing: + raise NotFoundError("WOKOBJST0001E", {'item': ident}) return json.loads(jsonstr) def get_object_version(self, obj_type, ident): -- 2.7.4

3 2

[PATCH v5][Kimchi] Issue# 979 - Change boot order UI
by bianca＠linux.vnet.ibm.com 03 Feb '17

03 Feb '17

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> This patch adds the UI portion for supporting changing the guest boot order via edit guest panel. This was based off of what Samuel had prototyped. Issue found in backend during test: When updating the VM even with just changing the name, the bootorder gets reset to 'hd' only. I tested this using the curl command and confirmed that indeed it does get reset to one entry only. Issue written to address this: https://github.com/kimchi-project/kimchi/issues/1012 Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 61 ++++++++++++++++++++++- ui/css/src/modules/_edit-guests.scss | 60 +++++++++++++++++++++- ui/js/src/kimchi.guest_edit_main.js | 97 +++++++++++++++++++++++++++++++++++- ui/pages/guest-edit.html.tmpl | 26 ++++++++-- 4 files changed, 238 insertions(+), 6 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index fff3279..dec47fa 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1557,6 +1557,65 @@ body.wok-gallery { overflow: visible; } +ul { + cursor: default; +} + +.boot-order { + display: block; + width: 85%; + font-size: 14px; + line-height: 1.42857; + color: #444; + overflow: hidden; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} + +.boot-order:focus, +.boot-order.focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); +} + +.boot-order > li { + cursor: move; + /* fallback if grab cursor is unsupported */ + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; + border-left: 0; + border-right: 0; +} + +.boot-order > li:first-child { + border-top: 0; +} + +.boot-order > li:last-child { + border-bottom: 0; +} + +.boot-order > li.ui-sortable-helper { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; + border: 1px solid #ccc !important; +} + +.boot-order li i { + text-align: right; +} + /* Add Template Modal Window */ .templates-modal .modal-dialog { width: 1100px; diff --git a/ui/css/src/modules/_edit-guests.scss b/ui/css/src/modules/_edit-guests.scss index 25d4d65..c8cc122 100644 --- a/ui/css/src/modules/_edit-guests.scss +++ b/ui/css/src/modules/_edit-guests.scss @@ -1,7 +1,7 @@ // // Project Kimchi // -// Copyright IBM Corp, 2015-2016 +// Copyright IBM Corp, 2015-2017 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -429,3 +429,61 @@ #form-guest-storage-add .form-section .field { overflow: visible; } + +ul { + cursor: default; +} + +.boot-order { + display: block; + width: 85%; + font-size: 14px; + line-height: 1.42857; + color: #444; + overflow: hidden; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} + +.boot-order:focus, +.boot-order.focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); +} + +.boot-order > li { + cursor: move; /* fallback if grab cursor is unsupported */ + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; + border-left: 0; + border-right: 0; +} + +.boot-order > li:first-child { + border-top: 0; +} + +.boot-order > li:last-child { + border-bottom: 0; +} + +.boot-order > li.ui-sortable-helper { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; + border: 1px solid #ccc !important; +} + +.boot-order li i { + text-align: right; +} diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index b47d293..dfb2ca3 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + kimchi.guest_edit_main = function() { var authType; var formTargetId; @@ -26,6 +27,7 @@ kimchi.guest_edit_main = function() { var networkOptions = ""; clearTimeout(kimchi.vmTimeout); + var bootOrderOptions = []; $('#modalWindow').on('hidden.bs.modal', function() { kimchi.setListVMAutoTimeout(); @@ -45,7 +47,6 @@ kimchi.guest_edit_main = function() { var submitForm = function(event) { - // tap map, "general": 0, "storage": 1, "interface": 2, "permission": 3, "password": 4 var submit_map = { 0: generalSubmit, 3: permissionSubmit, @@ -963,6 +964,85 @@ kimchi.guest_edit_main = function() { }); }; + var setupBootOrder = function(guest) { + var guestBootOrder = guest['bootorder']; + var dev = ["cdrom", "hd", "network"]; + var excludedDev = dev.filter(function(e){return this.indexOf(e)<0;},guestBootOrder); + + $('#myList button').prop('disabled', true); + $('#myList').empty(); + $.each(guestBootOrder, function(index, value) { + item = $.parseHTML("<li class='list-group-item' data-value=" + value + "><input type='checkbox' class='wok-checkbox' id='checkbox-" + value + "' value='" + value + "'> <label class='check-all' for='checkbox-" + value + "'>" + value + "</label><button id='button-" + value + "' class='btn btn-link deleteBootOrderElem' style='float:right; margin-top: 3px; padding: 0;'><i class='fa fa-minus-circle'></i> Remove</button></li>"); + $('#myList').append(item); + $('#checkbox-' + value).prop('disabled', true); + $('#checkbox-' + value).prop('checked', true); + $('#button-' + value).prop('disabled', false); + }); + if (excludedDev) { + $.each(excludedDev, function(index, value) { + item = $.parseHTML("<li class='list-group-item' data-value=" + value + "><input type='checkbox' class='wok-checkbox' id='checkbox-" + value + "' value='" + value + "'> <label class='check-all' for='checkbox-" + value + "'>" + value + "</label><button id='button-" + value + "' class='btn btn-link deleteBootOrderElem' style='float:right; margin-top: 3px; padding: 0;'><i class='fa fa-minus-circle'></i> Remove</button></li>"); + $('#myList').append(item); + }); + } + + if (guestBootOrder.length == 1) { + $('#myList button').prop('disabled', true); + } + + $('.boot-order').sortable({ + items: 'li', + cursor: 'move', + opacity: 0.6, + containment: "parent", + start: function(event, ui) { + $(this).addClass('focus'); + }, + stop: function(event, ui) { + $(this).removeClass('focus'); + }, + change: function(event, ui) { + // callback once started changing order + }, + update: function(event, ui) { + // callback once finished order + $(saveButton).prop('disabled', false); + bootOrderOptions = []; + $("#myList li").each(function() { + bootOrderOptions.push($(this).attr("data-value").toLowerCase()) + }); + bootOrderOptions.forEach(function(entry) { + console.log(entry); + }); + var data = { + bootorder: bootOrderOptions + }; + kimchi.updateVM(kimchi.selectedGuest, data, function() { + // wok.window.close(); + }, function(err) { + wok.message.error(err.responseJSON.reason,'#alert-modal-container'); + }); + } + }); + + $(".deleteBootOrderElem").on('click', function(evt) { + evt.preventDefault(); + var item = $(this).parent().attr("data-value").toLowerCase(); + $("#checkbox-" + item).prop('disabled', false); + $("#checkbox-" + item).prop('checked', false); + var index = guestBootOrder.indexOf(item); + if (index !== -1) { + guestBootOrder.splice(index, 1); + } + if (guestBootOrder.length == 1) { + $('#myList button').prop('disabled', true); + } + var data = { + bootorder: guestBootOrder + }; + kimchi.updateVM(kimchi.selectedGuest, data, function() {}); + }); + }; + var initContent = function(guest) { guest['icon'] = guest['icon'] || 'plugins/kimchi/images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); @@ -1028,6 +1108,7 @@ kimchi.guest_edit_main = function() { setupPermission(); setupPCIDevice(); setupSnapshot(); + setupBootOrder(guest); kimchi.init_processor_tab(guest.cpu_info, $(saveButton)); if ((kimchi.thisVMState === "running") || (kimchi.thisVMState === "paused")) { @@ -1051,6 +1132,13 @@ kimchi.guest_edit_main = function() { }; }; + $('#form-guest-edit-general').removeClass('active'); + $('#guest-edit-tabs > .wok-mask').show(); + setTimeout(function() { + $('#form-guest-edit-general').addClass('active'); + $('#guest-edit-tabs > .wok-mask').hide(); + }, 500); + kimchi.retrieveVM(kimchi.selectedGuest, initContent); var generalSubmit = function(event) { @@ -1115,6 +1203,13 @@ kimchi.guest_edit_main = function() { delete changedFields.memory.current; } } + console.log(changedFields); + + checkedValue = []; + $("#myList input:checked").each(function() { + checkedValue.push($(this).attr("value")); + }); + changedFields.bootorder = checkedValue; kimchi.updateVM(kimchi.selectedGuest, changedFields, function() { kimchi.listVmsAuto(); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index d8a482c..d67627a 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ </div> <div class="modal-body"> <span id="alert-modal-container"></span> -<ul class="nav nav-tabs" role="tablist"> + <ul class="nav nav-tabs" role="tablist"> <li role="presentation" class="active"><a href="#form-guest-edit-general" aria-controls="form-guest-edit-general" role="tab" data-id="form-guest-edit-general" data-toggle="tab">$_("General")</a></li> <li role="presentation"><a href="#form-guest-edit-storage" aria-controls="form-guest-edit-storage" role="tab" data-id="form-guest-edit-storage" data-toggle="tab">$_("Storage")</a></li> <li role="presentation"><a href="#form-guest-edit-interface" aria-controls="form-guest-edit-interface" role="tab" data-id="form-guest-edit-interface" data-toggle="tab">$_("Interface")</a></li> @@ -40,6 +40,14 @@ <li role="presentation"><a href="#form-edit-processor" aria-controls="form-edit-processor" role="tab" data-id="form-edit-processor" data-toggle="tab">$_("Processor")</a></li> </ul> <div class="tab-content" id="guest-edit-tabs"> + <div class="wok-mask" role="presentation" class="hidden"> + <div class="wok-mask-loader-container"> + <div class="wok-mask-loading"> + <div class="wok-mask-loading-icon"></div> + <div class="wok-mask-loading-text">$_("Loading")...</div> + </div> + </div> + </div> <form role="tabpanel" class="tab-pane active" id="form-guest-edit-general"> <div class="form-group"> <label for="guest-edit-id-textbox">$_("Name")</label> @@ -68,6 +76,19 @@ <option value="virtio">$_("virtio")</option> </select> </div> + <div class="guest-edit-bootorder tab-pane" id="form-guest-edit-bootorder"> + <div id="bootOrder"> + <label for="guest-edit-boot-order-textbox">Boot Order</label> + <ul id="myList" class="list-group boot-order"> + <li class="list-group-item" data-value="CDROM"><input type="checkbox" id="checkbox-cdrom" value="cdrom"> CD-ROM <button id="button-cdrom" class="btn btn-link deleteBootOrderElem"><i class="fa fa-minus-circle"></i> Remove</button></li> + <li class="list-group-item" data-value="HD"><input type="checkbox" id="checkbox-hd" value="hd"> HD <button id="button-hd" class="btn btn-link deleteBootOrderElem"><i class="fa fa-minus-circle"></i> Remove</button></li> + <li class="list-group-item" data-value="Network"><input type="checkbox" id="checkbox-network" value="network"> Network <button id="button-network" class="btn btn-link deleteBootOrderElem"><i class="fa fa-minus-circle"></i> Remove</button></li> + </ul> + <p class="help-block"> + <i class="fa fa-info-circle"></i> $_("Select which items for boot order and grad them when needed to order them. At least one option must be selected.")</p> + </p> + </div> + </div> </form> <form role="tabpanel" class="tab-pane" id="form-guest-edit-storage"> <div class="btn-group action-area"> @@ -197,7 +218,6 @@ $_("Current CPU must be equal or lower than the Maximum CPU value. If a topology is set, it must be also be a multiple of the 'threads' value.") </p> </div> - <div id="guest-max-processor-panel" class="form-group"> <label for="guest-edit-max-processor-textbox">$_("Max CPU")</label> <p id="settings-readonly-help" class="hidden">$_("Unable to edit maximum CPU or CPU topology when editing a running or paused virtual machine.")</p> -- 2.9.3

2 1

[PATCH] [Wok] Fix to the WoK for the Kimchi issue #1102
by jkatta＠linux.vnet.ibm.com 31 Jan '17

31 Jan '17

From: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> As a fix to the Kimchi issue #1102, some fix needs to be given for the WoK framework as well. Signed-off-by: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> --- src/wok/objectstore.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py index a571e5f..eb49056 100644 --- a/src/wok/objectstore.py +++ b/src/wok/objectstore.py @@ -52,7 +52,7 @@ class ObjectStoreSession(object): objects.sort(key=lambda (_, obj): obj[sort_key]) return [ident for ident, _ in objects] - def get(self, obj_type, ident): + def get(self, obj_type, ident, ignore_missing=True): c = self.conn.cursor() res = c.execute('SELECT json FROM objects WHERE type=? AND id=?', (obj_type, ident)) @@ -60,7 +60,10 @@ class ObjectStoreSession(object): jsonstr = res.fetchall()[0][0] except IndexError: self.conn.rollback() - raise NotFoundError("WOKOBJST0001E", {'item': ident}) + data = {"":""} + jsonstr = json.dumps(data) + if ignore_missing: + raise NotFoundError("WOKOBJST0001E", {'item': ident}) return json.loads(jsonstr) def get_object_version(self, obj_type, ident): -- 2.7.4

4 4

LTS distro support?
by WK 30 Jan '17

30 Jan '17

Greetings. Approximately a year ago we discovered Kimchi and immediately tested it on FC23 since that was one of the distro's supported. The workgroups were very happy with having a browser GUI, and the sysop guys love that they can still work on virsh with the command line along with all their ansible scripts. So last fall we put it into production with U16.4 LTS (kimchi 2.3.0) since that was available at the time and it had newer qemu/libvirt than Cent 7.x We see that currently you moved on to kimchi/wok/ginger with 2.3.1 but the .deb was targeted to U16.10. Fortunately, it install fine on 16.04 but we are little worried that when 17.04 comes out, the compatibility with LTS will go away. What is your distro support strategy? Obviously with migration and the fact that libvirt is relatively stable, bringing up newer hosts is not that hard but it does seem to be a little unecessary and we would prefer to stick with a longer term distro, though swapping out every 2 year (i.e. U18.4 LTS) would certainly be fine. We are agnostic as to Ubuntu/Redhat but in this case Ubuntu had the newer tools and we actually noticed that things like storage migration worked better on Ubuntu 16 vs FC23 because of that. Thank you for your efforts either way. Sincerely WK

3 2

[PATCHi v5][Kimchi] Issue# 979 - Change boot order UI
by bianca＠linux.vnet.ibm.com 30 Jan '17

30 Jan '17

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> This patch adds the UI portion for supporting changing the guest boot order via edit guest panel. This was based off of what Samuel had prototyped. Issue found in backend during test: When updating the VM even with just changing the name, the bootorder gets reset to 'hd' only. I tested this using the curl command and confirmed that indeed it does get reset to one entry only. Issue written to address this: https://github.com/kimchi-project/kimchi/issues/1012 Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 61 ++++++++++++++++++++++- ui/css/src/modules/_edit-guests.scss | 60 +++++++++++++++++++++- ui/js/src/kimchi.guest_edit_main.js | 97 +++++++++++++++++++++++++++++++++++- ui/pages/guest-edit.html.tmpl | 26 ++++++++-- 4 files changed, 238 insertions(+), 6 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index fff3279..dec47fa 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1557,6 +1557,65 @@ body.wok-gallery { overflow: visible; } +ul { + cursor: default; +} + +.boot-order { + display: block; + width: 85%; + font-size: 14px; + line-height: 1.42857; + color: #444; + overflow: hidden; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} + +.boot-order:focus, +.boot-order.focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); +} + +.boot-order > li { + cursor: move; + /* fallback if grab cursor is unsupported */ + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; + border-left: 0; + border-right: 0; +} + +.boot-order > li:first-child { + border-top: 0; +} + +.boot-order > li:last-child { + border-bottom: 0; +} + +.boot-order > li.ui-sortable-helper { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; + border: 1px solid #ccc !important; +} + +.boot-order li i { + text-align: right; +} + /* Add Template Modal Window */ .templates-modal .modal-dialog { width: 1100px; diff --git a/ui/css/src/modules/_edit-guests.scss b/ui/css/src/modules/_edit-guests.scss index 25d4d65..c8cc122 100644 --- a/ui/css/src/modules/_edit-guests.scss +++ b/ui/css/src/modules/_edit-guests.scss @@ -1,7 +1,7 @@ // // Project Kimchi // -// Copyright IBM Corp, 2015-2016 +// Copyright IBM Corp, 2015-2017 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -429,3 +429,61 @@ #form-guest-storage-add .form-section .field { overflow: visible; } + +ul { + cursor: default; +} + +.boot-order { + display: block; + width: 85%; + font-size: 14px; + line-height: 1.42857; + color: #444; + overflow: hidden; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} + +.boot-order:focus, +.boot-order.focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); +} + +.boot-order > li { + cursor: move; /* fallback if grab cursor is unsupported */ + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; + border-left: 0; + border-right: 0; +} + +.boot-order > li:first-child { + border-top: 0; +} + +.boot-order > li:last-child { + border-bottom: 0; +} + +.boot-order > li.ui-sortable-helper { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; + border: 1px solid #ccc !important; +} + +.boot-order li i { + text-align: right; +} diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index b47d293..dfb2ca3 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + kimchi.guest_edit_main = function() { var authType; var formTargetId; @@ -26,6 +27,7 @@ kimchi.guest_edit_main = function() { var networkOptions = ""; clearTimeout(kimchi.vmTimeout); + var bootOrderOptions = []; $('#modalWindow').on('hidden.bs.modal', function() { kimchi.setListVMAutoTimeout(); @@ -45,7 +47,6 @@ kimchi.guest_edit_main = function() { var submitForm = function(event) { - // tap map, "general": 0, "storage": 1, "interface": 2, "permission": 3, "password": 4 var submit_map = { 0: generalSubmit, 3: permissionSubmit, @@ -963,6 +964,85 @@ kimchi.guest_edit_main = function() { }); }; + var setupBootOrder = function(guest) { + var guestBootOrder = guest['bootorder']; + var dev = ["cdrom", "hd", "network"]; + var excludedDev = dev.filter(function(e){return this.indexOf(e)<0;},guestBootOrder); + + $('#myList button').prop('disabled', true); + $('#myList').empty(); + $.each(guestBootOrder, function(index, value) { + item = $.parseHTML("<li class='list-group-item' data-value=" + value + "><input type='checkbox' class='wok-checkbox' id='checkbox-" + value + "' value='" + value + "'> <label class='check-all' for='checkbox-" + value + "'>" + value + "</label><button id='button-" + value + "' class='btn btn-link deleteBootOrderElem' style='float:right; margin-top: 3px; padding: 0;'><i class='fa fa-minus-circle'></i> Remove</button></li>"); + $('#myList').append(item); + $('#checkbox-' + value).prop('disabled', true); + $('#checkbox-' + value).prop('checked', true); + $('#button-' + value).prop('disabled', false); + }); + if (excludedDev) { + $.each(excludedDev, function(index, value) { + item = $.parseHTML("<li class='list-group-item' data-value=" + value + "><input type='checkbox' class='wok-checkbox' id='checkbox-" + value + "' value='" + value + "'> <label class='check-all' for='checkbox-" + value + "'>" + value + "</label><button id='button-" + value + "' class='btn btn-link deleteBootOrderElem' style='float:right; margin-top: 3px; padding: 0;'><i class='fa fa-minus-circle'></i> Remove</button></li>"); + $('#myList').append(item); + }); + } + + if (guestBootOrder.length == 1) { + $('#myList button').prop('disabled', true); + } + + $('.boot-order').sortable({ + items: 'li', + cursor: 'move', + opacity: 0.6, + containment: "parent", + start: function(event, ui) { + $(this).addClass('focus'); + }, + stop: function(event, ui) { + $(this).removeClass('focus'); + }, + change: function(event, ui) { + // callback once started changing order + }, + update: function(event, ui) { + // callback once finished order + $(saveButton).prop('disabled', false); + bootOrderOptions = []; + $("#myList li").each(function() { + bootOrderOptions.push($(this).attr("data-value").toLowerCase()) + }); + bootOrderOptions.forEach(function(entry) { + console.log(entry); + }); + var data = { + bootorder: bootOrderOptions + }; + kimchi.updateVM(kimchi.selectedGuest, data, function() { + // wok.window.close(); + }, function(err) { + wok.message.error(err.responseJSON.reason,'#alert-modal-container'); + }); + } + }); + + $(".deleteBootOrderElem").on('click', function(evt) { + evt.preventDefault(); + var item = $(this).parent().attr("data-value").toLowerCase(); + $("#checkbox-" + item).prop('disabled', false); + $("#checkbox-" + item).prop('checked', false); + var index = guestBootOrder.indexOf(item); + if (index !== -1) { + guestBootOrder.splice(index, 1); + } + if (guestBootOrder.length == 1) { + $('#myList button').prop('disabled', true); + } + var data = { + bootorder: guestBootOrder + }; + kimchi.updateVM(kimchi.selectedGuest, data, function() {}); + }); + }; + var initContent = function(guest) { guest['icon'] = guest['icon'] || 'plugins/kimchi/images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); @@ -1028,6 +1108,7 @@ kimchi.guest_edit_main = function() { setupPermission(); setupPCIDevice(); setupSnapshot(); + setupBootOrder(guest); kimchi.init_processor_tab(guest.cpu_info, $(saveButton)); if ((kimchi.thisVMState === "running") || (kimchi.thisVMState === "paused")) { @@ -1051,6 +1132,13 @@ kimchi.guest_edit_main = function() { }; }; + $('#form-guest-edit-general').removeClass('active'); + $('#guest-edit-tabs > .wok-mask').show(); + setTimeout(function() { + $('#form-guest-edit-general').addClass('active'); + $('#guest-edit-tabs > .wok-mask').hide(); + }, 500); + kimchi.retrieveVM(kimchi.selectedGuest, initContent); var generalSubmit = function(event) { @@ -1115,6 +1203,13 @@ kimchi.guest_edit_main = function() { delete changedFields.memory.current; } } + console.log(changedFields); + + checkedValue = []; + $("#myList input:checked").each(function() { + checkedValue.push($(this).attr("value")); + }); + changedFields.bootorder = checkedValue; kimchi.updateVM(kimchi.selectedGuest, changedFields, function() { kimchi.listVmsAuto(); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index d8a482c..d67627a 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ </div> <div class="modal-body"> <span id="alert-modal-container"></span> -<ul class="nav nav-tabs" role="tablist"> + <ul class="nav nav-tabs" role="tablist"> <li role="presentation" class="active"><a href="#form-guest-edit-general" aria-controls="form-guest-edit-general" role="tab" data-id="form-guest-edit-general" data-toggle="tab">$_("General")</a></li> <li role="presentation"><a href="#form-guest-edit-storage" aria-controls="form-guest-edit-storage" role="tab" data-id="form-guest-edit-storage" data-toggle="tab">$_("Storage")</a></li> <li role="presentation"><a href="#form-guest-edit-interface" aria-controls="form-guest-edit-interface" role="tab" data-id="form-guest-edit-interface" data-toggle="tab">$_("Interface")</a></li> @@ -40,6 +40,14 @@ <li role="presentation"><a href="#form-edit-processor" aria-controls="form-edit-processor" role="tab" data-id="form-edit-processor" data-toggle="tab">$_("Processor")</a></li> </ul> <div class="tab-content" id="guest-edit-tabs"> + <div class="wok-mask" role="presentation" class="hidden"> + <div class="wok-mask-loader-container"> + <div class="wok-mask-loading"> + <div class="wok-mask-loading-icon"></div> + <div class="wok-mask-loading-text">$_("Loading")...</div> + </div> + </div> + </div> <form role="tabpanel" class="tab-pane active" id="form-guest-edit-general"> <div class="form-group"> <label for="guest-edit-id-textbox">$_("Name")</label> @@ -68,6 +76,19 @@ <option value="virtio">$_("virtio")</option> </select> </div> + <div class="guest-edit-bootorder tab-pane" id="form-guest-edit-bootorder"> + <div id="bootOrder"> + <label for="guest-edit-boot-order-textbox">Boot Order</label> + <ul id="myList" class="list-group boot-order"> + <li class="list-group-item" data-value="CDROM"><input type="checkbox" id="checkbox-cdrom" value="cdrom"> CD-ROM <button id="button-cdrom" class="btn btn-link deleteBootOrderElem"><i class="fa fa-minus-circle"></i> Remove</button></li> + <li class="list-group-item" data-value="HD"><input type="checkbox" id="checkbox-hd" value="hd"> HD <button id="button-hd" class="btn btn-link deleteBootOrderElem"><i class="fa fa-minus-circle"></i> Remove</button></li> + <li class="list-group-item" data-value="Network"><input type="checkbox" id="checkbox-network" value="network"> Network <button id="button-network" class="btn btn-link deleteBootOrderElem"><i class="fa fa-minus-circle"></i> Remove</button></li> + </ul> + <p class="help-block"> + <i class="fa fa-info-circle"></i> $_("Select which items for boot order and grad them when needed to order them. At least one option must be selected.")</p> + </p> + </div> + </div> </form> <form role="tabpanel" class="tab-pane" id="form-guest-edit-storage"> <div class="btn-group action-area"> @@ -197,7 +218,6 @@ $_("Current CPU must be equal or lower than the Maximum CPU value. If a topology is set, it must be also be a multiple of the 'threads' value.") </p> </div> - <div id="guest-max-processor-panel" class="form-group"> <label for="guest-edit-max-processor-textbox">$_("Max CPU")</label> <p id="settings-readonly-help" class="hidden">$_("Unable to edit maximum CPU or CPU topology when editing a running or paused virtual machine.")</p> -- 2.9.3

1 0

trouble while executing make check
by Rohan Gupta 30 Jan '17

30 Jan '17

hello sir, hope this is the right place to ask queries, i tried to install kimchi on centos 7 and when i run make check-local, i ran into a error. # make check-local contrib/check_i18n.py ./i18n.py Checking for invalid i18n string... Checking for invalid i18n string successfully /bin/pep8 --version 1.4.6 /bin/pep8 --filename '*.py,*.py.in' --exclude="*config.py,*i18n.py,*tests/test_config.py" . ./model/vms.py:1376:24: E127 continuation line over-indented for visual indent make: *** [check-local] Error 1 will i get a possible solution for this. thank you Rohan Raj Gupta

2 1

[PATCH V2] [Kimchi 0/3] Multiple string truncation issue fixed
by rajgupta＠linux.vnet.ibm.com 30 Jan '17

30 Jan '17

From: Rajat Gupta <rajat.triumph(a)gmail.com> Rajat Gupta (3): Fixed for Truncation occurs in edit a guest panel console row Fixed Truncation appeared on Virtualization->add network of Japanese language Fixed truncation for Guest Interface GUI OVS network/interface scroll bar ui/css/kimchi.css | 6 +++++- ui/css/src/modules/_edit-guests.scss | 2 +- ui/css/src/modules/_network.scss | 8 ++++++++ ui/js/src/kimchi.guest_edit_main.js | 4 +++- 4 files changed, 17 insertions(+), 3 deletions(-) -- 2.1.0

2 4

[PATCH] [Kimchi] Bug fix #1096 - Prevent mass detach based on source PCI address
by dhbarboza82＠gmail.com 30 Jan '17

30 Jan '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> Before this commit, Kimchi was mass detaching PCI devices when trying to detach a single dev 'hostdev0' following this criteria: - using the source address element, see all hostdevs that share the same PCI address (domain x bus x slot) as 'hostdev0'; - if more than one is found, 'hostdev0' is considered to be a multifunction device an a mass detachment of all devices found is made. This logic is flawed when considering SR-IOV devices (CX4 cards for example). Although all virtual functions share the same source PCI address, each VF should be attached and detached individually. Following the current libvirt documentation (https://libvirt.org/formatdomain.html) there is an attribute called 'multifunction' that can be used: 'Also available is the multifunction attribute, which controls turning on the multifunction bit for a particular slot/function in the PCI control register (...) multifunction defaults to 'off', but should be set to 'on' for function 0 of a slot that will have multiple functions used.' Further experimentation showed that, in multifunction devices, the device PCI address differs only in the 'function' attribute, while in the VFs for example they are different. This means that the device address is a better place to look for paired devices instead of using the source PCI address. This patch implements these changes to fix #1096: use the multifunction attribute to determine if a hostdev is multifuction and changed the 'get_devices_same_addr' method to use the device address instead of the source PCI address as comparison. Minor simplications of vmhostdevs.py code were also made, such as use a dict instead of an array of tuples to easily retrieve elements by a key and moved the NotFound verification up in the '_detach_device' method. Unit tests included. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- model/vmhostdevs.py | 112 +++++++++++++++++++++-------------- tests/test_model.py | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 234 insertions(+), 42 deletions(-) diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index 9823537..45939b8 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -635,7 +635,7 @@ class VMHostDevModel(object): wok_log.error('opaque must be valid') return - wok_log.info("Device %s removed successfuly" % alias) + wok_log.info("Device %s removed successfully" % alias) # Re-attach device to host try: dev = conn.get().nodeDeviceLookupByName(alias) @@ -655,8 +655,8 @@ class VMHostDevModel(object): lock = params['lock'] with lock: - pci_devs = [(DeviceModel.deduce_dev_name(e, self.conn), e) - for e in hostdev if e.attrib['type'] == 'pci'] + pci_devs = {DeviceModel.deduce_dev_name(e, self.conn): e + for e in hostdev if e.attrib['type'] == 'pci'} dev_info = self.dev_model.lookup(dev_name) is_3D_device = self.dev_model.is_device_3D_controller(dev_info) @@ -664,9 +664,20 @@ class VMHostDevModel(object): raise InvalidOperation('KCHVMHDEV0006E', {'name': dev_info['name']}) + if not pci_devs.get(dev_name): + msg = WokMessage('KCHVMHDEV0001E', + {'vmid': vmid, 'dev_name': dev_name}) + cb(msg.get_text(), False) + raise NotFoundError('KCHVMHDEV0001E', + {'vmid': vmid, 'dev_name': dev_name}) + + dev_name_elem = pci_devs[dev_name] + # check for multifunction and detach all functions together try: - multi = self._unplug_multifunction_pci(dom, hostdev, dev_name) + multi = self.unplug_multifunction_pci( + dom, hostdev, dev_name_elem + ) except libvirt.libvirtError: multi = False @@ -680,54 +691,71 @@ class VMHostDevModel(object): cb('OK', True) return - # detach each function individually - for e in hostdev: - if DeviceModel.deduce_dev_name(e, self.conn) == dev_name: - xmlstr = etree.tostring(e) - dom.detachDeviceFlags( - xmlstr, get_vm_config_flag(dom, mode='all')) - if e.attrib['type'] == 'pci': - self._delete_affected_pci_devices(dom, dev_name, - pci_devs) - if is_3D_device: - devsmodel = VMHostDevsModel(conn=self.conn) - devsmodel.update_mmio_guest(vmid, False) - break - else: - msg = WokMessage('KCHVMHDEV0001E', - {'vmid': vmid, 'dev_name': dev_name}) - cb(msg.get_text(), False) - raise NotFoundError('KCHVMHDEV0001E', - {'vmid': vmid, 'dev_name': dev_name}) + # detach individually + xmlstr = etree.tostring(dev_name_elem) + dom.detachDeviceFlags( + xmlstr, get_vm_config_flag(dom, mode='all')) + if dev_name_elem.attrib['type'] == 'pci': + self._delete_affected_pci_devices(dom, dev_name, + pci_devs) + if is_3D_device: + devsmodel = VMHostDevsModel(conn=self.conn) + devsmodel.update_mmio_guest(vmid, False) if DOM_STATE_MAP[dom.info()[0]] == "shutoff": cb('OK', True) - def _get_devices_same_addr(self, hostdev, domain, bus, slot): + def get_devices_same_addr(self, hostdevs, device_elem): + def elem_has_valid_address(elem): + if elem.get('type') != 'pci' or \ + elem.address is None or \ + elem.address.get('domain') is None or \ + elem.address.get('bus') is None or \ + elem.address.get('slot') is None: + return False + return True + + if not elem_has_valid_address(device_elem): + return [] + devices = [] - for device in hostdev: - if device.attrib['type'] != 'pci': - continue + device_domain = device_elem.address.get('domain') + device_bus = device_elem.address.get('bus') + device_slot = device_elem.address.get('slot') - address = device.source.address - if int(address.attrib['domain'], 16) != domain or \ - int(address.attrib['bus'], 16) != bus or \ - int(address.attrib['slot'], 16) != slot: + for dev in hostdevs: + + if not elem_has_valid_address(dev): continue - devices.append(etree.tostring(device)) + dev_domain = dev.address.get('domain') + dev_bus = dev.address.get('bus') + dev_slot = dev.address.get('slot') + + if dev_domain == device_domain and dev_bus == device_bus and \ + dev_slot == device_slot: + devices.append(etree.tostring(dev)) return devices - def _unplug_multifunction_pci(self, dom, hostdev, dev_name): - # get all devices attached to the guest in the same domain+bus+slot - # that the one we are going to detach because they must be detached - # together - domain, bus, slot, _ = dev_name.split('_')[1:] - devices = self._get_devices_same_addr(hostdev, - int(domain, 16), - int(bus, 16), - int(slot, 16)) + def is_hostdev_multifunction(self, dev_elem): + if dev_elem.address is None or \ + dev_elem.address.get('multifunction') is None or \ + dev_elem.address.get('function') is None: + + return False + + is_multi = dev_elem.address.get('multifunction') == 'on' and \ + dev_elem.address.get('function') == '0x0' + + return is_multi + + def unplug_multifunction_pci(self, dom, hostdevs, dev_elem): + if not self.is_hostdev_multifunction(dev_elem): + return False + + devices = self.get_devices_same_addr(hostdevs, dev_elem) + if len(devices) <= 1: return False @@ -747,7 +775,7 @@ class VMHostDevModel(object): DevicesModel( conn=self.conn).get_list(_passthrough_affected_by=dev_name)) - for pci_name, e in pci_devs: + for pci_name, e in pci_devs.iteritems(): if pci_name in affected_names: xmlstr = etree.tostring(e) dom.detachDeviceFlags( diff --git a/tests/test_model.py b/tests/test_model.py index 0209e8e..a14cf56 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -34,6 +34,8 @@ import shutil import time import unittest +from lxml import objectify + import tests.utils as utils import wok.objectstore @@ -1783,6 +1785,168 @@ class ModelTests(unittest.TestCase): self.assertTrue( inst.vmhostdevs_have_usb_controller('kimchi-vm1')) + def get_hostdevs_xml(self): + return """\ +<domain type='kvm' id='N'> + <name>vm_name</name> + <devices> + <emulator>/usr/bin/qemu-kvm</emulator> + <hostdev mode='subsystem' type='pci' managed='yes'> + <driver name='vfio'/> + <source> + <address domain='0x0001' bus='0x0d' slot='0x00' function='0x1'/> + </source> + <alias name='hostdev0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' \ +function='0x1'/> + </hostdev> + <hostdev mode='subsystem' type='pci' managed='yes'> + <driver name='vfio'/> + <source> + <address domain='0x0001' bus='0x0d' slot='0x00' function='0x0'/> + </source> + <alias name='hostdev1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' \ +function='0x0' multifunction='on'/> + </hostdev> + <hostdev mode='subsystem' type='pci' managed='yes'> + <driver name='vfio'/> + <source> + <address domain='0x0001' bus='0x0d' slot='0x00' function='0x2'/> + </source> + <alias name='hostdev2'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' \ +function='0x0'/> + </hostdev> + <hostdev mode='subsystem' type='pci' managed='yes'> + <driver name='vfio'/> + <source> + <address domain='0x0001' bus='0x0d' slot='0x00' function='0x4'/> + </source> + <alias name='hostdev3'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' \ +function='0x0'/> + </hostdev> + <hostdev mode='subsystem' type='pci' managed='yes'> + <driver name='vfio'/> + <source> + <address domain='0x0001' bus='0x0d' slot='0x00' function='0x5'/> + </source> + <alias name='hostdev4'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' \ +function='0x0'/> + </hostdev> + </devices> + </domain> +""" + + def get_hostdev_multifunction_xml(self): + return """\ +<hostdev mode='subsystem' type='pci' managed='yes'> + <driver name='vfio'/> + <source> + <address domain='0x0001' bus='0x0d' slot='0x00' function='0x0'/> + </source> + <alias name='hostdev1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0' \ +multifunction='on'/> +</hostdev> +""" + + def get_hostdev_nomultifunction_xml(self): + return """\ +<hostdev mode='subsystem' type='pci' managed='yes'> + <driver name='vfio'/> + <source> + <address domain='0x0001' bus='0x0d' slot='0x00' function='0x5'/> + </source> + <alias name='hostdev4'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> +</hostdev> +""" + + def test_vmhostdev_is_hostdev_multifunction(self): + inst = model.Model(None, objstore_loc=self.tmp_store) + + hostdev_multi_elem = objectify.fromstring( + self.get_hostdev_multifunction_xml() + ) + self.assertTrue( + inst.vmhostdev_is_hostdev_multifunction(hostdev_multi_elem) + ) + + hostdev_nomulti_elem = objectify.fromstring( + self.get_hostdev_nomultifunction_xml() + ) + self.assertFalse( + inst.vmhostdev_is_hostdev_multifunction(hostdev_nomulti_elem) + ) + + def test_vmhostdev_get_devices_same_addr(self): + inst = model.Model(None, objstore_loc=self.tmp_store) + + root = objectify.fromstring(self.get_hostdevs_xml()) + hostdevs = root.devices.hostdev + + hostdev_multi_elem = objectify.fromstring( + self.get_hostdev_multifunction_xml() + ) + + hostdev_same_addr_str = """\ +<hostdev mode="subsystem" type="pci" managed="yes"><driver name="vfio"/>\ +<source><address domain="0x0001" bus="0x0d" slot="0x00" function="0x1"/>\ +</source><alias name="hostdev0"/>\ +<address type="pci" domain="0x0000" bus="0x00" slot="0x05" function="0x1"/>\ +</hostdev>""" + same_addr_devices = [ + ET.tostring(hostdev_multi_elem), hostdev_same_addr_str + ] + + self.assertItemsEqual( + same_addr_devices, + inst.vmhostdev_get_devices_same_addr(hostdevs, hostdev_multi_elem) + ) + + nomatch_elem = objectify.fromstring( + self.get_hostdev_nomultifunction_xml() + ) + + self.assertEqual( + inst.vmhostdev_get_devices_same_addr(hostdevs, nomatch_elem), + [ET.tostring(nomatch_elem)] + ) + + @mock.patch('wok.plugins.kimchi.model.vmhostdevs.get_vm_config_flag') + def test_vmhostdev_unplug_multifunction_pci(self, mock_conf_flag): + class FakeDom(): + def detachDeviceFlags(self, xml, config_flag): + pass + + mock_conf_flag.return_value = '' + + inst = model.Model(None, objstore_loc=self.tmp_store) + + root = objectify.fromstring(self.get_hostdevs_xml()) + hostdevs = root.devices.hostdev + + hostdev_multi_elem = objectify.fromstring( + self.get_hostdev_multifunction_xml() + ) + + self.assertTrue( + inst.vmhostdev_unplug_multifunction_pci(FakeDom(), hostdevs, + hostdev_multi_elem) + ) + + nomatch_elem = objectify.fromstring( + self.get_hostdev_nomultifunction_xml() + ) + + self.assertFalse( + inst.vmhostdev_unplug_multifunction_pci(FakeDom(), hostdevs, + nomatch_elem) + ) + class BaseModelTests(unittest.TestCase): class FoosModel(object): -- 2.7.4

4 4

[PATCH v2] [Kimchi] PCI detach enhancements
by dhbarboza82＠gmail.com 30 Jan '17

30 Jan '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v2: - removed error msg redundancy - skip the reattach process if the device was in managed mode Daniel Henrique Barboza (1): Bug fix #1096 - Prevent mass detach based on source PCI address model/vmhostdevs.py | 134 ++++++++++++++++++++++++++---------------- tests/test_model.py | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 249 insertions(+), 49 deletions(-) -- 2.7.4

2 2

[PATCH V2] [Wok 0/2] Remove dhparams generation from build
by Lucio Correia 30 Jan '17

30 Jan '17

This patch moves dhparams.pem file generation to package post-install and server initialization when running on development mode (i.e. running from source) It also fix an issue on nginx configure reloading. If nginx was not up and running, reload command failed, causing tests to break or forcing user to restart nginx manually. V2: - Review comments - Updated copyright Lucio Correia (2): Generate dhparams in post-install and development mode Make sure nginx is running before reloading its config Makefile.am | 2 -- contrib/DEBIAN/control.in | 1 - contrib/DEBIAN/postinst | 16 ++++++++++++++-- contrib/wok.spec.fedora.in | 8 ++++++-- contrib/wok.spec.suse.in | 8 ++++++-- src/Makefile.am | 10 ++-------- src/wok/proxy.py | 23 +++++++++++++++++------ 7 files changed, 45 insertions(+), 23 deletions(-) -- 2.7.4

2 3

[Wok][RFC] Option to specific logging levels #35
by Ramon Medeiros 30 Jan '17

30 Jan '17

Propose: support different levels of logging on wok Bug: wok is setting logging handlers only, not cherrypy handlers. Issues: After my troubleshooting, just saw that we need to set cherrypy handlers: --- a/src/wok/server.py +++ b/src/wok/server.py @@ -120,6 +120,7 @@ class Server(object): delay=1) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) + cherrypy.log.access_log.setLevel(logLevel) # Add access log file to cherrypy configuration cherrypy.log.access_log.addHandler(h) @@ -128,6 +129,7 @@ class Server(object): h = SafeWatchedFileHandler(options.error_log, 'a', delay=1) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) + cherrypy.log.error_log.setLevel(logLevel) # Add error log file to cherrypy configuration cherrypy.log.error_log.addHandler(h) When testing, got this output: Running with loglevel == debug command-line ./src/wokd: No output access_log: lot of output, info output and commands results error_log: debug info ------------------------ Running with loglevel == info command-line ./src/wokd: No output access_log: lot of output, info output error_log: info -------------------------------- Running with loglevel == error command-line ./src/wokd: Info output (no expected) access_log: just calls to the urls error_log: only error The last one was not expected :( -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

2 3

[PATCH v3] [Wok] Bug fix #147: Block authentication request after too many failures
by ramonn＠linux.vnet.ibm.com 30 Jan '17

30 Jan '17

From: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> To prevent brute force attack, creates a mechanism to allow 3 tries first. After that, a timeout will start and will be added 30 seconds for each failed try in a row. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v3: Improve error handling on login page v2: Set timeout by user, ip and session id. This will avoid trouble with users using the same ip, like NAT. src/wok/i18n.py | 2 ++ src/wok/root.py | 66 ++++++++++++++++++++++++++++++++++++++++++++---- ui/js/src/wok.login.js | 21 +++++++++------ ui/pages/i18n.json.tmpl | 5 +++- ui/pages/login.html.tmpl | 6 ++--- 5 files changed, 82 insertions(+), 18 deletions(-) diff --git a/src/wok/i18n.py b/src/wok/i18n.py index e454e31..7d595b8 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -41,7 +41,9 @@ messages = { "WOKAUTH0001E": _("Authentication failed for user '%(username)s'. [Error code: %(code)s]"), "WOKAUTH0002E": _("You are not authorized to access Wok. Please, login first."), "WOKAUTH0003E": _("Specify %(item)s to login into Wok."), + "WOKAUTH0004E": _("You have failed to login in too much attempts. Please, wait for %(seconds)s seconds to try again."), "WOKAUTH0005E": _("Invalid LDAP configuration: %(item)s : %(value)s"), + "WOKAUTH0006E": _("The username or password you entered is incorrect. Please try again."), "WOKLOG0001E": _("Invalid filter parameter. Filter parameters allowed: %(filters)s"), "WOKLOG0002E": _("Creation of log file failed: %(err)s"), diff --git a/src/wok/root.py b/src/wok/root.py index 080b7f0..d314d25 100644 --- a/src/wok/root.py +++ b/src/wok/root.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -21,7 +21,9 @@ import cherrypy import json +import re import os +import time from distutils.version import LooseVersion from wok import auth @@ -31,7 +33,7 @@ from wok.config import paths as wok_paths from wok.control import sub_nodes from wok.control.base import Resource from wok.control.utils import parse_request -from wok.exception import MissingParameter +from wok.exception import MissingParameter, UnauthorizedError from wok.reqlogger import log_request @@ -48,7 +50,8 @@ class Root(Resource): super(Root, self).__init__(model) self._handled_error = ['error_page.400', 'error_page.404', 'error_page.405', 'error_page.406', - 'error_page.415', 'error_page.500'] + 'error_page.415', 'error_page.500', + 'error_page.403', 'error_page.401'] if not dev_env: self._cp_config = dict([(key, self.error_production_handler) @@ -146,6 +149,7 @@ class WokRoot(Root): self.domain = 'wok' self.messages = messages self.extends = None + self.failed_logins = {} # set user log messages and make sure all parameters are present self.log_map = ROOT_REQUESTS @@ -153,6 +157,13 @@ class WokRoot(Root): @cherrypy.expose def login(self, *args): + def _raise_timeout(user_id): + length = self.failed_logins[user_ip_sid]["count"] + timeout = (length - 3) * 30 + details = e = UnauthorizedError("WOKAUTH0004E", + {"seconds": timeout}) + log_request(code, params, details, method, 403) + raise cherrypy.HTTPError(403, e.message) details = None method = 'POST' code = self.getRequestMessage(method, 'login') @@ -161,17 +172,62 @@ class WokRoot(Root): params = parse_request() username = params['username'] password = params['password'] + + # no data passed: raise error + if len(username + password) == 0: + raise KeyError + except KeyError, item: details = e = MissingParameter('WOKAUTH0003E', {'item': str(item)}) log_request(code, params, details, method, 400) raise cherrypy.HTTPError(400, e.message) + # get authentication info + remote_ip = cherrypy.request.remote.ip + session_id = str(cherrypy.session.originalid) + user_ip_sid = re.escape(username + remote_ip + session_id) + + # check for repetly + count = self.failed_logins.get(user_ip_sid, {"count": 0}).get("count") + if count >= 3: + + # verify if timeout is still valid + last_try = self.failed_logins[user_ip_sid]["time"] + if time.time() < (last_try + ((count - 3) * 30)): + _raise_timeout(user_ip_sid) + try: status = 200 user_info = auth.login(username, password) + + # user logged sucessfuly: reset counters + if self.failed_logins.get(user_ip_sid) != None: + self.failed_logins.remove(user_ip_sid) except cherrypy.HTTPError, e: - status = e.status - raise + + # store time and prevent too much tries + if self.failed_logins.get(user_ip_sid) == None: + self.failed_logins[user_ip_sid] = {"time": time.time(), + "ip": remote_ip, + "session_id": session_id, + "username": username, + "count": 1} + else: + + # tries take more than 30 seconds between each one: do not + # increase count + if (time.time() - + self.failed_logins[user_ip_sid]["time"]) < 30: + + self.failed_logins[user_ip_sid]["time"] = time.time() + self.failed_logins[user_ip_sid]["count"] += 1 + + # more than 3 fails: raise error + if self.failed_logins[user_ip_sid]["count"] > 3: + _raise_timeout(user_ip_sid) + + details = e = MissingParameter('WOKAUTH0006E') + raise cherrypy.HTTPError(401, e.message) finally: log_request(code, params, details, method, status) diff --git a/ui/js/src/wok.login.js b/ui/js/src/wok.login.js index fa2a98a..d9daacf 100644 --- a/ui/js/src/wok.login.js +++ b/ui/js/src/wok.login.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Code derived from Project Kimchi * @@ -19,6 +19,10 @@ */ wok.login_main = function() { "use strict"; + var i18n; + wok.getI18n(function(i18nObj){ + i18n = i18nObj; + }, false, "i18n.json", true); // verify if language is available var selectedLanguage = wok.lang.get(); @@ -50,7 +54,8 @@ wok.login_main = function() { var query = window.location.search; var error = /.*error=(.*?)(&|$)/g.exec(query); if (error && error[1] === "sessionTimeout") { - $("#messSession").show(); + $("#errorArea").html(i18n["WOKAUT0001E"]); + $("#errorArea").show(); } var userNameBox = $('#username'); @@ -82,13 +87,13 @@ wok.login_main = function() { window.location.replace(window.location.pathname.replace(/\/+login.html/, '') + next_url); }, function(jqXHR, textStatus, errorThrown) { if (jqXHR.responseText == "") { - $("#messUserPass").hide(); - $("#missServer").show(); - } else { - $("#missServer").hide(); - $("#messUserPass").show(); + $("#errorArea").html(i18n["WOKAUT0002E"]); + $("#errorArea").show(); + } else if ((jqXHR.responseJSON != undefined) && + ! (jqXHR.responseJSON["reason"] == undefined)) { + $("#errorArea").html(jqXHR.responseJSON["reason"]); + $("#errorArea").show(); } - $("#messSession").hide(); $("#logging").hide(); $("#login").show(); }); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index ba29532..4329ad0 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -1,7 +1,7 @@ #* * Project Wok * - * Copyright IBM Corp, 2014-2016 + * Copyright IBM Corp, 2014-2017 * * Code derived from Project Kimchi * @@ -39,6 +39,9 @@ "WOKHOST6001M": "$_("Max:")", + "WOKAUT0001E": "$_("Session timeout, please re-login.")", + "WOKAUT0002E": "$_("Server unreachable")", + "WOKSETT0001M": "$_("Application")", "WOKSETT0002M": "$_("User")", "WOKSETT0003M": "$_("Request")", diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index f5a4b2d..6f967cf 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -1,7 +1,7 @@ #* * Project Wok * - * Copyright IBM Corp, 2014-2016 + * Copyright IBM Corp, 2014-2017 * * Code derived from Project Kimchi * @@ -104,9 +104,7 @@ <div class="container"> <div id="login-window" class="login-area row"> <div class="err-area"> - <div id="messUserPass" class="alert alert-danger" style="display: none;">$_("The username or password you entered is incorrect. Please try again.")</div> - <div id="messSession" class="alert alert-danger" style="display: none;">$_("Session timeout, please re-login.")</div> - <div id="missServer" class="alert alert-danger" style="display: none;">$_("Server unreachable.")</div> + <div id="errorArea" class="alert alert-danger" style="display: none;"></div> </div> <form id="form-login" class="form-horizontal" method="post"> <div class="form-group"> -- 2.10.1 (Apple Git-78)

3 4

[PATCH] [Kimchi] Fix for the kimchi #1102
by jkatta＠linux.vnet.ibm.com 30 Jan '17

30 Jan '17

From: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> Fix given to the kimchi plugin to avoid multiple continuos error message to the log in case of VMs created outside of WoK. Signed-off-by: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> --- model/vms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index 7729af0..895acd3 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1300,7 +1300,7 @@ class VMModel(object): with self.objstore as session: try: - extra_info = session.get('vm', dom.UUIDString()) + extra_info = session.get('vm', dom.UUIDString(), False) except NotFoundError: extra_info = {} icon = extra_info.get('icon') -- 2.7.4

2 1

[PATCH] [Kimchi] Fix for the kimchi #1102
by jkatta＠linux.vnet.ibm.com 30 Jan '17

30 Jan '17

From: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> Fix given to the kimchi plugin to avoid multiple continuos error message to the log in case of VMs created outside of WoK. Signed-off-by: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> --- model/vms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index 7729af0..895acd3 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1300,7 +1300,7 @@ class VMModel(object): with self.objstore as session: try: - extra_info = session.get('vm', dom.UUIDString()) + extra_info = session.get('vm', dom.UUIDString(), False) except NotFoundError: extra_info = {} icon = extra_info.get('icon') -- 2.7.4

1 0

[PATCH] [Wok] Fix to the WoK for the Kimchi issue #1102
by jkatta＠linux.vnet.ibm.com 30 Jan '17

30 Jan '17

From: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> As a fix to the Kimchi issue #1102, some fix needs to be given for the WoK framework as well. Signed-off-by: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> --- src/wok/objectstore.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py index a571e5f..eb49056 100644 --- a/src/wok/objectstore.py +++ b/src/wok/objectstore.py @@ -52,7 +52,7 @@ class ObjectStoreSession(object): objects.sort(key=lambda (_, obj): obj[sort_key]) return [ident for ident, _ in objects] - def get(self, obj_type, ident): + def get(self, obj_type, ident, ignore_missing=True): c = self.conn.cursor() res = c.execute('SELECT json FROM objects WHERE type=? AND id=?', (obj_type, ident)) @@ -60,7 +60,10 @@ class ObjectStoreSession(object): jsonstr = res.fetchall()[0][0] except IndexError: self.conn.rollback() - raise NotFoundError("WOKOBJST0001E", {'item': ident}) + data = {"":""} + jsonstr = json.dumps(data) + if ignore_missing: + raise NotFoundError("WOKOBJST0001E", {'item': ident}) return json.loads(jsonstr) def get_object_version(self, obj_type, ident): -- 2.7.4

1 0

[PATCH] [Kimchi] Remove role_key parameter
by Aline Manera 25 Jan '17

25 Jan '17

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- control/cpuinfo.py | 3 +-- control/groups.py | 3 +-- control/host.py | 7 +------ control/interfaces.py | 4 +--- control/networks.py | 4 +--- control/peers.py | 3 +-- control/storagepools.py | 4 +--- control/storageservers.py | 5 +---- control/templates.py | 4 +--- control/users.py | 3 +-- control/vms.py | 6 +----- 11 files changed, 11 insertions(+), 35 deletions(-) diff --git a/control/cpuinfo.py b/control/cpuinfo.py index f795b3f..322ff8f 100644 --- a/control/cpuinfo.py +++ b/control/cpuinfo.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -25,7 +25,6 @@ class CPUInfo(Resource): def __init__(self, model): super(CPUInfo, self).__init__(model) self.admin_methods = ['GET'] - self.role_key = 'host' self.uri_fmt = "/host/cpuinfo" @property diff --git a/control/groups.py b/control/groups.py index 8c5c4c6..1e037bd 100644 --- a/control/groups.py +++ b/control/groups.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -25,4 +25,3 @@ from wok.control.utils import UrlSubNode class Groups(SimpleCollection): def __init__(self, model): super(Groups, self).__init__(model) - self.role_key = 'guests' diff --git a/control/host.py b/control/host.py index 6d52bc1..b1204fe 100644 --- a/control/host.py +++ b/control/host.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -30,7 +30,6 @@ from wok.plugins.kimchi.utils import is_s390x class Host(Resource): def __init__(self, model, id=None): super(Host, self).__init__(model, id) - self.role_key = 'host' self.admin_methods = ['GET', 'POST'] self.uri_fmt = '/host/%s' self.devices = Devices(self.model) @@ -46,7 +45,6 @@ class Host(Resource): class VolumeGroups(Collection): def __init__(self, model): super(VolumeGroups, self).__init__(model) - self.role_key = 'host' self.uri_fmt = "/host/vgs" self.admin_methods = ['GET'] self.resource = VolumeGroup @@ -55,7 +53,6 @@ class VolumeGroups(Collection): class VolumeGroup(Resource): def __init__(self, model, id=None): super(VolumeGroup, self).__init__(model, id) - self.role_key = 'host' self.uri_fmt = "/host/vgs/%s" self.admin_methods = ['GET'] @@ -89,7 +86,6 @@ class Device(Resource): class Partitions(Collection): def __init__(self, model): super(Partitions, self).__init__(model) - self.role_key = 'storage' self.admin_methods = ['GET'] self.resource = Partition @@ -112,7 +108,6 @@ class Partitions(Collection): class Partition(Resource): def __init__(self, model, id): - self.role_key = 'storage' self.admin_methods = ['GET'] super(Partition, self).__init__(model, id) diff --git a/control/interfaces.py b/control/interfaces.py index c65839a..7b6127a 100644 --- a/control/interfaces.py +++ b/control/interfaces.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -25,7 +25,6 @@ from wok.control.utils import UrlSubNode class Interfaces(Collection): def __init__(self, model): super(Interfaces, self).__init__(model) - self.role_key = 'network' self.admin_methods = ['GET'] self.resource = Interface @@ -33,7 +32,6 @@ class Interfaces(Collection): class Interface(Resource): def __init__(self, model, ident): super(Interface, self).__init__(model, ident) - self.role_key = 'network' self.admin_methods = ['GET'] self.uri_fmt = "/interfaces/%s" diff --git a/control/networks.py b/control/networks.py index 1b8012e..d743873 100644 --- a/control/networks.py +++ b/control/networks.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -39,7 +39,6 @@ NETWORK_REQUESTS = { class Networks(Collection): def __init__(self, model): super(Networks, self).__init__(model) - self.role_key = 'network' self.admin_methods = ['POST'] self.resource = Network @@ -51,7 +50,6 @@ class Networks(Collection): class Network(Resource): def __init__(self, model, ident): super(Network, self).__init__(model, ident) - self.role_key = 'network' self.admin_methods = ['PUT', 'POST', 'DELETE'] self.uri_fmt = "/networks/%s" self.activate = self.generate_action_handler('activate') diff --git a/control/peers.py b/control/peers.py index c0d83ac..5eaacdd 100644 --- a/control/peers.py +++ b/control/peers.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -25,5 +25,4 @@ from wok.control.utils import UrlSubNode class Peers(SimpleCollection): def __init__(self, model): super(Peers, self).__init__(model) - self.role_key = 'peers' self.admin_methods = ['GET'] diff --git a/control/storagepools.py b/control/storagepools.py index e188aae..26aab7d 100644 --- a/control/storagepools.py +++ b/control/storagepools.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -47,7 +47,6 @@ STORAGEPOOL_REQUESTS = { class StoragePools(Collection): def __init__(self, model): super(StoragePools, self).__init__(model) - self.role_key = 'storage' self.admin_methods = ['POST'] self.resource = StoragePool isos = IsoPool(model) @@ -95,7 +94,6 @@ class StoragePools(Collection): class StoragePool(Resource): def __init__(self, model, ident): super(StoragePool, self).__init__(model, ident) - self.role_key = 'storage' self.admin_methods = ['PUT', 'POST', 'DELETE'] self.uri_fmt = "/storagepools/%s" self.activate = self.generate_action_handler('activate') diff --git a/control/storageservers.py b/control/storageservers.py index 9f9cade..9d18514 100644 --- a/control/storageservers.py +++ b/control/storageservers.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -26,7 +26,6 @@ from wok.control.utils import get_class_name, model_fn, UrlSubNode class StorageServers(Collection): def __init__(self, model): super(StorageServers, self).__init__(model) - self.role_key = 'storage' self.admin_methods = ['GET'] self.resource = StorageServer @@ -34,7 +33,6 @@ class StorageServers(Collection): class StorageServer(Resource): def __init__(self, model, ident): super(StorageServer, self).__init__(model, ident) - self.role_key = 'storage' self.admin_methods = ['GET'] self.storagetargets = StorageTargets(self.model, self.ident.decode("utf-8")) @@ -47,7 +45,6 @@ class StorageServer(Resource): class StorageTargets(Collection): def __init__(self, model, server): super(StorageTargets, self).__init__(model) - self.role_key = 'storage' self.admin_methods = ['GET'] self.server = server self.resource_args = [self.server, ] diff --git a/control/templates.py b/control/templates.py index ca36be3..a5d7dd5 100644 --- a/control/templates.py +++ b/control/templates.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -40,7 +40,6 @@ TEMPLATE_REQUESTS = { class Templates(Collection): def __init__(self, model): super(Templates, self).__init__(model) - self.role_key = 'templates' self.admin_methods = ['GET', 'POST'] self.resource = Template @@ -52,7 +51,6 @@ class Templates(Collection): class Template(Resource): def __init__(self, model, ident): super(Template, self).__init__(model, ident) - self.role_key = 'templates' self.admin_methods = ['PUT', 'POST', 'DELETE'] self.uri_fmt = "/templates/%s" self.clone = self.generate_action_handler('clone') diff --git a/control/users.py b/control/users.py index e551920..c71b621 100644 --- a/control/users.py +++ b/control/users.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -26,7 +26,6 @@ from wok.template import render class Users(SimpleCollection): def __init__(self, model): super(Users, self).__init__(model) - self.role_key = 'guests' def get(self, filter_params): res_list = [] diff --git a/control/vms.py b/control/vms.py index 645cb40..80e48e1 100644 --- a/control/vms.py +++ b/control/vms.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -52,7 +52,6 @@ class VMs(AsyncCollection): def __init__(self, model): super(VMs, self).__init__(model) self.resource = VM - self.role_key = 'guests' self.admin_methods = ['POST'] # set user log messages and make sure all parameters are present @@ -63,7 +62,6 @@ class VMs(AsyncCollection): class VM(Resource): def __init__(self, model, ident): super(VM, self).__init__(model, ident) - self.role_key = 'guests' self.screenshot = VMScreenShot(model, ident) self.virtviewerfile = VMVirtViewerFile(model, ident) self.uri_fmt = '/vms/%s' @@ -98,7 +96,6 @@ class VM(Resource): class VMScreenShot(Resource): def __init__(self, model, ident): super(VMScreenShot, self).__init__(model, ident) - self.role_key = 'guests' def get(self): self.lookup() @@ -109,7 +106,6 @@ class VMScreenShot(Resource): class VMVirtViewerFile(Resource): def __init__(self, model, ident): super(VMVirtViewerFile, self).__init__(model, ident) - self.role_key = 'guests' @property def data(self): -- 2.7.4

2 2

[PATCH] [Wok 0/2] Remove dhparams generation from build
by Lucio Correia 25 Jan '17

25 Jan '17

This patch moves dhparams.pem file generation to package post-install and server initialization when running on development mode (i.e. running from source) It also fix an issue on nginx configure reloading. If nginx was not up and running, reload command failed, causing tests to break or forcing user to restart nginx manually. Lucio Correia (2): Generate dhparams in post-install and development mode Make sure nginx is running before reloading its config Makefile.am | 2 -- contrib/DEBIAN/control.in | 1 - contrib/DEBIAN/postinst | 3 +++ contrib/wok.spec.fedora.in | 4 +++- contrib/wok.spec.suse.in | 4 +++- src/Makefile.am | 8 +------- src/wok/proxy.py | 20 ++++++++++++++++---- 7 files changed, 26 insertions(+), 16 deletions(-) -- 2.7.4

2 4

[PATCH] [Wok] Do not link user role with UI tabs
by Aline Manera 25 Jan '17

25 Jan '17

Thinking about providing more granularity on authorization (ie, grant access to a normal user to create a VM on Kimchi, for example) the user role (sysadmin or normal user) was linked to the UI tabs instead of the API itself It can cause multiple issues, for example: - different plugins with the same tab name (the case of Ginger and Kimchi) will get the authorization settings merged - what about an API in use for different tabs? To avoid those problems, remove the role_key parameter and also do not link UI tabs with user role. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/wok/auth.py | 86 +++++++++++++++++++++++------------------------- src/wok/control/base.py | 16 ++++----- src/wok/control/logs.py | 3 +- src/wok/control/utils.py | 8 ++--- tests/test_server.py | 7 ++-- tests/utils.py | 18 ++++------ ui/js/src/wok.login.js | 4 +-- ui/js/src/wok.main.js | 9 +++-- 8 files changed, 67 insertions(+), 84 deletions(-) diff --git a/src/wok/auth.py b/src/wok/auth.py index 6b1c160..976d729 100644 --- a/src/wok/auth.py +++ b/src/wok/auth.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -35,13 +35,11 @@ import urllib2 from wok import template from wok.config import config from wok.exception import InvalidOperation, OperationFailed -from wok.utils import get_all_tabs, run_command +from wok.utils import run_command USER_NAME = 'username' +USER_ROLE = 'role' USER_GROUPS = 'groups' -USER_ROLES = 'roles' - -tabs = get_all_tabs() def redirect_login(): @@ -60,6 +58,20 @@ def debug(msg): class User(object): + def __init__(self, username): + self.name = username + self.groups = self._get_groups() + # after adding support to change user roles that info should be read + # from a specific objstore and fallback to default only if any entry is + # found + self.role = self._get_role() + + def _get_groups(self): + pass + + def _get_role(self): + pass + @classmethod def get(cls, auth_args): auth_type = auth_args.pop('auth_type') @@ -78,29 +90,23 @@ class PAMUser(User): auth_type = "pam" def __init__(self, username): - self.user = {} - self.user[USER_NAME] = username - self.user[USER_GROUPS] = None - # after adding support to change user roles that info should be read - # from a specific objstore and fallback to default only if any entry is - # found - self.user[USER_ROLES] = dict.fromkeys(tabs, 'user') + super(PAMUser, self).__init__(username) - def get_groups(self): - out, err, rc = run_command(['id', '-Gn', self.user[USER_NAME]]) + def _get_groups(self): + out, err, rc = run_command(['id', '-Gn', self.name]) if rc == 0: - self.user[USER_GROUPS] = out.rstrip().split(" ") + return out.rstrip().split(" ") - return self.user[USER_GROUPS] + return None - def get_roles(self): + def _get_role(self): if self.has_sudo(): # after adding support to change user roles that info should be # read from a specific objstore and fallback to default only if # any entry is found - self.user[USER_ROLES] = dict.fromkeys(tabs, 'admin') + return 'admin' - return self.user[USER_ROLES] + return 'user' def has_sudo(self): result = multiprocessing.Value('i', 0, lock=False) @@ -117,16 +123,16 @@ class PAMUser(User): os.setsid() fcntl.ioctl(slave, termios.TIOCSCTTY, 0) - out, err, exit = run_command(['sudo', '-l', '-U', self.user[USER_NAME], + out, err, exit = run_command(['sudo', '-l', '-U', self.name, 'sudo']) if exit == 0: - debug("User %s is allowed to run sudo" % self.user[USER_NAME]) + debug("User %s is allowed to run sudo" % self.name) # sudo allows a wide range of configurations, such as controlling # which binaries the user can execute with sudo. # For now, we will just check whether the user is allowed to run # any command with sudo. out, err, exit = run_command(['sudo', '-l', '-U', - self.user[USER_NAME]]) + self.name]) for line in out.split('\n'): if line and re.search("(ALL)", line): result.value = True @@ -134,12 +140,9 @@ class PAMUser(User): result.value) return debug("User %s can only run some commands with sudo" % - self.user[USER_NAME]) + self.name) else: - debug("User %s is not allowed to run sudo" % self.user[USER_NAME]) - - def get_user(self): - return self.user + debug("User %s is not allowed to run sudo" % self.name) @staticmethod def authenticate(username, password, service="passwd"): @@ -189,12 +192,7 @@ class LDAPUser(User): auth_type = "ldap" def __init__(self, username): - self.user = {} - self.user[USER_NAME] = username - self.user[USER_GROUPS] = list() - # FIXME: user roles will be changed according roles assignment after - # objstore is integrated - self.user[USER_ROLES] = dict.fromkeys(tabs, 'user') + super(PAMUser, self).__init__(username) @staticmethod def authenticate(username, password): @@ -227,19 +225,16 @@ class LDAPUser(User): arg = {"username": username, "code": e.message} raise OperationFailed("WOKAUTH0001E", arg) - def get_groups(self): - return self.user[USER_GROUPS] + def _get_groups(self): + return None - def get_roles(self): + def _get_role(self): admin_ids = config.get( "authentication", "ldap_admin_id").strip('"').split(',') for admin_id in admin_ids: - if self.user[USER_NAME] == admin_id.strip(): - self.user[USER_ROLES] = dict.fromkeys(tabs, 'admin') - return self.user[USER_ROLES] - - def get_user(self): - return self.user + if self.name == admin_id.strip(): + return 'admin' + return 'user' def from_browser(): @@ -313,11 +308,12 @@ def login(username, password, **kwargs): cherrypy.session.acquire_lock() cherrypy.session.regenerate() cherrypy.session[USER_NAME] = username - cherrypy.session[USER_GROUPS] = user.get_groups() - cherrypy.session[USER_ROLES] = user.get_roles() + cherrypy.session[USER_GROUPS] = user.groups + cherrypy.session[USER_ROLE] = user.role cherrypy.session[template.REFRESH] = time.time() cherrypy.session.release_lock() - return user.get_user() + return {USER_NAME: user.name, USER_GROUPS: user.groups, + USER_ROLE: user.role} def logout(): diff --git a/src/wok/control/base.py b/src/wok/control/base.py index 786ecb7..3070e53 100644 --- a/src/wok/control/base.py +++ b/src/wok/control/base.py @@ -2,7 +2,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -27,7 +27,7 @@ import urllib2 import wok.template from wok.asynctask import save_request_log_id -from wok.auth import USER_GROUPS, USER_NAME, USER_ROLES +from wok.auth import USER_GROUPS, USER_NAME, USER_ROLE from wok.control.utils import get_class_name, internal_redirect, model_fn from wok.control.utils import parse_request, validate_method from wok.control.utils import validate_params @@ -66,7 +66,6 @@ class Resource(object): self.model = model self.ident = ident self.model_args = (ident,) - self.role_key = None self.admin_methods = [] self.log_map = {} self.log_args = { @@ -124,7 +123,7 @@ class Resource(object): status = 500 method = 'POST' - validate_method((method), self.role_key, self.admin_methods) + validate_method((method), self.admin_methods) try: request = parse_request() validate_params(request, self, action_name) @@ -191,8 +190,7 @@ class Resource(object): details = None status = 500 - method = validate_method(('GET', 'DELETE', 'PUT'), - self.role_key, self.admin_methods) + method = validate_method(('GET', 'DELETE', 'PUT'), self.admin_methods) try: self.lookup() @@ -222,7 +220,7 @@ class Resource(object): def is_authorized(self): user_name = cherrypy.session.get(USER_NAME, '') user_groups = cherrypy.session.get(USER_GROUPS, []) - user_role = cherrypy.session.get(USER_ROLES, {}).get(self.role_key) + user_role = cherrypy.session.get(USER_ROLE, None) users = self.data.get("users", None) groups = self.data.get("groups", None) @@ -331,7 +329,6 @@ class Collection(object): self.resource = Resource self.resource_args = [] self.model_args = [] - self.role_key = None self.admin_methods = [] self.log_map = {} self.log_args = {} @@ -432,8 +429,7 @@ class Collection(object): status = 500 params = {} - method = validate_method(('GET', 'POST'), - self.role_key, self.admin_methods) + method = validate_method(('GET', 'POST'), self.admin_methods) try: if method == 'GET': diff --git a/src/wok/control/logs.py b/src/wok/control/logs.py index 4844b89..739270c 100644 --- a/src/wok/control/logs.py +++ b/src/wok/control/logs.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2016 +# Copyright IBM Corp, 2016-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -28,7 +28,6 @@ from wok.control.utils import UrlSubNode class Logs(SimpleCollection): def __init__(self, model): super(Logs, self).__init__(model) - self.role_key = 'logs' self.admin_methods = ['GET'] def get(self, filter_params): diff --git a/src/wok/control/utils.py b/src/wok/control/utils.py index 987dd00..ef7b054 100644 --- a/src/wok/control/utils.py +++ b/src/wok/control/utils.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -24,7 +24,7 @@ import cherrypy import json from jsonschema import Draft3Validator, ValidationError, FormatChecker -from wok.auth import USER_ROLES +from wok.auth import USER_ROLE from wok.exception import InvalidParameter, OperationFailed from wok.utils import import_module, listPathModules @@ -41,12 +41,12 @@ def model_fn(cls, fn_name): return '%s_%s' % (get_class_name(cls), fn_name) -def validate_method(allowed, role_key, admin_methods): +def validate_method(allowed, admin_methods): method = cherrypy.request.method.upper() if method not in allowed: raise cherrypy.HTTPError(405) - user_role = cherrypy.session.get(USER_ROLES, {}).get(role_key) + user_role = cherrypy.session.get(USER_ROLE, None) if user_role and user_role != 'admin' and method in admin_methods: raise cherrypy.HTTPError(403) diff --git a/tests/test_server.py b/tests/test_server.py index 5541a4a..9c12b27 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -224,10 +224,9 @@ class ServerTests(unittest.TestCase): user_info = json.loads(resp.read()) self.assertEquals(sorted(user_info.keys()), - ['groups', 'roles', 'username']) - roles = user_info['roles'] - for tab, role in roles.iteritems(): - self.assertEquals(role, u'admin') + ['groups', 'role', 'username']) + role = user_info['role'] + self.assertEquals(role, u'admin') cookie = resp.getheader('set-cookie') hdrs['Cookie'] = cookie diff --git a/tests/utils.py b/tests/utils.py index f26aeff..739434f 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -34,7 +34,7 @@ import unittest import wok.server -from wok.auth import User, USER_NAME, USER_GROUPS, USER_ROLES, tabs +from wok.auth import User from wok.config import config from wok.exception import NotFoundError, OperationFailed from wok.utils import wok_log @@ -140,21 +140,15 @@ class FakeUser(User): sudo = True def __init__(self, username): - self.user = {} - self.user[USER_NAME] = username - self.user[USER_GROUPS] = None - self.user[USER_ROLES] = dict.fromkeys(tabs, 'user') + super(FakeUser, self).__init__(username) - def get_groups(self): + def _get_groups(self): return sorted([group.gr_name for group in grp.getgrall()])[0:3] - def get_roles(self): + def _get_role(self): if self.sudo: - self.user[USER_ROLES] = dict.fromkeys(tabs, 'admin') - return self.user[USER_ROLES] - - def get_user(self): - return self.user + return 'admin' + return 'user' @staticmethod def authenticate(username, password, service="passwd"): diff --git a/ui/js/src/wok.login.js b/ui/js/src/wok.login.js index fa2a98a..666a339 100644 --- a/ui/js/src/wok.login.js +++ b/ui/js/src/wok.login.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Code derived from Project Kimchi * @@ -78,7 +78,7 @@ wok.login_main = function() { var lastPage = wok.cookie.get('lastPage'); var next_url = lastPage ? lastPage.replace(/\"/g,'') : "/"; } - wok.cookie.set('roles',JSON.stringify(data.roles)); + wok.cookie.set('user_role', data.role); window.location.replace(window.location.pathname.replace(/\/+login.html/, '') + next_url); }, function(jqXHR, textStatus, errorThrown) { if (jqXHR.responseText == "") { diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 658974a..c67e97c 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Code derived from Project Kimchi * @@ -91,12 +91,11 @@ wok.main = function() { var titleKey = tab.find('title').text(); var title = i18n[titleKey] ? i18n[titleKey] : titleKey; var path = tab.find('path').text(); - var roles = wok.cookie.get('roles'); + var user_role = wok.cookie.get('user_role'); var order = tab.find('order').text(); - if (roles) { - var role = JSON.parse(roles)[titleKey.toLowerCase()]; - var mode = tab.find('[role="' + role + '"]').attr('mode'); + if (user_role) { + var mode = tab.find('[role=' + user_role + ']').attr('mode'); wok.tabMode[titleKey.toLowerCase()] = mode; if (mode != 'none') { tabs.push({ -- 2.7.4

2 2

[PATCH v6] [WoK 0/6] 'reload' API implementation
by dhbarboza82＠gmail.com 25 Jan '17

25 Jan '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v6: - added user log messages in /config/reload API v5: - added 'self.admin_methods = ['POST'] in control/config.py v4: - fixed a '()' in test_api.py - changed the positioning of the notification message in i18n.py v3: - 'add_notification' is now being called before the reload command v2: - changed API name to 'reload' - added test_api tests This patch set implements a new WOK API called 'reload' under /config/reload. To test it: $ curl -k -u danielhb -H "Content-Type: application/json" -H "Accept: application/json" -X POST 'https://localhost:8001/config/reload' -d'{}' Enter host password for user 'danielhb': { "proxy_port":"8001", "websockets_port":"64667", "version":"2.3.0-55.git5c9127b", "auth":"pam", "server_root":"" } This will reload WoK and all its plug-ins. Daniel Henrique Barboza (6): reload API: doc changes reload API: control and model changes reload API: new file tests/test_config_model.py reload API: added rest API tests reload API: adding notification before reloading operation reload API: adding user log messages docs/API/config.md | 2 +- src/wok/control/config.py | 13 ++++++++++++- src/wok/i18n.py | 3 +++ src/wok/model/config.py | 22 +++++++++++++++++++++- tests/test_api.py | 9 ++++++++- tests/test_config_model.py | 41 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 tests/test_config_model.py -- 2.7.4

2 7

[PATCH] [Wok] Bug fix #147: Block authentication request after too many failures
by ramonn＠linux.vnet.ibm.com 24 Jan '17

24 Jan '17

From: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> To prevent brute force attack, creates a mechanism to allow 3 tries first. After that, a timeout will start and will be added 30 seconds for each failed try in a row. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/wok/i18n.py | 2 ++ src/wok/root.py | 66 ++++++++++++++++++++++++++++++++++++++++++++---- ui/js/src/wok.login.js | 21 +++++++++------ ui/pages/i18n.json.tmpl | 5 +++- ui/pages/login.html.tmpl | 6 ++--- 5 files changed, 82 insertions(+), 18 deletions(-) diff --git a/src/wok/i18n.py b/src/wok/i18n.py index e454e31..7d595b8 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -41,7 +41,9 @@ messages = { "WOKAUTH0001E": _("Authentication failed for user '%(username)s'. [Error code: %(code)s]"), "WOKAUTH0002E": _("You are not authorized to access Wok. Please, login first."), "WOKAUTH0003E": _("Specify %(item)s to login into Wok."), + "WOKAUTH0004E": _("You have failed to login in too much attempts. Please, wait for %(seconds)s seconds to try again."), "WOKAUTH0005E": _("Invalid LDAP configuration: %(item)s : %(value)s"), + "WOKAUTH0006E": _("The username or password you entered is incorrect. Please try again."), "WOKLOG0001E": _("Invalid filter parameter. Filter parameters allowed: %(filters)s"), "WOKLOG0002E": _("Creation of log file failed: %(err)s"), diff --git a/src/wok/root.py b/src/wok/root.py index 080b7f0..d314d25 100644 --- a/src/wok/root.py +++ b/src/wok/root.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -21,7 +21,9 @@ import cherrypy import json +import re import os +import time from distutils.version import LooseVersion from wok import auth @@ -31,7 +33,7 @@ from wok.config import paths as wok_paths from wok.control import sub_nodes from wok.control.base import Resource from wok.control.utils import parse_request -from wok.exception import MissingParameter +from wok.exception import MissingParameter, UnauthorizedError from wok.reqlogger import log_request @@ -48,7 +50,8 @@ class Root(Resource): super(Root, self).__init__(model) self._handled_error = ['error_page.400', 'error_page.404', 'error_page.405', 'error_page.406', - 'error_page.415', 'error_page.500'] + 'error_page.415', 'error_page.500', + 'error_page.403', 'error_page.401'] if not dev_env: self._cp_config = dict([(key, self.error_production_handler) @@ -146,6 +149,7 @@ class WokRoot(Root): self.domain = 'wok' self.messages = messages self.extends = None + self.failed_logins = {} # set user log messages and make sure all parameters are present self.log_map = ROOT_REQUESTS @@ -153,6 +157,13 @@ class WokRoot(Root): @cherrypy.expose def login(self, *args): + def _raise_timeout(user_id): + length = self.failed_logins[user_ip_sid]["count"] + timeout = (length - 3) * 30 + details = e = UnauthorizedError("WOKAUTH0004E", + {"seconds": timeout}) + log_request(code, params, details, method, 403) + raise cherrypy.HTTPError(403, e.message) details = None method = 'POST' code = self.getRequestMessage(method, 'login') @@ -161,17 +172,62 @@ class WokRoot(Root): params = parse_request() username = params['username'] password = params['password'] + + # no data passed: raise error + if len(username + password) == 0: + raise KeyError + except KeyError, item: details = e = MissingParameter('WOKAUTH0003E', {'item': str(item)}) log_request(code, params, details, method, 400) raise cherrypy.HTTPError(400, e.message) + # get authentication info + remote_ip = cherrypy.request.remote.ip + session_id = str(cherrypy.session.originalid) + user_ip_sid = re.escape(username + remote_ip + session_id) + + # check for repetly + count = self.failed_logins.get(user_ip_sid, {"count": 0}).get("count") + if count >= 3: + + # verify if timeout is still valid + last_try = self.failed_logins[user_ip_sid]["time"] + if time.time() < (last_try + ((count - 3) * 30)): + _raise_timeout(user_ip_sid) + try: status = 200 user_info = auth.login(username, password) + + # user logged sucessfuly: reset counters + if self.failed_logins.get(user_ip_sid) != None: + self.failed_logins.remove(user_ip_sid) except cherrypy.HTTPError, e: - status = e.status - raise + + # store time and prevent too much tries + if self.failed_logins.get(user_ip_sid) == None: + self.failed_logins[user_ip_sid] = {"time": time.time(), + "ip": remote_ip, + "session_id": session_id, + "username": username, + "count": 1} + else: + + # tries take more than 30 seconds between each one: do not + # increase count + if (time.time() - + self.failed_logins[user_ip_sid]["time"]) < 30: + + self.failed_logins[user_ip_sid]["time"] = time.time() + self.failed_logins[user_ip_sid]["count"] += 1 + + # more than 3 fails: raise error + if self.failed_logins[user_ip_sid]["count"] > 3: + _raise_timeout(user_ip_sid) + + details = e = MissingParameter('WOKAUTH0006E') + raise cherrypy.HTTPError(401, e.message) finally: log_request(code, params, details, method, status) diff --git a/ui/js/src/wok.login.js b/ui/js/src/wok.login.js index fa2a98a..d9daacf 100644 --- a/ui/js/src/wok.login.js +++ b/ui/js/src/wok.login.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Code derived from Project Kimchi * @@ -19,6 +19,10 @@ */ wok.login_main = function() { "use strict"; + var i18n; + wok.getI18n(function(i18nObj){ + i18n = i18nObj; + }, false, "i18n.json", true); // verify if language is available var selectedLanguage = wok.lang.get(); @@ -50,7 +54,8 @@ wok.login_main = function() { var query = window.location.search; var error = /.*error=(.*?)(&|$)/g.exec(query); if (error && error[1] === "sessionTimeout") { - $("#messSession").show(); + $("#errorArea").html(i18n["WOKAUT0001E"]); + $("#errorArea").show(); } var userNameBox = $('#username'); @@ -82,13 +87,13 @@ wok.login_main = function() { window.location.replace(window.location.pathname.replace(/\/+login.html/, '') + next_url); }, function(jqXHR, textStatus, errorThrown) { if (jqXHR.responseText == "") { - $("#messUserPass").hide(); - $("#missServer").show(); - } else { - $("#missServer").hide(); - $("#messUserPass").show(); + $("#errorArea").html(i18n["WOKAUT0002E"]); + $("#errorArea").show(); + } else if ((jqXHR.responseJSON != undefined) && + ! (jqXHR.responseJSON["reason"] == undefined)) { + $("#errorArea").html(jqXHR.responseJSON["reason"]); + $("#errorArea").show(); } - $("#messSession").hide(); $("#logging").hide(); $("#login").show(); }); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index ba29532..4329ad0 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -1,7 +1,7 @@ #* * Project Wok * - * Copyright IBM Corp, 2014-2016 + * Copyright IBM Corp, 2014-2017 * * Code derived from Project Kimchi * @@ -39,6 +39,9 @@ "WOKHOST6001M": "$_("Max:")", + "WOKAUT0001E": "$_("Session timeout, please re-login.")", + "WOKAUT0002E": "$_("Server unreachable")", + "WOKSETT0001M": "$_("Application")", "WOKSETT0002M": "$_("User")", "WOKSETT0003M": "$_("Request")", diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index f5a4b2d..6f967cf 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -1,7 +1,7 @@ #* * Project Wok * - * Copyright IBM Corp, 2014-2016 + * Copyright IBM Corp, 2014-2017 * * Code derived from Project Kimchi * @@ -104,9 +104,7 @@ <div class="container"> <div id="login-window" class="login-area row"> <div class="err-area"> - <div id="messUserPass" class="alert alert-danger" style="display: none;">$_("The username or password you entered is incorrect. Please try again.")</div> - <div id="messSession" class="alert alert-danger" style="display: none;">$_("Session timeout, please re-login.")</div> - <div id="missServer" class="alert alert-danger" style="display: none;">$_("Server unreachable.")</div> + <div id="errorArea" class="alert alert-danger" style="display: none;"></div> </div> <form id="form-login" class="form-horizontal" method="post"> <div class="form-group"> -- 2.10.1 (Apple Git-78)

2 1

[PATCH v2][Wok] Bug fix #147: Block authentication request after too many failures
by Ramon Medeiros 24 Jan '17

24 Jan '17

To prevent brute force attack, creates a mechanism to allow 3 tries first. After that, a timeout will start and will be added 30 seconds for each failed try in a row. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: Set timeout by user, ip and session id. This will avoid trouble with users using the same ip, like NAT. Only count as failed login, tries with less than 30 seconds. Does not store all try: store last time try. src/wok/i18n.py | 1 + src/wok/root.py | 57 +++++++++++++++++++++++++++++++++++++++++++++--- ui/js/src/wok.login.js | 10 ++++++++- ui/pages/login.html.tmpl | 3 ++- 4 files changed, 66 insertions(+), 5 deletions(-) diff --git a/src/wok/i18n.py b/src/wok/i18n.py index e454e31..21cc4ea 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -41,6 +41,7 @@ messages = { "WOKAUTH0001E": _("Authentication failed for user '%(username)s'. [Error code: %(code)s]"), "WOKAUTH0002E": _("You are not authorized to access Wok. Please, login first."), "WOKAUTH0003E": _("Specify %(item)s to login into Wok."), + "WOKAUTH0004E": _("You have failed to login in too much attempts. Please, wait for %(seconds)s seconds to try again."), "WOKAUTH0005E": _("Invalid LDAP configuration: %(item)s : %(value)s"), "WOKLOG0001E": _("Invalid filter parameter. Filter parameters allowed: %(filters)s"), diff --git a/src/wok/root.py b/src/wok/root.py index 080b7f0..4cabfdf 100644 --- a/src/wok/root.py +++ b/src/wok/root.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -21,7 +21,9 @@ import cherrypy import json +import re import os +import time from distutils.version import LooseVersion from wok import auth @@ -31,7 +33,7 @@ from wok.config import paths as wok_paths from wok.control import sub_nodes from wok.control.base import Resource from wok.control.utils import parse_request -from wok.exception import MissingParameter +from wok.exception import MissingParameter, UnauthorizedError from wok.reqlogger import log_request @@ -48,7 +50,8 @@ class Root(Resource): super(Root, self).__init__(model) self._handled_error = ['error_page.400', 'error_page.404', 'error_page.405', 'error_page.406', - 'error_page.415', 'error_page.500'] + 'error_page.415', 'error_page.500', + 'error_page.403'] if not dev_env: self._cp_config = dict([(key, self.error_production_handler) @@ -146,6 +149,7 @@ class WokRoot(Root): self.domain = 'wok' self.messages = messages self.extends = None + self.failed_logins = {} # set user log messages and make sure all parameters are present self.log_map = ROOT_REQUESTS @@ -153,6 +157,13 @@ class WokRoot(Root): @cherrypy.expose def login(self, *args): + def _raise_timeout(user_id): + length = self.failed_logins[user_ip_sid]["count"] + timeout = (length - 3) * 30 + details = e = UnauthorizedError("WOKAUTH0004E", + {"seconds": timeout}) + log_request(code, params, details, method, 403) + raise cherrypy.HTTPError(403, e.message) details = None method = 'POST' code = self.getRequestMessage(method, 'login') @@ -166,10 +177,50 @@ class WokRoot(Root): log_request(code, params, details, method, 400) raise cherrypy.HTTPError(400, e.message) + # get authentication info + remote_ip = cherrypy.request.remote.ip + session_id = str(cherrypy.session.originalid) + user_ip_sid = re.escape(username + remote_ip + session_id) + + # check for repetly + count = self.failed_logins.get(user_ip_sid, {"count": 0}).get("count") + if count >= 3: + + # verify if timeout is still valid + last_try = self.failed_logins[user_ip_sid]["time"] + if time.time() < (last_try + ((count - 3) * 30)): + _raise_timeout(user_ip_sid) + try: status = 200 user_info = auth.login(username, password) + + # user logged sucessfuly: reset counters + if self.failed_logins.get(user_ip_sid) != None: + self.failed_logins.remove(user_ip_sid) except cherrypy.HTTPError, e: + + # store time and prevent too much tries + if self.failed_logins.get(user_ip_sid) == None: + self.failed_logins[user_ip_sid] = {"time": time.time(), + "ip": remote_ip, + "session_id": session_id, + "username": username, + "count": 1} + else: + + # tries take more than 30 seconds between each one: do not + # increase count + if (time.time() - + self.failed_logins[user_ip_sid]["time"]) < 30: + + self.failed_logins[user_ip_sid]["time"] = time.time() + self.failed_logins[user_ip_sid]["count"] += 1 + + # more than 3 fails: raise error + if self.failed_logins[user_ip_sid]["count"] > 3: + _raise_timeout(user_ip_sid) + status = e.status raise finally: diff --git a/ui/js/src/wok.login.js b/ui/js/src/wok.login.js index fa2a98a..12c6880 100644 --- a/ui/js/src/wok.login.js +++ b/ui/js/src/wok.login.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Code derived from Project Kimchi * @@ -84,9 +84,17 @@ wok.login_main = function() { if (jqXHR.responseText == "") { $("#messUserPass").hide(); $("#missServer").show(); + $("#timeoutError").hide(); + } else if ((jqXHR.responseJSON != undefined) && + ! (jqXHR.responseJSON["reason"] == undefined)) { + $("#messUserPass").hide(); + $("#missServer").hide(); + $("#timeoutError").html(jqXHR.responseJSON["reason"]); + $("#timeoutError").show(); } else { $("#missServer").hide(); $("#messUserPass").show(); + $("#timeoutError").hide(); } $("#messSession").hide(); $("#logging").hide(); diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index f5a4b2d..d25910c 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -1,7 +1,7 @@ #* * Project Wok * - * Copyright IBM Corp, 2014-2016 + * Copyright IBM Corp, 2014-2017 * * Code derived from Project Kimchi * @@ -107,6 +107,7 @@ <div id="messUserPass" class="alert alert-danger" style="display: none;">$_("The username or password you entered is incorrect. Please try again.")</div> <div id="messSession" class="alert alert-danger" style="display: none;">$_("Session timeout, please re-login.")</div> <div id="missServer" class="alert alert-danger" style="display: none;">$_("Server unreachable.")</div> + <div id="timeoutError" class="alert alert-danger" style="display: none;">$_("Timeout error")</div> </div> <form id="form-login" class="form-horizontal" method="post"> <div class="form-group"> -- 2.7.4

2 1

[PATCH v5] [WoK 0/5] 'reload' API implementation
by dhbarboza82＠gmail.com 24 Jan '17

24 Jan '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v5: - added 'self.admin_methods = ['POST'] in control/config.py v4: - fixed a '()' in test_api.py - changed the positioning of the notification message in i18n.py v3: - 'add_notification' is now being called before the reload command v2: - changed API name to 'reload' - added test_api tests This patch set implements a new WOK API called 'reload' under /config/reload. To test it: $ curl -k -u danielhb -H "Content-Type: application/json" -H "Accept: application/json" -X POST 'https://localhost:8001/config/reload' -d'{}' Enter host password for user 'danielhb': { "proxy_port":"8001", "websockets_port":"64667", "version":"2.3.0-55.git5c9127b", "auth":"pam", "server_root":"" } This will reload WoK and all its plug-ins. Daniel Henrique Barboza (5): reload API: doc changes reload API: control and model changes reload API: new file tests/test_config_model.py reload API: added rest API tests reload API: adding notification before reloading operation docs/API/config.md | 2 +- src/wok/control/config.py | 5 ++++- src/wok/i18n.py | 2 ++ src/wok/model/config.py | 22 +++++++++++++++++++++- tests/test_api.py | 9 ++++++++- tests/test_config_model.py | 41 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 tests/test_config_model.py -- 2.7.4

3 7

[PATCH] [WoK 0/9] '/config/plugins' API implementation
by dhbarboza82＠gmail.com 20 Jan '17

20 Jan '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> This patch set implements the '/config/plugins' API. The idea of this API is to replace the current '/plugins' API while adding a new attribute called 'enabled' in its return value, representing the current state of the plug-in. It will also return all the plug-ins, regardless of whether it is loaded or not. New actions /config/plugin/*name*/enable and /config/plugin/*name*/disable were implemented to enable/disable the plug-in *name* by editing the plug-in .conf file. This is the API in action: [danielhb@arthas wok_all_plugins]$ curl -k -u danielhb -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://localhost:8001/config/plugins'Enter host password for user 'danielhb': [ { "enabled":true, "name":"gingerbase" }, { "enabled":true, "name":"kimchi" }, { "enabled":true, "name":"ginger" } ][danielhb@arthas wok_all_plugins]$ [danielhb@arthas wok_all_plugins]$ curl -k -u danielhb -H "Content-Type: application/json" -H "Accept: application/json" -X POST 'https://localhost:8001/config/plugins/ginger/disable' -d'{}' Enter host password for user 'danielhb': { "enabled":false, "name":"ginger" }[danielhb@arthas wok_all_plugins]$ [danielhb@arthas wok_all_plugins]$ curl -k -u danielhb -H "Content-Type: applicationjson" -H "Accept: application/json" -X POST 'https://localhost:8001/config/plugins/ginger/enable' -d'{}' Enter host password for user 'danielhb': { "enabled":true, "name":"ginger" }[danielhb@arthas wok_all_plugins]$ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Daniel Henrique Barboza (9): /config/plugins API: docs changes /config/plugins API: utils changes /config/plugins: changes in config model /config/plugins API: model changes /config/plugins API: test changes Removing old /plugins API /config/plugins: changing existing UI calls /config/plugins: exclude 'sample' plug-in when not in test_mode Removing configobj, use file operations to edit conf files docs/API/config.md | 31 +++++++++++++++++++++++ docs/API/plugins.md | 13 ---------- src/wok/control/config.py | 24 ++++++++++++++++-- src/wok/control/plugins.py | 29 --------------------- src/wok/i18n.py | 1 + src/wok/model/plugins.py | 32 +++++++++++++++++------ src/wok/server.py | 7 +++++- src/wok/utils.py | 63 ++++++++++++++++++++++++++++++++++++++++------ tests/test_api.py | 47 +++++++++++++++++++++++++++++++++- tests/test_utils.py | 56 ++++++++++++++++++++++++++++++++++++++++- ui/js/src/wok.api.js | 4 +-- ui/js/src/wok.logos.js | 11 +++++--- ui/js/src/wok.main.js | 12 ++++++--- 13 files changed, 258 insertions(+), 72 deletions(-) delete mode 100644 docs/API/plugins.md delete mode 100644 src/wok/control/plugins.py -- 2.7.4

3 12

[PATCH][Kimchi] Bug fix #1029: Unable to create a snapshot on a running guest
by Ramon Medeiros 19 Jan '17

19 Jan '17

Libvirt supports live snapshot. This patch just removes the limitation to run snapshot only on turned off guests Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- i18n.py | 3 +-- model/vmsnapshots.py | 7 ++----- ui/js/src/kimchi.guest_edit_main.js | 3 --- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/i18n.py b/i18n.py index da1391b..c1f27a0 100644 --- a/i18n.py +++ b/i18n.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -343,7 +343,6 @@ messages = { "KCHVMSTOR0020E": _("On s390x arch 'format' must be specified while attaching disk to virtual machine"), "KCHVMSTOR0021E": _("Virtual disk already exists on the system: %(disk_path)s"), - "KCHSNAP0001E": _("Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."), "KCHSNAP0002E": _("Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %(err)s"), "KCHSNAP0003E": _("Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."), "KCHSNAP0004E": _("Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %(err)s"), diff --git a/model/vmsnapshots.py b/model/vmsnapshots.py index 6589306..8c30a53 100644 --- a/model/vmsnapshots.py +++ b/model/vmsnapshots.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -28,7 +28,7 @@ from wok.exception import InvalidOperation, NotFoundError, OperationFailed from wok.xmlutils.utils import xpath_get_text from wok.model.tasks import TaskModel -from wok.plugins.kimchi.model.vms import DOM_STATE_MAP, VMModel +from wok.plugins.kimchi.model.vms import VMModel from wok.plugins.kimchi.model.vmstorages import VMStorageModel, VMStoragesModel @@ -57,9 +57,6 @@ class VMSnapshotsModel(object): """ if params is None: params = {} - vir_dom = VMModel.get_vm(vm_name, self.conn) - if DOM_STATE_MAP[vir_dom.info()[0]] != u'shutoff': - raise InvalidOperation('KCHSNAP0001E', {'vm': vm_name}) # if the VM has a non-CDROM disk with type 'raw', abort. for storage_name in self.vmstorages.get_list(vm_name): diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 1682a58..b47d293 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -961,9 +961,6 @@ kimchi.guest_edit_main = function() { addOngoingItem(task); }); }); - if (kimchi.thisVMState === "running") { - $("button", "#form-guest-edit-snapshot").remove(); - } }; var initContent = function(guest) { -- 2.7.4

2 2

[PATCH v2][Kimchi 0/2] Bug fix #1029: Unable to create a snapshot on a running guest
by Ramon Medeiros 19 Jan '17

19 Jan '17

Changes: v2: Add unit tests Ramon Medeiros (2): Bug fix #1029: Unable to create a snapshot on a running guest Add test to live snapshot i18n.py | 1 - model/vmsnapshots.py | 7 ++----- tests/test_model.py | 6 ++++-- tests/test_rest.py | 19 +++++++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 3 --- 5 files changed, 25 insertions(+), 11 deletions(-) -- 2.7.4

2 3

[PATCH v4] [WoK 0/5] 'reload' API implementation
by dhbarboza82＠gmail.com 19 Jan '17

19 Jan '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v4: - fixed a '()' in test_api.py - changed the positioning of the notification message in i18n.py v3: - 'add_notification' is now being called before the reload command v2: - changed API name to 'reload' - added test_api tests This patch set implements a new WOK API called 'reload' under /config/reload. To test it: $ curl -k -u danielhb -H "Content-Type: application/json" -H "Accept: application/json" -X POST 'https://localhost:8001/config/reload' -d'{}' Enter host password for user 'danielhb': { "proxy_port":"8001", "websockets_port":"64667", "version":"2.3.0-55.git5c9127b", "auth":"pam", "server_root":"" } This will reload WoK and all its plug-ins. Daniel Henrique Barboza (5): reload API: doc changes reload API: control and model changes reload API: new file tests/test_config_model.py reload API: added rest API tests reload API: adding notification before reloading operation docs/API/config.md | 2 +- src/wok/control/config.py | 4 +++- src/wok/i18n.py | 2 ++ src/wok/model/config.py | 22 +++++++++++++++++++++- tests/test_api.py | 9 ++++++++- tests/test_config_model.py | 41 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 tests/test_config_model.py -- 2.7.4

4 8

[PATCH v3] [WoK 0/5] 'reload' API implementation
by dhbarboza82＠gmail.com 19 Jan '17

19 Jan '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v3: - 'add_notification' is now being called before the reload command v2: - changed API name to 'reload' - added test_api tests This patch set implements a new WOK API called 'reload' under /config/reload. To test it: $ curl -k -u danielhb -H "Content-Type: application/json" -H "Accept: application/json" -X POST 'https://localhost:8001/config/reload' -d'{}' Enter host password for user 'danielhb': { "proxy_port":"8001", "websockets_port":"64667", "version":"2.3.0-55.git5c9127b", "auth":"pam", "server_root":"" } This will reload WoK and all its plug-ins. Daniel Henrique Barboza (5): reload API: doc changes reload API: control and model changes reload API: new file tests/test_config_model.py reload API: added rest API tests reload API: adding notification before reloading operation docs/API/config.md | 2 +- src/wok/control/config.py | 4 +++- src/wok/i18n.py | 2 ++ src/wok/model/config.py | 22 +++++++++++++++++++++- tests/test_api.py | 9 ++++++++- tests/test_config_model.py | 41 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 tests/test_config_model.py -- 2.7.4

4 10

[PATCH v3] [Kimchi 0/5] Live migration RDMA support
by dhbarboza82＠gmail.com 19 Jan '17

19 Jan '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v3: - added migrate mockmodel API and test_rest tests v2: - added unit test. This patch set adds Live Migration RDMA support in Kimchi. The backend/frontend will not verify if the network card is RDMA capable before doing the migration. User will have to deal with the libvirt errors in case RDMA is chosen without proper support/setup. Daniel Henrique Barboza (5): Live migration RDMA support: doc changes Live migration RDMA support: model changes Live migration RDMA support: ui changes Live migration RDMA support: test changes Live migration RDMA support: mockmodel changes API.json | 5 ++++ control/vms.py | 5 ++-- docs/API.md | 1 + i18n.py | 3 +- mockmodel.py | 17 ++++++++++- model/vms.py | 18 ++++++++--- tests/test_livemigration.py | 53 ++++++++++++++++++++++++++++++++- tests/test_rest.py | 48 ++++++++++++++++++++++++++++- ui/js/src/kimchi.guest_livemigration.js | 7 +++-- ui/pages/guest-migration.html.tmpl | 6 +++- 10 files changed, 149 insertions(+), 14 deletions(-) -- 2.7.4

2 6

[PATCH][Kimchi] Bug fix #1016: Display current storage volume size on resize dialog
by Ramon Medeiros 19 Jan '17

19 Jan '17

Query storage volume size and show before resize Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storagepool_resize_volume_main.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.storagepool_resize_volume_main.js b/ui/js/src/kimchi.storagepool_resize_volume_main.js index 1f5b4db..6e4ad73 100644 --- a/ui/js/src/kimchi.storagepool_resize_volume_main.js +++ b/ui/js/src/kimchi.storagepool_resize_volume_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM Corp, 2016 + * Copyright IBM Corp, 2016-2017 * * Licensed under the Apache License, Version 2.0 (the 'License'); * you may not use this file except in compliance with the License. @@ -22,6 +22,11 @@ kimchi.sp_resize_volume_main = function() { var size = $('#volume-size'); var form = $('form#form-sp-resize-volume'); + // set storage volume size + kimchi.getStoragePoolVolume(kimchi.selectedSP, kimchi.selectedVolumes[0], function(volume) { + size.val(volume["capacity"] / (1024 * 1024)); + }); + $(addButton).prop('disabled',true); $(size).on('keyup change', function(){ if($(this).val() > 0) { -- 2.7.4

2 1

[PATCH v4] [Kimchi] Issue# 979 - Change boot order UI
by bianca＠linux.vnet.ibm.com 19 Jan '17

19 Jan '17

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> This patch adds the UI portion for supporting changing the guest boot order via edit guest panel. This was based off of what Samuel had prototyped. Issue found in backend during test: When updating the VM even with just changing the name, the bootorder gets reset to 'hd' only. I tested this using the curl command and confirmed that indeed it does get reset to one entry only. Issue written to address this: https://github.com/kimchi-project/kimchi/issues/1012 Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 57 ++++++++++++++- ui/css/src/modules/_edit-guests.scss | 60 +++++++++++++++- ui/js/src/kimchi.guest_edit_main.js | 133 ++++++++++++++++++++++++++++++++++- ui/pages/guest-edit.html.tmpl | 37 ++++++++-- 4 files changed, 280 insertions(+), 7 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index fff3279..16cc161 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1557,6 +1557,61 @@ body.wok-gallery { overflow: visible; } +ul { + cursor: default; +} + +.boot-order { + display: block; + width: 85%; + font-size: 14px; + line-height: 1.42857; + color: #444; + overflow: hidden; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} + +.boot-order:focus, +.boot-order.focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); +} + +.boot-order > li { + cursor: move; + /* fallback if grab cursor is unsupported */ + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; + border-left: 0; + border-right: 0; +} + +.boot-order > li:first-child { + border-top: 0; +} + +.boot-order > li:last-child { + border-bottom: 0; +} + +.boot-order > li.ui-sortable-helper { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; + border: 1px solid #ccc !important; +} + /* Add Template Modal Window */ .templates-modal .modal-dialog { width: 1100px; diff --git a/ui/css/src/modules/_edit-guests.scss b/ui/css/src/modules/_edit-guests.scss index 25d4d65..c8cc122 100644 --- a/ui/css/src/modules/_edit-guests.scss +++ b/ui/css/src/modules/_edit-guests.scss @@ -1,7 +1,7 @@ // // Project Kimchi // -// Copyright IBM Corp, 2015-2016 +// Copyright IBM Corp, 2015-2017 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -429,3 +429,61 @@ #form-guest-storage-add .form-section .field { overflow: visible; } + +ul { + cursor: default; +} + +.boot-order { + display: block; + width: 85%; + font-size: 14px; + line-height: 1.42857; + color: #444; + overflow: hidden; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} + +.boot-order:focus, +.boot-order.focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); +} + +.boot-order > li { + cursor: move; /* fallback if grab cursor is unsupported */ + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; + border-left: 0; + border-right: 0; +} + +.boot-order > li:first-child { + border-top: 0; +} + +.boot-order > li:last-child { + border-bottom: 0; +} + +.boot-order > li.ui-sortable-helper { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; + border: 1px solid #ccc !important; +} + +.boot-order li i { + text-align: right; +} diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 1682a58..2f15729 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + kimchi.guest_edit_main = function() { var authType; var formTargetId; @@ -26,6 +27,7 @@ kimchi.guest_edit_main = function() { var networkOptions = ""; clearTimeout(kimchi.vmTimeout); + var bootOrderOptions = []; $('#modalWindow').on('hidden.bs.modal', function() { kimchi.setListVMAutoTimeout(); @@ -45,7 +47,7 @@ kimchi.guest_edit_main = function() { var submitForm = function(event) { - // tap map, "general": 0, "storage": 1, "interface": 2, "permission": 3, "password": 4 + // tap map, "general": 0, "storage": 1, "interface": 2, "permission": 3, "pci": 4, "snapshot": 5, "processor": 6 var submit_map = { 0: generalSubmit, 3: permissionSubmit, @@ -966,6 +968,113 @@ kimchi.guest_edit_main = function() { } }; + var setupBootOrder = function(guest) { + var guestBootOrder = guest['bootorder']; + $("#myList").empty(); + $.each(guestBootOrder, function(index, value) { + var itemNode = $.parseHTML("<li class='list-group-item' " + "data-value=" + value + ">" + value + "<button class='btn btn-link deleteDev'><i class='fa fa-minus-circle'></i> Remove</button></li>"); + $("#myList").append(itemNode); + }); + + $('.boot-order').sortable({ + items: 'li', + cursor: 'move', + opacity: 0.6, + containment: "parent", + start: function(event, ui) { + $(this).addClass('focus'); + }, + stop: function(event, ui) { + $(this).removeClass('focus'); + }, + change: function(event, ui) { + // callback once started changing order + }, + update: function(event, ui) { + // callback once finished order + $(saveButton).prop('disabled', false); + bootOrderOptions = []; + $("#myList li").each(function() { + bootOrderOptions.push($(this).attr("data-value")) + }); + bootOrderOptions.forEach(function(entry) { + console.log(entry); + }); + } + }); + + $(".deleteDev").on('click', function(evt) { + evt.preventDefault(); + var item = $(this).parent().attr("data-value"); + var index = guestBootOrder.indexOf(item); + if (index !== -1) { + guestBootOrder.splice(index, 1); + } + var data = { + bootorder: guestBootOrder + }; + kimchi.updateVM(kimchi.selectedGuest, data, function() { + wok.window.close(); + }); + }); + + $("#guest-edit-add-boot-button").on('click', function(evt) { + evt.preventDefault(); + var html1 = "<div class='item' id='bootDevOrder'><span class='cell column-device'><select id='bootDev' data-none-selected-text='Nothing selected'>" + var html2 = "</select></span><span class='cell column-actions action-area'><button class='btn btn-primary save'>Save</button> <button class='btn btn-primary cancel'>Remove</button></span><div>" + var selectOptions = [] + var dev = ["cdrom", "hd", "network"]; + $.each(dev, function(index, value) { + if (!($.inArray(value, guestBootOrder) > -1)) { + var option = "<option id='"+ value +"-check'>" + value + "</option>" + selectOptions.push(option); + } + }); + var addBootorder = html1 + selectOptions.toString().replace(",", "") + html2; + var selectionVal = $("#add-boot-order").html(addBootorder); + addItem({ bootorder: selectionVal }); + + if ($('.body:not(:empty)')) { + $("#guest-edit-add-boot-button").prop('disabled', true); + } + }); + + if (guestBootOrder.length == 3) { + $("#guest-edit-add-boot-button").prop('disabled', true); + } + + var addItem = function(data) { + var itemNode = $.parseHTML(wok.substitute($('#add-boot-order').html(), data)); + $(".body", "#form-guest-edit-bootorder").append(itemNode); + + $('#bootDev').selectpicker({ + size: 4, + width: '150px' + }); + + $(".save", itemNode).on('click', function(evt) { + evt.preventDefault(); + guestBootOrder.push($("select", "#bootDevOrder").val()); + var data = { + bootorder: guestBootOrder + }; + + kimchi.updateVM(kimchi.selectedGuest, data, function() { + wok.window.close(); + }); + }); + $(".cancel", itemNode).on('click', function(evt) { + evt.preventDefault(); + var item = $(this).parent().parent(); + $("label", item).text() === "" ? item.remove() : toggleEdit(item, false, data.id); + + $("#guest-edit-add-boot-button").prop('disabled', false); + }); + + }; + + }; + var initContent = function(guest) { guest['icon'] = guest['icon'] || 'plugins/kimchi/images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); @@ -1031,6 +1140,7 @@ kimchi.guest_edit_main = function() { setupPermission(); setupPCIDevice(); setupSnapshot(); + setupBootOrder(guest); kimchi.init_processor_tab(guest.cpu_info, $(saveButton)); if ((kimchi.thisVMState === "running") || (kimchi.thisVMState === "paused")) { @@ -1128,6 +1238,27 @@ kimchi.guest_edit_main = function() { }); }); + //Format the strings to go in the array before passing in to the API + //"hd", "network", "cdrom" + var formattedBootOrderOptions = []; + for (var i=0; i<bootOrderOptions.length; i++) { + var str = bootOrderOptions[i].trim(); + str = str.toLowerCase(); + if (str === "hdd") { + str = "hd"; + } else if (str === "cd-rom") { + str = "cdrom"; + } + formattedBootOrderOptions.push(str); + } + var data = { + bootorder: formattedBootOrderOptions + }; + kimchi.updateVM(kimchi.selectedGuest, data, function() { + wok.window.close(); + }, function(err) { + wok.message.error(err.responseJSON.reason,'#alert-modal-container'); + }); }; var permissionSubmit = function(event) { diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index d8a482c..df35b8e 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ </div> <div class="modal-body"> <span id="alert-modal-container"></span> -<ul class="nav nav-tabs" role="tablist"> + <ul class="nav nav-tabs" role="tablist"> <li role="presentation" class="active"><a href="#form-guest-edit-general" aria-controls="form-guest-edit-general" role="tab" data-id="form-guest-edit-general" data-toggle="tab">$_("General")</a></li> <li role="presentation"><a href="#form-guest-edit-storage" aria-controls="form-guest-edit-storage" role="tab" data-id="form-guest-edit-storage" data-toggle="tab">$_("Storage")</a></li> <li role="presentation"><a href="#form-guest-edit-interface" aria-controls="form-guest-edit-interface" role="tab" data-id="form-guest-edit-interface" data-toggle="tab">$_("Interface")</a></li> @@ -39,7 +39,7 @@ <li role="presentation"><a href="#form-guest-edit-snapshot" aria-controls="form-guest-edit-snapshot" role="tab" data-id="form-guest-edit-snapshot" data-toggle="tab">$_("Snapshot")</a></li> <li role="presentation"><a href="#form-edit-processor" aria-controls="form-edit-processor" role="tab" data-id="form-edit-processor" data-toggle="tab">$_("Processor")</a></li> </ul> - <div class="tab-content" id="guest-edit-tabs"> + <div class="tab-content" id="guest-edit-tabs" style="height: 720px;"> <form role="tabpanel" class="tab-pane active" id="form-guest-edit-general"> <div class="form-group"> <label for="guest-edit-id-textbox">$_("Name")</label> @@ -68,6 +68,21 @@ <option value="virtio">$_("virtio")</option> </select> </div> + <div class="guest-edit-bootorder tab-pane" id="form-guest-edit-bootorder"> + <div id="bootOrder"> + <label for="guest-edit-boot-order-textbox">Boot Order</label> + <ul id="myList" class="list-group boot-order"> + <li class="list-group-item" data-value="CD-ROM">CD-ROM</li> + <li class="list-group-item" data-value="HDD">HDD</li> + <li class="list-group-item" data-value="Network">Network</li> + </ul> + <p class="help-block"> + <i class="fa fa-info-circle"></i> $_("Change the boot order by dragging the items on the list.")</p> + </p> + <p><button id="guest-edit-add-boot-button" class="add btn btn-primary"><i class="fa fa-plus-circle"></i> $_("Add")</button></p> + <div class="body"></div> + </div> + </div> </form> <form role="tabpanel" class="tab-pane" id="form-guest-edit-storage"> <div class="btn-group action-area"> @@ -197,7 +212,6 @@ $_("Current CPU must be equal or lower than the Maximum CPU value. If a topology is set, it must be also be a multiple of the 'threads' value.") </p> </div> - <div id="guest-max-processor-panel" class="form-group"> <label for="guest-edit-max-processor-textbox">$_("Max CPU")</label> <p id="settings-readonly-help" class="hidden">$_("Unable to edit maximum CPU or CPU topology when editing a running or paused virtual machine.")</p> @@ -238,6 +252,21 @@ <button id="guest-edit-button-cancel" class="btn btn-default" data-dismiss="modal">$_("Cancel")</button> </div> </div> +<script id="add-boot-order" type="text/html"> + <div class="item" id="bootDevOrder"> + <span class="cell column-device"> + <select id="bootDev" data-none-selected-text="$_("Nothing selected")"> + <option id="cdrom-check">cdrom</option> + <option id="hdd-check">hd</option> + <option id="network-check">network</option> + </select> + </span> + <span class="cell column-actions action-area"> + <button class="btn btn-primary save">$_("Save")</button> + <button class="btn btn-primary cancel">$_("Remove")</button> + </span> + <div> +</script> <script id="cdrom-row-tmpl" type="text/html"> <div class="item view" id="cdrom-{dev}"> <span class="cell dev column-device"> -- 2.9.3

2 1

[Wok] Do not link user role with UI tabs
by Aline Manera 18 Jan '17

18 Jan '17

Hi all, Today, Wok provides basic authorization level for all the application. When using PAM authentication, an user with root right (sudo ALL) will be considered a sysadmin and will have full control no Wok and its plugins. When using LDAP authentication, the users listed in "admin_users" parameter in wok.conf will be considered a sysadmin and then having full control on Wok and its plugins. Thinking about providing more granularity on authorization (ie, grant access to a normal user to create a VM on Kimchi, for example) the user role (sysadmin or normal user) was linked to the UI tabs (:-() instead of the API itself (you can see it on src/wok/auth.py) It can cause multiple issues, for example: - different plugins with the same tab name (the case of Ginger and Kimchi) will get the authorization settings merged - what about a tab making using of different APIs? The case of "Administration" tab on Ginger So, IMO the better solution would be to have that granularity (when it will be implemented) by API. So when a sysadmin may want to grant permission to a normal user to manage virtual machines, there would be an API like: POST /config/permission {api: <api>, username: <username>, role: admin|user} That will store the information in a DB (objectstore) and make use of it when responding to a request. with objectstore as session: user_role = session.get('permission', <api>, <username>) The reason of this RFC is to change the USER_ROLES we have today in auth.py to only store if the user is an admin or not and make use of it in the whole application not linked to any tab. That means, all the self.role_key parameter will be removed and the UI will be changed as well to reflect that. What do you think about it? I plan to send a patch to remove the link between user role and tabs as soon as we get agreement on it and the patches about grant permissions will require more discussions. Regards, Aline Manera

3 2

[RFC] Plugin management - disable/enable WoK plug-ins
by Daniel Henrique Barboza 18 Jan '17

18 Jan '17

Hi there, I am working in a way to enable/disable WoK plug-ins using an API. This is what we already have regarding plugin management: - each plug-in has a configuration file, for example ginger.conf: [wok] # Enable Ginger plugin on Wok server (values: True|False) enable = True (...) - an API that returns all enable plug-ins: $ curl -k -u danielhb -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://localhost:8001/plugins' Enter host password for user 'danielhb': [ "gingerbase", "kimchi", "ginger" ] The API retrieves the contents of each plug-in config file and return the plug-in name if enable = True. This is my proposal to implement this new feature without messing around too much: - the /plugins API will now returns all plug-ins, regardless of the plug-in being loaded or not. In the previous example the returned value would be: [{ "name: "gingerbase", "enabled": True} , { "name: "ginger", "enabled": True}, { "name: "kimchi", "enabled": True} ] Changes in the existing API calls will be made considering this new format. - A new PUT method to change the 'enabled' attribute of the plug-ins. Changing the attribute will write the new value in the plug-in config file, allowing WoK to enable/disable the plug-in in the next reboot. - To make the changes effective we need to reboot WoK after enabling/disabling a plug-in. This can be done by either rebooting WoK in the same PUT operation I mentioned above or by a new 'reboot' API in WoK. I am more fond of a new API but I can live with this 'super PUT' API too. Note that at this moment we will not supporting load/unload of plug-ins without rebooting WoK. This has proven to be challenging considering our current plug-in loading schema in cherrypy. Thoughts? Daniel

4 15

[PATCH][Wok] Bug fix #147: Block authentication request after too many failures
by Ramon Medeiros 18 Jan '17

18 Jan '17

To prevent brute force attack, creates a mechanism to allow 3 tries first. After that, a timeout will start and will be added 30 seconds for each failed try in a row. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/wok/i18n.py | 1 + src/wok/root.py | 57 +++++++++++++++++++++++++++++++++++++++++++++--- ui/js/src/wok.login.js | 10 ++++++++- ui/pages/login.html.tmpl | 3 ++- 4 files changed, 66 insertions(+), 5 deletions(-) diff --git a/src/wok/i18n.py b/src/wok/i18n.py index e454e31..21cc4ea 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -41,6 +41,7 @@ messages = { "WOKAUTH0001E": _("Authentication failed for user '%(username)s'. [Error code: %(code)s]"), "WOKAUTH0002E": _("You are not authorized to access Wok. Please, login first."), "WOKAUTH0003E": _("Specify %(item)s to login into Wok."), + "WOKAUTH0004E": _("You have failed to login in too much attempts. Please, wait for %(seconds)s seconds to try again."), "WOKAUTH0005E": _("Invalid LDAP configuration: %(item)s : %(value)s"), "WOKLOG0001E": _("Invalid filter parameter. Filter parameters allowed: %(filters)s"), diff --git a/src/wok/root.py b/src/wok/root.py index 080b7f0..4cabfdf 100644 --- a/src/wok/root.py +++ b/src/wok/root.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -21,7 +21,9 @@ import cherrypy import json +import re import os +import time from distutils.version import LooseVersion from wok import auth @@ -31,7 +33,7 @@ from wok.config import paths as wok_paths from wok.control import sub_nodes from wok.control.base import Resource from wok.control.utils import parse_request -from wok.exception import MissingParameter +from wok.exception import MissingParameter, UnauthorizedError from wok.reqlogger import log_request @@ -48,7 +50,8 @@ class Root(Resource): super(Root, self).__init__(model) self._handled_error = ['error_page.400', 'error_page.404', 'error_page.405', 'error_page.406', - 'error_page.415', 'error_page.500'] + 'error_page.415', 'error_page.500', + 'error_page.403'] if not dev_env: self._cp_config = dict([(key, self.error_production_handler) @@ -146,6 +149,7 @@ class WokRoot(Root): self.domain = 'wok' self.messages = messages self.extends = None + self.failed_logins = {} # set user log messages and make sure all parameters are present self.log_map = ROOT_REQUESTS @@ -153,6 +157,13 @@ class WokRoot(Root): @cherrypy.expose def login(self, *args): + def _raise_timeout(user_id): + length = self.failed_logins[user_ip_sid]["count"] + timeout = (length - 3) * 30 + details = e = UnauthorizedError("WOKAUTH0004E", + {"seconds": timeout}) + log_request(code, params, details, method, 403) + raise cherrypy.HTTPError(403, e.message) details = None method = 'POST' code = self.getRequestMessage(method, 'login') @@ -166,10 +177,50 @@ class WokRoot(Root): log_request(code, params, details, method, 400) raise cherrypy.HTTPError(400, e.message) + # get authentication info + remote_ip = cherrypy.request.remote.ip + session_id = str(cherrypy.session.originalid) + user_ip_sid = re.escape(username + remote_ip + session_id) + + # check for repetly + count = self.failed_logins.get(user_ip_sid, {"count": 0}).get("count") + if count >= 3: + + # verify if timeout is still valid + last_try = self.failed_logins[user_ip_sid]["time"] + if time.time() < (last_try + ((count - 3) * 30)): + _raise_timeout(user_ip_sid) + try: status = 200 user_info = auth.login(username, password) + + # user logged sucessfuly: reset counters + if self.failed_logins.get(user_ip_sid) != None: + self.failed_logins.remove(user_ip_sid) except cherrypy.HTTPError, e: + + # store time and prevent too much tries + if self.failed_logins.get(user_ip_sid) == None: + self.failed_logins[user_ip_sid] = {"time": time.time(), + "ip": remote_ip, + "session_id": session_id, + "username": username, + "count": 1} + else: + + # tries take more than 30 seconds between each one: do not + # increase count + if (time.time() - + self.failed_logins[user_ip_sid]["time"]) < 30: + + self.failed_logins[user_ip_sid]["time"] = time.time() + self.failed_logins[user_ip_sid]["count"] += 1 + + # more than 3 fails: raise error + if self.failed_logins[user_ip_sid]["count"] > 3: + _raise_timeout(user_ip_sid) + status = e.status raise finally: diff --git a/ui/js/src/wok.login.js b/ui/js/src/wok.login.js index fa2a98a..12c6880 100644 --- a/ui/js/src/wok.login.js +++ b/ui/js/src/wok.login.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Code derived from Project Kimchi * @@ -84,9 +84,17 @@ wok.login_main = function() { if (jqXHR.responseText == "") { $("#messUserPass").hide(); $("#missServer").show(); + $("#timeoutError").hide(); + } else if ((jqXHR.responseJSON != undefined) && + ! (jqXHR.responseJSON["reason"] == undefined)) { + $("#messUserPass").hide(); + $("#missServer").hide(); + $("#timeoutError").html(jqXHR.responseJSON["reason"]); + $("#timeoutError").show(); } else { $("#missServer").hide(); $("#messUserPass").show(); + $("#timeoutError").hide(); } $("#messSession").hide(); $("#logging").hide(); diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index f5a4b2d..d25910c 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -1,7 +1,7 @@ #* * Project Wok * - * Copyright IBM Corp, 2014-2016 + * Copyright IBM Corp, 2014-2017 * * Code derived from Project Kimchi * @@ -107,6 +107,7 @@ <div id="messUserPass" class="alert alert-danger" style="display: none;">$_("The username or password you entered is incorrect. Please try again.")</div> <div id="messSession" class="alert alert-danger" style="display: none;">$_("Session timeout, please re-login.")</div> <div id="missServer" class="alert alert-danger" style="display: none;">$_("Server unreachable.")</div> + <div id="timeoutError" class="alert alert-danger" style="display: none;">$_("Timeout error")</div> </div> <form id="form-login" class="form-horizontal" method="post"> <div class="form-group"> -- 2.7.4

1 1

nginx server and it's default port number (80)
by Chandra Shekhar Reddy Potula 18 Jan '17

18 Jan '17

Hi All, By default nginx server configured with port number 80 and I see the following from netstat In the file /etc/nginx/nginx.conf server { listen 80 default_server; listen [::]:80 default_server; server_name _; root /usr/share/nginx/html; # Load configuration files for the default server block. include /etc/nginx/default.d/*.conf; location / { } error_page 404 /404.html; location = /40x.html { } error_page 500 502 503 504 /50x.html; location = /50x.html { } [root@zs95kc conf.d]# netstat -anp Active Internet connections (servers and established) Proto Recv-Q Send-Q Local Address Foreign Address State PID/Program name tcp 0 0 0.0.0.0:8000 0.0.0.0:* LISTEN 57091/nginx: master tcp 0 0 0.0.0.0:8001 0.0.0.0:* LISTEN 57091/nginx: master tcp 0 0 0.0.0.0:80 0.0.0.0:* LISTEN 57091/nginx: master tcp 0 0 192.168.122.1:53 0.0.0.0:* LISTEN 15237/dnsmasq tcp 0 0 0.0.0.0:22 0.0.0.0:* LISTEN 12897/sshd tcp 0 248 10.20.92.162:22 10.20.94.36:49404 ESTABLISHED 56319/sshd: root@pt tcp6 0 0 :::80 :::* LISTEN 57091/nginx: master tcp6 0 0 :::22 :::* LISTEN 12897/sshd udp 0 0 192.168.122.1:53 0.0.0.0:* 15237/dnsmasq udp 0 0 0.0.0.0:67 0.0.0.0:* 15237/dnsmasq raw6 0 0 :::58 :::* 7 12181/NetworkManage So the question I have is do we really require nginx listing on port number 80 by wok ? Thanks in advance, Regards Chandra

3 3

[RFC] [Wok] #147 Block authentication request after too many failures
by Ramon Medeiros 17 Jan '17

17 Jan '17

Propose: make adjustments at login page to make difficult brute force attack. Today, an intruder can make login tries without any action from Wok. Possible measures: Record source port and ip. After 3 tries, block user for 30 seconds and increase the time by each more try. Using source port and ip will avoid errors for connections from NAT networks. Example: 1) ip 192.168.1.1 tries to login as root 3 times and fail 2) A timeout of 30 seconds will be set 3) After that, for 5 minutes, each try will add 30 seconds + x times the trial (60 seconds, 90 seconds. ..) 4) After 5 minutes of the last try, the counter will be reset. -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

2 4

[PATCH] [Wok] Add Documentation for systemd service
by Lucio Correia 17 Jan '17

17 Jan '17

Debian's lintian tool generates a warning when this field is not set. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- contrib/wokd.service.systemd | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/wokd.service.systemd b/contrib/wokd.service.systemd index 61673a5..040f94e 100644 --- a/contrib/wokd.service.systemd +++ b/contrib/wokd.service.systemd @@ -1,5 +1,6 @@ [Unit] Description=Wok - Webserver Originated from Kimchi +Documentation=https://github.com/kimchi-project/wok/wiki Wants=nginx.service After=nginx.service -- 2.7.4

2 1

[PATCH v2][Wok] Bug fix #147: Block authentication request after too many failures
by Ramon Medeiros 17 Jan '17

17 Jan '17

To prevent brute force attack, creates a mechanism to allow 3 tries first. After that, a timeout will start and will be added 30 seconds for each failed try in a row. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: fix pep8 issues src/wok/i18n.py | 1 + src/wok/root.py | 37 ++++++++++++++++++++++++++++++++++--- ui/js/src/wok.login.js | 11 ++++++++++- ui/pages/login.html.tmpl | 3 ++- 4 files changed, 47 insertions(+), 5 deletions(-) diff --git a/src/wok/i18n.py b/src/wok/i18n.py index e454e31..21cc4ea 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -41,6 +41,7 @@ messages = { "WOKAUTH0001E": _("Authentication failed for user '%(username)s'. [Error code: %(code)s]"), "WOKAUTH0002E": _("You are not authorized to access Wok. Please, login first."), "WOKAUTH0003E": _("Specify %(item)s to login into Wok."), + "WOKAUTH0004E": _("You have failed to login in too much attempts. Please, wait for %(seconds)s seconds to try again."), "WOKAUTH0005E": _("Invalid LDAP configuration: %(item)s : %(value)s"), "WOKLOG0001E": _("Invalid filter parameter. Filter parameters allowed: %(filters)s"), diff --git a/src/wok/root.py b/src/wok/root.py index 080b7f0..65226fb 100644 --- a/src/wok/root.py +++ b/src/wok/root.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -22,6 +22,7 @@ import cherrypy import json import os +import time from distutils.version import LooseVersion from wok import auth @@ -31,7 +32,7 @@ from wok.config import paths as wok_paths from wok.control import sub_nodes from wok.control.base import Resource from wok.control.utils import parse_request -from wok.exception import MissingParameter +from wok.exception import MissingParameter, UnauthorizedError from wok.reqlogger import log_request @@ -48,7 +49,8 @@ class Root(Resource): super(Root, self).__init__(model) self._handled_error = ['error_page.400', 'error_page.404', 'error_page.405', 'error_page.406', - 'error_page.415', 'error_page.500'] + 'error_page.415', 'error_page.500', + 'error_page.403'] if not dev_env: self._cp_config = dict([(key, self.error_production_handler) @@ -146,6 +148,8 @@ class WokRoot(Root): self.domain = 'wok' self.messages = messages self.extends = None + self.failed_logins = [] + self.fail_timeout = 30 # set user log messages and make sure all parameters are present self.log_map = ROOT_REQUESTS @@ -153,6 +157,12 @@ class WokRoot(Root): @cherrypy.expose def login(self, *args): + def _raise_timeout(): + details = e = UnauthorizedError("WOKAUTH0004E", + {"seconds": self.fail_timeout}) + log_request(code, params, details, method, 403) + raise cherrypy.HTTPError(403, e.message) + details = None method = 'POST' code = self.getRequestMessage(method, 'login') @@ -166,10 +176,31 @@ class WokRoot(Root): log_request(code, params, details, method, 400) raise cherrypy.HTTPError(400, e.message) + # check for repetly + l = len(self.failed_logins) + if l >= 3: + + # verify if timeout is still valid + last_try = self.failed_logins[l - 1] + if time.time() < (last_try["time"] + self.fail_timeout): + _raise_timeout() try: status = 200 user_info = auth.login(username, password) + + # user logged sucessfuly: reset counters + self.failed_logins = [] + self.timeout = 30 except cherrypy.HTTPError, e: + # store time and prevent too much tries + self.failed_logins.append({"user": username, + "time": time.time()}) + + # more than 3 fails: raise error + if len(self.failed_logins) > 3: + self.fail_timeout += (len(self.failed_logins) - 3) * 30 + _raise_timeout() + status = e.status raise finally: diff --git a/ui/js/src/wok.login.js b/ui/js/src/wok.login.js index fa2a98a..ba9ac23 100644 --- a/ui/js/src/wok.login.js +++ b/ui/js/src/wok.login.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Code derived from Project Kimchi * @@ -71,6 +71,7 @@ wok.login_main = function() { wok.login(settings, function(data) { var query = window.location.search; var next = /.*next=(.*?)(&|$)/g.exec(query); + if (next) { var next_url = decodeURIComponent(next[1]); } @@ -84,9 +85,17 @@ wok.login_main = function() { if (jqXHR.responseText == "") { $("#messUserPass").hide(); $("#missServer").show(); + $("#timeoutError").hide(); + } else if ((jqXHR.responseJSON != undefined) && + ! (jqXHR.responseJSON["reason"] == undefined)) { + $("#messUserPass").hide(); + $("#missServer").hide(); + $("#timeoutError").html(jqXHR.responseJSON["reason"]); + $("#timeoutError").show(); } else { $("#missServer").hide(); $("#messUserPass").show(); + $("#timeoutError").hide(); } $("#messSession").hide(); $("#logging").hide(); diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index f5a4b2d..d25910c 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -1,7 +1,7 @@ #* * Project Wok * - * Copyright IBM Corp, 2014-2016 + * Copyright IBM Corp, 2014-2017 * * Code derived from Project Kimchi * @@ -107,6 +107,7 @@ <div id="messUserPass" class="alert alert-danger" style="display: none;">$_("The username or password you entered is incorrect. Please try again.")</div> <div id="messSession" class="alert alert-danger" style="display: none;">$_("Session timeout, please re-login.")</div> <div id="missServer" class="alert alert-danger" style="display: none;">$_("Server unreachable.")</div> + <div id="timeoutError" class="alert alert-danger" style="display: none;">$_("Timeout error")</div> </div> <form id="form-login" class="form-horizontal" method="post"> <div class="form-group"> -- 2.7.4

2 2

[PATCH] [Wok 0/6] Update man page content
by Aline Manera 17 Jan '17

17 Jan '17

Aline Manera (6): Remove --access-log and --error-log options from wokd command Use underscore in all wokd command options Update AUTHORS content according to git-log command Update COPYING file to reflect all the imported code Update man page document Fix typo in license header AUTHORS | 67 ++++++++++++++++--- COPYING | 114 +++++++++++++++++++++++++++++--- docs/wokd.8.in | 149 +++++++++++++++++++++++------------------- src/wokd.in | 20 +++--- tests/test_exception.py | 4 +- tests/test_objectstore.py | 4 +- tests/test_plugin.py | 4 +- tests/test_rollbackcontext.py | 4 +- tests/test_server.py | 6 +- tests/test_utils.py | 4 +- tests/utils.py | 4 +- 11 files changed, 268 insertions(+), 112 deletions(-) -- 2.7.4

2 8

[PATCH v2][Wok] Issue #160: Fedora 25: Make check breaks on wok
by Ramon Medeiros 17 Jan '17

17 Jan '17

Threading identifier was not given a unique name. So, a name will be passed to force it. This behaviour is described at threading docs: https://docs.python.org/2/library/threading.html#threading.Thread.ident Thread identifiers may be recycled when a thread exits and another thread is created. The identifier is available even after the thread has exited. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: More verbose commit message src/wok/objectstore.py | 4 ++-- tests/test_objectstore.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py index 817f60c..a571e5f 100644 --- a/src/wok/objectstore.py +++ b/src/wok/objectstore.py @@ -1,6 +1,6 @@ # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -115,7 +115,7 @@ class ObjectStore(object): return def _get_conn(self): - ident = threading.currentThread().ident + ident = threading.currentThread().name try: return self._connections[ident] except KeyError: diff --git a/tests/test_objectstore.py b/tests/test_objectstore.py index 3ea7b70..96bcf13 100644 --- a/tests/test_objectstore.py +++ b/tests/test_objectstore.py @@ -2,7 +2,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code delivered from Project Kimchi # @@ -91,7 +91,7 @@ class ObjectStoreTests(unittest.TestCase): threads = [] for i in xrange(50): - t = threading.Thread(target=worker, args=(i,)) + t = threading.Thread(target=worker, args=(i,), name=str(i)) t.setDaemon(True) t.start() threads.append(t) -- 2.7.4

2 1

[PATCH][Kimchi] VEPA interface not listed with VM running
by Ramon Medeiros 17 Jan '17

17 Jan '17

UI was filtering interfaces. Just removed it. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index bb82077..16241cc 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -458,8 +458,7 @@ kimchi.guest_edit_main = function() { data[i].viewMode = ""; data[i].editMode = "hide"; data[i].id = i; - if (data[i].type == 'network') - addItem(data[i]); + addItem(data[i]); } }); } -- 2.7.4

3 2

[PATCH][Wok] Bug fix #147: Block authentication request after too many failures
by Ramon Medeiros 16 Jan '17

16 Jan '17

To prevent brute force attack, creates a mechanism to allow 3 tries first. After that, a timeout will start and will be added 30 seconds for each failed try in a row. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/wok/i18n.py | 3 ++- src/wok/root.py | 37 ++++++++++++++++++++++++++++++++++--- ui/js/src/wok.login.js | 11 ++++++++++- ui/pages/login.html.tmpl | 3 ++- 4 files changed, 48 insertions(+), 6 deletions(-) diff --git a/src/wok/i18n.py b/src/wok/i18n.py index cbc37cf..c594ae1 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -41,6 +41,7 @@ messages = { "WOKAUTH0001E": _("Authentication failed for user '%(username)s'. [Error code: %(code)s]"), "WOKAUTH0002E": _("You are not authorized to access Kimchi"), "WOKAUTH0003E": _("Specify %(item)s to login into Kimchi"), + "WOKAUTH0004E": _("You have failed to login in too much attempts. Please, wait for %(seconds)s seconds to try again."), "WOKAUTH0005E": _("Invalid LDAP configuration: %(item)s : %(value)s"), "WOKLOG0001E": _("Invalid filter parameter. Filter parameters allowed: %(filters)s"), diff --git a/src/wok/root.py b/src/wok/root.py index 080b7f0..44e7adb 100644 --- a/src/wok/root.py +++ b/src/wok/root.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -22,6 +22,7 @@ import cherrypy import json import os +import time from distutils.version import LooseVersion from wok import auth @@ -31,7 +32,7 @@ from wok.config import paths as wok_paths from wok.control import sub_nodes from wok.control.base import Resource from wok.control.utils import parse_request -from wok.exception import MissingParameter +from wok.exception import MissingParameter, UnauthorizedError from wok.reqlogger import log_request @@ -48,7 +49,8 @@ class Root(Resource): super(Root, self).__init__(model) self._handled_error = ['error_page.400', 'error_page.404', 'error_page.405', 'error_page.406', - 'error_page.415', 'error_page.500'] + 'error_page.415', 'error_page.500', + 'error_page.403'] if not dev_env: self._cp_config = dict([(key, self.error_production_handler) @@ -146,6 +148,8 @@ class WokRoot(Root): self.domain = 'wok' self.messages = messages self.extends = None + self.failed_logins = [] + self.fail_timeout = 30 # set user log messages and make sure all parameters are present self.log_map = ROOT_REQUESTS @@ -153,6 +157,12 @@ class WokRoot(Root): @cherrypy.expose def login(self, *args): + def _raise_timeout(): + details = e = UnauthorizedError("WOKAUTH0004E", + {"seconds": self.fail_timeout}) + log_request(code, params, details, method, 403) + raise cherrypy.HTTPError(403, e.message) + details = None method = 'POST' code = self.getRequestMessage(method, 'login') @@ -166,10 +176,31 @@ class WokRoot(Root): log_request(code, params, details, method, 400) raise cherrypy.HTTPError(400, e.message) + # check for repetly + l = len(self.failed_logins) + if l >= 3: + + # verify if timeout is still valid + last_try = self.failed_logins[l - 1] + if time.time() < (last_try["time"] + self.fail_timeout): + _raise_timeout() try: status = 200 user_info = auth.login(username, password) + + # user logged sucessfuly: reset counters + self.failed_logins = [] + self.timeout = 30 except cherrypy.HTTPError, e: + # store time and prevent too much tries + self.failed_logins.append({"user": username, + "time": time.time()}) + + # more than 3 fails: raise error + if len(self.failed_logins) > 3: + self.fail_timeout += (len(self.failed_logins) - 3) * 30 + _raise_timeout() + status = e.status raise finally: diff --git a/ui/js/src/wok.login.js b/ui/js/src/wok.login.js index fa2a98a..ba9ac23 100644 --- a/ui/js/src/wok.login.js +++ b/ui/js/src/wok.login.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Code derived from Project Kimchi * @@ -71,6 +71,7 @@ wok.login_main = function() { wok.login(settings, function(data) { var query = window.location.search; var next = /.*next=(.*?)(&|$)/g.exec(query); + if (next) { var next_url = decodeURIComponent(next[1]); } @@ -84,9 +85,17 @@ wok.login_main = function() { if (jqXHR.responseText == "") { $("#messUserPass").hide(); $("#missServer").show(); + $("#timeoutError").hide(); + } else if ((jqXHR.responseJSON != undefined) && + ! (jqXHR.responseJSON["reason"] == undefined)) { + $("#messUserPass").hide(); + $("#missServer").hide(); + $("#timeoutError").html(jqXHR.responseJSON["reason"]); + $("#timeoutError").show(); } else { $("#missServer").hide(); $("#messUserPass").show(); + $("#timeoutError").hide(); } $("#messSession").hide(); $("#logging").hide(); diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index f5a4b2d..d25910c 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -1,7 +1,7 @@ #* * Project Wok * - * Copyright IBM Corp, 2014-2016 + * Copyright IBM Corp, 2014-2017 * * Code derived from Project Kimchi * @@ -107,6 +107,7 @@ <div id="messUserPass" class="alert alert-danger" style="display: none;">$_("The username or password you entered is incorrect. Please try again.")</div> <div id="messSession" class="alert alert-danger" style="display: none;">$_("Session timeout, please re-login.")</div> <div id="missServer" class="alert alert-danger" style="display: none;">$_("Server unreachable.")</div> + <div id="timeoutError" class="alert alert-danger" style="display: none;">$_("Timeout error")</div> </div> <form id="form-login" class="form-horizontal" method="post"> <div class="form-group"> -- 2.7.4

1 0

[PATCH v2] [WoK 0/4] 'reload' API implementation
by dhbarboza82＠gmail.com 16 Jan '17

16 Jan '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v2: - changed API name to 'reload' - added test_api tests This patch set implements a new WOK API called 'reload' under /config/reload. To test it: $ curl -k -u danielhb -H "Content-Type: application/json" -H "Accept: application/json" -X POST 'https://localhost:8001/config/reload' -d'{}' Enter host password for user 'danielhb': { "proxy_port":"8001", "websockets_port":"64667", "version":"2.3.0-55.git5c9127b", "auth":"pam", "server_root":"" } This will reload WoK and all its plug-ins. Daniel Henrique Barboza (4): reload API: doc changes reload API: control and model changes reload API: new file tests/test_config_model.py reload API: added rest API tests docs/API/config.md | 2 +- src/wok/control/config.py | 4 +++- src/wok/model/config.py | 7 ++++++- tests/test_api.py | 9 ++++++++- tests/test_config_model.py | 41 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 tests/test_config_model.py -- 2.7.4

1 4

[PATCH] [WoK 0/3] 'restart' API implementation
by dhbarboza82＠gmail.com 16 Jan '17

16 Jan '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> This patch set implements a new WOK API called 'restart' under /config/restart. Daniel Henrique Barboza (3): restart API: doc changes restart API: control and model changes restart API: new file tests/test_config_model.py docs/API/config.md | 2 +- src/wok/control/config.py | 4 +++- src/wok/model/config.py | 7 ++++++- tests/test_config_model.py | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 tests/test_config_model.py -- 2.7.4

4 9

[Wok][RFC] #160: Fedora 25: Make check breaks on wok
by Ramon Medeiros 16 Jan '17

16 Jan '17

Issue: make check on Fedora 25 returns error: ====================================================================== FAIL: test_object_store_threaded (test_objectstore.ObjectStoreTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "test_objectstore.py", line 105, in test_object_store_threaded self.assertEquals(10, len(store._connections.keys())) AssertionError: 10 != 2 Error: tests/test_objectstore isn't able to deal with function session.store Propose: As i saw, the issue is in this function: def test_object_store_threaded(self): def worker(ident): with store as session: session.store('foo', ident, {}) store = objectstore.ObjectStore(tmpfile) threads = [] for i in range(50): t = threading.Thread(target=worker, args=(i,)) t.setDaemon(True) t.start() threads.append(t) for t in threads: t.join(0) with store as session: self.assertEquals(50, len(session.get_list('foo'))) self.assertEquals(10, len(store._connections.keys())) If a time.sleep is added to worker(), the issue is solved. So, store cannot handle too much tries, what happens at the first looping. As using sleep is too ugly, how can i improve the bug fix? -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

1 1

[PATCH][Wok] Issue #160: Fedora 25: Make check breaks on wok
by Ramon Medeiros 16 Jan '17

16 Jan '17

Threading identifier was not given a unique name. So, a name will be passed to force it Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/wok/objectstore.py | 4 ++-- tests/test_objectstore.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py index 817f60c..a571e5f 100644 --- a/src/wok/objectstore.py +++ b/src/wok/objectstore.py @@ -1,6 +1,6 @@ # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -115,7 +115,7 @@ class ObjectStore(object): return def _get_conn(self): - ident = threading.currentThread().ident + ident = threading.currentThread().name try: return self._connections[ident] except KeyError: diff --git a/tests/test_objectstore.py b/tests/test_objectstore.py index 3ea7b70..96bcf13 100644 --- a/tests/test_objectstore.py +++ b/tests/test_objectstore.py @@ -2,7 +2,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code delivered from Project Kimchi # @@ -91,7 +91,7 @@ class ObjectStoreTests(unittest.TestCase): threads = [] for i in xrange(50): - t = threading.Thread(target=worker, args=(i,)) + t = threading.Thread(target=worker, args=(i,), name=str(i)) t.setDaemon(True) t.start() threads.append(t) -- 2.7.4

1 0

[Wok] Doubts about JS on login page.
by Ramon Medeiros 16 Jan '17

16 Jan '17

Hi, i'm doing the issue https://github.com/kimchi-project/wok/issues/147, and got a problem to deal with exceptions and Javascript. I got this code at src/wok/root.py: # check for repetly l = len(self.failed_logins) if l >= 3: # verify if timeout is still valid last_try = self.failed_logins[l -1] if time.time() < (last_try["time"] + self.fail_timeout): details = e = UnauthorizedError("WOKAUTH0004E", {"seconds": self.fail_timeout}) log_request(code, params, details, method, 403) import pdb;pdb.set_trace() raise cherrypy.HTTPError(403, e.message) return e.message So, it may raise an exception. I want to filter this exception at UI. So i got this code: wok.login(settings, function(data) { var query = window.location.search; var next = /.*next=(.*?)(&|$)/g.exec(query); if (next) { var next_url = decodeURIComponent(next[1]); } else { var lastPage = wok.cookie.get('lastPage'); var next_url = lastPage ? lastPage.replace(/\"/g,'') : "/"; } wok.cookie.set('roles',JSON.stringify(data.roles)); window.location.replace(window.location.pathname.replace(/\/+login.html/, '') + next_url); }, function(jqXHR, textStatus, errorThrown) { if (jqXHR.responseText == "") { $("#messUserPass").hide(); $("#missServer").show(); } else { $("#missServer").hide(); $("#messUserPass").show(); } $("#messSession").hide(); $("#logging").hide(); $("#login").show(); }); The issue is: 1) If i raise a cherrypy.HTTPError, i got a html error with the message i created on the code. Here is an example http://pastebin.com/AjkWwHBz. The message is there, but i must parse it. 2) If i raise a InvalidOperation or other exception from wok, i receive a error 500: { "reason":"The server encountered an unexpected condition which prevented it from fulfilling the request.", "code":"500 Internal Server Error" } I want to receive a json with the error, to make it to parse from UI. -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

2 1

[PATCH] [Wok 0/2] Remove Kimchi references from Wok
by Aline Manera 12 Jan '17

12 Jan '17

Aline Manera (2): Fix issue #40: Improve WOKAUTH0002E error message and remove references to Kimchi Remove spice-html5 references from Wok build configure.ac | 11 +---------- po/de_DE.po | 33 ++++++++++++++++----------------- po/en_US.po | 29 ++++++++++++++--------------- po/es_ES.po | 33 ++++++++++++++++----------------- po/fr_FR.po | 33 ++++++++++++++++----------------- po/it_IT.po | 33 ++++++++++++++++----------------- po/ja_JP.po | 33 ++++++++++++++++----------------- po/ko_KR.po | 33 ++++++++++++++++----------------- po/pt_BR.po | 33 ++++++++++++++++----------------- po/ru_RU.po | 33 ++++++++++++++++----------------- po/wok.pot | 27 +++++++++++++-------------- po/zh_CN.po | 33 ++++++++++++++++----------------- po/zh_TW.po | 33 ++++++++++++++++----------------- src/wok/Makefile.am | 11 ++--------- src/wok/i18n.py | 6 +++--- 15 files changed, 193 insertions(+), 221 deletions(-) -- 2.7.4

3 5

[PATCH v2] [Kimchi 0/4] Live migration RDMA support
by dhbarboza82＠gmail.com 10 Jan '17

10 Jan '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v2: - added unit test. This patch set adds Live Migration RDMA support in Kimchi. The backend/frontend will not verify if the network card is RDMA capable before doing the migration. User will have to deal with the libvirt errors in case RDMA is chosen without proper support/setup. Daniel Henrique Barboza (4): Live migration RDMA support: doc changes Live migration RDMA support: model changes Live migration RDMA support: ui changes Live migration RDMA support: test changes API.json | 5 ++++ control/vms.py | 5 ++-- docs/API.md | 1 + i18n.py | 3 +- model/vms.py | 18 ++++++++--- tests/test_livemigration.py | 53 ++++++++++++++++++++++++++++++++- ui/js/src/kimchi.guest_livemigration.js | 7 +++-- ui/pages/guest-migration.html.tmpl | 6 +++- 8 files changed, 86 insertions(+), 12 deletions(-) -- 2.7.4

3 11

[PATCH v3] [Kimchi] Issue# 979 - Change boot order UI
by bianca＠linux.vnet.ibm.com 09 Jan '17

09 Jan '17

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> This patch adds the UI portion for supporting changing the guest boot order via edit guest panel. This was based off of what Samuel had prototyped. Issue found in backend during test: When updating the VM even with just changing the name, the bootorder gets reset to 'hd' only. I tested this using the curl command and confirmed that indeed it does get reset to one entry only. Issue written to address this: https://github.com/kimchi-project/kimchi/issues/1012 Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 57 +++++++++++++++++++++++++++++++- ui/css/src/modules/_edit-guests.scss | 56 +++++++++++++++++++++++++++++++- ui/js/src/kimchi.guest_edit_main.js | 63 ++++++++++++++++++++++++++++++++++-- ui/pages/guest-edit.html.tmpl | 18 +++++++++-- 4 files changed, 187 insertions(+), 7 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index fff3279..16cc161 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1557,6 +1557,61 @@ body.wok-gallery { overflow: visible; } +ul { + cursor: default; +} + +.boot-order { + display: block; + width: 85%; + font-size: 14px; + line-height: 1.42857; + color: #444; + overflow: hidden; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} + +.boot-order:focus, +.boot-order.focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); +} + +.boot-order > li { + cursor: move; + /* fallback if grab cursor is unsupported */ + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; + border-left: 0; + border-right: 0; +} + +.boot-order > li:first-child { + border-top: 0; +} + +.boot-order > li:last-child { + border-bottom: 0; +} + +.boot-order > li.ui-sortable-helper { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; + border: 1px solid #ccc !important; +} + /* Add Template Modal Window */ .templates-modal .modal-dialog { width: 1100px; diff --git a/ui/css/src/modules/_edit-guests.scss b/ui/css/src/modules/_edit-guests.scss index 25d4d65..e0794de 100644 --- a/ui/css/src/modules/_edit-guests.scss +++ b/ui/css/src/modules/_edit-guests.scss @@ -1,7 +1,7 @@ // // Project Kimchi // -// Copyright IBM Corp, 2015-2016 +// Copyright IBM Corp, 2015-2017 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -429,3 +429,57 @@ #form-guest-storage-add .form-section .field { overflow: visible; } + +ul { + cursor: default; +} + +.boot-order { + display: block; + width: 85%; + font-size: 14px; + line-height: 1.42857; + color: #444; + overflow: hidden; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} + +.boot-order:focus, +.boot-order.focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); +} + +.boot-order > li { + cursor: move; /* fallback if grab cursor is unsupported */ + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; + border-left: 0; + border-right: 0; +} + +.boot-order > li:first-child { + border-top: 0; +} + +.boot-order > li:last-child { + border-bottom: 0; +} + +.boot-order > li.ui-sortable-helper { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; + border: 1px solid #ccc !important; +} diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index bb82077..38a1d39 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ kimchi.guest_edit_main = function() { var networkOptions = ""; clearTimeout(kimchi.vmTimeout); + var bootOrderOptions = []; $('#modalWindow').on('hidden.bs.modal', function() { kimchi.setListVMAutoTimeout(); @@ -45,7 +46,7 @@ kimchi.guest_edit_main = function() { var submitForm = function(event) { - // tap map, "general": 0, "storage": 1, "interface": 2, "permission": 3, "password": 4 + // tap map, "general": 0, "storage": 1, "interface": 2, "permission": 3, "pci": 4, "snapshot": 5, "processor": 6 var submit_map = { 0: generalSubmit, 3: permissionSubmit, @@ -967,6 +968,42 @@ kimchi.guest_edit_main = function() { } }; + var setupBootOrder = function(guest) { + var guestBootOrder = guest['bootorder']; + $("#myList").empty(); + $.each(guestBootOrder, function(index, value) { + var itemNode = $.parseHTML("<li class='list-group-item' " + "data-value=" + value + ">" + value + "</li>"); + $("#myList").append(itemNode); + }); + + $('.boot-order').sortable({ + items: 'li', + cursor: 'move', + opacity: 0.6, + containment: "parent", + start: function(event, ui) { + $(this).addClass('focus'); + }, + stop: function(event, ui) { + $(this).removeClass('focus'); + }, + change: function(event, ui) { + // callback once started changing order + }, + update: function(event, ui) { + // callback once finished order + $(saveButton).prop('disabled', false); + bootOrderOptions = []; + $("#myList li").each(function() { + bootOrderOptions.push($(this).text()) + }); + bootOrderOptions.forEach(function(entry) { + console.log(entry); + }); + } + }); + }; + var initContent = function(guest) { guest['icon'] = guest['icon'] || 'plugins/kimchi/images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); @@ -1032,6 +1069,7 @@ kimchi.guest_edit_main = function() { setupPermission(); setupPCIDevice(); setupSnapshot(); + setupBootOrder(guest); kimchi.init_processor_tab(guest.cpu_info, $(saveButton)); if ((kimchi.thisVMState === "running") || (kimchi.thisVMState === "paused")) { @@ -1129,6 +1167,27 @@ kimchi.guest_edit_main = function() { }); }); + //Format the strings to go in the array before passing in to the API + //"hd", "network", "cdrom" + var formattedBootOrderOptions = []; + for (var i=0; i<bootOrderOptions.length; i++) { + var str = bootOrderOptions[i].trim(); + str = str.toLowerCase(); + if (str === "hdd") { + str = "hd"; + } else if (str === "cd-rom") { + str = "cdrom"; + } + formattedBootOrderOptions.push(str); + } + var data = { + bootorder: formattedBootOrderOptions + }; + kimchi.updateVM(kimchi.selectedGuest, data, function() { + wok.window.close(); + }, function(err) { + wok.message.error(err.responseJSON.reason,'#alert-modal-container'); + }); }; var permissionSubmit = function(event) { diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index d8a482c..9cc73b6 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ </div> <div class="modal-body"> <span id="alert-modal-container"></span> -<ul class="nav nav-tabs" role="tablist"> + <ul class="nav nav-tabs" role="tablist"> <li role="presentation" class="active"><a href="#form-guest-edit-general" aria-controls="form-guest-edit-general" role="tab" data-id="form-guest-edit-general" data-toggle="tab">$_("General")</a></li> <li role="presentation"><a href="#form-guest-edit-storage" aria-controls="form-guest-edit-storage" role="tab" data-id="form-guest-edit-storage" data-toggle="tab">$_("Storage")</a></li> <li role="presentation"><a href="#form-guest-edit-interface" aria-controls="form-guest-edit-interface" role="tab" data-id="form-guest-edit-interface" data-toggle="tab">$_("Interface")</a></li> @@ -68,6 +68,19 @@ <option value="virtio">$_("virtio")</option> </select> </div> + <div class="form-group"> + <div id="bootOrder"> + <label for="guest-edit-boot-order-textbox">Boot Order</label> + <ul id="myList" class="list-group boot-order"> + <li class="list-group-item" data-value="CD-ROM">CD-ROM</li> + <li class="list-group-item" data-value="HDD">HDD</li> + <li class="list-group-item" data-value="Network">Network</li> + </ul> + <p class="help-block"> + <i class="fa fa-info-circle"></i> $_("Change the boot order by dragging the items on the list.")</p> + </p> + </div> + </div> </form> <form role="tabpanel" class="tab-pane" id="form-guest-edit-storage"> <div class="btn-group action-area"> @@ -197,7 +210,6 @@ $_("Current CPU must be equal or lower than the Maximum CPU value. If a topology is set, it must be also be a multiple of the 'threads' value.") </p> </div> - <div id="guest-max-processor-panel" class="form-group"> <label for="guest-edit-max-processor-textbox">$_("Max CPU")</label> <p id="settings-readonly-help" class="hidden">$_("Unable to edit maximum CPU or CPU topology when editing a running or paused virtual machine.")</p> -- 2.9.3

2 1

[PATCH] [Kimchi] Fix issue #1069: Allow user specifies the Template name when creating it
by Aline Manera 09 Jan '17

09 Jan '17

When user creates a Template, now he/she can specify the Template name otherwise, it will be automatically chosen. The Template name is not taken in count when the user selected more than one Image Template. In that case, a name will be automatically chosen for each Image Template selected. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_add_main.js | 24 +++++++++++++++++++++++- ui/pages/template-add.html.tmpl | 10 +++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index 64d67c1..89d86e3 100644 --- a/ui/js/src/kimchi.template_add_main.js +++ b/ui/js/src/kimchi.template_add_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -255,6 +255,13 @@ kimchi.template_add_main = function() { $('#iso-file').val(''); $('#iso-url').val(''); + if (checkedLength && checkedLength != 1) { + $('#tmpl-name').val(''); + $('#tmpl-name').attr('disabled', 'disabled'); + } else { + $('#tmpl-name').removeAttr('disabled'); + } + $('#btn-template-file-create').attr('disabled', 'disabled').css('display', 'none'); // 1 - Folder path $('#btn-template-local-iso-create').attr('disabled', 'disabled').css('display', 'inline-block'); // 2 - Selected ISOs $('#btn-template-netboot-create').attr('disabled', 'disabled').css('display', 'none'); // 3 - Netboot @@ -271,9 +278,15 @@ kimchi.template_add_main = function() { }); $('#btn-template-netboot-create').click(function() { + var tmpl_name = $('#tmpl-name').val(); var data = { "source_media": {"type": "netboot"} }; + + if (tmpl_name && tmpl_name != "") { + data['name'] = tmpl_name + } + addTemplate(data, function() { $('#btn-template-netboot-create').text(i18n['KCHAPI6005M']); $('#btn-template-netboot-create').prop('disabled', false); @@ -281,6 +294,7 @@ kimchi.template_add_main = function() { }); $('#btn-template-local-iso-create').click(function() { + var tmpl_name = $('#tmpl-name').val(); $('input', '#iso-file-box').prop('disabled', true); $('#btn-template-local-iso-create').text(i18n['KCHAPI6008M']); $('#btn-template-local-iso-create').prop('disabled', true); @@ -288,6 +302,7 @@ kimchi.template_add_main = function() { }); $('#btn-template-file-create').click(function() { + var tmpl_name = $('#tmpl-name').val(); var isoFile = $('#iso-file').val(); $('input', '#iso-file-box').prop('disabled', true); $('#btn-template-file-create').text(i18n['KCHAPI6008M']); @@ -299,6 +314,9 @@ kimchi.template_add_main = function() { var data = { "source_media": {"type": "disk", "path": isoFile} }; + if (tmpl_name && tmpl_name != "") { + data['name'] = tmpl_name + } addTemplate(data, function() { $('input', '#iso-file-box').prop('disabled', false); $('#btn-template-file-create').text(i18n['KCHAPI6005M']); @@ -440,11 +458,15 @@ kimchi.template_add_main = function() { var length = 0; var successNum = 0; var addTemplate = function(isoInfo) { + var tmpl_name = $('#tmpl-name').val(); var data = { "os_distro": isoInfo.os_distro, "os_version": isoInfo.os_version, "source_media": {"type": "disk", "path": isoInfo.path} }; + if (length == 1 && tmpl_name && tmpl_name != "") { + data['name'] = tmpl_name + } kimchi.createTemplate(data, function() { successNum++; $('input[value="' + isoInfo.isoId + '"]').prop('checked', false); diff --git a/ui/pages/template-add.html.tmpl b/ui/pages/template-add.html.tmpl index 4028f90..007511f 100644 --- a/ui/pages/template-add.html.tmpl +++ b/ui/pages/template-add.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,6 +30,14 @@ <div class="modal-body"> <div class="template-modal-container"> <div id="alert-modal-container"></div> + <div class="form-group"> + <label for="tmpl-name">$_("Template Name")</label> + <input type="text" class="form-control" name="name" id="tmpl-name" /> + <p class="help-block"><i class="fa fa-info-circle"></i> $_("The name used to identify the template. If omitted, a name will be automatically chosen.") + </p> + <p class="help-block"><i class="fa fa-info-circle"></i> $_("When selecting more than one Image Template, a name will be automatically chosen for each Image Template selected.") + </p> + </div> <div> <h5>$_("Where is the source media for this template? ")</h5> <input type="radio" checked="checked" name="iso-source" id="image-src" value="image-src" class="wok-radio"> -- 2.7.4

2 2

[PATCH] [Kimchi 0/3] Live migration RDMA support
by dhbarboza82＠gmail.com 05 Jan '17

05 Jan '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> This patch set adds Live Migration RDMA support in Kimchi. The backend/frontend will not verify if the network card is RDMA capable before doing the migration. User will have to deal with the libvirt errors in case RDMA is chosen without proper support/setup. Daniel Henrique Barboza (3): Live migration RDMA support: doc changes Live migration RDMA support: model changes Live migration RDMA support: ui changes API.json | 5 +++++ control/vms.py | 5 +++-- docs/API.md | 1 + i18n.py | 3 ++- model/vms.py | 18 ++++++++++++++---- ui/js/src/kimchi.guest_livemigration.js | 7 ++++--- ui/pages/guest-migration.html.tmpl | 6 +++++- 7 files changed, 34 insertions(+), 11 deletions(-) -- 2.7.4

1 3

[PATCH] [Wok] Always install firewalld conf for all distributions
by Lucio Correia 05 Jan '17

05 Jan '17

Even if firewalld is not installed, Wok should install specific wokd.xml for it, for the case firewalld is installed afterwards. This patch does that by removing checks for existing firewalld directory and removing all build and runtime dependencies on firewalld, since it's not required to run Wok. Also, by always installing config for firealld, it fixes issues #27 and #185 another way. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- Makefile.am | 14 +++++++------- contrib/wok.spec.fedora.in | 4 +--- contrib/wok.spec.suse.in | 2 +- docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 72ffb50..7b34dca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -98,6 +98,9 @@ install-deb: install $(DESTDIR)/etc/init/wokd.conf; \ fi $(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/wok/ + $(MKDIR_P) $(DESTDIR)/usr/lib/firewalld/services + cp -R $(top_srcdir)/src/firewalld.xml \ + $(DESTDIR)/usr/lib/firewalld/services/wokd.xml deb: contrib/make-deb.sh @@ -143,10 +146,8 @@ install-data-local: $(INSTALL_DATA) contrib/wokd.sysvinit $(DESTDIR)/etc/init.d/wokd; \ chmod +x $(DESTDIR)/etc/init.d/wokd; \ fi; \ - if test -d /usr/lib/firewalld/services/; then \ - mkdir -p $(DESTDIR)/usr/lib/firewalld/services/; \ - $(INSTALL_DATA) src/firewalld.xml $(DESTDIR)/usr/lib/firewalld/services/wokd.xml; \ - fi; \ + mkdir -p $(DESTDIR)/usr/lib/firewalld/services/; + $(INSTALL_DATA) src/firewalld.xml $(DESTDIR)/usr/lib/firewalld/services/wokd.xml; mkdir -p $(DESTDIR)/$(localstatedir)/lib/wok/ mkdir -p $(DESTDIR)/$(localstatedir)/log/wok/ touch $(DESTDIR)/$(localstatedir)/log/wok/wok-access.log @@ -165,9 +166,8 @@ uninstall-local: $(RM) $(DESTDIR)/etc/init.d/wokd; \ $(RM) $(DESTDIR)/etc/init/wok.conf; \ fi; \ - if test -d /usr/lib/firewalld/services/; then \ - $(RM) $(DESTDIR)/usr/lib/firewalld/services/wokd.xml; \ - fi; \ + $(RM) $(DESTDIR)/usr/lib/firewalld/services/wokd.xml + rmdir $(DESTDIR)/usr/lib/firewalld/services && rmdir $(DESTDIR)/usr/lib/firewalld || : $(RM) -rf $(DESTDIR)/$(localstatedir)/lib/wok $(RM) -rf $(DESTDIR)/$(localstatedir)/log/wok $(RM) -rf $(DESTDIR)/etc/wok diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in index 0119381..fcada13 100644 --- a/contrib/wok.spec.fedora.in +++ b/contrib/wok.spec.fedora.in @@ -21,7 +21,6 @@ Requires: fontawesome-fonts Requires: open-sans-fonts Requires: logrotate Requires: openssl -BuildRequires: firewalld BuildRequires: gettext-devel BuildRequires: libxslt BuildRequires: openssl @@ -39,7 +38,6 @@ BuildRequires: python-unittest2 %if 0%{?with_systemd} Requires: systemd -Requires: firewalld Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -115,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/wok/plugins/*.py* %{python_sitelib}/wok/ %{_prefix}/share/locale/*/LC_MESSAGES/wok.mo +%{_prefix}/lib/firewalld/services/wokd.xml %{_datadir}/wok/ui/ %{_datadir}/wok %{_sysconfdir}/wok/wok.conf @@ -128,7 +127,6 @@ rm -rf $RPM_BUILD_ROOT %{_localstatedir}/log/wok/* %{_localstatedir}/log/wok/ %{_unitdir}/wokd.service -%{_prefix}/lib/firewalld/services/wokd.xml %endif %if 0%{?rhel} == 6 /etc/init/wokd.conf diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 8bed37a..ea2e708 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -22,7 +22,6 @@ Requires: fontawesome-fonts Requires: google-opensans-fonts Requires: logrotate Requires: openssl -BuildRequires: firewalld BuildRequires: gettext-tools BuildRequires: libxslt-tools BuildRequires: openssl @@ -110,6 +109,7 @@ rm -rf $RPM_BUILD_ROOT %{_localstatedir}/log/wok/* %{_localstatedir}/log/wok/ %{_mandir}/man8/wokd.8.gz +%{_prefix}/lib/firewalld/services/wokd.xml %if 0%{?with_systemd} %{_unitdir}/wokd.service diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index fa99f30..260390e 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -20,7 +20,7 @@ Build Dependencies -------------------- $ sudo yum install gcc make autoconf automake gettext-devel git rpm-build \ - libxslt firewalld + libxslt Runtime Dependencies -------------------- diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index ad4ed92..7fe1763 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -10,7 +10,7 @@ Build Dependencies -------------------- $ sudo zypper install gcc make autoconf automake gettext-tools git \ - rpm-build libxslt-tools firewalld + rpm-build libxslt-tools Runtime Dependencies -------------------- -- 2.7.4

2 1

[PATCH] [Wok] Fix typo in settings.css
by Lucio Correia 05 Jan '17

05 Jan '17

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- ui/css/settings.css | 2 +- ui/css/src/modules/_wok-accordion.scss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/css/settings.css b/ui/css/settings.css index 641b805..ec3c086 100644 --- a/ui/css/settings.css +++ b/ui/css/settings.css @@ -37,7 +37,7 @@ clear: both; } -#wok-root-container .accordion:first-chld { +#wok-root-container .accordion:first-child { margin-top: 24px; } diff --git a/ui/css/src/modules/_wok-accordion.scss b/ui/css/src/modules/_wok-accordion.scss index 1d86ddd..ee91709 100644 --- a/ui/css/src/modules/_wok-accordion.scss +++ b/ui/css/src/modules/_wok-accordion.scss @@ -22,7 +22,7 @@ border-bottom: 1px solid $table-border-color; overflow: visible; clear: both; - &:first-chld { + &:first-child { margin-top: 24px; } > h3 { @@ -65,4 +65,4 @@ } } } -} \ No newline at end of file +} -- 2.7.4

2 1

[PATCH] [Wok] Remove execution permission from css files
by Lucio Correia 05 Jan '17

05 Jan '17

Debian build system has detected unnecessary execution permission bits in some files. Fix them. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- ui/css/src/vendor/compass-mixins/lib/compass/functions/_display.scss | 0 ui/css/src/wok.scss | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 ui/css/src/vendor/compass-mixins/lib/compass/functions/_display.scss mode change 100755 => 100644 ui/css/src/wok.scss diff --git a/ui/css/src/vendor/compass-mixins/lib/compass/functions/_display.scss b/ui/css/src/vendor/compass-mixins/lib/compass/functions/_display.scss old mode 100755 new mode 100644 diff --git a/ui/css/src/wok.scss b/ui/css/src/wok.scss old mode 100755 new mode 100644 -- 2.7.4

2 1

[PATCH] [Kimchi] Bug fix #1073: Re-attach device to host when detaching it from guest
by Aline Manera 04 Jan '17

04 Jan '17

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/vmhostdevs.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index 1f893f2..6b02f4d 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -636,6 +636,13 @@ class VMHostDevModel(object): return wok_log.info("Device %s removed successfuly" % alias) + # Re-attach device to host + try: + dev = conn.get().nodeDeviceLookupByName(alias) + dev.reAttach() + except libvirt.libvirtError, e: + wok_log.error("Unable to attach device %s back to host. Error: %s", + alias, e.message) opaque._cb('OK', True) def _detach_device(self, cb, params): -- 2.7.4

2 2

[PATCH v2] [Kimchi] Issue# 979 - Change boot order UI
by bianca＠linux.vnet.ibm.com 04 Jan '17

04 Jan '17

From: Socorro <socorro(a)linux.vnet.ibm.com> This patch adds the UI portion for supporting changing the guest boot order via edit guest panel. This was based off of what Samuel had prototyped. Issue found in backend during test: When updating the VM even with just changing the name, the bootorder gets reset to 'hd' only. I tested this using the curl command and confirmed that indeed it does get reset to one entry only. Issue written to address this: https://github.com/kimchi-project/kimchi/issues/1012 Signed-off-by: Socorro <socorro(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 55 +++++++++++++++++++++++++++++ ui/css/src/modules/_edit-guests.scss | 54 ++++++++++++++++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 68 ++++++++++++++++++++++++++++++++++-- ui/pages/guest-edit.html.tmpl | 18 ++++++++-- 4 files changed, 191 insertions(+), 4 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index fff3279..ae5e37b 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -1557,6 +1557,61 @@ body.wok-gallery { overflow: visible; } +ul { + cursor: default; +} + +.boot-order { + display: block; + width: 85%; + font-size: 14px; + line-height: 1.42857; + color: #444; + overflow: hidden; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} + +.boot-order:focus, +.boot-order.focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); +} + +.boot-order > li { + cursor: move; + /* fallback if grab cursor is unsupported */ + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; + border-left: 0; + border-right: 0; +} + +.boot-order > li:first-child { + border-top: 0; +} + +.boot-order > li:last-child { + border-bottom: 0; +} + +.boot-order > li.ui-sortable-helper { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; + border: 1px solid #ccc !important; +} + /* Add Template Modal Window */ .templates-modal .modal-dialog { width: 1100px; diff --git a/ui/css/src/modules/_edit-guests.scss b/ui/css/src/modules/_edit-guests.scss index 25d4d65..ea3ee9d 100644 --- a/ui/css/src/modules/_edit-guests.scss +++ b/ui/css/src/modules/_edit-guests.scss @@ -429,3 +429,57 @@ #form-guest-storage-add .form-section .field { overflow: visible; } + +ul { + cursor: default; +} + +.boot-order { + display: block; + width: 85%; + font-size: 14px; + line-height: 1.42857; + color: #444; + overflow: hidden; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} + +.boot-order:focus, +.boot-order.focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); +} + +.boot-order > li { + cursor: move; /* fallback if grab cursor is unsupported */ + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; + border-left: 0; + border-right: 0; +} + +.boot-order > li:first-child { + border-top: 0; +} + +.boot-order > li:last-child { + border-bottom: 0; +} + +.boot-order > li.ui-sortable-helper { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; + border: 1px solid #ccc !important; +} diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index bb82077..12c0770 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -26,6 +26,7 @@ kimchi.guest_edit_main = function() { var networkOptions = ""; clearTimeout(kimchi.vmTimeout); + var bootOrderOptions = []; $('#modalWindow').on('hidden.bs.modal', function() { kimchi.setListVMAutoTimeout(); @@ -45,11 +46,12 @@ kimchi.guest_edit_main = function() { var submitForm = function(event) { - // tap map, "general": 0, "storage": 1, "interface": 2, "permission": 3, "password": 4 + // tap map, "general": 0, "storage": 1, "interface": 2, "permission": 3, "pci": 4, "snapshot": 5, "processor": 6, "bootOrder": 7 var submit_map = { 0: generalSubmit, 3: permissionSubmit, - 6: processorSubmit + 6: processorSubmit, + 7: bootOrderSubmit }; var currentTab = $('#guest-edit-window li.active a[data-toggle="tab"]').data('id'); var toSubmit = parseInt($('#'+currentTab).index()); @@ -967,6 +969,42 @@ kimchi.guest_edit_main = function() { } }; + var setupBootOrder = function(guest) { + var guestBootOrder = guest['bootorder']; + $("#myList").empty(); + $.each(guestBootOrder, function(index, value) { + var itemNode = $.parseHTML("<li class='list-group-item' " + "data-value=" + value + ">" + value + "</li>"); + $("#myList").append(itemNode); + }); + + $('.boot-order').sortable({ + items: 'li', + cursor: 'move', + opacity: 0.6, + containment: "parent", + start: function(event, ui) { + $(this).addClass('focus'); + }, + stop: function(event, ui) { + $(this).removeClass('focus'); + }, + change: function(event, ui) { + // callback once started changing order + }, + update: function(event, ui) { + // callback once finished order + $(saveButton).prop('disabled', false); + bootOrderOptions = []; + $("#myList li").each(function() { + bootOrderOptions.push($(this).text()) + }); + bootOrderOptions.forEach(function(entry) { + console.log(entry); + }); + } + }); + }; + var initContent = function(guest) { guest['icon'] = guest['icon'] || 'plugins/kimchi/images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); @@ -1032,6 +1070,7 @@ kimchi.guest_edit_main = function() { setupPermission(); setupPCIDevice(); setupSnapshot(); + setupBootOrder(guest); kimchi.init_processor_tab(guest.cpu_info, $(saveButton)); if ((kimchi.thisVMState === "running") || (kimchi.thisVMState === "paused")) { @@ -1221,4 +1260,29 @@ kimchi.guest_edit_main = function() { if(kimchi.hostarch === s390xArch){ $('#guest-edit-window ul li a[data-id="form-guest-edit-pci"],a[data-id="form-guest-edit-snapshot"]').parent().hide(); } + + var bootOrderSubmit = function(event) { + //Format the strings to go in the array before passing in to the API + //"hd", "network", "cdrom" + var formattedBootOrderOptions = []; + for (var i=0; i<bootOrderOptions.length; i++) { + var str = bootOrderOptions[i].trim(); + str = str.toLowerCase(); + if (str === "hdd") { + str = "hd"; + } else if (str === "cd-rom") { + str = "cdrom"; + } + formattedBootOrderOptions.push(str); + } + var data = { + bootorder: formattedBootOrderOptions + }; + kimchi.updateVM(kimchi.selectedGuest, data, function() { + wok.window.close(); + }, function(err) { + wok.message.error(err.responseJSON.reason,'#alert-modal-container'); + }); + }; + }; diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index d8a482c..5424250 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -30,7 +30,7 @@ </div> <div class="modal-body"> <span id="alert-modal-container"></span> -<ul class="nav nav-tabs" role="tablist"> + <ul class="nav nav-tabs" role="tablist"> <li role="presentation" class="active"><a href="#form-guest-edit-general" aria-controls="form-guest-edit-general" role="tab" data-id="form-guest-edit-general" data-toggle="tab">$_("General")</a></li> <li role="presentation"><a href="#form-guest-edit-storage" aria-controls="form-guest-edit-storage" role="tab" data-id="form-guest-edit-storage" data-toggle="tab">$_("Storage")</a></li> <li role="presentation"><a href="#form-guest-edit-interface" aria-controls="form-guest-edit-interface" role="tab" data-id="form-guest-edit-interface" data-toggle="tab">$_("Interface")</a></li> @@ -38,6 +38,7 @@ <li role="presentation"><a href="#form-guest-edit-pci" aria-controls="form-guest-edit-pci" role="form-guest-edit-pci" data-id="form-guest-edit-pci" data-toggle="tab">$_("Pci")</a></li> <li role="presentation"><a href="#form-guest-edit-snapshot" aria-controls="form-guest-edit-snapshot" role="tab" data-id="form-guest-edit-snapshot" data-toggle="tab">$_("Snapshot")</a></li> <li role="presentation"><a href="#form-edit-processor" aria-controls="form-edit-processor" role="tab" data-id="form-edit-processor" data-toggle="tab">$_("Processor")</a></li> + <li role="presentation"><a href="#form-guest-edit-boot-order" aria-controls="form-guest-edit-boot-order" role="tab" data-id="form-guest-edit-boot-order" data-toggle="tab">Boot Order</a></li> </ul> <div class="tab-content" id="guest-edit-tabs"> <form role="tabpanel" class="tab-pane active" id="form-guest-edit-general"> @@ -197,7 +198,6 @@ $_("Current CPU must be equal or lower than the Maximum CPU value. If a topology is set, it must be also be a multiple of the 'threads' value.") </p> </div> - <div id="guest-max-processor-panel" class="form-group"> <label for="guest-edit-max-processor-textbox">$_("Max CPU")</label> <p id="settings-readonly-help" class="hidden">$_("Unable to edit maximum CPU or CPU topology when editing a running or paused virtual machine.")</p> @@ -231,6 +231,20 @@ </div> </div> </form> + <form role="tabpanel" class="tab-pane" id="form-guest-edit-boot-order"> + <div class="form-group"> + <div id="bootOrder"> + <ul id="myList" class="list-group boot-order"> + <li class="list-group-item" data-value="CD-ROM">CD-ROM</li> + <li class="list-group-item" data-value="HDD">HDD</li> + <li class="list-group-item" data-value="Network">Network</li> + </ul> + <p class="help-block"> + <i class="fa fa-info-circle"></i> $_("Change the boot order by dragging the items on the list.")</p> + </p> + </div> + </div> + </form> </div> </div> <div class="modal-footer"> -- 2.9.3

3 2