Merge pull request #336 from mshriver/update-boto-imports

[RFR] Narrow boto/boto3 imports for EC2 module

Author: mshriver

requirements.txt

@@ -8,6 +8,7 @@ dateparser
 enum34; python_version == '2.7'
 fauxfactory>=2.0.7
 google-api-python-client
+google-compute-engine
 inflection
 miq-version>=0.1.6
 oauth2client

wrapanapi/systems/ec2.py

@@ -5,15 +5,18 @@
 import re
 from datetime import datetime
 
-import boto
-from boto import sqs
+import pytz
+from boto import sqs, UserAgent
+from boto.sqs import connection as _sqs_connection  # can't reference connection from sqs module
 from boto.ec2 import EC2Connection, elb, get_region
 from boto.ec2.elb import ELBConnection
-from boto.sqs import connection
-import boto3
+from boto.exception import BotoServerError
 from botocore.config import Config
 from botocore.exceptions import ClientError
-import pytz
+from boto3 import (
+    resource as boto3resource,
+    client as boto3client
+)
 
 from wrapanapi.entities import (Instance, Stack, StackMixin, Template,
                                 TemplateMixin, VmMixin, VmState)
@@ -253,7 +256,7 @@ def refresh(self):
         """
         try:
             self.raw = self._api.describe_stacks(StackName=self._uuid)['Stacks'][0]
-        except boto.exception.BotoServerError as error:
+        except BotoServerError as error:
             if error.status == 404:
                 raise NotFoundError('stack {}'.format(self._uuid))
             else:
@@ -385,7 +388,7 @@ def __init__(self, **kwargs):
         self._region = get_region(self._region_name)
         self.api = EC2Connection(self._username, self._password, region=self._region)
 
-        self.sqs_connection = connection.SQSConnection(
+        self.sqs_connection = _sqs_connection.SQSConnection(
             self._username, self._password, region=_regions(
                 regionmodule=sqs, regionname=self._region_name)
         )
@@ -395,23 +398,23 @@ def __init__(self, **kwargs):
                 regionmodule=elb, regionname=self._region_name)
         )
 
-        self.s3_connection = boto3.resource(
+        self.s3_connection = boto3resource(
             's3', aws_access_key_id=self._username, aws_secret_access_key=self._password,
             region_name=self._region_name, config=connection_config
         )
 
-        self.ec2_connection = boto3.client(
+        self.ec2_connection = boto3client(
             'ec2', aws_access_key_id=self._username, aws_secret_access_key=self._password,
             region_name=self._region_name, config=connection_config
         )
 
-        self.cloudformation_connection = boto3.client(
+        self.cloudformation_connection = boto3client(
             'cloudformation', aws_access_key_id=self._username,
             aws_secret_access_key=self._password, region_name=self._region_name,
             config=connection_config
         )
 
-        self.sns_connection = boto3.client('sns', region_name=self._region_name)
+        self.sns_connection = boto3client('sns', region_name=self._region_name)
 
         self.kwargs = kwargs
 
@@ -438,7 +441,7 @@ def disconnect(self):
 
     def info(self):
         """Returns the current versions of boto and the EC2 API being used"""
-        return '%s %s' % (boto.UserAgent, self.api.APIVersion)
+        return '%s %s' % (UserAgent, self.api.APIVersion)
 
     def _get_instances(self, **kwargs):
         """