valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Py3 compatibility

Browse Source
This commit is contained in:
Pedro Algarvio 2015-01-28 15:13:58 +00:00
parent 1c470d31ca
commit ddc242eb53
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
salt/modules/boto_asg.py
View File

@ -33,18 +33,18 @@ Connection module for Amazon Autoscale Groups
:depends: boto :depends: boto
''' '''
from __future__ import absolute_import
# Import Python libs # Import Python libs
from __future__ import absolute_import
import logging import logging
import json import json
import yaml
import email.mime.multipart import email.mime.multipart
import salt.ext.six as six
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
# Import third party libs # Import third party libs
import yaml
import salt.ext.six as six
try: try:
import boto import boto
import boto.ec2 import boto.ec2
@ -56,7 +56,7 @@ try:
except ImportError: except ImportError:
HAS_BOTO = False HAS_BOTO = False
from salt.ext.six import string_types # Import Salt libs
import salt.utils.odict as odict import salt.utils.odict as odict
@ -175,13 +175,13 @@ def create(name, launch_config_name, availability_zones, min_size, max_size,
conn = _get_conn(region, key, keyid, profile) conn = _get_conn(region, key, keyid, profile)
if not conn: if not conn:
return False return False
if isinstance(availability_zones, string_types): if isinstance(availability_zones, six.string_types):
availability_zones = json.loads(availability_zones) availability_zones = json.loads(availability_zones)
if isinstance(load_balancers, string_types): if isinstance(load_balancers, six.string_types):
load_balancers = json.loads(load_balancers) load_balancers = json.loads(load_balancers)
if isinstance(vpc_zone_identifier, string_types): if isinstance(vpc_zone_identifier, six.string_types):
vpc_zone_identifier = json.loads(vpc_zone_identifier) vpc_zone_identifier = json.loads(vpc_zone_identifier)
if isinstance(tags, string_types): if isinstance(tags, six.string_types):
tags = json.loads(tags) tags = json.loads(tags)
# Make a list of tag objects from the dict. # Make a list of tag objects from the dict.
_tags = [] _tags = []
@ -201,9 +201,9 @@ def create(name, launch_config_name, availability_zones, min_size, max_size,
_tag = autoscale.Tag(key=key, value=value, resource_id=name, _tag = autoscale.Tag(key=key, value=value, resource_id=name,
propagate_at_launch=propagate_at_launch) propagate_at_launch=propagate_at_launch)
_tags.append(_tag) _tags.append(_tag)
if isinstance(termination_policies, string_types): if isinstance(termination_policies, six.string_types):
termination_policies = json.loads(termination_policies) termination_policies = json.loads(termination_policies)
if isinstance(suspended_processes, string_types): if isinstance(suspended_processes, six.string_types):
suspended_processes = json.loads(suspended_processes) suspended_processes = json.loads(suspended_processes)
try: try:
_asg = autoscale.AutoScalingGroup( _asg = autoscale.AutoScalingGroup(
@ -249,13 +249,13 @@ def update(name, launch_config_name, availability_zones, min_size, max_size,
conn = _get_conn(region, key, keyid, profile) conn = _get_conn(region, key, keyid, profile)
if not conn: if not conn:
return False, "failed to connect to AWS" return False, "failed to connect to AWS"
if isinstance(availability_zones, string_types): if isinstance(availability_zones, six.string_types):
availability_zones = json.loads(availability_zones) availability_zones = json.loads(availability_zones)
if isinstance(load_balancers, string_types): if isinstance(load_balancers, six.string_types):
load_balancers = json.loads(load_balancers) load_balancers = json.loads(load_balancers)
if isinstance(vpc_zone_identifier, string_types): if isinstance(vpc_zone_identifier, six.string_types):
vpc_zone_identifier = json.loads(vpc_zone_identifier) vpc_zone_identifier = json.loads(vpc_zone_identifier)
if isinstance(tags, string_types): if isinstance(tags, six.string_types):
tags = json.loads(tags) tags = json.loads(tags)
# Make a list of tag objects from the dict. # Make a list of tag objects from the dict.
_tags = [] _tags = []
@ -275,9 +275,9 @@ def update(name, launch_config_name, availability_zones, min_size, max_size,
_tag = autoscale.Tag(key=key, value=value, resource_id=name, _tag = autoscale.Tag(key=key, value=value, resource_id=name,
propagate_at_launch=propagate_at_launch) propagate_at_launch=propagate_at_launch)
_tags.append(_tag) _tags.append(_tag)
if isinstance(termination_policies, string_types): if isinstance(termination_policies, six.string_types):
termination_policies = json.loads(termination_policies) termination_policies = json.loads(termination_policies)
if isinstance(suspended_processes, string_types): if isinstance(suspended_processes, six.string_types):
suspended_processes = json.loads(suspended_processes) suspended_processes = json.loads(suspended_processes)
try: try:
_asg = autoscale.AutoScalingGroup( _asg = autoscale.AutoScalingGroup(
@ -366,7 +366,7 @@ def get_cloud_init_mime(cloud_init):
salt myminion boto.get_cloud_init_mime <cloud init> salt myminion boto.get_cloud_init_mime <cloud init>
''' '''
if isinstance(cloud_init, string_types): if isinstance(cloud_init, six.string_types):
cloud_init = json.loads(cloud_init) cloud_init = json.loads(cloud_init)
_cloud_init = email.mime.multipart.MIMEMultipart() _cloud_init = email.mime.multipart.MIMEMultipart()
if 'scripts' in cloud_init: if 'scripts' in cloud_init:
@ -383,7 +383,7 @@ def get_cloud_init_mime(cloud_init):
def _safe_dump(data): def _safe_dump(data):
def ordered_dict_presenter(dumper, data): def ordered_dict_presenter(dumper, data):
return dumper.represent_dict(data.items()) return dumper.represent_dict(six.iteritems(data))
yaml.add_representer(odict.OrderedDict, ordered_dict_presenter, yaml.add_representer(odict.OrderedDict, ordered_dict_presenter,
Dumper=yaml.dumper.SafeDumper) Dumper=yaml.dumper.SafeDumper)
return yaml.safe_dump(data, default_flow_style=False) return yaml.safe_dump(data, default_flow_style=False)
@ -436,9 +436,9 @@ def create_launch_configuration(name, image_id, key_name=None,
conn = _get_conn(region, key, keyid, profile) conn = _get_conn(region, key, keyid, profile)
if not conn: if not conn:
return False return False
if isinstance(security_groups, string_types): if isinstance(security_groups, six.string_types):
security_groups = json.loads(security_groups) security_groups = json.loads(security_groups)
if isinstance(block_device_mappings, string_types): if isinstance(block_device_mappings, six.string_types):
block_device_mappings = json.loads(block_device_mappings) block_device_mappings = json.loads(block_device_mappings)
_bdms = [] _bdms = []
if block_device_mappings: if block_device_mappings:
@ -521,7 +521,7 @@ def _get_conn(region, key, keyid, profile):
Get a boto connection to autoscale. Get a boto connection to autoscale.
''' '''
if profile: if profile:
if isinstance(profile, string_types): if isinstance(profile, six.string_types):
_profile = __salt__['config.option'](profile) _profile = __salt__['config.option'](profile)
elif isinstance(profile, dict): elif isinstance(profile, dict):
_profile = profile _profile = profile
@ -555,7 +555,7 @@ def _get_ec2_conn(region, key, keyid, profile):
Get a boto connection to ec2. Needed for get_instances Get a boto connection to ec2. Needed for get_instances
''' '''
if profile: if profile:
if isinstance(profile, string_types): if isinstance(profile, six.string_types):
_profile = __salt__['config.option'](profile) _profile = __salt__['config.option'](profile)
elif isinstance(profile, dict): elif isinstance(profile, dict):
_profile = profile _profile = profile