da5cf72236
ACI: Fixes to domain parameters dependencies ( #36158 )
...
We identified an incompleteness to parameter dependencies that affects
querying all domain-related objects.
This PR also includes:
- Improvements to integration tests
- Add missing vm_provider types
- Fix examples
This relates to #36131
2018-02-14 13:51:38 +01:00
7897558b95
aci_aep_to_domain: Fix query all objects ( #36131 )
...
This PR includes:
- A fix to the module where domain_type without domain caused havoc
- A fix to the integration tests when querying all binding objects
- Improvements to integration tests
2018-02-13 19:07:23 +01:00
9f028e9dea
aci_domain_to_vlan_pool: Add missing integration tests ( #36079 )
2018-02-12 23:54:30 +01:00
30adc2f124
aci_domain: Add missing integration tests ( #36051 )
2018-02-12 21:37:25 +01:00
01ba3a4efc
ACI: Fixes to recent change to parameter choices ( #35968 )
...
This PR includes:
- Fixes related to the recent merge of #31637 and #34537
- A generic fix for a reference for assignment issue
- Fixes to aci.boolean() in order to catch exception
2018-02-09 21:21:56 +01:00
764e78d302
Fix issue with module ( #35960 )
2018-02-09 16:10:25 +01:00
c7d9a1594d
ACI_EPG_TO_DOMAIN: Add note about Openstack VMMs ( #34845 )
2018-02-07 21:38:48 +01:00
76a6c59e35
Pathatt encap ( #35803 )
...
* ACI_STATIC_BINDING: Rename 'encap' parameters
* Capitilize 'c' in docstring
* replicate name change in 'required_if'
2018-02-07 21:37:27 +01:00
0c5650ee1b
Pathatt connection ( #35806 )
...
* add interfacce_type to absent required if...not sure how this would work without it
* move fex requirement to required_if
* Fix incorrect documentation about port_channels
2018-02-07 09:08:53 +01:00
417d11eeb9
ACI_STATIC_BINDING: Update paths paramater ( #35807 )
...
* ACI_STATIC_BINDING: Update paths paramater
* Fix small issue
2018-02-07 00:40:17 +01:00
49eb0c49ea
Pathatt mode ( #35804 )
...
* ACI_STATIC_BINDING: Update parameter to use more standard network lingo
* Add 'mode' as an alias
2018-02-06 23:20:06 +01:00
dea860aff6
added aci_switch_policy_vpc_protection_group module ( #35769 )
...
* added aci_switch_policy_vpc_protection_group module
* Small change wrt. new interface
2018-02-06 12:37:46 +01:00
767f32c2b2
added aci_static_binding_to_epg module ( #35581 )
...
* added aci_static_binding_to_epg module
* fixing pep8 issues
* fixed documentation yaml ':' error
* fix aliases error
* small documentation fixes suggested in PR
2018-02-03 00:49:29 +01:00
e5687a1592
added aci_fabric_node module ( #35586 )
2018-02-03 00:49:12 +01:00
bee765fa6b
ACI: Change RETURN output as discussed ( #35617 )
...
* ACI: Change result output as discussed
* Update all modules to use new aci.exit_json()
* Update output_level spec and docs
* Fix integration tests
* Small PEP8 fix
* Asorted fixes to tests and aci_rest
* More test fixes and support for ANSIBLE_DEBUG
* Fix another PEP8 issues
* Move response handling inside ACI module
* Reform of ACI error handling and error output
* Diff multiline json output
* Fix a few more tests
* Revert aci_bd tests
* Small correction
* UI change: existing->current, original->previous
* UI change: config->sent
* Update all modules with RETURN values
* Fix a few more tests
* Improve docstring and add 'raw' return value
* Fix thinko
* Fix sanity/pep8 issues
* Rewrite unit tests to comply with new design
2018-02-03 00:41:56 +01:00
36bd24f121
aci_epg: Add support for Preferred Group Membership ( #35265 )
...
* aci_epg: Add support for Preferred Group Membership
* ACI defaults to 'no'
* Add 'version_added'
* Make use of aci.boolean()
2018-02-02 19:23:19 +01:00
3dfede5642
ACI: Implement aci.boolean() to return an ACI boolean ( #35610 )
...
* ACI: Implement aci.boolean() to return an ACI boolean
A boolean value in ACI is not always standardized to yes/no.
Sometimes we have active/inactive, or enabled/disabled
Whereas the interface we want is a true YAML boolean.
We did not modify enabled/disabled values at this time.
I first want to determine if this implementation is acceptable.
* Support enabled/disabled as well, with deprecation messages
* Fix typo
* Fix PEP8 issue
* Ensure the aci object exists before using it
* Add comment to ensure this gets fixed in v2.9
* Fix typo
2018-02-02 18:54:48 +01:00
12b8b8dcf2
aci_aaa_user: Manage AAA users on ACI fabrics ( #35543 )
...
* aci_aaa_user: Manage AAA users on ACI fabrics
* Fix module documentation
* Ensure we allow to not set accountStatus and expires
* Added aaa_password_lifetime and aaa_password_update_required support
* Improvements to integration tests in light of issue 35544
* Fix ACI ISO 8601 formatted string
* Add HAS_DATEUTIL
2018-02-01 00:45:32 +01:00
ee2a8ff324
Fix small typo in documentation
2018-01-28 03:43:43 +01:00
64df1a7566
aci_aaa_user_certificate: Rename user parameter to aaa_user ( #35207 )
2018-01-23 02:23:06 +01:00
d6004852a2
ACI: Move to 'host' parameter instead of 'hostname' ( #35161 )
...
* ACI: Move to 'host' parameter instead of 'hostname'
* Update host parameter in documentation fragment too
2018-01-22 22:06:56 +01:00
46e53f90a7
ACI: Rename aci_intf_policy_* to aci_interface_policy_* ( #35170 )
...
* ACI: Rename aci_intf_policy_* to aci_interface_policy_*
* Modify documentation accordingly
* Fix validity ignore file
2018-01-22 12:40:15 +01:00
fa5adabcbf
aci_rest: Additional notes and simplify examples ( #35091 )
...
Add additional notes, improve examples
2018-01-21 10:59:08 +01:00
4b8e76747e
aci_config_snapshot: Fix bug with filter_target ( #35141 )
2018-01-20 22:49:59 +01:00
064aad817d
ACI: Add ACI version information to VMM domain docs ( #35114 )
2018-01-20 01:15:59 +01:00
04f1b140d9
added aci_interface_policy_leaf_policy_group module ( #34968 )
...
* added aci_interface_policy_leaf_policy_group module
* fixing documentation errors
* fixed argument_spec function and fixing documentation errors
* added documentation extends..
* removed unnecessary aliases, improved notes, improved examples to show optional description
* fixing sanity checks
* fixed proposed changes by dag
* Fix one more leftover
2018-01-19 21:31:25 +01:00
585862e4d0
ACI: Added more VMM providers, doc improvements ( #34879 )
...
* Added more VMM providers, doc improvements
This fixes #34211 and others
* Add all VMM providers to other domain-related modules
2018-01-19 18:04:30 +01:00
2fd5a99989
ACI: Fix validate-module tests E322 and E323 ( #35052 )
2018-01-18 19:18:43 +01:00
a352d43824
Compare arg+aliases between docs and argument_spec ( #34809 )
...
* compare arg+aliases between docs and argument_spec
* Add some special handling for the network modules provider options that also appear in the top level arg spec
* Fix error code for bigip_hostname
* Address merge conflicts due to changes in f5 modules
* Update validate-modules ignore based off a clean execution
* Address merge conflicts
* Address renamed module
* Address recent changes to modules
* Add ignore for ucs_ip_pool
* Update aci modules to get more reliable documentation comparison, but not mutating the module_utils aci_argument_spec
* Update ignore.txt after recent aci updates
* Add extra guard to ensure we handle provider special only for network modules
* Address additional changes to modules
2018-01-17 10:11:30 -06:00
227ff61f9d
Add module support to yamllint sanity test. ( #34964 )
...
* Add module support to yamllint sanity test.
* Fix duplicate keys in module RETURN docs.
* Fix syntax in return_common docs fragment.
* Fix duplicate keys in module EXAMPLES docs.
2018-01-16 15:08:56 -08:00
ac4b031cc0
ACI: Fix parameters and aliases in documentation ( #34959 )
2018-01-16 23:03:29 +01:00
6351eff74e
ACI: Add missing documentation_fragments ( #34955 )
2018-01-16 22:51:02 +01:00
32997a5160
ACI_BD: Add option to set mac-address ( #34843 )
...
* Add option to set mac-address
* Fix missing version_added
* Fix booleans
2018-01-15 17:16:54 +01:00
179012caf3
ACI_DOMAIN: Additional params per MIM ( #34839 )
2018-01-15 16:24:56 +01:00
349024235c
ACI: Update docs ( #34876 )
2018-01-15 15:36:55 +01:00
05c960cf92
MIM URL: Update url for mim ( #34844 )
2018-01-13 23:53:11 -05:00
002fad53a1
ACI_SWITCH_LEAF_SELECTOR: Add description options ( #34841 )
2018-01-13 23:43:52 -05:00
aa9fc9313f
Aci access port to interface policy leaf profile ( #34842 )
...
* ACI_ACC_PORT_TO_INTF_POL_LEAF_PROF: Change from/to to standard used elsewhere
* ACI_ACC_PORT_TO_INTF_POL_LEAF_PROF: Add description options
* ACI_ACC_PORT_TO_INTF_POL_LEAF_PROF: Add missing trailing commas
2018-01-13 23:43:44 -05:00
3c7e639dde
ACI_AEP: Allow toggling of infrastructure vlan ( #34840 )
...
* ACI_AEP: Allow toggling of infrastructure vlan
* ACI_DOMAIN: fix accidental 'r' removal
2018-01-13 22:20:31 -05:00
7957ba7aad
Fix small typo
2018-01-12 15:06:05 +01:00
545650c3b1
aci_switch_leaf_selector module ( #34041 )
...
* added aci_switch_leaf_policy_profile module WIP
* fixed pep8 errors for PR
* fixed unwanted modifications and fixed pep8 errors
* fixed suggested errors for PR
* adding WIP aci_switch_leaf_selector module
* fixed for pull request
* fixing pep8 errors, bad indents
* improved initial description
* fixed pep8 doc errors
* updated module to include infra:NodeBlk and infra:RsAccNodePGrp instead of having seperate modules for the latter
* fixing pep8
* adding 'name' alias to leaf_selector
* updating example
* updating aliases, forgot 'name' again
* added examples
* Fix pylint errors
* Fix trailing whitespace issue
* Fix one more pylint issue
2018-01-12 12:23:29 +01:00
61d50a12e5
aci_access_port_to_interface_policy_leaf_profile module ( #34398 )
...
* added aci_switch_leaf_policy_profile module WIP
* fixed pep8 errors for PR
* fixed unwanted modifications and fixed pep8 errors
* fixed suggested errors for PR
* adding WIP aci_switch_leaf_selector module
* fixed for pull request
* fixing pep8 errors, bad indents
* improved initial description
* fixed pep8 doc errors
* updated module to include infra:NodeBlk and infra:RsAccNodePGrp instead of having seperate modules for the latter
* fixing pep8
* adding 'name' alias to leaf_selector
* updating example
* updating aliases, forgot 'name' again
* adding aci_interface_policy_leaf_profile module
* removing unwanted module.. man I always make this mistake
* add aci_access_port_to_interface_policy_leaf_profile module
* added example and integration tests
* Fix pylint errors
2018-01-12 12:20:52 +01:00
d23d290be8
aci_aep: Add infrastructure_vlan support (infra:ProvAcc) ( #33996 )
...
This is a needed enhancement.
2018-01-12 12:20:20 +01:00
393c5bea67
aci_switch_leaf_policy_profile module ( #33955 )
...
* added aci_switch_leaf_policy_profile module WIP
* fixed pep8 errors for PR
* fixed unwanted modifications and fixed pep8 errors
* fixed suggested errors for PR
* fixing PR errors
* removing unwanted module from this branch for PR
* removing unwanted module again, rookie git mistakes
* correcting wrong module name
* added examples
* Fix pylint errors
* Fix trailing whitespace
2018-01-12 12:15:13 +01:00
837a05fca4
aci_interface_selector_to_switch_policy_leaf_profile module ( #34098 )
...
* added aci_switch_leaf_policy_profile module WIP
* fixed pep8 errors for PR
* fixed unwanted modifications and fixed pep8 errors
* fixed suggested errors for PR
* adding WIP aci_switch_leaf_selector module
* fixed for pull request
* added new module aci_switch_leaf_selector_node_block for PR
* fixed pep8 issues
* fixed from and to parameter setup in arg spec
* fixed pep8 doc errors
* fixed pep8 indentation error
* adding new aci_interface_selector_to_switch_policy_leaf_profile module for PR
* removed unwanted module
* added examples
* Fix pylint errors
* Remove whitespace introduced by Github editor
2018-01-12 12:14:14 +01:00
007c19095d
aci_interface_policy_leaf_profile module ( #34364 )
...
* added aci_switch_leaf_policy_profile module WIP
* fixed pep8 errors for PR
* fixed unwanted modifications and fixed pep8 errors
* fixed suggested errors for PR
* adding WIP aci_switch_leaf_selector module
* fixed for pull request
* fixing pep8 errors, bad indents
* improved initial description
* fixed pep8 doc errors
* updated module to include infra:NodeBlk and infra:RsAccNodePGrp instead of having seperate modules for the latter
* fixing pep8
* adding 'name' alias to leaf_selector
* updating example
* updating aliases, forgot 'name' again
* adding aci_interface_policy_leaf_profile module
* removing unwanted module.. man I always make this mistake
* added examples
* Fix pylint errors
2018-01-12 11:57:44 +01:00
d7d13b48e5
aci_aep_to_domain: New module to bind AEP to domain ( #33942 )
...
* aci_aep_to_domain: New module to bind AEP to domain
* Changes to bring in line with aci_domain
* Rename aep_domain to domain_dn, add types
* Fix pylint errors
2018-01-12 11:50:41 +01:00
628eca85c3
ACI: Fixing new pylint issue ( #34775 )
2018-01-12 08:07:59 +01:00
83b7ec69fc
Fix pylint issue ( #34773 )
2018-01-12 02:26:14 +01:00
03dd3214b4
Fix new pylint issue ( #34772 )
...
Is it all worth it ?
2018-01-12 02:25:03 +01:00
c3909460d4
aci_domain_to_vlan_pool: Add domain to VLAN pool ( #34402 )
...
* aci_domain_to_vlan_pool: Add domain to VLAN pool
A new ACI module to bind a domain to a VLAN pool.
This module still needs integration tests once it is formally review and
accepted.
* Add examples to documentation
2018-01-11 23:32:12 +01:00
f3193f272c
aci_domain_to_encap_pool: Add domain to encap pool ( #34123 )
...
* aci_domain_to_encap_pool: Add domain to encap pool
A new ACI module to bind a domain to an encap pool.
This module still needs integration tests once it is formally review and
accepted.
* Fix domain RN and attributes
2018-01-11 23:31:48 +01:00
3127be0e3d
aci_domain: Manage phys, vmm, l2ext, l3ext and FC domain profiles ( #34011 )
...
* aci_domain: Manage phys, vmm, l2ext, l3ext and FC domain profiles
A new ACI module from the high priority list.
* Add RHEV VMM provider as Redhat
* PEP compliancy
* Make variables specific to domain
* Add examples
2018-01-11 23:31:23 +01:00
0d84e27d0c
aci_firmware_source: Manage firmware image sources on ACI ( #34670 )
2018-01-11 23:30:58 +01:00
e0214ece57
aci_vlan_pool_encap_block: New module to manage VLAN encap blocks ( #34653 )
...
* aci_vlan_pool_encap_block: New module to manage VLAN encap blocks
This module is a simplified version of the aci_encap_pool_range module.
* PEP8 fixes (closer to the original)
* Add integration tests
2018-01-11 23:22:43 +01:00
fbffcb36bf
aci_vlan_pool: Module to manage VLAN pools ( #34650 )
...
* aci_vlan_pool: Module to manage VLAN pools
This is a simplified version of the aci_encap_pool module.
* Add integration tests, based on aci_encap_pool
2018-01-11 22:17:10 +01:00
2df6735dcf
aci_aaa_user_certificate: Add a certificate to an AAA user ( #34602 )
...
* aci_user_certificate: Add a certificate to a user
A new ACI module to add a X.509 certificate to a user.
* Add integration tests
2018-01-10 16:53:31 +01:00
f67f8c7bc9
Fix examples with correct names
2018-01-09 18:26:05 +01:00
49739dda47
ACI: Add signature-based authentication ( #34451 )
...
ACI: Add signature-based authentication
2018-01-08 00:44:30 +01:00
3b941802ac
ACI ENCAP POOL RANGES: Add new module to support encap ranges ( #33758 )
...
* ACI ENCAP POOL RANGES: Add new module to support encap ranges
* fix module name
* remove extra format string
2017-12-14 00:35:50 +01:00
9ff5c15f57
ACI Encap pool: New module for support layer2 encap pools ( #33219 )
...
* ACI Encap Pool: Add new module to support VLAN, VXLAN, and VSAN Pools
* update logic for allocation_mode
* update docstring and tests
* Update filter_target since url method has been updated
2017-12-12 07:51:19 +00:00
c26a528b21
ACI Module: Update modules to provide match criteria; allows more complex matching ( #33756 )
2017-12-11 18:43:11 +00:00
11c9ad23d5
Refactor common network shared and platform utils code into package ( #33452 )
...
* Refactor common network shared and platform specific code into package (part-1)
As per proposal #76 refactor common network shared and platform specific
code into sub-package.
https://github.com/ansible/proposals/issues/76
* ansible.module_utils.network.common - command shared functions
* ansible.module_utils.network.{{ platform }} - where platform is platform specific shared functions
* Fix review comments
* Fix review comments
2017-12-03 21:42:30 +05:30
429af90027
Aci build url ( #33017 )
...
* ACI Buid URL: Refactor how ACI modules dynamically build proper URL.
* Remove MIM URl from update
* fix missing comma
2017-11-22 15:07:39 +00:00
99d4f5bab4
Remove uses of assert in production code ( #32079 )
...
* Remove uses of assert in production code
* Fix assertion
* Add code smell test for assertions, currently limited to lib/ansible
* Fix assertion
* Add docs for no-assert
* Remove new assert from enos
* Fix assert in module_utils.connection
2017-11-13 11:51:18 -05:00
8c3bf20a13
Use safe_load to load yaml
...
Replad `yaml.load` with `yaml.safe_load`
2017-09-14 11:19:00 -07:00
2489eeece0
ACI EPG TO DOMAIN: Add vm_provider docstring and add support for micr… ( #29114 )
...
* ACI EPG TO DOMAIN: Add vm_provider docstring and add support for microsoft and openstack
* Fix typo
* Fix whitespace
2017-09-12 22:53:17 +01:00
d69c803353
Fixed typo in resolution_immediacy values dict
2017-09-05 09:10:45 -07:00
a200ecf966
aci_rest: Accept YAML input and validate content input
...
This PR includes:
- Accept inline YAML, YAML string, inline JSON, JSON string input and
XML string input
- Validate YAML, JSON and XML input
2017-09-05 00:59:15 -07:00
a796391c9b
aci_rest: Implement idempotency
...
This PR includes:
- A new function to modify query strings in URLs
- Add rsp-subtree=modified to post/delete requests
- Test the ACI response for changes and report back
- Return the used URL back to the user
- Remove check-mode support (as it was non-functional anyway)
- Fix a bug related to method=delete and not having content set
This fixes datacenter/aci-ansible#111
2017-09-05 00:17:35 -07:00
6e79dfb5f3
ACI_BD_*: Fix missing default for state parameter
2017-09-01 21:59:34 +02:00
8ffb842963
ACI Config Rollback: Add new module to support config rollbacks in ACI ( #28811 )
...
* ACI Config Rollback: Add new module to support config rollbacks in ACI
* Fix EXAMPLES
* Fix whitespace
2017-08-30 07:26:17 +02:00
42db02c249
aci_config_snapshot: Module to manage ACI config snapshots ( #28784 )
...
* ACI Config Snapshot: Add module to support managing config snapshots on the APIC.
* add comma back
* Fix docstring errors
* Fix typo
* add quotes for notes section
2017-08-30 06:31:14 +02:00
e3b66a8016
ACI Rest: Fix issue with XML response ( #28785 )
2017-08-29 20:41:17 +02:00
a03a1cde88
ACI Tenant SPAN Src Grp to Dst Grp: Add new module to support managin… ( #28645 )
...
* ACI Tenant SPAN Src Grp to Dst Grp: Add new module to support managing Tenant SPAN Source Group and Dest Group Bindings
* Fix docstring errors
* Fix Metadata version
* Fix Shippable issues
2017-08-25 11:33:41 +02:00
6401478883
ACI Tenant SPAN Src Grp: Add new module to support managing Tenant SP… ( #28644 )
...
* ACI Tenant SPAN Src Grp: Add new module to support managing Tenant SPAN Source Groups
* Fix docstring errors
* Fix Metadata version
* Fix Shippable issue
2017-08-25 11:32:41 +02:00
05a17164e3
ACI EPG: Update module to use new URL Method ( #28647 )
2017-08-25 08:37:56 +02:00
eaea574e3b
ACI Tenant EP Retention Policy: Add new module to support managing En… ( #28642 )
...
* ACI Tenant EP Retention Policy: Add new module to support managing End Point Retention Policies
* Fix docstring errors
* Fix Metadata version
2017-08-25 08:37:28 +02:00
bac617acef
ACI Taboo Contract: Update module to use new URL Method ( #28639 )
2017-08-25 08:37:12 +02:00
8b641688e9
ACI Tenant Action Rule Profile: Update module to use new URL Method ( #28641 )
2017-08-25 08:36:51 +02:00
a12ff4468d
ACI SPAN Dest Group: Update module to use new URL Method ( #28643 )
2017-08-25 08:36:34 +02:00
8a966a48c8
ACI VRF: Update module to use new URL Method ( #28646 )
2017-08-25 08:35:45 +02:00
f7a466cbb4
ACI Intf Policy Port Security: Update module to use new URL Method ( #28638 )
2017-08-25 08:35:26 +02:00
f9036133bb
ACI Tenant: Update module to use new URL Method ( #28640 )
2017-08-25 08:35:00 +02:00
9c564de765
ACI L3Out Route Tag: Update module to use new URL Method ( #28637 )
2017-08-25 08:34:35 +02:00
a6614a132d
ACI Intf Policy Port Channel: Update module to use new URL Method; add support for ctrl ( #28636 )
2017-08-25 08:33:57 +02:00
1bec0e5753
ACI BD: Update module to use new URL Method ( #28625 )
...
* ACI BD: Update module to use new URL Method
* fix docstring errors
2017-08-25 08:33:27 +02:00
2e61760659
ACI Contract Subject: Add new module to support managing Contract Sub… ( #28620 )
...
* ACI Contract Subject: Add new module to support managing Contract Subjects in ACI
* Fix Metadata
* Fix Metadata version
2017-08-25 08:33:00 +02:00
e434c291ca
ACI Intf Policy MCP: Update module to use new URL Method ( #28635 )
2017-08-25 04:21:08 +02:00
fa6da960db
ACI Intf Policy LLDP: Update module to use new URL Method ( #28634 )
2017-08-25 03:57:03 +02:00
6109a6c093
ACI Filter: Update module to use new URL Method ( #28630 )
2017-08-25 03:56:18 +02:00
f5f2a2fac2
ACI Intf Policy L2: Update module to use new URL Method ( #28633 )
2017-08-25 03:55:45 +02:00
25d1ef3493
ACI Intf Policy FC: Update module to use new URL Method ( #28632 )
2017-08-25 03:55:27 +02:00
85ca2234fd
ACI Filter Entry: Update module to use new URL Method ( #28631 )
2017-08-25 03:51:21 +02:00
0577bf688c
ACI EPG to Contract: Update module to use new URL Method ( #28628 )
2017-08-25 03:45:32 +02:00
a4087841a8
ACI EPG to Domain: Update module to use new URL Method ( #28629 )
2017-08-25 03:45:12 +02:00
d186c9eda2
ACI EPG Mon Policy: Update module to use new URL Method ( #28627 )
2017-08-25 03:43:10 +02:00
9582e7e549
Ap ( #28626 )
...
* ACI Ap: Update module to use new URL Method
* ACI Ap: Update module to use new URL Method
2017-08-25 03:21:10 +02:00
0b1ea2be9b
ACI BD Subnet: Update module to use new URL Method ( #28624 )
2017-08-25 03:17:01 +02:00
dc232737ba
ACI BD to L3Out: Update module to use new URL Method ( #28623 )
2017-08-25 03:16:17 +02:00
Dag Wieers
Jacob McGill
Bruno
Matt Martz
Matt Clay
Ganesh Nalawade
Ganesh B. Nalawade
marinus81