- Kimchi-devel - oVirt List Archives

[PATCH] [Wok] Track submodules master branch
by Aline Manera 02 Dec '15

02 Dec '15

That way, the developer can run: $ git submodule update --remote To get all the new changes on master branch for each submodule without needing to enter each submodule directory to get it updated. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitmodules b/.gitmodules index 5838ebf..c9bc289 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,11 +2,14 @@ path = src/wok/plugins/kimchi url = https://github.com/kimchi-project/kimchi.git ignore = all + branch = master [submodule "src/wok/plugins/ginger"] path = src/wok/plugins/ginger url = https://github.com/kimchi-project/ginger.git ignore = all + branch = master [submodule "src/wok/plugins/gingerbase"] path = src/wok/plugins/gingerbase url = https://github.com/kimchi-project/gingerbase ignore = all + branch = master -- 2.5.0

2 2

[PATCH 0/9 - v6] Multiple disks in Template, updates objectstore, add max vcpu and topology support, removes 'storagepool' tag
by Rodrigo Trujillo 02 Dec '15

02 Dec '15

v6 - Fix problems in UI related to remotion of 'storagepool' from Templates V5 - Include script to update old templates in objectstore - Remove dependency and use of 'storagepool' tag from Templates - Fixes backend and tests problems found V4 - Include patch with support to max vcpu and other changes in vm backend to support cpu hot plug in the future. - Fixes vm update problem (offline update was not atomic) V3 - Addresses Aline's comments * fixes backend, API.md and API.json * fixes test cases and add new test V2 - Rebase over latest new UI patches V1 - Initial version Rodrigo Trujillo (9): Fix Template backend create/update for multiple disks Enable create guests with multiple disks from different pools UI - Implement multiple disks support in Template edit window Update VCPU by using libvirt function Test: Fix and add test related to disks in templates Remove 'stogarepool' referencies from Templates code backend Add script to upgrade objectstore to support new Template disks schema Fix tests and backend after remove 'storagepool' from templates Change UI to support remotion of 'storagepool' from template backend src/wok/plugins/kimchi/API.json | 43 ++-- src/wok/plugins/kimchi/control/templates.py | 1 - src/wok/plugins/kimchi/docs/API.md | 11 +- src/wok/plugins/kimchi/i18n.py | 5 + src/wok/plugins/kimchi/mockmodel.py | 60 +++-- src/wok/plugins/kimchi/model/storagepools.py | 10 +- src/wok/plugins/kimchi/model/templates.py | 85 +++---- src/wok/plugins/kimchi/model/vms.py | 130 +++++++++-- src/wok/plugins/kimchi/osinfo.py | 14 +- src/wok/plugins/kimchi/root.py | 2 + src/wok/plugins/kimchi/template.conf | 7 +- src/wok/plugins/kimchi/tests/test_model.py | 65 +++--- src/wok/plugins/kimchi/tests/test_rest.py | 41 ++-- src/wok/plugins/kimchi/tests/test_template.py | 76 +++++-- src/wok/plugins/kimchi/tests/test_vmtemplate.py | 9 +- .../kimchi/ui/js/src/kimchi.template_edit_main.js | 249 ++++++++++----------- .../kimchi/ui/pages/template-edit.html.tmpl | 5 +- src/wok/plugins/kimchi/utils.py | 49 +++- src/wok/plugins/kimchi/vmtemplate.py | 110 ++++++--- 19 files changed, 606 insertions(+), 366 deletions(-) -- 2.1.0

1 9

[PATCH 0/8 - v5] Multiple disks in Template, updates objectstore, add max vcpu and topology support
by Rodrigo Trujillo 02 Dec '15

02 Dec '15

V5 - Include script to update old templates in objectstore - Remove dependency and use of 'storagepool' tag from Templates - Fixes backend and tests problems found V4 - Include patch with support to max vcpu and other changes in vm backend to support cpu hot plug in the future. - Fixes vm update problem (offline update was not atomic) V3 - Addresses Aline's comments * fixes backend, API.md and API.json * fixes test cases and add new test V2 - Rebase over latest new UI patches V1 - Initial version Rodrigo Trujillo (8): Fix Template backend create/update for multiple disks Enable create guests with multiple disks from different pools UI - Implement multiple disks support in Template edit window Update VCPU by using libvirt function Test: Fix and add test related to disks in templates Remove 'stogarepool' referencies from Templates code backend Add script to upgrade objectstore to support new Template disks schema Fix tests and backend after remove 'storagepool' from templates src/wok/plugins/kimchi/API.json | 43 ++-- src/wok/plugins/kimchi/control/templates.py | 1 - src/wok/plugins/kimchi/docs/API.md | 11 +- src/wok/plugins/kimchi/i18n.py | 5 + src/wok/plugins/kimchi/mockmodel.py | 60 +++-- src/wok/plugins/kimchi/model/storagepools.py | 10 +- src/wok/plugins/kimchi/model/templates.py | 85 +++---- src/wok/plugins/kimchi/model/vms.py | 130 +++++++++-- src/wok/plugins/kimchi/osinfo.py | 14 +- src/wok/plugins/kimchi/root.py | 2 + src/wok/plugins/kimchi/template.conf | 7 +- src/wok/plugins/kimchi/tests/test_model.py | 65 +++--- src/wok/plugins/kimchi/tests/test_rest.py | 41 ++-- src/wok/plugins/kimchi/tests/test_template.py | 76 +++++-- src/wok/plugins/kimchi/tests/test_vmtemplate.py | 9 +- .../kimchi/ui/js/src/kimchi.template_edit_main.js | 246 ++++++++++----------- .../kimchi/ui/pages/template-edit.html.tmpl | 5 +- src/wok/plugins/kimchi/utils.py | 49 +++- src/wok/plugins/kimchi/vmtemplate.py | 110 ++++++--- 19 files changed, 605 insertions(+), 364 deletions(-) -- 2.1.0

1 9

[PATCH] [Wok] Configure to ignore changes in Wok submodules.
by pvital＠linux.vnet.ibm.com 02 Dec '15

02 Dec '15

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> After update or change any of the Wok submodules, the modifications will be listed as Wok changes. Add configuration to ignore all changes of in Wok submodules. The value for each submodule can be "untracked", "dirty" or "all". When "untracked" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using "dirty" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior before 1.7.0). Using "all" hides all changes to submodules (and suppresses the output of submodule summaries when the config option status.submodulesummary is set). This patch sets "ignore = all" for all Wok submodules. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitmodules b/.gitmodules index 00d2644..69760eb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,12 @@ [submodule "src/wok/plugins/kimchi"] path = src/wok/plugins/kimchi url = https://github.com/kimchi-project/kimchi.git + ignore = all [submodule "src/wok/plugins/ginger"] path = src/wok/plugins/ginger url = https://github.com/kimchi-project/ginger.git + ignore = all [submodule "src/wok/plugins/gingerbase"] path = src/wok/plugins/gingerbase url = https://github.com/kimchi-project/gingerbase + ignore = all -- 2.5.0

2 1

[PATCH 0/2] Live Migration UI v2
by sguimaraes943＠gmail.com 02 Dec '15

02 Dec '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> This patch addes Live Migration functionality to the new-ui. I'm attaching Socorro initial commit because I had to merge and resolve conflicts with the current new-ui version of Guests tab. Socorro Stoppler (1): Initial checkin for live migration UI support samhenri (1): Fixing Live Migration for the new-ui Guests tab src/wok/plugins/ginger | 2 +- src/wok/plugins/kimchi/ui/js/src/kimchi.api.js | 3 +- .../kimchi/ui/js/src/kimchi.guest_livemigration.js | 115 +++++++++++++++++++++ .../plugins/kimchi/ui/js/src/kimchi.guest_main.js | 82 ++++++++++++++- .../kimchi/ui/pages/guest-migration.html.tmpl | 67 ++++++++++++ src/wok/plugins/kimchi/ui/pages/guest.html.tmpl | 3 +- src/wok/plugins/kimchi/ui/pages/i18n.json.tmpl | 2 + src/wok/plugins/kimchi/ui/pages/network.html.tmpl | 1 - ui/css/src/modules/_validation.scss | 11 ++ ui/css/src/wok.scss | 2 + 10 files changed, 279 insertions(+), 9 deletions(-) create mode 100644 src/wok/plugins/kimchi/ui/js/src/kimchi.guest_livemigration.js create mode 100644 src/wok/plugins/kimchi/ui/pages/guest-migration.html.tmpl create mode 100644 ui/css/src/modules/_validation.scss -- 1.9.3

2 3

[PATCH] Applying new ui to Admin New Custom Backup
by sguimaraes943＠gmail.com 01 Dec '15

01 Dec '15

From: Andre Teodoro <andreteodoro.work(a)gmail.com> Signed-off-by: Andre Teodoro <andreteodoro.work(a)gmail.com> --- ui/css/src/modules/_administration.scss | 30 ++++++++++++---- ui/js/host-admin.js | Bin 35177 -> 34874 bytes ui/pages/host-admin.html.tmpl | 62 ++++++++++++++++++++------------ 3 files changed, 63 insertions(+), 29 deletions(-) diff --git a/ui/css/src/modules/_administration.scss b/ui/css/src/modules/_administration.scss index 2a79dce..84479f1 100644 --- a/ui/css/src/modules/_administration.scss +++ b/ui/css/src/modules/_administration.scss @@ -17,13 +17,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #administration-root-container { - .fa { - margin-left: 20px; - font-size: 20px; - color: #5a595b; - } + // .fa { + // margin-left: 20px; + // font-size: 20px; + // color: #5a595b; + // } h3 { height: 32px; padding: 10px 15px; @@ -369,4 +368,23 @@ width: 10%; height: auto; } +} + +#newBakDialog { + .del-label { + color: #9e9e9e; + font-size: 14px; + } + .fa { + padding: 1px 3px; + font-size: 18px; + margin-left: 0; + } + .fa-plus-circle { + margin-bottom: 5px; + } + .path-item { + display: flex; + margin-bottom: 10px; + } } \ No newline at end of file diff --git a/ui/js/host-admin.js b/ui/js/host-admin.js index f34fafd05a11a2f0e7e22f2b9c50f1c980bb8d79..d43bd3c9326be081be832fb3c41d0a0e4a43b460 100644 GIT binary patch delta 1259 zcmZ`(O>Em_7-p5bIL@Errb*g$tK+0~yvz-q1RZOVZVU$MAV615{7u4%zffzAoyJZ# zeySeeunTJG!v!t~G$Fx-qV9m;01_8Y{M@)8CO9D>F(jlODt<mYiP~+dCF}j($M5(0 z{hsH2zuz|pzStPpxOM2h&u(2Bh{{=uTzy!(@`$0C_REMaPva_6z<)D?h#n8(CNmc@ z8e-mXE@`Hr<AZh@y9|$amf|RPhVlO8v7Vnpm2miYB!-2-BE&!n7v~jhoMynXXR*!> zqsA)Kp2Ou=NAS{N20LsPx35RB^*n<K?g-Z32;*sv!M~?Mc#q}qdQd^^0*m8?WB5L} z(2I%SlM#;1<)tZ2*CjkNpAv{7zQ&3B9)jhGBlu^9#rU)A+9GjWB9_J6R7-0+<nhHP zpUBH4-B=Oprsg<hsinC~s^OBRRFTEP9htnOa>=k-9anT;X_2zzl54Ki-`TL+O|@=Y zZre6RKS~mdcO_Zt7ABXRmS*)g)@`%Xv{ap#gw|GbE$>xL!@45&Fltm&s}b|SqWZZS zn%L0PreSp)wQjWQCXp(oqET5OO?!ou7K`4G?<%TaQ<2h8k(Jpy4($o<E*Xx;7qQ$& zP12-B%#_8BrIUtX5gp5e2~XSy?~R-CS*>bK%6Yjg%2X!RXV|q>!>XGdoyd4QIEouw zGVFb*+B)$x!e1v7esgRIEG~p2Lt3jvEIofu%<bzjJVhe-^>8xji>vHAz$#sH_>&pK z`H5uw;LiAbcr2$Ar`|SNu3=lJMcPu?eSqo-U9+!YCvp;M^eC#)G$P3us%Zi1(IS4B z597P2g5Bs0e$Mee{$gwo|2Edezj|{JTYLaneir?;#Xr<rpTXb!15o1`G{XTr7oVgy zgB$S?YFW$)L4VYK^L-w?knQ0oU<+rtT)scQIF-7Hucrg}G<6i>{UKC`MmL23z6>ci z!!erzkJa!*ce$6h+(~qyaa0oNP0IV6kVYXggtrnb-c8KXp^Pv-qc3ph@F7>gkDP=Z zZU&Eq<Jjg#sedfzbMCd&UOnCWL{_G3D=#k@I>DMgnWVj`wa?R`$@diNs`X1s!OhT# w)Ik#b5t>FOEYW{T_$ln2B!d|t-n)f(iWR9Z(!yhhR=0N(<MHi}Ccmlu4_xMowEzGB delta 1501 zcma)6O>7fa5LUvjcfI~w|KK=I>}-~#cq{BWSfYue#A$+%Aguyb6_6;1wRaP*u)WrL z-Go#rR4Ru`98$hh4@kZj1Qn`~ddjJ%MisrcO}U^-ROM2&J(ai5PVAB#x|f+ZGdu5_ zneWZFTm8S??cdt{`q$<DoAR-mzBaF3KW(TLb5&L{8dXvs3sUD(o3^=B*K2ucMXfaS z6Z?*;si~E`WLwQ1<C>w_<-9bR&2|IJy0Kce^U|qaqh_hAtLkF0q8~_X=?!B;J<L<8 zm<{~{eVrteFUj2-Oa~wO*f?(4%-N=qZdZ}E4ZETjRVz(@lut-wsRISqRZFkgDMiUx zde!_$f5*11luZA`qoWaQ9664cS9$!L67cXy0V7xV$#&1qm{xV(u92n{o3?G%QbuE0 ztr(hAkYv5)6d+3ksAe>%u1pJP%?#l_lY=<Mgb0?5s%ZpOUA4<+ZM}-!!T^>OH(N4m z4N}k80Jc5MaNRPhs&#{;B9$4$m#$Zu4ZCcVuFLqe5XH`D2(1Yge;2~YpCd4@iAc<e z<Q5)cj={_20lWxGc=xs!Ef??KD><XC*t&&#7bS2)v`@ho>k<4h5r8Oic*aEVtZ?)o zp2R^sRipO*0A<~f*weUmk;B|150lOH=mMUw8K+`ASRTBa=h5#vMvpBeL}iQ{LTjDf zhuBUbV9lkFG%oz9jNv=i`>(}{crfFKnHZuyxUccJ6FiPwNXAaE0O!0O_8}39JGLQ* z^_yL074;R<(ia@wwF#E+b9f$5cxQT=-Y8)-JVBG(3Hoq59K>#v!6S_!Nt0Ah_($<1 zEaKWCgZIQ!Nccs#BP00f42ScgA3un4vG+nsrAA)5+<k%$CPO3h|1a;lD4hVi{VbLi zd)|d(FI5On9PCNTg)fC++MjO(k=-jGg5QNCwx?KlJ#BBw6T?P!0CPDWFX94J&s)_0 z?@SzDdEzv~FA|6EJz312i|xlHy@$tr?rq0yk>T!m7x2k6Pb80F-_*XY5<Pj6!#&?g zDu47Pk@=8=<Y(}g?+rrAam@M$iS!~HapS5O#0`3mkcI}}_D4FtSVw0tH_xLlFhxlw zGF<faH7C=>fTwJPhHOVunET9wrSTXNE;ni$9>gz%Fe~%a??8DTNO$yPXRdAEdGYOz z-PfKkyJvT1{3dPLKjL(Uz#=5g?cTgXx9O(x_)=sf818JR1@e~6Dp|^8x!?jfi0zwM V`H;=kS=F+${bXhOu`&L%_zJe6&u;(# diff --git a/ui/pages/host-admin.html.tmpl b/ui/pages/host-admin.html.tmpl index 7f4ceda..7e197bf 100644 --- a/ui/pages/host-admin.html.tmpl +++ b/ui/pages/host-admin.html.tmpl @@ -87,7 +87,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA <a href="#" id="newDefaultBakBtn"><i class="fa fa-file"></i>$_("Generate Default Backup")</a> </li> <li role="presentation"> - <a href="#" id="newCustomBakBtn"><i class="fa fa-file"></i>$_("New Custom Backup")</a> + <a href="#" id="newCustomBakBtn" data-toggle="modal" data-target="#newBakDialog"><i class="fa fa-file"></i>$_("New Custom Backup")</a> </li> <li role="presentation"> <a href="#" id="batDelBtn" data-toggle="modal" data-target="#batDelDialog"><i class="fa fa-minus-circle"></i>$_("Batch Delete")</a> @@ -262,21 +262,43 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA </div>  -<div id="newBakDialog" title='$_("Create a backup")' class="ginger-dialog"> - <div>$_("Description")</div> - <div class="crt-bak-section"><input type="text" class="desc"></div> - <div class="crt-bak-section"> - <div class="path-pick"> - <div>$_("Path Included")</div> - <div class="box" id="includeBox"></div> - </div> - <div class="path-pick"> - <div>$_("Path Excluded")</div> - <div class="box" id="excludeBox"></div> +<div class="modal fade host-modal" id="newBakDialog" tabindex="-1" role="dialog" labelledby="newBakLabel" aria-hidden="true"> + <div class="modal-dialog" role="document"> + <div class="modal-content" > + <div class="modal-header"> + <h4 class="modal-title">$_("Create a backup")</h4> + </div> + <div class="modal-body"> + <form id="form-backup-add"> + <div class="form-group"> + <label for="description-textbox">$_("Description")</label> + <input type="text" class="form-control input" id="description-textbox" name="description" /> + </div> + </form> + <div class="row"> + <div class="col-md-12"> + <div class="col-md-6" > + <label class="col-md-12">$_("Paths Included")</label> + <span class='add-path-to-include'><a class="add btn btn-link" href="#"><i class="fa fa-plus-circle"></i> $_("Add a Path")</a></span> + <div id="includeBox"></div> + </div> + <div class="col-md-6"> + <label class="col-md-12">$_("Paths Excluded")</label> + <span class='add-path-to-exclude'><a class="add btn btn-link" href="#"><i class="fa fa-plus-circle"></i> $_("Add a Path")</a></span> + <div id="excludeBox"></div> + </div> + </div> + </div> + </div> + <div class="modal-footer"> + <button type="button" id="newBakFormBtn" class="btn btn-default" data-dismiss="modal" disabled>$_("Generate Backup")</button> + <button type="button" id="newBakFormCancelBtn" class="btn btn-default" data-dismiss="modal">$_("Cancel")</button> + </div> </div> </div> </div> +  <div class="modal fade host-modal" id="batDelDialog" tabindex="-1" role="dialog" labelledby="batDelLabel" aria-hidden="true"> <div class="modal-dialog" role="document"> @@ -314,15 +336,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA </div> </div> - -  <div class="modal fade host-modal" id="subscriptionAdd" tabindex="-1" role="dialog" labelledby="hostsModalLabel" aria-hidden="true"> <div class="modal-dialog" role="document"> @@ -416,7 +429,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA <span class="column-file">{file}</span><span class="column-timestamp">{timestamp}</span><span class="column-download btn btn-link btn-download"><i class="fa fa-download"></i>$_("Download")</span><span class="column-delete btn btn-link btn-delete"><i class="fa fa-minus-circle"></i>$_("Remove")</span> + --><span class="column-delete btn btn-link btn-delete "><i class="fa fa-minus-circle"></i>$_("Remove")</span> </li> </script> <script id="backupTooltip" type="text/html"> @@ -428,7 +441,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA </div> </script> <script id="pathItem" type="text/html"> - <div class="path-item"><input type="text"><button class="add"></button><button class="delete"></button></div> + <div class="path-item"> + <input type="text" class="form-control input" /> + <span class="column-delete btn btn-link delete del-label"><i class="fa fa-minus-circle"></i>$_("Remove")</span> + </div> </script> <script id="nicItem" type="text/html"> <form class="form-inline"> -- 1.9.3

1 0

[PATCH] [Kimchi] Reverting model/config.py deleted on last commit
by Ramon Medeiros 01 Dec '15

01 Dec '15

The file was wrongly removed on last commit. Restore it to the correct location. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- model/config.py | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) create mode 100644 model/config.py diff --git a/model/config.py b/model/config.py new file mode 100644 index 0000000..e552edb --- /dev/null +++ b/model/config.py @@ -0,0 +1,155 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2014-2015 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +import cherrypy +from multiprocessing.pool import ThreadPool + +from wok.basemodel import Singleton +from wok.config import config as kconfig +from wok.config import get_version +from wok.exception import NotFoundError +from wok.utils import run_command, wok_log + +from wok.plugins.kimchi.config import find_qemu_binary +from wok.plugins.kimchi.distroloader import DistroLoader +from wok.plugins.kimchi.model.featuretests import FeatureTests +from wok.plugins.kimchi.model.featuretests import FEATURETEST_POOL_NAME +from wok.plugins.kimchi.model.featuretests import FEATURETEST_VM_NAME +from wok.plugins.kimchi.screenshot import VMScreenshot +from wok.plugins.kimchi.utils import check_url_path + + +class ConfigModel(object): + def __init__(self, **kargs): + pass + + def lookup(self, name): + proxy_port = kconfig.get('display', 'display_proxy_port') + return {'display_proxy_port': proxy_port, + 'version': get_version()} + + +class CapabilitiesModel(object): + __metaclass__ = Singleton + + def __init__(self, **kargs): + self.conn = kargs['conn'] + self.qemu_stream = False + self.libvirt_stream_protocols = [] + self.fc_host_support = False + self.kernel_vfio = False + self.mem_hotplug_support = False + + # Subscribe function to set host capabilities to be run when cherrypy + # server is up + # It is needed because some features tests depends on the server + cherrypy.engine.subscribe('start', self._set_capabilities) + + # Subscribe function to clean any Kimchi leftovers + cherrypy.engine.subscribe('stop', self._clean_leftovers) + + def _clean_leftovers(self): + conn = self.conn.get() + FeatureTests.disable_libvirt_error_logging() + try: + dom = conn.lookupByName(FEATURETEST_VM_NAME) + dom.undefine() + except Exception: + # Any exception can be ignored here + pass + + try: + pool = conn.storagePoolLookupByName(FEATURETEST_POOL_NAME) + pool.undefine() + except Exception: + # Any exception can be ignored here + pass + + FeatureTests.enable_libvirt_error_logging() + + def _set_capabilities(self): + wok_log.info("*** Running feature tests ***") + conn = self.conn.get() + self.qemu_stream = FeatureTests.qemu_supports_iso_stream() + self.nfs_target_probe = FeatureTests.libvirt_support_nfs_probe(conn) + self.fc_host_support = FeatureTests.libvirt_support_fc_host(conn) + self.kernel_vfio = FeatureTests.kernel_support_vfio() + self.mem_hotplug_support = FeatureTests.has_mem_hotplug_support(conn) + + self.libvirt_stream_protocols = [] + for p in ['http', 'https', 'ftp', 'ftps', 'tftp']: + if FeatureTests.libvirt_supports_iso_stream(conn, p): + self.libvirt_stream_protocols.append(p) + + wok_log.info("*** Feature tests completed ***") + _set_capabilities.priority = 90 + + def _qemu_support_spice(self): + qemu_path = find_qemu_binary(find_emulator=True) + out, err, rc = run_command(['ldd', qemu_path]) + if rc != 0: + wok_log.error('Failed to find qemu binary dependencies: %s', + err) + return False + for line in out.split('\n'): + if line.lstrip().startswith('libspice-server.so'): + return True + return False + + def lookup(self, *ident): + return {'libvirt_stream_protocols': self.libvirt_stream_protocols, + 'qemu_spice': self._qemu_support_spice(), + 'qemu_stream': self.qemu_stream, + 'screenshot': VMScreenshot.get_stream_test_result(), + 'federation': kconfig.get("server", "federation"), + 'auth': kconfig.get("authentication", "method"), + 'kernel_vfio': self.kernel_vfio, + 'nm_running': FeatureTests.is_nm_running(), + 'mem_hotplug_support': self.mem_hotplug_support + } + + +class DistrosModel(object): + def __init__(self, **kargs): + distroloader = DistroLoader() + self.distros = distroloader.get() + + def get_list(self): + def validate_distro(distro): + if check_url_path(distro['path']): + return distro['name'] + + n_processes = len(self.distros.keys()) + pool = ThreadPool(processes=n_processes) + map_res = pool.map_async(validate_distro, self.distros.values()) + pool.close() + pool.join() + res = list(set(map_res.get()) - set([None])) + return sorted(res) + + +class DistroModel(object): + def __init__(self, **kargs): + self._distros = DistrosModel() + + def lookup(self, name): + try: + return self._distros.distros[name] + except KeyError: + raise NotFoundError("KCHDISTRO0001E", {'name': name}) -- 2.1.0

3 2

Wok has its own repository!
by Aline Manera 01 Dec '15

01 Dec '15

Hi all, Wok has its own repository now: https://github.com/kimchi-project/wok.git \o/ Please, use this repository as the base for your development. All the plugins, Kimchi, Ginger Base and Ginger are listed as git-submodule in the Wok repository to make the development easy. You can follow the instruction below to have all the code available in your system: # Clone the Wok code and all its plugins git clone --recursive https://github.com/kimchi-project/wok.git As part of this effort, Kimchi repository now only contains the Kimchi source code. We will use the same mailing list (kimchi-devel(a)ovirt.org) for Wok and Kimchi projects. So please, add a tag [<project-name>] while sending patches, RFCs and anything else to the mailing list. I will properly update the github wiki page to add more details on how to contribute to both projects. Please, let me know on any problem with that. Regards, Aline Manera

2 1

Ginger Base has its own repository!
by Aline Manera 30 Nov '15

30 Nov '15

Hi all, As planned, Ginger Base now has its own repository: https://github.com/kimchi-project/gingerbase And it is now part of Ginger community. Please, follow the Ginger community instructions to submit patches to Ginger Base. All the Ginger Base code was removed from Kimchi repository. Please, use git-submodule to get access to the Ginger Base code through Kimchi repository. Let me know on any problem on that. Regards, Aline Manera

2 1

[PATCH V2] Fix issue 766 - Define network interface in libvirt
by Lucio Correia 30 Nov '15

30 Nov '15

When a network interface was only visible to the system and not to libvirt, libvirt throws an error when user asks a bridged network to be created using that interface, since it is not visible to libvirt. This patch adds network interface redefinition code to make it visible to libvirt, allowing the bridged network to be created. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> Changes in V2: - Daniel's review - Removed error message - Default interface type changed to 'network' in get_iface_xml --- src/wok/plugins/kimchi/i18n.py | 1 - src/wok/plugins/kimchi/model/networks.py | 25 ++++++++++++++++++++----- src/wok/plugins/kimchi/network.py | 5 +++++ src/wok/plugins/kimchi/xmlutils/interface.py | 20 ++++++++++++++++---- 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/wok/plugins/kimchi/i18n.py b/src/wok/plugins/kimchi/i18n.py index de7962a..b3414e2 100644 --- a/src/wok/plugins/kimchi/i18n.py +++ b/src/wok/plugins/kimchi/i18n.py @@ -267,7 +267,6 @@ messages = { "KCHNET0020E": _("Failed to activate interface %(iface)s: %(err)s."), "KCHNET0021E": _("Failed to activate interface %(iface)s. Please check the physical link status."), "KCHNET0022E": _("Failed to start network %(name)s. Details: %(err)s"), - "KCHNET0023E": _("Unable to get XML definition for interface %(name)s. Details: %(err)s"), "KCHNET0024E": _("Unable to redefine interface %(name)s. Details: %(err)s"), "KCHNET0025E": _("Unable to create bridge %(name)s. Details: %(err)s"), "KCHNET0026E": _("Open VSwitch bridges can only host bridged networks."), diff --git a/src/wok/plugins/kimchi/model/networks.py b/src/wok/plugins/kimchi/model/networks.py index 7f50003..403996a 100644 --- a/src/wok/plugins/kimchi/model/networks.py +++ b/src/wok/plugins/kimchi/model/networks.py @@ -33,6 +33,7 @@ from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi import netinfo from wok.plugins.kimchi import network as knetwork from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults +from wok.plugins.kimchi.xmlutils.interface import get_iface_xml from wok.plugins.kimchi.xmlutils.network import create_linux_bridge_xml from wok.plugins.kimchi.xmlutils.network import create_vlan_tagged_bridge_xml from wok.plugins.kimchi.xmlutils.network import get_no_network_config_xml @@ -240,13 +241,29 @@ class NetworksModel(object): # get xml definition of interface iface_xml = self._get_interface_desc_xml(interface) + # interface not defined in libvirt: try to define it + iface_defined = False + conn = self.conn.get() + if iface_xml is None: + try: + mac = knetwork.get_dev_macaddr(str(interface)) + iface_xml = get_iface_xml({'type': 'ethernet', + 'name': interface, + 'mac': mac, + 'startmode': "onboot"}) + conn.interfaceDefineXML(iface_xml.encode("utf-8")) + iface_defined = True + except libvirt.libvirtError, e: + raise OperationFailed("KCHNET0024E", {'name': interface, + 'err': e.get_error_message()}) + # Truncate the interface name if it exceeds 13 characters to make sure # the length of bridge name is less than 15 (its maximum value). br_name = KIMCHI_BRIDGE_PREFIX + interface[-13:] br_xml = create_linux_bridge_xml(br_name, interface, iface_xml) # drop network config from interface - self._redefine_iface_no_network(interface) + iface_defined or self._redefine_iface_no_network(interface, iface_xml) # create and start bridge self._create_bridge(br_name, br_xml) @@ -270,16 +287,14 @@ class NetworksModel(object): iface = conn.interfaceLookupByName(name) xml = iface.XMLDesc(flags=VIR_INTERFACE_XML_INACTIVE) except libvirt.libvirtError, e: - raise OperationFailed("KCHNET0023E", - {'name': name, 'err': e.get_error_message()}) + return None return xml - def _redefine_iface_no_network(self, name): + def _redefine_iface_no_network(self, name, iface_xml): conn = self.conn.get() # drop network config from definition of interface - iface_xml = self._get_interface_desc_xml(name) xml = get_no_network_config_xml(iface_xml.encode("utf-8")) try: diff --git a/src/wok/plugins/kimchi/network.py b/src/wok/plugins/kimchi/network.py index 1433b8a..eee0e8c 100644 --- a/src/wok/plugins/kimchi/network.py +++ b/src/wok/plugins/kimchi/network.py @@ -31,6 +31,11 @@ DefaultNetsPool = [ipaddr.IPNetwork('192.168.122.0/23'), ipaddr.IPNetwork('192.168.128.0/17')] +def get_dev_macaddr(dev): + info = ethtool.get_interfaces_info(dev)[0] + return info.mac_address + + def get_dev_netaddr(dev): info = ethtool.get_interfaces_info(dev)[0] return (info.ipv4_address and diff --git a/src/wok/plugins/kimchi/xmlutils/interface.py b/src/wok/plugins/kimchi/xmlutils/interface.py index 64df8cd..814caf9 100644 --- a/src/wok/plugins/kimchi/xmlutils/interface.py +++ b/src/wok/plugins/kimchi/xmlutils/interface.py @@ -26,15 +26,27 @@ from wok.plugins.kimchi import osinfo def get_iface_xml(params, arch=None, os_distro=None, os_version=None): """ - <interface type='network'> + <interface type='network' name='ethX'> + <start mode='onboot'/> <source network='default'/> <model type='virtio'/> </interface> """ - interface = E.interface(type=params['type']) - interface.append(E.source(network=params['network'])) + name = params.get('name', None) + if name: + interface = E.interface(type=params.get('type', 'network'), name=name) + else: + interface = E.interface(type=params.get('type', 'network')) - model = params.get('model') + stmode = params.get('startmode', None) + if stmode: + interface.append(E.start(mode=stmode)) + + nw = params.get('network', None) + if nw: + interface.append(E.source(network=nw)) + + model = params.get('model', None) # no model specified; let's try querying osinfo if model is None: -- 1.9.1

2 1