Juan Hernandez has uploaded a new change for review. Change subject: sdk: Regenerate against the latest API ......................................................................
sdk: Regenerate against the latest API This patch regenerates the SDK using the latest API obtained from the engine built from commit 74f4582, tag ovirt-engine-3.6.0_alpha2. Change-Id: Ibb462b67d3b31ea0479b1227218a8f6b32004b6a Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com> --- M Makefile M generator/src/main/resources/api.xsd M generator/src/main/resources/rsdl.xml M setup.py M src/ovirtsdk/api.py M src/ovirtsdk/infrastructure/brokers.py M src/ovirtsdk/xml/params.py 7 files changed, 1,173 insertions(+), 535 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk refs/changes/93/40793/1 diff --git a/Makefile b/Makefile index 9f06fe8..38d0213 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ version=3.6.0.0 rpmversion=$(version) rpmdist=$(shell rpm --eval '%dist') -rpmrelease:=0.12$(rpmsuffix)$(rpmdist) +rpmrelease:=0.13$(rpmsuffix)$(rpmdist) RPMTOP=$(PWD)/rpmtop NAME=ovirt-engine-sdk-python diff --git a/generator/src/main/resources/api.xsd b/generator/src/main/resources/api.xsd index 1bde347..16cf751 100644 --- a/generator/src/main/resources/api.xsd +++ b/generator/src/main/resources/api.xsd @@ -2789,6 +2789,8 @@ <xs:element name="wipe_after_delete" type="xs:boolean" minOccurs="0"/> <xs:element name="import" type="xs:boolean" minOccurs="0"/> <xs:element name="is_attached" type="xs:boolean" minOccurs="0"/> + <xs:element name="warning_low_space_indicator" type="xs:int" minOccurs="0"/> + <xs:element name="critical_space_action_blocker" type="xs:int" minOccurs="0"/> </xs:sequence> </xs:extension> </xs:complexContent> diff --git a/generator/src/main/resources/rsdl.xml b/generator/src/main/resources/rsdl.xml index 43177d0..dc1ef6f 100644 --- a/generator/src/main/resources/rsdl.xml +++ b/generator/src/main/resources/rsdl.xml @@ -58,6 +58,14 @@ <description>get the list of bookmarks in the system</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -780,6 +788,14 @@ <link href="clusters/{cluster:id}/glusterhooks" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -1029,6 +1045,10 @@ <name>case_sensitive</name> <value>true|false</value> </parameter> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> </parameters_set> </url> <body/> @@ -1173,6 +1193,14 @@ <value>true|false</value> </header> </headers> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -1403,14 +1431,6 @@ <description>get the statistics for the specified brick in the gluster volume attached to the cluster</description> <request> <http_method>GET</http_method> - <url> - <parameters_set> - <parameter required="false" type="xs:int" context="matrix"> - <name>max</name> - <value>max results</value> - </parameter> - </parameters_set> - </url> <body/> </request> <response> @@ -2842,6 +2862,14 @@ <link href="datacenters/{datacenter:id}/clusters/{cluster:id}/affinitygroups" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -2904,6 +2932,14 @@ <link href="datacenters/{datacenter:id}/clusters/{cluster:id}/affinitygroups/{affinitygroup:id}/vms" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -2938,6 +2974,14 @@ <link href="datacenters/{datacenter:id}/clusters/{cluster:id}/cpuprofiles" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -2970,6 +3014,14 @@ <link href="datacenters/{datacenter:id}/clusters/{cluster:id}/glusterhooks" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -3070,6 +3122,14 @@ <link href="datacenters/{datacenter:id}/clusters/{cluster:id}/glustervolumes" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -3136,6 +3196,14 @@ <link href="datacenters/{datacenter:id}/clusters/{cluster:id}/glustervolumes/{glustervolume:id}/bricks" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -3741,6 +3809,14 @@ <description>get all iSCSI Bonds for the specified datacenter</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -3848,6 +3924,14 @@ <description>gets the specified iSCSI Bond with the networks</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -3910,6 +3994,14 @@ <link href="datacenters/{datacenter:id}/iscsibonds/{iscsibond:id}/networks/{network:id}/labels" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -3953,6 +4045,14 @@ <link href="datacenters/{datacenter:id}/iscsibonds/{iscsibond:id}/networks/{network:id}/permissions" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -3996,6 +4096,14 @@ <link href="datacenters/{datacenter:id}/iscsibonds/{iscsibond:id}/networks/{network:id}/vnicprofiles" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -4039,6 +4147,14 @@ <link href="datacenters/{datacenter:id}/iscsibonds/{iscsibond:id}/networks/{network:id}/vnicprofiles/{vnicprofile:id}/permissions" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -4082,6 +4198,14 @@ <link href="datacenters/{datacenter:id}/iscsibonds/{iscsibond:id}/storageconnections" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -4349,6 +4473,14 @@ <description>get the labels of a network</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -4404,6 +4536,14 @@ <link href="datacenters/{datacenter:id}/networks/{network:id}/permissions" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -4447,6 +4587,14 @@ <link href="datacenters/{datacenter:id}/networks/{network:id}/vnicprofiles" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -4490,6 +4638,14 @@ <link href="datacenters/{datacenter:id}/networks/{network:id}/vnicprofiles/{vnicprofile:id}/permissions" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -4567,6 +4723,14 @@ <description>get the list of permissions on the data center</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -4822,6 +4986,14 @@ <link href="datacenters/{datacenter:id}/quotas" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -5149,13 +5321,13 @@ <name>case_sensitive</name> <value>true|false</value> </parameter> - <parameter required="false" type="xs:int" context="matrix"> - <name>max</name> - <value>max results</value> - </parameter> <parameter required="false" type="xs:boolean" context="matrix"> <name>unregistered</name> <value>true|false</value> + </parameter> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> </parameter> </parameters_set> </url> @@ -5304,6 +5476,14 @@ <link href="datacenters/{datacenter:id}/storagedomains/{storagedomain:id}/disks/{disk:id}/permissions" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -5977,14 +6157,6 @@ <description>get the disk statistics for the specified disk in the system</description> <request> <http_method>GET</http_method> - <url> - <parameters_set> - <parameter required="false" type="xs:int" context="matrix"> - <name>max</name> - <value>max results</value> - </parameter> - </parameters_set> - </url> <body/> </request> <response> @@ -7958,6 +8130,14 @@ <description>get all fencing agents defined for this host</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -8109,6 +8289,14 @@ <link href="hosts/{host:id}/hooks" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -8737,6 +8925,14 @@ <description>get the labels of an interface</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -8782,14 +8978,6 @@ <description>get the statistics for the network interface card attached to the specified host</description> <request> <http_method>GET</http_method> - <url> - <parameters_set> - <parameter required="false" type="xs:int" context="matrix"> - <name>max</name> - <value>max results</value> - </parameter> - </parameters_set> - </url> <body/> </request> <response> @@ -8838,14 +9026,6 @@ <description>get the statistics for the specified NUMA node of the host</description> <request> <http_method>GET</http_method> - <url> - <parameters_set> - <parameter required="false" type="xs:int" context="matrix"> - <name>max</name> - <value>max results</value> - </parameter> - </parameters_set> - </url> <body/> </request> <response> @@ -9002,14 +9182,6 @@ <description>get the statistics for the host</description> <request> <http_method>GET</http_method> - <url> - <parameters_set> - <parameter required="false" type="xs:int" context="matrix"> - <name>max</name> - <value>max results</value> - </parameter> - </parameters_set> - </url> <body/> </request> <response> @@ -9371,6 +9543,14 @@ <link href="instancetypes/{instancetype:id}/nics" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -9433,6 +9613,14 @@ <link href="instancetypes/{instancetype:id}/watchdogs" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -9749,14 +9937,6 @@ <description>get the detailed step status for monitoring</description> <request> <http_method>GET</http_method> - <url> - <parameters_set> - <parameter required="false" type="xs:int" context="matrix"> - <name>max</name> - <value>max results</value> - </parameter> - </parameters_set> - </url> <body/> </request> <response> @@ -10203,6 +10383,14 @@ <description>get the labels of a network</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -10457,6 +10645,14 @@ <link href="networks/{network:id}/vnicprofiles/{vnicprofile:id}/permissions" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -10717,8 +10913,19 @@ </response> </link> <link href="openstackimageproviders/{openstackimageprovider:id}/images/{image:id}/import" rel="import"> + <description>imports the OpenStack image</description> <request> <http_method>POST</http_method> + <headers> + <header required="false"> + <name>Correlation-Id</name> + <value>any string</value> + </header> + <header required="true"> + <name>Content-Type</name> + <value>application/xml|json</value> + </header> + </headers> <url> <parameters_set> <parameter required="false" type="xs:boolean" context="matrix"> @@ -10729,6 +10936,29 @@ </url> <body> <type>Action</type> + <parameters_set> + <parameter required="true" type="xs:string"> + <name>action.storagedomain.id|name</name> + </parameter> + <parameter required="false" type="xs:boolean"> + <name>action.import_as_template</name> + </parameter> + <parameter required="false" type="xs:string"> + <name>action.cluster.id|name</name> + </parameter> + <parameter required="false" type="xs:string"> + <name>action.disk.alias|name</name> + </parameter> + <parameter required="false" type="xs:string"> + <name>action.template.name</name> + </parameter> + <parameter required="false" type="xs:boolean"> + <name>action.async</name> + </parameter> + <parameter required="false" type="xs:long"> + <name>action.grace_period.expiry</name> + </parameter> + </parameters_set> </body> </request> <response> @@ -10988,6 +11218,14 @@ <link href="openstacknetworkproviders/{openstacknetworkprovider:id}/certificates" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -11311,6 +11549,14 @@ <link href="openstackvolumeproviders/{openstackvolumeprovider:id}/certificates" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -11396,6 +11642,14 @@ <description>get the list of all Operating Systems</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -12018,10 +12272,6 @@ <name>case_sensitive</name> <value>true|false</value> </parameter> - <parameter required="false" type="xs:int" context="matrix"> - <name>max</name> - <value>max results</value> - </parameter> </parameters_set> </url> <body/> @@ -12138,10 +12388,6 @@ <name>case_sensitive</name> <value>true|false</value> </parameter> - <parameter required="false" type="xs:int" context="matrix"> - <name>max</name> - <value>max results</value> - </parameter> </parameters_set> </url> <body/> @@ -12257,10 +12503,6 @@ <parameter required="false" type="xs:boolean" context="matrix"> <name>case_sensitive</name> <value>true|false</value> - </parameter> - <parameter required="false" type="xs:int" context="matrix"> - <name>max</name> - <value>max results</value> </parameter> </parameters_set> </url> @@ -12438,6 +12680,14 @@ <description>get the list of all storage connections in the system</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -12676,6 +12926,12 @@ <parameter required="false" type="xs:boolean"> <name>storagedomain.wipe_after_delete</name> </parameter> + <parameter required="false" type="xs:int"> + <name>storagedomain.warning_low_space_indicator</name> + </parameter> + <parameter required="false" type="xs:int"> + <name>storagedomain.critical_space_action_blocker</name> + </parameter> </parameters_set> <parameters_set> <description>Import an existing block storage domain to the system using the targets already connected to the host</description> @@ -12699,6 +12955,12 @@ </parameter> <parameter required="false" type="xs:string"> <name>storagedomain.comment</name> + </parameter> + <parameter required="false" type="xs:int"> + <name>storagedomain.warning_low_space_indicator</name> + </parameter> + <parameter required="false" type="xs:int"> + <name>storagedomain.critical_space_action_blocker</name> </parameter> </parameters_set> <parameters_set> @@ -12733,6 +12995,12 @@ <parameter required="false" type="xs:boolean"> <name>storagedomain.wipe_after_delete</name> </parameter> + <parameter required="false" type="xs:int"> + <name>storagedomain.warning_low_space_indicator</name> + </parameter> + <parameter required="false" type="xs:int"> + <name>storagedomain.critical_space_action_blocker</name> + </parameter> </parameters_set> <parameters_set> <description>add a new storage domain to the system using the storage on the localhost at the given path</description> @@ -12762,6 +13030,12 @@ </parameter> <parameter required="false" type="xs:boolean"> <name>storagedomain.wipe_after_delete</name> + </parameter> + <parameter required="false" type="xs:int"> + <name>storagedomain.warning_low_space_indicator</name> + </parameter> + <parameter required="false" type="xs:int"> + <name>storagedomain.critical_space_action_blocker</name> </parameter> </parameters_set> <parameters_set> @@ -12801,6 +13075,12 @@ </parameter> <parameter required="false" type="xs:boolean"> <name>storagedomain.wipe_after_delete</name> + </parameter> + <parameter required="false" type="xs:int"> + <name>storagedomain.warning_low_space_indicator</name> + </parameter> + <parameter required="false" type="xs:int"> + <name>storagedomain.critical_space_action_blocker</name> </parameter> </parameters_set> </body> @@ -12984,6 +13264,12 @@ </parameter> <parameter required="false" type="xs:boolean"> <name>storagedomain.wipe_after_delete</name> + </parameter> + <parameter required="false" type="xs:int"> + <name>storagedomain.warning_low_space_indicator</name> + </parameter> + <parameter required="false" type="xs:int"> + <name>storagedomain.critical_space_action_blocker</name> </parameter> </parameters_set> </body> @@ -13232,13 +13518,13 @@ <name>case_sensitive</name> <value>true|false</value> </parameter> - <parameter required="false" type="xs:int" context="matrix"> - <name>max</name> - <value>max results</value> - </parameter> <parameter required="false" type="xs:boolean" context="matrix"> <name>unregistered</name> <value>true|false</value> + </parameter> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> </parameter> </parameters_set> </url> @@ -13379,6 +13665,14 @@ <link href="storagedomains/{storagedomain:id}/disks/{disk:id}/permissions" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -13544,6 +13838,16 @@ <link href="storagedomains/{storagedomain:id}/images/{image:id}/import" rel="import"> <request> <http_method>POST</http_method> + <headers> + <header required="false"> + <name>Correlation-Id</name> + <value>any string</value> + </header> + <header required="true"> + <name>Content-Type</name> + <value>application/xml|json</value> + </header> + </headers> <url> <parameters_set> <parameter required="false" type="xs:boolean" context="matrix"> @@ -13554,6 +13858,23 @@ </url> <body> <type>Action</type> + <parameters_set> + <parameter required="true" type="xs:string"> + <name>storagedomain.id|name</name> + </parameter> + <parameter required="false" type="xs:boolean"> + <name>action.import_as_template</name> + </parameter> + <parameter required="false" type="xs:string"> + <name>action.cluster.id|name</name> + </parameter> + <parameter required="false" type="xs:boolean"> + <name>action.async</name> + </parameter> + <parameter required="false" type="xs:long"> + <name>action.grace_period.expiry</name> + </parameter> + </parameters_set> </body> </request> <response> @@ -13786,13 +14107,13 @@ <http_method>GET</http_method> <url> <parameters_set> - <parameter required="false" type="xs:int" context="matrix"> - <name>max</name> - <value>max results</value> - </parameter> <parameter required="false" type="xs:boolean" context="matrix"> <name>unregistered</name> <value>true|false</value> + </parameter> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> </parameter> </parameters_set> </url> @@ -13841,6 +14162,14 @@ <description>get the list of disks attached to the template in the export or data domain</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -13976,13 +14305,13 @@ <http_method>GET</http_method> <url> <parameters_set> - <parameter required="false" type="xs:int" context="matrix"> - <name>max</name> - <value>max results</value> - </parameter> <parameter required="false" type="xs:boolean" context="matrix"> <name>unregistered</name> <value>true|false</value> + </parameter> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> </parameter> </parameters_set> </url> @@ -14031,6 +14360,14 @@ <description>get the list of disks attached to the virtual machine in the storage domain</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -17488,6 +17825,14 @@ <value>true|false</value> </header> </headers> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -17567,13 +17912,13 @@ <http_method>GET</http_method> <url> <parameters_set> - <parameter required="false" type="xs:int" context="matrix"> - <name>max</name> - <value>max results</value> - </parameter> <parameter required="false" type="xs:boolean" context="matrix"> <name>current</name> <value>true|false</value> + </parameter> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> </parameter> </parameters_set> </url> @@ -18273,6 +18618,14 @@ <link href="vms/{vm:id}/disks/{disk:id}/permissions" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -18829,6 +19182,14 @@ <link href="vms/{vm:id}/nics/{nic:id}/reporteddevices" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -19212,6 +19573,14 @@ <link href="vms/{vm:id}/reporteddevices" rel="get"> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -19231,6 +19600,14 @@ <description>get the open user-sessions of this VM</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -19398,6 +19775,14 @@ <description>get the list of cdroms attached to the virtual machine at the time the snapshot was created</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -19418,6 +19803,14 @@ <description>get the list of disks attached to the virtual machine at the time the snapshot was created</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -19463,6 +19856,14 @@ <description>get the list of network interfaces attached to the virtual machine at the time the snapshot was created</description> <request> <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> <body/> </request> <response> @@ -19710,14 +20111,6 @@ <description>get the memory and cpu statistics for a given virtual machine</description> <request> <http_method>GET</http_method> - <url> - <parameters_set> - <parameter required="false" type="xs:int" context="matrix"> - <name>max</name> - <value>max results</value> - </parameter> - </parameters_set> - </url> <body/> </request> <response> diff --git a/setup.py b/setup.py index 2b59e08..fe49566 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ version_info = { 'name': 'ovirt-engine-sdk-python', - 'version': '3.6.0.0preview12', + 'version': '3.6.0.0preview13', 'description': 'A SDK interface to oVirt Virtualization', 'author': 'Michael Pasternak', 'author_email': 'mpast...@redhat.com', diff --git a/src/ovirtsdk/api.py b/src/ovirtsdk/api.py index 24716de..acca13c 100644 --- a/src/ovirtsdk/api.py +++ b/src/ovirtsdk/api.py @@ -20,7 +20,7 @@ ############ GENERATED CODE ############ ######################################## -'''Generated at: 2015-04-06 13:12:43.000237''' +'''Generated at: 2015-05-12 10:03:28.000499''' import re import types diff --git a/src/ovirtsdk/infrastructure/brokers.py b/src/ovirtsdk/infrastructure/brokers.py index 28308e5..aea6f04 100644 --- a/src/ovirtsdk/infrastructure/brokers.py +++ b/src/ovirtsdk/infrastructure/brokers.py @@ -19,7 +19,7 @@ ############ GENERATED CODE ############ ######################################## -'''Generated at: 2015-05-06 12:23:54.000686''' +'''Generated at: 2015-05-12 10:03:28.000330''' from ovirtsdk.xml import params @@ -172,9 +172,10 @@ raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)] + [@param max: int (max results)] @return Bookmarks: ''' @@ -182,7 +183,8 @@ url='/bookmarks' result = self.__getProxy().get( - url=url + url=SearchHelper.appendQuery(url, {'max:matrix':max}), + headers={} ).get_bookmark() return ParseHelper.toCollection( @@ -190,6 +192,7 @@ FilterHelper.filter(result, kwargs), context=self.context ) + class Capabilities(Base): def __init__(self, context): Base.__init__(self, context) @@ -1187,9 +1190,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return GlusterHooks: ''' @@ -1197,12 +1201,16 @@ url = '/clusters/{cluster:id}/glusterhooks' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{cluster:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{cluster:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_gluster_hook() return ParseHelper.toSubCollection( @@ -1798,10 +1806,9 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, max=None, **kwargs): + def list(self, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] - [@param max: int (max results)] @return Statistics: ''' @@ -1809,18 +1816,14 @@ url = '/clusters/{cluster:id}/glustervolumes/{glustervolume:id}/bricks/{brick:id}/statistics' result = self.__getProxy().get( - url=SearchHelper.appendQuery( - url=UrlHelper.replace( - url=url, - args={ - '{cluster:id}': self.parentclass.parentclass.parentclass.get_id(), - '{glustervolume:id}': self.parentclass.parentclass.get_id(), - '{brick:id}': self.parentclass.get_id(), - } - ), - qargs={'max:matrix':max} - ), - headers={} + url=UrlHelper.replace( + url, + { + '{cluster:id}': self.parentclass.parentclass.parentclass.get_id(), + '{glustervolume:id}': self.parentclass.parentclass.get_id(), + '{brick:id}': self.parentclass.get_id(), + } + ) ).get_statistic() return ParseHelper.toSubCollection( @@ -1949,9 +1952,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, all_content=None, **kwargs): + def list(self, max=None, all_content=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] [@param all_content: true|false] @return GlusterBricks: @@ -1968,7 +1972,7 @@ '{glustervolume:id}': self.parentclass.get_id(), } ), - qargs={} + qargs={'max:matrix':max} ), headers={"All-Content":all_content} ).get_brick() @@ -2234,11 +2238,12 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, query=None, case_sensitive=True, **kwargs): + def list(self, query=None, case_sensitive=True, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] [@param query: string (oVirt engine search dialect query)] [@param case_sensitive: boolean (true|false)] + [@param max: int (max results)] @return GlusterVolumes: ''' @@ -2253,7 +2258,7 @@ '{cluster:id}': self.parentclass.get_id(), } ), - qargs={'search:query':query,'case_sensitive:matrix':case_sensitive} + qargs={'search:query':query,'case_sensitive:matrix':case_sensitive,'max:matrix':max} ), headers={} ).get_gluster_volume() @@ -3627,9 +3632,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return VMs: ''' @@ -3637,14 +3643,18 @@ url = '/datacenters/{datacenter:id}/clusters/{cluster:id}/affinitygroups/{affinitygroup:id}/vms' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.parentclass.get_id(), - '{cluster:id}': self.parentclass.parentclass.get_id(), - '{affinitygroup:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.parentclass.get_id(), + '{cluster:id}': self.parentclass.parentclass.get_id(), + '{affinitygroup:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_vm() return ParseHelper.toSubCollection( @@ -3763,9 +3773,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return AffinityGroups: ''' @@ -3773,13 +3784,17 @@ url = '/datacenters/{datacenter:id}/clusters/{cluster:id}/affinitygroups' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.get_id(), - '{cluster:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.get_id(), + '{cluster:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_affinity_group() return ParseHelper.toSubCollection( @@ -3944,9 +3959,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return CpuProfiles: ''' @@ -3954,13 +3970,17 @@ url = '/datacenters/{datacenter:id}/clusters/{cluster:id}/cpuprofiles' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.get_id(), - '{cluster:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.get_id(), + '{cluster:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_cpu_profile() return ParseHelper.toSubCollection( @@ -4174,9 +4194,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return GlusterHooks: ''' @@ -4184,13 +4205,17 @@ url = '/datacenters/{datacenter:id}/clusters/{cluster:id}/glusterhooks' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.get_id(), - '{cluster:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.get_id(), + '{cluster:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_gluster_hook() return ParseHelper.toSubCollection( @@ -4881,9 +4906,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return GlusterBricks: ''' @@ -4891,14 +4917,18 @@ url = '/datacenters/{datacenter:id}/clusters/{cluster:id}/glustervolumes/{glustervolume:id}/bricks' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.parentclass.get_id(), - '{cluster:id}': self.parentclass.parentclass.get_id(), - '{glustervolume:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.parentclass.get_id(), + '{cluster:id}': self.parentclass.parentclass.get_id(), + '{glustervolume:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_brick() return ParseHelper.toSubCollection( @@ -5148,9 +5178,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return GlusterVolumes: ''' @@ -5158,13 +5189,17 @@ url = '/datacenters/{datacenter:id}/clusters/{cluster:id}/glustervolumes' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.get_id(), - '{cluster:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.get_id(), + '{cluster:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_gluster_volume() return ParseHelper.toSubCollection( @@ -6079,9 +6114,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Labels: ''' @@ -6089,14 +6125,18 @@ url = '/datacenters/{datacenter:id}/iscsibonds/{iscsibond:id}/networks/{network:id}/labels' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.parentclass.get_id(), - '{iscsibond:id}': self.parentclass.parentclass.get_id(), - '{network:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.parentclass.get_id(), + '{iscsibond:id}': self.parentclass.parentclass.get_id(), + '{network:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_label() return ParseHelper.toSubCollection( @@ -6265,9 +6305,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Permissions: ''' @@ -6275,14 +6316,18 @@ url = '/datacenters/{datacenter:id}/iscsibonds/{iscsibond:id}/networks/{network:id}/permissions' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.parentclass.get_id(), - '{iscsibond:id}': self.parentclass.parentclass.get_id(), - '{network:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.parentclass.get_id(), + '{iscsibond:id}': self.parentclass.parentclass.get_id(), + '{network:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_permission() return ParseHelper.toSubCollection( @@ -6503,9 +6548,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Permissions: ''' @@ -6513,15 +6559,19 @@ url = '/datacenters/{datacenter:id}/iscsibonds/{iscsibond:id}/networks/{network:id}/vnicprofiles/{vnicprofile:id}/permissions' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.parentclass.parentclass.get_id(), - '{iscsibond:id}': self.parentclass.parentclass.parentclass.get_id(), - '{network:id}': self.parentclass.parentclass.get_id(), - '{vnicprofile:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.parentclass.parentclass.get_id(), + '{iscsibond:id}': self.parentclass.parentclass.parentclass.get_id(), + '{network:id}': self.parentclass.parentclass.get_id(), + '{vnicprofile:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_permission() return ParseHelper.toSubCollection( @@ -6643,9 +6693,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return VnicProfiles: ''' @@ -6653,14 +6704,18 @@ url = '/datacenters/{datacenter:id}/iscsibonds/{iscsibond:id}/networks/{network:id}/vnicprofiles' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.parentclass.get_id(), - '{iscsibond:id}': self.parentclass.parentclass.get_id(), - '{network:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.parentclass.get_id(), + '{iscsibond:id}': self.parentclass.parentclass.get_id(), + '{network:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_vnic_profile() return ParseHelper.toSubCollection( @@ -6781,9 +6836,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Networks: ''' @@ -6791,13 +6847,17 @@ url = '/datacenters/{datacenter:id}/iscsibonds/{iscsibond:id}/networks' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.get_id(), - '{iscsibond:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.get_id(), + '{iscsibond:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_network() return ParseHelper.toSubCollection( @@ -7018,9 +7078,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return StorageConnections: ''' @@ -7028,13 +7089,17 @@ url = '/datacenters/{datacenter:id}/iscsibonds/{iscsibond:id}/storageconnections' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.get_id(), - '{iscsibond:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.get_id(), + '{iscsibond:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_storage_connection() return ParseHelper.toSubCollection( @@ -7153,9 +7218,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return IscsiBonds: ''' @@ -7163,12 +7229,16 @@ url = '/datacenters/{datacenter:id}/iscsibonds' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_iscsi_bond() return ParseHelper.toSubCollection( @@ -7421,9 +7491,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Labels: ''' @@ -7431,13 +7502,17 @@ url = '/datacenters/{datacenter:id}/networks/{network:id}/labels' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.get_id(), - '{network:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.get_id(), + '{network:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_label() return ParseHelper.toSubCollection( @@ -7602,9 +7677,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Permissions: ''' @@ -7612,13 +7688,17 @@ url = '/datacenters/{datacenter:id}/networks/{network:id}/permissions' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.get_id(), - '{network:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.get_id(), + '{network:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_permission() return ParseHelper.toSubCollection( @@ -7834,9 +7914,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Permissions: ''' @@ -7844,14 +7925,18 @@ url = '/datacenters/{datacenter:id}/networks/{network:id}/vnicprofiles/{vnicprofile:id}/permissions' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.parentclass.get_id(), - '{network:id}': self.parentclass.parentclass.get_id(), - '{vnicprofile:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.parentclass.get_id(), + '{network:id}': self.parentclass.parentclass.get_id(), + '{vnicprofile:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_permission() return ParseHelper.toSubCollection( @@ -7970,9 +8055,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return VnicProfiles: ''' @@ -7980,13 +8066,17 @@ url = '/datacenters/{datacenter:id}/networks/{network:id}/vnicprofiles' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.get_id(), - '{network:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.get_id(), + '{network:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_vnic_profile() return ParseHelper.toSubCollection( @@ -8308,9 +8398,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Permissions: ''' @@ -8318,12 +8409,16 @@ url = '/datacenters/{datacenter:id}/permissions' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_permission() return ParseHelper.toSubCollection( @@ -8678,9 +8773,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Quotas: ''' @@ -8688,12 +8784,16 @@ url = '/datacenters/{datacenter:id}/quotas' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_quota() return ParseHelper.toSubCollection( @@ -9096,9 +9196,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Permissions: ''' @@ -9106,14 +9207,18 @@ url = '/datacenters/{datacenter:id}/storagedomains/{storagedomain:id}/disks/{disk:id}/permissions' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{datacenter:id}': self.parentclass.parentclass.parentclass.get_id(), - '{storagedomain:id}': self.parentclass.parentclass.get_id(), - '{disk:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{datacenter:id}': self.parentclass.parentclass.parentclass.get_id(), + '{storagedomain:id}': self.parentclass.parentclass.get_id(), + '{disk:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_permission() return ParseHelper.toSubCollection( @@ -9400,13 +9505,13 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, query=None, case_sensitive=True, max=None, unregistered=None, **kwargs): + def list(self, query=None, case_sensitive=True, unregistered=None, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] [@param query: string (oVirt engine search dialect query)] [@param case_sensitive: boolean (true|false)] - [@param max: int (max results)] [@param unregistered: boolean (true|false)] + [@param max: int (max results)] @return Disks: ''' @@ -9422,7 +9527,7 @@ '{storagedomain:id}': self.parentclass.get_id(), } ), - qargs={'search:query':query,'case_sensitive:matrix':case_sensitive,'max:matrix':max,'unregistered:matrix':unregistered} + qargs={'search:query':query,'case_sensitive:matrix':case_sensitive,'unregistered:matrix':unregistered,'max:matrix':max} ), headers={} ).get_disk() @@ -10447,10 +10552,9 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, max=None, **kwargs): + def list(self, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] - [@param max: int (max results)] @return Statistics: ''' @@ -10458,16 +10562,12 @@ url = '/disks/{disk:id}/statistics' result = self.__getProxy().get( - url=SearchHelper.appendQuery( - url=UrlHelper.replace( - url=url, - args={ - '{disk:id}': self.parentclass.get_id(), - } - ), - qargs={'max:matrix':max} - ), - headers={} + url=UrlHelper.replace( + url, + { + '{disk:id}': self.parentclass.get_id(), + } + ) ).get_statistic() return ParseHelper.toSubCollection( @@ -13556,9 +13656,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Agents: ''' @@ -13566,12 +13667,16 @@ url = '/hosts/{host:id}/fenceagents' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{host:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{host:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_agent() return ParseHelper.toSubCollection( @@ -13681,9 +13786,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Hooks: ''' @@ -13691,12 +13797,16 @@ url = '/hosts/{host:id}/hooks' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{host:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{host:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_hook() return ParseHelper.toSubCollection( @@ -14147,9 +14257,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Labels: ''' @@ -14157,13 +14268,17 @@ url = '/hosts/{host:id}/nics/{nic:id}/labels' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{host:id}': self.parentclass.parentclass.get_id(), - '{nic:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{host:id}': self.parentclass.parentclass.get_id(), + '{nic:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_label() return ParseHelper.toSubCollection( @@ -14275,10 +14390,9 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, max=None, **kwargs): + def list(self, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] - [@param max: int (max results)] @return Statistics: ''' @@ -14286,17 +14400,13 @@ url = '/hosts/{host:id}/nics/{nic:id}/statistics' result = self.__getProxy().get( - url=SearchHelper.appendQuery( - url=UrlHelper.replace( - url=url, - args={ - '{host:id}': self.parentclass.parentclass.get_id(), - '{nic:id}': self.parentclass.get_id(), - } - ), - qargs={'max:matrix':max} - ), - headers={} + url=UrlHelper.replace( + url, + { + '{host:id}': self.parentclass.parentclass.get_id(), + '{nic:id}': self.parentclass.get_id(), + } + ) ).get_statistic() return ParseHelper.toSubCollection( @@ -14638,10 +14748,9 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, max=None, **kwargs): + def list(self, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] - [@param max: int (max results)] @return Statistics: ''' @@ -14649,17 +14758,13 @@ url = '/hosts/{host:id}/numanodes/{numanode:id}/statistics' result = self.__getProxy().get( - url=SearchHelper.appendQuery( - url=UrlHelper.replace( - url=url, - args={ - '{host:id}': self.parentclass.parentclass.get_id(), - '{numanode:id}': self.parentclass.get_id(), - } - ), - qargs={'max:matrix':max} - ), - headers={} + url=UrlHelper.replace( + url, + { + '{host:id}': self.parentclass.parentclass.get_id(), + '{numanode:id}': self.parentclass.get_id(), + } + ) ).get_statistic() return ParseHelper.toSubCollection( @@ -15067,10 +15172,9 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, max=None, **kwargs): + def list(self, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] - [@param max: int (max results)] @return Statistics: ''' @@ -15078,16 +15182,12 @@ url = '/hosts/{host:id}/statistics' result = self.__getProxy().get( - url=SearchHelper.appendQuery( - url=UrlHelper.replace( - url=url, - args={ - '{host:id}': self.parentclass.get_id(), - } - ), - qargs={'max:matrix':max} - ), - headers={} + url=UrlHelper.replace( + url, + { + '{host:id}': self.parentclass.get_id(), + } + ) ).get_statistic() return ParseHelper.toSubCollection( @@ -15840,9 +15940,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Nics: ''' @@ -15850,12 +15951,16 @@ url = '/instancetypes/{instancetype:id}/nics' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{instancetype:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{instancetype:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_nic() return ParseHelper.toSubCollection( @@ -16044,9 +16149,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return WatchDogs: ''' @@ -16054,12 +16160,16 @@ url = '/instancetypes/{instancetype:id}/watchdogs' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{instancetype:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{instancetype:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_watchdog() return ParseHelper.toSubCollection( @@ -16423,10 +16533,9 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, max=None, **kwargs): + def list(self, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] - [@param max: int (max results)] @return Statistics: ''' @@ -16434,17 +16543,13 @@ url = '/jobs/{job:id}/steps/{step:id}/statistics' result = self.__getProxy().get( - url=SearchHelper.appendQuery( - url=UrlHelper.replace( - url=url, - args={ - '{job:id}': self.parentclass.parentclass.get_id(), - '{step:id}': self.parentclass.get_id(), - } - ), - qargs={'max:matrix':max} - ), - headers={} + url=UrlHelper.replace( + url, + { + '{job:id}': self.parentclass.parentclass.get_id(), + '{step:id}': self.parentclass.get_id(), + } + ) ).get_statistic() return ParseHelper.toSubCollection( @@ -17201,9 +17306,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Labels: ''' @@ -17211,12 +17317,16 @@ url = '/networks/{network:id}/labels' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{network:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{network:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_label() return ParseHelper.toSubCollection( @@ -17618,9 +17728,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Permissions: ''' @@ -17628,13 +17739,17 @@ url = '/networks/{network:id}/vnicprofiles/{vnicprofile:id}/permissions' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{network:id}': self.parentclass.parentclass.get_id(), - '{vnicprofile:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{network:id}': self.parentclass.parentclass.get_id(), + '{vnicprofile:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_permission() return ParseHelper.toSubCollection( @@ -18188,10 +18303,18 @@ #still available at client's code. raise DisconnectedError - def import_image(self, action=params.Action()): + def import_image(self, action=params.Action(), correlation_id=None): ''' @type Action: + @param action.storagedomain.id|name: string + [@param action.import_as_template: boolean] + [@param action.cluster.id|name: string] + [@param action.disk.alias|name: string] + [@param action.template.name: string] + [@param action.async: boolean] + [@param action.grace_period.expiry: long] + [@param correlation_id: any string] @return Action: ''' @@ -18208,7 +18331,7 @@ } ), body=ParseHelper.toXml(action), - headers={} + headers={"Correlation-Id":correlation_id} ) return result @@ -18650,9 +18773,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Certificates: ''' @@ -18660,12 +18784,16 @@ url = '/openstacknetworkproviders/{openstacknetworkprovider:id}/certificates' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{openstacknetworkprovider:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{openstacknetworkprovider:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_certificate() return ParseHelper.toSubCollection( @@ -19326,9 +19454,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Certificates: ''' @@ -19336,12 +19465,16 @@ url = '/openstackvolumeproviders/{openstackvolumeprovider:id}/certificates' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{openstackvolumeprovider:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{openstackvolumeprovider:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_certificate() return ParseHelper.toSubCollection( @@ -19665,9 +19798,10 @@ raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)] + [@param max: int (max results)] @return OperatingSystemInfos: ''' @@ -19675,7 +19809,8 @@ url='/operatingsystems' result = self.__getProxy().get( - url=url + url=SearchHelper.appendQuery(url, {'max:matrix':max}), + headers={} ).get_operating_system() return ParseHelper.toCollection( @@ -19683,6 +19818,7 @@ FilterHelper.filter(result, kwargs), context=self.context ) + class Permission(params.Permission, Base): def __init__(self, permission, context): Base.__init__(self, context) @@ -21231,9 +21367,10 @@ raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)] + [@param max: int (max results)] @return StorageConnections: ''' @@ -21241,7 +21378,8 @@ url='/storageconnections' result = self.__getProxy().get( - url=url + url=SearchHelper.appendQuery(url, {'max:matrix':max}), + headers={} ).get_storage_connection() return ParseHelper.toCollection( @@ -21249,6 +21387,7 @@ FilterHelper.filter(result, kwargs), context=self.context ) + class StorageDomain(params.StorageDomain, Base): def __init__(self, storagedomain, context): Base.__init__(self, context) @@ -21332,6 +21471,8 @@ [@param storagedomain.comment: string] [@param storagedomain.storage.override_luns: boolean] [@param storagedomain.wipe_after_delete: boolean] + [@param storagedomain.warning_low_space_indicator: int] + [@param storagedomain.critical_space_action_blocker: int] [@param correlation_id: any string] [@param expect: 202-accepted] @@ -21660,9 +21801,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Permissions: ''' @@ -21670,13 +21812,17 @@ url = '/storagedomains/{storagedomain:id}/disks/{disk:id}/permissions' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{storagedomain:id}': self.parentclass.parentclass.get_id(), - '{disk:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{storagedomain:id}': self.parentclass.parentclass.get_id(), + '{disk:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_permission() return ParseHelper.toSubCollection( @@ -22298,13 +22444,13 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, query=None, case_sensitive=True, max=None, unregistered=None, **kwargs): + def list(self, query=None, case_sensitive=True, unregistered=None, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] [@param query: string (oVirt engine search dialect query)] [@param case_sensitive: boolean (true|false)] - [@param max: int (max results)] [@param unregistered: boolean (true|false)] + [@param max: int (max results)] @return Disks: ''' @@ -22319,7 +22465,7 @@ '{storagedomain:id}': self.parentclass.get_id(), } ), - qargs={'search:query':query,'case_sensitive:matrix':case_sensitive,'max:matrix':max,'unregistered:matrix':unregistered} + qargs={'search:query':query,'case_sensitive:matrix':case_sensitive,'unregistered:matrix':unregistered,'max:matrix':max} ), headers={} ).get_disk() @@ -22488,10 +22634,16 @@ #still available at client's code. raise DisconnectedError - def import_image(self, action=params.Action()): + def import_image(self, action=params.Action(), correlation_id=None): ''' @type Action: + @param storagedomain.id|name: string + [@param action.import_as_template: boolean] + [@param action.cluster.id|name: string] + [@param action.async: boolean] + [@param action.grace_period.expiry: long] + [@param correlation_id: any string] @return Action: ''' @@ -22508,7 +22660,7 @@ } ), body=ParseHelper.toXml(action), - headers={} + headers={"Correlation-Id":correlation_id} ) return result @@ -23211,9 +23363,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Disks: ''' @@ -23221,13 +23374,17 @@ url = '/storagedomains/{storagedomain:id}/templates/{template:id}/disks' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{storagedomain:id}': self.parentclass.parentclass.get_id(), - '{template:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{storagedomain:id}': self.parentclass.parentclass.get_id(), + '{template:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_disk() return ParseHelper.toSubCollection( @@ -23315,11 +23472,11 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, max=None, unregistered=None, **kwargs): + def list(self, unregistered=None, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] - [@param max: int (max results)] [@param unregistered: boolean (true|false)] + [@param max: int (max results)] @return Templates: ''' @@ -23334,7 +23491,7 @@ '{storagedomain:id}': self.parentclass.get_id(), } ), - qargs={'max:matrix':max,'unregistered:matrix':unregistered} + qargs={'unregistered:matrix':unregistered,'max:matrix':max} ), headers={} ).get_template() @@ -23564,9 +23721,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Disks: ''' @@ -23574,13 +23732,17 @@ url = '/storagedomains/{storagedomain:id}/vms/{vm:id}/disks' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{storagedomain:id}': self.parentclass.parentclass.get_id(), - '{vm:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{storagedomain:id}': self.parentclass.parentclass.get_id(), + '{vm:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_disk() return ParseHelper.toSubCollection( @@ -23668,11 +23830,11 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, max=None, unregistered=None, **kwargs): + def list(self, unregistered=None, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] - [@param max: int (max results)] [@param unregistered: boolean (true|false)] + [@param max: int (max results)] @return VMs: ''' @@ -23687,7 +23849,7 @@ '{storagedomain:id}': self.parentclass.get_id(), } ), - qargs={'max:matrix':max,'unregistered:matrix':unregistered} + qargs={'unregistered:matrix':unregistered,'max:matrix':max} ), headers={} ).get_vm() @@ -23745,6 +23907,8 @@ [@param storagedomain.storage.override_luns: boolean] [@param storagedomain.storage_format: string] [@param storagedomain.wipe_after_delete: boolean] + [@param storagedomain.warning_low_space_indicator: int] + [@param storagedomain.critical_space_action_blocker: int] Overload 2: @param storagedomain.host.id|name: string @param storagedomain.type: string @@ -23753,6 +23917,8 @@ [@param storagedomain.storage.address: string] [@param storagedomain.format: boolean] [@param storagedomain.comment: string] + [@param storagedomain.warning_low_space_indicator: int] + [@param storagedomain.critical_space_action_blocker: int] Overload 3: @param storagedomain.host.id|name: string @param storagedomain.type: string @@ -23764,6 +23930,8 @@ [@param storagedomain.comment: string] [@param storagedomain.storage_format: string] [@param storagedomain.wipe_after_delete: boolean] + [@param storagedomain.warning_low_space_indicator: int] + [@param storagedomain.critical_space_action_blocker: int] Overload 4: @param storagedomain.host.id|name: string @param storagedomain.type: string @@ -23774,6 +23942,8 @@ [@param storagedomain.comment: string] [@param storagedomain.storage_format: string] [@param storagedomain.wipe_after_delete: boolean] + [@param storagedomain.warning_low_space_indicator: int] + [@param storagedomain.critical_space_action_blocker: int] Overload 5: @param storagedomain.host.id|name: string @param storagedomain.type: string @@ -23787,6 +23957,8 @@ [@param storagedomain.storage.mount_options: string] [@param storagedomain.storage_format: string] [@param storagedomain.wipe_after_delete: boolean] + [@param storagedomain.warning_low_space_indicator: int] + [@param storagedomain.critical_space_action_blocker: int] [@param correlation_id: any string] [@param expect: 201-created] @@ -27209,9 +27381,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Applications: ''' @@ -27219,12 +27392,16 @@ url = '/vms/{vm:id}/applications' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{vm:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{vm:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_application() return ParseHelper.toSubCollection( @@ -27421,11 +27598,11 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, max=None, current=None, **kwargs): + def list(self, current=None, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] - [@param max: int (max results)] [@param current: boolean (true|false)] + [@param max: int (max results)] @return CdRoms: ''' @@ -27440,7 +27617,7 @@ '{vm:id}': self.parentclass.get_id(), } ), - qargs={'max:matrix':max,'current:matrix':current} + qargs={'current:matrix':current,'max:matrix':max} ), headers={} ).get_cdrom() @@ -27820,9 +27997,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Permissions: ''' @@ -27830,13 +28008,17 @@ url = '/vms/{vm:id}/disks/{disk:id}/permissions' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{vm:id}': self.parentclass.parentclass.get_id(), - '{disk:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{vm:id}': self.parentclass.parentclass.get_id(), + '{disk:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_permission() return ParseHelper.toSubCollection( @@ -28410,9 +28592,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return ReportedDevices: ''' @@ -28420,13 +28603,17 @@ url = '/vms/{vm:id}/nics/{nic:id}/reporteddevices' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{vm:id}': self.parentclass.parentclass.get_id(), - '{nic:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{vm:id}': self.parentclass.parentclass.get_id(), + '{nic:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_reported_device() return ParseHelper.toSubCollection( @@ -29012,9 +29199,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return ReportedDevices: ''' @@ -29022,12 +29210,16 @@ url = '/vms/{vm:id}/reporteddevices' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{vm:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{vm:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_reported_device() return ParseHelper.toSubCollection( @@ -29137,9 +29329,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Sessions: ''' @@ -29147,12 +29340,16 @@ url = '/vms/{vm:id}/sessions' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{vm:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{vm:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_session() return ParseHelper.toSubCollection( @@ -29347,9 +29544,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return CdRoms: ''' @@ -29357,13 +29555,17 @@ url = '/vms/{vm:id}/snapshots/{snapshot:id}/cdroms' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{vm:id}': self.parentclass.parentclass.get_id(), - '{snapshot:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{vm:id}': self.parentclass.parentclass.get_id(), + '{snapshot:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_cdrom() return ParseHelper.toSubCollection( @@ -29500,9 +29702,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Disks: ''' @@ -29510,13 +29713,17 @@ url = '/vms/{vm:id}/snapshots/{snapshot:id}/disks' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{vm:id}': self.parentclass.parentclass.get_id(), - '{snapshot:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{vm:id}': self.parentclass.parentclass.get_id(), + '{snapshot:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_disk() return ParseHelper.toSubCollection( @@ -29628,9 +29835,10 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, **kwargs): + def list(self, max=None, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] + [@param max: int (max results)] @return Nics: ''' @@ -29638,13 +29846,17 @@ url = '/vms/{vm:id}/snapshots/{snapshot:id}/nics' result = self.__getProxy().get( - url=UrlHelper.replace( - url, - { - '{vm:id}': self.parentclass.parentclass.get_id(), - '{snapshot:id}': self.parentclass.get_id(), - } - ) + url=SearchHelper.appendQuery( + url=UrlHelper.replace( + url=url, + args={ + '{vm:id}': self.parentclass.parentclass.get_id(), + '{snapshot:id}': self.parentclass.get_id(), + } + ), + qargs={'max:matrix':max} + ), + headers={} ).get_nic() return ParseHelper.toSubCollection( @@ -29900,10 +30112,9 @@ else: raise MissingParametersError(['id', 'name']) - def list(self, max=None, **kwargs): + def list(self, **kwargs): ''' [@param **kwargs: dict (property based filtering)"] - [@param max: int (max results)] @return Statistics: ''' @@ -29911,16 +30122,12 @@ url = '/vms/{vm:id}/statistics' result = self.__getProxy().get( - url=SearchHelper.appendQuery( - url=UrlHelper.replace( - url=url, - args={ - '{vm:id}': self.parentclass.get_id(), - } - ), - qargs={'max:matrix':max} - ), - headers={} + url=UrlHelper.replace( + url, + { + '{vm:id}': self.parentclass.get_id(), + } + ) ).get_statistic() return ParseHelper.toSubCollection( diff --git a/src/ovirtsdk/xml/params.py b/src/ovirtsdk/xml/params.py index 06dbe8c..323dd91 100644 --- a/src/ovirtsdk/xml/params.py +++ b/src/ovirtsdk/xml/params.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -# Generated Wed May 6 12:23:53 2015 by generateDS.py version 2.12a. +# Generated Tue May 12 10:03:27 2015 by generateDS.py version 2.12a. # import sys @@ -17726,7 +17726,7 @@ class StorageDomain(BaseResource): subclass = None superclass = BaseResource - def __init__(self, actions=None, href=None, id=None, name=None, description=None, comment=None, creation_status=None, link=None, data_center=None, data_centers=None, type_=None, status=None, master=None, storage=None, host=None, format=None, destroy=None, available=None, used=None, committed=None, storage_format=None, wipe_after_delete=None, import_=None, is_attached=None): + def __init__(self, actions=None, href=None, id=None, name=None, description=None, comment=None, creation_status=None, link=None, data_center=None, data_centers=None, type_=None, status=None, master=None, storage=None, host=None, format=None, destroy=None, available=None, used=None, committed=None, storage_format=None, wipe_after_delete=None, import_=None, is_attached=None, warning_low_space_indicator=None, critical_space_action_blocker=None): super(StorageDomain, self).__init__(actions, href, id, name, description, comment, creation_status, link, ) self.data_center = data_center self.data_centers = data_centers @@ -17744,6 +17744,8 @@ self.wipe_after_delete = wipe_after_delete self.import_ = import_ self.is_attached = is_attached + self.warning_low_space_indicator = warning_low_space_indicator + self.critical_space_action_blocker = critical_space_action_blocker def factory(*args_, **kwargs_): if StorageDomain.subclass: return StorageDomain.subclass(*args_, **kwargs_) @@ -17782,6 +17784,10 @@ def set_import(self, import_): self.import_ = import_ def get_is_attached(self): return self.is_attached def set_is_attached(self, is_attached): self.is_attached = is_attached + def get_warning_low_space_indicator(self): return self.warning_low_space_indicator + def set_warning_low_space_indicator(self, warning_low_space_indicator): self.warning_low_space_indicator = warning_low_space_indicator + def get_critical_space_action_blocker(self): return self.critical_space_action_blocker + def set_critical_space_action_blocker(self, critical_space_action_blocker): self.critical_space_action_blocker = critical_space_action_blocker def hasContent_(self): if ( self.data_center is not None or @@ -17800,6 +17806,8 @@ self.wipe_after_delete is not None or self.import_ is not None or self.is_attached is not None or + self.warning_low_space_indicator is not None or + self.critical_space_action_blocker is not None or super(StorageDomain, self).hasContent_() ): return True @@ -17872,6 +17880,12 @@ if self.is_attached is not None: showIndent(outfile, level, pretty_print) outfile.write('<%sis_attached>%s</%sis_attached>%s' % (namespace_, self.gds_format_boolean(self.is_attached, input_name='is_attached'), namespace_, eol_)) + if self.warning_low_space_indicator is not None: + showIndent(outfile, level, pretty_print) + outfile.write('<%swarning_low_space_indicator>%s</%swarning_low_space_indicator>%s' % (namespace_, self.gds_format_integer(self.warning_low_space_indicator, input_name='warning_low_space_indicator'), namespace_, eol_)) + if self.critical_space_action_blocker is not None: + showIndent(outfile, level, pretty_print) + outfile.write('<%scritical_space_action_blocker>%s</%scritical_space_action_blocker>%s' % (namespace_, self.gds_format_integer(self.critical_space_action_blocker, input_name='critical_space_action_blocker'), namespace_, eol_)) def exportLiteral(self, outfile, level, name_='StorageDomain'): level += 1 already_processed = set() @@ -17945,6 +17959,12 @@ if self.is_attached is not None: showIndent(outfile, level) outfile.write('is_attached=%s,\n' % self.is_attached) + if self.warning_low_space_indicator is not None: + showIndent(outfile, level) + outfile.write('warning_low_space_indicator=%d,\n' % self.warning_low_space_indicator) + if self.critical_space_action_blocker is not None: + showIndent(outfile, level) + outfile.write('critical_space_action_blocker=%d,\n' % self.critical_space_action_blocker) def build(self, node): already_processed = set() self.buildAttributes(node, node.attrib, already_processed) @@ -18067,6 +18087,22 @@ raise_parse_error(child_, 'requires boolean') ival_ = self.gds_validate_boolean(ival_, node, 'is_attached') self.is_attached = ival_ + elif nodeName_ == 'warning_low_space_indicator': + sval_ = child_.text + try: + ival_ = int(sval_) + except (TypeError, ValueError), exp: + raise_parse_error(child_, 'requires integer: %s' % exp) + ival_ = self.gds_validate_integer(ival_, node, 'warning_low_space_indicator') + self.warning_low_space_indicator = ival_ + elif nodeName_ == 'critical_space_action_blocker': + sval_ = child_.text + try: + ival_ = int(sval_) + except (TypeError, ValueError), exp: + raise_parse_error(child_, 'requires integer: %s' % exp) + ival_ = self.gds_validate_integer(ival_, node, 'critical_space_action_blocker') + self.critical_space_action_blocker = ival_ super(StorageDomain, self).buildChildren(child_, node, nodeName_, True) # end class StorageDomain -- To view, visit https://gerrit.ovirt.org/40793 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb462b67d3b31ea0479b1227218a8f6b32004b6a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches