1142 Commits (882f249f1d0b73221a9a077d7938ab348b0f9633)

Author	SHA1	Message	Date
Matt Clay	3f83e7e473	Initial stable-2.6 branch commit.	7 years ago
Alicia Cozine	43ca9d1548	adds table of connections by platform (#40688)	7 years ago
Sam Doran	8746d9ef87	Add guidelines on developing lookup plugins (#38681)	7 years ago
Antoine Pietri	313a46744d	Add a 'machinectl shell' become_method (#39826) ... * Add a 'machinectl shell' become_method * docs: add explanations for the machinectl become_method * docs: machinectl become_method: specify this part is specific to Linux+systemd setups	7 years ago
Harri Hämäläinen	8dcb6c288c	Document capability of giving regex search flags (#39893)	7 years ago
Andrew Gaffney	24e55615a0	Docs for module_defaults feature (#39932)	7 years ago
Pilou	3f5f5faec6	doc: config intro, add link to searched locations (#39614)	7 years ago
Felix Fontein	2a29b2ff7f	Make alias autodetection for symlinked modules independent of glob() order. (#40293)	7 years ago
Greg DeKoenigsberg	e5ccdaec88	Better Galaxy description for role reuse (#40557) ... * Better Galaxy description for role reuse * update per gundalow review	7 years ago
Martin Kimmerle	294c3a0a7c	[docs][minor] Variables user guide: fix grammar (#39427)	7 years ago
Brian Coca	bc93038943	added information on keyword/vars separation (#39561) ... * added information on keyword/vars separation fixes #39551 * updated as per fb	7 years ago
Eitan Adler	7847b1492c	Use $(MAKE) instead of raw "make" (#39588) ... This Makefile uses non-standard constructs. As such it can only be parsed by GNU make, which is often installed as 'gmake' instead of 'make'. Using $(MAKE) ensures the same version of make gets called that is used to execute the top level.	7 years ago
Adam "Bucky" Townsend	94049680c3	Add OpenBSD password encryption (#40647) ... OpenBSD comes with its own encryption utility as well, which must be run on the password text `encrypt <password>`. following the code block above, i just included the base command in the code block. I wasn't quite sure where to add my change, so I put it at the bottom of the section since the rest all flows well together. +label: docsite_pr	7 years ago
Yunge Zhu	21ea92feca	Fixes #36621, support adfs auth through adal (#37909) ... * update username/password auth to use adal lib * remove default client_id after discussion * fix lint error: trailing whitespace	7 years ago
Adam Miller	21feca6683	Docs - add shared snippet note about password prompts for ssh keys (#40633) ... * Docs - add shared snippet note about password prompts for ssh keys Signed-off-by: Adam Miller <admiller@redhat.com> * add note to ssh connection plugin, fix markup, fix typo Signed-off-by: Adam Miller <admiller@redhat.com>	7 years ago
flowerysong	e2c1589201	Add cidr_merge filter (#36081)	7 years ago
Matt Martz	a5f05c6fc2	[WIP] Start of subelements filter (#39829) ... * Start of subelements filter * Add docs for subelements filter	7 years ago
Jordan Borean	070a5557d1	always_run: removed deprecated always_run task option (#40470)	7 years ago
Matt Clay	4b2bba62b3	Update 2.6 roadmap schedule.	7 years ago
Alicia Cozine	69eef14e3b	uses .txt for shared content (#40416)	7 years ago
Matt Clay	8d39515914	Remove tab check from validate-modules. ... It is redundant with the pycodestyle W191 "indentation contains tabs" check.	7 years ago
Matt Clay	47173cc8b1	Clarify wording on 2.6 roadmap schedule. (#40408) ... * Clarify wording on 2.6 roadmap schedule. * Remove redundant use of "Core".	7 years ago
Brian Coca	5cf1a5edfd	corrected version added	7 years ago
Simon	fb6ae90f60	Memset: initial module, integration tests, module_utils and supporting documentation. (#40071) ... * * Memset: * module_utils and associated documentation. * module to manage DNS zones. * integration tests to run against Memset's API. * * memset.py: * remove import of requests from memset.py in favour of internal Ansible modules. * import necessary Ansible modules for request and response handling. * create a response object in order to retain a stable interface to memset_api_call from existing modules. * rework memset_api_call to remove requests. * memset_zone.py: * improve short description to be more verbose. * ensure all imports directly follow documentation. * remove any reference to requests. * correct keyerror carried over from elsewhere. * remove dependency on requests from documentation string * disable integration tests until we have a cleanup method available	7 years ago
Nathaniel Case	e9d7fa0418	HTTP(S) API connection plugin (#39224) ... * HTTPAPI connection * Punt run_commands to cliconf or httpapi * Fake enable_mode on eapi * Pull changes to nxos * Move load_config to edit_config for future-preparedness * Don't fail on lldp disabled * Re-enable check_rc on nxos' run_commands * Reorganize nxos httpapi plugin for compatibility * draft docs for connection: httpapi * restores docs for connection:local for eapi * Add _remote_is_local to httpapi	7 years ago
Sam Doran	59e541e31a	Change behavior to behaviour in docs and tests (#39392) ... * Change behavior to behaviour - use existing fact to get hash setting rather than shell task - fix code highlighting syntax in playbooks_variables.rst * Re-wrote intro section; this entire topic needs a clean-up/rewrite.	7 years ago
Alexandre Chaussier	e493891d08	Fix flatten filter documentation	7 years ago
Ganesh Nalawade	1328cc1fa0	Update ROADMAP_2_6.rst	7 years ago
Ganesh Nalawade	c86860c911	Update ROADMAP_2_6.rst	7 years ago
Deepak Agrawal	4fd770f792	Update ROADMAP_2_6.rst	7 years ago
Toshio Kuratomi	6227c2ac75	More file refactoring (#40114) ... * Set src in the state functions rather than the toplevel A good API should only require passing one version of a piece of data around so do that for src * Move the rewriting of path into additional_parameter_handling When the path is a directory we can rewrite the path to be a file inside of the directory * Emit a warning when src is used with a state where it should be ignored	7 years ago
Ken Celenza	ad1a7d90ff	Update structure to include file extensions (#36967) ... * Update structure to include file extensions It is not clear to novice users that the host/group_vars files should be yaml files. This highlights that IMHO a bit more clearer. * pluralize	7 years ago
Trishna Guha	465114958e	remove network_config,network_command from roadmap_2.6 (#40246) ... Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>	7 years ago
Alicia Cozine	64f87867dd	documents usage of enable mode on NXOS (#39859)	7 years ago
Felix Fontein	f16933492d	Fix problems in documentation generation (#40050) ... * Treat C(...) as inline literal (as opposed to interpreted text). * Making test for true and false more precise, to avoid matching 1, 1.0, etc. * The 'is sameas' test already takes care of definedness.	7 years ago
Trishna Guha	6e639b591f	networking roadmap cli modules (#40147) ... Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>	7 years ago
Jordan Borean	e0813d7d47	become win: better error messages and docs update (#39936) ... * become win: better error messages and docs update * Fix syntax error and added changelog fragment	7 years ago
Jon Dufresne	1d640182c6	Update all pypi.python.org URLs to pypi.org (#38988) ... For details on the new PyPI, see the blog post: https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html	7 years ago
Brian Coca	32c2aae258	document lookup errors optoin (#39645) ... * document lookup errors optoin * changed to doc * updated as per feedback	7 years ago
Steve McLellan	5fd9954ccc	Remove duplicate include in user_guide ... Looks like two commits merged close to each other and an '-include' got left along with its replacement '-include_tasks'	7 years ago
Chris Alfonso	02adb6520f	Removing stretch items for 2.6 roadmap (#39757) ... * netconf modules * gRPC connection plugin	7 years ago
Ewoud Kohl van Wijngaarden	e4efc191c5	Fix code snippet in playbook filters doc (#39798)	7 years ago
Ken Celenza	e476089bb9	spacing issue (#39884)	7 years ago
Cameron	854be6ef16	docs: fix 'ipmi' typo (#39823)	7 years ago
David Moreau Simard	8c27ffdf90	Add ARA Records Ansible to community tools (#39836) ... ARA is an Ansible callback that records playbook run data in a local or remote database. This data is exposed through a CLI client as well as a reporting web application.	7 years ago
Matt Martz	1663b64e18	Allow subspec defaults to be processed when the parent argument is not supplied (#38967) ... * Allow subspec defaults to be processed when the parent argument is not supplied * Allow this to be configurable via apply_defaults on the parent * Document attributes of arguments in argument_spec * Switch manageiq_connection to use apply_defaults * add choices to api_version in argument_spec	7 years ago
Elias	7f5820274f	Update call method for parse_cli_textfsm (#38437) ... +label: docsite_pr	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
Julien Palard	ab4cbfd5d3	FIX: Removing superfluous bloc wrongly introduced in 2b7799f817. (#39723)	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