From 498bf4b5be2c6f0f3c15a10e19dc4bcbd4d8989f Mon Sep 17 00:00:00 2001
From: Trishna Guha <trishnaguha17@gmail.com>
Date: Wed, 26 Jul 2017 20:36:56 +0530
Subject: [PATCH] change collection to aggregate (#27325)

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
---
 lib/ansible/modules/network/ios/ios_logging.py     |  4 ++--
 lib/ansible/modules/network/iosxr/iosxr_logging.py |  4 ++--
 lib/ansible/modules/network/vyos/vyos_logging.py   | 10 +++++-----
 lib/ansible/modules/network/vyos/vyos_user.py      |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/ansible/modules/network/ios/ios_logging.py b/lib/ansible/modules/network/ios/ios_logging.py
index 2c2f5dadfd..698c6c4021 100644
--- a/lib/ansible/modules/network/ios/ios_logging.py
+++ b/lib/ansible/modules/network/ios/ios_logging.py
@@ -52,11 +52,11 @@ options:
   level:
     description:
       - Set logging severity levels.
-  collection:
+  aggregate:
     description: List of logging definitions.
   purge:
     description:
-      - Purge logging not defined in the collections parameter.
+      - Purge logging not defined in the aggregates parameter.
     default: no
   state:
     description:
diff --git a/lib/ansible/modules/network/iosxr/iosxr_logging.py b/lib/ansible/modules/network/iosxr/iosxr_logging.py
index 76264c4081..048dcbd0ec 100644
--- a/lib/ansible/modules/network/iosxr/iosxr_logging.py
+++ b/lib/ansible/modules/network/iosxr/iosxr_logging.py
@@ -55,11 +55,11 @@ options:
     description:
       - Set logging severity levels.
     default: debugging
-  collection:
+  aggregate:
     description: List of logging definitions.
   purge:
     description:
-      - Purge logging not defined in the collections parameter.
+      - Purge logging not defined in the aggregates parameter.
     default: no
   state:
     description:
diff --git a/lib/ansible/modules/network/vyos/vyos_logging.py b/lib/ansible/modules/network/vyos/vyos_logging.py
index 153a68135d..d1d6241bcd 100644
--- a/lib/ansible/modules/network/vyos/vyos_logging.py
+++ b/lib/ansible/modules/network/vyos/vyos_logging.py
@@ -48,11 +48,11 @@ options:
   level:
     description:
       - Set logging severity levels.
-  collection:
+  aggregate:
     description: List of logging definitions.
   purge:
     description:
-      - Purge logging not defined in the collections parameter.
+      - Purge logging not defined in the aggregate parameter.
     default: no
   state:
     description:
@@ -163,8 +163,8 @@ def config_to_dict(module):
 def map_params_to_obj(module):
     obj = []
 
-    if 'collection' in module.params and module.params['collection']:
-        for c in module.params['collection']:
+    if 'aggregate' in module.params and module.params['aggregate']:
+        for c in module.params['aggregate']:
             d = c.copy()
             if d['dest'] not in ('host', 'file', 'user'):
                 d['name'] = None
@@ -200,7 +200,7 @@ def main():
         facility=dict(type='str'),
         level=dict(type='str'),
         state=dict(default='present', choices=['present', 'absent']),
-        collection=dict(type='list'),
+        aggregate=dict(type='list'),
         purge=dict(default=False, type='bool')
     )
 
diff --git a/lib/ansible/modules/network/vyos/vyos_user.py b/lib/ansible/modules/network/vyos/vyos_user.py
index 9586a867a1..333d6bba36 100644
--- a/lib/ansible/modules/network/vyos/vyos_user.py
+++ b/lib/ansible/modules/network/vyos/vyos_user.py
@@ -41,7 +41,7 @@ options:
       - The set of username objects to be configured on the remote
         VyOS device. The list entries can either be the username or
         a hash of username and properties. This argument is mutually
-        exclusive with the C(name) argument.
+        exclusive with the C(name) argument. alias C(aggregate).
   name:
     description:
       - The username to be configured on the VyOS device.