- Kimchi-devel - oVirt List Archives

[PATCH] Issue #290: correct the log usage
by shaohef＠linux.vnet.ibm.com 20 Dec '13

20 Dec '13

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> It is recommended that the log message should use comma. Arguments should be separated by comma. and they should not be in a tuple. Before this patch: Kimchi throws an exception as follow: TypeError: not enough arguments for format string Logged from file disks.py, line 117 After use the log correctly: Kimchi log works well: Error getting partition info for 35000c5002eaa8392p2: Error executing lsblk: lsblk: dm-2: unknown device name Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/disks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index 991bb4a..a054961 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -114,7 +114,7 @@ def get_partition_details(name): dev = _get_lsblk_devs(keys, [dev_path])[0] except OperationFailed as e: kimchi_log.error( - "Error getting partition info for %s: %s", (name, e)) + "Error getting partition info for %s: %s", name, e) return {} if dev['mountpoint']: -- 1.7.11.7

2 2

[project-kimchi][PATCHv2] screenshot: fix problem on Power of truncated picture
by lvroyce＠linux.vnet.ibm.com 20 Dec '13

20 Dec '13

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> PIL lib will report error because of picture information inconsistency, this error may because of qemu screenshot generation, work around this problem by load this image in advance to prevent it raise error in thumbnail generation. REF: http://stackoverflow.com/questions/12984426/ \ python-pil-ioerror-image-file-truncated-with-big-images Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/screenshot.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/kimchi/screenshot.py b/src/kimchi/screenshot.py index b17a3ce..5cfea96 100644 --- a/src/kimchi/screenshot.py +++ b/src/kimchi/screenshot.py @@ -174,6 +174,12 @@ class VMScreenshot(object): self._create_black_image(thumbnail) else: im = Image.open(thumbnail) + try: + # Prevent Image lib from lazy load, + # work around pic truncate validation in thumbnail generation + im.load() + except Exception as e: + kimchi_log.warning("Image load with warning: %s." % e) im.thumbnail(self.THUMBNAIL_SIZE) im.save(thumbnail, "PNG") -- 1.8.1.2

2 2

[project-kimchi][PATCHv4] Return source information for storage pool
by lvroyce＠linux.vnet.ibm.com 20 Dec '13

20 Dec '13

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v4, Delete logical pool source because UI just care VG name. Add update controller. For netfs storage pool, remote export path and addr will make more sense than local mount point. Report storage source information in pool info. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- docs/API.md | 3 +++ src/kimchi/controller.py | 1 + src/kimchi/mockmodel.py | 1 + src/kimchi/model.py | 16 ++++++++++++++++ tests/test_rest.py | 1 + 5 files changed, 22 insertions(+) diff --git a/docs/API.md b/docs/API.md index 74bc1b5..9edc551 100644 --- a/docs/API.md +++ b/docs/API.md @@ -215,6 +215,9 @@ Represents a snapshot of the Virtual Machine's primary monitor. * nr_volumes: The number of storage volumes for active pools, 0 for inactive pools * autostart: Whether the storage pool will be enabled automatically when the system boots + * source: Source of the storage pool, + * addr: mount address of this storage pool(for 'netfs' pool) + * path: export path of this storage pool(for 'netfs' pool) * **PUT**: Set whether the Storage Pool should be enabled automatically when the system boots * autostart: Toggle the autostart flag of the VM diff --git a/src/kimchi/controller.py b/src/kimchi/controller.py index 3b27c27..2940278 100644 --- a/src/kimchi/controller.py +++ b/src/kimchi/controller.py @@ -533,6 +533,7 @@ class StoragePool(Resource): 'allocated': self.info['allocated'], 'available': self.info['available'], 'path': self.info['path'], + 'source': self.info['source'], 'type': self.info['type'], 'nr_volumes': self.info['nr_volumes'], 'autostart': self.info['autostart']} diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index 4839d4c..348127a 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -639,6 +639,7 @@ class MockStoragePool(object): 'allocated': 512 << 20, 'available': 512 << 20, 'path': '/var/lib/libvirt/images', + 'source': {}, 'type': 'dir', 'nr_volumes': 0, 'autostart': 0} diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 73c18ac..3bc5d6d 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -78,6 +78,9 @@ GUESTS_STATS_INTERVAL = 5 HOST_STATS_INTERVAL = 1 VM_STATIC_UPDATE_PARAMS = {'name': './name'} VM_LIVE_UPDATE_PARAMS = {} +STORAGE_SOURCES = {'netfs': {'addr': '/pool/source/host/@name', + 'path': '/pool/source/dir/@path'}} + def _uri_to_name(collection, uri): expr = '/%s/(.*?)/?$' % collection @@ -1019,6 +1022,17 @@ class Model(object): raise OperationFailed(e.get_error_message()) return name + def _get_storage_source(self, pool_type, pool_xml): + source = {} + if pool_type not in STORAGE_SOURCES: + return source + + for key, val in STORAGE_SOURCES[pool_type].items(): + res = xmlutils.xpath_get_text(pool_xml, val) + source[key] = res[0] if len(res) == 1 else res + + return source + def storagepool_lookup(self, name): pool = self._get_storagepool(name) info = pool.info() @@ -1027,8 +1041,10 @@ class Model(object): xml = pool.XMLDesc(0) path = xmlutils.xpath_get_text(xml, "/pool/target/path")[0] pool_type = xmlutils.xpath_get_text(xml, "/pool/@type")[0] + source = self._get_storage_source(pool_type, xml) res = {'state': Model.pool_state_map[info[0]], 'path': path, + 'source': source, 'type': pool_type, 'autostart': autostart, 'capacity': info[1], diff --git a/tests/test_rest.py b/tests/test_rest.py index 73b5243..f597796 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -417,6 +417,7 @@ class RestTests(unittest.TestCase): storagepool = json.loads(resp.read()) self.assertEquals('storagepool-1', storagepool['name']) self.assertEquals('inactive', storagepool['state']) + self.assertIn('source', storagepool) def test_storagepool_action(self): # Create a storage pool -- 1.8.1.2

3 3

[project-kimchi] [PATCH 0/4] Use one weksockify instance as all vms' vnc proxy.
by Mark Wu 20 Dec '13

20 Dec '13

It resolves two problems: A fixed port for firewall rule. Race between client and server. It happens on every first connection after the host running kimchi reboot. Mark Wu (4): Move configuration parsing to config.py Add a configuration for vnc websocket proxy Use one weksockify instance as all vms' vnc proxy. Remove vnc related code in mockmodel docs/API.md | 1 + src/kimchi.conf.in | 3 +++ src/kimchi/config.py.in | 24 +++++++++++++++++++++--- src/kimchi/controller.py | 5 ++++- src/kimchi/mockmodel.py | 19 ------------------- src/kimchi/model.py | 18 +++++------------- src/kimchi/server.py | 5 +++++ src/kimchi/vnc.py | 42 +++++++++++++++++++++++------------------- src/kimchid.in | 20 +------------------- ui/js/src/kimchi.api.js | 14 +++++--------- 10 files changed, 68 insertions(+), 83 deletions(-) -- 1.8.3.1 -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

4 15

[project-kimchi] [PATCH 0/3 V2] Logical pool fixes
by Aline Manera 19 Dec '13

19 Dec '13

From: Aline Manera <alinefm(a)br.ibm.com> V1 -> V2: - Get device name from sysfs uevent file and assume its path is /dev/<devname> Zhou Zheng Sheng (3): PEP 8: cleanup src/kimchi/disks.py Issue #276: logical pool: a quick fix for the device listing rules, back-end Issue #276, logical pool: a quick fix for the device listing rules, front-end Makefile.am | 1 + src/kimchi/disks.py | 177 ++++++++++++++++-------------- ui/js/src/kimchi.storagepool_add_main.js | 2 +- 3 files changed, 94 insertions(+), 86 deletions(-) -- 1.7.10.4 -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

4 9

[project-kimchi] [PATCH] logical pool fixes: only list leaf devices, and read file instead of run "cat"
by Zhou Zheng Sheng 19 Dec '13

19 Dec '13

Some devices are parent of other devices. We should just list the leaf devices but not parent devices. For example, if a disk contains partitions, we should only list the partitions. If a disk is held by multipath device, we should not list the disk. Currently we strip the last charactter from "vda1" to get "vda" and ignore the parent "vda" device. This may fails on disk contains lots of logical partitions, for example "vda10"'s parent is not "vda1". Another problem is this method can not find the parent-child relation ship between a multipath device and its slaves. The most accurate information is on sysfs, and lsblk lists all children device of the requested device based on sysfs. So when "lsblk -P devices" prints only one line, it's the device itself, when it prints more lines, they are the children devices. This patch use this method to detect if a device a leaf one. This patch also avoids start new "cat" process to read uevent file, it opens the uevent file and read it directly. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/disks.py | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index 991bb4a..9ab9263 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -29,7 +29,6 @@ from kimchi.utils import kimchi_log def _get_partition_path(name): """ Returns device path given a partition name """ - dev_path = None maj_min = None keys = ["NAME", "MAJ:MIN"] @@ -39,15 +38,14 @@ def _get_partition_path(name): if dev['name'] == name: maj_min = dev['maj:min'] break + else: + raise OperationFailed( + "Failed to find major and minor number for %s", name) - uevent_cmd = "cat /sys/dev/block/%s/uevent" % maj_min - uevent = subprocess.Popen(uevent_cmd, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, shell=True) - out, err = uevent.communicate() - if uevent.returncode != 0: - raise OperationFailed("Error getting partition path for %s", name) + with open("/sys/dev/block/%s/uevent" % maj_min) as ueventf: + content = ueventf.read() - data = dict(re.findall(r'(\S+)=(".*?"|\S+)', out.replace("\n", " "))) + data = dict(re.findall(r'(\S+)=(".*?"|\S+)', content.replace("\n", " "))) return "/dev/%s" % data["DEVNAME"] @@ -63,6 +61,22 @@ def _get_lsblk_devs(keys, devs=[]): return _parse_lsblk_output(out, keys) +def _is_dev_leaf(name): + try: + # By default, lsblk prints a device information followed by children + # device information + childrenCount = len( + _get_lsblk_devs(["NAME"], [_get_partition_path(name)])) - 1 + except OperationFailed as e: + # lsblk is known to fail on multipath devices + # Assume these devices contain children + kimchi_log.error( + "Error getting device info for %s: %s", (name, e)) + return False + else: + return childrenCount == 0 + + def _parse_lsblk_output(output, keys): # output is on format key="value", # where key can be NAME, TYPE, FSTYPE, SIZE, MOUNTPOINT, etc @@ -82,7 +96,6 @@ def _parse_lsblk_output(output, keys): def get_partitions_names(): names = [] - ignore_names = [] keys = ["NAME", "TYPE", "FSTYPE", "MOUNTPOINT"] # output is on format key="value", # where key can be NAME, TYPE, FSTYPE, MOUNTPOINT @@ -90,20 +103,18 @@ def get_partitions_names(): # split()[0] to avoid the second part of the name, after the # whiteline name = dev['name'].split()[0] - # Only list unmounted and unformated partition or disk. + # Only list unmounted and unformated and leaf and (partition or disk) + # leaf means a partition, a disk has no partition, or a disk not held + # by any multipath device. if not all([dev['type'] in ['part', 'disk'], dev['fstype'] == "", - dev['mountpoint'] == ""]): - - # the whole disk must be ignored in it has at least one - # mounted/formatted partition - if dev['type'] == 'part': - ignore_names.append(name[:-1]) + dev['mountpoint'] == "", + _is_dev_leaf(name)]): continue names.append(name) - return list(set(names) - set(ignore_names)) + return names def get_partition_details(name): -- 1.7.11.7 -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

1 0

Re: [Kimchi-devel] [project-kimchi] [PATCH v1 4/4] storagepool: Support Creating iSCSI storagepool in model.py
by Sheldon 19 Dec '13

19 Dec '13

On 12/16/2013 04:01 PM, Zhou Zheng Sheng wrote: > This patch implements creating iSCSI storagepool for libvirt. > Each LUN in iSCSI storagepool can be used as a volume, but iSCSI > storagepool does not provide ability to create volume. For now in kimchi > we create volume for each newly created VM. Next is to implement > attaching existing volume to a new VM. > > How to test > > Create: > curl -u root -H 'Content-type: application/json' \ > -H 'Accept: application/json' \ > -d '{"srcTarget": > "targetIQN", > "srcHost": "10.0.0.X", > "type": "iscsi", > "name": "iscsipool"}' \ > http://127.0.0.1:8000/storagepools > > Show Info: > curl -u root -H 'Accept: application/json' \ > http://127.0.0.1:8000/storagepools/iscsipool > > Activate: > curl -u root -H 'Content-type: application/json' \ > -H 'Accept: application/json' \ > -d '' http://127.0.0.1:8000/storagepools/iscsipool/activate > > Examine: > iscsiadm -m session > > Deactivate: > curl -u root -H 'Content-type: application/json' \ > -H 'Accept: application/json' \ > -d '' http://127.0.0.1:8000/storagepools/iscsipool/deactivate > > Delete: > curl -u root -X DELETE -H 'Accept: application/json' \ > http://127.0.0.1:8000/storagepools/iscsipool > > Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> > --- > docs/API.md | 6 ++++-- > src/kimchi/model.py | 34 ++++++++++++++++++++++++++++++++++ > 2 files changed, 38 insertions(+), 2 deletions(-) > > diff --git a/docs/API.md b/docs/API.md > index dd3d7f1..342c583 100644 > --- a/docs/API.md > +++ b/docs/API.md > @@ -182,16 +182,18 @@ Represents a snapshot of the Virtual Machine's primary monitor. > * **POST**: Create a new Storage Pool > * name: The name of the Storage Pool. > * type: The type of the defined Storage Pool. > - Supported types: 'dir', 'kimchi-iso', 'netfs', 'logical' > + Supported types: 'dir', 'kimchi-iso', 'netfs', 'logical', 'iscsi' > * path: The path of the defined Storage Pool. > For 'kimchi-iso' pool refers to targeted deep scan path. > Pool types: 'dir', 'kimchi-iso'. > * srcHost: IP or hostname of server for a pool backed from a remote host. > - Pool types: 'nfs'. > + Pool types: 'nfs', 'iscsi'. > * srcPath: Export path on NFS server for NFS pool. > Pool types: 'nfs'. > * srcDevices: Array of devices to be used in the Storage Pool > Pool types: 'logical'. > + * srcTarget: Target IQN of an iSCSI pool. > + Pool types: 'iscsi'. > > ### Resource: Storage Pool > > diff --git a/src/kimchi/model.py b/src/kimchi/model.py > index af0d728..3888903 100644 > --- a/src/kimchi/model.py > +++ b/src/kimchi/model.py > @@ -1475,11 +1475,45 @@ def _get_logical_storagepool_xml(poolArgs): > return xml > > > +def _get_iscsi_storagepool_xml(poolArgs): > + # Required parameters > + # name: > + # type: > + # srcHost: > + # srcTarget: > + # > + # Optional parameters > + # srcPort: > + > + try: > + portAttr = "port='%s'" % poolArgs['srcPort'] > + except KeyError: > + portAttr = "" > + > + poolArgs.update({'srcPort': portAttr, > + 'path': '/dev/disk/by-id'}) > + > + xml = """ > + <pool type='%(type)s'> > + <name>%(name)s</name> > + <source> > + <host name='%(srcHost)s' %(srcPort)s/> > + <device path='%(srcTarget)s'/> > + </source> > + <target> > + <path>%(path)s</path> > + </target> > + </pool> > + """ % poolArgs > + return xml > + > + http://libvirt.org/formatstorage.html#exampleISCSI iSCSI based storage pool <pool type="iscsi"> <name>virtimages</name> <source> <host name="iscsi.example.com"/> <device path="iqn.2013-06.com.example:iscsi-pool"/> <auth type='chap' username='myuser'> <secret usage='libvirtiscsi'/> </auth> </source> <target> <path>/dev/disk/by-path</path> </target> </pool> auth tag? > def _get_pool_xml(**kwargs): > getPoolXml = { > 'dir': _get_dir_storagepool_xml, > 'netfs': _get_netfs_storagepool_xml, > 'logical': _get_logical_storagepool_xml, > + 'iscsi': _get_iscsi_storagepool_xml, > }[kwargs['type']] > return getPoolXml(kwargs) > Sheldon Feng(???) IBM Linux Technology Center -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

1 0

Re: [Kimchi-devel] [project-kimchi] [PATCH] spec: Open 8000 and 8001 port by default in spec.in post section. kimchi server use 8000 and 8001 port. Open 8000 and 8001 port by default in spec.in post section.
by Mark Wu 19 Dec '13

19 Dec '13

On 12/17/2013 02:36 PM, taget(a)linux.vnet.ibm.com wrote: > From: Eli Qiao <taget(a)linux.vnet.ibm.com> > > Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> > --- > contrib/kimchi.spec.fedora.in | 5 +++++ > contrib/kimchi.spec.suse.in | 5 +++++ > 2 files changed, 10 insertions(+), 0 deletions(-) > > diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in > index 14ec359..f21ae49 100644 > --- a/contrib/kimchi.spec.fedora.in > +++ b/contrib/kimchi.spec.fedora.in > @@ -81,6 +81,11 @@ if [ $1 -eq 1 ] ; then > /bin/systemctl daemon-reload >/dev/null 2>&1 || : > fi > > +# open 8000 and 8001 port for firewall > + > +iptables -I INPUT -p tcp --dport 8000 -j ACCEPT > +iptables -I INPUT -p tcp --dport 8001 -j ACCEPT > + > %if 0%{?rhel} == 6 > start kimchid > %else > diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in > index 9051284..5209e03 100644 > --- a/contrib/kimchi.spec.suse.in > +++ b/contrib/kimchi.spec.suse.in > @@ -47,6 +47,11 @@ install -Dm 0755 contrib/kimchid.sysvinit %{buildroot}%{_initrddir}/kimchid > service kimchid start > chkconfig kimchid on > > +# open 8000 and 8001 port for firewall > + > +iptables -I INPUT -p tcp --dport 8000 -j ACCEPT > +iptables -I INPUT -p tcp --dport 8001 -j ACCEPT > + > %preun > service kimchid stop > Eli, Thanks for the patch. But it's not a reliable configuration. This rule will be lost after reboot. And shipping a configuration file is better than running commands in spec file. Please take a look at firewalld and firewalld.service http://manpages.ubuntu.com/manpages/raring/man5/firewalld.service.5.html It could be a better solution for the platforms where firewalld is available. -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

4 6

[project-kimchi] Re: [PATCH v1 1/4] storagepool: dispatch _get_pool_xml() to respective _get_XXX_storagepool_xml() function
by Sheldon 19 Dec '13

19 Dec '13

As Pradeep mentioned: we will add more storage pools, how about split these xml to a new file? On 12/16/2013 04:01 PM, Zhou Zheng Sheng wrote: > In src/kimchi/model.py, _get_pool_xml() is to generate libvirt storage > pool XML definition from arguments provided by the POST data (a JSON > dict). It has to support various types of pool such as dir, netfs and > logical. Now it uses "if ... elif ... elif" to check the requested type > of pool and go in to the respective branch and generates the correct > XML. > > This is OK for now but in future we'll have more types of pool, so in > this patch we turn "if ... elif" into a dispatching dict, and put the > respective XML generating code to separated functions. > > Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> > --- > src/kimchi/model.py | 121 +++++++++++++++++++++++++++++++--------------------- > 1 file changed, 73 insertions(+), 48 deletions(-) > > diff --git a/src/kimchi/model.py b/src/kimchi/model.py > index 90a9a1b..d22e02d 100644 > --- a/src/kimchi/model.py > +++ b/src/kimchi/model.py > @@ -1403,60 +1403,85 @@ class LibvirtVMScreenshot(VMScreenshot): > finally: > os.close(fd) > > -def _get_pool_xml(**kwargs): > + > +def _get_dir_storagepool_xml(poolArgs): > # Required parameters > # name: > # type: > # path: > + xml = """ > + <pool type='%(type)s'> > + <name>%(name)s</name> > + <target> > + <path>%(path)s</path> > + </target> > + </pool> > + """ % poolArgs > + return xml > + > + > +def _get_netfs_storagepool_xml(poolArgs): > + # Required parameters > + # name: > + # type: > + # nfsserver: > # nfspath: > - if kwargs['type'] == 'dir': > - xml = """ > - <pool type='%(type)s'> > - <name>%(name)s</name> > - <target> > - <path>%(path)s</path> > - </target> > - </pool> > - """ > - elif kwargs['type'] == 'netfs': > - path = '/var/lib/kimchi/nfs_mount/' + kwargs['name']; > - if not os.path.exists(path): > - os.makedirs(path) > - kwargs.update({'path': path}) > - xml = """ > - <pool type='%(type)s'> > - <name>%(name)s</name> > - <source> > - <host name='%(nfsserver)s'/> > - <dir path='%(nfspath)s'/> > - </source> > - <target> > - <path>%(path)s</path> > - </target> > - </pool> > - """ > - elif kwargs['type'] == 'logical': > - path = '/var/lib/kimchi/logical_mount/' + kwargs['name']; > - if not os.path.exists(path): > - os.makedirs(path) > - xml = """ > - <pool type='%(type)s'> > - <name>%(name)s</name> > - <source> > - %(devices)s > - </source> > - <target> > - <path>%(path)s</path> > - </target> > - </pool> > - """ > - devices = '' > - for device_path in kwargs['devices']: > - devices += "<device path=\""+device_path+"\" />" > + path = '/var/lib/kimchi/nfs_mount/' + poolArgs['name'] > + if not os.path.exists(path): > + os.makedirs(path) > + poolArgs['path'] = path > + xml = """ > + <pool type='%(type)s'> > + <name>%(name)s</name> > + <source> > + <host name='%(nfsserver)s'/> > + <dir path='%(nfspath)s'/> > + </source> > + <target> > + <path>%(path)s</path> > + </target> > + </pool> > + """ % poolArgs > + return xml > + > + > +def _get_logical_storagepool_xml(poolArgs): > + # Required parameters > + # name: > + # type: > + # devices: > + path = '/var/lib/kimchi/logical_mount/' + poolArgs['name'] > + if not os.path.exists(path): > + os.makedirs(path) > + > + devices = [] > + for device_path in poolArgs['devices']: > + devices.append('<device path="%s" />' % device_path) > + > + poolArgs.update({'devices': ''.join(devices), > + 'path': path}) > + xml = """ > + <pool type='%(type)s'> > + <name>%(name)s</name> > + <source> > + %(devices)s > + </source> > + <target> > + <path>%(path)s</path> > + </target> > + </pool> > + """ % poolArgs > + return xml > + > + > +def _get_pool_xml(**kwargs): > + getPoolXml = { > + 'dir': _get_dir_storagepool_xml, > + 'netfs': _get_netfs_storagepool_xml, > + 'logical': _get_logical_storagepool_xml, > + }[kwargs['type']] > + return getPoolXml(kwargs) > > - kwargs.update({'devices': devices}) > - kwargs.update({'path': path}) > - return xml % kwargs > > def _get_volume_xml(**kwargs): > # Required parameters Sheldon Feng(???) IBM Linux Technology Center -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

1 0

[PATCH 0/2] Add the iscsi pool UI support
by zhoumeina 19 Dec '13

19 Dec '13

Include create storage pool UI and translation files. zhoumeina (2): Add UI support of iscsi Add the ISCSI translation po files po/en_US.po | 31 +++++++++++++---- po/kimchi.pot | 30 ++++++++++++---- po/pt_BR.po | 31 +++++++++++++---- po/zh_CN.po | 31 +++++++++++++---- ui/js/src/kimchi.storagepool_add_main.js | 54 ++++++++++++++++++++++++----- ui/pages/i18n.html.tmpl | 7 ++-- ui/pages/storagepool-add.html.tmpl | 19 ++++++++++ 7 files changed, 158 insertions(+), 45 deletions(-) mode change 100644 => 100755 po/kimchi.pot

1 2