From ea0d1bb893fb5b6b2586980053c4f37fdb24769e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 23 Jun 2022 09:33:23 +0100 Subject: [PATCH] Deprecate and remove ``__utils__`` usage. Implementation of https://github.com/saltstack/salt-enhancement-proposals/pull/66 Fixes #62191 Signed-off-by: Pedro Algarvio --- .pre-commit-config.yaml | 13 +- salt/cloud/clouds/aliyun.py | 20 +- salt/cloud/clouds/azurearm.py | 20 +- salt/cloud/clouds/clc.py | 5 +- salt/cloud/clouds/cloudstack.py | 28 +- salt/cloud/clouds/digitalocean.py | 22 +- salt/cloud/clouds/dimensiondata.py | 24 +- salt/cloud/clouds/ec2.py | 56 ++-- salt/cloud/clouds/gce.py | 120 ++++----- salt/cloud/clouds/gogrid.py | 20 +- salt/cloud/clouds/hetzner.py | 27 +- salt/cloud/clouds/joyent.py | 24 +- salt/cloud/clouds/libvirt.py | 18 +- salt/cloud/clouds/linode.py | 44 ++-- salt/cloud/clouds/lxc.py | 20 +- salt/cloud/clouds/msazure.py | 24 +- salt/cloud/clouds/oneandone.py | 14 +- salt/cloud/clouds/opennebula.py | 29 +-- salt/cloud/clouds/openstack.py | 52 ++-- salt/cloud/clouds/packet.py | 18 +- salt/cloud/clouds/parallels.py | 22 +- salt/cloud/clouds/profitbricks.py | 16 +- salt/cloud/clouds/proxmox.py | 22 +- salt/cloud/clouds/qingcloud.py | 22 +- salt/cloud/clouds/saltify.py | 13 +- salt/cloud/clouds/scaleway.py | 27 +- salt/cloud/clouds/softlayer.py | 26 +- salt/cloud/clouds/softlayer_hw.py | 26 +- salt/cloud/clouds/tencentcloud.py | 20 +- salt/cloud/clouds/vagrant.py | 8 +- salt/cloud/clouds/virtualbox.py | 23 +- salt/cloud/clouds/vmware.py | 30 +-- salt/cloud/clouds/vultrpy.py | 36 +-- salt/cloud/clouds/xen.py | 22 +- salt/cloud/libcloudfuncs.py | 14 +- salt/fileserver/s3fs.py | 7 +- salt/grains/zfs.py | 8 +- salt/modules/arista_pyeapi.py | 3 +- salt/modules/azurearm_compute.py | 80 +++--- salt/modules/azurearm_dns.py | 52 ++-- salt/modules/azurearm_network.py | 304 +++++++++++----------- salt/modules/azurearm_resource.py | 138 +++++----- salt/modules/boto3_elasticache.py | 3 +- salt/modules/boto3_elasticsearch.py | 3 +- salt/modules/boto3_route53.py | 3 +- salt/modules/boto3_sns.py | 3 +- salt/modules/boto_apigateway.py | 101 +++---- salt/modules/boto_asg.py | 14 +- salt/modules/boto_cfn.py | 3 +- salt/modules/boto_cloudfront.py | 19 +- salt/modules/boto_cloudtrail.py | 31 +-- salt/modules/boto_cloudwatch.py | 8 +- salt/modules/boto_cloudwatch_event.py | 27 +- salt/modules/boto_cognitoidentity.py | 17 +- salt/modules/boto_dynamodb.py | 3 +- salt/modules/boto_ec2.py | 21 +- salt/modules/boto_elasticache.py | 3 +- salt/modules/boto_elasticsearch_domain.py | 21 +- salt/modules/boto_elb.py | 8 +- salt/modules/boto_elbv2.py | 3 +- salt/modules/boto_iam.py | 38 +-- salt/modules/boto_iot.py | 69 ++--- salt/modules/boto_kinesis.py | 3 +- salt/modules/boto_kms.py | 47 ++-- salt/modules/boto_lambda.py | 53 ++-- salt/modules/boto_rds.py | 43 +-- salt/modules/boto_route53.py | 5 +- salt/modules/boto_s3.py | 7 +- salt/modules/boto_s3_bucket.py | 55 ++-- salt/modules/boto_secgroup.py | 5 +- salt/modules/boto_sns.py | 3 +- salt/modules/boto_sqs.py | 15 +- salt/modules/boto_ssm.py | 9 +- salt/modules/boto_vpc.py | 92 +++---- salt/modules/chocolatey.py | 9 +- salt/modules/chroot.py | 15 +- salt/modules/dockermod.py | 70 ++--- salt/modules/environ.py | 10 +- salt/modules/etcd_mod.py | 14 +- salt/modules/file.py | 24 +- salt/modules/git.py | 3 +- salt/modules/glanceng.py | 4 +- salt/modules/google_chat.py | 4 +- salt/modules/idem.py | 4 +- salt/modules/keystone.py | 3 +- salt/modules/keystoneng.py | 4 +- salt/modules/linux_service.py | 4 +- salt/modules/mac_service.py | 13 +- salt/modules/mac_system.py | 81 +++--- salt/modules/napalm_mod.py | 3 +- salt/modules/napalm_network.py | 7 +- salt/modules/netbox.py | 10 +- salt/modules/netmiko_mod.py | 3 +- salt/modules/network.py | 119 ++++----- salt/modules/neutronng.py | 4 +- salt/modules/nxos.py | 4 +- salt/modules/nxos_api.py | 3 +- salt/modules/pip.py | 3 +- salt/modules/proxy.py | 7 +- salt/modules/purefa.py | 6 +- salt/modules/purefb.py | 9 +- salt/modules/rebootmgr.py | 3 +- salt/modules/reg.py | 17 +- salt/modules/rh_service.py | 3 +- salt/modules/s3.py | 10 +- salt/modules/slsutil.py | 3 +- salt/modules/ssh.py | 3 +- salt/modules/state.py | 4 +- salt/modules/testinframod.py | 5 +- salt/modules/transactional_update.py | 8 +- salt/modules/vagrant.py | 17 +- salt/modules/vault.py | 25 +- salt/modules/win_auditpol.py | 7 +- salt/modules/win_file.py | 39 +-- salt/modules/win_lgpo.py | 12 +- salt/modules/win_path.py | 5 +- salt/modules/win_pkg.py | 53 ++-- salt/modules/win_snmp.py | 35 +-- salt/modules/win_timezone.py | 6 +- salt/modules/yaml.py | 7 +- salt/modules/zfs.py | 96 +++---- salt/modules/zpool.py | 115 ++++---- salt/pillar/s3.py | 5 +- salt/pillar/vault.py | 6 +- salt/proxy/cimc.py | 9 +- salt/proxy/nxos.py | 4 +- salt/proxy/nxos_api.py | 6 +- salt/proxy/panos.py | 9 +- salt/roster/ansible.py | 6 +- salt/roster/dir.py | 3 +- salt/roster/flat.py | 3 +- salt/roster/terraform.py | 3 +- salt/runners/cache.py | 3 +- salt/runners/state.py | 3 +- salt/sdb/vault.py | 11 +- salt/states/azurearm_compute.py | 5 +- salt/states/azurearm_dns.py | 7 +- salt/states/azurearm_network.py | 43 ++- salt/states/azurearm_resource.py | 11 +- salt/states/boto3_sns.py | 5 +- salt/states/boto_apigateway.py | 5 +- salt/states/boto_asg.py | 5 +- salt/states/boto_cloudfront.py | 11 +- salt/states/boto_elasticsearch_domain.py | 3 +- salt/states/boto_lambda.py | 3 +- salt/states/boto_s3.py | 8 +- salt/states/boto_s3_bucket.py | 11 +- salt/states/boto_sqs.py | 5 +- salt/states/btrfs.py | 3 +- salt/states/docker_network.py | 10 +- salt/states/elasticsearch.py | 9 +- salt/states/environ.py | 3 +- salt/states/file.py | 12 +- salt/states/glance_image.py | 4 +- salt/states/idem.py | 4 +- salt/states/iptables.py | 3 +- salt/states/keystone_domain.py | 4 +- salt/states/keystone_endpoint.py | 4 +- salt/states/keystone_group.py | 6 +- salt/states/keystone_project.py | 6 +- salt/states/keystone_role.py | 4 +- salt/states/keystone_service.py | 4 +- salt/states/keystone_user.py | 6 +- salt/states/neutron_network.py | 6 +- salt/states/neutron_secgroup.py | 6 +- salt/states/neutron_secgroup_rule.py | 4 +- salt/states/neutron_subnet.py | 4 +- salt/states/pkg.py | 3 +- salt/states/reg.py | 18 +- salt/states/saltmod.py | 3 +- salt/states/vault.py | 8 +- salt/states/win_dns_client.py | 5 +- salt/states/zfs.py | 41 +-- salt/states/zpool.py | 5 +- 174 files changed, 1843 insertions(+), 1700 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9f36bf2b63fa..3742bfa99971 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1124,13 +1124,22 @@ repos: - repo: https://github.com/s0undt3ch/salt-rewrite # Automatically rewrite code with known rules - rev: 1.3.2 + rev: 2.0.0 hooks: - id: salt-rewrite alias: rewrite-docstrings name: Salt docstrings auto-fixes files: ^salt/.*\.py$ args: [--silent, -F, fix_docstrings] + exclude: > + (?x)^( + salt/ext/.* + )$: + - id: salt-rewrite + alias: rewrite-dunder-utils + name: Remove __utils__ usage auto-fixes + files: ^salt/.*\.py$ + args: [--silent, -F, fix_dunder_utils] exclude: > (?x)^( salt/ext/.* @@ -1138,7 +1147,7 @@ repos: - repo: https://github.com/s0undt3ch/salt-rewrite # Automatically rewrite code with known rules - rev: 1.3.2 + rev: 2.0.0 hooks: - id: salt-rewrite alias: rewrite-tests diff --git a/salt/cloud/clouds/aliyun.py b/salt/cloud/clouds/aliyun.py index 9b1b318885b4..c6add52eda98 100644 --- a/salt/cloud/clouds/aliyun.py +++ b/salt/cloud/clouds/aliyun.py @@ -354,7 +354,7 @@ def list_nodes_full(call=None): provider = comps[0] __opts__["update_cachedir"] = True - __utils__["cloud.cache_node_list"](ret, provider, __opts__) + salt.utils.cloud.cache_node_list(ret, provider, __opts__) return ret @@ -608,11 +608,11 @@ def create(vm_): except AttributeError: pass - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -644,11 +644,11 @@ def create(vm_): if "systemdisk_category" in vm_: kwargs["SystemDisk.Category"] = vm_["systemdisk_category"] - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), - args=__utils__["cloud.filter_event"]("requesting", kwargs, list(kwargs)), + args=salt.utils.cloud.filter_event("requesting", kwargs, list(kwargs)), sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], ) @@ -710,17 +710,17 @@ def __query_node_data(vm_name): vm_["ssh_host"] = ssh_ip # The instance is booted and accessible, let's Salt it! - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update(data) log.info("Created Cloud VM '%s'", vm_["name"]) log.debug("'%s' VM creation details:\n%s", vm_["name"], pprint.pformat(data)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -979,7 +979,7 @@ def destroy(name, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -998,7 +998,7 @@ def destroy(name, call=None): node = query(params) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), diff --git a/salt/cloud/clouds/azurearm.py b/salt/cloud/clouds/azurearm.py index 8478fd2737be..1c382a579de9 100644 --- a/salt/cloud/clouds/azurearm.py +++ b/salt/cloud/clouds/azurearm.py @@ -602,7 +602,7 @@ def show_instance(name, call=None): log.debug("Failed to get data for node '%s'", name) node = {} - __utils__["cloud.cache_node"](node, _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(node, _get_active_provider_name(), __opts__) return node @@ -1253,11 +1253,11 @@ def request_instance(vm_, kwargs=None): availability_set=availability_set, ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "requesting", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -1305,17 +1305,17 @@ def create(vm_): if vm_.get("bootstrap_interface") is None: vm_["bootstrap_interface"] = "public" - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], ) - __utils__["cloud.cachedir_index_add"]( + salt.utils.cloud.cachedir_index_add( vm_["name"], vm_["profile"], "azurearm", vm_["driver"] ) if not vm_.get("location"): @@ -1379,7 +1379,7 @@ def _query_node_data(name, bootstrap_interface): "ssh_username", vm_, __opts__ ) vm_["password"] = config.get_cloud_config_value("ssh_password", vm_, __opts__) - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) data = show_instance(vm_["name"], call="action") log.info("Created Cloud VM '%s'", vm_["name"]) @@ -1387,11 +1387,11 @@ def _query_node_data(name, bootstrap_interface): ret.update(data) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -1435,7 +1435,7 @@ def destroy(name, call=None, kwargs=None): # pylint: disable=unused-argument result.wait() if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) diff --git a/salt/cloud/clouds/clc.py b/salt/cloud/clouds/clc.py index 5ea5dfacb21d..83be687bd96d 100644 --- a/salt/cloud/clouds/clc.py +++ b/salt/cloud/clouds/clc.py @@ -68,6 +68,7 @@ import time import salt.config as config +import salt.utils.cloud import salt.utils.json from salt.exceptions import SaltCloudSystemExit @@ -418,7 +419,7 @@ def create(vm_): ) req_id = clc_return["RequestID"] vm_["ssh_host"] = get_build_status(req_id, name) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "waiting for ssh", "salt/cloud/{}/waiting_for_ssh".format(name), @@ -428,7 +429,7 @@ def create(vm_): ) # Bootstrap! - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) return_message = {"Server Name": name, "IP Address": vm_["ssh_host"]} ret.update(return_message) return return_message diff --git a/salt/cloud/clouds/cloudstack.py b/salt/cloud/clouds/cloudstack.py index e9545d0e1270..9d0525988949 100644 --- a/salt/cloud/clouds/cloudstack.py +++ b/salt/cloud/clouds/cloudstack.py @@ -297,12 +297,12 @@ def create(vm_): except AttributeError: pass - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), sock_dir=__opts__["sock_dir"], - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), transport=__opts__["transport"], @@ -339,13 +339,13 @@ def create(vm_): event_data["image"] = kwargs["image"].name event_data["size"] = kwargs["size"].name - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), sock_dir=__opts__["sock_dir"], args={ - "kwargs": __utils__["cloud.filter_event"]( + "kwargs": salt.utils.cloud.filter_event( "requesting", event_data, ["name", "profile", "provider", "driver", "image", "size"], @@ -368,7 +368,7 @@ def create(vm_): ex_blockdevicemapping["VirtualName"] = "{}-{}".format( vm_["name"], len(volumes) ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting volume", "salt/cloud/{}/requesting".format(ex_blockdevicemapping["VirtualName"]), @@ -435,7 +435,7 @@ def create(vm_): vm_["ssh_host"] = get_ip(data) vm_["password"] = data.extra["password"] vm_["key_filename"] = get_key() - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update(data.__dict__) @@ -447,12 +447,12 @@ def create(vm_): "'%s' VM creation details:\n%s", vm_["name"], pprint.pformat(data.__dict__) ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), sock_dir=__opts__["sock_dir"], - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), transport=__opts__["transport"], @@ -470,7 +470,7 @@ def destroy(name, conn=None, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -495,7 +495,7 @@ def destroy(name, conn=None, call=None): ) continue log.info("Detaching volume: %s", volume.name) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "detaching volume", "salt/cloud/{}/detaching".format(volume.name), @@ -506,7 +506,7 @@ def destroy(name, conn=None, call=None): log.error("Failed to Detach volume: %s", volume.name) return False log.info("Detached volume: %s", volume.name) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "detached volume", "salt/cloud/{}/detached".format(volume.name), @@ -515,7 +515,7 @@ def destroy(name, conn=None, call=None): ) log.info("Destroying volume: %s", volume.name) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying volume", "salt/cloud/{}/destroying".format(volume.name), @@ -526,7 +526,7 @@ def destroy(name, conn=None, call=None): log.error("Failed to Destroy volume: %s", volume.name) return False log.info("Destroyed volume: %s", volume.name) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed volume", "salt/cloud/{}/destroyed".format(volume.name), @@ -541,7 +541,7 @@ def destroy(name, conn=None, call=None): log.info("Destroyed VM: %s", name) # Fire destroy action event = salt.utils.event.SaltEvent("master", __opts__["sock_dir"]) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), diff --git a/salt/cloud/clouds/digitalocean.py b/salt/cloud/clouds/digitalocean.py index 8c3cf54f05fb..5da05dbd6f38 100644 --- a/salt/cloud/clouds/digitalocean.py +++ b/salt/cloud/clouds/digitalocean.py @@ -289,11 +289,11 @@ def create(vm_): except AttributeError: pass - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -488,11 +488,11 @@ def create(vm_): 'and "hostname" or the minion name must be an FQDN.' ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), - args=__utils__["cloud.filter_event"]("requesting", kwargs, list(kwargs)), + args=salt.utils.cloud.filter_event("requesting", kwargs, list(kwargs)), sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], ) @@ -575,17 +575,17 @@ def __query_node_data(vm_name): ) vm_["key_filename"] = key_filename - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update(data) log.info("Created Cloud VM '%s'", vm_["name"]) log.debug("'%s' VM creation details:\n%s", vm_["name"], pprint.pformat(data)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -689,7 +689,7 @@ def show_instance(name, call=None): "The show_instance action must be called with -a or --action." ) node = _get_node(name) - __utils__["cloud.cache_node"](node, _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(node, _get_active_provider_name(), __opts__) return node @@ -866,7 +866,7 @@ def destroy(name, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -903,7 +903,7 @@ def destroy(name, call=None): # for line in pprint.pformat(dir()).splitlines(): # log.debug('delete context: %s', line) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -913,7 +913,7 @@ def destroy(name, call=None): ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) diff --git a/salt/cloud/clouds/dimensiondata.py b/salt/cloud/clouds/dimensiondata.py index c35b24dcd446..fdbabd628fe1 100644 --- a/salt/cloud/clouds/dimensiondata.py +++ b/salt/cloud/clouds/dimensiondata.py @@ -214,11 +214,11 @@ def create(vm_): except AttributeError: pass - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -267,13 +267,11 @@ def create(vm_): event_data = _to_event_data(kwargs) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( - "requesting", event_data, list(event_data) - ), + args=salt.utils.cloud.filter_event("requesting", event_data, list(event_data)), sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], ) @@ -296,7 +294,7 @@ def create(vm_): return False try: - data = __utils__["cloud.wait_for_ip"]( + data = salt.utils.cloud.wait_for_ip( _query_node_data, update_args=(vm_, data), timeout=config.get_cloud_config_value( @@ -325,7 +323,7 @@ def create(vm_): ip_address = preferred_ip(vm_, data.public_ips) log.debug("Using IP address %s", ip_address) - if __utils__["cloud.get_salt_interface"](vm_, __opts__) == "private_ips": + if salt.utils.cloud.get_salt_interface(vm_, __opts__) == "private_ips": salt_ip_address = preferred_ip(vm_, data.private_ips) log.info("Salt interface set to: %s", salt_ip_address) else: @@ -339,7 +337,7 @@ def create(vm_): vm_["ssh_host"] = ip_address vm_["password"] = vm_["auth"] - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update(data.__dict__) @@ -351,11 +349,11 @@ def create(vm_): "'%s' VM creation details:\n%s", vm_["name"], pprint.pformat(data.__dict__) ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -430,7 +428,7 @@ def create_lb(kwargs=None, call=None): event_data = _to_event_data(kwargs) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "create load_balancer", "salt/cloud/loadbalancer/creating", @@ -443,7 +441,7 @@ def create_lb(kwargs=None, call=None): event_data = _to_event_data(kwargs) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created load_balancer", "salt/cloud/loadbalancer/created", diff --git a/salt/cloud/clouds/ec2.py b/salt/cloud/clouds/ec2.py index 3c8ea286bced..2a474cda285e 100644 --- a/salt/cloud/clouds/ec2.py +++ b/salt/cloud/clouds/ec2.py @@ -2075,14 +2075,12 @@ def request_instance(vm_=None, call=None): "'del_all_vols_on_destroy' should be a boolean value." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), args={ - "kwargs": __utils__["cloud.filter_event"]( - "requesting", params, list(params) - ), + "kwargs": salt.utils.cloud.filter_event("requesting", params, list(params)), "location": location, }, sock_dir=__opts__["sock_dir"], @@ -2157,7 +2155,7 @@ def __query_spot_instance_request(sir_id, location): ) return False - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "waiting for spot instance", "salt/cloud/{}/waiting_for_spot".format(vm_["name"]), @@ -2226,7 +2224,7 @@ def query_instance(vm_=None, call=None): instance_id = vm_["instance_id"] location = vm_.get("location", get_location(vm_)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "querying instance", "salt/cloud/{}/querying".format(vm_["name"]), @@ -2326,7 +2324,7 @@ def __query_ip_address(params, url): # pylint: disable=W0613 raise SaltCloudSystemExit(str(exc)) if "reactor" in vm_ and vm_["reactor"] is True: - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "instance queried", "salt/cloud/{}/query_reactor".format(vm_["name"]), @@ -2363,7 +2361,7 @@ def wait_for_instance( ssh_gateway_config = vm_.get("gateway", get_ssh_gateway_config(vm_)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "waiting for ssh", "salt/cloud/{}/waiting_for_ssh".format(vm_["name"]), @@ -2541,7 +2539,7 @@ def wait_for_instance( raise SaltCloudSystemExit("Failed to connect to remote ssh") if "reactor" in vm_ and vm_["reactor"] is True: - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "ssh is available", "salt/cloud/{}/ssh_ready_reactor".format(vm_["name"]), @@ -2609,17 +2607,17 @@ def create(vm_=None, call=None): # new instances when deploy is True _validate_key_path_and_mode(key_filename) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], ) - __utils__["cloud.cachedir_index_add"]( + salt.utils.cloud.cachedir_index_add( vm_["name"], vm_["profile"], "ec2", vm_["driver"] ) @@ -2704,7 +2702,7 @@ def create(vm_=None, call=None): tags["Name"] = vm_["name"] - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "setting tags", "salt/cloud/{}/tagging".format(vm_["name"]), @@ -2748,7 +2746,7 @@ def create(vm_=None, call=None): for k, v in vm_["spot_config"]["tag"].items(): spot_request_tags[k] = v - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "setting tags", "salt/cloud/spot_request_{}/tagging".format(sir_id), @@ -2814,7 +2812,7 @@ def create(vm_=None, call=None): "volumes", vm_, __opts__, search_global=True ) if volumes: - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "attaching volumes", "salt/cloud/{}/attaching_volumes".format(vm_["name"]), @@ -2873,18 +2871,18 @@ def create(vm_=None, call=None): if ssm_document: event_data["ssm_document"] = ssm_document - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]("created", event_data, list(event_data)), + args=salt.utils.cloud.filter_event("created", event_data, list(event_data)), sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], ) # Ensure that the latest node data is returned node = _get_node(instance_id=vm_["instance_id"]) - __utils__["cloud.cache_node"](node, _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(node, _get_active_provider_name(), __opts__) ret.update(node) # Add any block device tags specified @@ -2920,7 +2918,7 @@ def create(vm_=None, call=None): if block_device_volume_id_map: for volid, tags in block_device_volume_id_map.items(): - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "setting tags", "salt/cloud/block_volume_{}/tagging".format(str(volid)), @@ -2929,7 +2927,7 @@ def create(vm_=None, call=None): transport=__opts__["transport"], ) - __utils__["cloud.wait_for_fun"]( + salt.utils.cloud.wait_for_fun( set_tags, timeout=30, name=vm_["name"], @@ -2956,7 +2954,7 @@ def queue_instances(instances): """ for instance_id in instances: node = _get_node(instance_id=instance_id) - __utils__["cloud.cache_node"](node, _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(node, _get_active_provider_name(), __opts__) def create_attach_volumes(name, kwargs, call=None, wait_to_finish=True): @@ -3050,7 +3048,7 @@ def stop(name, call=None): instance_id = _get_node(name)["instanceId"] - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "stopping instance", "salt/cloud/{}/stopping".format(name), @@ -3084,7 +3082,7 @@ def start(name, call=None): instance_id = _get_node(name)["instanceId"] - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting instance", "salt/cloud/{}/starting".format(name), @@ -3352,7 +3350,7 @@ def destroy(name, call=None): name=name, instance_id=instance_id, call="action", quiet=True ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -3406,7 +3404,7 @@ def destroy(name, call=None): ) ret["spotInstance"] = result[0] - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -3415,10 +3413,10 @@ def destroy(name, call=None): transport=__opts__["transport"], ) - __utils__["cloud.cachedir_index_del"](name) + salt.utils.cloud.cachedir_index_del(name) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) @@ -3506,7 +3504,7 @@ def show_instance(name=None, instance_id=None, call=None, kwargs=None): ) node = _get_node(name=name, instance_id=instance_id) - __utils__["cloud.cache_node"](node, _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(node, _get_active_provider_name(), __opts__) return node @@ -3635,7 +3633,7 @@ def _list_nodes_full(location=None): ret = _extract_instance_info(instances) - __utils__["cloud.cache_node_list"](ret, provider, __opts__) + salt.utils.cloud.cache_node_list(ret, provider, __opts__) return ret diff --git a/salt/cloud/clouds/gce.py b/salt/cloud/clouds/gce.py index 4e6f0f210e86..b1a23eff681d 100644 --- a/salt/cloud/clouds/gce.py +++ b/salt/cloud/clouds/gce.py @@ -296,7 +296,7 @@ def show_instance(vm_name, call=None): ) conn = get_conn() node = _expand_node(conn.ex_get_node(vm_name)) - __utils__["cloud.cache_node"](node, _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(node, _get_active_provider_name(), __opts__) return node @@ -596,7 +596,7 @@ def create_network(kwargs=None, call=None): desc = kwargs.get("description", None) conn = get_conn() - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "creating network", "salt/cloud/net/creating", @@ -607,7 +607,7 @@ def create_network(kwargs=None, call=None): network = conn.ex_create_network(name, cidr, desc, mode) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created network", "salt/cloud/net/created", @@ -640,7 +640,7 @@ def delete_network(kwargs=None, call=None): name = kwargs["name"] conn = get_conn() - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "deleting network", "salt/cloud/net/deleting", @@ -660,7 +660,7 @@ def delete_network(kwargs=None, call=None): ) return False - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "deleted network", "salt/cloud/net/deleted", @@ -733,7 +733,7 @@ def create_subnetwork(kwargs=None, call=None): desc = kwargs.get("description", None) conn = get_conn() - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "create subnetwork", "salt/cloud/subnet/creating", @@ -750,7 +750,7 @@ def create_subnetwork(kwargs=None, call=None): subnet = conn.ex_create_subnetwork(name, cidr, network, region, desc) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created subnetwork", "salt/cloud/subnet/created", @@ -797,7 +797,7 @@ def delete_subnetwork(kwargs=None, call=None): region = kwargs["region"] conn = get_conn() - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "deleting subnetwork", "salt/cloud/subnet/deleting", @@ -817,7 +817,7 @@ def delete_subnetwork(kwargs=None, call=None): ) return False - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "deleted subnetwork", "salt/cloud/subnet/deleted", @@ -897,7 +897,7 @@ def create_fwrule(kwargs=None, call=None): dst_tags = dst_tags.split(",") conn = get_conn() - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "create firewall", "salt/cloud/firewall/creating", @@ -915,7 +915,7 @@ def create_fwrule(kwargs=None, call=None): target_tags=dst_tags, ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created firewall", "salt/cloud/firewall/created", @@ -948,7 +948,7 @@ def delete_fwrule(kwargs=None, call=None): name = kwargs["name"] conn = get_conn() - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "delete firewall", "salt/cloud/firewall/deleting", @@ -968,7 +968,7 @@ def delete_fwrule(kwargs=None, call=None): ) return False - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "deleted firewall", "salt/cloud/firewall/deleted", @@ -1031,7 +1031,7 @@ def create_hc(kwargs=None, call=None): conn = get_conn() - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "create health_check", "salt/cloud/healthcheck/creating", @@ -1060,7 +1060,7 @@ def create_hc(kwargs=None, call=None): healthy_threshold=healthy_threshold, ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created health_check", "salt/cloud/healthcheck/created", @@ -1102,7 +1102,7 @@ def delete_hc(kwargs=None, call=None): name = kwargs["name"] conn = get_conn() - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "delete health_check", "salt/cloud/healthcheck/deleting", @@ -1122,7 +1122,7 @@ def delete_hc(kwargs=None, call=None): ) return False - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "deleted health_check", "salt/cloud/healthcheck/deleted", @@ -1184,7 +1184,7 @@ def create_address(kwargs=None, call=None): conn = get_conn() - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "create address", "salt/cloud/address/creating", @@ -1195,7 +1195,7 @@ def create_address(kwargs=None, call=None): addy = conn.ex_create_address(name, ex_region, ex_address) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created address", "salt/cloud/address/created", @@ -1237,7 +1237,7 @@ def delete_address(kwargs=None, call=None): conn = get_conn() - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "delete address", "salt/cloud/address/deleting", @@ -1258,7 +1258,7 @@ def delete_address(kwargs=None, call=None): ) return False - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "deleted address", "salt/cloud/address/deleted", @@ -1347,7 +1347,7 @@ def create_lb(kwargs=None, call=None): if ex_healthchecks: ex_healthchecks = ex_healthchecks.split(",") - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "create load_balancer", "salt/cloud/loadbalancer/creating", @@ -1367,7 +1367,7 @@ def create_lb(kwargs=None, call=None): ex_address=ex_address, ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created load_balancer", "salt/cloud/loadbalancer/created", @@ -1400,7 +1400,7 @@ def delete_lb(kwargs=None, call=None): name = kwargs["name"] lb_conn = get_lb_conn(get_conn()) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "delete load_balancer", "salt/cloud/loadbalancer/deleting", @@ -1420,7 +1420,7 @@ def delete_lb(kwargs=None, call=None): ) return False - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "deleted load_balancer", "salt/cloud/loadbalancer/deleted", @@ -1481,7 +1481,7 @@ def attach_lb(kwargs=None, call=None): lb_conn = get_lb_conn(conn) lb = lb_conn.get_balancer(kwargs["name"]) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "attach load_balancer", "salt/cloud/loadbalancer/attaching", @@ -1492,7 +1492,7 @@ def attach_lb(kwargs=None, call=None): result = lb_conn.balancer_attach_compute_node(lb, node) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "attached load_balancer", "salt/cloud/loadbalancer/attached", @@ -1544,7 +1544,7 @@ def detach_lb(kwargs=None, call=None): ) return False - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "detach load_balancer", "salt/cloud/loadbalancer/detaching", @@ -1555,7 +1555,7 @@ def detach_lb(kwargs=None, call=None): result = lb_conn.balancer_detach_member(lb, remove_member) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "detached load_balancer", "salt/cloud/loadbalancer/detached", @@ -1588,7 +1588,7 @@ def delete_snapshot(kwargs=None, call=None): name = kwargs["name"] conn = get_conn() - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "delete snapshot", "salt/cloud/snapshot/deleting", @@ -1608,7 +1608,7 @@ def delete_snapshot(kwargs=None, call=None): ) return False - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "deleted snapshot", "salt/cloud/snapshot/deleted", @@ -1642,7 +1642,7 @@ def delete_disk(kwargs=None, call=None): disk = conn.ex_get_volume(kwargs.get("disk_name")) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "delete disk", "salt/cloud/disk/deleting", @@ -1667,7 +1667,7 @@ def delete_disk(kwargs=None, call=None): ) return False - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "deleted disk", "salt/cloud/disk/deleted", @@ -1728,7 +1728,7 @@ def create_disk(kwargs=None, call=None): location = conn.ex_get_zone(kwargs["location"]) use_existing = True - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "create disk", "salt/cloud/disk/creating", @@ -1746,7 +1746,7 @@ def create_disk(kwargs=None, call=None): size, name, location, snapshot, image, use_existing, disk_type ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created disk", "salt/cloud/disk/created", @@ -1801,7 +1801,7 @@ def create_snapshot(kwargs=None, call=None): ) return False - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "create snapshot", "salt/cloud/snapshot/creating", @@ -1812,7 +1812,7 @@ def create_snapshot(kwargs=None, call=None): snapshot = conn.create_volume_snapshot(disk, name) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created snapshot", "salt/cloud/snapshot/created", @@ -1893,7 +1893,7 @@ def detach_disk(name=None, kwargs=None, call=None): node = conn.ex_get_node(node_name) disk = conn.ex_get_volume(disk_name) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "detach disk", "salt/cloud/disk/detaching", @@ -1904,7 +1904,7 @@ def detach_disk(name=None, kwargs=None, call=None): result = conn.detach_volume(disk, node) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "detached disk", "salt/cloud/disk/detached", @@ -1955,7 +1955,7 @@ def attach_disk(name=None, kwargs=None, call=None): node = conn.ex_get_node(node_name) disk = conn.ex_get_volume(disk_name) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "attach disk", "salt/cloud/disk/attaching", @@ -1968,7 +1968,7 @@ def attach_disk(name=None, kwargs=None, call=None): node, disk, ex_mode=mode, ex_boot=boot, ex_auto_delete=auto_delete ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "attached disk", "salt/cloud/disk/attached", @@ -1996,7 +1996,7 @@ def reboot(vm_name, call=None): conn = get_conn() - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "reboot instance", "salt/cloud/{}/rebooting".format(vm_name), @@ -2007,7 +2007,7 @@ def reboot(vm_name, call=None): result = conn.reboot_node(conn.ex_get_node(vm_name)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "reboot instance", "salt/cloud/{}/rebooted".format(vm_name), @@ -2038,7 +2038,7 @@ def start(vm_name, call=None): conn = get_conn() - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "start instance", "salt/cloud/{}/starting".format(vm_name), @@ -2049,7 +2049,7 @@ def start(vm_name, call=None): result = conn.ex_start_node(conn.ex_get_node(vm_name)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "start instance", "salt/cloud/{}/started".format(vm_name), @@ -2078,7 +2078,7 @@ def stop(vm_name, call=None): conn = get_conn() - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "stop instance", "salt/cloud/{}/stopping".format(vm_name), @@ -2089,7 +2089,7 @@ def stop(vm_name, call=None): result = conn.ex_stop_node(conn.ex_get_node(vm_name)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "stop instance", "salt/cloud/{}/stopped".format(vm_name), @@ -2132,7 +2132,7 @@ def destroy(vm_name, call=None): ) raise SaltCloudSystemExit("Could not find instance {}.".format(vm_name)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "delete instance", "salt/cloud/{}/deleting".format(vm_name), @@ -2172,7 +2172,7 @@ def destroy(vm_name, call=None): exc_info_on_loglevel=logging.DEBUG, ) raise SaltCloudSystemExit("Could not destroy instance {}.".format(vm_name)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "delete instance", "salt/cloud/{}/deleted".format(vm_name), @@ -2186,7 +2186,7 @@ def destroy(vm_name, call=None): "delete_boot_pd is enabled for the instance profile, " "attempting to delete disk" ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "delete disk", "salt/cloud/disk/deleting", @@ -2208,7 +2208,7 @@ def destroy(vm_name, call=None): exc, exc_info_on_loglevel=logging.DEBUG, ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "deleted disk", "salt/cloud/disk/deleted", @@ -2218,7 +2218,7 @@ def destroy(vm_name, call=None): ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( vm_name, _get_active_provider_name().split(":")[0], __opts__ ) @@ -2305,11 +2305,11 @@ def request_instance(vm_): except AttributeError: pass - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "create instance", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -2402,11 +2402,11 @@ def request_instance(vm_): log.info("Creating GCE instance %s in %s", vm_["name"], kwargs["location"].name) log.debug("Create instance kwargs %s", kwargs) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "requesting", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -2431,7 +2431,7 @@ def request_instance(vm_): ) if volumes: - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "attaching volumes", "salt/cloud/{}/attaching_volumes".format(vm_["name"]), @@ -2471,18 +2471,18 @@ def create(vm_=None, call=None): vm_["ssh_host"] = __get_host(node_data, vm_) vm_["key_filename"] = ssh_key - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update(node_dict) log.info("Created Cloud VM '%s'", vm_["name"]) log.trace("'%s' VM creation details:\n%s", vm_["name"], pprint.pformat(node_dict)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], diff --git a/salt/cloud/clouds/gogrid.py b/salt/cloud/clouds/gogrid.py index a2457b48ca48..b470619f2244 100644 --- a/salt/cloud/clouds/gogrid.py +++ b/salt/cloud/clouds/gogrid.py @@ -101,11 +101,11 @@ def create(vm_): except AttributeError: pass - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -132,12 +132,12 @@ def create(vm_): "ip": host_ip, } - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), args={ - "kwargs": __utils__["cloud.filter_event"]( + "kwargs": salt.utils.cloud.filter_event( "requesting", create_kwargs, list(create_kwargs) ), }, @@ -182,17 +182,17 @@ def wait_for_apipass(): ) vm_["ssh_host"] = host_ip - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update(data) log.info("Created Cloud VM '%s'", vm_["name"]) log.debug("'%s' VM creation details:\n%s", vm_["name"], pprint.pformat(data)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -414,7 +414,7 @@ def destroy(name, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -425,7 +425,7 @@ def destroy(name, call=None): response = _query("grid", "server/delete", args={"name": name}) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -435,7 +435,7 @@ def destroy(name, call=None): ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) diff --git a/salt/cloud/clouds/hetzner.py b/salt/cloud/clouds/hetzner.py index e666769ee6aa..2fca0b1227cf 100644 --- a/salt/cloud/clouds/hetzner.py +++ b/salt/cloud/clouds/hetzner.py @@ -23,6 +23,7 @@ import time import salt.config as config +import salt.utils.cloud from salt.exceptions import SaltCloudException, SaltCloudSystemExit # hcloud module will be needed @@ -252,7 +253,7 @@ def show_instance(name, call=None): log.debug("Failed to get data for node '%s'", name) node = {} - __utils__["cloud.cache_node"]( + salt.utils.cloud.cache_node( node, _get_active_provider_name() or __virtualname__, __opts__, @@ -315,11 +316,11 @@ def create(vm_): if image is None: raise SaltCloudException("The server image is not supported") - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"], @@ -430,16 +431,16 @@ def create(vm_): } ) - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) log.info("Created Cloud VM '%s'", vm_["name"]) ret["created"] = True - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"], @@ -475,7 +476,7 @@ def start(name, call=None, wait=True): if wait and not wait_until(name, "running"): return "Instance {} doesn't start.".format(name) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "started instance", "salt/cloud/{}/started".format(name), @@ -509,7 +510,7 @@ def stop(name, call=None, wait=True): if wait and not wait_until(name, "off"): return "Instance {} doesn't stop.".format(name) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "stopped instance", "salt/cloud/{}/stopped".format(name), @@ -569,7 +570,7 @@ def destroy(name, call=None): if server is None: return "Instance {} doesn't exist.".format(name) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -586,7 +587,7 @@ def destroy(name, call=None): server.delete() - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -596,7 +597,7 @@ def destroy(name, call=None): ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__, @@ -634,7 +635,7 @@ def resize(name, kwargs, call=None): if server_type is None: raise SaltCloudException("The server size is not supported") - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "resizing instance", "salt/cloud/{}/resizing".format(name), @@ -651,7 +652,7 @@ def resize(name, kwargs, call=None): server.change_type(server_type, kwargs.get("upgrade_disk", False)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "resizing instance", "salt/cloud/{}/resized".format(name), diff --git a/salt/cloud/clouds/joyent.py b/salt/cloud/clouds/joyent.py index 58b853b3f004..074f067fff4f 100644 --- a/salt/cloud/clouds/joyent.py +++ b/salt/cloud/clouds/joyent.py @@ -197,7 +197,7 @@ def query_instance(vm_=None, call=None): "The query_instance action must be called with -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "querying instance", "salt/cloud/{}/querying".format(vm_["name"]), @@ -280,11 +280,11 @@ def create(vm_): "private_key", vm_, __opts__, search_global=False, default=None ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -308,14 +308,12 @@ def create(vm_): if "networks" in vm_: kwargs["networks"] = vm_.get("networks") - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), args={ - "kwargs": __utils__["cloud.filter_event"]( - "requesting", kwargs, list(kwargs) - ), + "kwargs": salt.utils.cloud.filter_event("requesting", kwargs, list(kwargs)), }, sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], @@ -332,13 +330,13 @@ def create(vm_): vm_["key_filename"] = key_filename vm_["ssh_host"] = data[1]["primaryIp"] - __utils__["cloud.bootstrap"](vm_, __opts__) + salt.utils.cloud.bootstrap(vm_, __opts__) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -416,7 +414,7 @@ def destroy(name, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -432,7 +430,7 @@ def destroy(name, call=None): method="DELETE", ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -442,7 +440,7 @@ def destroy(name, call=None): ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) diff --git a/salt/cloud/clouds/libvirt.py b/salt/cloud/clouds/libvirt.py index 22a79abbc842..0b0ac4fa5114 100644 --- a/salt/cloud/clouds/libvirt.py +++ b/salt/cloud/clouds/libvirt.py @@ -329,11 +329,11 @@ def create(vm_): # TODO: check name qemu/libvirt will choke on some characters (like '/')? name = vm_["name"] - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(name), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -371,12 +371,12 @@ def create(vm_): "base_domain": base, } - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(name), args={ - "kwargs": __utils__["cloud.filter_event"]( + "kwargs": salt.utils.cloud.filter_event( "requesting", kwargs, list(kwargs) ), }, @@ -510,13 +510,13 @@ def create(vm_): # the bootstrap script needs to be installed first in /etc/salt/cloud.deploy.d/ # salt-cloud -u is your friend - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(name), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -622,7 +622,7 @@ def destroy(name, call=None): if len(found) > 1: return "{} doesn't identify a unique machine leaving things".format(name) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -633,7 +633,7 @@ def destroy(name, call=None): destroy_domain(found[0]["conn"], found[0]["domain"]) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), diff --git a/salt/cloud/clouds/linode.py b/salt/cloud/clouds/linode.py index 72c985f148eb..46bd08cb040a 100644 --- a/salt/cloud/clouds/linode.py +++ b/salt/cloud/clouds/linode.py @@ -114,6 +114,8 @@ from pathlib import Path import salt.config as config +import salt.utils.cloud +import salt.utils.http from salt._compat import ipaddress from salt.exceptions import ( SaltCloudConfigError, @@ -495,7 +497,7 @@ def get_linode(self, kwargs=None): ) def list_nodes_select(self, call): - return __utils__["cloud.list_nodes_select"]( + return salt.utils.cloud.list_nodes_select( self.list_nodes_full(), __opts__["query.selection"], call, @@ -697,11 +699,11 @@ def create(self, vm_): if not _validate_name(name): return False - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(name), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -790,7 +792,7 @@ def create(self, vm_): vm_["ssh_host"] = public_ips[0] # Send event that the instance has booted. - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "waiting for ssh", "salt/cloud/{}/waiting_for_ssh".format(name), @@ -799,17 +801,17 @@ def create(self, vm_): transport=__opts__["transport"], ) - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update(data) log.info("Created Cloud VM '%s'", name) log.debug("'%s' VM creation details:\n%s", name, pprint.pformat(data)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(name), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -819,7 +821,7 @@ def create(self, vm_): return ret def destroy(self, name): - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -829,7 +831,7 @@ def destroy(self, name): ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) @@ -1181,7 +1183,7 @@ def _query( if LASTCALL >= now: time.sleep(ratelimit_sleep) - result = __utils__["http.query"]( + result = salt.utils.http.query( url, method, params=args, @@ -1304,11 +1306,11 @@ def create(self, vm_): if not _validate_name(name): return False - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(name), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -1405,11 +1407,11 @@ def create(self, vm_): ) return False - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(name), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "requesting", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -1498,7 +1500,7 @@ def create(self, vm_): vm_["private_ips"] = ips["private_ips"] # Send event that the instance has booted. - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "waiting for ssh", "salt/cloud/{}/waiting_for_ssh".format(name), @@ -1508,18 +1510,18 @@ def create(self, vm_): ) # Bootstrap! - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update(data) log.info("Created Cloud VM '%s'", name) log.debug("'%s' VM creation details:\n%s", name, pprint.pformat(data)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(name), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -1656,7 +1658,7 @@ def _create_private_ip(self, linode_id): return self._clean_data(result) def destroy(self, name): - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -1671,7 +1673,7 @@ def destroy(self, name): "linode", "delete", args={"LinodeID": linode_id, "skipChecks": True} ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -1681,7 +1683,7 @@ def destroy(self, name): ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) diff --git a/salt/cloud/clouds/lxc.py b/salt/cloud/clouds/lxc.py index da293dca66a0..6c4e12f56e6a 100644 --- a/salt/cloud/clouds/lxc.py +++ b/salt/cloud/clouds/lxc.py @@ -316,7 +316,7 @@ def show_instance(name, call=None): if not call: call = "action" nodes = list_nodes_full(call=call) - __utils__["cloud.cache_node"](nodes[name], _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(nodes[name], _get_active_provider_name(), __opts__) return nodes[name] @@ -369,7 +369,7 @@ def destroy(vm_, call=None): return ret = {"comment": "{} was not found".format(vm_), "result": False} if _salt("lxc.info", vm_, path=path): - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(vm_), @@ -381,7 +381,7 @@ def destroy(vm_, call=None): ret["result"] = cret["result"] if ret["result"]: ret["comment"] = "{} was destroyed".format(vm_) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(vm_), @@ -390,7 +390,7 @@ def destroy(vm_, call=None): transport=__opts__["transport"], ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( vm_, _get_active_provider_name().split(":")[0], __opts__ ) return ret @@ -414,11 +414,11 @@ def create(vm_, call=None): event_data = vm_.copy() event_data["profile"] = profile - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", event_data, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -436,11 +436,11 @@ def create(vm_, call=None): kwarg["host"] = prov["target"] kwarg["profile"] = profile - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "requesting", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -466,11 +466,11 @@ def create(vm_, call=None): __opts__["internal_lxc_profile"] = __opts__["profile"] del __opts__["profile"] - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], diff --git a/salt/cloud/clouds/msazure.py b/salt/cloud/clouds/msazure.py index b746320d27f0..ec6bc60aa810 100644 --- a/salt/cloud/clouds/msazure.py +++ b/salt/cloud/clouds/msazure.py @@ -459,9 +459,7 @@ def show_instance(name, call=None): if "name" not in nodes[name]: nodes[name]["name"] = nodes[name]["id"] try: - __utils__["cloud.cache_node"]( - nodes[name], _get_active_provider_name(), __opts__ - ) + salt.utils.cloud.cache_node(nodes[name], _get_active_provider_name(), __opts__) except TypeError: log.warning( "Unable to show cache node data; this may be because the node has been" @@ -491,11 +489,11 @@ def create(vm_): except AttributeError: pass - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -608,11 +606,11 @@ def create(vm_): del event_kwargs["vm_kwargs"]["system_config"] del event_kwargs["vm_kwargs"]["os_virtual_hard_disk"] del event_kwargs["vm_kwargs"]["network_config"] - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "requesting", event_kwargs, list(event_kwargs) ), sock_dir=__opts__["sock_dir"], @@ -716,18 +714,18 @@ def wait_for_hostname(): vm_["ssh_host"] = hostname.replace("http://", "").replace("/", "") vm_["password"] = config.get_cloud_config_value("ssh_password", vm_, __opts__) - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) # Attaching volumes volumes = config.get_cloud_config_value( "volumes", vm_, __opts__, search_global=True ) if volumes: - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "attaching volumes", "salt/cloud/{}/attaching_volumes".format(vm_["name"]), - args=__utils__["cloud.filter_event"]("attaching_volumes", vm_, ["volumes"]), + args=salt.utils.cloud.filter_event("attaching_volumes", vm_, ["volumes"]), sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], ) @@ -755,11 +753,11 @@ def wait_for_hostname(): ret.update(data) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -1037,7 +1035,7 @@ def destroy(name, conn=None, call=None, kwargs=None): delete_type: {"request_id": result.request_id}, } if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) diff --git a/salt/cloud/clouds/oneandone.py b/salt/cloud/clouds/oneandone.py index 7c4eb71efcce..9c43db1f67c3 100644 --- a/salt/cloud/clouds/oneandone.py +++ b/salt/cloud/clouds/oneandone.py @@ -464,7 +464,7 @@ def show_instance(name, call=None): ) nodes = list_nodes_full() - __utils__["cloud.cache_node"](nodes[name], _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(nodes[name], _get_active_provider_name(), __opts__) return nodes[name] @@ -609,7 +609,7 @@ def create(vm_): # Assemble the hdds object. hdds = _get_hdds(vm_) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), @@ -694,7 +694,7 @@ def __query_node_data(vm_, data): log.info("Created Cloud VM %s", vm_) log.debug("%s VM creation details:\n%s", vm_, pprint.pformat(data)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), @@ -710,7 +710,7 @@ def __query_node_data(vm_, data): if "ssh_host" in vm_: vm_["password"] = password vm_["key_filename"] = get_key_filename(vm_) - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update(data) return ret else: @@ -738,7 +738,7 @@ def destroy(name, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -752,7 +752,7 @@ def destroy(name, call=None): conn.delete_server(server_id=node["id"]) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -762,7 +762,7 @@ def destroy(name, call=None): ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) diff --git a/salt/cloud/clouds/opennebula.py b/salt/cloud/clouds/opennebula.py index adf4fcc1261a..cac0dfe2fc6c 100644 --- a/salt/cloud/clouds/opennebula.py +++ b/salt/cloud/clouds/opennebula.py @@ -65,6 +65,7 @@ import time import salt.config as config +import salt.utils.cloud import salt.utils.data import salt.utils.files from salt.exceptions import ( @@ -337,7 +338,7 @@ def list_nodes_select(call=None): "The list_nodes_full function must be called with -f or --function." ) - return __utils__["cloud.list_nodes_select"]( + return salt.utils.cloud.list_nodes_select( list_nodes_full("function"), __opts__["query.selection"], call, @@ -971,11 +972,11 @@ def create(vm_): except AttributeError: pass - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -996,14 +997,12 @@ def create(vm_): ) kwargs["private_networking"] = "true" if private_networking else "false" - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), args={ - "kwargs": __utils__["cloud.filter_event"]( - "requesting", kwargs, list(kwargs) - ), + "kwargs": salt.utils.cloud.filter_event("requesting", kwargs, list(kwargs)), }, sock_dir=__opts__["sock_dir"], ) @@ -1076,7 +1075,7 @@ def __query_node_data(vm_name): return node_data try: - data = __utils__["cloud.wait_for_ip"]( + data = salt.utils.cloud.wait_for_ip( __query_node_data, update_args=(vm_["name"],), timeout=config.get_cloud_config_value( @@ -1126,7 +1125,7 @@ def __query_node_data(vm_name): vm_["username"] = ssh_username vm_["key_filename"] = key_filename - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret["id"] = data["id"] ret["image"] = vm_["image"] @@ -1139,11 +1138,11 @@ def __query_node_data(vm_name): log.info("Created Cloud VM '%s'", vm_["name"]) log.debug("'%s' VM creation details:\n%s", vm_["name"], pprint.pformat(data)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -1174,7 +1173,7 @@ def destroy(name, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -1188,7 +1187,7 @@ def destroy(name, call=None): data = show_instance(name, call="action") node = server.one.vm.action(auth, "delete", int(data["id"])) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -1197,7 +1196,7 @@ def destroy(name, call=None): ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) @@ -1892,7 +1891,7 @@ def show_instance(name, call=None): ) node = _get_node(name) - __utils__["cloud.cache_node"](node, _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(node, _get_active_provider_name(), __opts__) return node diff --git a/salt/cloud/clouds/openstack.py b/salt/cloud/clouds/openstack.py index 6a98081c46d0..9f6d9a527d5d 100644 --- a/salt/cloud/clouds/openstack.py +++ b/salt/cloud/clouds/openstack.py @@ -231,6 +231,10 @@ import socket import salt.config as config +import salt.utils.cloud +import salt.utils.dictupdate +import salt.utils.files +import salt.utils.json import salt.utils.versions from salt.exceptions import ( SaltCloudConfigError, @@ -371,7 +375,7 @@ def get_conn(): vm_ = get_configured_provider() profile = vm_.pop("profile", None) if profile is not None: - vm_ = __utils__["dictupdate.update"]( + vm_ = salt.utils.dictupdate.update( os_client_config.vendors.get_profile(profile), vm_ ) conn = shade.openstackcloud.OpenStackCloud(cloud_config=None, **vm_) @@ -444,11 +448,9 @@ def _get_ips(node, addr_type="public"): "OS-EXT-IPS:type" ): ret.append(addr["addr"]) - elif addr_type == "public" and __utils__["cloud.is_public_ip"]( - addr["addr"] - ): + elif addr_type == "public" and salt.utils.cloud.is_public_ip(addr["addr"]): ret.append(addr["addr"]) - elif addr_type == "private" and not __utils__["cloud.is_public_ip"]( + elif addr_type == "private" and not salt.utils.cloud.is_public_ip( addr["addr"] ): ret.append(addr["addr"]) @@ -507,7 +509,7 @@ def list_nodes_select(conn=None, call=None): raise SaltCloudSystemExit( "The list_nodes_select function must be called with -f or --function." ) - return __utils__["cloud.list_nodes_select"]( + return salt.utils.cloud.list_nodes_select( list_nodes(conn, "function"), __opts__["query.selection"], call ) @@ -683,7 +685,7 @@ def _clean_create_kwargs(**kwargs): continue log.error("Error %s: %s is not of type %s", key, value, VALID_OPTS[key]) kwargs.pop(key) - return __utils__["dictupdate.update"](kwargs, extra) + return salt.utils.dictupdate.update(kwargs, extra) def request_instance(vm_, conn=None, call=None): @@ -698,7 +700,7 @@ def request_instance(vm_, conn=None, call=None): ) kwargs = copy.deepcopy(vm_) log.info("Creating Cloud VM %s", vm_["name"]) - __utils__["cloud.check_name"](vm_["name"], "a-zA-Z0-9._-") + salt.utils.cloud.check_name(vm_["name"], "a-zA-Z0-9._-") if conn is None: conn = get_conn() userdata = config.get_cloud_config_value( @@ -706,8 +708,8 @@ def request_instance(vm_, conn=None, call=None): ) if userdata is not None and os.path.isfile(userdata): try: - with __utils__["files.fopen"](userdata, "r") as fp_: - kwargs["userdata"] = __utils__["cloud.userdata_template"]( + with salt.utils.files.fopen(userdata, "r") as fp_: + kwargs["userdata"] = salt.utils.cloud.userdata_template( __opts__, vm_, fp_.read() ) except Exception as exc: # pylint: disable=broad-except @@ -743,11 +745,11 @@ def create(vm_): vm_["key_filename"] = key_filename - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -760,7 +762,7 @@ def create(vm_): # things like salt keys created yet, so let's create them now. if "pub_key" not in vm_ and "priv_key" not in vm_: log.debug("Generating minion keys for '%s'", vm_["name"]) - vm_["priv_key"], vm_["pub_key"] = __utils__["cloud.gen_keys"]( + vm_["priv_key"], vm_["pub_key"] = salt.utils.cloud.gen_keys( config.get_cloud_config_value("keysize", vm_, __opts__) ) else: @@ -783,7 +785,7 @@ def __query_node(vm_): return preferred_ip(vm_, data[ssh_interface(vm_)]) try: - ip_address = __utils__["cloud.wait_for_fun"](__query_node, vm_=vm_) + ip_address = salt.utils.cloud.wait_for_fun(__query_node, vm_=vm_) except (SaltCloudExecutionTimeout, SaltCloudExecutionFailure) as exc: try: # It might be already up, let's destroy it! @@ -794,7 +796,7 @@ def __query_node(vm_): raise SaltCloudSystemExit(str(exc)) log.debug("Using IP address %s", ip_address) - salt_interface = __utils__["cloud.get_salt_interface"](vm_, __opts__) + salt_interface = salt.utils.cloud.get_salt_interface(vm_, __opts__) salt_ip_address = preferred_ip(vm_, data[salt_interface]) log.debug("Salt interface set to: %s", salt_ip_address) @@ -804,7 +806,7 @@ def __query_node(vm_): vm_["ssh_host"] = ip_address vm_["salt_host"] = salt_ip_address - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update(data) log.info("Created Cloud VM '%s'", vm_["name"]) @@ -821,15 +823,15 @@ def __query_node(vm_): "public_ips": data["public_ips"], } - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]("created", event_data, list(event_data)), + args=salt.utils.cloud.filter_event("created", event_data, list(event_data)), sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], ) - __utils__["cloud.cachedir_index_add"]( + salt.utils.cloud.cachedir_index_add( vm_["name"], vm_["profile"], "nova", vm_["driver"] ) return ret @@ -844,7 +846,7 @@ def destroy(name, conn=None, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -861,7 +863,7 @@ def destroy(name, conn=None, call=None): if ret: log.info("Destroyed VM: %s", name) # Fire destroy action - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -870,14 +872,14 @@ def destroy(name, conn=None, call=None): transport=__opts__["transport"], ) if __opts__.get("delete_sshkeys", False) is True: - __utils__["cloud.remove_sshkey"]( + salt.utils.cloud.remove_sshkey( getattr(node, __opts__.get("ssh_interface", "public_ips"))[0] ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) - __utils__["cloud.cachedir_index_del"](name) + salt.utils.cloud.cachedir_index_del(name) return True log.error("Failed to Destroy VM: %s", name) @@ -913,7 +915,7 @@ def call(conn=None, call=None, kwargs=None): func = kwargs.pop("func") for key, value in kwargs.items(): try: - kwargs[key] = __utils__["json.loads"](value) + kwargs[key] = salt.utils.json.loads(value) except ValueError: continue try: diff --git a/salt/cloud/clouds/packet.py b/salt/cloud/clouds/packet.py index 1c6217bf4f7a..ff46cc904bc8 100644 --- a/salt/cloud/clouds/packet.py +++ b/salt/cloud/clouds/packet.py @@ -337,11 +337,11 @@ def create(vm_): if not is_profile_configured(vm_): return False - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(name), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -352,11 +352,11 @@ def create(vm_): manager = packet.Manager(auth_token=vm_["token"]) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "requesting", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -404,7 +404,7 @@ def create(vm_): vm_["private_key"] = key_filename # Bootstrap! - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update({"device": device.__dict__}) @@ -438,11 +438,11 @@ def create(vm_): log.debug("'%s' VM creation details:\n%s", name, pprint.pformat(device.__dict__)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(name), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -577,7 +577,7 @@ def destroy(name, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -603,7 +603,7 @@ def destroy(name, call=None): manager.call_api("devices/{id}".format(id=node["id"]), type="DELETE") - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), diff --git a/salt/cloud/clouds/parallels.py b/salt/cloud/clouds/parallels.py index 4b65ddd9c8ae..7f56f012bd4b 100644 --- a/salt/cloud/clouds/parallels.py +++ b/salt/cloud/clouds/parallels.py @@ -246,12 +246,12 @@ def create_node(vm_): data = ET.tostring(content, encoding="UTF-8") - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), args={ - "kwargs": __utils__["cloud.filter_event"]("requesting", data, list(data)), + "kwargs": salt.utils.cloud.filter_event("requesting", data, list(data)), }, sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], @@ -281,11 +281,11 @@ def create(vm_): except AttributeError: pass - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -347,16 +347,16 @@ def __query_node_data(vm_name): public_ip = comps[0] vm_["ssh_host"] = public_ip - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) log.info("Created Cloud VM '%s'", vm_["name"]) log.debug("'%s' VM creation details:\n%s", vm_["name"], pprint.pformat(data)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -489,7 +489,7 @@ def show_instance(name, call=None): for child in children: ret[item.tag][child.tag] = child.attrib - __utils__["cloud.cache_node"](ret, _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(ret, _get_active_provider_name(), __opts__) return ret @@ -523,7 +523,7 @@ def destroy(name, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -543,7 +543,7 @@ def destroy(name, call=None): if "error" in data: return data["error"] - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -553,7 +553,7 @@ def destroy(name, call=None): ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) diff --git a/salt/cloud/clouds/profitbricks.py b/salt/cloud/clouds/profitbricks.py index 2dfbcda5571c..2dc614ce7d58 100644 --- a/salt/cloud/clouds/profitbricks.py +++ b/salt/cloud/clouds/profitbricks.py @@ -585,7 +585,7 @@ def list_nodes_full(conn=None, call=None): ret[node["name"]] = node - __utils__["cloud.cache_node_list"]( + salt.utils.cloud.cache_node_list( ret, _get_active_provider_name().split(":")[0], __opts__ ) @@ -634,7 +634,7 @@ def show_instance(name, call=None): ) nodes = list_nodes_full() - __utils__["cloud.cache_node"](nodes[name], _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(nodes[name], _get_active_provider_name(), __opts__) return nodes[name] @@ -753,11 +753,11 @@ def get_key_filename(vm_): def signal_event(vm_, event, description): - args = __utils__["cloud.filter_event"]( + args = salt.utils.cloud.filter_event( event, vm_, ["name", "profile", "provider", "driver"] ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", description, "salt/cloud/{}/creating".format(vm_["name"]), @@ -910,7 +910,7 @@ def __query_node_data(vm_, data): if "ssh_host" in vm_: vm_["key_filename"] = get_key_filename(vm_) - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update(data) return ret else: @@ -938,7 +938,7 @@ def destroy(name, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -969,7 +969,7 @@ def destroy(name, call=None): conn.delete_volume(datacenter_id=datacenter_id, volume_id=vol["id"]) log.debug("Deleted volume %s", vol["id"]) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -979,7 +979,7 @@ def destroy(name, call=None): ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) diff --git a/salt/cloud/clouds/proxmox.py b/salt/cloud/clouds/proxmox.py index 8f59aab6ccbc..2b156699f4aa 100644 --- a/salt/cloud/clouds/proxmox.py +++ b/salt/cloud/clouds/proxmox.py @@ -626,11 +626,11 @@ def create(vm_): ret = {} - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -738,17 +738,17 @@ def create(vm_): vm_["ssh_host"] = ip_address vm_["password"] = ssh_password - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) # Report success! log.info("Created Cloud VM '%s'", vm_["name"]) log.debug("'%s' VM creation details:\n%s", vm_["name"], pprint.pformat(data)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -1010,12 +1010,12 @@ def create_node(vm_, newid): newnode[prop] = vm_[prop] # The node is ready. Lets request it to be added - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), args={ - "kwargs": __utils__["cloud.filter_event"]( + "kwargs": salt.utils.cloud.filter_event( "requesting", newnode, list(newnode) ), }, @@ -1060,7 +1060,7 @@ def show_instance(name, call=None): ) nodes = list_nodes_full() - __utils__["cloud.cache_node"](nodes[name], _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(nodes[name], _get_active_provider_name(), __opts__) return nodes[name] @@ -1145,7 +1145,7 @@ def destroy(name, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -1169,7 +1169,7 @@ def destroy(name, call=None): time.sleep(3) query("delete", "nodes/{}/{}".format(vmobj["node"], vmobj["id"])) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -1178,7 +1178,7 @@ def destroy(name, call=None): transport=__opts__["transport"], ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) diff --git a/salt/cloud/clouds/qingcloud.py b/salt/cloud/clouds/qingcloud.py index b684f6bc9d8a..28bd14d98dee 100644 --- a/salt/cloud/clouds/qingcloud.py +++ b/salt/cloud/clouds/qingcloud.py @@ -520,7 +520,7 @@ def list_nodes_full(call=None): provider = comps[0] __opts__["update_cachedir"] = True - __utils__["cloud.cache_node_list"](result, provider, __opts__) + salt.utils.cloud.cache_node_list(result, provider, __opts__) return result @@ -675,11 +675,11 @@ def create(vm_): except AttributeError: pass - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -700,14 +700,12 @@ def create(vm_): "login_keypair": vm_["login_keypair"], } - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), args={ - "kwargs": __utils__["cloud.filter_event"]( - "requesting", params, list(params) - ), + "kwargs": salt.utils.cloud.filter_event("requesting", params, list(params)), }, sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], @@ -743,17 +741,17 @@ def create(vm_): vm_["ssh_host"] = private_ip # The instance is booted and accessible, let's Salt it! - __utils__["cloud.bootstrap"](vm_, __opts__) + salt.utils.cloud.bootstrap(vm_, __opts__) log.info("Created Cloud VM '%s'", vm_["name"]) log.debug("'%s' VM creation details:\n%s", vm_["name"], pprint.pformat(data)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -875,7 +873,7 @@ def destroy(instance_id, call=None): instance_data = show_instance(instance_id, call="action") name = instance_data["instance_name"] - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -891,7 +889,7 @@ def destroy(instance_id, call=None): } result = query(params) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), diff --git a/salt/cloud/clouds/saltify.py b/salt/cloud/clouds/saltify.py index bb3ab1d48c21..72bd6e042f60 100644 --- a/salt/cloud/clouds/saltify.py +++ b/salt/cloud/clouds/saltify.py @@ -22,6 +22,7 @@ import salt.client import salt.config as config import salt.utils.cloud +import salt.utils.smb from salt._compat import ipaddress from salt.exceptions import SaltCloudException, SaltCloudSystemExit @@ -312,7 +313,7 @@ def create(vm_): log.info("delaying %d seconds for boot", sleep_time) time.sleep(sleep_time) log.info("Provisioning existing machine %s", vm_["name"]) - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) else: ret = _verify(vm_) @@ -358,7 +359,7 @@ def _verify(vm_): # Test SMB connection try: log.debug("Testing SMB protocol for %s", vm_["name"]) - if __utils__["smb.get_conn"](**kwargs) is False: + if salt.utils.smb.get_conn(**kwargs) is False: return False except (smbSessionError, smb3SessionError) as exc: log.error("Exception: %s", exc) @@ -382,7 +383,7 @@ def _verify(vm_): try: log.debug("Testing WinRM protocol for %s", vm_["name"]) - return __utils__["cloud.wait_for_winrm"](**kwargs) is not None + return salt.utils.cloud.wait_for_winrm(**kwargs) is not None except ( ConnectionError, ConnectTimeout, @@ -429,7 +430,7 @@ def _verify(vm_): log.debug("Testing SSH protocol for %s", vm_["name"]) try: - return __utils__["cloud.wait_for_passwd"](**kwargs) is True + return salt.utils.cloud.wait_for_passwd(**kwargs) is True except SaltCloudException as exc: log.error("Exception: %s", exc) return False @@ -463,7 +464,7 @@ def destroy(name, call=None): opts = __opts__ - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -509,7 +510,7 @@ def destroy(name, call=None): if ret and ret[name]: log.info("system.shutdown for minion %s successful", name) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), diff --git a/salt/cloud/clouds/scaleway.py b/salt/cloud/clouds/scaleway.py index 9b412181c017..7a71cedd7415 100644 --- a/salt/cloud/clouds/scaleway.py +++ b/salt/cloud/clouds/scaleway.py @@ -28,6 +28,7 @@ import salt.config as config import salt.utils.cloud +import salt.utils.http import salt.utils.json from salt.exceptions import ( SaltCloudConfigError, @@ -198,11 +199,11 @@ def create(server_): except AttributeError: pass - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(server_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", server_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -237,14 +238,12 @@ def create(server_): "commercial_type": commercial_type, } - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(server_["name"]), args={ - "kwargs": __utils__["cloud.filter_event"]( - "requesting", kwargs, list(kwargs) - ), + "kwargs": salt.utils.cloud.filter_event("requesting", kwargs, list(kwargs)), }, sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], @@ -294,7 +293,7 @@ def __query_node_data(server_name): server_["ssh_host"] = data["public_ip"]["address"] server_["ssh_password"] = ssh_password server_["key_filename"] = key_filename - ret = __utils__["cloud.bootstrap"](server_, __opts__) + ret = salt.utils.cloud.bootstrap(server_, __opts__) ret.update(data) @@ -305,11 +304,11 @@ def __query_node_data(server_name): pprint.pformat(data), ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(server_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", server_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -361,7 +360,7 @@ def query( data = salt.utils.json.dumps(args) - request = __utils__["http.query"]( + request = salt.utils.http.query( path, method=http_method, data=data, @@ -403,7 +402,7 @@ def show_instance(name, call=None): "The show_instance action must be called with -a or --action." ) node = _get_node(name) - __utils__["cloud.cache_node"](node, _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(node, _get_active_provider_name(), __opts__) return node @@ -436,7 +435,7 @@ def destroy(name, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -454,7 +453,7 @@ def destroy(name, call=None): http_method="POST", ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -464,7 +463,7 @@ def destroy(name, call=None): ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) diff --git a/salt/cloud/clouds/softlayer.py b/salt/cloud/clouds/softlayer.py index 188669c0cfd1..423448d80044 100644 --- a/salt/cloud/clouds/softlayer.py +++ b/salt/cloud/clouds/softlayer.py @@ -266,11 +266,11 @@ def create(vm_): name = ".".join([name, domain]) vm_["name"] = name - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(name), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -392,14 +392,12 @@ def create(vm_): if dedicated_host_id: kwargs["dedicatedHost"] = {"id": dedicated_host_id} - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(name), args={ - "kwargs": __utils__["cloud.filter_event"]( - "requesting", kwargs, list(kwargs) - ), + "kwargs": salt.utils.cloud.filter_event("requesting", kwargs, list(kwargs)), }, sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], @@ -506,15 +504,15 @@ def get_credentials(): vm_["ssh_host"] = ip_address vm_["password"] = passwd - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update(response) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(name), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -539,7 +537,7 @@ def list_nodes_full(mask="mask[id]", call=None): for node_id in response: hostname = node_id["hostname"] ret[hostname] = node_id - __utils__["cloud.cache_node_list"]( + salt.utils.cloud.cache_node_list( ret, _get_active_provider_name().split(":")[0], __opts__ ) return ret @@ -598,7 +596,7 @@ def show_instance(name, call=None): ) nodes = list_nodes_full() - __utils__["cloud.cache_node"](nodes[name], _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(nodes[name], _get_active_provider_name(), __opts__) return nodes[name] @@ -617,7 +615,7 @@ def destroy(name, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -630,7 +628,7 @@ def destroy(name, call=None): conn = get_conn() response = conn.deleteObject(id=node["id"]) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -639,7 +637,7 @@ def destroy(name, call=None): transport=__opts__["transport"], ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) diff --git a/salt/cloud/clouds/softlayer_hw.py b/salt/cloud/clouds/softlayer_hw.py index 1cca56865d50..e5472ece611b 100644 --- a/salt/cloud/clouds/softlayer_hw.py +++ b/salt/cloud/clouds/softlayer_hw.py @@ -238,11 +238,11 @@ def create(vm_): name = ".".join([name, domain]) vm_["name"] = name - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(name), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -308,14 +308,12 @@ def create(vm_): if location: kwargs["location"] = location - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(name), args={ - "kwargs": __utils__["cloud.filter_event"]( - "requesting", kwargs, list(kwargs) - ), + "kwargs": salt.utils.cloud.filter_event("requesting", kwargs, list(kwargs)), }, sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], @@ -399,15 +397,15 @@ def get_passwd(): vm_["ssh_host"] = ip_address vm_["password"] = passwd - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update(response) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(name), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -435,7 +433,7 @@ def list_nodes_full( for node in response: ret[node["hostname"]] = node - __utils__["cloud.cache_node_list"]( + salt.utils.cloud.cache_node_list( ret, _get_active_provider_name().split(":")[0], __opts__ ) return ret @@ -492,7 +490,7 @@ def show_instance(name, call=None): ) nodes = list_nodes_full() - __utils__["cloud.cache_node"](nodes[name], _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(nodes[name], _get_active_provider_name(), __opts__) return nodes[name] @@ -511,7 +509,7 @@ def destroy(name, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -532,7 +530,7 @@ def destroy(name, call=None): } ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -541,7 +539,7 @@ def destroy(name, call=None): transport=__opts__["transport"], ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) diff --git a/salt/cloud/clouds/tencentcloud.py b/salt/cloud/clouds/tencentcloud.py index 5611b0524ab0..21bd20cedc28 100644 --- a/salt/cloud/clouds/tencentcloud.py +++ b/salt/cloud/clouds/tencentcloud.py @@ -363,7 +363,7 @@ def list_nodes_full(call=None): provider = comps[0] __opts__["update_cachedir"] = True - __utils__["cloud.cache_node_list"](ret, provider, __opts__) + salt.utils.cloud.cache_node_list(ret, provider, __opts__) return ret @@ -453,11 +453,11 @@ def create(vm_): except AttributeError: pass - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -535,11 +535,11 @@ def create(vm_): if system_disk_type: req.SystemDisk["DiskType"] = system_disk_type - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), - args=__utils__["cloud.filter_event"]("requesting", vm_, list(vm_)), + args=salt.utils.cloud.filter_event("requesting", vm_, list(vm_)), sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], ) @@ -602,16 +602,16 @@ def __query_node_data(vm_name): vm_["ssh_host"] = ssh_ip # The instance is booted and accessible, let's Salt it! - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update(data) log.debug("'%s' instance creation details:\n%s", vm_["name"], pprint.pformat(data)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -711,7 +711,7 @@ def destroy(name, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -727,7 +727,7 @@ def destroy(name, call=None): req.InstanceIds = [node.InstanceId] resp = client.TerminateInstances(req) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), diff --git a/salt/cloud/clouds/vagrant.py b/salt/cloud/clouds/vagrant.py index 836ea44badd5..0856b232f964 100644 --- a/salt/cloud/clouds/vagrant.py +++ b/salt/cloud/clouds/vagrant.py @@ -265,7 +265,7 @@ def create(vm_): name, vm_["ssh_host"], ) - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) return ret @@ -297,7 +297,7 @@ def destroy(name, call=None): opts = __opts__ - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -314,7 +314,7 @@ def destroy(name, call=None): ret = local.cmd(host, "vagrant.destroy", [name]) if ret[host]: - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -324,7 +324,7 @@ def destroy(name, call=None): ) if opts.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], opts ) diff --git a/salt/cloud/clouds/virtualbox.py b/salt/cloud/clouds/virtualbox.py index a5b6b87380e6..15591db274ef 100644 --- a/salt/cloud/clouds/virtualbox.py +++ b/salt/cloud/clouds/virtualbox.py @@ -19,6 +19,7 @@ import logging import salt.config as config +import salt.utils.cloud from salt.exceptions import SaltCloudSystemExit try: @@ -187,11 +188,11 @@ def create(vm_info): ) log.debug("Going to fire event: starting create") - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_info["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_info, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -205,11 +206,11 @@ def create(vm_info): "clone_mode": clone_mode, } - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_info["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "requesting", request_kwargs, list(request_kwargs) ), sock_dir=__opts__["sock_dir"], @@ -232,14 +233,14 @@ def create(vm_info): vm_info["key_filename"] = key_filename vm_info["ssh_host"] = ip - res = __utils__["cloud.bootstrap"](vm_info, __opts__) + res = salt.utils.cloud.bootstrap(vm_info, __opts__) vm_result.update(res) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created machine", "salt/cloud/{}/created".format(vm_info["name"]), - args=__utils__["cloud.filter_event"]("created", vm_result, list(vm_result)), + args=salt.utils.cloud.filter_event("created", vm_result, list(vm_result)), sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], ) @@ -328,7 +329,7 @@ def list_nodes(kwargs=None, call=None): "private_ips", "public_ips", ] - return __utils__["cloud.list_nodes_select"]( + return salt.utils.cloud.list_nodes_select( list_nodes_full("function"), attributes, call, @@ -339,7 +340,7 @@ def list_nodes_select(call=None): """ Return a list of the VMs that are on the provider, with select fields """ - return __utils__["cloud.list_nodes_select"]( + return salt.utils.cloud.list_nodes_select( list_nodes_full("function"), __opts__["query.selection"], call, @@ -369,7 +370,7 @@ def destroy(name, call=None): if not vb_machine_exists(name): return "{} doesn't exist and can't be deleted".format(name) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -380,7 +381,7 @@ def destroy(name, call=None): vb_destroy_machine(name) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), diff --git a/salt/cloud/clouds/vmware.py b/salt/cloud/clouds/vmware.py index b0b3edf9c08b..27a1cd95c369 100644 --- a/salt/cloud/clouds/vmware.py +++ b/salt/cloud/clouds/vmware.py @@ -2653,7 +2653,7 @@ def destroy(name, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -2699,7 +2699,7 @@ def destroy(name, call=None): ) return "failed to destroy" - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -2708,7 +2708,7 @@ def destroy(name, call=None): transport=__opts__["transport"], ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) @@ -2744,11 +2744,11 @@ def create(vm_): except AttributeError: pass - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -3002,11 +3002,11 @@ def create(vm_): del event_kwargs["password"] try: - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "requesting", event_kwargs, list(event_kwargs) ), sock_dir=__opts__["sock_dir"], @@ -3077,18 +3077,18 @@ def create(vm_): vm_["ssh_host"] = ip log.info("[ %s ] Deploying to %s", vm_name, vm_["ssh_host"]) - out = __utils__["cloud.bootstrap"](vm_, __opts__) + out = salt.utils.cloud.bootstrap(vm_, __opts__) data = show_instance(vm_name, call="action") if deploy and isinstance(out, dict): data["deploy_kwargs"] = out.get("deploy_kwargs", {}) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -3262,11 +3262,11 @@ def create(vm_): del event_kwargs["password"] try: - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "requesting", event_kwargs, list(event_kwargs) ), sock_dir=__opts__["sock_dir"], @@ -3355,18 +3355,18 @@ def create(vm_): vm_["ssh_host"] = ip log.info("[ %s ] Deploying to %s", vm_name, vm_["ssh_host"]) - out = __utils__["cloud.bootstrap"](vm_, __opts__) + out = salt.utils.cloud.bootstrap(vm_, __opts__) data = show_instance(vm_name, call="action") if deploy and isinstance(out, dict): data["deploy_kwargs"] = out.get("deploy_kwargs", {}) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], diff --git a/salt/cloud/clouds/vultrpy.py b/salt/cloud/clouds/vultrpy.py index a67f23a292a5..67dfe28f3fac 100644 --- a/salt/cloud/clouds/vultrpy.py +++ b/salt/cloud/clouds/vultrpy.py @@ -82,6 +82,8 @@ import urllib.parse import salt.config as config +import salt.utils.cloud +import salt.utils.http from salt.exceptions import SaltCloudConfigError, SaltCloudSystemExit # Get logging started @@ -263,7 +265,7 @@ def list_nodes_select(conn=None, call=None): """ Return a list of the VMs that are on the provider, with select fields """ - return __utils__["cloud.list_nodes_select"]( + return salt.utils.cloud.list_nodes_select( list_nodes_full(), __opts__["query.selection"], call, @@ -318,7 +320,7 @@ def show_instance(name, call=None): # Find under which cloud service the name is listed, if any if name not in nodes: return {} - __utils__["cloud.cache_node"](nodes[name], _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(nodes[name], _get_active_provider_name(), __opts__) return nodes[name] @@ -402,11 +404,11 @@ def create(vm_): else: enable_private_network = "no" - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "creating", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -447,14 +449,12 @@ def create(vm_): log.info("Creating Cloud VM %s", vm_["name"]) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(vm_["name"]), args={ - "kwargs": __utils__["cloud.filter_event"]( - "requesting", kwargs, list(kwargs) - ), + "kwargs": salt.utils.cloud.filter_event("requesting", kwargs, list(kwargs)), }, sock_dir=__opts__["sock_dir"], transport=__opts__["transport"], @@ -475,7 +475,7 @@ def create(vm_): "invalid location, image, or size." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "instance request failed", "salt/cloud/{}/requesting/failed".format(vm_["name"]), @@ -494,7 +494,7 @@ def create(vm_): # Show the traceback if the debug logging level is enabled exc_info_on_loglevel=logging.DEBUG, ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "instance request failed", "salt/cloud/{}/requesting/failed".format(vm_["name"]), @@ -552,25 +552,25 @@ def wait_for_server_state(): return False return data["default_password"] - vm_["ssh_host"] = __utils__["cloud.wait_for_fun"]( + vm_["ssh_host"] = salt.utils.cloud.wait_for_fun( wait_for_hostname, timeout=config.get_cloud_config_value( "wait_for_fun_timeout", vm_, __opts__, default=15 * 60 ), ) - vm_["password"] = __utils__["cloud.wait_for_fun"]( + vm_["password"] = salt.utils.cloud.wait_for_fun( wait_for_default_password, timeout=config.get_cloud_config_value( "wait_for_fun_timeout", vm_, __opts__, default=15 * 60 ), ) - __utils__["cloud.wait_for_fun"]( + salt.utils.cloud.wait_for_fun( wait_for_status, timeout=config.get_cloud_config_value( "wait_for_fun_timeout", vm_, __opts__, default=15 * 60 ), ) - __utils__["cloud.wait_for_fun"]( + salt.utils.cloud.wait_for_fun( wait_for_server_state, timeout=config.get_cloud_config_value( "wait_for_fun_timeout", vm_, __opts__, default=15 * 60 @@ -586,18 +586,18 @@ def wait_for_server_state(): ) # Bootstrap - ret = __utils__["cloud.bootstrap"](vm_, __opts__) + ret = salt.utils.cloud.bootstrap(vm_, __opts__) ret.update(show_instance(vm_["name"], call="action")) log.info("Created Cloud VM '%s'", vm_["name"]) log.debug("'%s' VM creation details:\n%s", vm_["name"], pprint.pformat(data)) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(vm_["name"]), - args=__utils__["cloud.filter_event"]( + args=salt.utils.cloud.filter_event( "created", vm_, ["name", "profile", "provider", "driver"] ), sock_dir=__opts__["sock_dir"], @@ -633,7 +633,7 @@ def _query(path, method="GET", data=None, params=None, header_dict=None, decode= if header_dict is None: header_dict = {} - result = __utils__["http.query"]( + result = salt.utils.http.query( url, method=method, params=params, diff --git a/salt/cloud/clouds/xen.py b/salt/cloud/clouds/xen.py index 878f74f2a7ad..8e876fb26cff 100644 --- a/salt/cloud/clouds/xen.py +++ b/salt/cloud/clouds/xen.py @@ -328,7 +328,7 @@ def list_nodes_full(session=None): log.debug("ret: %s", ret) log.debug("provider: %s", provider) log.debug("__opts__: %s", __opts__) - __utils__["cloud.cache_node_list"](ret, provider, __opts__) + salt.utils.cloud.cache_node_list(ret, provider, __opts__) return ret @@ -488,7 +488,7 @@ def show_instance(name, session=None, call=None): "public_ips": None, } - __utils__["cloud.cache_node"](ret, _get_active_provider_name(), __opts__) + salt.utils.cloud.cache_node(ret, _get_active_provider_name(), __opts__) return ret @@ -547,7 +547,7 @@ def create(vm_): ret = {} # fire creating event - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "starting create", "salt/cloud/{}/creating".format(name), @@ -556,7 +556,7 @@ def create(vm_): transport=__opts__["transport"], ) log.debug("Adding %s to cloud cache.", name) - __utils__["cloud.cachedir_index_add"]( + salt.utils.cloud.cachedir_index_add( vm_["name"], vm_["profile"], "xen", vm_["driver"] ) @@ -577,7 +577,7 @@ def create(vm_): log.debug("Clone: %s ", clone) # fire event to read new vm properties (requesting) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "requesting instance", "salt/cloud/{}/requesting".format(name), @@ -620,7 +620,7 @@ def create(vm_): ret = show_instance(name) ret.update({"extra": record}) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "created instance", "salt/cloud/{}/created".format(name), @@ -644,7 +644,7 @@ def _deploy_salt_minion(name, session, vm_): # Bootstrap Salt minion! if vm_["ssh_host"] is not None: log.info("Installing Salt minion on %s", name) - boot_ret = __utils__["cloud.bootstrap"](vm_, __opts__) + boot_ret = salt.utils.cloud.bootstrap(vm_, __opts__) log.debug("boot return: %s", boot_ret) @@ -981,7 +981,7 @@ def destroy(name=None, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) ret = {} - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -1006,7 +1006,7 @@ def destroy(name=None, call=None): task = session.xenapi.Async.VM.destroy(vm) _run_async_task(task, session) ret["destroyed"] = True - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -1015,10 +1015,10 @@ def destroy(name=None, call=None): transport=__opts__["transport"], ) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, _get_active_provider_name().split(":")[0], __opts__ ) - __utils__["cloud.cachedir_index_del"](name) + salt.utils.cloud.cachedir_index_del(name) return ret diff --git a/salt/cloud/libcloudfuncs.py b/salt/cloud/libcloudfuncs.py index ed67934b1c7c..c8bdd5f7ce63 100644 --- a/salt/cloud/libcloudfuncs.py +++ b/salt/cloud/libcloudfuncs.py @@ -73,7 +73,7 @@ def get_node(conn, name): nodes = conn.list_nodes() for node in nodes: if node.name == name: - __utils__["cloud.cache_node"]( + salt.utils.cloud.cache_node( salt.utils.data.simple_types_filter(node.__dict__), __active_provider_name__, __opts__, @@ -254,7 +254,7 @@ def destroy(name, conn=None, call=None): "The destroy action must be called with -d, --destroy, -a or --action." ) - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroying instance", "salt/cloud/{}/destroying".format(name), @@ -293,7 +293,7 @@ def destroy(name, conn=None, call=None): if ret: log.info("Destroyed VM: %s", name) # Fire destroy action - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "destroyed instance", "salt/cloud/{}/destroyed".format(name), @@ -311,7 +311,7 @@ def destroy(name, conn=None, call=None): salt.utils.cloud.remove_sshkey(private_ips[0]) if __opts__.get("update_cachedir", False) is True: - __utils__["cloud.delete_minion_cachedir"]( + salt.utils.cloud.delete_minion_cachedir( name, __active_provider_name__.split(":")[0], __opts__ ) @@ -336,7 +336,7 @@ def reboot(name, conn=None): if ret: log.info("Rebooted VM: %s", name) # Fire reboot action - __utils__["cloud.fire_event"]( + salt.utils.cloud.fire_event( "event", "{} has been rebooted".format(name), "salt/cloud/{}/rebooting".format(name), @@ -398,7 +398,7 @@ def list_nodes_full(conn=None, call=None): ret[node.name] = pairs del ret[node.name]["driver"] - __utils__["cloud.cache_node_list"]( + salt.utils.cloud.cache_node_list( ret, __active_provider_name__.split(":")[0], __opts__ ) return ret @@ -428,7 +428,7 @@ def show_instance(name, call=None): ) nodes = list_nodes_full() - __utils__["cloud.cache_node"](nodes[name], __active_provider_name__, __opts__) + salt.utils.cloud.cache_node(nodes[name], __active_provider_name__, __opts__) return nodes[name] diff --git a/salt/fileserver/s3fs.py b/salt/fileserver/s3fs.py index ac1c8e415973..8746015ca882 100644 --- a/salt/fileserver/s3fs.py +++ b/salt/fileserver/s3fs.py @@ -90,6 +90,7 @@ import salt.utils.files import salt.utils.gzip_util import salt.utils.hashutils +import salt.utils.s3 import salt.utils.versions log = logging.getLogger(__name__) @@ -420,7 +421,7 @@ def _refresh_buckets_cache_file(cache_file): def __get_s3_meta(bucket, key=key, keyid=keyid): ret, marker = [], "" while True: - tmp = __utils__["s3.query"]( + tmp = salt.utils.s3.query( key=key, keyid=keyid, kms_keyid=keyid, @@ -732,7 +733,7 @@ def _get_file_from_s3(metadata, saltenv, bucket_name, path, cached_file_path): "cached file mtime later than metadata last " "modification time." ) - ret = __utils__["s3.query"]( + ret = salt.utils.s3.query( key=key, keyid=keyid, kms_keyid=keyid, @@ -771,7 +772,7 @@ def _get_file_from_s3(metadata, saltenv, bucket_name, path, cached_file_path): return # ... or get the file from S3 - __utils__["s3.query"]( + salt.utils.s3.query( key=key, keyid=keyid, kms_keyid=keyid, diff --git a/salt/grains/zfs.py b/salt/grains/zfs.py index e903d010832a..dc35354703c5 100644 --- a/salt/grains/zfs.py +++ b/salt/grains/zfs.py @@ -53,7 +53,7 @@ def _zfs_pool_data(): grains = {} # collect zpool data - zpool_list_cmd = __utils__["zfs.zpool_command"]( + zpool_list_cmd = salt.utils.zfs.zpool_command( "list", flags=["-H"], opts={"-o": "name,size"}, @@ -62,7 +62,7 @@ def _zfs_pool_data(): if "zpool" not in grains: grains["zpool"] = {} zpool = zpool.split() - grains["zpool"][zpool[0]] = __utils__["zfs.to_size"](zpool[1], False) + grains["zpool"][zpool[0]] = salt.utils.zfs.to_size(zpool[1], False) # return grain data return grains @@ -73,8 +73,8 @@ def zfs(): Provide grains for zfs/zpool """ grains = {} - grains["zfs_support"] = __utils__["zfs.is_supported"]() - grains["zfs_feature_flags"] = __utils__["zfs.has_feature_flags"]() + grains["zfs_support"] = salt.utils.zfs.is_supported() + grains["zfs_feature_flags"] = salt.utils.zfs.has_feature_flags() if grains["zfs_support"]: grains = salt.utils.dictupdate.update( grains, _zfs_pool_data(), merge_lists=True diff --git a/salt/modules/arista_pyeapi.py b/salt/modules/arista_pyeapi.py index 1dbd27fd8722..4b846783c4ae 100644 --- a/salt/modules/arista_pyeapi.py +++ b/salt/modules/arista_pyeapi.py @@ -92,6 +92,7 @@ import difflib import logging +import salt.utils.args from salt.exceptions import CommandExecutionError from salt.utils.args import clean_kwargs @@ -159,7 +160,7 @@ def _prepare_connection(**kwargs): """ pyeapi_kwargs = __salt__["config.get"]("pyeapi", {}) pyeapi_kwargs.update(kwargs) # merge the CLI args with the opts/pillar - init_kwargs, fun_kwargs = __utils__["args.prepare_kwargs"]( + init_kwargs, fun_kwargs = salt.utils.args.prepare_kwargs( pyeapi_kwargs, PYEAPI_INIT_KWARGS ) if "transport" not in init_kwargs: diff --git a/salt/modules/azurearm_compute.py b/salt/modules/azurearm_compute.py index e10b3d8778e4..e1e2e6bfd35e 100644 --- a/salt/modules/azurearm_compute.py +++ b/salt/modules/azurearm_compute.py @@ -116,7 +116,7 @@ def availability_set_create_or_update( return False kwargs["location"] = rg_props["location"] - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) # Use VM names to link to the IDs of existing VMs. if isinstance(kwargs.get("virtual_machines"), list): @@ -130,7 +130,7 @@ def availability_set_create_or_update( kwargs["virtual_machines"] = vm_list try: - setmodel = __utils__["azurearm.create_object_model"]( + setmodel = salt.utils.azurearm.create_object_model( "compute", "AvailabilitySet", **kwargs ) except TypeError as exc: @@ -146,7 +146,7 @@ def availability_set_create_or_update( result = av_set.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -176,7 +176,7 @@ def availability_set_delete(name, resource_group, **kwargs): """ result = False - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: compconn.availability_sets.delete( resource_group_name=resource_group, availability_set_name=name @@ -184,7 +184,7 @@ def availability_set_delete(name, resource_group, **kwargs): result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) return result @@ -208,7 +208,7 @@ def availability_set_get(name, resource_group, **kwargs): salt-call azurearm_compute.availability_set_get testset testgroup """ - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: av_set = compconn.availability_sets.get( resource_group_name=resource_group, availability_set_name=name @@ -216,7 +216,7 @@ def availability_set_get(name, resource_group, **kwargs): result = av_set.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -240,16 +240,16 @@ def availability_sets_list(resource_group, **kwargs): """ result = {} - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: - avail_sets = __utils__["azurearm.paged_object_to_list"]( + avail_sets = salt.utils.azurearm.paged_object_to_list( compconn.availability_sets.list(resource_group_name=resource_group) ) for avail_set in avail_sets: result[avail_set["name"]] = avail_set except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -279,9 +279,9 @@ def availability_sets_list_available_sizes( """ result = {} - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: - sizes = __utils__["azurearm.paged_object_to_list"]( + sizes = salt.utils.azurearm.paged_object_to_list( compconn.availability_sets.list_available_sizes( resource_group_name=resource_group, availability_set_name=name ) @@ -290,7 +290,7 @@ def availability_sets_list_available_sizes( for size in sizes: result[size["name"]] = size except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -329,7 +329,7 @@ def virtual_machine_capture( azure.mgmt.compute.models, "VirtualMachineCaptureParameters" ) - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: # pylint: disable=invalid-name vm = compconn.virtual_machines.capture( @@ -345,7 +345,7 @@ def virtual_machine_capture( vm_result = vm.result() result = vm_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -373,7 +373,7 @@ def virtual_machine_get(name, resource_group, **kwargs): """ expand = kwargs.get("expand") - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: # pylint: disable=invalid-name vm = compconn.virtual_machines.get( @@ -381,7 +381,7 @@ def virtual_machine_get(name, resource_group, **kwargs): ) result = vm.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -409,7 +409,7 @@ def virtual_machine_convert_to_managed_disks( salt-call azurearm_compute.virtual_machine_convert_to_managed_disks testvm testgroup """ - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: # pylint: disable=invalid-name vm = compconn.virtual_machines.convert_to_managed_disks( @@ -419,7 +419,7 @@ def virtual_machine_convert_to_managed_disks( vm_result = vm.result() result = vm_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -444,7 +444,7 @@ def virtual_machine_deallocate(name, resource_group, **kwargs): salt-call azurearm_compute.virtual_machine_deallocate testvm testgroup """ - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: # pylint: disable=invalid-name vm = compconn.virtual_machines.deallocate( @@ -454,7 +454,7 @@ def virtual_machine_deallocate(name, resource_group, **kwargs): vm_result = vm.result() result = vm_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -480,14 +480,14 @@ def virtual_machine_generalize(name, resource_group, **kwargs): """ result = False - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: compconn.virtual_machines.generalize( resource_group_name=resource_group, vm_name=name ) result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) return result @@ -510,15 +510,15 @@ def virtual_machines_list(resource_group, **kwargs): """ result = {} - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: - vms = __utils__["azurearm.paged_object_to_list"]( + vms = salt.utils.azurearm.paged_object_to_list( compconn.virtual_machines.list(resource_group_name=resource_group) ) for vm in vms: # pylint: disable=invalid-name result[vm["name"]] = vm except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -539,15 +539,15 @@ def virtual_machines_list_all(**kwargs): """ result = {} - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: - vms = __utils__["azurearm.paged_object_to_list"]( + vms = salt.utils.azurearm.paged_object_to_list( compconn.virtual_machines.list_all() ) for vm in vms: # pylint: disable=invalid-name result[vm["name"]] = vm except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -576,9 +576,9 @@ def virtual_machines_list_available_sizes( """ result = {} - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: - sizes = __utils__["azurearm.paged_object_to_list"]( + sizes = salt.utils.azurearm.paged_object_to_list( compconn.virtual_machines.list_available_sizes( resource_group_name=resource_group, vm_name=name ) @@ -586,7 +586,7 @@ def virtual_machines_list_available_sizes( for size in sizes: result[size["name"]] = size except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -611,7 +611,7 @@ def virtual_machine_power_off(name, resource_group, **kwargs): salt-call azurearm_compute.virtual_machine_power_off testvm testgroup """ - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: # pylint: disable=invalid-name vm = compconn.virtual_machines.power_off( @@ -621,7 +621,7 @@ def virtual_machine_power_off(name, resource_group, **kwargs): vm_result = vm.result() result = vm_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -646,7 +646,7 @@ def virtual_machine_restart(name, resource_group, **kwargs): salt-call azurearm_compute.virtual_machine_restart testvm testgroup """ - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: # pylint: disable=invalid-name vm = compconn.virtual_machines.restart( @@ -656,7 +656,7 @@ def virtual_machine_restart(name, resource_group, **kwargs): vm_result = vm.result() result = vm_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -681,7 +681,7 @@ def virtual_machine_start(name, resource_group, **kwargs): salt-call azurearm_compute.virtual_machine_start testvm testgroup """ - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: # pylint: disable=invalid-name vm = compconn.virtual_machines.start( @@ -691,7 +691,7 @@ def virtual_machine_start(name, resource_group, **kwargs): vm_result = vm.result() result = vm_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -716,7 +716,7 @@ def virtual_machine_redeploy(name, resource_group, **kwargs): salt-call azurearm_compute.virtual_machine_redeploy testvm testgroup """ - compconn = __utils__["azurearm.get_client"]("compute", **kwargs) + compconn = salt.utils.azurearm.get_client("compute", **kwargs) try: # pylint: disable=invalid-name vm = compconn.virtual_machines.redeploy( @@ -726,7 +726,7 @@ def virtual_machine_redeploy(name, resource_group, **kwargs): vm_result = vm.result() result = vm_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("compute", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("compute", str(exc), **kwargs) result = {"error": str(exc)} return result diff --git a/salt/modules/azurearm_dns.py b/salt/modules/azurearm_dns.py index 7f258ab3104e..61ff7f0a8605 100644 --- a/salt/modules/azurearm_dns.py +++ b/salt/modules/azurearm_dns.py @@ -117,10 +117,10 @@ def record_set_create_or_update(name, zone_name, resource_group, record_type, ** arecords='[{ipv4_address: 10.0.0.1}]' ttl=300 """ - dnsconn = __utils__["azurearm.get_client"]("dns", **kwargs) + dnsconn = salt.utils.azurearm.get_client("dns", **kwargs) try: - record_set_model = __utils__["azurearm.create_object_model"]( + record_set_model = salt.utils.azurearm.create_object_model( "dns", "RecordSet", **kwargs ) except TypeError as exc: @@ -139,7 +139,7 @@ def record_set_create_or_update(name, zone_name, resource_group, record_type, ** ) result = record_set.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("dns", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("dns", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -175,7 +175,7 @@ def record_set_delete(name, zone_name, resource_group, record_type, **kwargs): """ result = False - dnsconn = __utils__["azurearm.get_client"]("dns", **kwargs) + dnsconn = salt.utils.azurearm.get_client("dns", **kwargs) try: record_set = dnsconn.record_sets.delete( relative_record_set_name=name, @@ -186,7 +186,7 @@ def record_set_delete(name, zone_name, resource_group, record_type, **kwargs): ) result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("dns", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("dns", str(exc), **kwargs) return result @@ -215,7 +215,7 @@ def record_set_get(name, zone_name, resource_group, record_type, **kwargs): salt-call azurearm_dns.record_set_get '@' myzone testgroup SOA """ - dnsconn = __utils__["azurearm.get_client"]("dns", **kwargs) + dnsconn = salt.utils.azurearm.get_client("dns", **kwargs) try: record_set = dnsconn.record_sets.get( relative_record_set_name=name, @@ -226,7 +226,7 @@ def record_set_get(name, zone_name, resource_group, record_type, **kwargs): result = record_set.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("dns", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("dns", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -265,9 +265,9 @@ def record_sets_list_by_type( """ result = {} - dnsconn = __utils__["azurearm.get_client"]("dns", **kwargs) + dnsconn = salt.utils.azurearm.get_client("dns", **kwargs) try: - record_sets = __utils__["azurearm.paged_object_to_list"]( + record_sets = salt.utils.azurearm.paged_object_to_list( dnsconn.record_sets.list_by_type( zone_name=zone_name, resource_group_name=resource_group, @@ -280,7 +280,7 @@ def record_sets_list_by_type( for record_set in record_sets: result[record_set["name"]] = record_set except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("dns", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("dns", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -315,9 +315,9 @@ def record_sets_list_by_dns_zone( """ result = {} - dnsconn = __utils__["azurearm.get_client"]("dns", **kwargs) + dnsconn = salt.utils.azurearm.get_client("dns", **kwargs) try: - record_sets = __utils__["azurearm.paged_object_to_list"]( + record_sets = salt.utils.azurearm.paged_object_to_list( dnsconn.record_sets.list_by_dns_zone( zone_name=zone_name, resource_group_name=resource_group, @@ -329,7 +329,7 @@ def record_sets_list_by_dns_zone( for record_set in record_sets: result[record_set["name"]] = record_set except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("dns", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("dns", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -356,7 +356,7 @@ def zone_create_or_update(name, resource_group, **kwargs): # DNS zones are global objects kwargs["location"] = "global" - dnsconn = __utils__["azurearm.get_client"]("dns", **kwargs) + dnsconn = salt.utils.azurearm.get_client("dns", **kwargs) # Convert list of ID strings to list of dictionaries with id key. if isinstance(kwargs.get("registration_virtual_networks"), list): @@ -370,7 +370,7 @@ def zone_create_or_update(name, resource_group, **kwargs): ] try: - zone_model = __utils__["azurearm.create_object_model"]("dns", "Zone", **kwargs) + zone_model = salt.utils.azurearm.create_object_model("dns", "Zone", **kwargs) except TypeError as exc: result = {"error": "The object model could not be built. ({})".format(str(exc))} return result @@ -385,7 +385,7 @@ def zone_create_or_update(name, resource_group, **kwargs): ) result = zone.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("dns", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("dns", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -414,7 +414,7 @@ def zone_delete(name, resource_group, **kwargs): """ result = False - dnsconn = __utils__["azurearm.get_client"]("dns", **kwargs) + dnsconn = salt.utils.azurearm.get_client("dns", **kwargs) try: zone = dnsconn.zones.delete( zone_name=name, @@ -424,7 +424,7 @@ def zone_delete(name, resource_group, **kwargs): zone.wait() result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("dns", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("dns", str(exc), **kwargs) return result @@ -448,13 +448,13 @@ def zone_get(name, resource_group, **kwargs): salt-call azurearm_dns.zone_get myzone testgroup """ - dnsconn = __utils__["azurearm.get_client"]("dns", **kwargs) + dnsconn = salt.utils.azurearm.get_client("dns", **kwargs) try: zone = dnsconn.zones.get(zone_name=name, resource_group_name=resource_group) result = zone.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("dns", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("dns", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -481,9 +481,9 @@ def zones_list_by_resource_group(resource_group, top=None, **kwargs): """ result = {} - dnsconn = __utils__["azurearm.get_client"]("dns", **kwargs) + dnsconn = salt.utils.azurearm.get_client("dns", **kwargs) try: - zones = __utils__["azurearm.paged_object_to_list"]( + zones = salt.utils.azurearm.paged_object_to_list( dnsconn.zones.list_by_resource_group( resource_group_name=resource_group, top=top ) @@ -492,7 +492,7 @@ def zones_list_by_resource_group(resource_group, top=None, **kwargs): for zone in zones: result[zone["name"]] = zone except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("dns", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("dns", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -517,14 +517,14 @@ def zones_list(top=None, **kwargs): """ result = {} - dnsconn = __utils__["azurearm.get_client"]("dns", **kwargs) + dnsconn = salt.utils.azurearm.get_client("dns", **kwargs) try: - zones = __utils__["azurearm.paged_object_to_list"](dnsconn.zones.list(top=top)) + zones = salt.utils.azurearm.paged_object_to_list(dnsconn.zones.list(top=top)) for zone in zones: result[zone["name"]] = zone except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("dns", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("dns", str(exc), **kwargs) result = {"error": str(exc)} return result diff --git a/salt/modules/azurearm_network.py b/salt/modules/azurearm_network.py index 53200334ae63..f5ca9780df29 100644 --- a/salt/modules/azurearm_network.py +++ b/salt/modules/azurearm_network.py @@ -105,14 +105,14 @@ def check_dns_name_availability(name, region, **kwargs): salt-call azurearm_network.check_dns_name_availability testdnsname westus """ - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: check_dns_name = netconn.check_dns_name_availability( location=region, domain_name_label=name ) result = check_dns_name.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -143,7 +143,7 @@ def check_ip_address_availability( salt-call azurearm_network.check_ip_address_availability 10.0.0.4 testnet testgroup """ - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: check_ip = netconn.virtual_networks.check_ip_address_availability( resource_group_name=resource_group, @@ -152,7 +152,7 @@ def check_ip_address_availability( ) result = check_ip.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -258,15 +258,15 @@ def security_rules_list(security_group, resource_group, **kwargs): salt-call azurearm_network.security_rules_list testnsg testgroup """ - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: secrules = netconn.security_rules.list( network_security_group_name=security_group, resource_group_name=resource_group, ) - result = __utils__["azurearm.paged_object_to_list"](secrules) + result = salt.utils.azurearm.paged_object_to_list(secrules) except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -378,10 +378,10 @@ def security_rule_create_or_update( # pylint: disable=exec-used exec("{} = None".format(params[1])) - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - rulemodel = __utils__["azurearm.create_object_model"]( + rulemodel = salt.utils.azurearm.create_object_model( "network", "SecurityRule", name=name, @@ -414,7 +414,7 @@ def security_rule_create_or_update( secrule_result = secrule.result() result = secrule_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -447,7 +447,7 @@ def security_rule_delete(security_rule, security_group, resource_group, **kwargs """ result = False - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: secrule = netconn.security_rules.delete( network_security_group_name=security_group, @@ -457,7 +457,7 @@ def security_rule_delete(security_rule, security_group, resource_group, **kwargs secrule.wait() result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) return result @@ -484,7 +484,7 @@ def security_rule_get(security_rule, security_group, resource_group, **kwargs): salt-call azurearm_network.security_rule_get testrule1 testnsg testgroup """ - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: secrule = netconn.security_rules.get( network_security_group_name=security_group, @@ -493,7 +493,7 @@ def security_rule_get(security_rule, security_group, resource_group, **kwargs): ) result = secrule.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -530,10 +530,10 @@ def network_security_group_create_or_update( return False kwargs["location"] = rg_props["location"] - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - secgroupmodel = __utils__["azurearm.create_object_model"]( + secgroupmodel = salt.utils.azurearm.create_object_model( "network", "NetworkSecurityGroup", **kwargs ) except TypeError as exc: @@ -550,7 +550,7 @@ def network_security_group_create_or_update( secgroup_result = secgroup.result() result = secgroup_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -580,7 +580,7 @@ def network_security_group_delete(name, resource_group, **kwargs): """ result = False - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: secgroup = netconn.network_security_groups.delete( resource_group_name=resource_group, network_security_group_name=name @@ -588,7 +588,7 @@ def network_security_group_delete(name, resource_group, **kwargs): secgroup.wait() result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) return result @@ -612,14 +612,14 @@ def network_security_group_get(name, resource_group, **kwargs): salt-call azurearm_network.network_security_group_get testnsg testgroup """ - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: secgroup = netconn.network_security_groups.get( resource_group_name=resource_group, network_security_group_name=name ) result = secgroup.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -643,15 +643,15 @@ def network_security_groups_list(resource_group, **kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - secgroups = __utils__["azurearm.paged_object_to_list"]( + secgroups = salt.utils.azurearm.paged_object_to_list( netconn.network_security_groups.list(resource_group_name=resource_group) ) for secgroup in secgroups: result[secgroup["name"]] = secgroup except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -672,15 +672,15 @@ def network_security_groups_list_all(**kwargs): # pylint: disable=invalid-name """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - secgroups = __utils__["azurearm.paged_object_to_list"]( + secgroups = salt.utils.azurearm.paged_object_to_list( netconn.network_security_groups.list_all() ) for secgroup in secgroups: result[secgroup["name"]] = secgroup except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -706,9 +706,9 @@ def subnets_list(virtual_network, resource_group, **kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - subnets = __utils__["azurearm.paged_object_to_list"]( + subnets = salt.utils.azurearm.paged_object_to_list( netconn.subnets.list( resource_group_name=resource_group, virtual_network_name=virtual_network ) @@ -717,7 +717,7 @@ def subnets_list(virtual_network, resource_group, **kwargs): for subnet in subnets: result[subnet["name"]] = subnet except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -745,7 +745,7 @@ def subnet_get(name, virtual_network, resource_group, **kwargs): salt-call azurearm_network.subnet_get testsubnet testnet testgroup """ - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: subnet = netconn.subnets.get( resource_group_name=resource_group, @@ -755,7 +755,7 @@ def subnet_get(name, virtual_network, resource_group, **kwargs): result = subnet.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -788,7 +788,7 @@ def subnet_create_or_update( '10.0.0.0/24' testnet testgroup """ - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) # Use NSG name to link to the ID of an existing NSG. if kwargs.get("network_security_group"): @@ -809,7 +809,7 @@ def subnet_create_or_update( kwargs["route_table"] = {"id": str(rt_table["id"])} try: - snetmodel = __utils__["azurearm.create_object_model"]( + snetmodel = salt.utils.azurearm.create_object_model( "network", "Subnet", address_prefix=address_prefix, @@ -831,7 +831,7 @@ def subnet_create_or_update( sn_result = subnet.result() result = sn_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -864,7 +864,7 @@ def subnet_delete(name, virtual_network, resource_group, **kwargs): """ result = False - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: subnet = netconn.subnets.delete( resource_group_name=resource_group, @@ -874,7 +874,7 @@ def subnet_delete(name, virtual_network, resource_group, **kwargs): subnet.wait() result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) return result @@ -894,16 +894,16 @@ def virtual_networks_list_all(**kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - vnets = __utils__["azurearm.paged_object_to_list"]( + vnets = salt.utils.azurearm.paged_object_to_list( netconn.virtual_networks.list_all() ) for vnet in vnets: result[vnet["name"]] = vnet except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -927,16 +927,16 @@ def virtual_networks_list(resource_group, **kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - vnets = __utils__["azurearm.paged_object_to_list"]( + vnets = salt.utils.azurearm.paged_object_to_list( netconn.virtual_networks.list(resource_group_name=resource_group) ) for vnet in vnets: result[vnet["name"]] = vnet except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -981,13 +981,13 @@ def virtual_network_create_or_update(name, address_prefixes, resource_group, **k log.error("Address prefixes must be specified as a list!") return False - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) address_space = {"address_prefixes": address_prefixes} dhcp_options = {"dns_servers": kwargs.get("dns_servers")} try: - vnetmodel = __utils__["azurearm.create_object_model"]( + vnetmodel = salt.utils.azurearm.create_object_model( "network", "VirtualNetwork", address_space=address_space, @@ -1008,7 +1008,7 @@ def virtual_network_create_or_update(name, address_prefixes, resource_group, **k vnet_result = vnet.result() result = vnet_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -1038,7 +1038,7 @@ def virtual_network_delete(name, resource_group, **kwargs): """ result = False - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: vnet = netconn.virtual_networks.delete( virtual_network_name=name, resource_group_name=resource_group @@ -1046,7 +1046,7 @@ def virtual_network_delete(name, resource_group, **kwargs): vnet.wait() result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) return result @@ -1070,14 +1070,14 @@ def virtual_network_get(name, resource_group, **kwargs): salt-call azurearm_network.virtual_network_get testnet testgroup """ - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: vnet = netconn.virtual_networks.get( virtual_network_name=name, resource_group_name=resource_group ) result = vnet.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1098,16 +1098,16 @@ def load_balancers_list_all(**kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - load_balancers = __utils__["azurearm.paged_object_to_list"]( + load_balancers = salt.utils.azurearm.paged_object_to_list( netconn.load_balancers.list_all() ) for load_balancer in load_balancers: result[load_balancer["name"]] = load_balancer except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1131,16 +1131,16 @@ def load_balancers_list(resource_group, **kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - load_balancers = __utils__["azurearm.paged_object_to_list"]( + load_balancers = salt.utils.azurearm.paged_object_to_list( netconn.load_balancers.list(resource_group_name=resource_group) ) for load_balancer in load_balancers: result[load_balancer["name"]] = load_balancer except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1165,14 +1165,14 @@ def load_balancer_get(name, resource_group, **kwargs): salt-call azurearm_network.load_balancer_get testlb testgroup """ - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: load_balancer = netconn.load_balancers.get( load_balancer_name=name, resource_group_name=resource_group ) result = load_balancer.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1207,7 +1207,7 @@ def load_balancer_create_or_update(name, resource_group, **kwargs): return False kwargs["location"] = rg_props["location"] - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) if isinstance(kwargs.get("frontend_ip_configurations"), list): for idx in range(0, len(kwargs["frontend_ip_configurations"])): @@ -1338,7 +1338,7 @@ def load_balancer_create_or_update(name, resource_group, **kwargs): } try: - lbmodel = __utils__["azurearm.create_object_model"]( + lbmodel = salt.utils.azurearm.create_object_model( "network", "LoadBalancer", **kwargs ) except TypeError as exc: @@ -1355,7 +1355,7 @@ def load_balancer_create_or_update(name, resource_group, **kwargs): lb_result = load_balancer.result() result = lb_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -1385,7 +1385,7 @@ def load_balancer_delete(name, resource_group, **kwargs): """ result = False - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: load_balancer = netconn.load_balancers.delete( load_balancer_name=name, resource_group_name=resource_group @@ -1393,7 +1393,7 @@ def load_balancer_delete(name, resource_group, **kwargs): load_balancer.wait() result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) return result @@ -1414,13 +1414,11 @@ def usages_list(location, **kwargs): salt-call azurearm_network.usages_list westus """ - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - result = __utils__["azurearm.paged_object_to_list"]( - netconn.usages.list(location) - ) + result = salt.utils.azurearm.paged_object_to_list(netconn.usages.list(location)) except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1447,7 +1445,7 @@ def network_interface_delete(name, resource_group, **kwargs): """ result = False - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: nic = netconn.network_interfaces.delete( network_interface_name=name, resource_group_name=resource_group @@ -1455,7 +1453,7 @@ def network_interface_delete(name, resource_group, **kwargs): nic.wait() result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) return result @@ -1479,14 +1477,14 @@ def network_interface_get(name, resource_group, **kwargs): salt-call azurearm_network.network_interface_get test-iface0 testgroup """ - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: nic = netconn.network_interfaces.get( network_interface_name=name, resource_group_name=resource_group ) result = nic.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1533,7 +1531,7 @@ def network_interface_create_or_update( return False kwargs["location"] = rg_props["location"] - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) # Use NSG name to link to the ID of an existing NSG. if kwargs.get("network_security_group"): @@ -1591,7 +1589,7 @@ def network_interface_create_or_update( ipconfig["public_ip_address"] = {"id": str(pub_ip["id"])} try: - nicmodel = __utils__["azurearm.create_object_model"]( + nicmodel = salt.utils.azurearm.create_object_model( "network", "NetworkInterface", ip_configurations=ip_configurations, **kwargs ) except TypeError as exc: @@ -1608,7 +1606,7 @@ def network_interface_create_or_update( nic_result = interface.result() result = nic_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -1633,16 +1631,16 @@ def network_interfaces_list_all(**kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - nics = __utils__["azurearm.paged_object_to_list"]( + nics = salt.utils.azurearm.paged_object_to_list( netconn.network_interfaces.list_all() ) for nic in nics: result[nic["name"]] = nic except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1666,16 +1664,16 @@ def network_interfaces_list(resource_group, **kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - nics = __utils__["azurearm.paged_object_to_list"]( + nics = salt.utils.azurearm.paged_object_to_list( netconn.network_interfaces.list(resource_group_name=resource_group) ) for nic in nics: result[nic["name"]] = nic except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1701,7 +1699,7 @@ def network_interface_get_effective_route_table(name, resource_group, **kwargs): salt-call azurearm_network.network_interface_get_effective_route_table test-iface0 testgroup """ - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: nic = netconn.network_interfaces.get_effective_route_table( network_interface_name=name, resource_group_name=resource_group @@ -1711,7 +1709,7 @@ def network_interface_get_effective_route_table(name, resource_group, **kwargs): tables = tables.as_dict() result = tables["value"] except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1739,7 +1737,7 @@ def network_interface_list_effective_network_security_groups( salt-call azurearm_network.network_interface_list_effective_network_security_groups test-iface0 testgroup """ - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: nic = netconn.network_interfaces.list_effective_network_security_groups( network_interface_name=name, resource_group_name=resource_group @@ -1749,7 +1747,7 @@ def network_interface_list_effective_network_security_groups( groups = groups.as_dict() result = groups["value"] except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1780,9 +1778,9 @@ def list_virtual_machine_scale_set_vm_network_interfaces( """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - nics = __utils__["azurearm.paged_object_to_list"]( + nics = salt.utils.azurearm.paged_object_to_list( netconn.network_interfaces.list_virtual_machine_scale_set_vm_network_interfaces( virtual_machine_scale_set_name=scale_set, virtualmachine_index=vm_index, @@ -1793,7 +1791,7 @@ def list_virtual_machine_scale_set_vm_network_interfaces( for nic in nics: result[nic["name"]] = nic except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1822,9 +1820,9 @@ def list_virtual_machine_scale_set_network_interfaces( """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - nics = __utils__["azurearm.paged_object_to_list"]( + nics = salt.utils.azurearm.paged_object_to_list( netconn.network_interfaces.list_virtual_machine_scale_set_network_interfaces( virtual_machine_scale_set_name=scale_set, resource_group_name=resource_group, @@ -1834,7 +1832,7 @@ def list_virtual_machine_scale_set_network_interfaces( for nic in nics: result[nic["name"]] = nic except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1868,7 +1866,7 @@ def get_virtual_machine_scale_set_network_interface( """ expand = kwargs.get("expand") - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: nic = netconn.network_interfaces.list_virtual_machine_scale_set_vm_network_interfaces( network_interface_name=name, @@ -1880,7 +1878,7 @@ def get_virtual_machine_scale_set_network_interface( result = nic.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1906,7 +1904,7 @@ def public_ip_address_delete(name, resource_group, **kwargs): """ result = False - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: pub_ip = netconn.public_ip_addresses.delete( public_ip_address_name=name, resource_group_name=resource_group @@ -1914,7 +1912,7 @@ def public_ip_address_delete(name, resource_group, **kwargs): pub_ip.wait() result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) return result @@ -1940,7 +1938,7 @@ def public_ip_address_get(name, resource_group, **kwargs): """ expand = kwargs.get("expand") - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: pub_ip = netconn.public_ip_addresses.get( @@ -1950,7 +1948,7 @@ def public_ip_address_get(name, resource_group, **kwargs): ) result = pub_ip.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1985,10 +1983,10 @@ def public_ip_address_create_or_update(name, resource_group, **kwargs): return False kwargs["location"] = rg_props["location"] - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - pub_ip_model = __utils__["azurearm.create_object_model"]( + pub_ip_model = salt.utils.azurearm.create_object_model( "network", "PublicIPAddress", **kwargs ) except TypeError as exc: @@ -2005,7 +2003,7 @@ def public_ip_address_create_or_update(name, resource_group, **kwargs): ip_result = ip.result() result = ip_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -2030,16 +2028,16 @@ def public_ip_addresses_list_all(**kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - pub_ips = __utils__["azurearm.paged_object_to_list"]( + pub_ips = salt.utils.azurearm.paged_object_to_list( netconn.public_ip_addresses.list_all() ) for ip in pub_ips: result[ip["name"]] = ip except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -2063,16 +2061,16 @@ def public_ip_addresses_list(resource_group, **kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - pub_ips = __utils__["azurearm.paged_object_to_list"]( + pub_ips = salt.utils.azurearm.paged_object_to_list( netconn.public_ip_addresses.list(resource_group_name=resource_group) ) for ip in pub_ips: result[ip["name"]] = ip except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -2100,7 +2098,7 @@ def route_filter_rule_delete(name, route_filter, resource_group, **kwargs): """ result = False - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: rule = netconn.route_filter_rules.delete( resource_group_name=resource_group, @@ -2110,7 +2108,7 @@ def route_filter_rule_delete(name, route_filter, resource_group, **kwargs): rule.wait() result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) return result @@ -2137,7 +2135,7 @@ def route_filter_rule_get(name, route_filter, resource_group, **kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: rule = netconn.route_filter_rules.get( resource_group_name=resource_group, @@ -2147,7 +2145,7 @@ def route_filter_rule_get(name, route_filter, resource_group, **kwargs): result = rule.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -2195,10 +2193,10 @@ def route_filter_rule_create_or_update( return False kwargs["location"] = rg_props["location"] - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - rule_model = __utils__["azurearm.create_object_model"]( + rule_model = salt.utils.azurearm.create_object_model( "network", "RouteFilterRule", access=access, @@ -2223,7 +2221,7 @@ def route_filter_rule_create_or_update( message = str(exc) if kwargs.get("subscription_id") == str(message).strip(): message = "Subscription not authorized for this operation!" - __utils__["azurearm.log_cloud_error"]("network", message, **kwargs) + salt.utils.azurearm.log_cloud_error("network", message, **kwargs) result = {"error": message} except SerializationError as exc: result = { @@ -2253,9 +2251,9 @@ def route_filter_rules_list(route_filter, resource_group, **kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - rules = __utils__["azurearm.paged_object_to_list"]( + rules = salt.utils.azurearm.paged_object_to_list( netconn.route_filter_rules.list_by_route_filter( resource_group_name=resource_group, route_filter_name=route_filter ) @@ -2264,7 +2262,7 @@ def route_filter_rules_list(route_filter, resource_group, **kwargs): for rule in rules: result[rule["name"]] = rule except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -2290,7 +2288,7 @@ def route_filter_delete(name, resource_group, **kwargs): """ result = False - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: route_filter = netconn.route_filters.delete( route_filter_name=name, resource_group_name=resource_group @@ -2298,7 +2296,7 @@ def route_filter_delete(name, resource_group, **kwargs): route_filter.wait() result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) return result @@ -2324,7 +2322,7 @@ def route_filter_get(name, resource_group, **kwargs): """ expand = kwargs.get("expand") - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: route_filter = netconn.route_filters.get( @@ -2332,7 +2330,7 @@ def route_filter_get(name, resource_group, **kwargs): ) result = route_filter.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -2367,10 +2365,10 @@ def route_filter_create_or_update(name, resource_group, **kwargs): return False kwargs["location"] = rg_props["location"] - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - rt_filter_model = __utils__["azurearm.create_object_model"]( + rt_filter_model = salt.utils.azurearm.create_object_model( "network", "RouteFilter", **kwargs ) except TypeError as exc: @@ -2387,7 +2385,7 @@ def route_filter_create_or_update(name, resource_group, **kwargs): rt_result = rt_filter.result() result = rt_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -2415,9 +2413,9 @@ def route_filters_list(resource_group, **kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - filters = __utils__["azurearm.paged_object_to_list"]( + filters = salt.utils.azurearm.paged_object_to_list( netconn.route_filters.list_by_resource_group( resource_group_name=resource_group ) @@ -2426,7 +2424,7 @@ def route_filters_list(resource_group, **kwargs): for route_filter in filters: result[route_filter["name"]] = route_filter except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -2447,16 +2445,14 @@ def route_filters_list_all(**kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - filters = __utils__["azurearm.paged_object_to_list"]( - netconn.route_filters.list() - ) + filters = salt.utils.azurearm.paged_object_to_list(netconn.route_filters.list()) for route_filter in filters: result[route_filter["name"]] = route_filter except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -2484,7 +2480,7 @@ def route_delete(name, route_table, resource_group, **kwargs): """ result = False - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: route = netconn.routes.delete( resource_group_name=resource_group, @@ -2494,7 +2490,7 @@ def route_delete(name, route_table, resource_group, **kwargs): route.wait() result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) return result @@ -2521,7 +2517,7 @@ def route_get(name, route_table, resource_group, **kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: route = netconn.routes.get( resource_group_name=resource_group, @@ -2531,7 +2527,7 @@ def route_get(name, route_table, resource_group, **kwargs): result = route.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -2574,10 +2570,10 @@ def route_create_or_update( salt-call azurearm_network.route_create_or_update test-rt '10.0.0.0/8' test-rt-table testgroup """ - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - rt_model = __utils__["azurearm.create_object_model"]( + rt_model = salt.utils.azurearm.create_object_model( "network", "Route", address_prefix=address_prefix, @@ -2600,7 +2596,7 @@ def route_create_or_update( rt_result = route.result() result = rt_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -2630,9 +2626,9 @@ def routes_list(route_table, resource_group, **kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - routes = __utils__["azurearm.paged_object_to_list"]( + routes = salt.utils.azurearm.paged_object_to_list( netconn.routes.list( resource_group_name=resource_group, route_table_name=route_table ) @@ -2641,7 +2637,7 @@ def routes_list(route_table, resource_group, **kwargs): for route in routes: result[route["name"]] = route except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -2667,7 +2663,7 @@ def route_table_delete(name, resource_group, **kwargs): """ result = False - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: table = netconn.route_tables.delete( route_table_name=name, resource_group_name=resource_group @@ -2675,7 +2671,7 @@ def route_table_delete(name, resource_group, **kwargs): table.wait() result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) return result @@ -2701,7 +2697,7 @@ def route_table_get(name, resource_group, **kwargs): """ expand = kwargs.get("expand") - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: table = netconn.route_tables.get( @@ -2709,7 +2705,7 @@ def route_table_get(name, resource_group, **kwargs): ) result = table.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -2744,10 +2740,10 @@ def route_table_create_or_update(name, resource_group, **kwargs): return False kwargs["location"] = rg_props["location"] - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - rt_tbl_model = __utils__["azurearm.create_object_model"]( + rt_tbl_model = salt.utils.azurearm.create_object_model( "network", "RouteTable", **kwargs ) except TypeError as exc: @@ -2764,7 +2760,7 @@ def route_table_create_or_update(name, resource_group, **kwargs): tbl_result = table.result() result = tbl_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -2792,16 +2788,16 @@ def route_tables_list(resource_group, **kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - tables = __utils__["azurearm.paged_object_to_list"]( + tables = salt.utils.azurearm.paged_object_to_list( netconn.route_tables.list(resource_group_name=resource_group) ) for table in tables: result[table["name"]] = table except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -2822,16 +2818,16 @@ def route_tables_list_all(**kwargs): """ result = {} - netconn = __utils__["azurearm.get_client"]("network", **kwargs) + netconn = salt.utils.azurearm.get_client("network", **kwargs) try: - tables = __utils__["azurearm.paged_object_to_list"]( + tables = salt.utils.azurearm.paged_object_to_list( netconn.route_tables.list_all() ) for table in tables: result[table["name"]] = table except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("network", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("network", str(exc), **kwargs) result = {"error": str(exc)} return result diff --git a/salt/modules/azurearm_resource.py b/salt/modules/azurearm_resource.py index 096d2da02be6..222ee5dd3a04 100644 --- a/salt/modules/azurearm_resource.py +++ b/salt/modules/azurearm_resource.py @@ -102,16 +102,16 @@ def resource_groups_list(**kwargs): """ result = {} - resconn = __utils__["azurearm.get_client"]("resource", **kwargs) + resconn = salt.utils.azurearm.get_client("resource", **kwargs) try: - groups = __utils__["azurearm.paged_object_to_list"]( + groups = salt.utils.azurearm.paged_object_to_list( resconn.resource_groups.list() ) for group in groups: result[group["name"]] = group except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -134,12 +134,12 @@ def resource_group_check_existence(name, **kwargs): """ result = False - resconn = __utils__["azurearm.get_client"]("resource", **kwargs) + resconn = salt.utils.azurearm.get_client("resource", **kwargs) try: result = resconn.resource_groups.check_existence(name) except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) return result @@ -161,13 +161,13 @@ def resource_group_get(name, **kwargs): """ result = {} - resconn = __utils__["azurearm.get_client"]("resource", **kwargs) + resconn = salt.utils.azurearm.get_client("resource", **kwargs) try: group = resconn.resource_groups.get(name) result = group.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -195,7 +195,7 @@ def resource_group_create_or_update( """ result = {} - resconn = __utils__["azurearm.get_client"]("resource", **kwargs) + resconn = salt.utils.azurearm.get_client("resource", **kwargs) resource_group_params = { "location": location, "managed_by": kwargs.get("managed_by"), @@ -205,7 +205,7 @@ def resource_group_create_or_update( group = resconn.resource_groups.create_or_update(name, resource_group_params) result = group.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -228,13 +228,13 @@ def resource_group_delete(name, **kwargs): """ result = False - resconn = __utils__["azurearm.get_client"]("resource", **kwargs) + resconn = salt.utils.azurearm.get_client("resource", **kwargs) try: group = resconn.resource_groups.delete(name) group.wait() result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) return result @@ -260,7 +260,7 @@ def deployment_operation_get(operation, deployment, resource_group, **kwargs): salt-call azurearm_resource.deployment_operation_get XXXXX testdeploy testgroup """ - resconn = __utils__["azurearm.get_client"]("resource", **kwargs) + resconn = salt.utils.azurearm.get_client("resource", **kwargs) try: operation = resconn.deployment_operations.get( resource_group_name=resource_group, @@ -270,7 +270,7 @@ def deployment_operation_get(operation, deployment, resource_group, **kwargs): result = operation.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -299,9 +299,9 @@ def deployment_operations_list(name, resource_group, result_limit=10, **kwargs): """ result = {} - resconn = __utils__["azurearm.get_client"]("resource", **kwargs) + resconn = salt.utils.azurearm.get_client("resource", **kwargs) try: - operations = __utils__["azurearm.paged_object_to_list"]( + operations = salt.utils.azurearm.paged_object_to_list( resconn.deployment_operations.list( resource_group_name=resource_group, deployment_name=name, @@ -312,7 +312,7 @@ def deployment_operations_list(name, resource_group, result_limit=10, **kwargs): for oper in operations: result[oper["operation_id"]] = oper except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -338,7 +338,7 @@ def deployment_delete(name, resource_group, **kwargs): """ result = False - resconn = __utils__["azurearm.get_client"]("resource", **kwargs) + resconn = salt.utils.azurearm.get_client("resource", **kwargs) try: deploy = resconn.deployments.delete( deployment_name=name, resource_group_name=resource_group @@ -346,7 +346,7 @@ def deployment_delete(name, resource_group, **kwargs): deploy.wait() result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) return result @@ -371,13 +371,13 @@ def deployment_check_existence(name, resource_group, **kwargs): """ result = False - resconn = __utils__["azurearm.get_client"]("resource", **kwargs) + resconn = salt.utils.azurearm.get_client("resource", **kwargs) try: result = resconn.deployments.check_existence( deployment_name=name, resource_group_name=resource_group ) except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) return result @@ -438,7 +438,7 @@ def deployment_create_or_update( salt-call azurearm_resource.deployment_create_or_update testdeploy testgroup """ - resconn = __utils__["azurearm.get_client"]("resource", **kwargs) + resconn = salt.utils.azurearm.get_client("resource", **kwargs) prop_kwargs = {"mode": deploy_mode} prop_kwargs["debug_setting"] = {"detail_level": debug_setting} @@ -463,7 +463,7 @@ def deployment_create_or_update( deploy_kwargs.update(prop_kwargs) try: - deploy_model = __utils__["azurearm.create_object_model"]( + deploy_model = salt.utils.azurearm.create_object_model( "resource", "DeploymentProperties", **deploy_kwargs ) except TypeError as exc: @@ -486,7 +486,7 @@ def deployment_create_or_update( deploy_result = deploy.result() result = deploy_result.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -515,14 +515,14 @@ def deployment_get(name, resource_group, **kwargs): salt-call azurearm_resource.deployment_get testdeploy testgroup """ - resconn = __utils__["azurearm.get_client"]("resource", **kwargs) + resconn = salt.utils.azurearm.get_client("resource", **kwargs) try: deploy = resconn.deployments.get( deployment_name=name, resource_group_name=resource_group ) result = deploy.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -547,14 +547,14 @@ def deployment_cancel(name, resource_group, **kwargs): salt-call azurearm_resource.deployment_cancel testdeploy testgroup """ - resconn = __utils__["azurearm.get_client"]("resource", **kwargs) + resconn = salt.utils.azurearm.get_client("resource", **kwargs) try: resconn.deployments.cancel( deployment_name=name, resource_group_name=resource_group ) result = {"result": True} except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc), "result": False} return result @@ -617,7 +617,7 @@ def deployment_validate( salt-call azurearm_resource.deployment_validate testdeploy testgroup """ - resconn = __utils__["azurearm.get_client"]("resource", **kwargs) + resconn = salt.utils.azurearm.get_client("resource", **kwargs) prop_kwargs = {"mode": deploy_mode} prop_kwargs["debug_setting"] = {"detail_level": debug_setting} @@ -642,7 +642,7 @@ def deployment_validate( deploy_kwargs.update(prop_kwargs) try: - deploy_model = __utils__["azurearm.create_object_model"]( + deploy_model = salt.utils.azurearm.create_object_model( "resource", "DeploymentProperties", **deploy_kwargs ) except TypeError as exc: @@ -661,7 +661,7 @@ def deployment_validate( ) result = deploy.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -690,14 +690,14 @@ def deployment_export_template(name, resource_group, **kwargs): salt-call azurearm_resource.deployment_export_template testdeploy testgroup """ - resconn = __utils__["azurearm.get_client"]("resource", **kwargs) + resconn = salt.utils.azurearm.get_client("resource", **kwargs) try: deploy = resconn.deployments.export_template( deployment_name=name, resource_group_name=resource_group ) result = deploy.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -718,9 +718,9 @@ def deployments_list(resource_group, **kwargs): """ result = {} - resconn = __utils__["azurearm.get_client"]("resource", **kwargs) + resconn = salt.utils.azurearm.get_client("resource", **kwargs) try: - deployments = __utils__["azurearm.paged_object_to_list"]( + deployments = salt.utils.azurearm.paged_object_to_list( resconn.deployments.list_by_resource_group( resource_group_name=resource_group ) @@ -729,7 +729,7 @@ def deployments_list(resource_group, **kwargs): for deploy in deployments: result[deploy["name"]] = deploy except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -758,9 +758,9 @@ def subscriptions_list_locations(subscription_id=None, **kwargs): elif not kwargs.get("subscription_id"): kwargs["subscription_id"] = subscription_id - subconn = __utils__["azurearm.get_client"]("subscription", **kwargs) + subconn = salt.utils.azurearm.get_client("subscription", **kwargs) try: - locations = __utils__["azurearm.paged_object_to_list"]( + locations = salt.utils.azurearm.paged_object_to_list( subconn.subscriptions.list_locations( subscription_id=kwargs["subscription_id"] ) @@ -769,7 +769,7 @@ def subscriptions_list_locations(subscription_id=None, **kwargs): for loc in locations: result[loc["name"]] = loc except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -798,7 +798,7 @@ def subscription_get(subscription_id=None, **kwargs): elif not kwargs.get("subscription_id"): kwargs["subscription_id"] = subscription_id - subconn = __utils__["azurearm.get_client"]("subscription", **kwargs) + subconn = salt.utils.azurearm.get_client("subscription", **kwargs) try: subscription = subconn.subscriptions.get( subscription_id=kwargs.get("subscription_id") @@ -806,7 +806,7 @@ def subscription_get(subscription_id=None, **kwargs): result = subscription.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -827,14 +827,14 @@ def subscriptions_list(**kwargs): """ result = {} - subconn = __utils__["azurearm.get_client"]("subscription", **kwargs) + subconn = salt.utils.azurearm.get_client("subscription", **kwargs) try: - subs = __utils__["azurearm.paged_object_to_list"](subconn.subscriptions.list()) + subs = salt.utils.azurearm.paged_object_to_list(subconn.subscriptions.list()) for sub in subs: result[sub["subscription_id"]] = sub except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -855,14 +855,14 @@ def tenants_list(**kwargs): """ result = {} - subconn = __utils__["azurearm.get_client"]("subscription", **kwargs) + subconn = salt.utils.azurearm.get_client("subscription", **kwargs) try: - tenants = __utils__["azurearm.paged_object_to_list"](subconn.tenants.list()) + tenants = salt.utils.azurearm.paged_object_to_list(subconn.tenants.list()) for tenant in tenants: result[tenant["tenant_id"]] = tenant except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -888,7 +888,7 @@ def policy_assignment_delete(name, scope, **kwargs): """ result = False - polconn = __utils__["azurearm.get_client"]("policy", **kwargs) + polconn = salt.utils.azurearm.get_client("policy", **kwargs) try: # pylint: disable=unused-variable policy = polconn.policy_assignments.delete( @@ -896,7 +896,7 @@ def policy_assignment_delete(name, scope, **kwargs): ) result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) return result @@ -922,7 +922,7 @@ def policy_assignment_create(name, scope, definition_name, **kwargs): /subscriptions/bc75htn-a0fhsi-349b-56gh-4fghti-f84852 testpolicy """ - polconn = __utils__["azurearm.get_client"]("policy", **kwargs) + polconn = salt.utils.azurearm.get_client("policy", **kwargs) # "get" doesn't work for built-in policies per https://github.com/Azure/azure-cli/issues/692 # Uncomment this section when the ticket above is resolved. @@ -955,7 +955,7 @@ def policy_assignment_create(name, scope, definition_name, **kwargs): policy_kwargs.update(prop_kwargs) try: - policy_model = __utils__["azurearm.create_object_model"]( + policy_model = salt.utils.azurearm.create_object_model( "resource.policy", "PolicyAssignment", **policy_kwargs ) except TypeError as exc: @@ -970,7 +970,7 @@ def policy_assignment_create(name, scope, definition_name, **kwargs): ) result = policy.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -1005,14 +1005,14 @@ def policy_assignment_get(name, scope, **kwargs): /subscriptions/bc75htn-a0fhsi-349b-56gh-4fghti-f84852 """ - polconn = __utils__["azurearm.get_client"]("policy", **kwargs) + polconn = salt.utils.azurearm.get_client("policy", **kwargs) try: policy = polconn.policy_assignments.get( policy_assignment_name=name, scope=scope ) result = policy.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1037,9 +1037,9 @@ def policy_assignments_list_for_resource_group( """ result = {} - polconn = __utils__["azurearm.get_client"]("policy", **kwargs) + polconn = salt.utils.azurearm.get_client("policy", **kwargs) try: - policy_assign = __utils__["azurearm.paged_object_to_list"]( + policy_assign = salt.utils.azurearm.paged_object_to_list( polconn.policy_assignments.list_for_resource_group( resource_group_name=resource_group, filter=kwargs.get("filter") ) @@ -1048,7 +1048,7 @@ def policy_assignments_list_for_resource_group( for assign in policy_assign: result[assign["name"]] = assign except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1069,16 +1069,16 @@ def policy_assignments_list(**kwargs): """ result = {} - polconn = __utils__["azurearm.get_client"]("policy", **kwargs) + polconn = salt.utils.azurearm.get_client("policy", **kwargs) try: - policy_assign = __utils__["azurearm.paged_object_to_list"]( + policy_assign = salt.utils.azurearm.paged_object_to_list( polconn.policy_assignments.list() ) for assign in policy_assign: result[assign["name"]] = assign except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1109,7 +1109,7 @@ def policy_definition_create_or_update( result = {"error": "The policy rule must be a dictionary!"} return result - polconn = __utils__["azurearm.get_client"]("policy", **kwargs) + polconn = salt.utils.azurearm.get_client("policy", **kwargs) # Convert OrderedDict to dict prop_kwargs = { @@ -1120,7 +1120,7 @@ def policy_definition_create_or_update( policy_kwargs.update(prop_kwargs) try: - policy_model = __utils__["azurearm.create_object_model"]( + policy_model = salt.utils.azurearm.create_object_model( "resource.policy", "PolicyDefinition", **policy_kwargs ) except TypeError as exc: @@ -1133,7 +1133,7 @@ def policy_definition_create_or_update( ) result = policy.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} except SerializationError as exc: result = { @@ -1160,13 +1160,13 @@ def policy_definition_delete(name, **kwargs): """ result = False - polconn = __utils__["azurearm.get_client"]("policy", **kwargs) + polconn = salt.utils.azurearm.get_client("policy", **kwargs) try: # pylint: disable=unused-variable policy = polconn.policy_definitions.delete(policy_definition_name=name) result = True except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) return result @@ -1187,12 +1187,12 @@ def policy_definition_get(name, **kwargs): salt-call azurearm_resource.policy_definition_get testpolicy """ - polconn = __utils__["azurearm.get_client"]("policy", **kwargs) + polconn = salt.utils.azurearm.get_client("policy", **kwargs) try: policy_def = polconn.policy_definitions.get(policy_definition_name=name) result = policy_def.as_dict() except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result @@ -1215,9 +1215,9 @@ def policy_definitions_list(hide_builtin=False, **kwargs): """ result = {} - polconn = __utils__["azurearm.get_client"]("policy", **kwargs) + polconn = salt.utils.azurearm.get_client("policy", **kwargs) try: - policy_defs = __utils__["azurearm.paged_object_to_list"]( + policy_defs = salt.utils.azurearm.paged_object_to_list( polconn.policy_definitions.list() ) @@ -1225,7 +1225,7 @@ def policy_definitions_list(hide_builtin=False, **kwargs): if not (hide_builtin and policy["policy_type"] == "BuiltIn"): result[policy["name"]] = policy except CloudError as exc: - __utils__["azurearm.log_cloud_error"]("resource", str(exc), **kwargs) + salt.utils.azurearm.log_cloud_error("resource", str(exc), **kwargs) result = {"error": str(exc)} return result diff --git a/salt/modules/boto3_elasticache.py b/salt/modules/boto3_elasticache.py index a64e24508532..e877d693e2e1 100644 --- a/salt/modules/boto3_elasticache.py +++ b/salt/modules/boto3_elasticache.py @@ -49,6 +49,7 @@ import logging import time +import salt.utils.boto3mod import salt.utils.compat import salt.utils.versions from salt.exceptions import CommandExecutionError, SaltInvocationError @@ -77,7 +78,7 @@ def __virtual__(): def __init__(opts): if HAS_BOTO3: - __utils__["boto3.assign_funcs"]( + salt.utils.boto3mod.assign_funcs( __name__, "elasticache", get_conn_funcname="_get_conn", diff --git a/salt/modules/boto3_elasticsearch.py b/salt/modules/boto3_elasticsearch.py index 7462ea74d5d2..b7e733825165 100644 --- a/salt/modules/boto3_elasticsearch.py +++ b/salt/modules/boto3_elasticsearch.py @@ -52,6 +52,7 @@ import logging +import salt.utils.boto3mod import salt.utils.compat import salt.utils.json import salt.utils.versions @@ -88,7 +89,7 @@ def __virtual__(): def __init__(opts): _ = opts if HAS_BOTO: - __utils__["boto3.assign_funcs"](__name__, "es") + salt.utils.boto3mod.assign_funcs(__name__, "es") def add_tags( diff --git a/salt/modules/boto3_route53.py b/salt/modules/boto3_route53.py index 32c971356c2d..f59dcf09d91b 100644 --- a/salt/modules/boto3_route53.py +++ b/salt/modules/boto3_route53.py @@ -52,6 +52,7 @@ import re import time +import salt.utils.boto3mod import salt.utils.compat import salt.utils.versions from salt.exceptions import CommandExecutionError, SaltInvocationError @@ -81,7 +82,7 @@ def __virtual__(): def __init__(opts): if HAS_BOTO3: - __utils__["boto3.assign_funcs"](__name__, "route53") + salt.utils.boto3mod.assign_funcs(__name__, "route53") def _collect_results(func, item, args, marker="Marker", nextmarker="NextMarker"): diff --git a/salt/modules/boto3_sns.py b/salt/modules/boto3_sns.py index 378b3e436fcf..6f633d54b18b 100644 --- a/salt/modules/boto3_sns.py +++ b/salt/modules/boto3_sns.py @@ -44,6 +44,7 @@ import logging +import salt.utils.boto3mod import salt.utils.versions log = logging.getLogger(__name__) @@ -67,7 +68,7 @@ def __virtual__(): """ has_boto_reqs = salt.utils.versions.check_boto_reqs() if has_boto_reqs is True: - __utils__["boto3.assign_funcs"](__name__, "sns") + salt.utils.boto3mod.assign_funcs(__name__, "sns") return has_boto_reqs diff --git a/salt/modules/boto_apigateway.py b/salt/modules/boto_apigateway.py index d2911e89acd6..2a1702752cec 100644 --- a/salt/modules/boto_apigateway.py +++ b/salt/modules/boto_apigateway.py @@ -81,6 +81,7 @@ import datetime import logging +import salt.utils.boto3mod import salt.utils.compat import salt.utils.json import salt.utils.versions @@ -121,7 +122,7 @@ def __virtual__(): def __init__(opts): if HAS_BOTO: - __utils__["boto3.assign_funcs"](__name__, "apigateway") + salt.utils.boto3mod.assign_funcs(__name__, "apigateway") def _convert_datetime_str(response): @@ -183,7 +184,7 @@ def _find_apis_by_name( apis = _filter_apis_desc(description, apis) return {"restapi": [_convert_datetime_str(api) for api in apis]} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def describe_apis( @@ -274,7 +275,7 @@ def create_api( api = _convert_datetime_str(api) return {"created": True, "restapi": api} if api else {"created": False} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def delete_api(name, description=None, region=None, key=None, keyid=None, profile=None): @@ -305,7 +306,7 @@ def delete_api(name, description=None, region=None, key=None, keyid=None, profil else: return {"deleted": False} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def describe_api_resources(restApiId, region=None, key=None, keyid=None, profile=None): @@ -328,7 +329,7 @@ def describe_api_resources(restApiId, region=None, key=None, keyid=None, profile return {"resources": resources} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def describe_api_resource( @@ -401,7 +402,7 @@ def create_api_resources( else: return {"created": False, "error": "unexpected error."} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def delete_api_resources( @@ -433,7 +434,7 @@ def delete_api_resources( else: return {"deleted": False, "error": "no resource found by {}".format(path)} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def describe_api_resource_method( @@ -465,7 +466,7 @@ def describe_api_resource_method( ) return {"method": method} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def describe_api_key(apiKey, region=None, key=None, keyid=None, profile=None): @@ -484,7 +485,7 @@ def describe_api_key(apiKey, region=None, key=None, keyid=None, profile=None): response = conn.get_api_key(apiKey=apiKey) return {"apiKey": _convert_datetime_str(response)} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def describe_api_keys(region=None, key=None, keyid=None, profile=None): @@ -504,7 +505,7 @@ def describe_api_keys(region=None, key=None, keyid=None, profile=None): return {"apiKeys": [_convert_datetime_str(apikey) for apikey in apikeys]} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def create_api_key( @@ -551,7 +552,7 @@ def create_api_key( return {"created": True, "apiKey": _convert_datetime_str(response)} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def delete_api_key(apiKey, region=None, key=None, keyid=None, profile=None): @@ -570,7 +571,7 @@ def delete_api_key(apiKey, region=None, key=None, keyid=None, profile=None): conn.delete_api_key(apiKey=apiKey) return {"deleted": True} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def _api_key_patch_replace(conn, apiKey, path, value): @@ -628,7 +629,7 @@ def update_api_key_description( response = _api_key_patch_replace(conn, apiKey, "/description", description) return {"updated": True, "apiKey": _convert_datetime_str(response)} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def enable_api_key(apiKey, region=None, key=None, keyid=None, profile=None): @@ -647,7 +648,7 @@ def enable_api_key(apiKey, region=None, key=None, keyid=None, profile=None): response = _api_key_patch_replace(conn, apiKey, "/enabled", "True") return {"apiKey": _convert_datetime_str(response)} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def disable_api_key(apiKey, region=None, key=None, keyid=None, profile=None): @@ -666,7 +667,7 @@ def disable_api_key(apiKey, region=None, key=None, keyid=None, profile=None): response = _api_key_patch_replace(conn, apiKey, "/enabled", "False") return {"apiKey": _convert_datetime_str(response)} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def associate_api_key_stagekeys( @@ -689,7 +690,7 @@ def associate_api_key_stagekeys( response = _api_key_patch_add(conn, apiKey, pvlist) return {"associated": True, "apiKey": _convert_datetime_str(response)} except ClientError as e: - return {"associated": False, "error": __utils__["boto3.get_error"](e)} + return {"associated": False, "error": salt.utils.boto3mod.get_error(e)} def disassociate_api_key_stagekeys( @@ -712,7 +713,7 @@ def disassociate_api_key_stagekeys( response = _api_key_patch_remove(conn, apiKey, pvlist) return {"disassociated": True} except ClientError as e: - return {"disassociated": False, "error": __utils__["boto3.get_error"](e)} + return {"disassociated": False, "error": salt.utils.boto3mod.get_error(e)} def describe_api_deployments( @@ -748,7 +749,7 @@ def describe_api_deployments( ] } except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def describe_api_deployment( @@ -769,7 +770,7 @@ def describe_api_deployment( deployment = conn.get_deployment(restApiId=restApiId, deploymentId=deploymentId) return {"deployment": _convert_datetime_str(deployment)} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def activate_api_deployment( @@ -796,7 +797,7 @@ def activate_api_deployment( ) return {"set": True, "response": _convert_datetime_str(response)} except ClientError as e: - return {"set": False, "error": __utils__["boto3.get_error"](e)} + return {"set": False, "error": salt.utils.boto3mod.get_error(e)} def create_api_deployment( @@ -838,7 +839,7 @@ def create_api_deployment( ) return {"created": True, "deployment": _convert_datetime_str(deployment)} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def delete_api_deployment( @@ -859,7 +860,7 @@ def delete_api_deployment( conn.delete_deployment(restApiId=restApiId, deploymentId=deploymentId) return {"deleted": True} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def overwrite_api_stage_variables( @@ -910,7 +911,7 @@ def overwrite_api_stage_variables( return {"overwrite": True, "stage": _convert_datetime_str(stage)} except ClientError as e: - return {"overwrite": False, "error": __utils__["boto3.get_error"](e)} + return {"overwrite": False, "error": salt.utils.boto3mod.get_error(e)} def describe_api_stage( @@ -931,7 +932,7 @@ def describe_api_stage( stage = conn.get_stage(restApiId=restApiId, stageName=stageName) return {"stage": _convert_datetime_str(stage)} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def describe_api_stages( @@ -952,7 +953,7 @@ def describe_api_stages( stages = conn.get_stages(restApiId=restApiId, deploymentId=deploymentId) return {"stages": [_convert_datetime_str(stage) for stage in stages["item"]]} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def create_api_stage( @@ -994,7 +995,7 @@ def create_api_stage( ) return {"created": True, "stage": _convert_datetime_str(stage)} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def delete_api_stage( @@ -1015,7 +1016,7 @@ def delete_api_stage( conn.delete_stage(restApiId=restApiId, stageName=stageName) return {"deleted": True} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def flush_api_stage_cache( @@ -1036,7 +1037,7 @@ def flush_api_stage_cache( conn.flush_stage_cache(restApiId=restApiId, stageName=stageName) return {"flushed": True} except ClientError as e: - return {"flushed": False, "error": __utils__["boto3.get_error"](e)} + return {"flushed": False, "error": salt.utils.boto3mod.get_error(e)} def create_api_method( @@ -1092,7 +1093,7 @@ def create_api_method( return {"created": False, "error": "Failed to create method"} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def describe_api_method( @@ -1125,7 +1126,7 @@ def describe_api_method( return {"method": _convert_datetime_str(method)} return {"error": "get API method failed: no such resource"} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def delete_api_method( @@ -1158,7 +1159,7 @@ def delete_api_method( return {"deleted": True} return {"deleted": False, "error": "get API method failed: no such resource"} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def create_api_method_response( @@ -1211,7 +1212,7 @@ def create_api_method_response( return {"created": True, "response": response} return {"created": False, "error": "no such resource"} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def delete_api_method_response( @@ -1254,7 +1255,7 @@ def delete_api_method_response( return {"deleted": True} return {"deleted": False, "error": "no such resource"} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def describe_api_method_response( @@ -1297,7 +1298,7 @@ def describe_api_method_response( return {"response": _convert_datetime_str(response)} return {"error": "no such resource"} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def describe_api_models(restApiId, region=None, key=None, keyid=None, profile=None): @@ -1316,7 +1317,7 @@ def describe_api_models(restApiId, region=None, key=None, keyid=None, profile=No models = _multi_call(conn.get_models, "items", restApiId=restApiId) return {"models": [_convert_datetime_str(model) for model in models]} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def describe_api_model( @@ -1339,7 +1340,7 @@ def describe_api_model( ) return {"model": _convert_datetime_str(model)} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def api_model_exists( @@ -1396,7 +1397,7 @@ def update_api_model_schema( ) return {"updated": True, "model": _convert_datetime_str(response)} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def delete_api_model( @@ -1417,7 +1418,7 @@ def delete_api_model( conn.delete_model(restApiId=restApiId, modelName=modelName) return {"deleted": True} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def create_api_model( @@ -1456,7 +1457,7 @@ def create_api_model( ) return {"created": True, "model": _convert_datetime_str(model)} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def describe_api_integration( @@ -1489,7 +1490,7 @@ def describe_api_integration( return {"integration": _convert_datetime_str(integration)} return {"error": "no such resource"} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def describe_api_integration_response( @@ -1532,7 +1533,7 @@ def describe_api_integration_response( return {"response": _convert_datetime_str(response)} return {"error": "no such resource"} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def delete_api_integration( @@ -1565,7 +1566,7 @@ def delete_api_integration( return {"deleted": True} return {"deleted": False, "error": "no such resource"} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def delete_api_integration_response( @@ -1608,7 +1609,7 @@ def delete_api_integration_response( return {"deleted": True} return {"deleted": False, "error": "no such resource"} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def _get_role_arn(name, region=None, key=None, keyid=None, profile=None): @@ -1694,7 +1695,7 @@ def create_api_integration( return {"created": True, "integration": integration} return {"created": False, "error": "no such resource"} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def create_api_integration_response( @@ -1751,7 +1752,7 @@ def create_api_integration_response( return {"created": True, "response": response} return {"created": False, "error": "no such resource"} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def _filter_plans(attr, name, plans): @@ -1789,7 +1790,7 @@ def describe_usage_plans( return {"plans": [_convert_datetime_str(plan) for plan in plans]} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def _validate_throttle(throttle): @@ -1885,7 +1886,7 @@ def create_usage_plan( res = conn.create_usage_plan(**values) return {"created": True, "result": res} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} except (TypeError, ValueError) as e: return {"error": str(e)} @@ -1988,7 +1989,7 @@ def update_usage_plan( return {"updated": False} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} except (TypeError, ValueError) as e: return {"error": str(e)} @@ -2019,7 +2020,7 @@ def delete_usage_plan(plan_id, region=None, key=None, keyid=None, profile=None): res = conn.delete_usage_plan(usagePlanId=plan_id) return {"deleted": True, "usagePlanId": plan_id} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def _update_usage_plan_apis( @@ -2058,7 +2059,7 @@ def _update_usage_plan_apis( ) return {"success": True, "result": res} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} except Exception as e: # pylint: disable=broad-except return {"error": e} diff --git a/salt/modules/boto_asg.py b/salt/modules/boto_asg.py index 7bdad75c7a09..3afa9f426741 100644 --- a/salt/modules/boto_asg.py +++ b/salt/modules/boto_asg.py @@ -51,6 +51,8 @@ import sys import time +import salt.utils.boto3mod +import salt.utils.botomod import salt.utils.compat import salt.utils.json import salt.utils.odict as odict @@ -83,20 +85,20 @@ def __virtual__(): """ has_boto_reqs = salt.utils.versions.check_boto_reqs() if has_boto_reqs is True: - __utils__["boto.assign_funcs"]( + salt.utils.botomod.assign_funcs( __name__, "asg", module="ec2.autoscale", pack=__salt__ ) setattr( sys.modules[__name__], "_get_ec2_conn", - __utils__["boto.get_connection_func"]("ec2"), + salt.utils.botomod.get_connection_func("ec2"), ) return has_boto_reqs def __init__(opts): if HAS_BOTO: - __utils__["boto3.assign_funcs"]( + salt.utils.boto3mod.assign_funcs( __name__, "autoscaling", get_conn_funcname="_get_conn_autoscaling_boto3" ) @@ -423,7 +425,7 @@ def update( add_tags = [] desired_tags = [] if tags: - tags = __utils__["boto3.ordered"](tags) + tags = salt.utils.boto3mod.ordered(tags) for tag in tags: try: key = tag.get("key") @@ -1052,7 +1054,7 @@ def enter_standby( ShouldDecrementDesiredCapacity=should_decrement_desired_capacity, ) except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "ResourceNotFoundException": return {"exists": False} return {"error": err} @@ -1090,7 +1092,7 @@ def exit_standby( InstanceIds=instance_ids, AutoScalingGroupName=name ) except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "ResourceNotFoundException": return {"exists": False} return {"error": err} diff --git a/salt/modules/boto_cfn.py b/salt/modules/boto_cfn.py index 4c6b700482a8..67a913bd8a91 100644 --- a/salt/modules/boto_cfn.py +++ b/salt/modules/boto_cfn.py @@ -34,6 +34,7 @@ import logging +import salt.utils.botomod import salt.utils.versions log = logging.getLogger(__name__) @@ -62,7 +63,7 @@ def __virtual__(): def __init__(opts): if HAS_BOTO: - __utils__["boto.assign_funcs"]( + salt.utils.botomod.assign_funcs( __name__, "cfn", module="cloudformation", pack=__salt__ ) diff --git a/salt/modules/boto_cloudfront.py b/salt/modules/boto_cloudfront.py index 7e4db092d066..84d3b489084e 100644 --- a/salt/modules/boto_cloudfront.py +++ b/salt/modules/boto_cloudfront.py @@ -52,7 +52,10 @@ import logging +import salt.utils.boto3mod +import salt.utils.dictdiffer import salt.utils.versions +import salt.utils.yaml from salt.utils.odict import OrderedDict try: @@ -75,7 +78,7 @@ def __virtual__(): """ has_boto_reqs = salt.utils.versions.check_boto_reqs() if has_boto_reqs is True: - __utils__["boto3.assign_funcs"](__name__, "cloudfront") + salt.utils.boto3mod.assign_funcs(__name__, "cloudfront") return has_boto_reqs @@ -208,7 +211,7 @@ def get_distribution(name, region=None, key=None, keyid=None, profile=None): return {"error": msg.format(name)} distribution = dist except botocore.exceptions.ClientError as err: - return {"error": __utils__["boto3.get_error"](err)} + return {"error": salt.utils.boto3mod.get_error(err)} if not distribution: return {"result": None} @@ -263,8 +266,8 @@ def export_distributions(region=None, key=None, keyid=None, profile=None): # as opposed to being called from execution or state modules log.trace("Boto client error: {}", exc) - dumper = __utils__["yaml.get_dumper"]("IndentedSafeOrderedDumper") - return __utils__["yaml.dump"]( + dumper = salt.utils.yaml.get_dumper("IndentedSafeOrderedDumper") + return salt.utils.yaml.dump( results, default_flow_style=False, Dumper=dumper, @@ -336,7 +339,7 @@ def create_distribution( profile=profile, ) except botocore.exceptions.ClientError as err: - return {"error": __utils__["boto3.get_error"](err)} + return {"error": salt.utils.boto3mod.get_error(err)} return {"result": True} @@ -394,9 +397,9 @@ def update_distribution( current_tags = dist_with_tags["tags"] etag = dist_with_tags["etag"] - config_diff = __utils__["dictdiffer.deep_diff"](current_config, config) + config_diff = salt.utils.dictdiffer.deep_diff(current_config, config) if tags: - tags_diff = __utils__["dictdiffer.deep_diff"](current_tags, tags) + tags_diff = salt.utils.dictdiffer.deep_diff(current_tags, tags) conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile) try: @@ -427,7 +430,7 @@ def update_distribution( TagKeys=tags_to_remove, ) except botocore.exceptions.ClientError as err: - return {"error": __utils__["boto3.get_error"](err)} + return {"error": salt.utils.boto3mod.get_error(err)} finally: _cache_id( "cloudfront", diff --git a/salt/modules/boto_cloudtrail.py b/salt/modules/boto_cloudtrail.py index 25c165bd4242..3f4504611220 100644 --- a/salt/modules/boto_cloudtrail.py +++ b/salt/modules/boto_cloudtrail.py @@ -51,6 +51,7 @@ import logging +import salt.utils.boto3mod import salt.utils.compat import salt.utils.versions @@ -86,7 +87,7 @@ def __virtual__(): def __init__(opts): if HAS_BOTO: - __utils__["boto3.assign_funcs"](__name__, "cloudtrail") + salt.utils.boto3mod.assign_funcs(__name__, "cloudtrail") def exists(Name, region=None, key=None, keyid=None, profile=None): @@ -109,7 +110,7 @@ def exists(Name, region=None, key=None, keyid=None, profile=None): conn.get_trail_status(Name=Name) return {"exists": True} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "TrailNotFoundException": return {"exists": False} return {"error": err} @@ -169,7 +170,7 @@ def create( log.warning("Trail was not created") return {"created": False} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def delete(Name, region=None, key=None, keyid=None, profile=None): @@ -192,7 +193,7 @@ def delete(Name, region=None, key=None, keyid=None, profile=None): conn.delete_trail(Name=Name) return {"deleted": True} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def describe(Name, region=None, key=None, keyid=None, profile=None): @@ -232,10 +233,10 @@ def describe(Name, region=None, key=None, keyid=None, profile=None): else: return {"trail": None} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "TrailNotFoundException": return {"trail": None} - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def status(Name, region=None, key=None, keyid=None, profile=None): @@ -279,10 +280,10 @@ def status(Name, region=None, key=None, keyid=None, profile=None): else: return {"trail": None} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "TrailNotFoundException": return {"trail": None} - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def list(region=None, key=None, keyid=None, profile=None): @@ -307,7 +308,7 @@ def list(region=None, key=None, keyid=None, profile=None): log.warning("No trails found") return {"trails": trails.get("trailList", [])} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def update( @@ -364,7 +365,7 @@ def update( log.warning("Trail was not created") return {"updated": False} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def start_logging(Name, region=None, key=None, keyid=None, profile=None): @@ -387,7 +388,7 @@ def start_logging(Name, region=None, key=None, keyid=None, profile=None): conn.start_logging(Name=Name) return {"started": True} except ClientError as e: - return {"started": False, "error": __utils__["boto3.get_error"](e)} + return {"started": False, "error": salt.utils.boto3mod.get_error(e)} def stop_logging(Name, region=None, key=None, keyid=None, profile=None): @@ -410,7 +411,7 @@ def stop_logging(Name, region=None, key=None, keyid=None, profile=None): conn.stop_logging(Name=Name) return {"stopped": True} except ClientError as e: - return {"stopped": False, "error": __utils__["boto3.get_error"](e)} + return {"stopped": False, "error": salt.utils.boto3mod.get_error(e)} def _get_trail_arn(name, region=None, key=None, keyid=None, profile=None): @@ -457,7 +458,7 @@ def add_tags(Name, region=None, key=None, keyid=None, profile=None, **kwargs): ) return {"tagged": True} except ClientError as e: - return {"tagged": False, "error": __utils__["boto3.get_error"](e)} + return {"tagged": False, "error": salt.utils.boto3mod.get_error(e)} def remove_tags(Name, region=None, key=None, keyid=None, profile=None, **kwargs): @@ -490,7 +491,7 @@ def remove_tags(Name, region=None, key=None, keyid=None, profile=None, **kwargs) ) return {"tagged": True} except ClientError as e: - return {"tagged": False, "error": __utils__["boto3.get_error"](e)} + return {"tagged": False, "error": salt.utils.boto3mod.get_error(e)} def list_tags(Name, region=None, key=None, keyid=None, profile=None): @@ -520,4 +521,4 @@ def list_tags(Name, region=None, key=None, keyid=None, profile=None): tagdict[tag.get("Key")] = tag.get("Value") return {"tags": tagdict} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} diff --git a/salt/modules/boto_cloudwatch.py b/salt/modules/boto_cloudwatch.py index bdd9794f3b33..c2687b669a46 100644 --- a/salt/modules/boto_cloudwatch.py +++ b/salt/modules/boto_cloudwatch.py @@ -45,9 +45,11 @@ import logging +import salt.utils.botomod import salt.utils.json import salt.utils.odict as odict import salt.utils.versions +import salt.utils.yaml import yaml # pylint: disable=blacklisted-import try: @@ -70,7 +72,7 @@ def __virtual__(): """ has_boto_reqs = salt.utils.versions.check_boto_reqs(check_boto3=False) if has_boto_reqs is True: - __utils__["boto.assign_funcs"]( + salt.utils.botomod.assign_funcs( __name__, "cloudwatch", module="ec2.cloudwatch", pack=__salt__ ) return has_boto_reqs @@ -102,7 +104,7 @@ def _safe_dump(data): work with the objects returned from boto.describe_alarms() """ - custom_dumper = __utils__["yaml.get_dumper"]("SafeOrderedDumper") + custom_dumper = salt.utils.yaml.get_dumper("SafeOrderedDumper") def boto_listelement_presenter(dumper, data): return dumper.represent_list(list(data)) @@ -122,7 +124,7 @@ def dimension_presenter(dumper, data): Dumper=custom_dumper, ) - return __utils__["yaml.dump"](data, Dumper=custom_dumper) + return salt.utils.yaml.dump(data, Dumper=custom_dumper) def get_all_alarms(region=None, prefix=None, key=None, keyid=None, profile=None): diff --git a/salt/modules/boto_cloudwatch_event.py b/salt/modules/boto_cloudwatch_event.py index 1e8def652d1f..430e1c2467af 100644 --- a/salt/modules/boto_cloudwatch_event.py +++ b/salt/modules/boto_cloudwatch_event.py @@ -46,6 +46,7 @@ import logging +import salt.utils.boto3mod import salt.utils.compat import salt.utils.json import salt.utils.versions @@ -77,7 +78,7 @@ def __virtual__(): def __init__(opts): if HAS_BOTO: - __utils__["boto3.assign_funcs"](__name__, "events") + salt.utils.boto3mod.assign_funcs(__name__, "events") def exists(Name, region=None, key=None, keyid=None, profile=None): @@ -104,7 +105,7 @@ def exists(Name, region=None, key=None, keyid=None, profile=None): return {"exists": True} return {"exists": False} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) return {"error": err} @@ -155,7 +156,7 @@ def create_or_update( log.warning("Event rule was not created") return {"created": False} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def delete(Name, region=None, key=None, keyid=None, profile=None): @@ -178,7 +179,7 @@ def delete(Name, region=None, key=None, keyid=None, profile=None): conn.delete_rule(Name=Name) return {"deleted": True} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def describe(Name, region=None, key=None, keyid=None, profile=None): @@ -212,10 +213,10 @@ def describe(Name, region=None, key=None, keyid=None, profile=None): else: return {"rule": None} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "RuleNotFoundException": return {"error": "Rule {} not found".format(Rule)} - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def list_rules(region=None, key=None, keyid=None, profile=None): @@ -240,7 +241,7 @@ def list_rules(region=None, key=None, keyid=None, profile=None): NextToken = r.get("NextToken") return ret except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def list_targets(Rule, region=None, key=None, keyid=None, profile=None): @@ -268,10 +269,10 @@ def list_targets(Rule, region=None, key=None, keyid=None, profile=None): else: return {"targets": None} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "RuleNotFoundException": return {"error": "Rule {} not found".format(Rule)} - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def put_targets(Rule, Targets, region=None, key=None, keyid=None, profile=None): @@ -297,10 +298,10 @@ def put_targets(Rule, Targets, region=None, key=None, keyid=None, profile=None): else: return {"failures": None} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "RuleNotFoundException": return {"error": "Rule {} not found".format(Rule)} - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def remove_targets(Rule, Ids, region=None, key=None, keyid=None, profile=None): @@ -326,7 +327,7 @@ def remove_targets(Rule, Ids, region=None, key=None, keyid=None, profile=None): else: return {"failures": None} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "RuleNotFoundException": return {"error": "Rule {} not found".format(Rule)} - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} diff --git a/salt/modules/boto_cognitoidentity.py b/salt/modules/boto_cognitoidentity.py index 5d8e7d8aa8fe..b6ba1337638c 100644 --- a/salt/modules/boto_cognitoidentity.py +++ b/salt/modules/boto_cognitoidentity.py @@ -78,6 +78,7 @@ import logging +import salt.utils.boto3mod import salt.utils.compat import salt.utils.versions @@ -114,7 +115,7 @@ def __virtual__(): def __init__(opts): if HAS_BOTO: - __utils__["boto3.assign_funcs"](__name__, "cognito-identity") + salt.utils.boto3mod.assign_funcs(__name__, "cognito-identity") def _find_identity_pool_ids(name, pool_id, conn): @@ -124,7 +125,7 @@ def _find_identity_pool_ids(name, pool_id, conn): """ ids = [] if pool_id is None: - for pools in __utils__["boto3.paged_call"]( + for pools in salt.utils.boto3mod.paged_call( conn.list_identity_pools, marker_flag="NextToken", marker_arg="NextToken", @@ -177,7 +178,7 @@ def describe_identity_pools( else: return {"identity_pools": None} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def create_identity_pool( @@ -230,7 +231,7 @@ def create_identity_pool( return {"created": True, "identity_pool": response} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def delete_identity_pools( @@ -270,7 +271,7 @@ def delete_identity_pools( else: return {"deleted": False, "count": count} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def get_identity_pool_roles( @@ -310,7 +311,7 @@ def get_identity_pool_roles( else: return {"identity_pool_roles": None} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def _get_role_arn(name, **conn_params): @@ -390,7 +391,7 @@ def set_identity_pool_roles( return {"set": True, "roles": Roles} except ClientError as e: - return {"set": False, "error": __utils__["boto3.get_error"](e)} + return {"set": False, "error": salt.utils.boto3mod.get_error(e)} def update_identity_pool( @@ -475,4 +476,4 @@ def update_identity_pool( return {"updated": True, "identity_pool": response} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} diff --git a/salt/modules/boto_dynamodb.py b/salt/modules/boto_dynamodb.py index e83bf6bec9dd..8fb4e6a566a8 100644 --- a/salt/modules/boto_dynamodb.py +++ b/salt/modules/boto_dynamodb.py @@ -46,6 +46,7 @@ import logging import time +import salt.utils.botomod import salt.utils.versions from salt.exceptions import SaltInvocationError @@ -80,7 +81,7 @@ def __virtual__(): """ has_boto_reqs = salt.utils.versions.check_boto_reqs(check_boto3=False) if has_boto_reqs is True: - __utils__["boto.assign_funcs"](__name__, "dynamodb2", pack=__salt__) + salt.utils.botomod.assign_funcs(__name__, "dynamodb2", pack=__salt__) return has_boto_reqs diff --git a/salt/modules/boto_ec2.py b/salt/modules/boto_ec2.py index 73281ab4249f..6747220ba89f 100644 --- a/salt/modules/boto_ec2.py +++ b/salt/modules/boto_ec2.py @@ -46,6 +46,7 @@ import logging import time +import salt.utils.botomod import salt.utils.compat import salt.utils.data import salt.utils.json @@ -84,13 +85,13 @@ def __virtual__(): boto_ver="2.8.0", check_boto3=False ) if has_boto_reqs is True: - __utils__["boto.assign_funcs"](__name__, "ec2", pack=__salt__) + salt.utils.botomod.assign_funcs(__name__, "ec2", pack=__salt__) return has_boto_reqs def __init__(opts): if HAS_BOTO: - __utils__["boto.assign_funcs"](__name__, "ec2") + salt.utils.botomod.assign_funcs(__name__, "ec2") def _get_all_eip_addresses( @@ -1664,7 +1665,7 @@ def get_network_interface_id(name, region=None, key=None, keyid=None, profile=No eni = enis[0] r["result"] = eni.id except boto.exception.EC2ResponseError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -1720,7 +1721,7 @@ def _get_network_interface(conn, name=None, network_interface_id=None): eni = enis[0] r["result"] = eni except boto.exception.EC2ResponseError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -1839,7 +1840,7 @@ def create_network_interface( ) eni.add_tag("Name", name) except boto.exception.EC2ResponseError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r r["result"] = _describe_network_interface(eni) return r @@ -1883,7 +1884,7 @@ def delete_network_interface( try: r["result"] = conn.delete_network_interface(network_interface_id) except boto.exception.EC2ResponseError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -1948,7 +1949,7 @@ def attach_network_interface( network_interface_id, instance_id, device_index ) except boto.exception.EC2ResponseError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -1993,7 +1994,7 @@ def detach_network_interface( try: r["result"] = conn.detach_network_interface(attachment_id, force) except boto.exception.EC2ResponseError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -2074,7 +2075,7 @@ def modify_network_interface_attribute( network_interface_id, _attr, _value, attachment_id=_attachment_id ) except boto.exception.EC2ResponseError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -2632,5 +2633,5 @@ def create_volume( else: ret["result"] = vol.id except boto.exception.BotoServerError as error: - ret["error"] = __utils__["boto.get_error"](error) + ret["error"] = salt.utils.botomod.get_error(error) return ret diff --git a/salt/modules/boto_elasticache.py b/salt/modules/boto_elasticache.py index 43f183b0f393..f17dcc30f257 100644 --- a/salt/modules/boto_elasticache.py +++ b/salt/modules/boto_elasticache.py @@ -47,6 +47,7 @@ import logging import time +import salt.utils.botomod import salt.utils.odict as odict import salt.utils.versions from salt.exceptions import SaltInvocationError @@ -73,7 +74,7 @@ def __virtual__(): """ has_boto_reqs = salt.utils.versions.check_boto_reqs(check_boto3=False) if has_boto_reqs is True: - __utils__["boto.assign_funcs"](__name__, "elasticache", pack=__salt__) + salt.utils.botomod.assign_funcs(__name__, "elasticache", pack=__salt__) return has_boto_reqs diff --git a/salt/modules/boto_elasticsearch_domain.py b/salt/modules/boto_elasticsearch_domain.py index 050ef2f011b8..a45763670224 100644 --- a/salt/modules/boto_elasticsearch_domain.py +++ b/salt/modules/boto_elasticsearch_domain.py @@ -76,6 +76,7 @@ import logging +import salt.utils.boto3mod import salt.utils.compat import salt.utils.json import salt.utils.versions @@ -114,7 +115,7 @@ def __virtual__(): def __init__(opts): if HAS_BOTO: - __utils__["boto3.assign_funcs"](__name__, "es") + salt.utils.boto3mod.assign_funcs(__name__, "es") def exists(DomainName, region=None, key=None, keyid=None, profile=None): @@ -139,7 +140,7 @@ def exists(DomainName, region=None, key=None, keyid=None, profile=None): except ClientError as e: if e.response.get("Error", {}).get("Code") == "ResourceNotFoundException": return {"exists": False} - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def status(DomainName, region=None, key=None, keyid=None, profile=None): @@ -179,7 +180,7 @@ def status(DomainName, region=None, key=None, keyid=None, profile=None): else: return {"domain": None} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def describe(DomainName, region=None, key=None, keyid=None, profile=None): @@ -216,7 +217,7 @@ def describe(DomainName, region=None, key=None, keyid=None, profile=None): else: return {"domain": None} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def create( @@ -287,7 +288,7 @@ def create( log.warning("Domain was not created") return {"created": False} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def delete(DomainName, region=None, key=None, keyid=None, profile=None): @@ -310,7 +311,7 @@ def delete(DomainName, region=None, key=None, keyid=None, profile=None): conn.delete_elasticsearch_domain(DomainName=DomainName) return {"deleted": True} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def update( @@ -379,7 +380,7 @@ def update( return {"updated": False} return {"updated": True} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def add_tags( @@ -429,7 +430,7 @@ def add_tags( conn.add_tags(ARN=ARN, TagList=tagslist) return {"tagged": True} except ClientError as e: - return {"tagged": False, "error": __utils__["boto3.get_error"](e)} + return {"tagged": False, "error": salt.utils.boto3mod.get_error(e)} def remove_tags( @@ -474,7 +475,7 @@ def remove_tags( conn.remove_tags(ARN=domaindata.get("domain", {}).get("ARN"), TagKeys=TagKeys) return {"tagged": True} except ClientError as e: - return {"tagged": False, "error": __utils__["boto3.get_error"](e)} + return {"tagged": False, "error": salt.utils.boto3mod.get_error(e)} def list_tags( @@ -526,4 +527,4 @@ def list_tags( tagdict[tag.get("Key")] = tag.get("Value") return {"tags": tagdict} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} diff --git a/salt/modules/boto_elb.py b/salt/modules/boto_elb.py index c912ce63bc0b..c11dee23f0ef 100644 --- a/salt/modules/boto_elb.py +++ b/salt/modules/boto_elb.py @@ -46,6 +46,8 @@ import logging import time +import salt.utils.boto_elb_tag +import salt.utils.botomod import salt.utils.json import salt.utils.odict as odict import salt.utils.versions @@ -76,7 +78,9 @@ def __virtual__(): boto_ver="2.33.0", check_boto3=False ) if has_boto_reqs is True: - __utils__["boto.assign_funcs"](__name__, "elb", module="ec2.elb", pack=__salt__) + salt.utils.botomod.assign_funcs( + __name__, "elb", module="ec2.elb", pack=__salt__ + ) return has_boto_reqs @@ -1124,7 +1128,7 @@ def _get_all_tags(conn, load_balancer_names=None): tags = conn.get_object( "DescribeTags", params, - __utils__["boto_elb_tag.get_tag_descriptions"](), + salt.utils.boto_elb_tag.get_tag_descriptions(), verb="POST", ) if tags[load_balancer_names]: diff --git a/salt/modules/boto_elbv2.py b/salt/modules/boto_elbv2.py index 2f20e857459b..d8aa7591fad4 100644 --- a/salt/modules/boto_elbv2.py +++ b/salt/modules/boto_elbv2.py @@ -41,6 +41,7 @@ import logging +import salt.utils.boto3mod import salt.utils.versions try: @@ -67,7 +68,7 @@ def __virtual__(): """ has_boto_reqs = salt.utils.versions.check_boto_reqs() if has_boto_reqs is True: - __utils__["boto3.assign_funcs"](__name__, "elbv2") + salt.utils.boto3mod.assign_funcs(__name__, "elbv2") return has_boto_reqs diff --git a/salt/modules/boto_iam.py b/salt/modules/boto_iam.py index c7ea859ecbc9..11c56bd3e08f 100644 --- a/salt/modules/boto_iam.py +++ b/salt/modules/boto_iam.py @@ -41,10 +41,12 @@ import time import urllib.parse +import salt.utils.botomod import salt.utils.compat import salt.utils.json import salt.utils.odict as odict import salt.utils.versions +import salt.utils.yaml # pylint: disable=unused-import try: @@ -72,7 +74,7 @@ def __virtual__(): def __init__(opts): if HAS_BOTO: - __utils__["boto.assign_funcs"](__name__, "iam", pack=__salt__) + salt.utils.botomod.assign_funcs(__name__, "iam", pack=__salt__) def instance_profile_exists(name, region=None, key=None, keyid=None, profile=None): @@ -1679,7 +1681,7 @@ def export_users(path_prefix="/", region=None, key=None, keyid=None, profile=Non user_sls.append({"policies": policies}) user_sls.append({"path": user.path}) results["manage user " + name] = {"boto_iam.user_present": user_sls} - return __utils__["yaml.safe_dump"](results, default_flow_style=False, indent=2) + return salt.utils.yaml.safe_dump(results, default_flow_style=False, indent=2) def export_roles(path_prefix="/", region=None, key=None, keyid=None, profile=None): @@ -1725,7 +1727,7 @@ def export_roles(path_prefix="/", region=None, key=None, keyid=None, profile=Non ) role_sls.append({"path": role.path}) results["manage role " + name] = {"boto_iam_role.present": role_sls} - return __utils__["yaml.safe_dump"](results, default_flow_style=False, indent=2) + return salt.utils.yaml.safe_dump(results, default_flow_style=False, indent=2) def _get_policy_arn(name, region=None, key=None, keyid=None, profile=None): @@ -1840,7 +1842,7 @@ def delete_policy(policy_name, region=None, key=None, keyid=None, profile=None): conn.delete_policy(policy_arn) log.info("Deleted %s policy.", policy_name) except boto.exception.BotoServerError as e: - aws = __utils__["boto.get_error"](e) + aws = salt.utils.botomod.get_error(e) log.debug(aws) log.error("Failed to delete %s policy: %s.", policy_name, aws.get("message")) return False @@ -1861,7 +1863,7 @@ def list_policies(region=None, key=None, keyid=None, profile=None): try: policies = [] - for ret in __utils__["boto.paged_call"](conn.list_policies): + for ret in salt.utils.botomod.paged_call(conn.list_policies): policies.append( ret.get("list_policies_response", {}) .get("list_policies_result", {}) @@ -1969,7 +1971,7 @@ def create_policy_version( except boto.exception.BotoServerError as e: log.debug(e) log.error("Failed to create IAM policy %s version %s.", policy_name, vid) - return {"created": False, "error": __utils__["boto.get_error"](e)} + return {"created": False, "error": salt.utils.botomod.get_error(e)} def delete_policy_version( @@ -1993,7 +1995,7 @@ def delete_policy_version( conn.delete_policy_version(policy_arn, version_id) log.info("Deleted IAM policy %s version %s.", policy_name, version_id) except boto.exception.BotoServerError as e: - aws = __utils__["boto.get_error"](e) + aws = salt.utils.botomod.get_error(e) log.debug(aws) log.error( "Failed to delete IAM policy %s version %s: %s", @@ -2050,7 +2052,7 @@ def set_default_policy_version( conn.set_default_policy_version(policy_arn, version_id) log.info("Set %s policy to version %s.", policy_name, version_id) except boto.exception.BotoServerError as e: - aws = __utils__["boto.get_error"](e) + aws = salt.utils.botomod.get_error(e) log.debug(aws) log.error( "Failed to set %s policy to version %s: %s", @@ -2254,7 +2256,7 @@ def list_entities_for_policy( "policy_users": [], "policy_roles": [], } - for ret in __utils__["boto.paged_call"]( + for ret in salt.utils.botomod.paged_call( conn.list_entities_for_policy, policy_arn=policy_arn, **params ): for k, v in allret.items(): @@ -2305,7 +2307,7 @@ def list_attached_user_policies( try: # Using conn.get_response is a bit of a hack, but it avoids having to # rewrite this whole module based on boto3 - for ret in __utils__["boto.paged_call"]( + for ret in salt.utils.botomod.paged_call( conn.get_response, "ListAttachedUserPolicies", params, @@ -2351,7 +2353,7 @@ def list_attached_group_policies( try: # Using conn.get_response is a bit of a hack, but it avoids having to # rewrite this whole module based on boto3 - for ret in __utils__["boto.paged_call"]( + for ret in salt.utils.botomod.paged_call( conn.get_response, "ListAttachedGroupPolicies", params, @@ -2397,7 +2399,7 @@ def list_attached_role_policies( try: # Using conn.get_response is a bit of a hack, but it avoids having to # rewrite this whole module based on boto3 - for ret in __utils__["boto.paged_call"]( + for ret in salt.utils.botomod.paged_call( conn.get_response, "ListAttachedRolePolicies", params, @@ -2433,7 +2435,7 @@ def create_saml_provider( log.info("Successfully created %s SAML provider.", name) return True except boto.exception.BotoServerError as e: - aws = __utils__["boto.get_error"](e) + aws = salt.utils.botomod.get_error(e) log.debug(aws) log.error("Failed to create SAML provider %s.", name) return False @@ -2461,7 +2463,7 @@ def get_saml_provider_arn(name, region=None, key=None, keyid=None, profile=None) return saml_provider["arn"] return False except boto.exception.BotoServerError as e: - aws = __utils__["boto.get_error"](e) + aws = salt.utils.botomod.get_error(e) log.debug(aws) log.error("Failed to get ARN of SAML provider %s.", name) return False @@ -2489,7 +2491,7 @@ def delete_saml_provider(name, region=None, key=None, keyid=None, profile=None): log.info("Successfully deleted SAML provider %s.", name) return True except boto.exception.BotoServerError as e: - aws = __utils__["boto.get_error"](e) + aws = salt.utils.botomod.get_error(e) log.debug(aws) log.error("Failed to delete SAML provider %s.", name) return False @@ -2515,7 +2517,7 @@ def list_saml_providers(region=None, key=None, keyid=None, profile=None): providers.append(arn["arn"].rsplit("/", 1)[1]) return providers except boto.exception.BotoServerError as e: - log.debug(__utils__["boto.get_error"](e)) + log.debug(salt.utils.botomod.get_error(e)) log.error("Failed to get list of SAML providers.") return False @@ -2537,7 +2539,7 @@ def get_saml_provider(name, region=None, key=None, keyid=None, profile=None): "saml_metadata_document" ] except boto.exception.BotoServerError as e: - log.debug(__utils__["boto.get_error"](e)) + log.debug(salt.utils.botomod.get_error(e)) log.error("Failed to get SAML provider document %s.", name) return False @@ -2566,6 +2568,6 @@ def update_saml_provider( return True return False except boto.exception.BotoServerError as e: - log.debug(__utils__["boto.get_error"](e)) + log.debug(salt.utils.botomod.get_error(e)) log.error("Failed to update SAML provider %s.", name) return False diff --git a/salt/modules/boto_iot.py b/salt/modules/boto_iot.py index 6985d4168139..e4492002b49a 100644 --- a/salt/modules/boto_iot.py +++ b/salt/modules/boto_iot.py @@ -52,6 +52,7 @@ import datetime import logging +import salt.utils.boto3mod import salt.utils.compat import salt.utils.json import salt.utils.versions @@ -89,7 +90,7 @@ def __virtual__(): def __init__(opts): if HAS_BOTO: - __utils__["boto3.assign_funcs"](__name__, "iot") + salt.utils.boto3mod.assign_funcs(__name__, "iot") def thing_type_exists(thingTypeName, region=None, key=None, keyid=None, profile=None): @@ -117,7 +118,7 @@ def thing_type_exists(thingTypeName, region=None, key=None, keyid=None, profile= else: return {"exists": False} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "ResourceNotFoundException": return {"exists": False} return {"error": err} @@ -153,7 +154,7 @@ def describe_thing_type(thingTypeName, region=None, key=None, keyid=None, profil else: return {"thing_type": None} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "ResourceNotFoundException": return {"thing_type": None} return {"error": err} @@ -205,7 +206,7 @@ def create_thing_type( log.warning("thing type was not created") return {"created": False} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def deprecate_thing_type( @@ -236,7 +237,7 @@ def deprecate_thing_type( deprecated = True if undoDeprecate is False else False return {"deprecated": deprecated} except ClientError as e: - return {"deprecated": False, "error": __utils__["boto3.get_error"](e)} + return {"deprecated": False, "error": salt.utils.boto3mod.get_error(e)} def delete_thing_type(thingTypeName, region=None, key=None, keyid=None, profile=None): @@ -261,7 +262,7 @@ def delete_thing_type(thingTypeName, region=None, key=None, keyid=None, profile= conn.delete_thing_type(thingTypeName=thingTypeName) return {"deleted": True} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "ResourceNotFoundException": return {"deleted": True} return {"deleted": False, "error": err} @@ -287,7 +288,7 @@ def policy_exists(policyName, region=None, key=None, keyid=None, profile=None): conn.get_policy(policyName=policyName) return {"exists": True} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "ResourceNotFoundException": return {"exists": False} return {"error": err} @@ -331,7 +332,7 @@ def create_policy( log.warning("Policy was not created") return {"created": False} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def delete_policy(policyName, region=None, key=None, keyid=None, profile=None): @@ -354,7 +355,7 @@ def delete_policy(policyName, region=None, key=None, keyid=None, profile=None): conn.delete_policy(policyName=policyName) return {"deleted": True} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def describe_policy(policyName, region=None, key=None, keyid=None, profile=None): @@ -380,10 +381,10 @@ def describe_policy(policyName, region=None, key=None, keyid=None, profile=None) else: return {"policy": None} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "ResourceNotFoundException": return {"policy": None} - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def policy_version_exists( @@ -410,10 +411,10 @@ def policy_version_exists( ) return {"exists": bool(policy)} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "ResourceNotFoundException": return {"exists": False} - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def create_policy_version( @@ -459,7 +460,7 @@ def create_policy_version( log.warning("Policy version was not created") return {"created": False} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def delete_policy_version( @@ -486,7 +487,7 @@ def delete_policy_version( ) return {"deleted": True} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def describe_policy_version( @@ -522,10 +523,10 @@ def describe_policy_version( else: return {"policy": None} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "ResourceNotFoundException": return {"policy": None} - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def list_policies(region=None, key=None, keyid=None, profile=None): @@ -552,7 +553,7 @@ def list_policies(region=None, key=None, keyid=None, profile=None): try: conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile) policies = [] - for ret in __utils__["boto3.paged_call"]( + for ret in salt.utils.boto3mod.paged_call( conn.list_policies, marker_flag="nextMarker", marker_arg="marker" ): policies.extend(ret["policies"]) @@ -560,7 +561,7 @@ def list_policies(region=None, key=None, keyid=None, profile=None): log.warning("No policies found") return {"policies": policies} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def list_policy_versions(policyName, region=None, key=None, keyid=None, profile=None): @@ -585,7 +586,7 @@ def list_policy_versions(policyName, region=None, key=None, keyid=None, profile= try: conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile) vers = [] - for ret in __utils__["boto3.paged_call"]( + for ret in salt.utils.boto3mod.paged_call( conn.list_policy_versions, marker_flag="nextMarker", marker_arg="marker", @@ -596,7 +597,7 @@ def list_policy_versions(policyName, region=None, key=None, keyid=None, profile= log.warning("No versions found") return {"policyVersions": vers} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def set_default_policy_version( @@ -624,7 +625,7 @@ def set_default_policy_version( ) return {"changed": True} except ClientError as e: - return {"changed": False, "error": __utils__["boto3.get_error"](e)} + return {"changed": False, "error": salt.utils.boto3mod.get_error(e)} def list_principal_policies(principal, region=None, key=None, keyid=None, profile=None): @@ -649,7 +650,7 @@ def list_principal_policies(principal, region=None, key=None, keyid=None, profil try: conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile) vers = [] - for ret in __utils__["boto3.paged_call"]( + for ret in salt.utils.boto3mod.paged_call( conn.list_principal_policies, principal=principal, marker_flag="nextMarker", @@ -660,7 +661,7 @@ def list_principal_policies(principal, region=None, key=None, keyid=None, profil log.warning("No policies found") return {"policies": vers} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def attach_principal_policy( @@ -685,7 +686,7 @@ def attach_principal_policy( conn.attach_principal_policy(policyName=policyName, principal=principal) return {"attached": True} except ClientError as e: - return {"attached": False, "error": __utils__["boto3.get_error"](e)} + return {"attached": False, "error": salt.utils.boto3mod.get_error(e)} def detach_principal_policy( @@ -710,7 +711,7 @@ def detach_principal_policy( conn.detach_principal_policy(policyName=policyName, principal=principal) return {"detached": True} except ClientError as e: - return {"detached": False, "error": __utils__["boto3.get_error"](e)} + return {"detached": False, "error": salt.utils.boto3mod.get_error(e)} def topic_rule_exists(ruleName, region=None, key=None, keyid=None, profile=None): @@ -738,10 +739,10 @@ def topic_rule_exists(ruleName, region=None, key=None, keyid=None, profile=None) # use, it's more useful to assume lack of existence than to assume a # genuine authorization problem; authorization problems should not be # the common case. - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "UnauthorizedException": return {"exists": False} - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def create_topic_rule( @@ -784,7 +785,7 @@ def create_topic_rule( ) return {"created": True} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def replace_topic_rule( @@ -827,7 +828,7 @@ def replace_topic_rule( ) return {"replaced": True} except ClientError as e: - return {"replaced": False, "error": __utils__["boto3.get_error"](e)} + return {"replaced": False, "error": salt.utils.boto3mod.get_error(e)} def delete_topic_rule(ruleName, region=None, key=None, keyid=None, profile=None): @@ -850,7 +851,7 @@ def delete_topic_rule(ruleName, region=None, key=None, keyid=None, profile=None) conn.delete_topic_rule(ruleName=ruleName) return {"deleted": True} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def describe_topic_rule(ruleName, region=None, key=None, keyid=None, profile=None): @@ -877,7 +878,7 @@ def describe_topic_rule(ruleName, region=None, key=None, keyid=None, profile=Non else: return {"rule": None} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def list_topic_rules( @@ -911,7 +912,7 @@ def list_topic_rules( if ruleDisabled is not None: kwargs["ruleDisabled"] = ruleDisabled rules = [] - for ret in __utils__["boto3.paged_call"]( + for ret in salt.utils.boto3mod.paged_call( conn.list_topic_rules, marker_flag="nextToken", marker_arg="nextToken", @@ -922,4 +923,4 @@ def list_topic_rules( log.warning("No rules found") return {"rules": rules} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} diff --git a/salt/modules/boto_kinesis.py b/salt/modules/boto_kinesis.py index b93caae2d3a7..1e78ce1ec827 100644 --- a/salt/modules/boto_kinesis.py +++ b/salt/modules/boto_kinesis.py @@ -49,6 +49,7 @@ import random import time +import salt.utils.boto3mod import salt.utils.versions # pylint: disable=unused-import @@ -73,7 +74,7 @@ def __virtual__(): """ has_boto_reqs = salt.utils.versions.check_boto_reqs() if has_boto_reqs is True: - __utils__["boto3.assign_funcs"](__name__, "kinesis") + salt.utils.boto3mod.assign_funcs(__name__, "kinesis") return __virtualname__ return has_boto_reqs diff --git a/salt/modules/boto_kms.py b/salt/modules/boto_kms.py index ac106655d5bd..f88319f276ec 100644 --- a/salt/modules/boto_kms.py +++ b/salt/modules/boto_kms.py @@ -39,6 +39,7 @@ import logging import salt.serializers.json +import salt.utils.botomod import salt.utils.compat import salt.utils.odict as odict import salt.utils.versions @@ -66,7 +67,7 @@ def __virtual__(): def __init__(opts): if HAS_BOTO: - __utils__["boto.assign_funcs"](__name__, "kms", pack=__salt__) + salt.utils.botomod.assign_funcs(__name__, "kms", pack=__salt__) def create_alias( @@ -89,7 +90,7 @@ def create_alias( r["result"] = True except boto.exception.BotoServerError as e: r["result"] = False - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -130,7 +131,7 @@ def create_grant( grant_tokens=grant_tokens, ) except boto.exception.BotoServerError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -162,7 +163,7 @@ def create_key( ) r["key_metadata"] = key_metadata["KeyMetadata"] except boto.exception.BotoServerError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -195,7 +196,7 @@ def decrypt( ) r["plaintext"] = plaintext["Plaintext"] except boto.exception.BotoServerError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -220,7 +221,7 @@ def key_exists(key_id, region=None, key=None, keyid=None, profile=None): if isinstance(e, boto.kms.exceptions.NotFoundException): r["result"] = False return r - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -250,7 +251,7 @@ def describe_key(key_id, region=None, key=None, keyid=None, profile=None): # TODO: add to context cache r["key_metadata"] = key["KeyMetadata"] except boto.exception.BotoServerError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -272,7 +273,7 @@ def disable_key(key_id, region=None, key=None, keyid=None, profile=None): r["result"] = True except boto.exception.BotoServerError as e: r["result"] = False - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -294,7 +295,7 @@ def disable_key_rotation(key_id, region=None, key=None, keyid=None, profile=None r["result"] = True except boto.exception.BotoServerError as e: r["result"] = False - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -316,7 +317,7 @@ def enable_key(key_id, region=None, key=None, keyid=None, profile=None): r["result"] = True except boto.exception.BotoServerError as e: r["result"] = False - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -338,7 +339,7 @@ def enable_key_rotation(key_id, region=None, key=None, keyid=None, profile=None) r["result"] = True except boto.exception.BotoServerError as e: r["result"] = False - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -373,7 +374,7 @@ def encrypt( ) r["ciphertext"] = ciphertext["CiphertextBlob"] except boto.exception.BotoServerError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -410,7 +411,7 @@ def generate_data_key( ) r["data_key"] = data_key except boto.exception.BotoServerError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -447,7 +448,7 @@ def generate_data_key_without_plaintext( ) r["data_key"] = data_key except boto.exception.BotoServerError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -470,7 +471,7 @@ def generate_random( random = conn.generate_random(number_of_bytes) r["random"] = random["Plaintext"] except boto.exception.BotoServerError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -495,7 +496,7 @@ def get_key_policy( key_policy["Policy"], object_pairs_hook=odict.OrderedDict ) except boto.exception.BotoServerError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -516,7 +517,7 @@ def get_key_rotation_status(key_id, region=None, key=None, keyid=None, profile=N key_rotation_status = conn.get_key_rotation_status(key_id) r["result"] = key_rotation_status["KeyRotationEnabled"] except boto.exception.BotoServerError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -550,7 +551,7 @@ def list_grants( break r["grants"] = _grants except boto.exception.BotoServerError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -576,7 +577,7 @@ def list_key_policies( # TODO: handle limit, marker and truncation automatically. r["key_policies"] = key_policies["PolicyNames"] except boto.exception.BotoServerError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -602,7 +603,7 @@ def put_key_policy( r["result"] = True except boto.exception.BotoServerError as e: r["result"] = False - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -639,7 +640,7 @@ def re_encrypt( ) r["ciphertext"] = ciphertext except boto.exception.BotoServerError as e: - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -663,7 +664,7 @@ def revoke_grant(key_id, grant_id, region=None, key=None, keyid=None, profile=No r["result"] = True except boto.exception.BotoServerError as e: r["result"] = False - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r @@ -687,5 +688,5 @@ def update_key_description( r["result"] = True except boto.exception.BotoServerError as e: r["result"] = False - r["error"] = __utils__["boto.get_error"](e) + r["error"] = salt.utils.botomod.get_error(e) return r diff --git a/salt/modules/boto_lambda.py b/salt/modules/boto_lambda.py index 313086e53ced..eeaa18810019 100644 --- a/salt/modules/boto_lambda.py +++ b/salt/modules/boto_lambda.py @@ -82,6 +82,7 @@ import random import time +import salt.utils.boto3mod import salt.utils.compat import salt.utils.files import salt.utils.json @@ -125,7 +126,7 @@ def __virtual__(): def __init__(opts): if HAS_BOTO: - __utils__["boto3.assign_funcs"](__name__, "lambda") + salt.utils.boto3mod.assign_funcs(__name__, "lambda") def _find_function(name, region=None, key=None, keyid=None, profile=None): @@ -134,7 +135,7 @@ def _find_function(name, region=None, key=None, keyid=None, profile=None): """ conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile) - for funcs in __utils__["boto3.paged_call"](conn.list_functions): + for funcs in salt.utils.boto3mod.paged_call(conn.list_functions): for func in funcs["Functions"]: if func["FunctionName"] == name: return func @@ -162,7 +163,7 @@ def function_exists(FunctionName, region=None, key=None, keyid=None, profile=Non ) return {"exists": bool(func)} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def _get_role_arn(name, region=None, key=None, keyid=None, profile=None): @@ -342,7 +343,7 @@ def create_function( log.warning("Function was not created") return {"created": False} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def delete_function( @@ -370,7 +371,7 @@ def delete_function( conn.delete_function(FunctionName=FunctionName) return {"deleted": True} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def describe_function(FunctionName, region=None, key=None, keyid=None, profile=None): @@ -411,7 +412,7 @@ def describe_function(FunctionName, region=None, key=None, keyid=None, profile=N else: return {"function": None} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def update_function_config( @@ -526,7 +527,7 @@ def update_function_config( log.warning("Function was not updated") return {"updated": False} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def update_function_code( @@ -602,7 +603,7 @@ def update_function_code( log.warning("Function was not updated") return {"updated": False} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def add_permission( @@ -649,7 +650,7 @@ def add_permission( ) return {"updated": True} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def remove_permission( @@ -685,7 +686,7 @@ def remove_permission( ) return {"updated": True} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def get_permissions( @@ -739,7 +740,7 @@ def get_permissions( permissions[statement.get("Sid")] = permission return {"permissions": permissions} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "ResourceNotFoundException": return {"permissions": None} return {"permissions": None, "error": err} @@ -759,7 +760,7 @@ def list_functions(region=None, key=None, keyid=None, profile=None): conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile) ret = [] - for funcs in __utils__["boto3.paged_call"](conn.list_functions): + for funcs in salt.utils.boto3mod.paged_call(conn.list_functions): ret += funcs["Functions"] return ret @@ -784,7 +785,7 @@ def list_function_versions( try: conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile) vers = [] - for ret in __utils__["boto3.paged_call"]( + for ret in salt.utils.boto3mod.paged_call( conn.list_versions_by_function, FunctionName=FunctionName ): vers.extend(ret["Versions"]) @@ -792,7 +793,7 @@ def list_function_versions( log.warning("No versions found") return {"Versions": vers} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def create_alias( @@ -834,7 +835,7 @@ def create_alias( log.warning("Alias was not created") return {"created": False} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def delete_alias(FunctionName, Name, region=None, key=None, keyid=None, profile=None): @@ -857,7 +858,7 @@ def delete_alias(FunctionName, Name, region=None, key=None, keyid=None, profile= conn.delete_alias(FunctionName=FunctionName, Name=Name) return {"deleted": True} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def _find_alias( @@ -878,7 +879,7 @@ def _find_alias( if FunctionVersion: args["FunctionVersion"] = FunctionVersion - for aliases in __utils__["boto3.paged_call"](conn.list_aliases, **args): + for aliases in salt.utils.boto3mod.paged_call(conn.list_aliases, **args): for alias in aliases.get("Aliases"): if alias["Name"] == Name: return alias @@ -906,7 +907,7 @@ def alias_exists(FunctionName, Name, region=None, key=None, keyid=None, profile= ) return {"exists": bool(alias)} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def describe_alias(FunctionName, Name, region=None, key=None, keyid=None, profile=None): @@ -933,7 +934,7 @@ def describe_alias(FunctionName, Name, region=None, key=None, keyid=None, profil else: return {"alias": None} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def update_alias( @@ -975,7 +976,7 @@ def update_alias( log.warning("Alias was not updated") return {"updated": False} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def create_event_source_mapping( @@ -1021,7 +1022,7 @@ def create_event_source_mapping( log.warning("Event source mapping was not created") return {"created": False} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def get_event_source_mapping_ids( @@ -1041,7 +1042,7 @@ def get_event_source_mapping_ids( conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile) try: mappings = [] - for maps in __utils__["boto3.paged_call"]( + for maps in salt.utils.boto3mod.paged_call( conn.list_event_source_mappings, EventSourceArn=EventSourceArn, FunctionName=FunctionName, @@ -1051,7 +1052,7 @@ def get_event_source_mapping_ids( ) return mappings except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def _get_ids( @@ -1116,7 +1117,7 @@ def delete_event_source_mapping( conn.delete_event_source_mapping(UUID=id) return {"deleted": True} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def event_source_mapping_exists( @@ -1202,7 +1203,7 @@ def describe_event_source_mapping( else: return {"event_source_mapping": None} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def update_event_source_mapping( @@ -1258,4 +1259,4 @@ def update_event_source_mapping( log.warning("Mapping was not updated") return {"updated": False} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} diff --git a/salt/modules/boto_rds.py b/salt/modules/boto_rds.py index 129c80bc6fe1..1f332980eb9c 100644 --- a/salt/modules/boto_rds.py +++ b/salt/modules/boto_rds.py @@ -49,6 +49,7 @@ import logging import time +import salt.utils.boto3mod import salt.utils.compat import salt.utils.odict as odict import salt.utils.versions @@ -129,7 +130,7 @@ def __virtual__(): def __init__(opts): if HAS_BOTO: - __utils__["boto3.assign_funcs"](__name__, "rds") + salt.utils.boto3mod.assign_funcs(__name__, "rds") def exists(name, tags=None, region=None, key=None, keyid=None, profile=None): @@ -148,7 +149,7 @@ def exists(name, tags=None, region=None, key=None, keyid=None, profile=None): rds = conn.describe_db_instances(DBInstanceIdentifier=name) return {"exists": bool(rds)} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def option_group_exists( @@ -169,7 +170,7 @@ def option_group_exists( rds = conn.describe_option_groups(OptionGroupName=name) return {"exists": bool(rds)} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def parameter_group_exists( @@ -194,7 +195,7 @@ def parameter_group_exists( resp = {} if e.response["Error"]["Code"] == "DBParameterGroupNotFound": resp["exists"] = False - resp["error"] = __utils__["boto3.get_error"](e) + resp["error"] = salt.utils.boto3mod.get_error(e) return resp @@ -222,7 +223,7 @@ def subnet_group_exists( if "DBSubnetGroupNotFoundFault" in e.message: return {"exists": False} else: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def create( @@ -371,7 +372,7 @@ def create( log.info("Instance status after 10 seconds is: %s", stat) except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def create_read_replica( @@ -449,7 +450,7 @@ def create_read_replica( return {"exists": bool(rds_replica)} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def create_option_group( @@ -493,7 +494,7 @@ def create_option_group( return {"exists": bool(rds)} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def create_parameter_group( @@ -543,7 +544,7 @@ def create_parameter_group( "message": "Created RDS parameter group {}".format(name), } except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def create_subnet_group( @@ -586,7 +587,7 @@ def create_subnet_group( return {"created": bool(rds)} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def update_parameter_group( @@ -644,7 +645,7 @@ def update_parameter_group( ) return {"results": bool(res)} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def describe(name, tags=None, region=None, key=None, keyid=None, profile=None): @@ -714,7 +715,7 @@ def describe(name, tags=None, region=None, key=None, keyid=None, profile=None): else: return {"rds": None} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} except IndexError: return {"rds": None} @@ -752,7 +753,7 @@ def describe_db_instances( except ClientError as e: code = getattr(e, "response", {}).get("Error", {}).get("Code") if code != "DBInstanceNotFound": - log.error(__utils__["boto3.get_error"](e)) + log.error(salt.utils.boto3mod.get_error(e)) return [] @@ -811,7 +812,7 @@ def get_endpoint(name, tags=None, region=None, key=None, keyid=None, profile=Non return endpoint except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} return endpoint @@ -899,7 +900,7 @@ def delete( ) time.sleep(10) except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def delete_option_group(name, region=None, key=None, keyid=None, profile=None): @@ -930,7 +931,7 @@ def delete_option_group(name, region=None, key=None, keyid=None, profile=None): "message": "Deleted RDS option group {}.".format(name), } except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def delete_parameter_group(name, region=None, key=None, keyid=None, profile=None): @@ -955,7 +956,7 @@ def delete_parameter_group(name, region=None, key=None, keyid=None, profile=None "message": "Deleted RDS parameter group {}.".format(name), } except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def delete_subnet_group(name, region=None, key=None, keyid=None, profile=None): @@ -980,7 +981,7 @@ def delete_subnet_group(name, region=None, key=None, keyid=None, profile=None): "message": "Deleted RDS subnet group {}.".format(name), } except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def describe_parameter_group( @@ -1032,7 +1033,7 @@ def describe_parameter_group( "message": "Got RDS descrition for group {}.".format(name), } except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def describe_parameters( @@ -1108,7 +1109,7 @@ def describe_parameters( ret["parameters"] = parameters return ret except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def modify_db_instance( @@ -1198,7 +1199,7 @@ def modify_db_instance( "results": dict(info), } except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def _tag_doc(tags): diff --git a/salt/modules/boto_route53.py b/salt/modules/boto_route53.py index 500e6f2cb782..ba8dcd20c2c3 100644 --- a/salt/modules/boto_route53.py +++ b/salt/modules/boto_route53.py @@ -48,6 +48,7 @@ import logging import time +import salt.utils.botomod import salt.utils.compat import salt.utils.odict as odict import salt.utils.versions @@ -79,7 +80,7 @@ def __virtual__(): def __init__(opts): if HAS_BOTO: - __utils__["boto.assign_funcs"](__name__, "route53", pack=__salt__) + salt.utils.botomod.assign_funcs(__name__, "route53", pack=__salt__) def _get_split_zone(zone, _conn, private_zone): @@ -490,7 +491,7 @@ def create_healthcheck( time.sleep(3) error_retries -= 1 continue - return {"error": __utils__["boto.get_error"](exc)} + return {"error": salt.utils.botomod.get_error(exc)} return False diff --git a/salt/modules/boto_s3.py b/salt/modules/boto_s3.py index bef68657e9b0..481be496c7fa 100644 --- a/salt/modules/boto_s3.py +++ b/salt/modules/boto_s3.py @@ -52,6 +52,7 @@ import logging +import salt.utils.boto3mod import salt.utils.versions log = logging.getLogger(__name__) @@ -81,7 +82,7 @@ def __virtual__(): def __init__(opts): # pylint: disable=unused-argument if HAS_BOTO: - __utils__["boto3.assign_funcs"](__name__, "s3") + salt.utils.boto3mod.assign_funcs(__name__, "s3") def get_object_metadata( @@ -120,7 +121,7 @@ def get_object_metadata( except botocore.exceptions.ClientError as e: if e.response["Error"]["Message"] == "Not Found": return {"result": None} - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} return {"result": metadata} @@ -156,7 +157,7 @@ def upload_file( try: conn.upload_file(source, bucket, s3_key, ExtraArgs=extra_args) except boto3.exceptions.S3UploadFailedError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} log.info("S3 object uploaded to %s", name) return {"result": True} diff --git a/salt/modules/boto_s3_bucket.py b/salt/modules/boto_s3_bucket.py index 9fc2417cbfcd..433d81ecc74b 100644 --- a/salt/modules/boto_s3_bucket.py +++ b/salt/modules/boto_s3_bucket.py @@ -53,6 +53,7 @@ import logging +import salt.utils.boto3mod import salt.utils.compat import salt.utils.json import salt.utils.versions @@ -90,7 +91,7 @@ def __virtual__(): def __init__(opts): if HAS_BOTO: - __utils__["boto3.assign_funcs"](__name__, "s3") + salt.utils.boto3mod.assign_funcs(__name__, "s3") def exists(Bucket, region=None, key=None, keyid=None, profile=None): @@ -115,7 +116,7 @@ def exists(Bucket, region=None, key=None, keyid=None, profile=None): except ClientError as e: if e.response.get("Error", {}).get("Code") == "404": return {"exists": False} - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) return {"error": err} @@ -180,7 +181,7 @@ def create( log.warning("Bucket was not created") return {"created": False} except ClientError as e: - return {"created": False, "error": __utils__["boto3.get_error"](e)} + return {"created": False, "error": salt.utils.boto3mod.get_error(e)} def delete( @@ -222,7 +223,7 @@ def delete( conn.delete_bucket(Bucket=Bucket) return {"deleted": True} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def delete_objects( @@ -270,7 +271,7 @@ def delete_objects( ret = conn.delete_objects(**args) failed += ret.get("Errors", []) except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} if failed: return {"deleted": False, "failed": failed} @@ -339,10 +340,10 @@ def describe(Bucket, region=None, key=None, keyid=None, profile=None): result["Tagging"] = tags return {"bucket": result} except ClientError as e: - err = __utils__["boto3.get_error"](e) + err = salt.utils.boto3mod.get_error(e) if e.response.get("Error", {}).get("Code") == "NoSuchBucket": return {"bucket": None} - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def empty( @@ -416,7 +417,7 @@ def list(region=None, key=None, keyid=None, profile=None): del buckets["ResponseMetadata"] return buckets except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def list_object_versions( @@ -461,7 +462,7 @@ def list_object_versions( DeleteMarkers += ret.get("DeleteMarkers", []) return {"Versions": Versions, "DeleteMarkers": DeleteMarkers} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def list_objects( @@ -506,7 +507,7 @@ def list_objects( Contents += ret.get("Contents", []) return {"Contents": Contents} except ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def put_acl( @@ -560,7 +561,7 @@ def put_acl( conn.put_bucket_acl(Bucket=Bucket, **kwargs) return {"updated": True, "name": Bucket} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def put_cors(Bucket, CORSRules, region=None, key=None, keyid=None, profile=None): @@ -591,7 +592,7 @@ def put_cors(Bucket, CORSRules, region=None, key=None, keyid=None, profile=None) conn.put_bucket_cors(Bucket=Bucket, CORSConfiguration={"CORSRules": CORSRules}) return {"updated": True, "name": Bucket} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def put_lifecycle_configuration( @@ -628,7 +629,7 @@ def put_lifecycle_configuration( ) return {"updated": True, "name": Bucket} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def put_logging( @@ -675,7 +676,7 @@ def put_logging( conn.put_bucket_logging(Bucket=Bucket, BucketLoggingStatus=logstatus) return {"updated": True, "name": Bucket} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def put_notification_configuration( @@ -732,7 +733,7 @@ def put_notification_configuration( ) return {"updated": True, "name": Bucket} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def put_policy(Bucket, Policy, region=None, key=None, keyid=None, profile=None): @@ -759,7 +760,7 @@ def put_policy(Bucket, Policy, region=None, key=None, keyid=None, profile=None): conn.put_bucket_policy(Bucket=Bucket, Policy=Policy) return {"updated": True, "name": Bucket} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def _get_role_arn(name, region=None, key=None, keyid=None, profile=None): @@ -807,7 +808,7 @@ def put_replication( ) return {"updated": True, "name": Bucket} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def put_request_payment(Bucket, Payer, region=None, key=None, keyid=None, profile=None): @@ -832,7 +833,7 @@ def put_request_payment(Bucket, Payer, region=None, key=None, keyid=None, profil ) return {"updated": True, "name": Bucket} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def put_tagging(Bucket, region=None, key=None, keyid=None, profile=None, **kwargs): @@ -860,7 +861,7 @@ def put_tagging(Bucket, region=None, key=None, keyid=None, profile=None, **kwarg conn.put_bucket_tagging(Bucket=Bucket, Tagging={"TagSet": tagslist}) return {"updated": True, "name": Bucket} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def put_versioning( @@ -900,7 +901,7 @@ def put_versioning( ) return {"updated": True, "name": Bucket} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def put_website( @@ -948,7 +949,7 @@ def put_website( ) return {"updated": True, "name": Bucket} except ClientError as e: - return {"updated": False, "error": __utils__["boto3.get_error"](e)} + return {"updated": False, "error": salt.utils.boto3mod.get_error(e)} def delete_cors(Bucket, region=None, key=None, keyid=None, profile=None): @@ -971,7 +972,7 @@ def delete_cors(Bucket, region=None, key=None, keyid=None, profile=None): conn.delete_bucket_cors(Bucket=Bucket) return {"deleted": True, "name": Bucket} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def delete_lifecycle_configuration( @@ -996,7 +997,7 @@ def delete_lifecycle_configuration( conn.delete_bucket_lifecycle(Bucket=Bucket) return {"deleted": True, "name": Bucket} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def delete_policy(Bucket, region=None, key=None, keyid=None, profile=None): @@ -1019,7 +1020,7 @@ def delete_policy(Bucket, region=None, key=None, keyid=None, profile=None): conn.delete_bucket_policy(Bucket=Bucket) return {"deleted": True, "name": Bucket} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def delete_replication(Bucket, region=None, key=None, keyid=None, profile=None): @@ -1042,7 +1043,7 @@ def delete_replication(Bucket, region=None, key=None, keyid=None, profile=None): conn.delete_bucket_replication(Bucket=Bucket) return {"deleted": True, "name": Bucket} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def delete_tagging(Bucket, region=None, key=None, keyid=None, profile=None): @@ -1065,7 +1066,7 @@ def delete_tagging(Bucket, region=None, key=None, keyid=None, profile=None): conn.delete_bucket_tagging(Bucket=Bucket) return {"deleted": True, "name": Bucket} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} def delete_website(Bucket, region=None, key=None, keyid=None, profile=None): @@ -1088,4 +1089,4 @@ def delete_website(Bucket, region=None, key=None, keyid=None, profile=None): conn.delete_bucket_website(Bucket=Bucket) return {"deleted": True, "name": Bucket} except ClientError as e: - return {"deleted": False, "error": __utils__["boto3.get_error"](e)} + return {"deleted": False, "error": salt.utils.boto3mod.get_error(e)} diff --git a/salt/modules/boto_secgroup.py b/salt/modules/boto_secgroup.py index 979411479336..6f9ff78cf15c 100644 --- a/salt/modules/boto_secgroup.py +++ b/salt/modules/boto_secgroup.py @@ -46,6 +46,7 @@ import logging +import salt.utils.botomod import salt.utils.odict as odict import salt.utils.versions from salt.exceptions import CommandExecutionError, SaltInvocationError @@ -79,7 +80,7 @@ def __virtual__(): boto_ver="2.4.0", check_boto3=False ) if has_boto_reqs is True: - __utils__["boto.assign_funcs"](__name__, "ec2", pack=__salt__) + salt.utils.botomod.assign_funcs(__name__, "ec2", pack=__salt__) return has_boto_reqs @@ -761,7 +762,7 @@ def _find_vpcs( "provided: vpc_id, vpc_name, cidr or tags." ) - local_get_conn = __utils__["boto.get_connection_func"]("vpc") + local_get_conn = salt.utils.botomod.get_connection_func("vpc") conn = local_get_conn(region=region, key=key, keyid=keyid, profile=profile) filter_parameters = {"filters": {}} diff --git a/salt/modules/boto_sns.py b/salt/modules/boto_sns.py index 7df58b95e5a4..98ba733fe3c4 100644 --- a/salt/modules/boto_sns.py +++ b/salt/modules/boto_sns.py @@ -44,6 +44,7 @@ import logging +import salt.utils.botomod import salt.utils.versions log = logging.getLogger(__name__) @@ -66,7 +67,7 @@ def __virtual__(): """ has_boto_reqs = salt.utils.versions.check_boto_reqs(check_boto3=False) if has_boto_reqs is True: - __utils__["boto.assign_funcs"](__name__, "sns", pack=__salt__) + salt.utils.botomod.assign_funcs(__name__, "sns", pack=__salt__) return has_boto_reqs diff --git a/salt/modules/boto_sqs.py b/salt/modules/boto_sqs.py index c2a572ab2487..b95c6fea8048 100644 --- a/salt/modules/boto_sqs.py +++ b/salt/modules/boto_sqs.py @@ -47,6 +47,7 @@ import logging import urllib.parse +import salt.utils.boto3mod import salt.utils.json import salt.utils.versions @@ -74,7 +75,7 @@ def __virtual__(): """ has_boto_reqs = salt.utils.versions.check_boto_reqs() if has_boto_reqs is True: - __utils__["boto3.assign_funcs"](__name__, "sqs") + salt.utils.boto3mod.assign_funcs(__name__, "sqs") return has_boto_reqs @@ -113,7 +114,7 @@ def exists(name, region=None, key=None, keyid=None, profile=None): missing_code = "AWS.SimpleQueueService.NonExistentQueue" if e.response.get("Error", {}).get("Code") == missing_code: return {"result": False} - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} return {"result": True} @@ -143,7 +144,7 @@ def create( try: conn.create_queue(QueueName=name, Attributes=attributes) except botocore.exceptions.ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} return {"result": True} @@ -163,7 +164,7 @@ def delete(name, region=None, key=None, keyid=None, profile=None): url = conn.get_queue_url(QueueName=name)["QueueUrl"] conn.delete_queue(QueueUrl=url) except botocore.exceptions.ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} return {"result": True} @@ -191,7 +192,7 @@ def extract_name(queue_url): urls = r.get("QueueUrls", []) return {"result": [extract_name(url) for url in urls]} except botocore.exceptions.ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def get_attributes(name, region=None, key=None, keyid=None, profile=None): @@ -211,7 +212,7 @@ def get_attributes(name, region=None, key=None, keyid=None, profile=None): r = conn.get_queue_attributes(QueueUrl=url, AttributeNames=["All"]) return {"result": r["Attributes"]} except botocore.exceptions.ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} def set_attributes( @@ -239,5 +240,5 @@ def set_attributes( url = conn.get_queue_url(QueueName=name)["QueueUrl"] conn.set_queue_attributes(QueueUrl=url, Attributes=attributes) except botocore.exceptions.ClientError as e: - return {"error": __utils__["boto3.get_error"](e)} + return {"error": salt.utils.boto3mod.get_error(e)} return {"result": True} diff --git a/salt/modules/boto_ssm.py b/salt/modules/boto_ssm.py index f2908a46edce..05709fdafb08 100644 --- a/salt/modules/boto_ssm.py +++ b/salt/modules/boto_ssm.py @@ -14,6 +14,7 @@ """ import logging +import salt.utils.boto3mod import salt.utils.json as json import salt.utils.versions @@ -26,7 +27,7 @@ def __virtual__(): """ has_boto_reqs = salt.utils.versions.check_boto_reqs() if has_boto_reqs is True: - __utils__["boto3.assign_funcs"](__name__, "ssm") + salt.utils.boto3mod.assign_funcs(__name__, "ssm") return has_boto_reqs @@ -48,7 +49,7 @@ def get_parameter( salt-call boto_ssm.get_parameter test-param withdescription=True """ - conn = __utils__["boto3.get_connection"]( + conn = salt.utils.boto3mod.get_connection( "ssm", region=region, key=key, keyid=keyid, profile=profile ) try: @@ -85,7 +86,7 @@ def put_parameter( salt-call boto_ssm.put_parameter test-param test_value Type=SecureString KeyId=alias/aws/ssm Description='test encrypted key' """ - conn = __utils__["boto3.get_connection"]( + conn = salt.utils.boto3mod.get_connection( "ssm", region=region, key=key, keyid=keyid, profile=profile ) if Type not in ("String", "StringList", "SecureString"): @@ -124,7 +125,7 @@ def delete_parameter(Name, region=None, key=None, keyid=None, profile=None): salt-call boto_ssm.delete_parameter test-param """ - conn = __utils__["boto3.get_connection"]( + conn = salt.utils.boto3mod.get_connection( "ssm", region=region, key=key, keyid=keyid, profile=profile ) try: diff --git a/salt/modules/boto_vpc.py b/salt/modules/boto_vpc.py index 0f61a41dd6d4..b7a005b8815a 100644 --- a/salt/modules/boto_vpc.py +++ b/salt/modules/boto_vpc.py @@ -129,6 +129,8 @@ import socket import time +import salt.utils.boto3mod +import salt.utils.botomod import salt.utils.compat import salt.utils.versions from salt.exceptions import CommandExecutionError, SaltInvocationError @@ -184,9 +186,9 @@ def __virtual__(): def __init__(opts): if HAS_BOTO: - __utils__["boto.assign_funcs"](__name__, "vpc", pack=__salt__) + salt.utils.botomod.assign_funcs(__name__, "vpc", pack=__salt__) if HAS_BOTO3: - __utils__["boto3.assign_funcs"]( + salt.utils.boto3mod.assign_funcs( __name__, "ec2", get_conn_funcname="_get_conn3", @@ -299,7 +301,7 @@ def _create_resource( log.warning(e) return {"created": False, "error": {"message": e}} except BotoServerError as e: - return {"created": False, "error": __utils__["boto.get_error"](e)} + return {"created": False, "error": salt.utils.botomod.get_error(e)} def _delete_resource( @@ -361,7 +363,7 @@ def _delete_resource( e = "{} was not deleted.".format(resource) return {"deleted": False, "error": {"message": e}} except BotoServerError as e: - return {"deleted": False, "error": __utils__["boto.get_error"](e)} + return {"deleted": False, "error": salt.utils.botomod.get_error(e)} def _get_resource( @@ -522,7 +524,7 @@ def get_resource_id( ) } except BotoServerError as e: - return {"error": __utils__["boto.get_error"](e)} + return {"error": salt.utils.botomod.get_error(e)} def resource_exists( @@ -566,7 +568,7 @@ def resource_exists( ) } except BotoServerError as e: - return {"error": __utils__["boto.get_error"](e)} + return {"error": salt.utils.botomod.get_error(e)} def _find_vpcs( @@ -707,7 +709,7 @@ def get_id( ) } except BotoServerError as e: - return {"error": __utils__["boto.get_error"](e)} + return {"error": salt.utils.botomod.get_error(e)} def exists( @@ -752,7 +754,7 @@ def exists( profile=profile, ) except BotoServerError as err: - boto_err = __utils__["boto.get_error"](err) + boto_err = salt.utils.botomod.get_error(err) if boto_err.get("aws", {}).get("code") == "InvalidVpcID.NotFound": # VPC was not found: handle the error and return False. return {"exists": False} @@ -816,7 +818,7 @@ def create( log.warning("VPC was not created") return {"created": False} except BotoServerError as e: - return {"created": False, "error": __utils__["boto.get_error"](e)} + return {"created": False, "error": salt.utils.botomod.get_error(e)} def delete( @@ -888,7 +890,7 @@ def delete( log.warning("VPC %s was not deleted.", vpc_id) return {"deleted": False} except BotoServerError as e: - return {"deleted": False, "error": __utils__["boto.get_error"](e)} + return {"deleted": False, "error": salt.utils.botomod.get_error(e)} def describe( @@ -927,7 +929,7 @@ def describe( profile=profile, ) except BotoServerError as err: - boto_err = __utils__["boto.get_error"](err) + boto_err = salt.utils.botomod.get_error(err) if boto_err.get("aws", {}).get("code") == "InvalidVpcID.NotFound": # VPC was not found: handle the error and return None. return {"vpc": None} @@ -941,7 +943,7 @@ def describe( try: vpcs = conn.get_all_vpcs(**filter_parameters) except BotoServerError as err: - return {"error": __utils__["boto.get_error"](err)} + return {"error": salt.utils.botomod.get_error(err)} if vpcs: vpc = vpcs[0] # Found! @@ -1028,7 +1030,7 @@ def describe_vpcs( return {"vpcs": []} except BotoServerError as e: - return {"error": __utils__["boto.get_error"](e)} + return {"error": salt.utils.botomod.get_error(e)} def _find_subnets(subnet_name=None, vpc_id=None, cidr=None, tags=None, conn=None): @@ -1113,7 +1115,7 @@ def create_subnet( }, } except BotoServerError as e: - return {"created": False, "error": __utils__["boto.get_error"](e)} + return {"created": False, "error": salt.utils.botomod.get_error(e)} subnet_object_dict = _create_resource( "subnet", @@ -1211,7 +1213,7 @@ def subnet_exists( try: conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile) except BotoServerError as err: - return {"error": __utils__["boto.get_error"](err)} + return {"error": salt.utils.botomod.get_error(err)} filter_parameters = {"filters": {}} if subnet_id: @@ -1229,7 +1231,7 @@ def subnet_exists( try: subnets = conn.get_all_subnets(**filter_parameters) except BotoServerError as err: - boto_err = __utils__["boto.get_error"](err) + boto_err = salt.utils.botomod.get_error(err) if boto_err.get("aws", {}).get("code") == "InvalidSubnetID.NotFound": # Subnet was not found: handle the error and return False. return {"exists": False} @@ -1274,7 +1276,7 @@ def get_subnet_association(subnets, region=None, key=None, keyid=None, profile=N # subnet_ids=subnets can accept either a string or a list subnets = conn.get_all_subnets(subnet_ids=subnets) except BotoServerError as e: - return {"error": __utils__["boto.get_error"](e)} + return {"error": salt.utils.botomod.get_error(e)} # using a set to store vpc_ids - the use of set prevents duplicate # vpc_id values @@ -1323,7 +1325,7 @@ def describe_subnet( profile=profile, ) except BotoServerError as e: - return {"error": __utils__["boto.get_error"](e)} + return {"error": salt.utils.botomod.get_error(e)} if not subnet: return {"subnet": None} @@ -1426,7 +1428,7 @@ def describe_subnets( return {"subnets": subnets_list} except BotoServerError as e: - return {"error": __utils__["boto.get_error"](e)} + return {"error": salt.utils.botomod.get_error(e)} def create_internet_gateway( @@ -1484,7 +1486,7 @@ def create_internet_gateway( ) return r except BotoServerError as e: - return {"created": False, "error": __utils__["boto.get_error"](e)} + return {"created": False, "error": salt.utils.botomod.get_error(e)} def delete_internet_gateway( @@ -1566,7 +1568,7 @@ def delete_internet_gateway( profile=profile, ) except BotoServerError as e: - return {"deleted": False, "error": __utils__["boto.get_error"](e)} + return {"deleted": False, "error": salt.utils.botomod.get_error(e)} def _find_nat_gateways( @@ -1618,7 +1620,7 @@ def _find_nat_gateways( conn3 = _get_conn3(region=region, key=key, keyid=keyid, profile=profile) nat_gateways = [] - for ret in __utils__["boto3.paged_call"]( + for ret in salt.utils.boto3mod.paged_call( conn3.describe_nat_gateways, marker_flag="NextToken", marker_arg="NextToken", @@ -1797,7 +1799,7 @@ def create_nat_gateway( r = conn3.create_nat_gateway(SubnetId=subnet_id, AllocationId=allocation_id) return {"created": True, "id": r.get("NatGateway", {}).get("NatGatewayId")} except BotoServerError as e: - return {"created": False, "error": __utils__["boto.get_error"](e)} + return {"created": False, "error": salt.utils.botomod.get_error(e)} def delete_nat_gateway( @@ -1882,7 +1884,7 @@ def delete_nat_gateway( conn3.release_address(AllocationId=addr.get("AllocationId")) return {"deleted": True} except BotoServerError as e: - return {"deleted": False, "error": __utils__["boto.get_error"](e)} + return {"deleted": False, "error": salt.utils.botomod.get_error(e)} def create_customer_gateway( @@ -2059,7 +2061,7 @@ def create_dhcp_options( log.info("Associated options %s to VPC %s", r["id"], vpc_name or vpc_id) return r except BotoServerError as e: - return {"created": False, "error": __utils__["boto.get_error"](e)} + return {"created": False, "error": salt.utils.botomod.get_error(e)} def get_dhcp_options( @@ -2103,7 +2105,7 @@ def get_dhcp_options( conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile) r = conn.get_all_dhcp_options(dhcp_options_ids=[dhcp_options_id]) except BotoServerError as e: - return {"error": __utils__["boto.get_error"](e)} + return {"error": salt.utils.botomod.get_error(e)} if not r: return {"dhcp_options": None} @@ -2201,7 +2203,7 @@ def associate_dhcp_options_to_vpc( "error": {"message": "DHCP options could not be associated."}, } except BotoServerError as e: - return {"associated": False, "error": __utils__["boto.get_error"](e)} + return {"associated": False, "error": salt.utils.botomod.get_error(e)} def dhcp_options_exists( @@ -2279,7 +2281,7 @@ def create_network_acl( try: vpc_id = check_vpc(vpc_id, vpc_name, region, key, keyid, profile) except BotoServerError as e: - return {"created": False, "error": __utils__["boto.get_error"](e)} + return {"created": False, "error": salt.utils.botomod.get_error(e)} if not vpc_id: return { @@ -2329,7 +2331,7 @@ def create_network_acl( conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile) association_id = conn.associate_network_acl(r["id"], subnet_id) except BotoServerError as e: - return {"created": False, "error": __utils__["boto.get_error"](e)} + return {"created": False, "error": salt.utils.botomod.get_error(e)} r["association_id"] = association_id return r @@ -2503,7 +2505,7 @@ def associate_network_acl_to_subnet( "error": {"message": "ACL could not be assocaited."}, } except BotoServerError as e: - return {"associated": False, "error": __utils__["boto.get_error"](e)} + return {"associated": False, "error": salt.utils.botomod.get_error(e)} def disassociate_network_acl( @@ -2559,7 +2561,7 @@ def disassociate_network_acl( association_id = conn.disassociate_network_acl(subnet_id, vpc_id=vpc_id) return {"disassociated": True, "association_id": association_id} except BotoServerError as e: - return {"disassociated": False, "error": __utils__["boto.get_error"](e)} + return {"disassociated": False, "error": salt.utils.botomod.get_error(e)} def _create_network_acl_entry( @@ -2645,7 +2647,7 @@ def _create_network_acl_entry( log.warning("Network ACL entry was not %s", rkey) return {rkey: created} except BotoServerError as e: - return {rkey: False, "error": __utils__["boto.get_error"](e)} + return {rkey: False, "error": salt.utils.botomod.get_error(e)} def create_network_acl_entry( @@ -2773,7 +2775,7 @@ def delete_network_acl_entry( log.warning("Network ACL was not deleted") return {"deleted": deleted} except BotoServerError as e: - return {"deleted": False, "error": __utils__["boto.get_error"](e)} + return {"deleted": False, "error": salt.utils.botomod.get_error(e)} def create_route_table( @@ -2973,7 +2975,7 @@ def route_exists( log.warning("Route %s does not exist.", destination_cidr_block) return {"exists": False} except BotoServerError as e: - return {"error": __utils__["boto.get_error"](e)} + return {"error": salt.utils.botomod.get_error(e)} def associate_route_table( @@ -3045,7 +3047,7 @@ def associate_route_table( ) return {"association_id": association_id} except BotoServerError as e: - return {"associated": False, "error": __utils__["boto.get_error"](e)} + return {"associated": False, "error": salt.utils.botomod.get_error(e)} def disassociate_route_table( @@ -3080,7 +3082,7 @@ def disassociate_route_table( ) return {"disassociated": False} except BotoServerError as e: - return {"disassociated": False, "error": __utils__["boto.get_error"](e)} + return {"disassociated": False, "error": salt.utils.botomod.get_error(e)} def replace_route_table_association( @@ -3109,7 +3111,7 @@ def replace_route_table_association( ) return {"replaced": True, "association_id": association_id} except BotoServerError as e: - return {"replaced": False, "error": __utils__["boto.get_error"](e)} + return {"replaced": False, "error": salt.utils.botomod.get_error(e)} def create_route( @@ -3267,7 +3269,7 @@ def create_route( nat_gateway_id = gws[0]["NatGatewayId"] except BotoServerError as e: - return {"created": False, "error": __utils__["boto.get_error"](e)} + return {"created": False, "error": salt.utils.botomod.get_error(e)} if not nat_gateway_id: return _create_resource( @@ -3293,7 +3295,7 @@ def create_route( ) return {"created": True, "id": ret.get("NatGatewayId")} except BotoServerError as e: - return {"created": False, "error": __utils__["boto.get_error"](e)} + return {"created": False, "error": salt.utils.botomod.get_error(e)} def delete_route( @@ -3344,7 +3346,7 @@ def delete_route( }, } except BotoServerError as e: - return {"created": False, "error": __utils__["boto.get_error"](e)} + return {"created": False, "error": salt.utils.botomod.get_error(e)} return _delete_resource( resource="route", @@ -3432,7 +3434,7 @@ def replace_route( ) return {"replaced": False} except BotoServerError as e: - return {"replaced": False, "error": __utils__["boto.get_error"](e)} + return {"replaced": False, "error": salt.utils.botomod.get_error(e)} def describe_route_tables( @@ -3536,7 +3538,7 @@ def describe_route_tables( return tables except BotoServerError as e: - return {"error": __utils__["boto.get_error"](e)} + return {"error": salt.utils.botomod.get_error(e)} def _create_dhcp_options( @@ -3792,7 +3794,7 @@ def request_vpc_peering_connection( return {"msg": msg} except botocore.exceptions.ClientError as err: log.error("Got an error while trying to request vpc peering") - return {"error": __utils__["boto.get_error"](err)} + return {"error": salt.utils.botomod.get_error(err)} def _get_peering_connection_ids(name, conn): @@ -3907,7 +3909,7 @@ def accept_vpc_peering_connection( # pylint: disable=too-many-arguments return {"msg": "VPC peering connection accepted."} except botocore.exceptions.ClientError as err: log.error("Got an error while trying to accept vpc peering") - return {"error": __utils__["boto.get_error"](err)} + return {"error": salt.utils.botomod.get_error(err)} def _vpc_peering_conn_id_for_name(name, conn): @@ -3998,7 +4000,7 @@ def delete_vpc_peering_connection( ) return {"msg": "VPC peering connection deleted."} except botocore.exceptions.ClientError as err: - e = __utils__["boto.get_error"](err) + e = salt.utils.botomod.get_error(err) log.error("Failed to delete VPC peering %s: %s", conn_name or conn_id, e) return {"error": e} diff --git a/salt/modules/chocolatey.py b/salt/modules/chocolatey.py index 85d612eaa8ce..7544a9716909 100644 --- a/salt/modules/chocolatey.py +++ b/salt/modules/chocolatey.py @@ -12,7 +12,7 @@ import salt.utils.data import salt.utils.platform -from requests.structures import CaseInsensitiveDict +import salt.utils.win_dotnet from salt.exceptions import ( CommandExecutionError, CommandNotFoundError, @@ -22,6 +22,11 @@ from salt.utils.data import CaseInsensitiveDict from salt.utils.versions import LooseVersion as _LooseVersion +try: + import salt.utils.win_dotnet +except ImportError: + pass + log = logging.getLogger(__name__) __func_alias__ = {"list_": "list"} @@ -273,7 +278,7 @@ def bootstrap(force=False, source=None): # Check that .NET v4.0+ is installed # Windows 7 / Windows Server 2008 R2 and below do not come with at least # .NET v4.0 installed - if not __utils__["dotnet.version_at_least"](version="4"): + if not salt.utils.win_dotnet.version_at_least(version="4"): # It took until .NET v4.0 for Microsoft got the hang of making # installers, this should work under any version of Windows url = "http://download.microsoft.com/download/1/B/E/1BE39E79-7E39-46A3-96FF-047F95396215/dotNetFx40_Full_setup.exe" diff --git a/salt/modules/chroot.py b/salt/modules/chroot.py index 91f139455bd6..64a6aaaa3138 100644 --- a/salt/modules/chroot.py +++ b/salt/modules/chroot.py @@ -18,6 +18,9 @@ import salt.exceptions import salt.utils.args import salt.utils.files +import salt.utils.json +import salt.utils.path +import salt.utils.thin __func_alias__ = {"apply_": "apply"} @@ -28,7 +31,7 @@ def __virtual__(): """ Chroot command is required. """ - if __utils__["path.which"]("chroot") is not None: + if salt.utils.path.which("chroot") is not None: return True else: return (False, "Module chroot requires the command chroot") @@ -149,7 +152,7 @@ def call(root, function, *args, **kwargs): # Create a temporary directory inside the chroot where we can # untar salt-thin thin_dest_path = tempfile.mkdtemp(dir=root) - thin_path = __utils__["thin.gen_thin"]( + thin_path = salt.utils.thin.gen_thin( __opts__["cachedir"], extra_mods=__salt__["config.option"]("thin_extra_mods", ""), so_mods=__salt__["config.option"]("thin_so_mods", ""), @@ -162,7 +165,7 @@ def call(root, function, *args, **kwargs): # stdout = __salt__["cmd.run"](["tar", "xzf", thin_path, "-C", thin_dest_path]) if stdout: - __utils__["files.rm_rf"](thin_dest_path) + salt.utils.files.rm_rf(thin_dest_path) return {"result": False, "comment": stdout} chroot_path = os.path.join(os.path.sep, os.path.relpath(thin_dest_path, root)) @@ -192,7 +195,7 @@ def call(root, function, *args, **kwargs): # Process "real" result in stdout try: - data = __utils__["json.find_json"](ret["stdout"]) + data = salt.utils.json.find_json(ret["stdout"]) local = data.get("local", data) if isinstance(local, dict) and "retcode" in local: __context__["retcode"] = local["retcode"] @@ -204,7 +207,7 @@ def call(root, function, *args, **kwargs): "comment": {"stdout": ret["stdout"], "stderr": ret["stderr"]}, } finally: - __utils__["files.rm_rf"](thin_dest_path) + salt.utils.files.rm_rf(thin_dest_path) def apply_(root, mods=None, **kwargs): @@ -268,7 +271,7 @@ def _create_and_execute_salt_state(root, chunks, file_refs, test, hash_type): hash_type=hash_type, ) finally: - __utils__["files.rm_rf"](salt_state_path) + salt.utils.files.rm_rf(salt_state_path) return ret diff --git a/salt/modules/dockermod.py b/salt/modules/dockermod.py index d8581586ca72..7ee56647c66c 100644 --- a/salt/modules/dockermod.py +++ b/salt/modules/dockermod.py @@ -216,11 +216,17 @@ import salt.exceptions import salt.fileclient import salt.pillar +import salt.utils.args +import salt.utils.dockermod import salt.utils.dockermod.translate.container import salt.utils.dockermod.translate.network +import salt.utils.files import salt.utils.functools +import salt.utils.hashutils import salt.utils.json import salt.utils.path +import salt.utils.state +import salt.utils.thin from salt.exceptions import CommandExecutionError, SaltInvocationError from salt.state import HighState @@ -426,7 +432,7 @@ def wrapper(*args, **kwargs): """ Ensure that the client is present """ - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) timeout = kwargs.pop("client_timeout", NOTSET) if "docker.client" not in __context__ or not hasattr( __context__["docker.client"], "timeout" @@ -459,7 +465,7 @@ def wrapper(*args, **kwargs): """ refresh salt mine on exit. """ - returned = wrapped(*args, **__utils__["args.clean_kwargs"](**kwargs)) + returned = wrapped(*args, **salt.utils.args.clean_kwargs(**kwargs)) if _check_update_mine(): __salt__["mine.send"]("docker.ps", verbose=True, all=True, host=True) return returned @@ -863,7 +869,7 @@ def get_client_args(limit=None): salt myminion docker.get_client_args logs salt myminion docker.get_client_args create_container,connect_container_to_network """ - return __utils__["docker.get_client_args"](limit=limit) + return salt.utils.dockermod.get_client_args(limit=limit) def _get_create_kwargs( @@ -884,12 +890,12 @@ def _get_create_kwargs( else: networks = {} - kwargs = __utils__["docker.translate_input"]( + kwargs = salt.utils.dockermod.translate_input( salt.utils.dockermod.translate.container, skip_translate=skip_translate, ignore_collisions=ignore_collisions, validate_ip_addrs=validate_ip_addrs, - **__utils__["args.clean_kwargs"](**kwargs) + **salt.utils.args.clean_kwargs(**kwargs) ) if networks: @@ -954,7 +960,7 @@ def compare_containers(first, second, ignore=None): salt myminion docker.compare_containers foo bar salt myminion docker.compare_containers foo bar ignore=Hostname """ - ignore = __utils__["args.split_input"](ignore or []) + ignore = salt.utils.args.split_input(ignore or []) result1 = inspect_container(first) result2 = inspect_container(second) ret = {} @@ -1296,7 +1302,7 @@ def compare_networks(first, second, ignore="Name,Id,Created,Containers"): salt myminion docker.compare_network foo bar """ - ignore = __utils__["args.split_input"](ignore or []) + ignore = salt.utils.args.split_input(ignore or []) net1 = inspect_network(first) if not isinstance(first, dict) else first net2 = inspect_network(second) if not isinstance(second, dict) else second ret = {} @@ -2091,10 +2097,10 @@ def resolve_tag(name, **kwargs): salt myminion docker.resolve_tag centos:7 all=True salt myminion docker.resolve_tag c9f378ac27d9 """ - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) all_ = kwargs.pop("all", False) if kwargs: - __utils__["args.invalid_kwargs"](kwargs) + salt.utils.args.invalid_kwargs(kwargs) try: inspect_result = inspect_image(name) @@ -2177,7 +2183,7 @@ def logs(name, **kwargs): salt myminion docker.logs mycontainer since='1 week ago' salt myminion docker.logs mycontainer since='1 fortnight ago' """ - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) if "stream" in kwargs: raise SaltInvocationError("The 'stream' argument is not supported") @@ -3840,9 +3846,7 @@ def export(name, path, overwrite=False, makedirs=False, compression=None, **kwar # open the filehandle. If not using gzip, we need to open the # filehandle here. We make sure to close it in the "finally" block # below. - out = __utils__["files.fopen"]( - path, "wb" - ) # pylint: disable=resource-leakage + out = salt.utils.files.fopen(path, "wb") # pylint: disable=resource-leakage response = _client_wrapper("export", name) buf = None while buf != "": @@ -3926,12 +3930,12 @@ def rm_(name, force=False, volumes=False, **kwargs): salt myminion docker.rm mycontainer salt myminion docker.rm mycontainer force=True """ - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) stop_ = kwargs.pop("stop", False) timeout = kwargs.pop("timeout", None) auto_remove = False if kwargs: - __utils__["args.invalid_kwargs"](kwargs) + salt.utils.args.invalid_kwargs(kwargs) if state(name) == "running" and not (force or stop_): raise CommandExecutionError( @@ -4911,7 +4915,7 @@ def save(name, path, overwrite=False, makedirs=False, compression=None, **kwargs ) if compression: - saved_path = __utils__["files.mkstemp"]() + saved_path = salt.utils.files.mkstemp() else: saved_path = path # use the image name if its valid if not use the image id @@ -4941,14 +4945,14 @@ def save(name, path, overwrite=False, makedirs=False, compression=None, **kwargs compressor = lzma.LZMACompressor() try: - with __utils__["files.fopen"](saved_path, "rb") as uncompressed: + with salt.utils.files.fopen(saved_path, "rb") as uncompressed: # No need to decode on read and encode on on write, since we're # reading and immediately writing out bytes. if compression != "gzip": # gzip doesn't use a Compressor object, it uses a .open() # method to open the filehandle. If not using gzip, we need # to open the filehandle here. - out = __utils__["files.fopen"](path, "wb") + out = salt.utils.files.fopen(path, "wb") buf = None while buf != "": buf = uncompressed.read(4096) @@ -5068,9 +5072,9 @@ def networks(names=None, ids=None): salt myminion docker.networks ids=1f9d2454d0872b68dd9e8744c6e7a4c66b86f10abaccc21e14f7f014f729b2bc """ if names is not None: - names = __utils__["args.split_input"](names) + names = salt.utils.args.split_input(names) if ids is not None: - ids = __utils__["args.split_input"](ids) + ids = salt.utils.args.split_input(ids) response = _client_wrapper("networks", names=names, ids=ids) # Work around https://github.com/docker/docker-py/issues/1775 @@ -5327,12 +5331,12 @@ def create_network( # IPv4 and IPv6 salt myminion docker.create_network mynet ipam_pools='[{"subnet": "10.0.0.0/24", "gateway": "10.0.0.1"}, {"subnet": "fe3f:2180:26:1::60/123", "gateway": "fe3f:2180:26:1::61"}]' """ - kwargs = __utils__["docker.translate_input"]( + kwargs = salt.utils.dockermod.translate_input( salt.utils.dockermod.translate.network, skip_translate=skip_translate, ignore_collisions=ignore_collisions, validate_ip_addrs=validate_ip_addrs, - **__utils__["args.clean_kwargs"](**kwargs) + **salt.utils.args.clean_kwargs(**kwargs) ) if "ipam" not in kwargs: @@ -5350,7 +5354,7 @@ def create_network( # IPAM-specific configuration was passed. Just create the network # without specifying IPAM configuration. if ipam_pools or ipam_kwargs: - kwargs["ipam"] = __utils__["docker.create_ipam_config"]( + kwargs["ipam"] = salt.utils.dockermod.create_ipam_config( *ipam_pools, **ipam_kwargs ) @@ -5425,7 +5429,7 @@ def connect_container_to_network(container, net_id, **kwargs): salt myminion docker.connect_container_to_network web-1 mynet ipv4_address=10.20.0.10 salt myminion docker.connect_container_to_network web-1 1f9d2454d0872b68dd9e8744c6e7a4c66b86f10abaccc21e14f7f014f729b2bc """ - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) log.debug( "Connecting container '%s' to network '%s' with the following " "configuration: %s", @@ -6021,7 +6025,7 @@ def prune( if system is None and not any((containers, images, networks, build)): system = True - filters = __utils__["args.clean_kwargs"](**filters) + filters = salt.utils.args.clean_kwargs(**filters) for fname in list(filters): if not isinstance(filters[fname], bool): # support comma-separated values @@ -6118,7 +6122,7 @@ def _cleanup_tempfile(path): except OSError as exc: log.error("cmd.script: Unable to clean tempfile '%s': %s", path, exc) - path = __utils__["files.mkstemp"]( + path = salt.utils.files.mkstemp( dir="/tmp", prefix="salt", suffix=os.path.splitext(source)[1] ) if template: @@ -6729,7 +6733,7 @@ def call(name, function, *args, **kwargs): raise CommandExecutionError("Missing function parameter") # move salt into the container - thin_path = __utils__["thin.gen_thin"]( + thin_path = salt.utils.thin.gen_thin( __opts__["cachedir"], extra_mods=__salt__["config.option"]("thin_extra_mods", ""), so_mods=__salt__["config.option"]("thin_so_mods", ""), @@ -6797,7 +6801,7 @@ def call(name, function, *args, **kwargs): # process "real" result in stdout try: - data = __utils__["json.find_json"](ret["stdout"]) + data = salt.utils.json.find_json(ret["stdout"]) local = data.get("local", data) if isinstance(local, dict): if "retcode" in local: @@ -6883,7 +6887,7 @@ def sls(name, mods=None, **kwargs): pillar_override = kwargs.pop("pillar", None) if "saltenv" not in kwargs: kwargs["saltenv"] = "base" - sls_opts = __utils__["state.get_sls_opts"](__opts__, **kwargs) + sls_opts = salt.utils.state.get_sls_opts(__opts__, **kwargs) # gather grains from the container grains = call(name, "grains.items") @@ -6919,7 +6923,7 @@ def sls(name, mods=None, **kwargs): ret = None try: - trans_tar_sha256 = __utils__["hashutils.get_hash"](trans_tar, "sha256") + trans_tar_sha256 = salt.utils.hashutils.get_hash(trans_tar, "sha256") copy_to( name, trans_tar, @@ -6949,7 +6953,7 @@ def sls(name, mods=None, **kwargs): ) if not isinstance(ret, dict): __context__["retcode"] = 1 - elif not __utils__["state.check_result"](ret): + elif not salt.utils.state.check_result(ret): __context__["retcode"] = 2 else: __context__["retcode"] = 0 @@ -7055,7 +7059,7 @@ def sls_build( salt myminion docker.sls_build imgname base=mybase mods=rails,web """ - create_kwargs = __utils__["args.clean_kwargs"](**copy.deepcopy(kwargs)) + create_kwargs = salt.utils.args.clean_kwargs(**copy.deepcopy(kwargs)) for key in ("image", "name", "cmd", "interactive", "tty", "extra_filerefs"): try: del create_kwargs[key] @@ -7073,7 +7077,7 @@ def sls_build( # Now execute the state into the container ret = sls(id_, mods, **kwargs) # fail if the state was not successful - if not dryrun and not __utils__["state.check_result"](ret): + if not dryrun and not salt.utils.state.check_result(ret): raise CommandExecutionError(ret) if dryrun is False: ret = commit(id_, repository, tag=tag) diff --git a/salt/modules/environ.py b/salt/modules/environ.py index 02dea44d4345..e50b8fd7252f 100644 --- a/salt/modules/environ.py +++ b/salt/modules/environ.py @@ -7,6 +7,8 @@ import os import salt.utils.platform +import salt.utils.win_functions +import salt.utils.win_reg log = logging.getLogger(__name__) @@ -71,8 +73,8 @@ def setval(key, val, false_unsets=False, permanent=False): try: os.environ.pop(key, None) if permanent and is_windows: - __utils__["reg.delete_value"](permanent_hive, permanent_key, key) - __utils__["win_functions.broadcast_setting_change"]() + salt.utils.win_reg.delete_value(permanent_hive, permanent_key, key) + salt.utils.win_functions.broadcast_setting_change() return None except Exception as exc: # pylint: disable=broad-except log.error( @@ -88,8 +90,8 @@ def setval(key, val, false_unsets=False, permanent=False): try: os.environ[key] = val if permanent and is_windows: - __utils__["reg.set_value"](permanent_hive, permanent_key, key, val) - __utils__["win_functions.broadcast_setting_change"]() + salt.utils.win_reg.set_value(permanent_hive, permanent_key, key, val) + salt.utils.win_functions.broadcast_setting_change() return os.environ[key] except Exception as exc: # pylint: disable=broad-except log.error( diff --git a/salt/modules/etcd_mod.py b/salt/modules/etcd_mod.py index ba37c9e7c3b1..52633ed3d360 100644 --- a/salt/modules/etcd_mod.py +++ b/salt/modules/etcd_mod.py @@ -116,7 +116,7 @@ def get_(key, recurse=False, profile=None, **kwargs): salt myminion etcd.get /path/to/key recurse=True profile=my_etcd_config salt myminion etcd.get /path/to/key host=127.0.0.1 port=2379 """ - client = __utils__["etcd_util.get_conn"](__opts__, profile, **kwargs) + client = salt.utils.etcd_util.get_conn(__opts__, profile, **kwargs) return client.get(key, recurse=recurse) @@ -137,7 +137,7 @@ def set_(key, value, profile=None, ttl=None, directory=False, **kwargs): salt myminion etcd.set /path/to/dir '' directory=True salt myminion etcd.set /path/to/key value ttl=5 """ - client = __utils__["etcd_util.get_conn"](__opts__, profile, **kwargs) + client = salt.utils.etcd_util.get_conn(__opts__, profile, **kwargs) return client.set(key, value, ttl=ttl, directory=directory) @@ -191,7 +191,7 @@ def update(fields, path="", profile=None, **kwargs): salt myminion etcd.update "{'/path/to/key': 'baz', '/another/key': 'bar'}" host=127.0.0.1 port=2379 salt myminion etcd.update "{'/path/to/key': 'baz', '/another/key': 'bar'}" path='/some/root' """ - client = __utils__["etcd_util.get_conn"](__opts__, profile, **kwargs) + client = salt.utils.etcd_util.get_conn(__opts__, profile, **kwargs) return client.update(fields, path) @@ -216,7 +216,7 @@ def watch(key, recurse=False, profile=None, timeout=0, index=None, **kwargs): salt myminion etcd.watch /patch/to/key host=127.0.0.1 port=2379 """ - client = __utils__["etcd_util.get_conn"](__opts__, profile, **kwargs) + client = salt.utils.etcd_util.get_conn(__opts__, profile, **kwargs) return client.watch(key, recurse=recurse, timeout=timeout, index=index) @@ -235,7 +235,7 @@ def ls_(path="/", profile=None, **kwargs): salt myminion etcd.ls /path/to/dir/ profile=my_etcd_config salt myminion etcd.ls /path/to/dir/ host=127.0.0.1 port=2379 """ - client = __utils__["etcd_util.get_conn"](__opts__, profile, **kwargs) + client = salt.utils.etcd_util.get_conn(__opts__, profile, **kwargs) return client.ls(path) @@ -255,7 +255,7 @@ def rm_(key, recurse=False, profile=None, **kwargs): salt myminion etcd.rm /path/to/key host=127.0.0.1 port=2379 salt myminion etcd.rm /path/to/dir recurse=True profile=my_etcd_config """ - client = __utils__["etcd_util.get_conn"](__opts__, profile, **kwargs) + client = salt.utils.etcd_util.get_conn(__opts__, profile, **kwargs) return client.rm(key, recurse=recurse) @@ -274,5 +274,5 @@ def tree(path="/", profile=None, **kwargs): salt myminion etcd.tree host=127.0.0.1 port=2379 salt myminion etcd.tree /path/to/keys profile=my_etcd_config """ - client = __utils__["etcd_util.get_conn"](__opts__, profile, **kwargs) + client = salt.utils.etcd_util.get_conn(__opts__, profile, **kwargs) return client.tree(path) diff --git a/salt/modules/file.py b/salt/modules/file.py index 95bd69a58869..f3b63c0764ae 100644 --- a/salt/modules/file.py +++ b/salt/modules/file.py @@ -114,8 +114,8 @@ def _binary_replace(old, new): This function should only be run AFTER it has been determined that the files differ. """ - old_isbin = not __utils__["files.is_text"](old) - new_isbin = not __utils__["files.is_text"](new) + old_isbin = not salt.utils.files.is_text(old) + new_isbin = not salt.utils.files.is_text(new) if any((old_isbin, new_isbin)): if all((old_isbin, new_isbin)): return "Replace binary file" @@ -1514,7 +1514,7 @@ def comment_line(path, regex, char="#", cmnt=True, backup=".bak"): raise SaltInvocationError("File not found: {}".format(path)) # Make sure it is a text file - if not __utils__["files.is_text"](path): + if not salt.utils.files.is_text(path): raise SaltInvocationError( "Cannot perform string replacements on a binary file: {}".format(path) ) @@ -1617,7 +1617,7 @@ def comment_line(path, regex, char="#", cmnt=True, backup=".bak"): check_perms(path, None, pre_user, pre_group, pre_mode) # Return a diff using the two dictionaries - return __utils__["stringutils.get_diff"](orig_file, new_file) + return salt.utils.stringutils.get_diff(orig_file, new_file) def _get_flags(flags): @@ -2326,7 +2326,7 @@ def line( if show_changes: with salt.utils.files.fopen(path, "r") as fp_: path_content = salt.utils.data.decode_list(fp_.read().splitlines(True)) - changes_diff = __utils__["stringutils.get_diff"](path_content, body) + changes_diff = salt.utils.stringutils.get_diff(path_content, body) if __opts__["test"] is False: fh_ = None try: @@ -2498,7 +2498,7 @@ def replace( else: raise SaltInvocationError("File not found: {}".format(path)) - if not __utils__["files.is_text"](path): + if not salt.utils.files.is_text(path): raise SaltInvocationError( "Cannot perform string replacements on a binary file: {}".format(path) ) @@ -2717,7 +2717,7 @@ def replace( if not dry_run and not salt.utils.platform.is_windows(): check_perms(path, None, pre_user, pre_group, pre_mode) - differences = __utils__["stringutils.get_diff"](orig_file, new_file) + differences = salt.utils.stringutils.get_diff(orig_file, new_file) if show_changes: return differences @@ -2853,11 +2853,11 @@ def blockreplace( raise SaltInvocationError("File not found: {}".format(path)) try: - file_encoding = __utils__["files.get_encoding"](path) + file_encoding = salt.utils.files.get_encoding(path) except CommandExecutionError: file_encoding = None - if __utils__["files.is_binary"](path): + if salt.utils.files.is_binary(path): if not file_encoding: raise SaltInvocationError( "Cannot perform string replacements on a binary file: {}".format(path) @@ -3025,7 +3025,7 @@ def _add_content(linesep, lines=None, include_marker_start=True, end_line=None): ) if block_found: - diff = __utils__["stringutils.get_diff"](orig_file, new_file) + diff = salt.utils.stringutils.get_diff(orig_file, new_file) has_changes = diff != "" if has_changes and not dry_run: # changes detected @@ -3060,7 +3060,7 @@ def _add_content(linesep, lines=None, include_marker_start=True, end_line=None): "Cannot edit marked block. Markers were not found in file." ) - diff = __utils__["stringutils.get_diff"](orig_file, new_file) + diff = salt.utils.stringutils.get_diff(orig_file, new_file) has_changes = diff != "" if has_changes and not dry_run: # changes detected @@ -5871,7 +5871,7 @@ def get_diff( else: if show_filenames: args.extend(paths) - ret = __utils__["stringutils.get_diff"](*args) + ret = salt.utils.stringutils.get_diff(*args) return ret return "" diff --git a/salt/modules/git.py b/salt/modules/git.py index ed74d95c9cad..a50ea25df51e 100644 --- a/salt/modules/git.py +++ b/salt/modules/git.py @@ -16,6 +16,7 @@ import salt.utils.itertools import salt.utils.path import salt.utils.platform +import salt.utils.ssh import salt.utils.stringutils import salt.utils.templates import salt.utils.url @@ -298,7 +299,7 @@ def _git_run( os.chown(tmp_ssh_wrapper, __salt__["file.user_to_uid"](user), -1) env["GIT_SSH"] = tmp_ssh_wrapper - if "salt-call" not in _salt_cli and __utils__["ssh.key_is_encrypted"]( + if "salt-call" not in _salt_cli and salt.utils.ssh.key_is_encrypted( id_file ): errors.append( diff --git a/salt/modules/glanceng.py b/salt/modules/glanceng.py index 7f1b824b0f60..10f720ebba35 100644 --- a/salt/modules/glanceng.py +++ b/salt/modules/glanceng.py @@ -24,7 +24,7 @@ auth_url: https://example.org:5000/v3 identity_api_version: 3 """ - +import salt.utils.args HAS_SHADE = False try: @@ -70,7 +70,7 @@ def _clean_kwargs(keep_name=False, **kwargs): if "name" in kwargs and not keep_name: kwargs["name_or_id"] = kwargs.pop("name") - return __utils__["args.clean_kwargs"](**kwargs) + return salt.utils.args.clean_kwargs(**kwargs) def setup_clouds(auth=None): diff --git a/salt/modules/google_chat.py b/salt/modules/google_chat.py index faf83eb08919..42c193c21cee 100644 --- a/salt/modules/google_chat.py +++ b/salt/modules/google_chat.py @@ -11,6 +11,8 @@ import json +import salt.utils.http + # ------------------------------------------------------------------------------ # module properties # ------------------------------------------------------------------------------ @@ -41,7 +43,7 @@ def send_message(url, message): """ headers = {"Content-Type": "application/json"} data = {"text": message} - result = __utils__["http.query"]( + result = salt.utils.http.query( url, "POST", data=json.dumps(data), diff --git a/salt/modules/idem.py b/salt/modules/idem.py index 168488cf8974..b19099b73920 100644 --- a/salt/modules/idem.py +++ b/salt/modules/idem.py @@ -10,6 +10,8 @@ .. versionadded:: 3002 """ +import salt.utils.idem + # Function alias to make sure not to shadow built-in's __func_alias__ = {"exec_": "exec"} __virtualname__ = "idem" @@ -57,7 +59,7 @@ def exec_(path, acct_file=None, acct_key=None, acct_profile=None, *args, **kwarg :depends: acct, pop, pop-config, idem :platform: all """ - hub = __utils__["idem.hub"]() + hub = salt.utils.idem.hub() coro = hub.idem.ex.run( path, diff --git a/salt/modules/keystone.py b/salt/modules/keystone.py index ffcbc8eb4005..49ef4395bef1 100644 --- a/salt/modules/keystone.py +++ b/salt/modules/keystone.py @@ -54,6 +54,7 @@ import logging import salt.utils.http +import salt.utils.versions HAS_KEYSTONE = False try: @@ -172,7 +173,7 @@ def auth(profile=None, **connection_args): salt '*' keystone.auth """ - __utils__["versions.warn_until"]( + salt.utils.versions.warn_until( "Argon", "The keystone module has been deprecated and will be removed in {version}. " "Please update to using the keystoneng module", diff --git a/salt/modules/keystoneng.py b/salt/modules/keystoneng.py index 77c5e7f8b010..3b67971037e8 100644 --- a/salt/modules/keystoneng.py +++ b/salt/modules/keystoneng.py @@ -24,7 +24,7 @@ auth_url: https://example.org:5000/v3 identity_api_version: 3 """ - +import salt.utils.args HAS_SHADE = False try: @@ -93,7 +93,7 @@ def _clean_kwargs(keep_name=False, **kwargs): if "name" in kwargs and not keep_name: kwargs["name_or_id"] = kwargs.pop("name") - return __utils__["args.clean_kwargs"](**kwargs) + return salt.utils.args.clean_kwargs(**kwargs) def setup_clouds(auth=None): diff --git a/salt/modules/linux_service.py b/salt/modules/linux_service.py index d26fc5a97996..dbbe780c5337 100644 --- a/salt/modules/linux_service.py +++ b/salt/modules/linux_service.py @@ -6,6 +6,8 @@ import os import re +import salt.utils.systemd + __func_alias__ = {"reload_": "reload"} _GRAINMAP = {"Arch": "/etc/rc.d", "Arch ARM": "/etc/rc.d"} @@ -44,7 +46,7 @@ def __virtual__(): init_grain = __grains__.get("init") if init_grain not in (None, "sysvinit", "unknown"): return (False, "Minion is running {}".format(init_grain)) - elif __utils__["systemd.booted"](__context__): + elif salt.utils.systemd.booted(__context__): # Should have been caught by init grain check, but check just in case return (False, "Minion is running systemd") return "service" diff --git a/salt/modules/mac_service.py b/salt/modules/mac_service.py index 900c937e63ba..189fd2227e1d 100644 --- a/salt/modules/mac_service.py +++ b/salt/modules/mac_service.py @@ -32,6 +32,7 @@ import os import salt.utils.files +import salt.utils.mac_utils import salt.utils.path import salt.utils.platform import salt.utils.stringutils @@ -127,7 +128,7 @@ def _get_service(name): :return: The service information for the service, otherwise an Error :rtype: dict """ - services = __utils__["mac_utils.available_services"]() + services = salt.utils.mac_utils.available_services() # fix the name differences between platforms # salt-minion becomes com.saltstack.salt.minion name = SALT_MAC_SERVICES.get(name, name).lower() @@ -155,7 +156,7 @@ def _get_service(name): # we used a cached version to check, a service could have been made # between now and then, we should refresh our available services. - services = __utils__["mac_utils.available_services"](refresh=True) + services = salt.utils.mac_utils.available_services(refresh=True) # check to see if we found the service we are looking for. service = _name_in_services(name, services) @@ -239,7 +240,7 @@ def _get_domain_target(name, service_target=False): # check if a LaunchAgent as we should treat these differently. if "LaunchAgents" in path: # Get the console user so we can service in the correct session - uid = __utils__["mac_utils.console_user"]() + uid = salt.utils.mac_utils.console_user() domain_target = "gui/{}".format(uid) # check to see if we need to make it a full service target. @@ -315,7 +316,7 @@ def launchctl(sub_cmd, *args, **kwargs): salt '*' service.launchctl debug org.cups.cupsd """ - return __utils__["mac_utils.launchctl"](sub_cmd, *args, **kwargs) + return salt.utils.mac_utils.launchctl(sub_cmd, *args, **kwargs) def list_(name=None, runas=None): @@ -345,7 +346,7 @@ def list_(name=None, runas=None): # we can assume if we are trying to list a LaunchAgent we need # to run as a user, if not provided, we'll use the console user. if not runas and _launch_agent(name): - runas = __utils__["mac_utils.console_user"](username=True) + runas = salt.utils.mac_utils.console_user(username=True) # Collect information on service: will raise an error if it fails return launchctl("list", label, return_stdout=True, runas=runas) @@ -522,7 +523,7 @@ def status(name, sig=None, runas=None): return False if not runas and _launch_agent(name): - runas = __utils__["mac_utils.console_user"](username=True) + runas = salt.utils.mac_utils.console_user(username=True) try: output = __salt__["service.list"](name, runas=runas) diff --git a/salt/modules/mac_system.py b/salt/modules/mac_system.py index 1dd0aa8ea29a..72b87fd08ddf 100644 --- a/salt/modules/mac_system.py +++ b/salt/modules/mac_system.py @@ -10,6 +10,7 @@ import getpass import shlex +import salt.utils.mac_utils import salt.utils.platform from salt.exceptions import CommandExecutionError, SaltInvocationError @@ -204,10 +205,10 @@ def get_remote_login(): salt '*' system.get_remote_login """ - ret = __utils__["mac_utils.execute_return_result"]("systemsetup -getremotelogin") + ret = salt.utils.mac_utils.execute_return_result("systemsetup -getremotelogin") - enabled = __utils__["mac_utils.validate_enabled"]( - __utils__["mac_utils.parse_return"](ret) + enabled = salt.utils.mac_utils.validate_enabled( + salt.utils.mac_utils.parse_return(ret) ) return enabled == "on" @@ -230,12 +231,12 @@ def set_remote_login(enable): salt '*' system.set_remote_login True """ - state = __utils__["mac_utils.validate_enabled"](enable) + state = salt.utils.mac_utils.validate_enabled(enable) cmd = "systemsetup -f -setremotelogin {}".format(state) - __utils__["mac_utils.execute_return_success"](cmd) + salt.utils.mac_utils.execute_return_success(cmd) - return __utils__["mac_utils.confirm_updated"]( + return salt.utils.mac_utils.confirm_updated( state, get_remote_login, normalize_ret=True ) @@ -253,12 +254,12 @@ def get_remote_events(): salt '*' system.get_remote_events """ - ret = __utils__["mac_utils.execute_return_result"]( + ret = salt.utils.mac_utils.execute_return_result( "systemsetup -getremoteappleevents" ) - enabled = __utils__["mac_utils.validate_enabled"]( - __utils__["mac_utils.parse_return"](ret) + enabled = salt.utils.mac_utils.validate_enabled( + salt.utils.mac_utils.parse_return(ret) ) return enabled == "on" @@ -282,12 +283,12 @@ def set_remote_events(enable): salt '*' system.set_remote_events On """ - state = __utils__["mac_utils.validate_enabled"](enable) + state = salt.utils.mac_utils.validate_enabled(enable) cmd = "systemsetup -setremoteappleevents {}".format(state) - __utils__["mac_utils.execute_return_success"](cmd) + salt.utils.mac_utils.execute_return_success(cmd) - return __utils__["mac_utils.confirm_updated"]( + return salt.utils.mac_utils.confirm_updated( state, get_remote_events, normalize_ret=True, @@ -307,9 +308,9 @@ def get_computer_name(): salt '*' system.get_computer_name """ - ret = __utils__["mac_utils.execute_return_result"]("scutil --get ComputerName") + ret = salt.utils.mac_utils.execute_return_result("scutil --get ComputerName") - return __utils__["mac_utils.parse_return"](ret) + return salt.utils.mac_utils.parse_return(ret) def set_computer_name(name): @@ -328,9 +329,9 @@ def set_computer_name(name): salt '*' system.set_computer_name "Mike's Mac" """ cmd = 'scutil --set ComputerName "{}"'.format(name) - __utils__["mac_utils.execute_return_success"](cmd) + salt.utils.mac_utils.execute_return_success(cmd) - return __utils__["mac_utils.confirm_updated"]( + return salt.utils.mac_utils.confirm_updated( name, get_computer_name, ) @@ -349,11 +350,9 @@ def get_subnet_name(): salt '*' system.get_subnet_name """ - ret = __utils__["mac_utils.execute_return_result"]( - "systemsetup -getlocalsubnetname" - ) + ret = salt.utils.mac_utils.execute_return_result("systemsetup -getlocalsubnetname") - return __utils__["mac_utils.parse_return"](ret) + return salt.utils.mac_utils.parse_return(ret) def set_subnet_name(name): @@ -376,9 +375,9 @@ def set_subnet_name(name): salt '*' system.set_subnet_name "Mike's Mac" """ cmd = 'systemsetup -setlocalsubnetname "{}"'.format(name) - __utils__["mac_utils.execute_return_success"](cmd) + salt.utils.mac_utils.execute_return_success(cmd) - return __utils__["mac_utils.confirm_updated"]( + return salt.utils.mac_utils.confirm_updated( name, get_subnet_name, ) @@ -397,9 +396,9 @@ def get_startup_disk(): salt '*' system.get_startup_disk """ - ret = __utils__["mac_utils.execute_return_result"]("systemsetup -getstartupdisk") + ret = salt.utils.mac_utils.execute_return_result("systemsetup -getstartupdisk") - return __utils__["mac_utils.parse_return"](ret) + return salt.utils.mac_utils.parse_return(ret) def list_startup_disks(): @@ -415,7 +414,7 @@ def list_startup_disks(): salt '*' system.list_startup_disks """ - ret = __utils__["mac_utils.execute_return_result"]("systemsetup -liststartupdisks") + ret = salt.utils.mac_utils.execute_return_result("systemsetup -liststartupdisks") return ret.splitlines() @@ -446,9 +445,9 @@ def set_startup_disk(path): raise SaltInvocationError(msg) cmd = "systemsetup -setstartupdisk {}".format(path) - __utils__["mac_utils.execute_return_result"](cmd) + salt.utils.mac_utils.execute_return_result(cmd) - return __utils__["mac_utils.confirm_updated"]( + return salt.utils.mac_utils.confirm_updated( path, get_startup_disk, ) @@ -469,11 +468,11 @@ def get_restart_delay(): salt '*' system.get_restart_delay """ - ret = __utils__["mac_utils.execute_return_result"]( + ret = salt.utils.mac_utils.execute_return_result( "systemsetup -getwaitforstartupafterpowerfailure" ) - return __utils__["mac_utils.parse_return"](ret) + return salt.utils.mac_utils.parse_return(ret) def set_restart_delay(seconds): @@ -513,9 +512,9 @@ def set_restart_delay(seconds): raise SaltInvocationError(msg) cmd = "systemsetup -setwaitforstartupafterpowerfailure {}".format(seconds) - __utils__["mac_utils.execute_return_success"](cmd) + salt.utils.mac_utils.execute_return_success(cmd) - return __utils__["mac_utils.confirm_updated"]( + return salt.utils.mac_utils.confirm_updated( seconds, get_restart_delay, ) @@ -535,12 +534,12 @@ def get_disable_keyboard_on_lock(): salt '*' system.get_disable_keyboard_on_lock """ - ret = __utils__["mac_utils.execute_return_result"]( + ret = salt.utils.mac_utils.execute_return_result( "systemsetup -getdisablekeyboardwhenenclosurelockisengaged" ) - enabled = __utils__["mac_utils.validate_enabled"]( - __utils__["mac_utils.parse_return"](ret) + enabled = salt.utils.mac_utils.validate_enabled( + salt.utils.mac_utils.parse_return(ret) ) return enabled == "on" @@ -564,12 +563,12 @@ def set_disable_keyboard_on_lock(enable): salt '*' system.set_disable_keyboard_on_lock False """ - state = __utils__["mac_utils.validate_enabled"](enable) + state = salt.utils.mac_utils.validate_enabled(enable) cmd = "systemsetup -setdisablekeyboardwhenenclosurelockisengaged {}".format(state) - __utils__["mac_utils.execute_return_success"](cmd) + salt.utils.mac_utils.execute_return_success(cmd) - return __utils__["mac_utils.confirm_updated"]( + return salt.utils.mac_utils.confirm_updated( state, get_disable_keyboard_on_lock, normalize_ret=True, @@ -589,11 +588,11 @@ def get_boot_arch(): salt '*' system.get_boot_arch """ - ret = __utils__["mac_utils.execute_return_result"]( + ret = salt.utils.mac_utils.execute_return_result( "systemsetup -getkernelbootarchitecturesetting" ) - arch = __utils__["mac_utils.parse_return"](ret) + arch = salt.utils.mac_utils.parse_return(ret) if "default" in arch: return "default" @@ -640,9 +639,9 @@ def set_boot_arch(arch="default"): raise SaltInvocationError(msg) cmd = "systemsetup -setkernelbootarchitecture {}".format(arch) - __utils__["mac_utils.execute_return_success"](cmd) + salt.utils.mac_utils.execute_return_success(cmd) - return __utils__["mac_utils.confirm_updated"]( + return salt.utils.mac_utils.confirm_updated( arch, get_boot_arch, ) diff --git a/salt/modules/napalm_mod.py b/salt/modules/napalm_mod.py index 8f70c9ad62b4..4a2d7129cd3f 100644 --- a/salt/modules/napalm_mod.py +++ b/salt/modules/napalm_mod.py @@ -9,6 +9,7 @@ import logging +import salt.utils.args import salt.utils.napalm from salt.exceptions import CommandExecutionError from salt.utils.decorators import depends @@ -95,7 +96,7 @@ def _get_netmiko_args(optional_args): # Older version don't have the netmiko_helpers module, the following code is # simply a port from the NAPALM code base, for backwards compatibility: # https://github.com/napalm-automation/napalm/blob/develop/napalm/base/netmiko_helpers.py - netmiko_args, _, _, netmiko_defaults = __utils__["args.get_function_argspec"]( + netmiko_args, _, _, netmiko_defaults = salt.utils.args.get_function_argspec( BaseConnection.__init__ ) check_self = netmiko_args.pop(0) diff --git a/salt/modules/napalm_network.py b/salt/modules/napalm_network.py index 03fa8bc54f9a..544599c2ee48 100644 --- a/salt/modules/napalm_network.py +++ b/salt/modules/napalm_network.py @@ -25,6 +25,7 @@ import salt.utils.files import salt.utils.napalm import salt.utils.templates +import salt.utils.timeutil import salt.utils.versions log = logging.getLogger(__name__) @@ -244,7 +245,7 @@ def _config_logic( # and also the user wants to commit (default) # and there are changes to commit if commit_in or commit_at: - commit_time = __utils__["timeutil.get_time_at"]( + commit_time = salt.utils.timeutil.get_time_at( time_in=commit_in, time_at=commit_in ) # schedule job @@ -291,7 +292,7 @@ def _config_logic( log.debug("About to commit:") log.debug(loaded_result["diff"]) if revert_in or revert_at: - revert_time = __utils__["timeutil.get_time_at"]( + revert_time = salt.utils.timeutil.get_time_at( time_in=revert_in, time_at=revert_at ) if __grains__["os"] == "junos": @@ -303,7 +304,7 @@ def _config_logic( ) loaded_result["result"] = False return loaded_result - timestamp_at = __utils__["timeutil.get_timestamp_at"]( + timestamp_at = salt.utils.timeutil.get_timestamp_at( time_in=revert_in, time_at=revert_at ) minutes = int((timestamp_at - time.time()) / 60) diff --git a/salt/modules/netbox.py b/salt/modules/netbox.py index 656087d0cb06..84334a04b1fc 100644 --- a/salt/modules/netbox.py +++ b/salt/modules/netbox.py @@ -25,6 +25,8 @@ import logging import re +import salt.utils.args +import salt.utils.dictupdate from salt.exceptions import CommandExecutionError try: @@ -118,7 +120,7 @@ def _get(app, endpoint, id=None, auth_required=False, **kwargs): if id: item = getattr(getattr(nb, app), endpoint).get(id) else: - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) item = getattr(getattr(nb, app), endpoint).get(**kwargs) return item @@ -153,7 +155,7 @@ def filter_(app, endpoint, **kwargs): ret = [] nb = _nb_obj(auth_required=True if app in AUTH_ENDPOINTS else False) nb_query = getattr(getattr(nb, app), endpoint).filter( - **__utils__["args.clean_kwargs"](**kwargs) + **salt.utils.args.clean_kwargs(**kwargs) ) if nb_query: ret = [_strip_url_field(dict(i)) for i in nb_query] @@ -411,7 +413,7 @@ def update_device(name, **kwargs): salt myminion netbox.update_device edge_router serial=JN2932920 """ - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) nb_device = _get("dcim", "devices", auth_required=True, name=name) for k, v in kwargs.items(): setattr(nb_device, k, v) @@ -604,7 +606,7 @@ def openconfig_interfaces(device_name=None): } } } - oc_if[if_name] = __utils__["dictupdate.update"]( + oc_if[if_name] = salt.utils.dictupdate.update( oc_if[if_name], subif_descr ) if interface["mtu"]: diff --git a/salt/modules/netmiko_mod.py b/salt/modules/netmiko_mod.py index 592837343bda..4f8cc38274d1 100644 --- a/salt/modules/netmiko_mod.py +++ b/salt/modules/netmiko_mod.py @@ -184,6 +184,7 @@ import logging +import salt.utils.args import salt.utils.platform from salt.exceptions import CommandExecutionError from salt.utils.args import clean_kwargs @@ -252,7 +253,7 @@ def _prepare_connection(**kwargs): fun_kwargs = {} netmiko_kwargs = __salt__["config.get"]("netmiko", {}) netmiko_kwargs.update(kwargs) # merge the CLI args with the opts/pillar - netmiko_init_args, _, _, netmiko_defaults = __utils__["args.get_function_argspec"]( + netmiko_init_args, _, _, netmiko_defaults = salt.utils.args.get_function_argspec( BaseConnection.__init__ ) check_self = netmiko_init_args.pop(0) diff --git a/salt/modules/network.py b/salt/modules/network.py index 1149c9609738..30925d072d46 100644 --- a/salt/modules/network.py +++ b/salt/modules/network.py @@ -13,9 +13,12 @@ import time import salt.utils.decorators.path +import salt.utils.files import salt.utils.functools import salt.utils.network +import salt.utils.path import salt.utils.platform +import salt.utils.stringutils import salt.utils.validate.net from salt._compat import ipaddress from salt.exceptions import CommandExecutionError @@ -49,7 +52,7 @@ def wol(mac, bcast="255.255.255.255", destport=9): salt '*' network.wol 080027136977 255.255.255.255 7 salt '*' network.wol 08:00:27:13:69:77 255.255.255.255 7 """ - dest = __utils__["network.mac_str_to_bytes"](mac) + dest = salt.utils.network.mac_str_to_bytes(mac) sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1) sock.sendto(b"\xff" * 6 + dest * 16, (bcast, int(destport))) @@ -86,14 +89,14 @@ def ping(host, timeout=False, return_boolean=False): if timeout: if __grains__["kernel"] == "SunOS": cmd = "ping -c 4 {} {}".format( - __utils__["network.sanitize_host"](host), timeout + salt.utils.network.sanitize_host(host), timeout ) else: cmd = "ping -W {} -c 4 {}".format( - timeout, __utils__["network.sanitize_host"](host) + timeout, salt.utils.network.sanitize_host(host) ) else: - cmd = "ping -c 4 {}".format(__utils__["network.sanitize_host"](host)) + cmd = "ping -c 4 {}".format(salt.utils.network.sanitize_host(host)) if return_boolean: ret = __salt__["cmd.run_all"](cmd) if ret["retcode"] != 0: @@ -855,7 +858,7 @@ def netstat(): salt '*' network.netstat """ if __grains__["kernel"] == "Linux": - if not __utils__["path.which"]("netstat"): + if not salt.utils.path.which("netstat"): return _ss_linux() else: return _netstat_linux() @@ -883,7 +886,7 @@ def active_tcp(): salt '*' network.active_tcp """ if __grains__["kernel"] == "Linux": - return __utils__["network.active_tcp"]() + return salt.utils.network.active_tcp() elif __grains__["kernel"] == "SunOS": # lets use netstat to mimic linux as close as possible ret = {} @@ -936,11 +939,11 @@ def traceroute(host): salt '*' network.traceroute archlinux.org """ ret = [] - cmd = "traceroute {}".format(__utils__["network.sanitize_host"](host)) + cmd = "traceroute {}".format(salt.utils.network.sanitize_host(host)) out = __salt__["cmd.run"](cmd) # Parse version of traceroute - if __utils__["platform.is_sunos"]() or __utils__["platform.is_aix"](): + if salt.utils.platform.is_sunos() or salt.utils.platform.is_aix(): traceroute_version = [0, 0, 0] else: version_out = __salt__["cmd.run"]("traceroute --version") @@ -975,7 +978,7 @@ def traceroute(host): skip_line = True if line.startswith("traceroute"): skip_line = True - if __utils__["platform.is_aix"](): + if salt.utils.platform.is_aix(): if line.startswith("trying to get source for"): skip_line = True if line.startswith("source should be"): @@ -1073,7 +1076,7 @@ def dig(host): salt '*' network.dig archlinux.org """ - cmd = "dig {}".format(__utils__["network.sanitize_host"](host)) + cmd = "dig {}".format(salt.utils.network.sanitize_host(host)) return __salt__["cmd.run"](cmd) @@ -1125,7 +1128,7 @@ def interfaces(): salt '*' network.interfaces """ - return __utils__["network.interfaces"]() + return salt.utils.network.interfaces() def hw_addr(iface): @@ -1138,7 +1141,7 @@ def hw_addr(iface): salt '*' network.hw_addr eth0 """ - return __utils__["network.hw_addr"](iface) + return salt.utils.network.hw_addr(iface) # Alias hwaddr to preserve backward compat @@ -1157,7 +1160,7 @@ def interface(iface): salt '*' network.interface eth0 """ - return __utils__["network.interface"](iface) + return salt.utils.network.interface(iface) def interface_ip(iface): @@ -1172,7 +1175,7 @@ def interface_ip(iface): salt '*' network.interface_ip eth0 """ - return __utils__["network.interface_ip"](iface) + return salt.utils.network.interface_ip(iface) def subnets(interfaces=None): @@ -1186,7 +1189,7 @@ def subnets(interfaces=None): salt '*' network.subnets salt '*' network.subnets interfaces=eth1 """ - return __utils__["network.subnets"](interfaces) + return salt.utils.network.subnets(interfaces) def subnets6(): @@ -1199,7 +1202,7 @@ def subnets6(): salt '*' network.subnets """ - return __utils__["network.subnets6"]() + return salt.utils.network.subnets6() def in_subnet(cidr): @@ -1212,7 +1215,7 @@ def in_subnet(cidr): salt '*' network.in_subnet 10.0.0.0/16 """ - return __utils__["network.in_subnet"](cidr) + return salt.utils.network.in_subnet(cidr) def ip_in_subnet(ip_addr, cidr): @@ -1225,7 +1228,7 @@ def ip_in_subnet(ip_addr, cidr): salt '*' network.ip_in_subnet 172.17.0.4 172.16.0.0/12 """ - return __utils__["network.in_subnet"](cidr, ip_addr) + return salt.utils.network.in_subnet(cidr, ip_addr) def convert_cidr(cidr): @@ -1264,7 +1267,7 @@ def calc_net(ip_addr, netmask=None): .. versionadded:: 2015.8.0 """ - return __utils__["network.calc_net"](ip_addr, netmask) + return salt.utils.network.calc_net(ip_addr, netmask) def ip_addrs(interface=None, include_loopback=False, cidr=None, type=None): @@ -1286,11 +1289,11 @@ def ip_addrs(interface=None, include_loopback=False, cidr=None, type=None): salt '*' network.ip_addrs """ - addrs = __utils__["network.ip_addrs"]( + addrs = salt.utils.network.ip_addrs( interface=interface, include_loopback=include_loopback ) if cidr: - return [i for i in addrs if __utils__["network.in_subnet"](cidr, [i])] + return [i for i in addrs if salt.utils.network.in_subnet(cidr, [i])] else: if type == "public": return [i for i in addrs if not is_private(i)] @@ -1321,11 +1324,11 @@ def ip_addrs6(interface=None, include_loopback=False, cidr=None): salt '*' network.ip_addrs6 """ - addrs = __utils__["network.ip_addrs6"]( + addrs = salt.utils.network.ip_addrs6( interface=interface, include_loopback=include_loopback ) if cidr: - return [i for i in addrs if __utils__["network.in_subnet"](cidr, [i])] + return [i for i in addrs if salt.utils.network.in_subnet(cidr, [i])] else: return addrs @@ -1386,16 +1389,16 @@ def mod_hostname(hostname): if hostname is None: return False - hostname_cmd = __utils__["path.which"]("hostnamectl") or __utils__["path.which"]( + hostname_cmd = salt.utils.path.which("hostnamectl") or salt.utils.path.which( "hostname" ) - if __utils__["platform.is_sunos"](): + if salt.utils.platform.is_sunos(): uname_cmd = ( "/usr/bin/uname" - if __utils__["platform.is_smartos"]() - else __utils__["path.which"]("uname") + if salt.utils.platform.is_smartos() + else salt.utils.path.which("uname") ) - check_hostname_cmd = __utils__["path.which"]("check-hostname") + check_hostname_cmd = salt.utils.path.which("check-hostname") # Grab the old hostname so we know which hostname to change and then # change the hostname using the hostname command @@ -1410,7 +1413,7 @@ def mod_hostname(hostname): else: log.debug("%s was unable to get hostname", hostname_cmd) o_hostname = __salt__["network.get_hostname"]() - elif not __utils__["platform.is_sunos"](): + elif not salt.utils.platform.is_sunos(): # don't run hostname -f because -f is not supported on all platforms o_hostname = socket.getfqdn() else: @@ -1431,57 +1434,57 @@ def mod_hostname(hostname): result["stderr"], ) return False - elif not __utils__["platform.is_sunos"](): + elif not salt.utils.platform.is_sunos(): __salt__["cmd.run"]("{} {}".format(hostname_cmd, hostname)) else: __salt__["cmd.run"]("{} -S {}".format(uname_cmd, hostname.split(".")[0])) # Modify the /etc/hosts file to replace the old hostname with the # new hostname - with __utils__["files.fopen"]("/etc/hosts", "r") as fp_: - host_c = [__utils__["stringutils.to_unicode"](_l) for _l in fp_.readlines()] + with salt.utils.files.fopen("/etc/hosts", "r") as fp_: + host_c = [salt.utils.stringutils.to_unicode(_l) for _l in fp_.readlines()] - with __utils__["files.fopen"]("/etc/hosts", "w") as fh_: + with salt.utils.files.fopen("/etc/hosts", "w") as fh_: for host in host_c: host = host.split() try: host[host.index(o_hostname)] = hostname - if __utils__["platform.is_sunos"](): + if salt.utils.platform.is_sunos(): # also set a copy of the hostname host[host.index(o_hostname.split(".")[0])] = hostname.split(".")[0] except ValueError: pass - fh_.write(__utils__["stringutils.to_str"]("\t".join(host) + "\n")) + fh_.write(salt.utils.stringutils.to_str("\t".join(host) + "\n")) # Modify the /etc/sysconfig/network configuration file to set the # new hostname if __grains__["os_family"] == "RedHat": - with __utils__["files.fopen"]("/etc/sysconfig/network", "r") as fp_: + with salt.utils.files.fopen("/etc/sysconfig/network", "r") as fp_: network_c = [ - __utils__["stringutils.to_unicode"](_l) for _l in fp_.readlines() + salt.utils.stringutils.to_unicode(_l) for _l in fp_.readlines() ] - with __utils__["files.fopen"]("/etc/sysconfig/network", "w") as fh_: + with salt.utils.files.fopen("/etc/sysconfig/network", "w") as fh_: for net in network_c: if net.startswith("HOSTNAME"): old_hostname = net.split("=", 1)[1].rstrip() - quote_type = __utils__["stringutils.is_quoted"](old_hostname) + quote_type = salt.utils.stringutils.is_quoted(old_hostname) fh_.write( - __utils__["stringutils.to_str"]( + salt.utils.stringutils.to_str( "HOSTNAME={1}{0}{1}\n".format( - __utils__["stringutils.dequote"](hostname), quote_type + salt.utils.stringutils.dequote(hostname), quote_type ) ) ) else: - fh_.write(__utils__["stringutils.to_str"](net)) + fh_.write(salt.utils.stringutils.to_str(net)) elif __grains__["os_family"] in ("Debian", "NILinuxRT"): - with __utils__["files.fopen"]("/etc/hostname", "w") as fh_: - fh_.write(__utils__["stringutils.to_str"](hostname + "\n")) + with salt.utils.files.fopen("/etc/hostname", "w") as fh_: + fh_.write(salt.utils.stringutils.to_str(hostname + "\n")) if __grains__["lsb_distrib_id"] == "nilrt": - str_hostname = __utils__["stringutils.to_str"](hostname) + str_hostname = salt.utils.stringutils.to_str(hostname) nirtcfg_cmd = "/usr/local/natinst/bin/nirtcfg" nirtcfg_cmd += ( " --set section=SystemSettings,token='Host_Name',value='{}'".format( @@ -1493,18 +1496,16 @@ def mod_hostname(hostname): "Couldn't set hostname to: {}\n".format(str_hostname) ) elif __grains__["os_family"] == "OpenBSD": - with __utils__["files.fopen"]("/etc/myname", "w") as fh_: - fh_.write(__utils__["stringutils.to_str"](hostname + "\n")) + with salt.utils.files.fopen("/etc/myname", "w") as fh_: + fh_.write(salt.utils.stringutils.to_str(hostname + "\n")) # Update /etc/nodename and /etc/defaultdomain on SunOS - if __utils__["platform.is_sunos"](): - with __utils__["files.fopen"]("/etc/nodename", "w") as fh_: - fh_.write(__utils__["stringutils.to_str"](hostname.split(".")[0] + "\n")) - with __utils__["files.fopen"]("/etc/defaultdomain", "w") as fh_: + if salt.utils.platform.is_sunos(): + with salt.utils.files.fopen("/etc/nodename", "w") as fh_: + fh_.write(salt.utils.stringutils.to_str(hostname.split(".")[0] + "\n")) + with salt.utils.files.fopen("/etc/defaultdomain", "w") as fh_: fh_.write( - __utils__["stringutils.to_str"]( - ".".join(hostname.split(".")[1:]) + "\n" - ) + salt.utils.stringutils.to_str(".".join(hostname.split(".")[1:]) + "\n") ) return True @@ -1551,7 +1552,7 @@ def connect(host, port=None, **kwargs): ): address = host else: - address = "{}".format(__utils__["network.sanitize_host"](host)) + address = "{}".format(salt.utils.network.sanitize_host(host)) try: if proto == "udp": @@ -1773,7 +1774,7 @@ def routes(family=None): raise CommandExecutionError("Invalid address family {}".format(family)) if __grains__["kernel"] == "Linux": - if not __utils__["path.which"]("netstat"): + if not salt.utils.path.which("netstat"): routes_ = _ip_route_linux() else: routes_ = _netstat_route_linux() @@ -1913,7 +1914,7 @@ def get_route(ip): ret["gateway"] = line[1].strip() if "interface" in line[0]: ret["interface"] = line[1].strip() - ret["source"] = __utils__["network.interface_ip"](line[1].strip()) + ret["source"] = salt.utils.network.interface_ip(line[1].strip()) return ret @@ -2043,7 +2044,7 @@ def ip_networks(interface=None, include_loopback=False, verbose=False): salt '*' network.ip_networks interface=docker0,enp* salt '*' network.ip_networks interface=eth* """ - return __utils__["network.ip_networks"]( + return salt.utils.network.ip_networks( interface=interface, include_loopback=include_loopback, verbose=verbose ) @@ -2068,7 +2069,7 @@ def ip_networks6(interface=None, include_loopback=False, verbose=False): salt '*' network.ip_networks6 interface=docker0,enp* salt '*' network.ip_networks6 interface=eth* """ - return __utils__["network.ip_networks6"]( + return salt.utils.network.ip_networks6( interface=interface, include_loopback=include_loopback, verbose=verbose ) diff --git a/salt/modules/neutronng.py b/salt/modules/neutronng.py index daf91f49ff7d..678898154122 100644 --- a/salt/modules/neutronng.py +++ b/salt/modules/neutronng.py @@ -24,7 +24,7 @@ auth_url: https://example.org:5000/v3 identity_api_version: 3 """ - +import salt.utils.args HAS_SHADE = False try: @@ -69,7 +69,7 @@ def _clean_kwargs(keep_name=False, **kwargs): if "name" in kwargs and not keep_name: kwargs["name_or_id"] = kwargs.pop("name") - return __utils__["args.clean_kwargs"](**kwargs) + return salt.utils.args.clean_kwargs(**kwargs) def setup_clouds(auth=None): diff --git a/salt/modules/nxos.py b/salt/modules/nxos.py index d1bd109063c7..5f40e45c522b 100644 --- a/salt/modules/nxos.py +++ b/salt/modules/nxos.py @@ -127,7 +127,7 @@ def ping(**kwargs): """ if salt.utils.platform.is_proxy(): return __proxy__["nxos.ping"]() - return __utils__["nxos.ping"](**kwargs) + return salt.utils.nxos.ping(**kwargs) # ----------------------------------------------------------------------------- @@ -875,4 +875,4 @@ def _nxapi_request(commands, method="cli_conf", **kwargs): else: api_kwargs = __salt__["config.get"]("nxos", {}) api_kwargs.update(**kwargs) - return __utils__["nxos.nxapi_request"](commands, method=method, **api_kwargs) + return salt.utils.nxos.nxapi_request(commands, method=method, **api_kwargs) diff --git a/salt/modules/nxos_api.py b/salt/modules/nxos_api.py index b4409b7dd478..fc8484f39957 100644 --- a/salt/modules/nxos_api.py +++ b/salt/modules/nxos_api.py @@ -125,6 +125,7 @@ import difflib import logging +import salt.utils.nxos_api from salt.exceptions import CommandExecutionError, SaltException # ----------------------------------------------------------------------------- @@ -246,7 +247,7 @@ def rpc(commands, method="cli", **kwargs): return __proxy__["nxos_api.rpc"](commands, method=method, **nxos_api_kwargs) nxos_api_kwargs = __salt__["config.get"]("nxos_api", {}) nxos_api_kwargs.update(**kwargs) - return __utils__["nxos_api.rpc"](commands, method=method, **nxos_api_kwargs) + return salt.utils.nxos_api.rpc(commands, method=method, **nxos_api_kwargs) def show(commands, raw_text=True, **kwargs): diff --git a/salt/modules/pip.py b/salt/modules/pip.py index 7135a9145fb4..fe247fed0533 100644 --- a/salt/modules/pip.py +++ b/salt/modules/pip.py @@ -94,6 +94,7 @@ import salt.utils.stringutils import salt.utils.url import salt.utils.versions +import salt.utils.win_dacl from salt.exceptions import CommandExecutionError, CommandNotFoundError # This needs to be named logger so we don't shadow it in pip.install @@ -327,7 +328,7 @@ def _process_requirements(requirements, cmd, cwd, saltenv, user): # In Windows, just being owner of a file isn't enough. You also # need permissions if salt.utils.platform.is_windows(): - __utils__["dacl.set_permissions"]( + salt.utils.win_dacl.set_permissions( obj_name=treq, principal=user, permissions="read_execute" ) diff --git a/salt/modules/proxy.py b/salt/modules/proxy.py index 81453b83bdd2..45af4f454bb1 100644 --- a/salt/modules/proxy.py +++ b/salt/modules/proxy.py @@ -11,6 +11,7 @@ import re import salt.utils.platform +import salt.utils.win_reg log = logging.getLogger(__name__) __virtualname__ = "proxy" @@ -113,14 +114,14 @@ def _set_proxy_windows( for t in types: server_str += "{}={}:{};".format(t, server, port) - __utils__["reg.set_value"]( + salt.utils.win_reg.set_value( hive="HKEY_CURRENT_USER", key=r"SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings", vname="ProxyServer", vdata=server_str, ) - __utils__["reg.set_value"]( + salt.utils.win_reg.set_value( hive="HKEY_CURRENT_USER", key=r"SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings", vname="ProxyEnable", @@ -131,7 +132,7 @@ def _set_proxy_windows( if bypass_hosts is not None: bypass_hosts_str = ";{}".format(";".join(bypass_hosts)) - __utils__["reg.set_value"]( + salt.utils.win_reg.set_value( hive="HKEY_CURRENT_USER", key=r"SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings", vname="ProxyOverride", diff --git a/salt/modules/purefa.py b/salt/modules/purefa.py index 143f0283c202..da3b9372cf77 100644 --- a/salt/modules/purefa.py +++ b/salt/modules/purefa.py @@ -54,6 +54,8 @@ import platform from datetime import datetime +import salt.utils.stringutils +import salt.utils.value from salt.exceptions import CommandExecutionError # Import 3rd party modules @@ -455,7 +457,7 @@ def volume_extend(name, size): array = _get_system() vol = _get_volume(name, array) if vol is not None: - if __utils__["stringutils.human_to_bytes"](size) > vol["size"]: + if salt.utils.stringutils.human_to_bytes(size) > vol["size"]: try: array.extend_volume(name, size) return True @@ -993,7 +995,7 @@ def pg_create(name, hostgroup=None, host=None, volume=None, enabled=True): return False else: return False - elif __utils__["value.xor"](hostgroup, host, volume): + elif salt.utils.value.xor(hostgroup, host, volume): if _get_pgroup(name, array) is None: try: array.create_pgroup(name) diff --git a/salt/modules/purefb.py b/salt/modules/purefb.py index 0439c4b96153..ad5d1cbc568e 100644 --- a/salt/modules/purefb.py +++ b/salt/modules/purefb.py @@ -53,6 +53,7 @@ import os from datetime import datetime +import salt.utils.stringutils from salt.exceptions import CommandExecutionError try: @@ -322,9 +323,9 @@ def fs_create( print(proto) if _get_fs(name, blade) is None: if size is None: - size = __utils__["stringutils.human_to_bytes"]("32G") + size = salt.utils.stringutils.human_to_bytes("32G") else: - size = __utils__["stringutils.human_to_bytes"](size) + size = salt.utils.stringutils.human_to_bytes(size) if proto.lower() == "nfs": fs_obj = FileSystem( name=name, @@ -463,9 +464,9 @@ def fs_extend(name, size): blade = _get_blade() _fs = _get_fs(name, blade) if _fs is not None: - if __utils__["stringutils.human_to_bytes"](size) > _fs.provisioned: + if salt.utils.stringutils.human_to_bytes(size) > _fs.provisioned: try: - attr["provisioned"] = __utils__["stringutils.human_to_bytes"](size) + attr["provisioned"] = salt.utils.stringutils.human_to_bytes(size) n_attr = FileSystem(**attr) blade.file_systems.update_file_systems(name=name, attributes=n_attr) return True diff --git a/salt/modules/rebootmgr.py b/salt/modules/rebootmgr.py index 4354dd1fce86..2df2966366fb 100644 --- a/salt/modules/rebootmgr.py +++ b/salt/modules/rebootmgr.py @@ -11,13 +11,14 @@ import re import salt.exceptions +import salt.utils.path log = logging.getLogger(__name__) def __virtual__(): """rebootmgrctl command is required.""" - if __utils__["path.which"]("rebootmgrctl") is not None: + if salt.utils.path.which("rebootmgrctl") is not None: return True else: return (False, "Module rebootmgt requires the command rebootmgrctl") diff --git a/salt/modules/reg.py b/salt/modules/reg.py index 229998e27a9b..3779dd739fe2 100644 --- a/salt/modules/reg.py +++ b/salt/modules/reg.py @@ -69,6 +69,7 @@ import logging import salt.utils.platform +import salt.utils.win_reg from salt.exceptions import CommandExecutionError log = logging.getLogger(__name__) @@ -119,7 +120,7 @@ def key_exists(hive, key, use_32bit_registry=False): salt '*' reg.key_exists HKLM SOFTWARE\Microsoft """ - return __utils__["reg.key_exists"]( + return salt.utils.win_reg.key_exists( hive=hive, key=key, use_32bit_registry=use_32bit_registry ) @@ -149,7 +150,7 @@ def value_exists(hive, key, vname, use_32bit_registry=False): salt '*' reg.value_exists HKLM SOFTWARE\Microsoft\Windows\CurrentVersion CommonFilesDir """ - return __utils__["reg.value_exists"]( + return salt.utils.win_reg.value_exists( hive=hive, key=key, vname=vname, use_32bit_registry=use_32bit_registry ) @@ -206,7 +207,7 @@ def list_keys(hive, key=None, use_32bit_registry=False): salt '*' reg.list_keys HKLM 'SOFTWARE' """ - return __utils__["reg.list_keys"]( + return salt.utils.win_reg.list_keys( hive=hive, key=key, use_32bit_registry=use_32bit_registry ) @@ -247,7 +248,7 @@ def list_values(hive, key=None, use_32bit_registry=False): salt '*' reg.list_values HKLM 'SYSTEM\\CurrentControlSet\\Services\\Tcpip' """ - return __utils__["reg.list_values"]( + return salt.utils.win_reg.list_values( hive=hive, key=key, use_32bit_registry=use_32bit_registry ) @@ -307,7 +308,7 @@ def read_value(hive, key, vname=None, use_32bit_registry=False): salt '*' reg.read_value HKEY_LOCAL_MACHINE 'SOFTWARE\Salt' """ - return __utils__["reg.read_value"]( + return salt.utils.win_reg.read_value( hive=hive, key=key, vname=vname, use_32bit_registry=use_32bit_registry ) @@ -431,7 +432,7 @@ def set_value( salt '*' reg.set_value HKEY_LOCAL_MACHINE 'SOFTWARE\\Salt' 'list_data' vtype=REG_MULTI_SZ vdata='["Salt", "is", "great"]' """ - return __utils__["reg.set_value"]( + return salt.utils.win_reg.set_value( hive=hive, key=key, vname=vname, @@ -479,7 +480,7 @@ def delete_key_recursive(hive, key, use_32bit_registry=False): salt '*' reg.delete_key_recursive HKLM SOFTWARE\\delete_me """ - return __utils__["reg.delete_key_recursive"]( + return salt.utils.win_reg.delete_key_recursive( hive=hive, key=key, use_32bit_registry=use_32bit_registry ) @@ -519,7 +520,7 @@ def delete_value(hive, key, vname=None, use_32bit_registry=False): salt '*' reg.delete_value HKEY_CURRENT_USER 'SOFTWARE\\Salt' 'version' """ - return __utils__["reg.delete_value"]( + return salt.utils.win_reg.delete_value( hive=hive, key=key, vname=vname, use_32bit_registry=use_32bit_registry ) diff --git a/salt/modules/rh_service.py b/salt/modules/rh_service.py index ec0db7963dc4..5e5e02018b86 100644 --- a/salt/modules/rh_service.py +++ b/salt/modules/rh_service.py @@ -16,6 +16,7 @@ import stat import salt.utils.path +import salt.utils.systemd log = logging.getLogger(__name__) @@ -49,7 +50,7 @@ def __virtual__(): management of either sysvinit or a hybrid sysvinit/upstart init system. """ # Disable when booted with systemd - if __utils__["systemd.booted"](__context__): + if salt.utils.systemd.booted(__context__): return ( False, "The rh_service execution module failed to load: this system was booted" diff --git a/salt/modules/s3.py b/salt/modules/s3.py index 393310dd0186..1979a369e5d1 100644 --- a/salt/modules/s3.py +++ b/salt/modules/s3.py @@ -73,6 +73,8 @@ import logging +import salt.utils.s3 + log = logging.getLogger(__name__) @@ -131,7 +133,7 @@ def delete( https_enable, ) - return __utils__["s3.query"]( + return salt.utils.s3.query( method="DELETE", bucket=bucket, path=path, @@ -227,7 +229,7 @@ def get( https_enable, ) - return __utils__["s3.query"]( + return salt.utils.s3.query( method="GET", bucket=bucket, path=path, @@ -291,7 +293,7 @@ def head( https_enable, ) - return __utils__["s3.query"]( + return salt.utils.s3.query( method="HEAD", bucket=bucket, path=path, @@ -357,7 +359,7 @@ def put( https_enable, ) - return __utils__["s3.query"]( + return salt.utils.s3.query( method="PUT", bucket=bucket, path=path, diff --git a/salt/modules/slsutil.py b/salt/modules/slsutil.py index 4345bc02e146..75aa9ef86c21 100644 --- a/salt/modules/slsutil.py +++ b/salt/modules/slsutil.py @@ -13,6 +13,7 @@ import salt.utils.args import salt.utils.dictupdate import salt.utils.path +import salt.utils.stringio CONTEXT_BASE = "slsutil" @@ -181,7 +182,7 @@ def run(): __opts__["renderer_whitelist"], **kwargs ) - return ret.read() if __utils__["stringio.is_readable"](ret) else ret + return ret.read() if salt.utils.stringio.is_readable(ret) else ret def _get_serialize_fn(serializer, fn_name): diff --git a/salt/modules/ssh.py b/salt/modules/ssh.py index d17e48aa0baa..40fe69e9bbe1 100644 --- a/salt/modules/ssh.py +++ b/salt/modules/ssh.py @@ -21,6 +21,7 @@ import salt.utils.files import salt.utils.path import salt.utils.platform +import salt.utils.ssh import salt.utils.stringutils from salt.exceptions import CommandExecutionError, SaltInvocationError @@ -1415,4 +1416,4 @@ def key_is_encrypted(key): salt '*' ssh.key_is_encrypted /root/id_rsa """ - return __utils__["ssh.key_is_encrypted"](key) + return salt.utils.ssh.key_is_encrypted(key) diff --git a/salt/modules/state.py b/salt/modules/state.py index f2142913287f..a8ed58bede7d 100644 --- a/salt/modules/state.py +++ b/salt/modules/state.py @@ -100,7 +100,7 @@ def _set_retcode(ret, highstate=None): if isinstance(ret, list): __context__["retcode"] = salt.defaults.exitcodes.EX_STATE_COMPILER_ERROR return - if not __utils__["state.check_result"](ret, highstate=highstate): + if not salt.utils.state.check_result(ret, highstate=highstate): __context__["retcode"] = salt.defaults.exitcodes.EX_STATE_FAILURE @@ -459,7 +459,7 @@ def low(data, queue=False, **kwargs): ret = st_.call(data) if isinstance(ret, list): __context__["retcode"] = salt.defaults.exitcodes.EX_STATE_COMPILER_ERROR - if __utils__["state.check_result"](ret): + if salt.utils.state.check_result(ret): __context__["retcode"] = salt.defaults.exitcodes.EX_STATE_FAILURE return ret diff --git a/salt/modules/testinframod.py b/salt/modules/testinframod.py index eb7254a09d6f..a7303e6bb388 100644 --- a/salt/modules/testinframod.py +++ b/salt/modules/testinframod.py @@ -13,6 +13,7 @@ import re import types +import salt.utils.args from salt.utils.stringutils import camel_to_snake_case, snake_to_camel_case log = logging.getLogger(__name__) @@ -221,9 +222,9 @@ def _run_tests(name, **methods): parameters = mod_sig.parameters else: if isinstance(mod.__init__, types.MethodType): - mod_sig = __utils__["args.get_function_argspec"](mod.__init__) + mod_sig = salt.utils.args.get_function_argspec(mod.__init__) elif hasattr(mod, "__call__"): - mod_sig = __utils__["args.get_function_argspec"](mod.__call__) + mod_sig = salt.utils.args.get_function_argspec(mod.__call__) parameters = mod_sig.args log.debug("Parameters accepted by module %s: %s", module_name, parameters) additional_args = {} diff --git a/salt/modules/transactional_update.py b/salt/modules/transactional_update.py index 28b02f8fec27..e762319116ea 100644 --- a/salt/modules/transactional_update.py +++ b/salt/modules/transactional_update.py @@ -284,6 +284,8 @@ import salt.client.ssh.wrapper.state import salt.exceptions import salt.utils.args +import salt.utils.json +import salt.utils.path from salt.modules.state import _check_queue, _prior_running_states, _wait, running __func_alias__ = {"apply_": "apply"} @@ -296,7 +298,7 @@ def __virtual__(): transactional-update command is required. """ global _check_queue, _wait, _prior_running_states, running - if __utils__["path.which"]("transactional-update"): + if salt.utils.path.which("transactional-update"): _check_queue = salt.utils.functools.namespaced_function(_check_queue, globals()) _wait = salt.utils.functools.namespaced_function(_wait, globals()) _prior_running_states = salt.utils.functools.namespaced_function( @@ -367,7 +369,7 @@ def transactional(): salt microos transactional_update transactional """ - return bool(__utils__["path.which"]("transactional-update")) + return bool(salt.utils.path.which("transactional-update")) def in_transaction(): @@ -966,7 +968,7 @@ def call(function, *args, **kwargs): # Process "real" result in stdout try: - data = __utils__["json.find_json"](ret_stdout) + data = salt.utils.json.find_json(ret_stdout) local = data.get("local", data) if isinstance(local, dict): if "retcode" in local: diff --git a/salt/modules/vagrant.py b/salt/modules/vagrant.py index f34eae5e98ed..8a60836f4371 100644 --- a/salt/modules/vagrant.py +++ b/salt/modules/vagrant.py @@ -32,6 +32,7 @@ import salt.utils.files import salt.utils.path +import salt.utils.sdb import salt.utils.stringutils from salt._compat import ipaddress from salt.exceptions import CommandExecutionError, SaltInvocationError @@ -79,11 +80,11 @@ def _build_machine_uri(machine, cwd): def _update_vm_info(name, vm_): """store the vm_ information keyed by name""" - __utils__["sdb.sdb_set"](_build_sdb_uri(name), vm_, __opts__) + salt.utils.sdb.sdb_set(_build_sdb_uri(name), vm_, __opts__) # store machine-to-name mapping, too if vm_["machine"]: - __utils__["sdb.sdb_set"]( + salt.utils.sdb.sdb_set( _build_machine_uri(vm_["machine"], vm_.get("cwd", ".")), name, __opts__ ) @@ -96,7 +97,7 @@ def get_vm_info(name): :return: dictionary of {'machine': x, 'cwd': y, ...}. """ try: - vm_ = __utils__["sdb.sdb_get"](_build_sdb_uri(name), __opts__) + vm_ = salt.utils.sdb.sdb_get(_build_sdb_uri(name), __opts__) except KeyError: raise SaltInvocationError( "Probable sdb driver not found. Check your configuration." @@ -116,7 +117,7 @@ def get_machine_id(machine, cwd): :param cwd: the path to Vagrantfile :return: salt_id name """ - name = __utils__["sdb.sdb_get"](_build_machine_uri(machine, cwd), __opts__) + name = salt.utils.sdb.sdb_get(_build_machine_uri(machine, cwd), __opts__) return name @@ -134,20 +135,20 @@ def _erase_vm_info(name): if vm_["machine"]: key = _build_machine_uri(vm_["machine"], vm_.get("cwd", ".")) try: - __utils__["sdb.sdb_delete"](key, __opts__) + salt.utils.sdb.sdb_delete(key, __opts__) except KeyError: # no delete method found -- load a blank value - __utils__["sdb.sdb_set"](key, None, __opts__) + salt.utils.sdb.sdb_set(key, None, __opts__) except Exception: # pylint: disable=broad-except pass uri = _build_sdb_uri(name) try: # delete the name record - __utils__["sdb.sdb_delete"](uri, __opts__) + salt.utils.sdb.sdb_delete(uri, __opts__) except KeyError: # no delete method found -- load an empty dictionary - __utils__["sdb.sdb_set"](uri, {}, __opts__) + salt.utils.sdb.sdb_set(uri, {}, __opts__) except Exception: # pylint: disable=broad-except pass diff --git a/salt/modules/vault.py b/salt/modules/vault.py index ad05b283bb2e..824e63f1eb6d 100644 --- a/salt/modules/vault.py +++ b/salt/modules/vault.py @@ -178,6 +178,7 @@ import logging import os +import salt.utils.vault from salt.exceptions import CommandExecutionError log = logging.getLogger(__name__) @@ -213,13 +214,13 @@ def read_secret(path, key=None, metadata=False, default=None): """ if default is None: default = CommandExecutionError - version2 = __utils__["vault.is_v2"](path) + version2 = salt.utils.vault.is_v2(path) if version2["v2"]: path = version2["data"] log.debug("Reading Vault secret for %s at %s", __grains__["id"], path) try: url = "v1/{}".format(path) - response = __utils__["vault.make_request"]("GET", url) + response = salt.utils.vault.make_request("GET", url) if response.status_code != 200: response.raise_for_status() data = response.json()["data"] @@ -256,13 +257,13 @@ def write_secret(path, **kwargs): """ log.debug("Writing vault secrets for %s at %s", __grains__["id"], path) data = {x: y for x, y in kwargs.items() if not x.startswith("__")} - version2 = __utils__["vault.is_v2"](path) + version2 = salt.utils.vault.is_v2(path) if version2["v2"]: path = version2["data"] data = {"data": data} try: url = "v1/{}".format(path) - response = __utils__["vault.make_request"]("POST", url, json=data) + response = salt.utils.vault.make_request("POST", url, json=data) if response.status_code == 200: return response.json()["data"] elif response.status_code != 204: @@ -284,13 +285,13 @@ def write_raw(path, raw): salt '*' vault.write_raw "secret/my/secret" '{"user":"foo","password": "bar"}' """ log.debug("Writing vault secrets for %s at %s", __grains__["id"], path) - version2 = __utils__["vault.is_v2"](path) + version2 = salt.utils.vault.is_v2(path) if version2["v2"]: path = version2["data"] raw = {"data": raw} try: url = "v1/{}".format(path) - response = __utils__["vault.make_request"]("POST", url, json=raw) + response = salt.utils.vault.make_request("POST", url, json=raw) if response.status_code == 200: return response.json()["data"] elif response.status_code != 204: @@ -312,12 +313,12 @@ def delete_secret(path): salt '*' vault.delete_secret "secret/my/secret" """ log.debug("Deleting vault secrets for %s in %s", __grains__["id"], path) - version2 = __utils__["vault.is_v2"](path) + version2 = salt.utils.vault.is_v2(path) if version2["v2"]: path = version2["data"] try: url = "v1/{}".format(path) - response = __utils__["vault.make_request"]("DELETE", url) + response = salt.utils.vault.make_request("DELETE", url) if response.status_code != 204: response.raise_for_status() return True @@ -341,7 +342,7 @@ def destroy_secret(path, *args): """ log.debug("Destroying vault secrets for %s in %s", __grains__["id"], path) data = {"versions": list(args)} - version2 = __utils__["vault.is_v2"](path) + version2 = salt.utils.vault.is_v2(path) if version2["v2"]: path = version2["destroy"] else: @@ -349,7 +350,7 @@ def destroy_secret(path, *args): return False try: url = "v1/{}".format(path) - response = __utils__["vault.make_request"]("POST", url, json=data) + response = salt.utils.vault.make_request("POST", url, json=data) if response.status_code != 204: response.raise_for_status() return True @@ -377,12 +378,12 @@ def list_secrets(path, default=None): if default is None: default = CommandExecutionError log.debug("Listing vault secret keys for %s in %s", __grains__["id"], path) - version2 = __utils__["vault.is_v2"](path) + version2 = salt.utils.vault.is_v2(path) if version2["v2"]: path = version2["metadata"] try: url = "v1/{}".format(path) - response = __utils__["vault.make_request"]("LIST", url) + response = salt.utils.vault.make_request("LIST", url) if response.status_code != 200: response.raise_for_status() return response.json()["data"] diff --git a/salt/modules/win_auditpol.py b/salt/modules/win_auditpol.py index 29c1c535bd73..0d6ca81bc910 100644 --- a/salt/modules/win_auditpol.py +++ b/salt/modules/win_auditpol.py @@ -55,6 +55,7 @@ """ import salt.utils.platform +import salt.utils.win_lgpo_auditpol # Define the module's virtual name __virtualname__ = "auditpol" @@ -112,7 +113,7 @@ def get_settings(category="All"): # category salt * auditpol.get_settings "Account Logon" """ - return __utils__["auditpol.get_settings"](category=category) + return salt.utils.win_lgpo_auditpol.get_settings(category=category) def get_setting(name): @@ -136,7 +137,7 @@ def get_setting(name): # Get current state of the "Credential Validation" setting salt * auditpol.get_setting "Credential Validation" """ - return __utils__["auditpol.get_setting"](name=name) + return salt.utils.win_lgpo_auditpol.get_setting(name=name) def set_setting(name, value): @@ -174,4 +175,4 @@ def set_setting(name, value): # Set the state of the "Credential Validation" setting to No Auditing salt * auditpol.set_setting "Credential Validation" "No Auditing" """ - return __utils__["auditpol.set_setting"](name=name, value=value) + return salt.utils.win_lgpo_auditpol.set_setting(name=name, value=value) diff --git a/salt/modules/win_file.py b/salt/modules/win_file.py index 9b5221c2b7a4..3dde7fc22d4d 100644 --- a/salt/modules/win_file.py +++ b/salt/modules/win_file.py @@ -34,8 +34,11 @@ from functools import reduce # do not remove import salt.utils.atomicfile # do not remove, used in imported file.py functions +import salt.utils.files import salt.utils.path import salt.utils.platform +import salt.utils.user +import salt.utils.win_dacl from salt.exceptions import CommandExecutionError, SaltInvocationError # do not remove, used in imported file.py functions @@ -359,7 +362,7 @@ def group_to_gid(group): if group is None: return "" - return __utils__["dacl.get_sid_string"](group) + return salt.utils.win_dacl.get_sid_string(group) def get_pgid(path, follow_symlinks=True): @@ -400,8 +403,8 @@ def get_pgid(path, follow_symlinks=True): if follow_symlinks and sys.getwindowsversion().major >= 6: path = _resolve_symlink(path) - group_name = __utils__["dacl.get_primary_group"](path) - return __utils__["dacl.get_sid_string"](group_name) + group_name = salt.utils.win_dacl.get_primary_group(path) + return salt.utils.win_dacl.get_sid_string(group_name) def get_pgroup(path, follow_symlinks=True): @@ -552,7 +555,7 @@ def uid_to_user(uid): if uid is None or uid == "": return "" - return __utils__["dacl.get_name"](uid) + return salt.utils.win_dacl.get_name(uid) def user_to_uid(user): @@ -572,9 +575,9 @@ def user_to_uid(user): salt '*' file.user_to_uid myusername """ if user is None: - user = __utils__["user.get_user"]() + user = salt.utils.user.get_user() - return __utils__["dacl.get_sid_string"](user) + return salt.utils.win_dacl.get_sid_string(user) def get_uid(path, follow_symlinks=True): @@ -612,8 +615,8 @@ def get_uid(path, follow_symlinks=True): if follow_symlinks and sys.getwindowsversion().major >= 6: path = _resolve_symlink(path) - owner_sid = __utils__["dacl.get_owner"](path) - return __utils__["dacl.get_sid_string"](owner_sid) + owner_sid = salt.utils.win_dacl.get_owner(path) + return salt.utils.win_dacl.get_sid_string(owner_sid) def get_user(path, follow_symlinks=True): @@ -651,7 +654,7 @@ def get_user(path, follow_symlinks=True): if follow_symlinks and sys.getwindowsversion().major >= 6: path = _resolve_symlink(path) - return __utils__["dacl.get_owner"](path) + return salt.utils.win_dacl.get_owner(path) def get_mode(path): @@ -789,9 +792,9 @@ def chown(path, user, group=None, pgroup=None, follow_symlinks=True): if not os.path.exists(path): raise CommandExecutionError("Path not found: {}".format(path)) - __utils__["dacl.set_owner"](path, user) + salt.utils.win_dacl.set_owner(path, user) if pgroup: - __utils__["dacl.set_primary_group"](path, pgroup) + salt.utils.win_dacl.set_primary_group(path, pgroup) return True @@ -821,7 +824,7 @@ def chpgrp(path, group): salt '*' file.chpgrp c:\\temp\\test.txt Administrators salt '*' file.chpgrp c:\\temp\\test.txt "'None'" """ - return __utils__["dacl.set_primary_group"](path, group) + return salt.utils.win_dacl.set_primary_group(path, group) def chgrp(path, group): @@ -925,7 +928,7 @@ def stats(path, hash_type="sha256", follow_symlinks=True): ret["mtime"] = pstat.st_mtime ret["ctime"] = pstat.st_ctime ret["size"] = pstat.st_size - ret["mode"] = __utils__["files.normalize_mode"](oct(stat.S_IMODE(pstat.st_mode))) + ret["mode"] = salt.utils.files.normalize_mode(oct(stat.S_IMODE(pstat.st_mode))) if hash_type: ret["sum"] = get_sum(path, hash_type) ret["type"] = "file" @@ -1532,7 +1535,7 @@ def is_link(path): ) try: - return __utils__["path.islink"](path) + return salt.utils.path.islink(path) except Exception as exc: # pylint: disable=broad-except raise CommandExecutionError(exc) @@ -1623,10 +1626,10 @@ def mkdir( # Set owner if owner: - __utils__["dacl.set_owner"](obj_name=path, principal=owner) + salt.utils.win_dacl.set_owner(obj_name=path, principal=owner) # Set permissions - __utils__["dacl.set_perms"]( + salt.utils.win_dacl.set_perms( obj_name=path, obj_type="file", grant_perms=grant_perms, @@ -1945,7 +1948,7 @@ def check_perms( path = os.path.expanduser(path) - return __utils__["dacl.check_perms"]( + return salt.utils.win_dacl.check_perms( obj_name=path, obj_type="file", ret=ret, @@ -2031,7 +2034,7 @@ def set_perms(path, grant_perms=None, deny_perms=None, inheritance=True, reset=F # Specify advanced attributes with a list salt '*' file.set_perms C:\\Temp\\ "{'jsnuffy': {'perms': ['read_attributes', 'read_ea'], 'applies_to': 'this_folder_only'}}" """ - return __utils__["dacl.set_perms"]( + return salt.utils.win_dacl.set_perms( obj_name=path, obj_type="file", grant_perms=grant_perms, diff --git a/salt/modules/win_lgpo.py b/salt/modules/win_lgpo.py index 155b5c04db6a..5d4284a2bd55 100644 --- a/salt/modules/win_lgpo.py +++ b/salt/modules/win_lgpo.py @@ -54,7 +54,9 @@ import salt.utils.path import salt.utils.platform import salt.utils.stringutils +import salt.utils.win_lgpo_auditpol import salt.utils.win_lgpo_netsh +import salt.utils.win_reg from salt.exceptions import CommandExecutionError, SaltInvocationError from salt.serializers.configparser import deserialize @@ -5351,7 +5353,7 @@ def _get_advaudit_defaults(option=None): # Get available setting names and GUIDs # This is used to get the fieldnames and GUIDs for individual policies log.debug("Loading auditpol defaults into __context__") - dump = __utils__["auditpol.get_auditpol_dump"]() + dump = salt.utils.win_lgpo_auditpol.get_auditpol_dump() reader = csv.DictReader(dump) audit_defaults = {"fieldnames": reader.fieldnames} for row in reader: @@ -5583,7 +5585,7 @@ def _set_advaudit_pol_data(option, value): "3": "Success and Failure", } defaults = _get_advaudit_defaults(option) - return __utils__["auditpol.set_setting"]( + return salt.utils.win_lgpo_auditpol.set_setting( name=defaults["Auditpol Name"], value=auditpol_values[value] ) @@ -10478,7 +10480,7 @@ class in this module. _regedits[regedit]["value"] is not None and _regedits[regedit]["value"] != "(value not set)" ): - _ret = __utils__["reg.set_value"]( + _ret = salt.utils.win_reg.set_value( _regedits[regedit]["policy"]["Registry"]["Hive"], _regedits[regedit]["policy"]["Registry"]["Path"], _regedits[regedit]["policy"]["Registry"]["Value"], @@ -10486,13 +10488,13 @@ class in this module. _regedits[regedit]["policy"]["Registry"]["Type"], ) else: - _ret = __utils__["reg.read_value"]( + _ret = salt.utils.win_reg.read_value( _regedits[regedit]["policy"]["Registry"]["Hive"], _regedits[regedit]["policy"]["Registry"]["Path"], _regedits[regedit]["policy"]["Registry"]["Value"], ) if _ret["success"] and _ret["vdata"] != "(value not set)": - _ret = __utils__["reg.delete_value"]( + _ret = salt.utils.win_reg.delete_value( _regedits[regedit]["policy"]["Registry"]["Hive"], _regedits[regedit]["policy"]["Registry"]["Path"], _regedits[regedit]["policy"]["Registry"]["Value"], diff --git a/salt/modules/win_path.py b/salt/modules/win_path.py index 6ce76de54124..720b5bea7636 100644 --- a/salt/modules/win_path.py +++ b/salt/modules/win_path.py @@ -14,6 +14,7 @@ import salt.utils.platform import salt.utils.stringutils import salt.utils.win_functions +import salt.utils.win_reg try: HAS_WIN32 = True @@ -271,7 +272,7 @@ def _check_path(dirs, path, index): return True # Move forward with registry update - result = __utils__["reg.set_value"]( + result = salt.utils.win_reg.set_value( HIVE, KEY, VNAME, ";".join(salt.utils.data.decode(system_path)), VTYPE ) @@ -342,7 +343,7 @@ def _check_path(dirs, path): # No changes necessary return True - result = __utils__["reg.set_value"]( + result = salt.utils.win_reg.set_value( HIVE, KEY, VNAME, ";".join(salt.utils.data.decode(system_path)), VTYPE ) diff --git a/salt/modules/win_pkg.py b/salt/modules/win_pkg.py index 30a556ab3431..094d794b4bb1 100644 --- a/salt/modules/win_pkg.py +++ b/salt/modules/win_pkg.py @@ -59,6 +59,7 @@ import salt.utils.platform import salt.utils.versions import salt.utils.win_functions +import salt.utils.win_reg from salt.exceptions import ( CommandExecutionError, MinionError, @@ -488,7 +489,7 @@ def skip_component(hive, key, sub_key, use_32bit_registry): """ if include_components: return False - if __utils__["reg.value_exists"]( + if salt.utils.win_reg.value_exists( hive=hive, key="{}\\{}".format(key, sub_key), vname="SystemComponent", @@ -517,7 +518,7 @@ def skip_win_installer(hive, key, sub_key, use_32bit_registry): bool: True if the package needs to be skipped, otherwise False """ products_key = "Software\\Classes\\Installer\\Products\\{0}" - if __utils__["reg.value_exists"]( + if salt.utils.win_reg.value_exists( hive=hive, key="{}\\{}".format(key, sub_key), vname="WindowsInstaller", @@ -533,7 +534,7 @@ def skip_win_installer(hive, key, sub_key, use_32bit_registry): > 0 ): squid = salt.utils.win_functions.guid_to_squid(sub_key) - if not __utils__["reg.key_exists"]( + if not salt.utils.win_reg.key_exists( hive="HKLM", key=products_key.format(squid), use_32bit_registry=use_32bit_registry, @@ -555,7 +556,7 @@ def skip_uninstall_string(hive, key, sub_key, use_32bit_registry): bool: True if the package needs to be skipped, otherwise False """ # https://docs.microsoft.com/en-us/windows/win32/msi/arpnoremove - if __utils__["reg.value_exists"]( + if salt.utils.win_reg.value_exists( hive=hive, key="{}\\{}".format(key, sub_key), vname="NoRemove", @@ -571,7 +572,7 @@ def skip_uninstall_string(hive, key, sub_key, use_32bit_registry): > 0 ): return False - if not __utils__["reg.value_exists"]( + if not salt.utils.win_reg.value_exists( hive=hive, key="{}\\{}".format(key, sub_key), vname="UninstallString", @@ -592,7 +593,7 @@ def skip_release_type(hive, key, sub_key, use_32bit_registry): if include_updates: return False skip_types = ["Hotfix", "Security Update", "Update Rollup"] - if __utils__["reg.value_exists"]( + if salt.utils.win_reg.value_exists( hive=hive, key="{}\\{}".format(key, sub_key), vname="ReleaseType", @@ -618,7 +619,7 @@ def skip_parent_key(hive, key, sub_key, use_32bit_registry): Returns: bool: True if the package needs to be skipped, otherwise False """ - if __utils__["reg.value_exists"]( + if salt.utils.win_reg.value_exists( hive=hive, key="{}\\{}".format(key, sub_key), vname="ParentKeyName", @@ -635,7 +636,7 @@ def add_software(hive, key, sub_key, use_32bit_registry): not start with 'KB' followed by 6 numbers - as that indicates a Windows update. """ - d_name_regdata = __utils__["reg.read_value"]( + d_name_regdata = salt.utils.win_reg.read_value( hive=hive, key="{}\\{}".format(key, sub_key), vname="DisplayName", @@ -654,7 +655,7 @@ def add_software(hive, key, sub_key, use_32bit_registry): if re.match(r"^KB[0-9]{6}", d_name): return - d_vers_regdata = __utils__["reg.read_value"]( + d_vers_regdata = salt.utils.win_reg.read_value( hive=hive, key="{}\\{}".format(key, sub_key), vname="DisplayVersion", @@ -683,7 +684,7 @@ def add_software(hive, key, sub_key, use_32bit_registry): "key": "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall", "use_32bit_registry": False, } - for sub_key in __utils__["reg.list_keys"](**kwargs): + for sub_key in salt.utils.win_reg.list_keys(**kwargs): kwargs["sub_key"] = sub_key if skip_component(**kwargs): continue @@ -700,7 +701,7 @@ def add_software(hive, key, sub_key, use_32bit_registry): # HKLM Uninstall 32 bit kwargs["use_32bit_registry"] = True kwargs.pop("sub_key", False) - for sub_key in __utils__["reg.list_keys"](**kwargs): + for sub_key in salt.utils.win_reg.list_keys(**kwargs): kwargs["sub_key"] = sub_key if skip_component(**kwargs): continue @@ -724,9 +725,9 @@ def add_software(hive, key, sub_key, use_32bit_registry): "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\" "UserData\\S-1-5-18\\Products" ) - for sub_key in __utils__["reg.list_keys"](**kwargs): + for sub_key in salt.utils.win_reg.list_keys(**kwargs): # If the key does not exist in userdata, skip it - if not __utils__["reg.key_exists"]( + if not salt.utils.win_reg.key_exists( hive=kwargs["hive"], key="{}\\{}".format(userdata_key, sub_key) ): continue @@ -747,14 +748,14 @@ def add_software(hive, key, sub_key, use_32bit_registry): "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\" "UserData\\{0}\\Products\\{1}" ) - for user_guid in __utils__["reg.list_keys"](hive=hive_hku): + for user_guid in salt.utils.win_reg.list_keys(hive=hive_hku): kwargs = { "hive": hive_hku, "key": uninstall_key.format(user_guid), "use_32bit_registry": False, } - if __utils__["reg.key_exists"](**kwargs): - for sub_key in __utils__["reg.list_keys"](**kwargs): + if salt.utils.win_reg.key_exists(**kwargs): + for sub_key in salt.utils.win_reg.list_keys(**kwargs): kwargs["sub_key"] = sub_key if skip_component(**kwargs): continue @@ -774,28 +775,30 @@ def add_software(hive, key, sub_key, use_32bit_registry): "key": product_key.format(user_guid), "use_32bit_registry": False, } - if __utils__["reg.key_exists"](**kwargs): - for sub_key in __utils__["reg.list_keys"](**kwargs): + if salt.utils.win_reg.key_exists(**kwargs): + for sub_key in salt.utils.win_reg.list_keys(**kwargs): kwargs = { "hive": "HKLM", "key": user_data_key.format(user_guid, sub_key), "use_32bit_registry": False, } - if __utils__["reg.key_exists"](**kwargs): + if salt.utils.win_reg.key_exists(**kwargs): kwargs["sub_key"] = "InstallProperties" if skip_component(**kwargs): continue add_software(**kwargs) # Uninstall for each user on the system (HKU), 32 bit - for user_guid in __utils__["reg.list_keys"](hive=hive_hku, use_32bit_registry=True): + for user_guid in salt.utils.win_reg.list_keys( + hive=hive_hku, use_32bit_registry=True + ): kwargs = { "hive": hive_hku, "key": uninstall_key.format(user_guid), "use_32bit_registry": True, } - if __utils__["reg.key_exists"](**kwargs): - for sub_key in __utils__["reg.list_keys"](**kwargs): + if salt.utils.win_reg.key_exists(**kwargs): + for sub_key in salt.utils.win_reg.list_keys(**kwargs): kwargs["sub_key"] = sub_key if skip_component(**kwargs): continue @@ -814,15 +817,15 @@ def add_software(hive, key, sub_key, use_32bit_registry): "key": product_key.format(user_guid), "use_32bit_registry": True, } - if __utils__["reg.key_exists"](**kwargs): + if salt.utils.win_reg.key_exists(**kwargs): # While we have the user guid, we're going to check userdata in HKLM - for sub_key_2 in __utils__["reg.list_keys"](**kwargs): + for sub_key_2 in salt.utils.win_reg.list_keys(**kwargs): kwargs = { "hive": "HKLM", "key": user_data_key.format(user_guid, sub_key_2), "use_32bit_registry": True, } - if __utils__["reg.key_exists"](**kwargs): + if salt.utils.win_reg.key_exists(**kwargs): kwargs["sub_key"] = "InstallProperties" if skip_component(**kwargs): continue diff --git a/salt/modules/win_snmp.py b/salt/modules/win_snmp.py index 0fc7775ea6c2..8f986160ec4f 100644 --- a/salt/modules/win_snmp.py +++ b/salt/modules/win_snmp.py @@ -6,6 +6,7 @@ import logging import salt.utils.platform +import salt.utils.win_reg from salt.exceptions import CommandExecutionError, SaltInvocationError _HKEY = "HKLM" @@ -46,7 +47,7 @@ def __virtual__(): if not salt.utils.platform.is_windows(): return False, "Module win_snmp: Requires Windows" - if not __utils__["reg.key_exists"](_HKEY, _SNMP_KEY): + if not salt.utils.win_reg.key_exists(_HKEY, _SNMP_KEY): return False, "Module win_snmp: SNMP not installed" return __virtualname__ @@ -102,15 +103,15 @@ def get_agent_settings(): sorted_types = sorted(_SERVICE_TYPES.items(), key=lambda x: (-x[1], x[0])) ret["services"] = list() - ret["contact"] = (__utils__["reg.read_value"](_HKEY, _AGENT_KEY, "sysContact"))[ + ret["contact"] = (salt.utils.win_reg.read_value(_HKEY, _AGENT_KEY, "sysContact"))[ "vdata" ] - ret["location"] = (__utils__["reg.read_value"](_HKEY, _AGENT_KEY, "sysLocation"))[ + ret["location"] = (salt.utils.win_reg.read_value(_HKEY, _AGENT_KEY, "sysLocation"))[ "vdata" ] - current_bitmask = (__utils__["reg.read_value"](_HKEY, _AGENT_KEY, "sysServices"))[ + current_bitmask = (salt.utils.win_reg.read_value(_HKEY, _AGENT_KEY, "sysServices"))[ "vdata" ] @@ -177,13 +178,13 @@ def set_agent_settings(contact=None, location=None, services=None): if contact is not None: if contact != current_settings["contact"]: - __utils__["reg.set_value"]( + salt.utils.win_reg.set_value( _HKEY, _AGENT_KEY, "sysContact", contact, "REG_SZ" ) if location is not None: if location != current_settings["location"]: - __utils__["reg.set_value"]( + salt.utils.win_reg.set_value( _HKEY, _AGENT_KEY, "sysLocation", location, "REG_SZ" ) @@ -195,7 +196,7 @@ def set_agent_settings(contact=None, location=None, services=None): _LOG.debug("Setting sysServices vdata to: %s", vdata) - __utils__["reg.set_value"]( + salt.utils.win_reg.set_value( _HKEY, _AGENT_KEY, "sysServices", vdata, "REG_DWORD" ) @@ -229,7 +230,9 @@ def get_auth_traps_enabled(): salt '*' win_snmp.get_auth_traps_enabled """ - reg_ret = __utils__["reg.read_value"](_HKEY, _SNMP_KEY, "EnableAuthenticationTraps") + reg_ret = salt.utils.win_reg.read_value( + _HKEY, _SNMP_KEY, "EnableAuthenticationTraps" + ) if reg_ret["vdata"] == "(value not set)": return False @@ -260,7 +263,7 @@ def set_auth_traps_enabled(status=True): return True vdata = int(status) - __utils__["reg.set_value"](_HKEY, _SNMP_KEY, vname, vdata, "REG_DWORD") + salt.utils.win_reg.set_value(_HKEY, _SNMP_KEY, vname, vdata, "REG_DWORD") new_status = get_auth_traps_enabled() @@ -302,11 +305,11 @@ def get_community_names(): ret = dict() # Look in GPO settings first - if __utils__["reg.key_exists"](_HKEY, _COMMUNITIES_GPO_KEY): + if salt.utils.win_reg.key_exists(_HKEY, _COMMUNITIES_GPO_KEY): _LOG.debug("Loading communities from Group Policy settings") - current_values = __utils__["reg.list_values"](_HKEY, _COMMUNITIES_GPO_KEY) + current_values = salt.utils.win_reg.list_values(_HKEY, _COMMUNITIES_GPO_KEY) # GPO settings are different in that they do not designate permissions # They are a numbered list of communities like so: @@ -333,7 +336,7 @@ def get_community_names(): _LOG.debug("Loading communities from SNMP settings") - current_values = __utils__["reg.list_values"](_HKEY, _COMMUNITIES_KEY) + current_values = salt.utils.win_reg.list_values(_HKEY, _COMMUNITIES_KEY) # The communities are stored as the community name with a numeric # permission value. Like this (4 = Read Only): @@ -396,7 +399,7 @@ def set_community_names(communities): """ values = dict() - if __utils__["reg.key_exists"](_HKEY, _COMMUNITIES_GPO_KEY): + if salt.utils.win_reg.key_exists(_HKEY, _COMMUNITIES_GPO_KEY): _LOG.debug("Communities on this system are managed by Group Policy") raise CommandExecutionError( "Communities on this system are managed by Group Policy" @@ -426,7 +429,7 @@ def set_community_names(communities): if current_vname in values: # Modify existing communities that have a different permission value. if current_communities[current_vname] != values[current_vname]: - __utils__["reg.set_value"]( + salt.utils.win_reg.set_value( _HKEY, _COMMUNITIES_KEY, current_vname, @@ -435,12 +438,12 @@ def set_community_names(communities): ) else: # Remove current communities that weren't provided. - __utils__["reg.delete_value"](_HKEY, _COMMUNITIES_KEY, current_vname) + salt.utils.win_reg.delete_value(_HKEY, _COMMUNITIES_KEY, current_vname) # Create any new communities. for vname in values: if vname not in current_communities: - __utils__["reg.set_value"]( + salt.utils.win_reg.set_value( _HKEY, _COMMUNITIES_KEY, vname, values[vname], "REG_DWORD" ) diff --git a/salt/modules/win_timezone.py b/salt/modules/win_timezone.py index d8c3c82bb23f..f2ecf96195d5 100644 --- a/salt/modules/win_timezone.py +++ b/salt/modules/win_timezone.py @@ -4,6 +4,8 @@ import logging from datetime import datetime +import salt.utils.path +import salt.utils.platform from salt.exceptions import CommandExecutionError try: @@ -187,11 +189,11 @@ def __virtual__(): """ Only load on windows """ - if not __utils__["platform.is_windows"](): + if not salt.utils.platform.is_windows(): return False, "Module win_timezone: Not on Windows client" if not HAS_PYTZ: return False, "Module win_timezone: pytz not found" - if not __utils__["path.which"]("tzutil"): + if not salt.utils.path.which("tzutil"): return False, "Module win_timezone: tzutil not found" return __virtualname__ diff --git a/salt/modules/yaml.py b/salt/modules/yaml.py index 27d12448bfc6..bb30daec7f91 100644 --- a/salt/modules/yaml.py +++ b/salt/modules/yaml.py @@ -11,6 +11,9 @@ import logging +import salt.utils.files +import salt.utils.yamllint + log = logging.getLogger(__name__) __virtualname__ = "yaml" @@ -46,11 +49,11 @@ def lint(source, saltenv=None, pre_render=None, **kwargs): cache = __salt__["cp.cache_file"](source, saltenv) if cache is False: return (False, "Template was unable to be cached") - with __utils__["files.fopen"](cache, "r") as yaml_stream: + with salt.utils.files.fopen(cache, "r") as yaml_stream: yaml_out = yaml_stream.read(-1) else: kwargs.update({"saltenv": saltenv}) yaml_out = __salt__["slsutil.renderer"]( path=source, default_renderer=pre_render, **kwargs ) - return __utils__["yamllint.lint"](yaml_out) + return salt.utils.yamllint.lint(yaml_out) diff --git a/salt/modules/zfs.py b/salt/modules/zfs.py index d583108a43a9..1f7c14303906 100644 --- a/salt/modules/zfs.py +++ b/salt/modules/zfs.py @@ -17,9 +17,11 @@ import salt.modules.cmdmod import salt.utils.args +import salt.utils.dateutils import salt.utils.path import salt.utils.platform import salt.utils.versions +import salt.utils.zfs from salt.utils.odict import OrderedDict __virtualname__ = "zfs" @@ -71,7 +73,7 @@ def exists(name, **kwargs): ## Check if 'name' of 'type' exists res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="list", opts=opts, target=name, @@ -133,13 +135,13 @@ def create(name, **kwargs): if kwargs.get("sparse", False) and kwargs.get("volume_size", None): flags.append("-s") if kwargs.get("volume_size", None): - opts["-V"] = __utils__["zfs.to_size"]( + opts["-V"] = salt.utils.zfs.to_size( kwargs.get("volume_size"), convert_to_human=False ) ## Create filesystem/volume res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="create", flags=flags, opts=opts, @@ -149,7 +151,7 @@ def create(name, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "created") + return salt.utils.zfs.parse_command_result(res, "created") def destroy(name, **kwargs): @@ -192,7 +194,7 @@ def destroy(name, **kwargs): ## Destroy filesystem/volume/snapshot/... res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="destroy", flags=flags, target=name, @@ -200,7 +202,7 @@ def destroy(name, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "destroyed") + return salt.utils.zfs.parse_command_result(res, "destroyed") def rename(name, new_name, **kwargs): @@ -236,7 +238,7 @@ def rename(name, new_name, **kwargs): target = [] # NOTE: set extra config from kwargs - if __utils__["zfs.is_snapshot"](name): + if salt.utils.zfs.is_snapshot(name): if kwargs.get("create_parent", False): log.warning( "zfs.rename - create_parent=True cannot be used with snapshots." @@ -259,7 +261,7 @@ def rename(name, new_name, **kwargs): ## Rename filesystem/volume/snapshot/... res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="rename", flags=flags, target=target, @@ -267,7 +269,7 @@ def rename(name, new_name, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "renamed") + return salt.utils.zfs.parse_command_result(res, "renamed") def list_(name=None, **kwargs): @@ -346,7 +348,7 @@ def list_(name=None, **kwargs): ## parse zfs list res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="list", flags=flags, opts=opts, @@ -357,11 +359,11 @@ def list_(name=None, **kwargs): if res["retcode"] == 0: for ds in res["stdout"].splitlines(): if kwargs.get("parsable", True): - ds_data = __utils__["zfs.from_auto_dict"]( + ds_data = salt.utils.zfs.from_auto_dict( OrderedDict(list(zip(properties, ds.split("\t")))), ) else: - ds_data = __utils__["zfs.to_auto_dict"]( + ds_data = salt.utils.zfs.to_auto_dict( OrderedDict(list(zip(properties, ds.split("\t")))), convert_to_human=True, ) @@ -369,7 +371,7 @@ def list_(name=None, **kwargs): ret[ds_data["name"]] = ds_data del ret[ds_data["name"]]["name"] else: - return __utils__["zfs.parse_command_result"](res) + return salt.utils.zfs.parse_command_result(res) return ret @@ -389,7 +391,7 @@ def list_mount(): """ ## List mounted filesystem res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="mount", ), python_shell=False, @@ -402,7 +404,7 @@ def list_mount(): ret[mount[0]] = mount[-1] return ret else: - return __utils__["zfs.parse_command_result"](res) + return salt.utils.zfs.parse_command_result(res) def mount(name=None, **kwargs): @@ -446,7 +448,7 @@ def mount(name=None, **kwargs): ## Mount filesystem res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="mount", flags=flags, opts=opts, @@ -455,7 +457,7 @@ def mount(name=None, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "mounted") + return salt.utils.zfs.parse_command_result(res, "mounted") def unmount(name, **kwargs): @@ -501,7 +503,7 @@ def unmount(name, **kwargs): ## Unmount filesystem res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="unmount", flags=flags, target=name, @@ -509,7 +511,7 @@ def unmount(name, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "unmounted") + return salt.utils.zfs.parse_command_result(res, "unmounted") def inherit(prop, name, **kwargs): @@ -547,7 +549,7 @@ def inherit(prop, name, **kwargs): ## Inherit property res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="inherit", flags=flags, property_name=prop, @@ -556,7 +558,7 @@ def inherit(prop, name, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "inherited") + return salt.utils.zfs.parse_command_result(res, "inherited") def diff(name_a, name_b=None, **kwargs): @@ -603,7 +605,7 @@ def diff(name_a, name_b=None, **kwargs): ## Diff filesystem/snapshot res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="diff", flags=flags, target=target, @@ -612,13 +614,13 @@ def diff(name_a, name_b=None, **kwargs): ) if res["retcode"] != 0: - return __utils__["zfs.parse_command_result"](res) + return salt.utils.zfs.parse_command_result(res) else: if not kwargs.get("parsable", True) and kwargs.get("show_changetime", True): ret = OrderedDict() for entry in res["stdout"].splitlines(): entry = entry.split() - entry_timestamp = __utils__["dateutils.strftime"]( + entry_timestamp = salt.utils.dateutils.strftime( entry[0], "%Y-%m-%d.%H:%M:%S.%f" ) entry_data = "\t\t".join(entry[1:]) @@ -683,7 +685,7 @@ def rollback(name, **kwargs): ## Rollback to snapshot res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="rollback", flags=flags, target=name, @@ -691,7 +693,7 @@ def rollback(name, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "rolledback") + return salt.utils.zfs.parse_command_result(res, "rolledback") def clone(name_a, name_b, **kwargs): @@ -743,7 +745,7 @@ def clone(name_a, name_b, **kwargs): ## Clone filesystem/volume res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="clone", flags=flags, filesystem_properties=filesystem_properties, @@ -752,7 +754,7 @@ def clone(name_a, name_b, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "cloned") + return salt.utils.zfs.parse_command_result(res, "cloned") def promote(name): @@ -789,14 +791,14 @@ def promote(name): """ ## Promote clone res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="promote", target=name, ), python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "promoted") + return salt.utils.zfs.parse_command_result(res, "promoted") def bookmark(snapshot, bookmark): @@ -826,7 +828,7 @@ def bookmark(snapshot, bookmark): """ # abort if we do not have feature flags - if not __utils__["zfs.has_feature_flags"](): + if not salt.utils.zfs.has_feature_flags(): return OrderedDict([("error", "bookmarks are not supported")]) ## Configure command @@ -839,14 +841,14 @@ def bookmark(snapshot, bookmark): ## Bookmark snapshot res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="bookmark", target=target, ), python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "bookmarked") + return salt.utils.zfs.parse_command_result(res, "bookmarked") def holds(snapshot, **kwargs): @@ -881,7 +883,7 @@ def holds(snapshot, **kwargs): ## Lookup holds res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="holds", flags=flags, target=target, @@ -889,7 +891,7 @@ def holds(snapshot, **kwargs): python_shell=False, ) - ret = __utils__["zfs.parse_command_result"](res) + ret = salt.utils.zfs.parse_command_result(res) if res["retcode"] == 0: for hold in res["stdout"].splitlines(): hold_data = OrderedDict( @@ -956,7 +958,7 @@ def hold(tag, *snapshot, **kwargs): ## hold snapshot res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="hold", flags=flags, target=target, @@ -964,7 +966,7 @@ def hold(tag, *snapshot, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "held") + return salt.utils.zfs.parse_command_result(res, "held") def release(tag, *snapshot, **kwargs): @@ -1017,7 +1019,7 @@ def release(tag, *snapshot, **kwargs): ## release snapshot res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="release", flags=flags, target=target, @@ -1025,7 +1027,7 @@ def release(tag, *snapshot, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "released") + return salt.utils.zfs.parse_command_result(res, "released") def snapshot(*snapshot, **kwargs): @@ -1070,7 +1072,7 @@ def snapshot(*snapshot, **kwargs): ## Create snapshot res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="snapshot", flags=flags, filesystem_properties=filesystem_properties, @@ -1079,7 +1081,7 @@ def snapshot(*snapshot, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "snapshotted") + return salt.utils.zfs.parse_command_result(res, "snapshotted") def set(*dataset, **kwargs): @@ -1125,7 +1127,7 @@ def set(*dataset, **kwargs): ## Set property res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="set", property_name=list(filesystem_properties.keys()), property_value=list(filesystem_properties.values()), @@ -1134,7 +1136,7 @@ def set(*dataset, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "set") + return salt.utils.zfs.parse_command_result(res, "set") def get(*dataset, **kwargs): @@ -1213,7 +1215,7 @@ def get(*dataset, **kwargs): ## Get properties res = __salt__["cmd.run_all"]( - __utils__["zfs.zfs_command"]( + salt.utils.zfs.zfs_command( command="get", flags=flags, opts=opts, @@ -1223,19 +1225,19 @@ def get(*dataset, **kwargs): python_shell=False, ) - ret = __utils__["zfs.parse_command_result"](res) + ret = salt.utils.zfs.parse_command_result(res) if res["retcode"] == 0: for ds in res["stdout"].splitlines(): ds_data = OrderedDict(list(zip(fields, ds.split("\t")))) if "value" in ds_data: if kwargs.get("parsable", True): - ds_data["value"] = __utils__["zfs.from_auto"]( + ds_data["value"] = salt.utils.zfs.from_auto( ds_data["property"], ds_data["value"], ) else: - ds_data["value"] = __utils__["zfs.to_auto"]( + ds_data["value"] = salt.utils.zfs.to_auto( ds_data["property"], ds_data["value"], convert_to_human=True, diff --git a/salt/modules/zpool.py b/salt/modules/zpool.py index 051d9c661a12..45bf03631b6f 100644 --- a/salt/modules/zpool.py +++ b/salt/modules/zpool.py @@ -19,6 +19,7 @@ import salt.utils.decorators import salt.utils.decorators.path import salt.utils.path +import salt.utils.zfs from salt.utils.odict import OrderedDict log = logging.getLogger(__name__) @@ -86,7 +87,7 @@ def healthy(): # if all pools are healthy, otherwise we will get # the same output that we expect from zpool status res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]("status", flags=["-x"]), + salt.utils.zfs.zpool_command("status", flags=["-x"]), python_shell=False, ) return res["stdout"] == "all pools are healthy" @@ -112,12 +113,12 @@ def status(zpool=None): ## collect status output res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]("status", target=zpool), + salt.utils.zfs.zpool_command("status", target=zpool), python_shell=False, ) if res["retcode"] != 0: - return __utils__["zfs.parse_command_result"](res) + return salt.utils.zfs.parse_command_result(res) # NOTE: command output for reference # ===================================================================== @@ -204,7 +205,7 @@ def status(zpool=None): ) # NOTE: decode the zfs values properly - stat_data = __utils__["zfs.from_auto_dict"](stat_data) + stat_data = salt.utils.zfs.from_auto_dict(stat_data) # NOTE: store stat_data in the proper location if line.startswith(" " * 6): @@ -260,14 +261,14 @@ def iostat(zpool=None, sample_time=5, parsable=True): ## get iostat output res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="iostat", flags=["-v"], target=[zpool, sample_time, 2] ), python_shell=False, ) if res["retcode"] != 0: - return __utils__["zfs.parse_command_result"](res) + return salt.utils.zfs.parse_command_result(res) # NOTE: command output for reference # ===================================================================== @@ -323,10 +324,10 @@ def iostat(zpool=None, sample_time=5, parsable=True): # NOTE: normalize values if parsable: # NOTE: raw numbers and pythonic types - io_data = __utils__["zfs.from_auto_dict"](io_data) + io_data = salt.utils.zfs.from_auto_dict(io_data) else: # NOTE: human readable zfs types - io_data = __utils__["zfs.to_auto_dict"](io_data) + io_data = salt.utils.zfs.to_auto_dict(io_data) # NOTE: store io_data in the proper location if line.startswith(" " * 4): @@ -399,13 +400,13 @@ def list_(properties="size,alloc,free,cap,frag,health", zpool=None, parsable=Tru properties.insert(0, "name") # NOTE: remove 'frags' if we don't have feature flags - if not __utils__["zfs.has_feature_flags"](): + if not salt.utils.zfs.has_feature_flags(): while "frag" in properties: properties.remove("frag") ## collect list output res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="list", flags=["-H"], opts={"-o": ",".join(properties)}, @@ -415,7 +416,7 @@ def list_(properties="size,alloc,free,cap,frag,health", zpool=None, parsable=Tru ) if res["retcode"] != 0: - return __utils__["zfs.parse_command_result"](res) + return salt.utils.zfs.parse_command_result(res) # NOTE: command output for reference # ======================================================================== @@ -437,10 +438,10 @@ def list_(properties="size,alloc,free,cap,frag,health", zpool=None, parsable=Tru # NOTE: normalize values if parsable: # NOTE: raw numbers and pythonic types - zpool_data = __utils__["zfs.from_auto_dict"](zpool_data) + zpool_data = salt.utils.zfs.from_auto_dict(zpool_data) else: # NOTE: human readable zfs types - zpool_data = __utils__["zfs.to_auto_dict"](zpool_data) + zpool_data = salt.utils.zfs.to_auto_dict(zpool_data) ret[zpool_data["name"]] = zpool_data del ret[zpool_data["name"]]["name"] @@ -480,7 +481,7 @@ def get(zpool, prop=None, show_source=False, parsable=True): ## collect get output res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="get", flags=["-H"], property_name=prop if prop else "all", @@ -490,7 +491,7 @@ def get(zpool, prop=None, show_source=False, parsable=True): ) if res["retcode"] != 0: - return __utils__["zfs.parse_command_result"](res) + return salt.utils.zfs.parse_command_result(res) # NOTE: command output for reference # ======================================================================== @@ -518,12 +519,12 @@ def get(zpool, prop=None, show_source=False, parsable=True): # NOTE: normalize values if parsable: # NOTE: raw numbers and pythonic types - prop_data["value"] = __utils__["zfs.from_auto"]( + prop_data["value"] = salt.utils.zfs.from_auto( prop_data["property"], prop_data["value"] ) else: # NOTE: human readable zfs types - prop_data["value"] = __utils__["zfs.to_auto"]( + prop_data["value"] = salt.utils.zfs.to_auto( prop_data["property"], prop_data["value"] ) @@ -563,7 +564,7 @@ def set(zpool, prop, value): # set property res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="set", property_name=prop, property_value=value, @@ -572,7 +573,7 @@ def set(zpool, prop, value): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "set") + return salt.utils.zfs.parse_command_result(res, "set") def exists(zpool): @@ -592,7 +593,7 @@ def exists(zpool): # list for zpool # NOTE: retcode > 0 if zpool does not exists res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="list", target=zpool, ), @@ -622,7 +623,7 @@ def destroy(zpool, force=False): """ # destroy zpool res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="destroy", flags=["-f"] if force else None, target=zpool, @@ -630,7 +631,7 @@ def destroy(zpool, force=False): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "destroyed") + return salt.utils.zfs.parse_command_result(res, "destroyed") def scrub(zpool, stop=False, pause=False): @@ -672,7 +673,7 @@ def scrub(zpool, stop=False, pause=False): ## Scrub storage pool res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="scrub", flags=action, target=zpool, @@ -681,7 +682,7 @@ def scrub(zpool, stop=False, pause=False): ) if res["retcode"] != 0: - return __utils__["zfs.parse_command_result"](res, "scrubbing") + return salt.utils.zfs.parse_command_result(res, "scrubbing") ret = OrderedDict() if stop or pause: @@ -800,7 +801,7 @@ def create(zpool, *vdevs, **kwargs): ## Create storage pool res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="create", flags=flags, opts=opts, @@ -811,7 +812,7 @@ def create(zpool, *vdevs, **kwargs): python_shell=False, ) - ret = __utils__["zfs.parse_command_result"](res, "created") + ret = salt.utils.zfs.parse_command_result(res, "created") if ret["created"]: ## NOTE: lookup zpool status for vdev config ret["vdevs"] = _clean_vdev_config( @@ -856,7 +857,7 @@ def add(zpool, *vdevs, **kwargs): ## Update storage pool res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="add", flags=flags, target=target, @@ -864,7 +865,7 @@ def add(zpool, *vdevs, **kwargs): python_shell=False, ) - ret = __utils__["zfs.parse_command_result"](res, "added") + ret = salt.utils.zfs.parse_command_result(res, "added") if ret["added"]: ## NOTE: lookup zpool status for vdev config ret["vdevs"] = _clean_vdev_config( @@ -913,7 +914,7 @@ def attach(zpool, device, new_device, force=False): ## Update storage pool res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="attach", flags=flags, target=target, @@ -921,7 +922,7 @@ def attach(zpool, device, new_device, force=False): python_shell=False, ) - ret = __utils__["zfs.parse_command_result"](res, "attached") + ret = salt.utils.zfs.parse_command_result(res, "attached") if ret["attached"]: ## NOTE: lookup zpool status for vdev config ret["vdevs"] = _clean_vdev_config( @@ -950,14 +951,14 @@ def detach(zpool, device): """ ## Update storage pool res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="detach", target=[zpool, device], ), python_shell=False, ) - ret = __utils__["zfs.parse_command_result"](res, "detatched") + ret = salt.utils.zfs.parse_command_result(res, "detatched") if ret["detatched"]: ## NOTE: lookup zpool status for vdev config ret["vdevs"] = _clean_vdev_config( @@ -1040,7 +1041,7 @@ def split(zpool, newzpool, **kwargs): ## Split storage pool res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="split", opts=opts, pool_properties=pool_properties, @@ -1049,7 +1050,7 @@ def split(zpool, newzpool, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "split") + return salt.utils.zfs.parse_command_result(res, "split") def replace(zpool, old_device, new_device=None, force=False): @@ -1100,7 +1101,7 @@ def replace(zpool, old_device, new_device=None, force=False): ## Replace device res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="replace", flags=flags, target=target, @@ -1108,7 +1109,7 @@ def replace(zpool, old_device, new_device=None, force=False): python_shell=False, ) - ret = __utils__["zfs.parse_command_result"](res, "replaced") + ret = salt.utils.zfs.parse_command_result(res, "replaced") if ret["replaced"]: ## NOTE: lookup zpool status for vdev config ret["vdevs"] = _clean_vdev_config( @@ -1196,7 +1197,7 @@ def export(*pools, **kwargs): ## Export pools res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="export", flags=flags, target=targets, @@ -1204,7 +1205,7 @@ def export(*pools, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "exported") + return salt.utils.zfs.parse_command_result(res, "exported") def import_(zpool=None, new_name=None, **kwargs): @@ -1299,7 +1300,7 @@ def import_(zpool=None, new_name=None, **kwargs): opts["-o"] = kwargs.get("mntopts") if kwargs.get("dir", False): opts["-d"] = kwargs.get("dir").split(",") - if kwargs.get("recovery", False) and __utils__["zfs.has_feature_flags"](): + if kwargs.get("recovery", False) and salt.utils.zfs.has_feature_flags(): recovery = kwargs.get("recovery") if recovery in [True, "test"]: flags.append("-F") @@ -1317,7 +1318,7 @@ def import_(zpool=None, new_name=None, **kwargs): ## Import storage pool res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="import", flags=flags, opts=opts, @@ -1327,7 +1328,7 @@ def import_(zpool=None, new_name=None, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "imported") + return salt.utils.zfs.parse_command_result(res, "imported") def online(zpool, *vdevs, **kwargs): @@ -1384,7 +1385,7 @@ def online(zpool, *vdevs, **kwargs): ## Bring online device res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="online", flags=flags, target=target, @@ -1392,7 +1393,7 @@ def online(zpool, *vdevs, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "onlined") + return salt.utils.zfs.parse_command_result(res, "onlined") def offline(zpool, *vdevs, **kwargs): @@ -1438,7 +1439,7 @@ def offline(zpool, *vdevs, **kwargs): ## Take a device offline res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="offline", flags=flags, target=target, @@ -1446,7 +1447,7 @@ def offline(zpool, *vdevs, **kwargs): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "offlined") + return salt.utils.zfs.parse_command_result(res, "offlined") def labelclear(device, force=False): @@ -1470,7 +1471,7 @@ def labelclear(device, force=False): """ ## clear label for all specified device res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="labelclear", flags=["-f"] if force else None, target=device, @@ -1478,7 +1479,7 @@ def labelclear(device, force=False): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "labelcleared") + return salt.utils.zfs.parse_command_result(res, "labelcleared") def clear(zpool, device=None): @@ -1514,14 +1515,14 @@ def clear(zpool, device=None): ## clear storage pool errors res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="clear", target=target, ), python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "cleared") + return salt.utils.zfs.parse_command_result(res, "cleared") def reguid(zpool): @@ -1545,14 +1546,14 @@ def reguid(zpool): """ ## generate new GUID for pool res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="reguid", target=zpool, ), python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "reguided") + return salt.utils.zfs.parse_command_result(res, "reguided") def reopen(zpool): @@ -1573,14 +1574,14 @@ def reopen(zpool): """ ## reopen all devices fro pool res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="reopen", target=zpool, ), python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "reopened") + return salt.utils.zfs.parse_command_result(res, "reopened") def upgrade(zpool=None, version=None): @@ -1620,7 +1621,7 @@ def upgrade(zpool=None, version=None): ## Upgrade pool res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="upgrade", flags=flags, opts=opts, @@ -1629,7 +1630,7 @@ def upgrade(zpool=None, version=None): python_shell=False, ) - return __utils__["zfs.parse_command_result"](res, "upgraded") + return salt.utils.zfs.parse_command_result(res, "upgraded") def history(zpool=None, internal=False, verbose=False): @@ -1670,7 +1671,7 @@ def history(zpool=None, internal=False, verbose=False): ## Lookup history res = __salt__["cmd.run_all"]( - __utils__["zfs.zpool_command"]( + salt.utils.zfs.zpool_command( command="history", flags=flags, target=zpool, @@ -1679,7 +1680,7 @@ def history(zpool=None, internal=False, verbose=False): ) if res["retcode"] != 0: - return __utils__["zfs.parse_command_result"](res) + return salt.utils.zfs.parse_command_result(res) else: pool = "unknown" for line in res["stdout"].splitlines(): diff --git a/salt/pillar/s3.py b/salt/pillar/s3.py index 6e97dfd33bdf..e20e5f787dbd 100644 --- a/salt/pillar/s3.py +++ b/salt/pillar/s3.py @@ -97,6 +97,7 @@ import salt.utils.files import salt.utils.hashutils +import salt.utils.s3 from salt.pillar import Pillar log = logging.getLogger(__name__) @@ -295,7 +296,7 @@ def __get_s3_meta(continuation_token=None): if continuation_token: params["continuation-token"] = continuation_token - return __utils__["s3.query"]( + return salt.utils.s3.query( key=creds.key, keyid=creds.keyid, kms_keyid=creds.kms_keyid, @@ -470,7 +471,7 @@ def _get_file_from_s3(creds, metadata, saltenv, bucket, path, cached_file_path): return # ... or get the file from S3 - __utils__["s3.query"]( + salt.utils.s3.query( key=creds.key, keyid=creds.keyid, kms_keyid=creds.kms_keyid, diff --git a/salt/pillar/vault.py b/salt/pillar/vault.py index b36667b91f82..1e60e29cd657 100644 --- a/salt/pillar/vault.py +++ b/salt/pillar/vault.py @@ -123,6 +123,8 @@ import logging +import salt.utils.vault + log = logging.getLogger(__name__) __func_alias__ = {"set_": "set"} @@ -156,12 +158,12 @@ def ext_pillar( try: path = paths[0].replace("path=", "") path = path.format(**{"minion": minion_id}) - version2 = __utils__["vault.is_v2"](path) + version2 = salt.utils.vault.is_v2(path) if version2["v2"]: path = version2["data"] url = "v1/{}".format(path) - response = __utils__["vault.make_request"]("GET", url) + response = salt.utils.vault.make_request("GET", url) if response.status_code == 200: vault_pillar = response.json().get("data", {}) else: diff --git a/salt/proxy/cimc.py b/salt/proxy/cimc.py index 046ef2e70f3f..6751aa7ca8ed 100644 --- a/salt/proxy/cimc.py +++ b/salt/proxy/cimc.py @@ -71,6 +71,7 @@ import xml.etree.ElementTree as ET import salt.exceptions +import salt.utils.http # This must be present or the Salt loader won't load this module. __proxyenabled__ = ["cimc"] @@ -159,7 +160,7 @@ def set_config_modify(dn=None, inconfig=None, hierarchical=False): '' "{}".format(cookie, h, dn, inconfig) ) - r = __utils__["http.query"]( + r = salt.utils.http.query( DETAILS["url"], data=payload, method="POST", @@ -198,7 +199,7 @@ def get_config_resolver_class(cid=None, hierarchical=False): cookie, h, cid ) ) - r = __utils__["http.query"]( + r = salt.utils.http.query( DETAILS["url"], data=payload, method="POST", @@ -229,7 +230,7 @@ def logon(): payload = "".format( DETAILS["username"], DETAILS["password"] ) - r = __utils__["http.query"]( + r = salt.utils.http.query( DETAILS["url"], data=payload, method="POST", @@ -259,7 +260,7 @@ def logout(cookie=None): Closes the session with the device. """ payload = ''.format(cookie) - __utils__["http.query"]( + salt.utils.http.query( DETAILS["url"], data=payload, method="POST", diff --git a/salt/proxy/nxos.py b/salt/proxy/nxos.py index 9b83519096ed..8c368464b200 100644 --- a/salt/proxy/nxos.py +++ b/salt/proxy/nxos.py @@ -450,7 +450,7 @@ def _init_nxapi(opts): conn_args = copy.deepcopy(proxy_dict) conn_args.pop("proxytype", None) try: - rpc_reply = __utils__["nxos.nxapi_request"]("show clock", **conn_args) + rpc_reply = salt.utils.nxos.nxapi_request("show clock", **conn_args) # Execute a very simple command to confirm we are able to connect properly DEVICE_DETAILS["conn_args"] = conn_args DEVICE_DETAILS["initialized"] = True @@ -502,5 +502,5 @@ def _nxapi_request(commands, method="cli_conf", **kwargs): return "_nxapi_request is not available for ssh proxy" conn_args = DEVICE_DETAILS["conn_args"] conn_args.update(kwargs) - data = __utils__["nxos.nxapi_request"](commands, method=method, **conn_args) + data = salt.utils.nxos.nxapi_request(commands, method=method, **conn_args) return data diff --git a/salt/proxy/nxos_api.py b/salt/proxy/nxos_api.py index 62a046296809..f37b6691eb24 100644 --- a/salt/proxy/nxos_api.py +++ b/salt/proxy/nxos_api.py @@ -102,6 +102,8 @@ import copy import logging +import salt.utils.nxos_api + # Import Salt modules from salt.exceptions import SaltException @@ -154,7 +156,7 @@ def init(opts): # This is not a SSH-based proxy, so it should be safe to enable # multiprocessing. try: - rpc_reply = __utils__["nxos_api.rpc"]("show clock", **conn_args) + rpc_reply = salt.utils.nxos_api.rpc("show clock", **conn_args) # Execute a very simple command to confirm we are able to connect properly nxos_device["conn_args"] = conn_args nxos_device["initialized"] = True @@ -205,4 +207,4 @@ def rpc(commands, method="cli", **kwargs): """ conn_args = nxos_device["conn_args"] conn_args.update(kwargs) - return __utils__["nxos_api.rpc"](commands, method=method, **conn_args) + return salt.utils.nxos_api.rpc(commands, method=method, **conn_args) diff --git a/salt/proxy/panos.py b/salt/proxy/panos.py index d2f5fccc5bda..a19e20aed533 100644 --- a/salt/proxy/panos.py +++ b/salt/proxy/panos.py @@ -207,6 +207,7 @@ import xml.etree.ElementTree as ET import salt.exceptions +import salt.utils.http import salt.utils.xmlutil as xml # This must be present or the Salt loader won't load this module. @@ -310,7 +311,7 @@ def call(payload=None): # Pass the api key without the target declaration conditional_payload = {"key": DETAILS["apikey"]} payload.update(conditional_payload) - r = __utils__["http.query"]( + r = salt.utils.http.query( DETAILS["url"], data=payload, method="POST", @@ -322,7 +323,7 @@ def call(payload=None): ) elif DETAILS["method"] == "dev_pass": # Pass credentials without the target declaration - r = __utils__["http.query"]( + r = salt.utils.http.query( DETAILS["url"], username=DETAILS["username"], password=DETAILS["password"], @@ -341,7 +342,7 @@ def call(payload=None): "target": DETAILS["serial"], } payload.update(conditional_payload) - r = __utils__["http.query"]( + r = salt.utils.http.query( DETAILS["url"], data=payload, method="POST", @@ -355,7 +356,7 @@ def call(payload=None): # Pass credentials with the target declaration conditional_payload = {"target": DETAILS["serial"]} payload.update(conditional_payload) - r = __utils__["http.query"]( + r = salt.utils.http.query( DETAILS["url"], username=DETAILS["username"], password=DETAILS["password"], diff --git a/salt/roster/ansible.py b/salt/roster/ansible.py index aac94c3b29b4..57bc50c846ef 100644 --- a/salt/roster/ansible.py +++ b/salt/roster/ansible.py @@ -97,7 +97,9 @@ import copy import fnmatch +import salt.utils.json import salt.utils.path +import salt.utils.stringutils from salt.roster import get_roster_file CONVERSION = { @@ -128,8 +130,8 @@ def targets(tgt, tgt_type="glob", **kwargs): "cmd.run_all", "ansible-inventory -i {} --list".format(get_roster_file(__opts__)), ) - __context__["inventory"] = __utils__["json.loads"]( - __utils__["stringutils.to_str"](inventory["stdout"]) + __context__["inventory"] = salt.utils.json.loads( + salt.utils.stringutils.to_str(inventory["stdout"]) ) if tgt_type == "glob": diff --git a/salt/roster/dir.py b/salt/roster/dir.py index 2e01f22b5992..822e32ba1365 100644 --- a/salt/roster/dir.py +++ b/salt/roster/dir.py @@ -52,6 +52,7 @@ import salt.loader import salt.template +import salt.utils.roster_matcher import salt.utils.verify from salt.exceptions import CommandExecutionError @@ -67,7 +68,7 @@ def targets(tgt, tgt_type="glob", **kwargs): # Match the targets before rendering to avoid opening files unnecessarily. raw = dict.fromkeys(os.listdir(roster_dir), "") log.debug("Filtering %d minions in %s", len(raw), roster_dir) - matched_raw = __utils__["roster_matcher.targets"](raw, tgt, tgt_type, "ipv4") + matched_raw = salt.utils.roster_matcher.targets(raw, tgt, tgt_type, "ipv4") rendered = {} for minion_id in matched_raw: target_file = salt.utils.verify.clean_path(roster_dir, minion_id) diff --git a/salt/roster/flat.py b/salt/roster/flat.py index 440b0e0073a8..7186712eb59d 100644 --- a/salt/roster/flat.py +++ b/salt/roster/flat.py @@ -6,6 +6,7 @@ import salt.config import salt.loader +import salt.utils.roster_matcher from salt.roster import get_roster_file from salt.template import compile_template @@ -32,4 +33,4 @@ def targets(tgt, tgt_type="glob", **kwargs): conditioned_raw = {} for minion in raw: conditioned_raw[str(minion)] = salt.config.apply_sdb(raw[minion]) - return __utils__["roster_matcher.targets"](conditioned_raw, tgt, tgt_type, "ipv4") + return salt.utils.roster_matcher.targets(conditioned_raw, tgt, tgt_type, "ipv4") diff --git a/salt/roster/terraform.py b/salt/roster/terraform.py index d3ee3e84d9bd..3768bb1901a1 100644 --- a/salt/roster/terraform.py +++ b/salt/roster/terraform.py @@ -59,6 +59,7 @@ import salt.utils.files import salt.utils.json +import salt.utils.roster_matcher log = logging.getLogger(__name__) @@ -177,4 +178,4 @@ def targets(tgt, tgt_type="glob", **kwargs): # pylint: disable=W0613 raw = _parse_state_file(roster_file) log.debug("%s hosts in terraform state file", len(raw)) - return __utils__["roster_matcher.targets"](raw, tgt, tgt_type, "ipv4") + return salt.utils.roster_matcher.targets(raw, tgt, tgt_type, "ipv4") diff --git a/salt/runners/cache.py b/salt/runners/cache.py index 88a5c6be0dbe..b28742d43534 100644 --- a/salt/runners/cache.py +++ b/salt/runners/cache.py @@ -13,6 +13,7 @@ import salt.pillar.git_pillar import salt.runners.winrepo import salt.utils.args +import salt.utils.cloud import salt.utils.gitfs import salt.utils.master from salt.exceptions import SaltInvocationError @@ -372,7 +373,7 @@ def cloud(tgt, provider=None): if not opts.get("update_cachedir"): return {} - cloud_cache = __utils__["cloud.list_cache_nodes_full"](opts=opts, provider=provider) + cloud_cache = salt.utils.cloud.list_cache_nodes_full(opts=opts, provider=provider) if cloud_cache is None: return {} diff --git a/salt/runners/state.py b/salt/runners/state.py index f8fc1b094487..37894f689244 100644 --- a/salt/runners/state.py +++ b/salt/runners/state.py @@ -8,6 +8,7 @@ import salt.utils.event import salt.utils.functools import salt.utils.jid +import salt.utils.state from salt.exceptions import SaltInvocationError log = logging.getLogger(__name__) @@ -125,7 +126,7 @@ def orchestrate( orchestration_jid=orchestration_jid, ) ret = {"data": {minion.opts["id"]: running}, "outputter": "highstate"} - res = __utils__["state.check_result"](ret["data"]) + res = salt.utils.state.check_result(ret["data"]) if res: ret["retcode"] = 0 else: diff --git a/salt/sdb/vault.py b/salt/sdb/vault.py index 08360e2d84fb..6afa8b34271e 100644 --- a/salt/sdb/vault.py +++ b/salt/sdb/vault.py @@ -43,6 +43,7 @@ import logging import salt.exceptions +import salt.utils.vault log = logging.getLogger(__name__) @@ -59,14 +60,14 @@ def set_(key, value, profile=None): path, key = key.rsplit("/", 1) data = {key: value} - version2 = __utils__["vault.is_v2"](path) + version2 = salt.utils.vault.is_v2(path) if version2["v2"]: path = version2["data"] data = {"data": data} try: url = "v1/{}".format(path) - response = __utils__["vault.make_request"]("POST", url, json=data) + response = salt.utils.vault.make_request("POST", url, json=data) if response.status_code != 204: response.raise_for_status() @@ -85,18 +86,18 @@ def get(key, profile=None): else: path, key = key.rsplit("/", 1) - version2 = __utils__["vault.is_v2"](path) + version2 = salt.utils.vault.is_v2(path) if version2["v2"]: path = version2["data"] try: url = "v1/{}".format(path) - response = __utils__["vault.make_request"]("GET", url) + response = salt.utils.vault.make_request("GET", url) if response.status_code == 404: if version2["v2"]: path = version2["data"] + "/" + key url = "v1/{}".format(path) - response = __utils__["vault.make_request"]("GET", url) + response = salt.utils.vault.make_request("GET", url) if response.status_code == 404: return None else: diff --git a/salt/states/azurearm_compute.py b/salt/states/azurearm_compute.py index 31e992796c6a..4ceeabdb327e 100644 --- a/salt/states/azurearm_compute.py +++ b/salt/states/azurearm_compute.py @@ -95,6 +95,7 @@ import logging import salt.utils.azurearm +import salt.utils.dictdiffer __virtualname__ = "azurearm_compute" @@ -189,9 +190,7 @@ def availability_set_present( ) if "error" not in aset: - tag_changes = __utils__["dictdiffer.deep_diff"]( - aset.get("tags", {}), tags or {} - ) + tag_changes = salt.utils.dictdiffer.deep_diff(aset.get("tags", {}), tags or {}) if tag_changes: ret["changes"]["tags"] = tag_changes diff --git a/salt/states/azurearm_dns.py b/salt/states/azurearm_dns.py index e2beb9b69c78..bc60d0d54847 100644 --- a/salt/states/azurearm_dns.py +++ b/salt/states/azurearm_dns.py @@ -119,6 +119,7 @@ import logging import salt.utils.azurearm +import salt.utils.dictdiffer __virtualname__ = "azurearm_dns" @@ -220,9 +221,7 @@ def zone_present( ) if "error" not in zone: - tag_changes = __utils__["dictdiffer.deep_diff"]( - zone.get("tags", {}), tags or {} - ) + tag_changes = salt.utils.dictdiffer.deep_diff(zone.get("tags", {}), tags or {}) if tag_changes: ret["changes"]["tags"] = tag_changes @@ -557,7 +556,7 @@ def record_set_present( ) if "error" not in rec_set: - metadata_changes = __utils__["dictdiffer.deep_diff"]( + metadata_changes = salt.utils.dictdiffer.deep_diff( rec_set.get("metadata", {}), metadata or {} ) if metadata_changes: diff --git a/salt/states/azurearm_network.py b/salt/states/azurearm_network.py index a2d680b99330..80a034492eb3 100644 --- a/salt/states/azurearm_network.py +++ b/salt/states/azurearm_network.py @@ -94,6 +94,7 @@ import logging import salt.utils.azurearm +import salt.utils.dictdiffer __virtualname__ = "azurearm_network" @@ -176,9 +177,7 @@ def virtual_network_present( ) if "error" not in vnet: - tag_changes = __utils__["dictdiffer.deep_diff"]( - vnet.get("tags", {}), tags or {} - ) + tag_changes = salt.utils.dictdiffer.deep_diff(vnet.get("tags", {}), tags or {}) if tag_changes: ret["changes"]["tags"] = tag_changes @@ -613,12 +612,12 @@ def network_security_group_present( ) if "error" not in nsg: - tag_changes = __utils__["dictdiffer.deep_diff"](nsg.get("tags", {}), tags or {}) + tag_changes = salt.utils.dictdiffer.deep_diff(nsg.get("tags", {}), tags or {}) if tag_changes: ret["changes"]["tags"] = tag_changes if security_rules: - comp_ret = __utils__["azurearm.compare_list_of_dicts"]( + comp_ret = salt.utils.azurearm.compare_list_of_dicts( nsg.get("security_rules", []), security_rules ) @@ -1343,7 +1342,7 @@ def load_balancer_present( if "error" not in load_bal: # tag changes - tag_changes = __utils__["dictdiffer.deep_diff"]( + tag_changes = salt.utils.dictdiffer.deep_diff( load_bal.get("tags", {}), tags or {} ) if tag_changes: @@ -1351,15 +1350,13 @@ def load_balancer_present( # sku changes if sku: - sku_changes = __utils__["dictdiffer.deep_diff"]( - load_bal.get("sku", {}), sku - ) + sku_changes = salt.utils.dictdiffer.deep_diff(load_bal.get("sku", {}), sku) if sku_changes: ret["changes"]["sku"] = sku_changes # frontend_ip_configurations changes if frontend_ip_configurations: - comp_ret = __utils__["azurearm.compare_list_of_dicts"]( + comp_ret = salt.utils.azurearm.compare_list_of_dicts( load_bal.get("frontend_ip_configurations", []), frontend_ip_configurations, ["public_ip_address", "subnet"], @@ -1376,7 +1373,7 @@ def load_balancer_present( # backend_address_pools changes if backend_address_pools: - comp_ret = __utils__["azurearm.compare_list_of_dicts"]( + comp_ret = salt.utils.azurearm.compare_list_of_dicts( load_bal.get("backend_address_pools", []), backend_address_pools ) @@ -1391,7 +1388,7 @@ def load_balancer_present( # probes changes if probes: - comp_ret = __utils__["azurearm.compare_list_of_dicts"]( + comp_ret = salt.utils.azurearm.compare_list_of_dicts( load_bal.get("probes", []), probes ) @@ -1404,7 +1401,7 @@ def load_balancer_present( # load_balancing_rules changes if load_balancing_rules: - comp_ret = __utils__["azurearm.compare_list_of_dicts"]( + comp_ret = salt.utils.azurearm.compare_list_of_dicts( load_bal.get("load_balancing_rules", []), load_balancing_rules, ["frontend_ip_configuration", "backend_address_pool", "probe"], @@ -1419,7 +1416,7 @@ def load_balancer_present( # inbound_nat_rules changes if inbound_nat_rules: - comp_ret = __utils__["azurearm.compare_list_of_dicts"]( + comp_ret = salt.utils.azurearm.compare_list_of_dicts( load_bal.get("inbound_nat_rules", []), inbound_nat_rules, ["frontend_ip_configuration"], @@ -1434,7 +1431,7 @@ def load_balancer_present( # inbound_nat_pools changes if inbound_nat_pools: - comp_ret = __utils__["azurearm.compare_list_of_dicts"]( + comp_ret = salt.utils.azurearm.compare_list_of_dicts( load_bal.get("inbound_nat_pools", []), inbound_nat_pools, ["frontend_ip_configuration"], @@ -1449,7 +1446,7 @@ def load_balancer_present( # outbound_nat_rules changes if outbound_nat_rules: - comp_ret = __utils__["azurearm.compare_list_of_dicts"]( + comp_ret = salt.utils.azurearm.compare_list_of_dicts( load_bal.get("outbound_nat_rules", []), outbound_nat_rules, ["frontend_ip_configuration"], @@ -1670,7 +1667,7 @@ def public_ip_address_present( if "error" not in pub_ip: # tag changes - tag_changes = __utils__["dictdiffer.deep_diff"]( + tag_changes = salt.utils.dictdiffer.deep_diff( pub_ip.get("tags", {}), tags or {} ) if tag_changes: @@ -1692,7 +1689,7 @@ def public_ip_address_present( # sku changes if sku: - sku_changes = __utils__["dictdiffer.deep_diff"](pub_ip.get("sku", {}), sku) + sku_changes = salt.utils.dictdiffer.deep_diff(pub_ip.get("sku", {}), sku) if sku_changes: ret["changes"]["sku"] = sku_changes @@ -1957,9 +1954,7 @@ def network_interface_present( if "error" not in iface: # tag changes - tag_changes = __utils__["dictdiffer.deep_diff"]( - iface.get("tags", {}), tags or {} - ) + tag_changes = salt.utils.dictdiffer.deep_diff(iface.get("tags", {}), tags or {}) if tag_changes: ret["changes"]["tags"] = tag_changes @@ -2033,7 +2028,7 @@ def network_interface_present( break # ip_configurations changes - comp_ret = __utils__["azurearm.compare_list_of_dicts"]( + comp_ret = salt.utils.azurearm.compare_list_of_dicts( iface.get("ip_configurations", []), ip_configurations, ["public_ip_address", "subnet"], @@ -2239,7 +2234,7 @@ def route_table_present( if "error" not in rt_tbl: # tag changes - tag_changes = __utils__["dictdiffer.deep_diff"]( + tag_changes = salt.utils.dictdiffer.deep_diff( rt_tbl.get("tags", {}), tags or {} ) if tag_changes: @@ -2257,7 +2252,7 @@ def route_table_present( # routes changes if routes: - comp_ret = __utils__["azurearm.compare_list_of_dicts"]( + comp_ret = salt.utils.azurearm.compare_list_of_dicts( rt_tbl.get("routes", []), routes ) diff --git a/salt/states/azurearm_resource.py b/salt/states/azurearm_resource.py index 4a61ef3d9764..5a1c41d1d9d8 100644 --- a/salt/states/azurearm_resource.py +++ b/salt/states/azurearm_resource.py @@ -91,6 +91,7 @@ import logging import salt.utils.azurearm +import salt.utils.dictdiffer import salt.utils.files __virtualname__ = "azurearm_resource" @@ -165,7 +166,7 @@ def resource_group_present( group = __salt__["azurearm_resource.resource_group_get"]( name, **connection_auth ) - ret["changes"] = __utils__["dictdiffer.deep_diff"]( + ret["changes"] = salt.utils.dictdiffer.deep_diff( group.get("tags", {}), tags or {} ) @@ -511,19 +512,19 @@ def policy_definition_present( "new": description, } - rule_changes = __utils__["dictdiffer.deep_diff"]( + rule_changes = salt.utils.dictdiffer.deep_diff( policy.get("policy_rule", {}), policy_rule or {} ) if rule_changes: ret["changes"]["policy_rule"] = rule_changes - meta_changes = __utils__["dictdiffer.deep_diff"]( + meta_changes = salt.utils.dictdiffer.deep_diff( policy.get("metadata", {}), metadata or {} ) if meta_changes: ret["changes"]["metadata"] = meta_changes - param_changes = __utils__["dictdiffer.deep_diff"]( + param_changes = salt.utils.dictdiffer.deep_diff( policy.get("parameters", {}), parameters or {} ) if param_changes: @@ -739,7 +740,7 @@ def policy_assignment_present( "new": description, } - param_changes = __utils__["dictdiffer.deep_diff"]( + param_changes = salt.utils.dictdiffer.deep_diff( policy.get("parameters", {}), parameters or {} ) if param_changes: diff --git a/salt/states/boto3_sns.py b/salt/states/boto3_sns.py index 30509176e702..2544713bfc9e 100644 --- a/salt/states/boto3_sns.py +++ b/salt/states/boto3_sns.py @@ -66,6 +66,7 @@ import logging import re +import salt.utils.boto3mod import salt.utils.json log = logging.getLogger(__name__) @@ -383,10 +384,10 @@ def topic_absent( def _json_objs_equal(left, right): - left = __utils__["boto3.ordered"]( + left = salt.utils.boto3mod.ordered( salt.utils.json.loads(left) if isinstance(left, str) else left ) - right = __utils__["boto3.ordered"]( + right = salt.utils.boto3mod.ordered( salt.utils.json.loads(right) if isinstance(right, str) else right ) return left == right diff --git a/salt/states/boto_apigateway.py b/salt/states/boto_apigateway.py index ed26ba7e366a..d4ea0b20befe 100644 --- a/salt/states/boto_apigateway.py +++ b/salt/states/boto_apigateway.py @@ -56,6 +56,7 @@ import os import re +import salt.utils.boto3mod import salt.utils.files import salt.utils.json import salt.utils.yaml @@ -1636,8 +1637,8 @@ def _lambda_uri(self, lambda_name, lambda_region): profile = self._common_aws_args.get("profile") region = self._common_aws_args.get("region") - lambda_region = __utils__["boto3.get_region"]("lambda", lambda_region, profile) - apigw_region = __utils__["boto3.get_region"]("apigateway", region, profile) + lambda_region = salt.utils.boto3mod.get_region("lambda", lambda_region, profile) + apigw_region = salt.utils.boto3mod.get_region("apigateway", region, profile) lambda_desc = __salt__["boto_lambda.describe_function"]( lambda_name, **self._common_aws_args diff --git a/salt/states/boto_asg.py b/salt/states/boto_asg.py index 58a5baed2ca3..d6ea6051656d 100644 --- a/salt/states/boto_asg.py +++ b/salt/states/boto_asg.py @@ -196,6 +196,7 @@ import hashlib import logging +import salt.utils.boto3mod import salt.utils.dictupdate as dictupdate import salt.utils.stringutils from salt.exceptions import SaltInvocationError @@ -642,9 +643,9 @@ def present( # always be returned from AWS. if value is None: continue - value = __utils__["boto3.ordered"](value) + value = salt.utils.boto3mod.ordered(value) if asg_property in asg: - _value = __utils__["boto3.ordered"](asg[asg_property]) + _value = salt.utils.boto3mod.ordered(asg[asg_property]) if not value == _value: log.debug("%s asg_property differs from %s", value, _value) proposed.setdefault("old", {}).update({asg_property: _value}) diff --git a/salt/states/boto_cloudfront.py b/salt/states/boto_cloudfront.py index db83cc10b805..85dce9f28aac 100644 --- a/salt/states/boto_cloudfront.py +++ b/salt/states/boto_cloudfront.py @@ -47,6 +47,9 @@ import difflib import logging +import salt.utils.dictdiffer +import salt.utils.yaml + log = logging.getLogger(__name__) @@ -166,7 +169,7 @@ def present( "config": config, "tags": tags, } - diffed_config = __utils__["dictdiffer.deep_diff"]( + diffed_config = salt.utils.dictdiffer.deep_diff( full_config_old, full_config_new, ) @@ -176,10 +179,8 @@ def _yaml_safe_dump(attrs): Safely dump YAML using a readable flow style """ dumper_name = "IndentedSafeOrderedDumper" - dumper = __utils__["yaml.get_dumper"](dumper_name) - return __utils__["yaml.dump"]( - attrs, default_flow_style=False, Dumper=dumper - ) + dumper = salt.utils.yaml.get_dumper(dumper_name) + return salt.utils.yaml.dump(attrs, default_flow_style=False, Dumper=dumper) changes_diff = "".join( difflib.unified_diff( diff --git a/salt/states/boto_elasticsearch_domain.py b/salt/states/boto_elasticsearch_domain.py index 4c47222b5605..632f27de0579 100644 --- a/salt/states/boto_elasticsearch_domain.py +++ b/salt/states/boto_elasticsearch_domain.py @@ -81,6 +81,7 @@ import logging import os +import salt.utils.boto3mod import salt.utils.json log = logging.getLogger(__name__) @@ -96,7 +97,7 @@ def __virtual__(): def _compare_json(current, desired): - return __utils__["boto3.json_objs_equal"](current, desired) + return salt.utils.boto3mod.json_objs_equal(current, desired) def present( diff --git a/salt/states/boto_lambda.py b/salt/states/boto_lambda.py index cd8bca05f528..7358b6e83831 100644 --- a/salt/states/boto_lambda.py +++ b/salt/states/boto_lambda.py @@ -64,6 +64,7 @@ import logging import os +import salt.utils.boto3mod import salt.utils.data import salt.utils.dictupdate as dictupdate import salt.utils.files @@ -441,7 +442,7 @@ def _function_config_present( if oldval is not None: oldval.pop("VpcId", None) fixed_VpcConfig = _resolve_vpcconfig(VpcConfig, region, key, keyid, profile) - if __utils__["boto3.ordered"](oldval) != __utils__["boto3.ordered"]( + if salt.utils.boto3mod.ordered(oldval) != salt.utils.boto3mod.ordered( fixed_VpcConfig ): need_update = True diff --git a/salt/states/boto_s3.py b/salt/states/boto_s3.py index d466374cc27c..9f8caf9443e8 100644 --- a/salt/states/boto_s3.py +++ b/salt/states/boto_s3.py @@ -53,7 +53,9 @@ import difflib import logging +import salt.utils.dictupdate import salt.utils.hashutils +import salt.utils.yaml log = logging.getLogger(__name__) @@ -171,7 +173,7 @@ def object_present( combined_extra_args = copy.deepcopy( __salt__["config.option"](extra_args_from_pillar, {}) ) - __utils__["dictupdate.update"](combined_extra_args, extra_args) + salt.utils.dictupdate.update(combined_extra_args, extra_args) if combined_extra_args: supported_args = STORED_EXTRA_ARGS | UPLOAD_ONLY_EXTRA_ARGS combined_extra_args_keys = frozenset(combined_extra_args.keys()) @@ -265,8 +267,8 @@ def _yaml_safe_dump(attrs): Safely dump YAML using a readable flow style """ dumper_name = "IndentedSafeOrderedDumper" - dumper = __utils__["yaml.get_dumper"](dumper_name) - return __utils__["yaml.dump"](attrs, default_flow_style=False, Dumper=dumper) + dumper = salt.utils.yaml.get_dumper(dumper_name) + return salt.utils.yaml.dump(attrs, default_flow_style=False, Dumper=dumper) changes_diff = "".join( difflib.unified_diff( diff --git a/salt/states/boto_s3_bucket.py b/salt/states/boto_s3_bucket.py index 66dc68db08d7..e1628ec3a429 100644 --- a/salt/states/boto_s3_bucket.py +++ b/salt/states/boto_s3_bucket.py @@ -141,6 +141,7 @@ import copy import logging +import salt.utils.boto3mod import salt.utils.json log = logging.getLogger(__name__) @@ -303,7 +304,7 @@ def _get_role_arn(name, region=None, key=None, keyid=None, profile=None): def _compare_json(current, desired, region, key, keyid, profile): - return __utils__["boto3.json_objs_equal"](current, desired) + return salt.utils.boto3mod.json_objs_equal(current, desired) def _compare_acl(current, desired, region, key, keyid, profile): @@ -314,7 +315,7 @@ def _compare_acl(current, desired, region, key, keyid, profile): rather than the input itself. """ ocid = _get_canonical_id(region, key, keyid, profile) - return __utils__["boto3.json_objs_equal"](current, _acl_to_grant(desired, ocid)) + return salt.utils.boto3mod.json_objs_equal(current, _acl_to_grant(desired, ocid)) def _compare_policy(current, desired, region, key, keyid, profile): @@ -330,7 +331,7 @@ def _compare_replication(current, desired, region, key, keyid, profile): desired["Role"] = _get_role_arn( desired["Role"], region=region, key=key, keyid=keyid, profile=profile ) - return __utils__["boto3.json_objs_equal"](current, desired) + return salt.utils.boto3mod.json_objs_equal(current, desired) def present( @@ -427,7 +428,7 @@ def present( if Policy: if isinstance(Policy, str): Policy = salt.utils.json.loads(Policy) - Policy = __utils__["boto3.ordered"](Policy) + Policy = salt.utils.boto3mod.ordered(Policy) r = __salt__["boto_s3_bucket.exists"]( Bucket=Bucket, region=region, key=key, keyid=keyid, profile=profile @@ -631,7 +632,7 @@ def present( # Policy description is always returned as a JSON string. # Convert it to JSON now for ease of comparisons later. if isinstance(temp, str): - current = __utils__["boto3.ordered"]( + current = salt.utils.boto3mod.ordered( {"Policy": salt.utils.json.loads(temp)} ) if not comparator(current, desired, region, key, keyid, profile): diff --git a/salt/states/boto_sqs.py b/salt/states/boto_sqs.py index 0c3784070c9d..bb4c9f0cdeb3 100644 --- a/salt/states/boto_sqs.py +++ b/salt/states/boto_sqs.py @@ -61,6 +61,7 @@ import logging import salt.utils.json +import salt.utils.yaml log = logging.getLogger(__name__) @@ -201,8 +202,8 @@ def _yaml_safe_dump(attrs): """ Safely dump YAML using a readable flow style """ - dumper = __utils__["yaml.get_dumper"]("IndentedSafeOrderedDumper") - return __utils__["yaml.dump"](attrs, default_flow_style=False, Dumper=dumper) + dumper = salt.utils.yaml.get_dumper("IndentedSafeOrderedDumper") + return salt.utils.yaml.dump(attrs, default_flow_style=False, Dumper=dumper) attributes_diff = "".join( difflib.unified_diff( diff --git a/salt/states/btrfs.py b/salt/states/btrfs.py index e925840a4681..068ce77c98ff 100644 --- a/salt/states/btrfs.py +++ b/salt/states/btrfs.py @@ -10,6 +10,7 @@ import os.path import tempfile +import salt.utils.files from salt.exceptions import CommandExecutionError log = logging.getLogger(__name__) @@ -38,7 +39,7 @@ def _umount(path): Umount and clean the temporary place. """ __states__["mount.unmounted"](path) - __utils__["files.rm_rf"](path) + salt.utils.files.rm_rf(path) def _is_default(path, dest, name): diff --git a/salt/states/docker_network.py b/salt/states/docker_network.py index 38e9027a1a2f..d3f7557af968 100644 --- a/salt/states/docker_network.py +++ b/salt/states/docker_network.py @@ -35,6 +35,8 @@ import random import string +import salt.utils.args +import salt.utils.dockermod import salt.utils.dockermod.translate.network from salt._compat import ipaddress from salt.exceptions import CommandExecutionError @@ -535,7 +537,7 @@ def present( to_connect = {} missing_containers = [] stopped_containers = [] - for cname in __utils__["args.split_input"](containers or []): + for cname in salt.utils.args.split_input(containers or []): try: cinfo = __salt__["docker.inspect_container"](cname) except CommandExecutionError: @@ -570,12 +572,12 @@ def present( disconnected_containers = {} try: - kwargs = __utils__["docker.translate_input"]( + kwargs = salt.utils.dockermod.translate_input( salt.utils.dockermod.translate.network, skip_translate=skip_translate, ignore_collisions=ignore_collisions, validate_ip_addrs=validate_ip_addrs, - **__utils__["args.clean_kwargs"](**kwargs) + **salt.utils.args.clean_kwargs(**kwargs) ) except Exception as exc: # pylint: disable=broad-except ret["comment"] = exc.__str__() @@ -603,7 +605,7 @@ def present( else: ipam_pools = ipam_kwargs.pop("ipam_pools", ()) try: - ipam_config = __utils__["docker.create_ipam_config"]( + ipam_config = salt.utils.dockermod.create_ipam_config( *ipam_pools, **ipam_kwargs ) except Exception as exc: # pylint: disable=broad-except diff --git a/salt/states/elasticsearch.py b/salt/states/elasticsearch.py index bf58af5913d6..08788773af6b 100644 --- a/salt/states/elasticsearch.py +++ b/salt/states/elasticsearch.py @@ -7,6 +7,7 @@ import logging +import salt.utils.dictdiffer import salt.utils.json log = logging.getLogger(__name__) @@ -193,7 +194,7 @@ def alias_present(name, index, definition=None): if not definition: definition = {} - ret["changes"] = __utils__["dictdiffer.deep_diff"](old, definition) + ret["changes"] = salt.utils.dictdiffer.deep_diff(old, definition) if ret["changes"] or not definition: if __opts__["test"]: @@ -352,7 +353,7 @@ def index_template_present(name, definition, check_definition=False): for key in ("mappings", "aliases", "settings"): if current_template[key] == {} and key not in definition_parsed: del current_template[key] - diff = __utils__["dictdiffer.deep_diff"]( + diff = salt.utils.dictdiffer.deep_diff( current_template, definition_parsed ) if len(diff) != 0: @@ -460,7 +461,7 @@ def pipeline_present(name, definition): old = {} if pipeline and name in pipeline: old = pipeline[name] - ret["changes"] = __utils__["dictdiffer.deep_diff"](old, definition) + ret["changes"] = salt.utils.dictdiffer.deep_diff(old, definition) if ret["changes"] or not definition: if __opts__["test"]: @@ -570,7 +571,7 @@ def search_template_present(name, definition): if template: old = salt.utils.json.loads(template["template"]) - ret["changes"] = __utils__["dictdiffer.deep_diff"](old, definition) + ret["changes"] = salt.utils.dictdiffer.deep_diff(old, definition) if ret["changes"] or not definition: if __opts__["test"]: diff --git a/salt/states/environ.py b/salt/states/environ.py index fb495d1af441..a7d272d4d895 100644 --- a/salt/states/environ.py +++ b/salt/states/environ.py @@ -7,6 +7,7 @@ import os import salt.utils.platform +import salt.utils.win_reg def __virtual__(): @@ -131,7 +132,7 @@ def key_exists(): r" Manager\Environment" ) - out = __utils__["reg.read_value"]( + out = salt.utils.win_reg.read_value( permanent_hive, permanent_key, _norm_key(key) ) return out["success"] is True diff --git a/salt/states/file.py b/salt/states/file.py index 9f33a8de232e..b282af6e5c6d 100644 --- a/salt/states/file.py +++ b/salt/states/file.py @@ -6102,7 +6102,7 @@ def comment(name, regex, char="#", backup=".bak", ignore_missing=False): ret["result"] = __salt__["file.search"](name, comment_regex, multiline=True) if slines != nlines: - if not __utils__["files.is_text"](name): + if not salt.utils.files.is_text(name): ret["changes"]["diff"] = "Replace binary file" else: # Changes happened, add them @@ -6198,7 +6198,7 @@ def uncomment(name, regex, char="#", backup=".bak"): ) if slines != nlines: - if not __utils__["files.is_text"](name): + if not salt.utils.files.is_text(name): ret["changes"]["diff"] = "Replace binary file" else: # Changes happened, add them @@ -6449,7 +6449,7 @@ def append( nlines = list(slines) nlines.extend(append_lines) if slines != nlines: - if not __utils__["files.is_text"](name): + if not salt.utils.files.is_text(name): ret["changes"]["diff"] = "Replace binary file" else: # Changes happened, add them @@ -6471,7 +6471,7 @@ def append( nlines = nlines.splitlines() if slines != nlines: - if not __utils__["files.is_text"](name): + if not salt.utils.files.is_text(name): ret["changes"]["diff"] = "Replace binary file" else: # Changes happened, add them @@ -6735,7 +6735,7 @@ def prepend( if __opts__["test"]: nlines = test_lines + slines if slines != nlines: - if not __utils__["files.is_text"](name): + if not salt.utils.files.is_text(name): ret["changes"]["diff"] = "Replace binary file" else: # Changes happened, add them @@ -6774,7 +6774,7 @@ def prepend( nlines = nlines.splitlines(True) if slines != nlines: - if not __utils__["files.is_text"](name): + if not salt.utils.files.is_text(name): ret["changes"]["diff"] = "Replace binary file" else: # Changes happened, add them diff --git a/salt/states/glance_image.py b/salt/states/glance_image.py index fe8f7857ce77..22232ec5a722 100644 --- a/salt/states/glance_image.py +++ b/salt/states/glance_image.py @@ -21,7 +21,7 @@ glance_image.absent: - name: cirros """ - +import salt.utils.args __virtualname__ = "glance_image" @@ -51,7 +51,7 @@ def present(name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["glanceng.setup_clouds"](auth) diff --git a/salt/states/idem.py b/salt/states/idem.py index a7caba30ecd2..717c52978673 100644 --- a/salt/states/idem.py +++ b/salt/states/idem.py @@ -13,6 +13,8 @@ import pathlib import re +import salt.utils.idem + __virtualname__ = "idem" @@ -113,7 +115,7 @@ def state( :depends: acct, pop, pop-config, idem :platform: all """ - hub = __utils__["idem.hub"]() + hub = salt.utils.idem.hub() if isinstance(sls, str): sls = [sls] diff --git a/salt/states/iptables.py b/salt/states/iptables.py index 079c627d1bbc..466ae424f85c 100644 --- a/salt/states/iptables.py +++ b/salt/states/iptables.py @@ -245,6 +245,7 @@ output of iptables-save. This may have unintended consequences on legacy releases of ``iptables``. """ +import salt.utils.state from salt.state import STATE_INTERNAL_KEYWORDS as _STATE_INTERNAL_KEYWORDS @@ -880,7 +881,7 @@ def mod_aggregate(low, chunks, running): if low.get("fun") not in agg_enabled: return low for chunk in chunks: - tag = __utils__["state.gen_tag"](chunk) + tag = salt.utils.state.gen_tag(chunk) if tag in running: # Already ran the iptables state, skip aggregation continue diff --git a/salt/states/keystone_domain.py b/salt/states/keystone_domain.py index b8df63b98715..f5eaad315c37 100644 --- a/salt/states/keystone_domain.py +++ b/salt/states/keystone_domain.py @@ -25,7 +25,7 @@ keystone_domain.absent: - name: domain1 """ - +import salt.utils.args __virtualname__ = "keystone_domain" @@ -55,7 +55,7 @@ def present(name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["keystoneng.setup_clouds"](auth) diff --git a/salt/states/keystone_endpoint.py b/salt/states/keystone_endpoint.py index 279c3be23f63..32dd6f7e3f35 100644 --- a/salt/states/keystone_endpoint.py +++ b/salt/states/keystone_endpoint.py @@ -35,7 +35,7 @@ - region: RegionOne - service_name: glance """ - +import salt.utils.args __virtualname__ = "keystone_endpoint" @@ -100,7 +100,7 @@ def present(name, service_name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["keystoneng.setup_clouds"](auth) diff --git a/salt/states/keystone_group.py b/salt/states/keystone_group.py index ac6077a3f9a3..1fdfec08c2c5 100644 --- a/salt/states/keystone_group.py +++ b/salt/states/keystone_group.py @@ -25,7 +25,7 @@ - domain: domain1 - description: 'my group' """ - +import salt.utils.args __virtualname__ = "keystone_group" @@ -71,7 +71,7 @@ def present(name, auth=None, **kwargs): __salt__["keystoneng.setup_cloud"](auth) - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) kwargs["name"] = name group = _common(kwargs) @@ -115,7 +115,7 @@ def absent(name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["keystoneng.setup_cloud"](auth) diff --git a/salt/states/keystone_project.py b/salt/states/keystone_project.py index b6db7cc2033e..98d26d3410ec 100644 --- a/salt/states/keystone_project.py +++ b/salt/states/keystone_project.py @@ -26,7 +26,7 @@ - enabled: False - description: 'my project' """ - +import salt.utils.args __virtualname__ = "keystone_project" @@ -70,7 +70,7 @@ def present(name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["keystoneng.setup_clouds"](auth) @@ -116,7 +116,7 @@ def absent(name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["keystoneng.setup_clouds"](auth) diff --git a/salt/states/keystone_role.py b/salt/states/keystone_role.py index 1cb938a4a51a..a8d2531157e1 100644 --- a/salt/states/keystone_role.py +++ b/salt/states/keystone_role.py @@ -24,7 +24,7 @@ - name: role1 - description: 'my group' """ - +import salt.utils.args __virtualname__ = "keystone_role" @@ -51,7 +51,7 @@ def present(name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["keystoneng.setup_clouds"](auth) diff --git a/salt/states/keystone_service.py b/salt/states/keystone_service.py index 988eae706e66..4ea211243758 100644 --- a/salt/states/keystone_service.py +++ b/salt/states/keystone_service.py @@ -27,7 +27,7 @@ - enabled: False - description: 'OpenStack Image' """ - +import salt.utils.args __virtualname__ = "keystone_service" @@ -60,7 +60,7 @@ def present(name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["keystoneng.setup_clouds"](auth) diff --git a/salt/states/keystone_user.py b/salt/states/keystone_user.py index 8f9ec9f8c8d2..ef613ac27171 100644 --- a/salt/states/keystone_user.py +++ b/salt/states/keystone_user.py @@ -28,7 +28,7 @@ - email: "user1@example.org" - description: 'my user' """ - +import salt.utils.args __virtualname__ = "keystone_user" @@ -81,7 +81,7 @@ def present(name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["keystoneng.setup_clouds"](auth) @@ -128,7 +128,7 @@ def absent(name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["keystoneng.setup_clouds"](auth) diff --git a/salt/states/neutron_network.py b/salt/states/neutron_network.py index 30e6cfb050fa..10c92091ed26 100644 --- a/salt/states/neutron_network.py +++ b/salt/states/neutron_network.py @@ -27,7 +27,7 @@ - external: False - project: project1 """ - +import salt.utils.args __virtualname__ = "neutron_network" @@ -69,7 +69,7 @@ def present(name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["neutronng.setup_clouds"](auth) @@ -136,7 +136,7 @@ def absent(name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["neutronng.setup_clouds"](auth) diff --git a/salt/states/neutron_secgroup.py b/salt/states/neutron_secgroup.py index 045f413c9453..b00998bb108d 100644 --- a/salt/states/neutron_secgroup.py +++ b/salt/states/neutron_secgroup.py @@ -33,7 +33,7 @@ - description: "Very Secure Security Group" - project_name: Project1 """ - +import salt.utils.args __virtualname__ = "neutron_secgroup" @@ -71,7 +71,7 @@ def present(name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["neutronng.setup_clouds"](auth) @@ -127,7 +127,7 @@ def absent(name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["neutronng.setup_clouds"](auth) diff --git a/salt/states/neutron_secgroup_rule.py b/salt/states/neutron_secgroup_rule.py index db4721fc79e4..09cbc53cb0cc 100644 --- a/salt/states/neutron_secgroup_rule.py +++ b/salt/states/neutron_secgroup_rule.py @@ -27,7 +27,7 @@ - description: "Very Secure Security Group" - project_id: 1dcac318a83b4610b7a7f7ba01465548 """ - +import salt.utils.args __virtualname__ = "neutron_secgroup_rule" @@ -74,7 +74,7 @@ def present(name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["neutronng.setup_clouds"](auth) diff --git a/salt/states/neutron_subnet.py b/salt/states/neutron_subnet.py index 30c69992b583..b1ff1dcfe6b1 100644 --- a/salt/states/neutron_subnet.py +++ b/salt/states/neutron_subnet.py @@ -45,7 +45,7 @@ - network_name_or_id: network1 - ip_version: 6 """ - +import salt.utils.args __virtualname__ = "neutron_subnet" @@ -93,7 +93,7 @@ def present(name, auth=None, **kwargs): """ ret = {"name": name, "changes": {}, "result": True, "comment": ""} - kwargs = __utils__["args.clean_kwargs"](**kwargs) + kwargs = salt.utils.args.clean_kwargs(**kwargs) __salt__["neutronng.setup_clouds"](auth) diff --git a/salt/states/pkg.py b/salt/states/pkg.py index e9728066a61a..bcd3c1e000e8 100644 --- a/salt/states/pkg.py +++ b/salt/states/pkg.py @@ -76,6 +76,7 @@ import salt.utils.pkg import salt.utils.platform +import salt.utils.state import salt.utils.versions from salt.exceptions import CommandExecutionError, MinionError, SaltInvocationError from salt.modules.pkg_resource import _repack_pkgs @@ -3519,7 +3520,7 @@ def mod_aggregate(low, chunks, running): if low.get("fun") not in agg_enabled: return low for chunk in chunks: - tag = __utils__["state.gen_tag"](chunk) + tag = salt.utils.state.gen_tag(chunk) if tag in running: # Already ran the pkg state, skip aggregation continue diff --git a/salt/states/reg.py b/salt/states/reg.py index 97359c01d843..d0fe2c6c9d9b 100644 --- a/salt/states/reg.py +++ b/salt/states/reg.py @@ -72,6 +72,8 @@ import logging import salt.utils.stringutils +import salt.utils.win_dacl +import salt.utils.win_reg log = logging.getLogger(__name__) @@ -396,12 +398,12 @@ def present( hive, key = _parse_key(name) # Determine what to do - reg_current = __utils__["reg.read_value"]( + reg_current = salt.utils.win_reg.read_value( hive=hive, key=key, vname=vname, use_32bit_registry=use_32bit_registry ) # Cast the vdata according to the vtype - vdata_decoded = __utils__["reg.cast_vdata"](vdata=vdata, vtype=vtype) + vdata_decoded = salt.utils.win_reg.cast_vdata(vdata=vdata, vtype=vtype) # Check if the key already exists # If so, check perms @@ -411,7 +413,7 @@ def present( salt.utils.stringutils.to_unicode(vname, "utf-8") if vname else "(Default)", salt.utils.stringutils.to_unicode(name, "utf-8"), ) - return __utils__["dacl.check_perms"]( + return salt.utils.win_dacl.check_perms( obj_name="\\".join([hive, key]), obj_type="registry32" if use_32bit_registry else "registry", ret=ret, @@ -440,7 +442,7 @@ def present( return ret # Configure the value - ret["result"] = __utils__["reg.set_value"]( + ret["result"] = salt.utils.win_reg.set_value( hive=hive, key=key, vname=vname, @@ -457,7 +459,7 @@ def present( ret["comment"] = r"Added {} to {}\{}".format(vname, hive, key) if ret["result"]: - ret = __utils__["dacl.check_perms"]( + ret = salt.utils.win_dacl.check_perms( obj_name="\\".join([hive, key]), obj_type="registry32" if use_32bit_registry else "registry", ret=ret, @@ -517,7 +519,7 @@ def absent(name, vname=None, use_32bit_registry=False): hive, key = _parse_key(name) # Determine what to do - reg_check = __utils__["reg.read_value"]( + reg_check = salt.utils.win_reg.read_value( hive=hive, key=key, vname=vname, use_32bit_registry=use_32bit_registry ) if not reg_check["success"] or reg_check["vdata"] == "(value not set)": @@ -536,7 +538,7 @@ def absent(name, vname=None, use_32bit_registry=False): return ret # Delete the value - ret["result"] = __utils__["reg.delete_value"]( + ret["result"] = salt.utils.win_reg.delete_value( hive=hive, key=key, vname=vname, use_32bit_registry=use_32bit_registry ) if not ret["result"]: @@ -609,7 +611,7 @@ def key_absent(name, use_32bit_registry=False): return ret # Delete the value - __utils__["reg.delete_key_recursive"]( + salt.utils.win_reg.delete_key_recursive( hive=hive, key=key, use_32bit_registry=use_32bit_registry ) if __utils__["reg.read_value"]( diff --git a/salt/states/saltmod.py b/salt/states/saltmod.py index 4c0b7c41ac72..1d70df809203 100644 --- a/salt/states/saltmod.py +++ b/salt/states/saltmod.py @@ -32,6 +32,7 @@ import salt.syspaths import salt.utils.data import salt.utils.event +import salt.utils.state log = logging.getLogger(__name__) @@ -396,7 +397,7 @@ def state( except KeyError: m_state = False if m_state: - m_state = __utils__["state.check_result"](m_ret, recurse=True) + m_state = salt.utils.state.check_result(m_ret, recurse=True) if not m_state: if minion not in fail_minions: diff --git a/salt/states/vault.py b/salt/states/vault.py index 54de5b8f435a..c6c070ca355f 100644 --- a/salt/states/vault.py +++ b/salt/states/vault.py @@ -13,6 +13,8 @@ import difflib import logging +import salt.utils.vault + log = logging.getLogger(__name__) @@ -42,7 +44,7 @@ def policy_present(name, rules): """ url = "v1/sys/policy/{}".format(name) - response = __utils__["vault.make_request"]("GET", url) + response = salt.utils.vault.make_request("GET", url) try: if response.status_code == 200: return _handle_existing_policy(name, rules, response.json()["rules"]) @@ -70,7 +72,7 @@ def _create_new_policy(name, rules): payload = {"rules": rules} url = "v1/sys/policy/{}".format(name) - response = __utils__["vault.make_request"]("PUT", url, json=payload) + response = salt.utils.vault.make_request("PUT", url, json=payload) if response.status_code not in [200, 204]: return { "name": name, @@ -109,7 +111,7 @@ def _handle_existing_policy(name, new_rules, existing_rules): payload = {"rules": new_rules} url = "v1/sys/policy/{}".format(name) - response = __utils__["vault.make_request"]("PUT", url, json=payload) + response = salt.utils.vault.make_request("PUT", url, json=payload) if response.status_code not in [200, 204]: return { "name": name, diff --git a/salt/states/win_dns_client.py b/salt/states/win_dns_client.py index 9afa0faf3689..fe8a4faf15a7 100644 --- a/salt/states/win_dns_client.py +++ b/salt/states/win_dns_client.py @@ -1,6 +1,7 @@ """ Module for configuring DNS Client on Windows systems """ +import salt.utils.win_reg def __virtual__(): @@ -240,7 +241,7 @@ def primary_suffix(name, suffix=None, updates=False): "new": {"suffix": reg_data["suffix"]["new"]}, } - suffix_result = __utils__["reg.set_value"]( + suffix_result = salt.utils.win_reg.set_value( reg_data["suffix"]["hive"], reg_data["suffix"]["key"], reg_data["suffix"]["vname"], @@ -248,7 +249,7 @@ def primary_suffix(name, suffix=None, updates=False): reg_data["suffix"]["vtype"], ) - updates_result = __utils__["reg.set_value"]( + updates_result = salt.utils.win_reg.set_value( reg_data["updates"]["hive"], reg_data["updates"]["key"], reg_data["updates"]["vname"], diff --git a/salt/states/zfs.py b/salt/states/zfs.py index 855ec6383410..b617a45fabf2 100644 --- a/salt/states/zfs.py +++ b/salt/states/zfs.py @@ -46,6 +46,7 @@ import logging from datetime import datetime +import salt.utils.zfs from salt.utils.odict import OrderedDict log = logging.getLogger(__name__) @@ -140,7 +141,7 @@ def filesystem_absent(name, force=False, recursive=False): destroying the volume specified by ``name``. This module is dataset type sensitive. """ - if not __utils__["zfs.is_dataset"](name): + if not salt.utils.zfs.is_dataset(name): ret = { "name": name, "changes": {}, @@ -169,7 +170,7 @@ def volume_absent(name, force=False, recursive=False): destroying the filesystem specified by ``name``. This module is dataset type sensitive. """ - if not __utils__["zfs.is_dataset"](name): + if not salt.utils.zfs.is_dataset(name): ret = { "name": name, "changes": {}, @@ -193,7 +194,7 @@ def snapshot_absent(name, force=False, recursive=False): also destroy all the child datasets (zfs destroy -r) """ - if not __utils__["zfs.is_snapshot"](name): + if not salt.utils.zfs.is_snapshot(name): ret = { "name": name, "changes": {}, @@ -217,7 +218,7 @@ def bookmark_absent(name, force=False, recursive=False): also destroy all the child datasets (zfs destroy -r) """ - if not __utils__["zfs.is_bookmark"](name): + if not salt.utils.zfs.is_bookmark(name): ret = { "name": name, "changes": {}, @@ -248,14 +249,14 @@ def hold_absent(name, snapshot, recursive=False): log.debug("zfs.hold_absent::%s::config::recursive = %s", name, recursive) ## check we have a snapshot/tag name - if not __utils__["zfs.is_snapshot"](snapshot): + if not salt.utils.zfs.is_snapshot(snapshot): ret["result"] = False ret["comment"] = "invalid snapshot name: {}".format(snapshot) return ret if ( - __utils__["zfs.is_snapshot"](name) - or __utils__["zfs.is_bookmark"](name) + salt.utils.zfs.is_snapshot(name) + or salt.utils.zfs.is_bookmark(name) or name == "error" ): ret["result"] = False @@ -317,14 +318,14 @@ def hold_present(name, snapshot, recursive=False): log.debug("zfs.hold_present::%s::config::recursive = %s", name, recursive) ## check we have a snapshot/tag name - if not __utils__["zfs.is_snapshot"](snapshot): + if not salt.utils.zfs.is_snapshot(snapshot): ret["result"] = False ret["comment"] = "invalid snapshot name: {}".format(snapshot) return ret if ( - __utils__["zfs.is_snapshot"](name) - or __utils__["zfs.is_bookmark"](name) + salt.utils.zfs.is_snapshot(name) + or salt.utils.zfs.is_bookmark(name) or name == "error" ): ret["result"] = False @@ -410,10 +411,10 @@ def _dataset_present( ## ensure properties are zfs values if properties is None: properties = {} - properties = __utils__["zfs.from_auto_dict"](properties) + properties = salt.utils.zfs.from_auto_dict(properties) if volume_size: ## NOTE: add volsize to properties - volume_size = __utils__["zfs.from_size"](volume_size) + volume_size = salt.utils.zfs.from_size(volume_size) properties.update({"volsize": volume_size}) # The sorted isn't necessary for proper behavior, but it helps for the unit # tests. @@ -438,12 +439,12 @@ def _dataset_present( ) ## check we have valid filesystem name/volume name/clone snapshot - if not __utils__["zfs.is_dataset"](name): + if not salt.utils.zfs.is_dataset(name): ret["result"] = False ret["comment"] = "invalid dataset name: {}".format(name) return ret - if cloned_from and not __utils__["zfs.is_snapshot"](cloned_from): + if cloned_from and not salt.utils.zfs.is_snapshot(cloned_from): ret["result"] = False ret["comment"] = "{} is not a snapshot".format(cloned_from) return ret @@ -656,7 +657,7 @@ def bookmark_present(name, snapshot): log.debug("zfs.bookmark_present::%s::config::snapshot = %s", name, snapshot) ## check we have valid snapshot/bookmark name - if not __utils__["zfs.is_snapshot"](snapshot): + if not salt.utils.zfs.is_snapshot(snapshot): ret["result"] = False ret["comment"] = "invalid snapshot name: {}".format(name) return ret @@ -668,7 +669,7 @@ def bookmark_present(name, snapshot): name = "{}#{}".format(snapshot[: snapshot.index("@")], name) ret["name"] = name - if not __utils__["zfs.is_bookmark"](name): + if not salt.utils.zfs.is_bookmark(name): ret["result"] = False ret["comment"] = "invalid bookmark name: {}".format(name) return ret @@ -719,10 +720,10 @@ def snapshot_present(name, recursive=False, properties=None): ## ensure properties are zfs values if properties: - properties = __utils__["zfs.from_auto_dict"](properties) + properties = salt.utils.zfs.from_auto_dict(properties) ## check we have valid snapshot name - if not __utils__["zfs.is_snapshot"](name): + if not salt.utils.zfs.is_snapshot(name): ret["result"] = False ret["comment"] = "invalid snapshot name: {}".format(name) return ret @@ -770,7 +771,7 @@ def promoted(name): ret = {"name": name, "changes": {}, "result": True, "comment": ""} ## check we if we have a valid dataset name - if not __utils__["zfs.is_dataset"](name): + if not salt.utils.zfs.is_dataset(name): ret["result"] = False ret["comment"] = "invalid dataset name: {}".format(name) return ret @@ -952,7 +953,7 @@ def scheduled_snapshot(name, prefix, recursive=True, schedule=None): ## strict configuration validation ## NOTE: we need a valid dataset - if not __utils__["zfs.is_dataset"](name): + if not salt.utils.zfs.is_dataset(name): ret["result"] = False ret["comment"] = "invalid dataset name: {}".format(name) diff --git a/salt/states/zpool.py b/salt/states/zpool.py index 6eac07ada133..2edbe9e21dc3 100644 --- a/salt/states/zpool.py +++ b/salt/states/zpool.py @@ -72,6 +72,7 @@ import logging import os +import salt.utils.zfs from salt.utils.odict import OrderedDict log = logging.getLogger(__name__) @@ -264,11 +265,11 @@ def present( # ensure properties are zfs values if properties: - properties = __utils__["zfs.from_auto_dict"](properties) + properties = salt.utils.zfs.from_auto_dict(properties) elif properties is None: properties = {} if filesystem_properties: - filesystem_properties = __utils__["zfs.from_auto_dict"](filesystem_properties) + filesystem_properties = salt.utils.zfs.from_auto_dict(filesystem_properties) elif filesystem_properties is None: filesystem_properties = {}