Disk: add new dataStore element to disk.py#4052
Merged
Yingshun merged 1 commit intoavocado-framework:masterfrom Mar 27, 2025
Merged
Disk: add new dataStore element to disk.py#4052Yingshun merged 1 commit intoavocado-framework:masterfrom
Yingshun merged 1 commit intoavocado-framework:masterfrom
Conversation
Contributor
Author
|
chloerh
reviewed
Feb 14, 2025
Comment on lines
+360
to
+368
| def new_datastore(self, **dargs): | ||
| """ | ||
| Return a new disk datastore instance and set properties from dargs | ||
| """ | ||
| new_one = self.dataStore(virsh_instance=self.virsh) | ||
| for key, value in list(dargs.items()): | ||
| setattr(new_one, key, value) | ||
| return new_one | ||
|
|
Contributor
There was a problem hiding this comment.
This function is actually unnecessary now
| """ | ||
|
|
||
| __slots__ = ("attrs", "dev", "protocol", "name", "host", "file", "auth") | ||
| __slots__ = ("attrs", "protocol", "name", "host", "auth", "datastore") |
Contributor
There was a problem hiding this comment.
Seems 'dev' was removed from slots , but not it's accessor.
And I'm also worried if it's going to cause error if we delete 'dev' and 'file', are they being used by some test code?
Contributor
Author
There was a problem hiding this comment.
I didn't consider that other functions would use them. So in case I don't plan to delete them.
Comment on lines
+1036
to
+1044
| def new_source(self, **dargs): | ||
| """ | ||
| Create new source for dataStore | ||
|
|
||
| """ | ||
| new_one = self.Source(virsh_instance=self.virsh) | ||
| for key, value in list(dargs.items()): | ||
| setattr(new_one, key, value) | ||
| return new_one |
Contributor
There was a problem hiding this comment.
This function could be removed too, we're using setup_attrs(), this kind of function is no longer necessary.
meinaLi
force-pushed
the
datastore
branch
3 times, most recently
from
1efbebe to
35be472
Compare
chloerh
approved these changes
Feb 19, 2025
Yingshun
reviewed
Mar 7, 2025
Comment on lines
+238
to
+245
| accessors.XMLElementNest( | ||
| "datastore", | ||
| self, | ||
| parent_xpath="/", | ||
| tag_name="dataStore", | ||
| subclass=Disk.dataStore, | ||
| subclass_dargs={"virsh_instance": virsh_instance}, | ||
| ) |
Contributor
There was a problem hiding this comment.
@meinaLi Can you plz provide a test result of this part? I didn't find it in your previous results.
BTW, for new changes in xml part, it's better to have a result of setup_attrs(). can you plz also provide it? Thanks!
Contributor
Author
There was a problem hiding this comment.
This part is in Disk class which is incorrect. Because dataStore element is mainly placed in the DiskSource or Backingchain. So I've already removed it.
The test result related to setup_attrs():
>>> from virttest.libvirt_xml.devices import disk
>>> disk_dev = disk.Disk()
>>> disk_dict={'device': 'disk', 'source': {'attrs': {'file': '/path/to/datastore.qcow2'}, 'dataStore': {'format': {'type': 'raw'}, 'type': 'file', 'source': {'attrs': {'file': '/path/to/datastore'}}}}, 'target': {'dev': 'vdh', 'bus': 'virtio'}, 'type_name': 'file', 'backingstore': {'type': 'file', 'format': {'type': 'qcow2'}, 'source': {'attrs': {'file': '/var/lib/libvirt/images/base-with-data-file.qcow'}, 'file': '/var/lib/libvirt/images/base-with-data-file.qcow', 'datastore': {'format': {'type': 'raw'}, 'type': 'block', 'source': {'attrs': {'dev': '/dev/mapper/base2'}}}}}, 'driver': {'name': 'qemu', 'type': 'qcow2'}}
>>> disk_dev.setup_attrs(**disk_dict)
>>> disk_dev.xml
'/tmp/xml_utils_temp_yhn4b_bv.xml'
# cat /tmp/xml_utils_temp_yhn4b_bv.xml
<disk type="file" device="disk"><source file="/path/to/datastore.qcow2"><dataStore type="file"><format type="raw" /><source file="/path/to/datastore" /></dataStore></source><target dev="vdh" bus="virtio" /><backingStore type="file"><format type="qcow2" /><source file="/var/lib/libvirt/images/base-with-data-file.qcow"><dataStore type="block"><format type="raw" /><source dev="/dev/mapper/base2" /></dataStore></source></backingStore><driver name="qemu" type="qcow2" /></disk>
Contributor
Author
There was a problem hiding this comment.
Because the above disk_dict has a bug with XML error: The
Added the test result of attaching disk:
>>> from virttest.libvirt_xml.devices import disk
>>> disk_dev = disk.Disk()
>>> disk_dict={'device': 'disk', 'source': {'attrs': {'file': '/var/lib/libvirt/images/datastore.qcow2'}}, 'target': {'dev': 'vdh', 'bus': 'virtio'}, 'type_name': 'file', 'backingstore': {'type': 'file', 'format': {'type': 'qcow2'}, 'source': {'attrs': {'file': '/var/lib/libvirt/images/base-with-data-file.qcow'}, 'file': '/var/lib/libvirt/images/base-with-data-file.qcow', 'datastore': {'format': {'type': 'raw'}, 'type': 'file', 'source': {'attrs': {'file': '/var/lib/libvirt/images/datastore_1'}}}}}, 'driver': {'name': 'qemu', 'type': 'qcow2'}}
>>> disk_dev.setup_attrs(**disk_dict)
>>> from virttest import virsh
>>> virsh.attach_device("avocado-vt-vm1", disk_dev.xml, debug=True, ignore_status=False)
<avocado.utils.process.CmdResult object at 0x7f260c51da30>
The disk xml is attached to the guest:
# virsh dumpxml avocado-vt-vm1 --xpath //disk
......
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/var/lib/libvirt/images/datastore.qcow2" index="2"/>
<backingStore type="file" index="3">
<format type="qcow2"/>
<source file="/var/lib/libvirt/images/base-with-data-file.qcow">
<dataStore type="file">
<format type="raw"/>
<source file="/var/lib/libvirt/images/datastore_1" index="4"/>
</dataStore>
</source>
<backingStore/>
</backingStore>
<target dev="vdh" bus="virtio"/>
<alias name="virtio-disk7"/>
<address type="pci" domain="0x0000" bus="0x05" slot="0x00" function="0x0"/>
</disk>
Now a new element dataStore has been implemented. So add it to disk.py. Signed-off-by: meinaLi <meili@redhat.com>
Yingshun
approved these changes
Mar 27, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Now a new element dataStore has been implemented. So add it to disk.py.