Return-Path: X-Original-To: apmail-libcloud-notifications-archive@www.apache.org Delivered-To: apmail-libcloud-notifications-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 56D4311D62 for ; Tue, 24 Jun 2014 18:10:58 +0000 (UTC) Received: (qmail 60260 invoked by uid 500); 24 Jun 2014 18:10:58 -0000 Delivered-To: apmail-libcloud-notifications-archive@libcloud.apache.org Received: (qmail 60204 invoked by uid 500); 24 Jun 2014 18:10:58 -0000 Mailing-List: contact notifications-help@libcloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@libcloud.apache.org Delivered-To: mailing list notifications@libcloud.apache.org Received: (qmail 60188 invoked by uid 500); 24 Jun 2014 18:10:58 -0000 Delivered-To: apmail-libcloud-commits@libcloud.apache.org Received: (qmail 60185 invoked by uid 99); 24 Jun 2014 18:10:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jun 2014 18:10:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 05DED98C7C2; Tue, 24 Jun 2014 18:10:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tomaz@apache.org To: commits@libcloud.apache.org Date: Tue, 24 Jun 2014 18:10:58 -0000 Message-Id: <47b77f5033a94d7e83c78cd89b7a2079@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: use _get_boolean() function instead of parsing api response in every method use _get_boolean() function instead of parsing api response in every method Closes #324 Signed-off-by: Tomaz Muraus Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/8f704e86 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/8f704e86 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/8f704e86 Branch: refs/heads/trunk Commit: 8f704e86f256ba2cfc17251ddacfa41cd7674d98 Parents: 158380b Author: Lior Goikhburg Authored: Tue Jun 24 19:04:51 2014 +0400 Committer: Tomaz Muraus Committed: Tue Jun 24 20:07:29 2014 +0200 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 165 ++++++++++++----------------------- 1 file changed, 57 insertions(+), 108 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/8f704e86/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 77e7629..efd8251 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -2352,10 +2352,9 @@ class BaseEC2NodeDriver(NodeDriver): 'Action': 'DeleteKeyPair', 'KeyName': key_pair.name } - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, xpath='return', - namespace=NAMESPACE) - return element == 'true' + res = self.connection.request(self.path, params=params).object + + return self._get_boolean(res) def copy_image(self, image, source_region, name=None, description=None): """ @@ -2611,11 +2610,9 @@ class BaseEC2NodeDriver(NodeDriver): """ params = {'Action': 'DeleteVpc', 'VpcId': vpc.id} - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_list_subnets(self, subnet_ids=None, filters=None): """ @@ -2694,12 +2691,9 @@ class BaseEC2NodeDriver(NodeDriver): """ params = {'Action': 'DeleteSubnet', 'SubnetId': subnet.id} - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, - xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_list_security_groups(self): """ @@ -2801,11 +2795,9 @@ class BaseEC2NodeDriver(NodeDriver): """ params = {'Action': 'DeleteSecurityGroup', 'GroupId': group_id} - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_delete_security_group_by_name(self, group_name): """ @@ -2818,11 +2810,9 @@ class BaseEC2NodeDriver(NodeDriver): """ params = {'Action': 'DeleteSecurityGroup', 'GroupName': group_name} - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_delete_security_group(self, name): """ @@ -2867,10 +2857,9 @@ class BaseEC2NodeDriver(NodeDriver): 'ToPort': str(to_port), 'CidrIp': cidr_ip} try: - resp = self.connection.request( + res = self.connection.request( self.path, params=params.copy()).object - return bool(findtext(element=resp, xpath='return', - namespace=NAMESPACE)) + return self._get_boolean(res) except Exception: e = sys.exc_info()[1] if e.args[0].find('InvalidPermission.Duplicate') == -1: @@ -2924,11 +2913,9 @@ class BaseEC2NodeDriver(NodeDriver): params["Action"] = 'AuthorizeSecurityGroupIngress' - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_authorize_security_group_egress(self, id, from_port, to_port, cidr_ips, group_pairs=None, @@ -2980,11 +2967,9 @@ class BaseEC2NodeDriver(NodeDriver): params["Action"] = 'AuthorizeSecurityGroupEgress' - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_revoke_security_group_ingress(self, id, from_port, to_port, cidr_ips=None, group_pairs=None, @@ -3034,11 +3019,9 @@ class BaseEC2NodeDriver(NodeDriver): params["Action"] = 'RevokeSecurityGroupIngress' - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_revoke_security_group_egress(self, id, from_port, to_port, cidr_ips=None, group_pairs=None, @@ -3090,11 +3073,9 @@ class BaseEC2NodeDriver(NodeDriver): params['Action'] = 'RevokeSecurityGroupEgress' - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_authorize_security_group_permissive(self, name): """ @@ -3236,11 +3217,10 @@ class BaseEC2NodeDriver(NodeDriver): params['Tag.%d.Key' % i] = key params['Tag.%d.Value' % i] = tags[key] - result = self.connection.request(self.path, - params=params.copy()).object - element = findtext(element=result, xpath='return', - namespace=NAMESPACE) - return element == 'true' + res = self.connection.request(self.path, + params=params.copy()).object + + return self._get_boolean(res) def ex_delete_tags(self, resource, tags): """ @@ -3264,11 +3244,10 @@ class BaseEC2NodeDriver(NodeDriver): params['Tag.%d.Key' % i] = key params['Tag.%d.Value' % i] = tags[key] - result = self.connection.request(self.path, - params=params.copy()).object - element = findtext(element=result, xpath='return', - namespace=NAMESPACE) - return element == 'true' + res = self.connection.request(self.path, + params=params.copy()).object + + return self._get_boolean(res) def ex_get_metadata_for_node(self, node): """ @@ -3552,11 +3531,9 @@ class BaseEC2NodeDriver(NodeDriver): params = {'Action': 'DeleteNetworkInterface', 'NetworkInterfaceId': network_interface.id} - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_attach_network_interface_to_node(self, network_interface, node, device_index): @@ -3607,11 +3584,9 @@ class BaseEC2NodeDriver(NodeDriver): if force: params['Force'] = True - result = self.connection.request(self.path, params=params).object + res = self.connection.request(self.path, params=params).object - element = findtext(element=result, xpath='return', - namespace=NAMESPACE) - return element == 'true' + return self._get_boolean(res) def ex_modify_instance_attribute(self, node, attributes): """ @@ -3633,11 +3608,10 @@ class BaseEC2NodeDriver(NodeDriver): params = {'Action': 'ModifyInstanceAttribute'} params.update(attributes) - result = self.connection.request(self.path, - params=params.copy()).object - element = findtext(element=result, xpath='return', - namespace=NAMESPACE) - return element == 'true' + res = self.connection.request(self.path, + params=params.copy()).object + + return self._get_boolean(res) def ex_modify_image_attribute(self, image, attributes): """ @@ -3658,11 +3632,10 @@ class BaseEC2NodeDriver(NodeDriver): params = {'Action': 'ModifyImageAttribute'} params.update(attributes) - result = self.connection.request(self.path, - params=params.copy()).object - element = findtext(element=result, xpath='return', - namespace=NAMESPACE) - return element == 'true' + res = self.connection.request(self.path, + params=params.copy()).object + + return self._get_boolean(res) def ex_change_node_size(self, node, new_size): """ @@ -4061,12 +4034,9 @@ class BaseEC2NodeDriver(NodeDriver): params = {'Action': 'DeleteInternetGateway', 'InternetGatewayId': gateway.id} - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, - xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_attach_internet_gateway(self, gateway, network): """ @@ -4084,12 +4054,9 @@ class BaseEC2NodeDriver(NodeDriver): 'InternetGatewayId': gateway.id, 'VpcId': network.id} - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, - xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_detach_internet_gateway(self, gateway, network): """ @@ -4107,12 +4074,9 @@ class BaseEC2NodeDriver(NodeDriver): 'InternetGatewayId': gateway.id, 'VpcId': network.id} - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, - xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_list_route_tables(self, route_table_ids=None, filters=None): """ @@ -4179,12 +4143,9 @@ class BaseEC2NodeDriver(NodeDriver): params = {'Action': 'DeleteRouteTable', 'RouteTableId': route_table.id} - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, - xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_associate_route_table(self, route_table, subnet): """ @@ -4233,12 +4194,9 @@ class BaseEC2NodeDriver(NodeDriver): params = {'Action': 'DisassociateRouteTable', 'AssociationId': subnet_association_id} - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, - xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_replace_route_table_association(self, subnet_association, route_table): @@ -4325,12 +4283,9 @@ class BaseEC2NodeDriver(NodeDriver): if vpc_peering_connection: params['VpcPeeringConnectionId'] = vpc_peering_connection.id - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, - xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_delete_route(self, route_table, cidr): """ @@ -4349,12 +4304,9 @@ class BaseEC2NodeDriver(NodeDriver): 'RouteTableId': route_table.id, 'DestinationCidrBlock': cidr} - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, - xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def ex_replace_route(self, route_table, cidr, internet_gateway=None, node=None, @@ -4404,12 +4356,9 @@ class BaseEC2NodeDriver(NodeDriver): if vpc_peering_connection: params['VpcPeeringConnectionId'] = vpc_peering_connection.id - result = self.connection.request(self.path, params=params).object - element = findtext(element=result, - xpath='return', - namespace=NAMESPACE) + res = self.connection.request(self.path, params=params).object - return element == 'true' + return self._get_boolean(res) def _to_nodes(self, object, xpath): return [self._to_node(el)