Skip to content

Commit a4ea37a

Browse files
Sync with upstream
1 parent eb59751 commit a4ea37a

File tree

4 files changed

+38
-25
lines changed

4 files changed

+38
-25
lines changed

lib/ovirtsdk4/readers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7280,6 +7280,8 @@ def read_one(reader):
72807280
obj.os = OperatingSystemReader.read_one(reader)
72817281
elif tag == 'override_iptables':
72827282
obj.override_iptables = Reader.read_boolean(reader)
7283+
elif tag == 'ovn_configured':
7284+
obj.ovn_configured = Reader.read_boolean(reader)
72837285
elif tag == 'permissions':
72847286
obj.permissions = PermissionReader.read_many(reader)
72857287
elif tag == 'port':

lib/ovirtsdk4/services.py

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7675,8 +7675,8 @@ def add(
76757675
):
76767676
"""
76777677
Adds a new floating disk.
7678-
There are three types of disks that can be added - disk image, direct LUN and
7679-
https://wiki.openstack.org/wiki/Cinder[Cinder] disk.
7678+
There are three types of disks that can be added - disk image, direct LUN and Managed Block disk.
7679+
https://wiki.openstack.org/wiki/Cinder[Cinder] integration has been replaced by Managed Block Storage.
76807680
*Adding a new image disk:*
76817681
When creating a new floating image <<types/disk,Disk>>, the API requires the `storage_domain`, `provisioned_size`
76827682
and `format` attributes.
@@ -7734,28 +7734,8 @@ def add(
77347734
----
77357735
To create a new floating direct LUN disk without using a host, remove the `host` element.
77367736
*Adding a new Cinder disk:*
7737-
To create a new floating Cinder disk, send a request as follows:
7738-
[source]
7739-
----
7740-
POST /ovirt-engine/api/disks
7741-
----
7742-
With a request body as follows:
7743-
[source,xml]
7744-
----
7745-
<disk>
7746-
<openstack_volume_type>
7747-
<name>myceph</name>
7748-
</openstack_volume_type>
7749-
<storage_domains>
7750-
<storage_domain>
7751-
<name>cinderDomain</name>
7752-
</storage_domain>
7753-
</storage_domains>
7754-
<provisioned_size>1073741824</provisioned_size>
7755-
<interface>virtio</interface>
7756-
<format>raw</format>
7757-
</disk>
7758-
----
7737+
Cinder integration has been replaced by Managed Block Storage.
7738+
//TODO: Add an example for adding an MBS disk
77597739
*Adding a floating disks in order to upload disk snapshots:*
77607740
Since version 4.2 of the engine it is possible to upload disks with
77617741
snapshots. This request should be used to create the base image of the
@@ -19300,6 +19280,8 @@ def __str__(self):
1930019280

1930119281
class OpenstackVolumeAuthenticationKeyService(Service):
1930219282
"""
19283+
Openstack Volume (Cinder) integration has been replaced by Managed Block Storage.
19284+
1930319285
"""
1930419286

1930519287
def __init__(self, connection, path):
@@ -19413,6 +19395,8 @@ def __str__(self):
1941319395

1941419396
class OpenstackVolumeAuthenticationKeysService(Service):
1941519397
"""
19398+
Openstack Volume (Cinder) integration has been replaced by Managed Block Storage.
19399+
1941619400
"""
1941719401

1941819402
def __init__(self, connection, path):
@@ -19512,6 +19496,8 @@ def __str__(self):
1951219496

1951319497
class OpenstackVolumeProviderService(ExternalProviderService):
1951419498
"""
19499+
Openstack Volume (Cinder) integration has been replaced by Managed Block Storage.
19500+
1951519501
"""
1951619502

1951719503
def __init__(self, connection, path):
@@ -19745,6 +19731,8 @@ def __str__(self):
1974519731

1974619732
class OpenstackVolumeProvidersService(Service):
1974719733
"""
19734+
Openstack Volume (Cinder) integration has been replaced by Managed Block Storage.
19735+
1974819736
"""
1974919737

1975019738
def __init__(self, connection, path):
@@ -19870,6 +19858,8 @@ def __str__(self):
1987019858

1987119859
class OpenstackVolumeTypeService(Service):
1987219860
"""
19861+
Openstack Volume (Cinder) integration has been replaced by Managed Block Storage.
19862+
1987319863
"""
1987419864

1987519865
def __init__(self, connection, path):
@@ -19922,6 +19912,8 @@ def __str__(self):
1992219912

1992319913
class OpenstackVolumeTypesService(Service):
1992419914
"""
19915+
Openstack Volume (Cinder) integration has been replaced by Managed Block Storage.
19916+
1992519917
"""
1992619918

1992719919
def __init__(self, connection, path):
@@ -39352,7 +39344,8 @@ def update(
3935239344
This operation allows updating the following floating disk properties:
3935339345
* For Image disks: `provisioned_size`, `alias`, `description`, `wipe_after_delete`, `shareable`, `backup` and `disk_profile`.
3935439346
* For LUN disks: `alias`, `description` and `shareable`.
39355-
* For Cinder and Managed Block disks: `provisioned_size`, `alias` and `description`.
39347+
* Cinder integration has been replaced by Managed Block Storage.
39348+
* For Managed Block disks: `provisioned_size`, `alias` and `description`.
3935639349
* For VM attached disks, the `qcow_version` can also be updated.
3935739350
For example, a disk's update can be done by using the following request:
3935839351
[source]

lib/ovirtsdk4/types.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20556,6 +20556,7 @@ def __init__(
2055620556
numa_supported=None,
2055720557
os=None,
2055820558
override_iptables=None,
20559+
ovn_configured=None,
2055920560
permissions=None,
2056020561
port=None,
2056120562
power_management=None,
@@ -20615,6 +20616,7 @@ def __init__(
2061520616
self.numa_supported = numa_supported
2061620617
self.os = os
2061720618
self.override_iptables = override_iptables
20619+
self.ovn_configured = ovn_configured
2061820620
self.permissions = permissions
2061920621
self.port = port
2062020622
self.power_management = power_management
@@ -20926,6 +20928,20 @@ def update_available(self, value):
2092620928
"""
2092720929
self._update_available = value
2092820930

20931+
@property
20932+
def ovn_configured(self):
20933+
"""
20934+
Returns the value of the `ovn_configured` property.
20935+
"""
20936+
return self._ovn_configured
20937+
20938+
@ovn_configured.setter
20939+
def ovn_configured(self, value):
20940+
"""
20941+
Sets the value of the `ovn_configured` property.
20942+
"""
20943+
self._ovn_configured = value
20944+
2092920945
@property
2093020946
def external_network_provider_configurations(self):
2093120947
"""

lib/ovirtsdk4/writers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4140,6 +4140,8 @@ def write_one(obj, writer, singular=None):
41404140
OperatingSystemWriter.write_one(obj.os, writer, 'os')
41414141
if obj.override_iptables is not None:
41424142
Writer.write_boolean(writer, 'override_iptables', obj.override_iptables)
4143+
if obj.ovn_configured is not None:
4144+
Writer.write_boolean(writer, 'ovn_configured', obj.ovn_configured)
41434145
if obj.port is not None:
41444146
Writer.write_integer(writer, 'port', obj.port)
41454147
if obj.power_management is not None:

0 commit comments

Comments
 (0)