2564 Commits (d25420bbb95202959d7283105139fb772f6911a6)

Author	SHA1	Message	Date
Abhijeet Kasurde	57f6abdb84	VMware: new module: vmware_host_powerstate (#36577) ... Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>	7 years ago
René Moser	4a1632444b	tests, patch: init integration tests (#40045) ... * patch: init integration tests * skip install for macos	7 years ago
Brian Coca	95655fae5c	Configurable list of facts modules (#31783) ... * configurable list of facts modules - allow for args dict for specific modules - add way to pass parameters - avoid facts poluting test - move to 'facts gathered' flag - add 'gathering' setting tests	7 years ago
Alex Stephen	7c510a2549	New Module: GCP Compute Instance Templates (#38907)	7 years ago
saichint	2557c0662a	IT cases for nxos_logging (#39929) ... * IT cases for nxos_logging * review comment	7 years ago
Matt Clay	2de6734ce4	Mark the azure_rm_storageblob test unstable.	7 years ago
Matt Clay	0b1840772d	Download files from S3 for yarn integration test.	7 years ago
Alex Stephen	7cfbf43f4b	New Module: GCP Compute Instances (#38906)	7 years ago
Matt Clay	dec4f10c21	Move lookups tests to group1.	7 years ago
Matt Clay	c1f9efabf4	Overhaul httptester support in ansible-test. (#39892) ... - Works with the --remote option. - Can be disabled with the --disable-httptester option. - Change image with the --httptester option. - Only load and run httptester for targets that require it.	7 years ago
Matt Clay	0e344b225a	Remove CI group from unsupported tests.	7 years ago
Matt Clay	6a1cb25c99	Remove unnecessary destructive aliases.	7 years ago
Matt Clay	8e6fd48087	Mark unsupported vmware tests.	7 years ago
Martin Krizek	bf702e6d88	dnf: handle error when latest pkg not found (#39720) ... * dnf: handle error when latest pkg not found * Add integration test	7 years ago
Matt Clay	a5b8085113	Move pyvmomi install into cloud test plugin.	7 years ago
Nathaniel Case	c6270e15a6	Remove provider (and transport, where applicable) from consideration when not using connection=local (#39555) ... * Remove provider (and transport, where applicable) from consideration * Add tests that misplaced transport does not fail task	7 years ago
Trishna Guha	f08332acb4	nxos enable mode (#39355) ... * nxos enable mode Signed-off-by: Trishna Guha <trishnaguha17@gmail.com> * fix prompt Signed-off-by: Trishna Guha <trishnaguha17@gmail.com> * Add authorize,auth_pass Signed-off-by: Trishna Guha <trishnaguha17@gmail.com> * remove byte string from exec_cli_command Signed-off-by: Trishna Guha <trishnaguha17@gmail.com> * Add on_become test Signed-off-by: Trishna Guha <trishnaguha17@gmail.com> * removed_in_version Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>	7 years ago
saichint	e3bfbe5875	fix nxos_snmp_user issues (#39760) ... * fix nxos_snmp_user issues * shipppable fix	7 years ago
Deepak Agrawal	ef577b71cc	Handling of configurations blocks with end-* at the end of the block (#39673) ... * handle end-policy issue * revert changes in iosxr cliconf * fix trailing parents not included in difference * Moving fix to platform specific fix * pep 8 issues	7 years ago
Arun Babu Neelicattu	eb430b2e57	azure: fix creation of TXT dns record sets (#38368) ... As per `azure.mgmt.dns.models.txt_record.TxtRecord`, expected value for a record is of type `[str]`. Fix TXT argspec to specify type as `list` instead of `str`. Fixes #37581 Reference: https://docs.microsoft.com/en-us/python/api/azure.mgmt.dns.models.txtrecord?view=azure-python	7 years ago
Matt Clay	1c7417cba7	Restore nuage_vspk integration tests.	7 years ago
Alex Stephen	1663539327	Adding support for GCP Compute Health Checks (#37438)	7 years ago
Abhijeet Kasurde	bc59dc471b	VMware: New module: vmware_portgroup_facts (#36740) ... Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>	7 years ago
Abhijeet Kasurde	1c8a7d06e5	VMware: new module : vmware_resource_pool_facts (#38674) ... This module adds capability to provide facts about all resource pools in given environment. Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>	7 years ago
Abhijeet Kasurde	693065da1e	VMware: new module : vmware_local_user_facts (#37167) ... Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>	7 years ago
Abhijeet Kasurde	02f1d263c7	VMware: new module: vmware_vswitch_facts (#37176) ... Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>	7 years ago
Matt Clay	a121b5073c	Temporarily disable the nuage_vspk test. ... This test interferes with the uri test on centos6.	7 years ago
Jordan Borean	fc210a4584	base64 filter: Added ability to specify encoding (#39714) ... * base64 filter: Added ability to specify encoding * Added unicode chars for further testing * Removed errors to keep previous behaviour in place * Removed surrogate pairs due to issues loading YAML in CI	7 years ago
Rob	b5cffe8ced	[aws] Create classes for Application Load Balancer (#33769) ... * Create classes for Application Load Balancer * Add unsupported CI alias * Add AWSRetry * Add integration tests using the ALB	7 years ago
Mickaël Guérin	8ac69b0a5f	Fix gathering facts in run_once play (#39453) ... * Fix gathering facts in run_once play Fixes https://github.com/ansible/ansible/issues/39312 * Check that run_once doesn't prevent fact gathering	7 years ago
Alex Stephen	05d5d21d1c	New module: GCP Container Node Pools (#37325)	7 years ago
Alex Stephen	5b0ce0222b	Bug fixes for GCP Compute Address (#38630)	7 years ago
Alex Stephen	e177cf5831	New module: GCP Pubsub Topics (#38627)	7 years ago
Alex Stephen	e116c6cee8	New module: GCP Pubsub Subscriptions (#38626)	7 years ago
Alex Stephen	478759a686	New module: GCP Compute Subnetworks (#38621)	7 years ago
Alex Stephen	01f0e4ac6f	New module: GCP Compute Networks (#38618)	7 years ago
Alex Stephen	768a81dd4b	New module: GCP Compute Routes (#38619)	7 years ago
Matt Martz	3d5a7d6dc2	Allow using action/local_action on includes and imports (#37260) ... * Prevent using action/local_action on includes and imports. Fixes #28822 * Use ModuleArgsParser to determine action instead of disallowing action/local_action with import/include * Add to_native * switch back to block in task_ds, use ModuleArgsParse otherwise * var should be task_ds * Add test validating action+include_tasks	7 years ago
Ganesh Nalawade	4c5ac16447	Fix ios integration test failures in CI (#39729) ... Fix ios integration test failures in CI. Since the packet transfer and receive rate on the interface is not determined to remove the tx_rate and rx_rate test conditions to prevent intermittent failure.	7 years ago
Yuwei Zhou	9348809184	Fixes #37731 Create Internal Loadbalancers with azure_rm_loadbalancer, support SKU (#38077) ... * create internal loadbalancer * fix test * remove duplicate test * clean up * fix doc * lint * add sku support * update version * change to the version the same as CLI * add pip support sku * fix lint * fix test * Update main.yml * add changelog entry	7 years ago
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
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