Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make ec2 inventory plugin Python 3 compatible #10835

Merged
merged 3 commits into from
Apr 28, 2015
Merged

Make ec2 inventory plugin Python 3 compatible #10835

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1674b47
Make ec2 inventory plugin Python 3 compatible
logston Apr 25, 2015
50932ce
Use six.moves to import configparser
logston Apr 25, 2015
e8768b2
Use six to check for string_types
logston Apr 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 16 additions & 12 deletions plugins/inventory/ec2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@
from boto import ec2
from boto import rds
from boto import route53
import ConfigParser
import six

from six.moves import configparser
from collections import defaultdict

try:
Expand Down Expand Up @@ -166,7 +168,7 @@ def __init__(self):
else:
data_to_print = self.json_format_dict(self.inventory, True)

print data_to_print
print(data_to_print)


def is_cache_valid(self):
Expand All @@ -184,8 +186,10 @@ def is_cache_valid(self):

def read_settings(self):
''' Reads the settings from the ec2.ini file '''

config = ConfigParser.SafeConfigParser()
if six.PY2:
config = configparser.SafeConfigParser()
else:
config = configparser.ConfigParser()
ec2_default_ini_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'ec2.ini')
ec2_ini_path = os.environ.get('EC2_INI_PATH', ec2_default_ini_path)
config.read(ec2_ini_path)
Expand Down Expand Up @@ -282,7 +286,7 @@ def read_settings(self):
self.pattern_include = re.compile(pattern_include)
else:
self.pattern_include = None
except ConfigParser.NoOptionError, e:
except configparser.NoOptionError as e:
self.pattern_include = None

# Do we need to exclude hosts that match a pattern?
Expand All @@ -292,7 +296,7 @@ def read_settings(self):
self.pattern_exclude = re.compile(pattern_exclude)
else:
self.pattern_exclude = None
except ConfigParser.NoOptionError, e:
except configparser.NoOptionError as e:
self.pattern_exclude = None

# Instance filters (see boto and EC2 API docs). Ignore invalid filters.
Expand Down Expand Up @@ -354,7 +358,7 @@ def get_instances_by_region(self, region):
conn = self.connect(region)
reservations = []
if self.ec2_instance_filters:
for filter_key, filter_values in self.ec2_instance_filters.iteritems():
for filter_key, filter_values in self.ec2_instance_filters.items():
reservations.extend(conn.get_all_instances(filters = { filter_key : filter_values }))
else:
reservations = conn.get_all_instances()
Expand All @@ -363,7 +367,7 @@ def get_instances_by_region(self, region):
for instance in reservation.instances:
self.add_instance(instance, region)

except boto.exception.BotoServerError, e:
except boto.exception.BotoServerError as e:
if e.error_code == 'AuthFailure':
error = self.get_auth_error_message()
else:
Expand All @@ -381,7 +385,7 @@ def get_rds_instances_by_region(self, region):
instances = conn.get_all_dbinstances()
for instance in instances:
self.add_rds_instance(instance, region)
except boto.exception.BotoServerError, e:
except boto.exception.BotoServerError as e:
error = e.reason

if e.error_code == 'AuthFailure':
Expand Down Expand Up @@ -515,7 +519,7 @@ def add_instance(self, instance, region):

# Inventory: Group by tag keys
if self.group_by_tag_keys:
for k, v in instance.tags.iteritems():
for k, v in instance.tags.items():
key = self.to_safe("tag_" + k + "=" + v)
self.push(self.inventory, key, dest)
if self.nested_groups:
Expand Down Expand Up @@ -690,7 +694,7 @@ def get_host_info_dict_from_instance(self, instance):
instance_vars['ec2_previous_state_code'] = instance.previous_state_code
elif type(value) in [int, bool]:
instance_vars[key] = value
elif type(value) in [str, unicode]:
elif isinstance(value, six.string_types):
instance_vars[key] = value.strip()
elif type(value) == type(None):
instance_vars[key] = ''
Expand All @@ -699,7 +703,7 @@ def get_host_info_dict_from_instance(self, instance):
elif key == 'ec2__placement':
instance_vars['ec2_placement'] = value.zone
elif key == 'ec2_tags':
for k, v in value.iteritems():
for k, v in value.items():
key = self.to_safe('ec2_tag_' + k)
instance_vars[key] = v
elif key == 'ec2_groups':
Expand Down