Repository: libcloud Updated Branches: refs/heads/trunk a0fa3da6c -> f58ef3b89
Removing ex_ from the front of vps_parameters to avoid overwrites of server memory values. Closes #308 Signed-off-by: Tomaz Muraus <to...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/f58ef3b8 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/f58ef3b8 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/f58ef3b8 Branch: refs/heads/trunk Commit: f58ef3b891d02a0d6d1dbf378297f094cb5b876a Parents: a0fa3da Author: doberloh <dober...@pertino.com> Authored: Tue Jun 3 13:14:35 2014 -0700 Committer: Tomaz Muraus <to...@apache.org> Committed: Fri Jun 6 11:07:21 2014 +0200 ---------------------------------------------------------------------- CHANGES.rst | 5 +++++ libcloud/compute/drivers/rimuhosting.py | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/f58ef3b8/CHANGES.rst ---------------------------------------------------------------------- diff --git a/CHANGES.rst b/CHANGES.rst index c359359..0935c46 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -203,6 +203,11 @@ Compute (LIBCLOUD-569, GITHUB-303) [amastracci] +- Fix issue with overwriting the server memory values in the RimuHosting + driver. + (GUTHUB-308) + [Dustin Oberloh] + Storage ~~~~~~~ http://git-wip-us.apache.org/repos/asf/libcloud/blob/f58ef3b8/libcloud/compute/drivers/rimuhosting.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/rimuhosting.py b/libcloud/compute/drivers/rimuhosting.py index 4c6b0e1..acde574 100644 --- a/libcloud/compute/drivers/rimuhosting.py +++ b/libcloud/compute/drivers/rimuhosting.py @@ -267,9 +267,11 @@ class RimuHostingNodeDriver(NodeDriver): data = { 'instantiation_options': { - 'domain_name': name, 'distro': image.id + 'domain_name': name, + 'distro': image.id }, 'pricing_plan_code': size.id, + 'vps_parameters': {} } if 'ex_control_panel' in kwargs: @@ -302,22 +304,20 @@ class RimuHostingNodeDriver(NodeDriver): kwargs['ex_extra_ip_reason'] if 'ex_memory_mb' in kwargs: - if 'vps_parameters' not in data: - data['vps_parameters'] = {} data['vps_parameters']['memory_mb'] = kwargs['ex_memory_mb'] if 'ex_disk_space_mb' in kwargs: - if 'ex_vps_parameters' not in data: - data['vps_parameters'] = {} data['vps_parameters']['disk_space_mb'] = \ kwargs['ex_disk_space_mb'] if 'ex_disk_space_2_mb' in kwargs: - if 'vps_parameters' not in data: - data['vps_parameters'] = {} data['vps_parameters']['disk_space_2_mb'] =\ kwargs['ex_disk_space_2_mb'] + # Don't send empty 'vps_parameters' attribute + if not data['vps_parameters']: + del data['vps_parameters'] + res = self.connection.request( '/orders/new-vps', method='POST',
