Repository: libcloud Updated Branches: refs/heads/trunk 4d5934230 -> 4e42f86bb
Fix checking for "location is None" in several functions Closes #1098 Signed-off-by: Quentin Pradet <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/fe0a8484 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/fe0a8484 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/fe0a8484 Branch: refs/heads/trunk Commit: fe0a8484c5bab6bafa156663f81a6cda53f1e492 Parents: 4d59342 Author: Elsharkawy, Sameh <[email protected]> Authored: Wed Sep 27 08:17:16 2017 +0400 Committer: Quentin Pradet <[email protected]> Committed: Wed Sep 27 08:21:25 2017 +0400 ---------------------------------------------------------------------- CHANGES.rst | 3 +++ libcloud/compute/drivers/azure_arm.py | 27 +++++++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/fe0a8484/CHANGES.rst ---------------------------------------------------------------------- diff --git a/CHANGES.rst b/CHANGES.rst index ab64c0e..fe13a41 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -25,6 +25,9 @@ Compute - [GCE] Fix `GCEList` pagination. (GITHUB-1095) [Yap Sok Ann] +- [ARM] Fix checking for "location is None" in several functions (LIBCLOUD-926, GITHUB-1098) + [Sameh Elsharkawy] + Changes in Apache Libcloud 2.2.1 -------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/fe0a8484/libcloud/compute/drivers/azure_arm.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/azure_arm.py b/libcloud/compute/drivers/azure_arm.py index 8950c2a..45db5a1 100644 --- a/libcloud/compute/drivers/azure_arm.py +++ b/libcloud/compute/drivers/azure_arm.py @@ -1407,10 +1407,11 @@ class AzureNodeDriver(NodeDriver): :type location: :class:`.NodeLocation` """ - if location is None and self.default_location: - location = self.default_location - else: - raise ValueError("location is required.") + if location is None: + if self.default_location: + location = self.default_location + else: + raise ValueError("location is required.") target = "/subscriptions/%s/resourceGroups/%s/" \ "providers/Microsoft.Network/networkSecurityGroups/%s" \ @@ -1440,10 +1441,11 @@ class AzureNodeDriver(NodeDriver): :type location: :class:`.NodeLocation` """ - if location is None and self.default_location: - location = self.default_location - else: - raise ValueError("location is required.") + if location is None: + if self.default_location: + location = self.default_location + else: + raise ValueError("location is required.") target = "/subscriptions/%s/resourceGroups/%s/" \ "providers/Microsoft.Network/networkSecurityGroups/%s" \ @@ -1628,10 +1630,11 @@ class AzureNodeDriver(NodeDriver): :rtype: :class:`.AzureIPAddress` """ - if location is None and self.default_location: - location = self.default_location - else: - raise ValueError("location is required.") + if location is None: + if self.default_location: + location = self.default_location + else: + raise ValueError("location is required.") target = "/subscriptions/%s/resourceGroups/%s/" \ "providers/Microsoft.Network/publicIPAddresses/%s" \
