5001 Commits (17a4553c68e87f28f95e3a86344603b27aa31c06)

Author	SHA1	Message	Date
Toshio Kuratomi	17a4553c68	Reorganize and expand the file tests ... * Pull the tests for state=link into their own file * Pull tests for what happens when dest is a directory out * Expand both of the above sets of tests	7 years ago
Pilou	a5d320f8e7	vdirect modules: fix 'import' sanity test (#39706) ... * vdirect modules: fix 'import' sanity test * Remove passing file from import skip list. * vdirect modules: fix validate-modules warnings - Arguments with a default should not be marked as required - add choices in doc * vdirect_runnable: use formatting function	7 years ago
Toshio Kuratomi	6b159fdb03	Fix for file module with recursive permission setting and broken symlinks ... There was a traceback when setting permissions on a directory tree when there were broken symlinks inside of the tree and follow=true. chmod -R ignores broken symlinks inside of the tree so we've fixed the file module to do the same. Fixes #39456	7 years ago
Toshio Kuratomi	4f664f8ff6	Fix for file module with symlinks to nonexistent target (#39635) ... * Fix for file module with symlinks to nonexistent target When creating a symlink to a nonexistent target, creating the symlink would work but subsequent runs of the task would fail because it was trying to operate on the target instead of the symlink. Fixes #39558	7 years ago
Jordan Borean	f75b7a9437	win_get_url: Fixed a few issues with using FTP and added tests (#39646) ... * win_get_url: Fixed a few issues with using FTP and added tests * Fixed typo in docs	7 years ago
Kevin Breit	c8d287fece	Meraki organization module (#38773) ... * Initial commit Query an organization within Meraki. No support is in place for managing or creating yet * Change output_level method and make the state parameter required. * Implemented listing all organizations - Updated documentation - Parse results and return all organizations - Parse results and return specified organization * Framework for creating an organization - Documentation example for organization creation - Framework exists for creating organizations, pending PR 36809 - Created functions for HTTP calls - Renamed from dashboard.meraki.com to api.meraki.com - Added required_if for state * Remove absent state - Meraki API does not support deleting an organization so absent is removed - Updated documentation to call it state instead of status * Small change to documentation * Support all parameters associated to organization - Added all parameters needed for all organization actions. - None of the added ones work at this time. - Added documentation for clone. * Integration test for meraki_organization module * Rename module to meraki for porting to module utility * Meraki documentation fragment - Created initial documentation fragment for Meraki modules * Add meraki module utility to branch. Formerly was on a separate branch. * CRU support for Meraki organization module * CRU is supported for Meraki organizations * There is no DELETE function for organizations in the API * This code is very messy and needs cleanup * Create and Update actions don't show status as updated, must fix * Added Meraki module utility to module utility documentation list * Added support for organization cloning * Renamed use_ssl to use_https * Removed define_method() * Removed is_org() * Added is_org_valid() which does all org sanity checks * Fixes for ansibot - Changed default of use_proxy from true to false - Removed some commented out code - Updated documentation * Changes for ansibot - Removed requirement for state parameter. I may readd this. - Updated formatting diff --git a/lib/ansible/module_utils/network/meraki/meraki.py b/lib/ansible/module_utils/network/meraki/meraki.py index 3acd3d1038..395ac7c4b4 100644 --- a/lib/ansible/module_utils/network/meraki/meraki.py +++ b/lib/ansible/module_utils/network/meraki/meraki.py @@ -42,7 +42,7 @@ def meraki_argument_spec(): return dict(auth_key=dict(type='str', no_log=True, fallback=(env_fallback, ['MERAKI_KEY'])), host=dict(type='str', default='api.meraki.com'), name=dict(type='str'), - state=dict(type='str', choices=['present', 'absent', 'query'], required=True), + state=dict(type='str', choices=['present', 'absent', 'query']), use_proxy=dict(type='bool', default=False), use_https=dict(type='bool', default=True), validate_certs=dict(type='bool', default=True), diff --git a/lib/ansible/modules/network/meraki/meraki_organization.py b/lib/ansible/modules/network/meraki/meraki_organization.py index 923d969366..3789be91d6 100644 --- a/lib/ansible/modules/network/meraki/meraki_organization.py +++ b/lib/ansible/modules/network/meraki/meraki_organization.py @@ -20,11 +20,9 @@ short_description: Manage organizations in the Meraki cloud version_added: "2.6" description: - Allows for creation, management, and visibility into organizations within Meraki - notes: - More information about the Meraki API can be found at U(https://dashboard.meraki.com/api_docs). - Some of the options are likely only used for developers within Meraki - options: name: description: @@ -32,21 +30,18 @@ options: - If C(clone) is specified, C(name) is the name of the new organization. state: description: - - Create or query organizations - choices: ['query', 'present'] + - Create or modify an organization + choices: ['present', 'query'] clone: description: - Organization to clone to a new organization. - type: string org_name: description: - Name of organization. - Used when C(name) should refer to another object. - type: string org_id: description: - ID of organization - author: - Kevin Breit (@kbreit) extends_documentation_fragment: meraki @@ -86,7 +81,6 @@ RETURN = ''' response: description: Data returned from Meraki dashboard. type: dict - state: query returned: info ''' @@ -103,6 +97,7 @@ def main(): argument_spec = meraki_argument_spec() argument_spec.update(clone=dict(type='str'), + state=dict(type='str', choices=['present', 'query']), ) @@ -125,11 +120,9 @@ def main(): meraki.function = 'organizations' meraki.params['follow_redirects'] = 'all' - meraki.required_if=[ - ['state', 'present', ['name']], - ['clone', ['name']], - # ['vpn_PublicIP', ['name']], - ] + meraki.required_if = [['state', 'present', ['name']], + ['clone', ['name']], + ] create_urls = {'organizations': '/organizations', } @@ -162,23 +155,16 @@ def main(): - - # method = None - # org_id = None - - - # meraki.fail_json(msg=meraki.is_org_valid(meraki.get_orgs(), org_name='AnsibleTestOrg')) - if meraki.params['state'] == 'query': - if meraki.params['name'] is None: # Query all organizations, no matter what - orgs = meraki.get_orgs() - meraki.result['organization'] = orgs - elif meraki.params['name'] is not None: # Query by organization name - module.warn('All matching organizations will be returned, even if there are duplicate named organizations') - orgs = meraki.get_orgs() - for o in orgs: - if o['name'] == meraki.params['name']: - meraki.result['organization'] = o + if meraki.params['name'] is None: # Query all organizations, no matter what + orgs = meraki.get_orgs() + meraki.result['organization'] = orgs + elif meraki.params['name'] is not None: # Query by organization name + module.warn('All matching organizations will be returned, even if there are duplicate named organizations') + orgs = meraki.get_orgs() + for o in orgs: + if o['name'] == meraki.params['name']: + meraki.result['organization'] = o elif meraki.params['state'] == 'present': if meraki.params['clone'] is not None: # Cloning payload = {'name': meraki.params['name']} @@ -193,7 +179,10 @@ def main(): payload = {'name': meraki.params['name'], 'id': meraki.params['org_id'], } - meraki.result['response'] = json.loads(meraki.request(meraki.construct_path('update', org_id=meraki.params['org_id']), payload=json.dumps(payload), method='PUT')) + meraki.result['response'] = json.loads(meraki.request(meraki.construct_path('update', + org_id=meraki.params['org_id']), + payload=json.dumps(payload), + method='PUT')) diff --git a/lib/ansible/utils/module_docs_fragments/meraki.py b/lib/ansible/utils/module_docs_fragments/meraki.py index e268d02e68..3569d83b99 100644 --- a/lib/ansible/utils/module_docs_fragments/meraki.py +++ b/lib/ansible/utils/module_docs_fragments/meraki.py @@ -35,6 +35,7 @@ options: description: - Set amount of debug output during module execution choices: ['normal', 'debug'] + default: 'normal' timeout: description: - Time to timeout for HTTP requests. diff --git a/test/integration/targets/meraki_organization/aliases b/test/integration/targets/meraki_organization/aliases new file mode 100644 index 0000000000..ad7ccf7ada --- /dev/null +++ b/test/integration/targets/meraki_organization/aliases @@ -0,0 +1 @@ +unsupported * Formatting fix * Minor updates due to testing - Made state required again - Improved formatting for happier PEP8 - request() now sets instance method * Fix reporting of the result * Enhance idempotency checks - Remove merging functionality as the proposed should be used - Do check and reverse check to look for differences * Rewrote and added additional integration tests. This isn't done. * Updated is_update_required method: - Original and proposed data is passed to method - Added ignored_keys list so it can be skipped if needed * Changes per comments from dag - Optionally assign function on class instantiation - URLs now have {} for substitution method - Move auth_key check to module utility - Remove is_new and get_existing - Minor changes to documentation * Enhancements for future modules and organization - Rewrote construct_path method for simplicity - Increased support for network functionality to be committed * Changes based on Dag feedback and to debug problems * Minor fixes for validitation testing * Small changes for dag and Ansibot - Changed how auth_key is processed - Removed some commented lines - Updated documentation fragment, but that may get reverted * Remove blank line and comment * Improvements for testing and code simplification - Added network integration tests - Modified error handling in request() - More testing to come on this - Rewrote construct_path again. Very simple now. * Remove trailing whitespace * Small changes based on dag's response * Removed certain sections from exit_json and fail_json as they're old	7 years ago
Matt Clay	c2d7347819	Enable nuage_vspk tests for Python 2.7.	7 years ago
Julien Vey	a6d5656dd8	ec2_instance: add a retry to run_instance to help with ec2 consistency	7 years ago
Julien PRIGENT	1905a6e8fb	ec2_vpc_route_table: Update matching_count parsing on find_subnets fu… (#38707) ... * ec2_vpc_route_table: Update matching_count parsing on find_subnets function and tests * ec2_vpc_route_table: Update matching_count parsing on find_subnets function	7 years ago
Matt Martz	aeecdbfc35	Restore previous test play, break new tests into a new play (#39688)	7 years ago
John R Barker	62b03d93bc	Use ansible-test, not nxos.yaml (#39692)	7 years ago
Sloane Hertel	923f676836	[ec2_vpc_vgw] [ec2_vpc_vpn] stabilize modules for PR 35983 (#38666) ... * Stabilize ec2_vpc_vgw and ec2_vpc_vpn so tests for ec2_vpc_vpn_facts in PR 35983 can be run in CI * Add updated placebo recordings * ensure find_vgw uses the virtual gateway id if available Add AWSRetry.jittered_backoff to attach_vpn_gateway to deal with errors when attaching a new VPC directly after detaching Add integrations tests for ec2_vpc_vgw * Sort VPN Gateways by ID	7 years ago
John R Barker	923a81e9e5	vyos_interface require multiple network nodes to run (#39670) ... * vyos_interface require multiple network nodes to run We don't have the ability to run these currently, so disable them. The original logic was also incorrect, the tests don't pass on lab, DCI nor single instance nodepool, so disable https://github.com/ansible/ansible/issues/39667 tracks getting these enabled again * eth0 -> Gi0/0 * Correctly detect if we should run lldp * Correctly detect if we should run lldp	7 years ago
saichint	f99bae1776	Fix for nxos_snmp_host issues (#39642) ... * fix snmp_host issues * source files * fix shippable * remove defaults to match arg spec	7 years ago
saichint	99748cbfa4	fix nxos_snmp_traps issues (#39444) ... * fix snmp_traps code * add IT cases * fix shippable * fix shippable without ignore	7 years ago
John R Barker	a7660f0603	Default ssh port (#39678)	7 years ago
Will Thames	29770a297a	Fail with nice error message if elb target_type=ip not supported (#38313) ... * Add helpful failure message if target_type=ip is not supported Create test case for target_type=ip not supported * Update elb_target_group module to latest standards Use AnsibleAWSModule Improve exception handling Improve connection handling	7 years ago
Will Thames	261ad0aa87	[aws] Improve integration test suite for cloudfront (#37813) ... Improve naming of one of the cloudfront tasks Change test_identifier back to resource_prefix now it's always lower case. More tests around using distribution_id and default_root_object	7 years ago
Sloane Hertel	910bc892c6	ec2_ami: Properly delete snapshots (#39606)	7 years ago
Ganesh Nalawade	afdc2364f2	Fix eos_vlan associated interface check (#39661) ... * Fix eos_vlan associated interface check Fix eos_vlan associated interface check by comparing the interface in want and have without converting the interface name to lower * Update eos_vlan docs	7 years ago
Ganesh Nalawade	b20b964c4a	Fix eos_config integration test failure (#39662) ... Enable become for eos_config check_mode test cases	7 years ago
Sam Doran	f872b70449	Remove skipping of never tag since it is done automatically (#39643)	7 years ago
Alex Stephen	b6aa132033	New module: GCP Compute Backend Services (#38611)	7 years ago
Alex Stephen	394abba1b9	New module: GCP Compute Backend Buckets (#38610)	7 years ago
Matt Clay	472c586563	Enable xml integration test. (#39629)	7 years ago
Matt Clay	f526a461ee	Remove unstable marker from rabbitmq_user test.	7 years ago
Robin Roth	90354d282d	Install git in pip tests (#39460) ... * Install git in pip tests * Ignore MacOSX	7 years ago
John R Barker	287f4ff374	Connect via ssh using ansible_port (#39603) ... Depending on how we spin up the VM we use different ssh port. Honor that in the vyos_user test	7 years ago
Trishna Guha	0a17adb3df	fix nxos_vrf_af teardown for nxapi (#39599) ... Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>	7 years ago
Matt Clay	b92ef8e54a	Use HTTPS instead of HTTP for httpbin tests. (#39457) ... The httpbin.org site is now redirecting HTTP to HTTPS.	7 years ago
Dennis Conrad	77f5a8f422	Add AWS Inspector Target Module (#37464) ... * Add AWS Inspector Target Module * "ansible-test sanity" Fixes * * Rename module * Add integration test * Incorporate feedback from s-hertel	7 years ago
Sam Doran	5a6bdef76b	Only change expiration date if it is different (#38885) ... * Only change expiration date if it is different Modify user_info() method to also return the password expiration. Compare current and desired expiration times and only change if they are different. * Improve formatting on user tests * Add integration test for expiration * Add changelog fragment * Improve integration test Skip macOS and use getent module for validating expiration date. * Fix expiration change for FreeBSD * Don't use datetime since the total_seconds method isn't available on CentOS 6 * Use better name for expiration index field Use separate tasks for verifying expiration date on BSD * Use calendar.timegm() rather than time.mktime() calendar.timegm() is the inverse of time.gmtime() and returns a timestamp in UTC not localtime Add tests that change the system timezone away from UTC * Mark tests as destructive and use test for change status * Fix account expiration for FreeBSD Use DATE_FORMAT when setting expiration date on FreeBSD. Previously the argument passed to -e was an integer of days since epoch when the account will expire which was inserted directly into master.passwd. This value is interpreted as seconds since epoch by the system, meaning the account expiration was actually set to a few hours past epoch. Greatly simply comparing desired and current expiration time by using the first three values of the struct_time tuple rather than doing a whole bunch of manipulations of the seconds since epoch.	7 years ago
Toshio Kuratomi	81b2529159	Fix when template paths contain non-ascii chars and using the path in ansible_managed ... Fixes #27262	7 years ago
Matt Martz	cca96b8c9d	Pass vars from import_playbook in early (#39521) ... * Pass vars from import_playbook in early, as they may be needed to parse the imported plays. Fixes #33693 * Add test for import_playbook vars	7 years ago
Matt Martz	240b060c02	Use the computed role name instead of 'role'. Fixes #38838 (#39516)	7 years ago
Tim Rupp	5f9b7046ed	Adds bigip management route module (#39520) ... This module can be used for managing the management routes on a bigip	7 years ago
Alex Stephen	18b463e17b	New module: GCP Container Clusters (#37324)	7 years ago
Tim Rupp	609b1827e1	Adds log publisher module for f5 (#39518) ... This module can be used to manage log publishers on a bigip	7 years ago
Tim Rupp	c0cea32f61	Adds log destination module for f5 (#39513) ... This module can be used to manage log destinations on a bigip	7 years ago
Alex Stephen	d39b1ff664	New module: GCP Storage Bucket Access Controls (#37289)	7 years ago
Tim Rupp	0cb11c61ac	Various f5 module fixes (#39510) ... Mainly fixing coding conventions. Also, added ipv6 suppor to pool members	7 years ago
Jordan Borean	0d1daf4de8	Ansible.ModuleUtils.SID - allow SID as an input to allow people to specify well know SIDs instead of the name (#39400)	7 years ago
Abhijeet Kasurde	ed141f1eab	VMware: Refactor vmware_vswitch (#36091) ... * Update documentation * Update logic * Added idempotency * Added Error handling Fixes: #36030 Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>	7 years ago
Matt Clay	7ea68a23c1	Disable failing tests.	7 years ago
Matthew Stone	d2a1c1ffe5	Adding slxos-facts module and tests. (#39121)	7 years ago
Alicia Cozine	c8a9b411bc	Last docs link fixes (#39391) ... * should not need <>, but fails without * adds anchor to keywords page, uses it on plugins pages * fixes envvar link errors * harmonize file name and ref name as python_3 * removes undefined-lable from ignore list	7 years ago
Matt Martz	7db5ce2c86	Ensure handlers have proper parent (#39426) ... * Ensure role handlers are parented correctly. Fixes #36518 * Add delegate_to test for include_role handlers	7 years ago
Sloane Hertel	85b42a6f68	Allow ec2_group integration tests to run on PRs to the ec2_group module by marking it unstable instead of disabled (#39415)	7 years ago
Sloane Hertel	68c9c18bcd	Allow ec2_ami integration tests to run on PRs to the ec2_ami module by marking it unstable instead of disabled (#39416)	7 years ago
David Passante	200a0bce67	cloudstack: new module cs_role_permission (#37065)	7 years ago