Attachment 920600 Details for Bug 1122945 – Patch for the Python SDK

[patch] Patch for the Python SDK

f.patch (text/plain), 9.25 KB, created by Juan Hernández on 2014-07-24 15:43:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Juan Hernández

Created: 2014-07-24 15:43:00 UTC

Size: 9.25 KB

patch

obsolete

>From 8870ede3710739785479dadd3ee8df14c1235ac2 Mon Sep 17 00:00:00 2001
>From: Juan Hernandez <juan.hernandez@redhat.com>
>Date: Thu, 24 Jul 2014 17:04:07 +0200
>Subject: [PATCH] Update to upstream 3.4.3.0
>
>Related: rhbz#1122945
>Signed-off-by: Juan Hernandez <juan.hernandez@redhat.com>
>---
> .gitignore                               |   1 +
> 0001-Branding.patch                      |   2 +-
> 0002-Regenerate-against-latest-API.patch | 173 +++----------------------------
> rhevm-sdk-python.spec                    |  10 +-
> sources                                  |   2 +-
> 5 files changed, 28 insertions(+), 160 deletions(-)
>
>diff --git a/.gitignore b/.gitignore
>index ee37e51..1ad82ef 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -48,3 +48,4 @@
> /ovirt-engine-sdk-python-3.4.0.7.tar.xz
> /ovirt-engine-sdk-python-3.4.1.0.tar.xz
> /ovirt-engine-sdk-python-3.4.1.1.tar.xz
>+/ovirt-engine-sdk-python-3.4.3.0.tar.xz
>diff --git a/0001-Branding.patch b/0001-Branding.patch
>index c609371..83b6c5d 100644
>--- a/0001-Branding.patch
>+++ b/0001-Branding.patch
>@@ -21,7 +21,7 @@ index bcbec89..15d5817 100755
>  version_info = {
> -    'name': 'ovirt-engine-sdk-python',
> +    'name': 'rhevm-sdk-python',
>-     'version': '3.4.1.1',
>+     'version': '3.4.3.0',
> -    'description': 'A SDK interface to oVirt Virtualization',
> +    'description': 'A SDK interface to RHEVM Virtualization',
>      'author': 'Michael Pasternak',
>diff --git a/0002-Regenerate-against-latest-API.patch b/0002-Regenerate-against-latest-API.patch
>index f983ecc..9adfdaa 100644
>--- a/0002-Regenerate-against-latest-API.patch
>+++ b/0002-Regenerate-against-latest-API.patch
>@@ -1,177 +1,38 @@
>-From fc8a007191166e43c1dcd6ff49bf2fa3a77d99e2 Mon Sep 17 00:00:00 2001
>+From 28f79c7ae5bd8a8ec43ca64a42db57cef7ef2fd8 Mon Sep 17 00:00:00 2001
> From: Juan Hernandez <juan.hernandez@redhat.com>
>-Date: Tue, 24 Jun 2014 17:32:12 +0200
>+Date: Thu, 24 Jul 2014 17:26:23 +0200
> Subject: [PATCH] sdk: Regenerate against the latest API
> 
> This patch regenerates the SDK using the latest API obtained from
>-the engine built from commit bba20fa.
>+the engine built from commit 5e0119d.
> 
>-Relevant changes:
>-
>-- Added Expect and Correlation-Id parameters to snapshot related
>-  actions.
>-
>-Change-Id: I6b441fc384a67ee92fa410294a7ed280142b505a
>+Change-Id: I4465660181043565b919989c2df44dabbebb46d9
> Signed-off-by: Juan Hernandez <juan.hernandez@redhat.com>
> ---
>- src/ovirtsdk/infrastructure/brokers.py | 39 ++++++++++++++++++++++------------
>- 1 file changed, 26 insertions(+), 13 deletions(-)
>+ src/ovirtsdk/infrastructure/brokers.py | 3 ++-
>+ 1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/ovirtsdk/infrastructure/brokers.py b/src/ovirtsdk/infrastructure/brokers.py
>-index 2460f62..48b0939 100644
>+index c1f4089..28f8e86 100644
> --- a/src/ovirtsdk/infrastructure/brokers.py
> +++ b/src/ovirtsdk/infrastructure/brokers.py
> @@ -20,7 +20,7 @@
>  ############ GENERATED CODE ############
>  ########################################
>  
>--'''Generated at: 2014-05-07 10:24:47.560092'''
>-+'''Generated at: 2014-06-24 17:29:39.862333'''
>+-'''Generated at: 2014-07-10 10:33:39.730440'''
>++'''Generated at: 2014-07-24 17:10:08.666673'''
>  
>  
>  from ovirtsdk.xml import params
>-@@ -4268,11 +4268,14 @@ class DataCenterNetworkLabels(Base):
>-         #still available at client's code.
>-         raise DisconnectedError
>- 
>--    def add(self, label):
>-+    def add(self, label, expect=None, correlation_id=None):
>- 
>-         '''
>-         @type Label:
>- 
>-+        @param label.id: string
>-+        [@param expect: 201-created]
>-+        [@param correlation_id: any string]
>- 
>-         @return Label:
>-         '''
>-@@ -4286,7 +4289,7 @@ class DataCenterNetworkLabels(Base):
>-                  '{network:id}': self.parentclass.get_id()}
>-             ),
>-             body=ParseHelper.toXml(label),
>--            headers={}
>-+            headers={"Expect":expect, "Correlation-Id":correlation_id}
>-         )
>- 
>-         return DataCenterNetworkLabel(
>-@@ -8652,11 +8655,14 @@ class HostNicLabels(Base):
>-         #still available at client's code.
>-         raise DisconnectedError
>- 
>--    def add(self, label):
>-+    def add(self, label, expect=None, correlation_id=None):
>- 
>-         '''
>-         @type Label:
>- 
>-+        @param label.id: string
>-+        [@param expect: 201-created]
>-+        [@param correlation_id: any string]
>- 
>-         @return Label:
>-         '''
>-@@ -8670,7 +8676,7 @@ class HostNicLabels(Base):
>-                  '{nic:id}': self.parentclass.get_id()}
>-             ),
>-             body=ParseHelper.toXml(label),
>--            headers={}
>-+            headers={"Expect":expect, "Correlation-Id":correlation_id}
>-         )
>- 
>-         return HostNicLabel(
>-@@ -10447,11 +10453,14 @@ class NetworkLabels(Base):
>-         #still available at client's code.
>-         raise DisconnectedError
>- 
>--    def add(self, label):
>-+    def add(self, label, expect=None, correlation_id=None):
>- 
>-         '''
>-         @type Label:
>- 
>-+        @param label.id: string
>-+        [@param expect: 201-created]
>-+        [@param correlation_id: any string]
>- 
>-         @return Label:
>-         '''
>-@@ -10464,7 +10473,7 @@ class NetworkLabels(Base):
>-                 {'{network:id}': self.parentclass.get_id()}
>-             ),
>-             body=ParseHelper.toXml(label),
>--            headers={}
>-+            headers={"Expect":expect, "Correlation-Id":correlation_id}
>-         )
>- 
>-         return NetworkLabel(
>-@@ -16227,10 +16236,11 @@ class VM(params.VM, Base):
>- 
>-         return result
>- 
>--    def commit_snapshot(self, action=params.Action()):
>-+    def commit_snapshot(self, action=params.Action(), correlation_id=None):
>-         '''
>-         @type Action:
>- 
>-+        [@param correlation_id: any string]
>- 
>-         @return Action:
>-         '''
>-@@ -16241,7 +16251,7 @@ class VM(params.VM, Base):
>-             method='POST',
>-             url=UrlHelper.replace(url, {'{vm:id}': self.get_id()}),
>-             body=ParseHelper.toXml(action),
>--            headers={}
>-+            headers={"Correlation-Id":correlation_id}
>-         )
>- 
>-         return result
>-@@ -16363,10 +16373,12 @@ class VM(params.VM, Base):
>- 
>-         return result
>- 
>--    def preview_snapshot(self, action=params.Action()):
>-+    def preview_snapshot(self, action=params.Action(), correlation_id=None):
>-         '''
>-         @type Action:
>- 
>-+        @param action.snapshot.id: string
>-+        [@param correlation_id: any string]
>- 
>-         @return Action:
>-         '''
>-@@ -16377,7 +16389,7 @@ class VM(params.VM, Base):
>-             method='POST',
>-             url=UrlHelper.replace(url, {'{vm:id}': self.get_id()}),
>-             body=ParseHelper.toXml(action),
>--            headers={}
>-+            headers={"Correlation-Id":correlation_id}
>-         )
>- 
>-         return result
>-@@ -16564,10 +16576,11 @@ class VM(params.VM, Base):
>- 
>-         return result
>- 
>--    def undo_snapshot(self, action=params.Action()):
>-+    def undo_snapshot(self, action=params.Action(), correlation_id=None):
>-         '''
>-         @type Action:
>- 
>-+        [@param correlation_id: any string]
>- 
>-         @return Action:
>-         '''
>-@@ -16578,7 +16591,7 @@ class VM(params.VM, Base):
>-             method='POST',
>-             url=UrlHelper.replace(url, {'{vm:id}': self.get_id()}),
>-             body=ParseHelper.toXml(action),
>--            headers={}
>-+            headers={"Correlation-Id":correlation_id}
>-         )
>- 
>-         return result
>+@@ -16163,6 +16163,7 @@ class VM(params.VM, Base):
>+         [@param vm.cpu.topology.cores: int]
>+         [@param vm.cpu_shares: int]
>+         [@param vm.memory: long]
>++        [@param vm.memory_policy.guaranteed: long]
>+         [@param vm.high_availability.priority: int]
>+         [@param vm.high_availability.enabled: boolean]
>+         [@param vm.domain.name: string]
> -- 
> 1.9.3
> 
>diff --git a/rhevm-sdk-python.spec b/rhevm-sdk-python.spec
>index abeff29..1a63fa0 100644
>--- a/rhevm-sdk-python.spec
>+++ b/rhevm-sdk-python.spec
>@@ -1,5 +1,5 @@
> Name: rhevm-sdk-python
>-Version: 3.4.1.1
>+Version: 3.4.3.0
> Release: 1%{?dist}
> Summary: RHEV-M Software Development Kit
> Group: Development/Libraries
>@@ -8,7 +8,7 @@ URL: http://ovirt.org/wiki/SDK
> 
> # git clone git://gerrit.ovirt.org/ovirt-engine-sdk
> # cd ovirt-engine-sdk
>-# git archive --prefix=ovirt-engine-sdk-python-3.4.1.1/ 3.4.1.1 | xz > ovirt-engine-sdk-python-3.4.1.1.tar.xz
>+# git archive --prefix=ovirt-engine-sdk-python-3.4.3.0/ 3.4.3.0 | xz > ovirt-engine-sdk-python-3.4.3.0.tar.xz
> Source0: ovirt-engine-sdk-python-%{version}.tar.xz
> 
> BuildRequires: python2-devel
>@@ -58,6 +58,12 @@ With this package, custom software can be built for RHEV-M.
> %doc LICENSE
> 
> %changelog
>+* Thu Jul 10 2014 Juan Hernandez <juan.hernandez@redhat.com> - 3.4.3.0-1
>+- Update to upstream version 3.4.3.0.
>+- Add expect and correlation_id parameters to network label related
>+  methods #1101531.
>+- Fix update VM optional parameters #1122945.
>+
> * Tue Jun 24 2014 Juan Hernandez <juan.hernandez@redhat.com> - 3.4.1.1-1
> - Update to upstream version 3.4.1.1.
> - Add Expect and Correlation-Id parameters to snapshots and network label
>diff --git a/sources b/sources
>index 58c2d97..02b6dbf 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-3363830b31172decb6bacda6617d9402  ovirt-engine-sdk-python-3.4.1.1.tar.xz
>+4b548e30dcc1ad047109c893c3b6543b  ovirt-engine-sdk-python-3.4.3.0.tar.xz
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1122945: 920600