Updated assets for ansible collection (#179)

Signed-off-by: Sagar <[email protected]>

Author: sagarpsalvi

docs/avi_backupconfiguration.rst

@@ -408,6 +408,29 @@ Parameters
                   - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
                 </div>
                                             </td>
+        </tr>
+                <tr>
+            <td colspan="2">
+                <div class="ansibleOptionAnchor" id="parameter-"></div>
+                <b>s3_bucket_folder</b>
+                <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                <div style="font-size: small">
+                    <span style="color: purple">str</span>
+                </div>
+            </td>
+            <td>
+                                                            </td>
+            <td>
+                                                <div style="font-size: small">
+                  - The folder name in s3 bucket where backup will be stored.
+                </div>
+                                <div style="font-size: small">
+                  - Field introduced in 30.1.1.
+                </div>
+                                <div style="font-size: small">
+                  - Allowed in enterprise edition with any value, enterprise with cloud services edition.
+                </div>
+                                            </td>
         </tr>
                 <tr>
             <td colspan="2">

plugins/module_utils/saml_avi_api.py

@@ -16,7 +16,6 @@
 from ssl import SSLError
 import time
 import logging
-from bs4 import BeautifulSoup
 import warnings
 
 logger = logging.getLogger(__name__)
@@ -134,6 +133,7 @@ def saml_assertion(self, username, password):
                     idp_resp.status_code, idp_resp.text))
                 raise APIError('Status Code %s msg %s' % (
                     idp_resp.status_code, idp_resp.text), resp)
+            from bs4 import BeautifulSoup
             saml_resp = BeautifulSoup(idp_resp.text, features="html.parser")
             saml_response_match = saml_resp.find('textarea').string
             if not saml_response_match:
@@ -159,6 +159,7 @@ def authenticate_session(self):
             # Assert SAML response
             controller_session, resp = self.saml_assertion(username, password)
             content = resp.text
+            from bs4 import BeautifulSoup
             saml_resp = BeautifulSoup(resp.text, features="html.parser")
             saml_response = saml_resp.find('textarea').string
             relay_state = re.search(WS1loginSAMLApiSession.response_relay_state_regex, content, re.M |

plugins/modules/avi_albservicesconfig.py

@@ -48,21 +48,21 @@
         type: str
     app_signature_config:
         description:
-            - Default values to be used for application signature sync.
+            - Default values for application signature sync.
             - Field introduced in 20.1.4.
             - Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services
             - edition.
         required: true
         type: dict
     asset_contact:
         description:
-            - Information about the default contact for this controller cluster.
+            - Default contact for this controller cluster.
             - Field introduced in 20.1.1.
             - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
         type: dict
     case_config:
         description:
-            - Default values to be used for pulse case management.
+            - Default values for case management.
             - Field introduced in 21.1.1.
             - Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services
             - edition.
@@ -77,7 +77,7 @@
         type: dict
     feature_opt_in_status:
         description:
-            - Information about the portal features opted in for controller.
+            - Features opt-in for pulse cloud services.
             - Field introduced in 20.1.1.
         required: true
         type: dict
@@ -97,6 +97,21 @@
             - salesforce,myvmware,systest), enterprise with cloud services edition.
             - Default value when not specified in API or module is interpreted by Avi Controller as MYVMWARE.
         type: str
+    name:
+        description:
+            - Name of the albservicesconfig object.
+            - Field introduced in 30.1.1.
+            - Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services
+            - edition.
+        type: str
+    operations_config:
+        description:
+            - Operations configuration.
+            - Field deprecated in 30.1.1.
+            - Field introduced in 22.1.3.
+            - Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services
+            - edition.
+        type: dict
     polling_interval:
         description:
             - Time interval in minutes.
@@ -107,7 +122,7 @@
         type: int
     portal_url:
         description:
-            - The fqdn or ip address of the customer portal.
+            - The fqdn or ip address of the pulse cloud services.
             - Field introduced in 18.2.6.
             - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
         required: true
@@ -122,32 +137,40 @@
         type: dict
     split_proxy_configuration:
         description:
-            - Split proxy configuration to connect external pulse services.
+            - Split proxy configuration to connect external pulse cloud services.
             - Field introduced in 20.1.1.
             - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
         type: dict
+    tenant_ref:
+        description:
+            - Tenant uuid associated with the object.
+            - It is a reference to an object of type tenant.
+            - Field introduced in 30.1.1.
+            - Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services
+            - edition.
+        type: str
     url:
         description:
             - Avi controller URL of the object.
         type: str
     use_split_proxy:
         description:
-            - By default, pulse uses proxy added in system configuration.
-            - If pulse needs to use a seperate proxy, set this flag to true and configure split proxy configuration.
+            - By default, pulse cloud services uses proxy added in system configuration.
+            - If it should use a separate proxy, set this flag to true and configure split proxy configuration.
             - Field introduced in 20.1.1.
             - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
             - Default value when not specified in API or module is interpreted by Avi Controller as False.
         type: bool
     use_tls:
         description:
-            - Secure the controller to pulse communication over tls.
+            - Secure the controller to pulse cloud services communication over tls.
             - Field introduced in 20.1.3.
             - Allowed in enterprise edition with any value, basic edition with any value, enterprise with cloud services edition.
             - Default value when not specified in API or module is interpreted by Avi Controller as True.
         type: bool
     user_agent_db_config:
         description:
-            - Default values to be used for user agent db service.
+            - Default values for user agent db service.
             - Field introduced in 21.1.1.
             - Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services
             - edition.
@@ -160,7 +183,7 @@
         type: str
     waf_config:
         description:
-            - Default values to be used for pulse waf management.
+            - Default values for waf management.
             - Field introduced in 21.1.1.
             - Allowed in essentials edition with any value, basic edition with any value, enterprise, enterprise with cloud services edition.
         required: true
@@ -217,10 +240,13 @@ def main():
         feature_opt_in_status=dict(type='dict', required=True),
         ip_reputation_config=dict(type='dict', required=True),
         mode=dict(type='str',),
+        name=dict(type='str',),
+        operations_config=dict(type='dict',),
         polling_interval=dict(type='int',),
         portal_url=dict(type='str', required=True),
         saas_licensing_config=dict(type='dict', required=True),
         split_proxy_configuration=dict(type='dict',),
+        tenant_ref=dict(type='str',),
         url=dict(type='str',),
         use_split_proxy=dict(type='bool',),
         use_tls=dict(type='bool',),

plugins/modules/avi_albservicesfileupload.py

@@ -80,7 +80,7 @@
         type: str
     status:
         description:
-            - Captures status for file upload.
+            - Status of file upload.
             - Enum options - SYSERR_SUCCESS, SYSERR_FAILURE, SYSERR_OUT_OF_MEMORY, SYSERR_NO_ENT, SYSERR_INVAL, SYSERR_ACCESS, SYSERR_FAULT, SYSERR_IO,
             - SYSERR_TIMEOUT, SYSERR_NOT_SUPPORTED, SYSERR_NOT_READY, SYSERR_UPGRADE_IN_PROGRESS, SYSERR_WARM_START_IN_PROGRESS, SYSERR_TRY_AGAIN,
             - SYSERR_NOT_UPGRADING, SYSERR_PENDING, SYSERR_EVENT_GEN_FAILURE, SYSERR_CONFIG_PARAM_MISSING, SYSERR_RANGE, SYSERR_BAD_REQUEST...

plugins/modules/avi_albservicesjob.py

@@ -62,7 +62,7 @@
         type: dict
     end_time:
         description:
-            - The time at which the albservicesjob is ended.
+            - Time at which the albservicesjob ended.
             - Field introduced in 21.1.3.
             - Allowed in enterprise edition with any value, enterprise with cloud services edition.
         type: dict
@@ -79,15 +79,16 @@
             - Field introduced in 22.1.1.
             - Allowed in enterprise edition with any value, enterprise with cloud services edition.
         type: list
+        elements: dict
     pulse_job_id:
         description:
-            - A unique identifier for this job entry on the pulse portal.
+            - A unique identifier for this job entry on the pulse cloud services.
             - Field introduced in 21.1.3.
             - Allowed in enterprise edition with any value, enterprise with cloud services edition.
         type: str
     pulse_sync_status:
         description:
-            - Status of sync to pulse(result uploads/state updates).
+            - Status of sync to pulse cloud services(result uploads/state updates).
             - Field introduced in 22.1.1.
             - Allowed in enterprise edition with any value, enterprise with cloud services edition.
         type: bool
@@ -99,14 +100,14 @@
         type: str
     start_time:
         description:
-            - The time at which the albservicesjob is started.
+            - Time at which the albservicesjob started.
             - Field introduced in 21.1.3.
             - Allowed in enterprise edition with any value, enterprise with cloud services edition.
         type: dict
     status:
         description:
             - The status of the albservicesjob.
-            - Enum options - UNDETERMINED, PENDING, IN_PROGRESS, COMPLETED, FAILED.
+            - Enum options - UNDETERMINED, PENDING, IN_PROGRESS, COMPLETED, FAILED, NOT_ENABLED.
             - Field introduced in 21.1.3.
             - Allowed in enterprise edition with any value, enterprise with cloud services edition.
             - Default value when not specified in API or module is interpreted by Avi Controller as PENDING.
@@ -183,7 +184,7 @@ def main():
         configpb_attributes=dict(type='dict',),
         end_time=dict(type='dict',),
         name=dict(type='str', required=True),
-        params=dict(type='list',),
+        params=dict(type='list', elements='dict',),
         pulse_job_id=dict(type='str',),
         pulse_sync_status=dict(type='bool',),
         result=dict(type='str',),

plugins/modules/avi_authmappingprofile.py

@@ -67,6 +67,7 @@
             - Allowed in enterprise edition with any value, enterprise with cloud services edition.
         required: true
         type: list
+        elements: dict
     name:
         description:
             - Name of the authmappingprofile.
@@ -146,7 +147,7 @@ def main():
         avi_patch_value=dict(type='str',),
         configpb_attributes=dict(type='dict',),
         description=dict(type='str',),
-        mapping_rules=dict(type='list', required=True),
+        mapping_rules=dict(type='list', elements='dict', required=True),
         name=dict(type='str', required=True),
         tenant_ref=dict(type='str',),
         type=dict(type='str', required=True),

plugins/modules/avi_availabilityzone.py

@@ -93,6 +93,7 @@
             - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
         required: true
         type: list
+        elements: str
 extends_documentation_fragment:
     - vmware.alb.avi
 '''
@@ -144,7 +145,7 @@ def main():
         tenant_ref=dict(type='str',),
         url=dict(type='str',),
         uuid=dict(type='str',),
-        vcenter_refs=dict(type='list', required=True),
+        vcenter_refs=dict(type='list', elements='str', required=True),
     )
     argument_specs.update(avi_common_argument_spec())
     module = AnsibleModule(

plugins/modules/avi_backupconfiguration.py

@@ -119,6 +119,12 @@
             - Remote destination.
             - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
         type: str
+    s3_bucket_folder:
+        description:
+            - The folder name in s3 bucket where backup will be stored.
+            - Field introduced in 30.1.1.
+            - Allowed in enterprise edition with any value, enterprise with cloud services edition.
+        type: str
     save_local:
         description:
             - Local backup.
@@ -211,6 +217,7 @@ def main():
         remote_directory=dict(type='str',),
         remote_file_transfer_protocol=dict(type='str',),
         remote_hostname=dict(type='str',),
+        s3_bucket_folder=dict(type='str',),
         save_local=dict(type='bool',),
         ssh_user_ref=dict(type='str',),
         tenant_ref=dict(type='str',),

plugins/modules/avi_botipreputationtypemapping.py

@@ -52,6 +52,7 @@
             - Field introduced in 21.1.1.
             - Allowed in enterprise edition with any value, enterprise with cloud services edition.
         type: list
+        elements: dict
     name:
         description:
             - The name of this mapping.
@@ -121,7 +122,7 @@ def main():
         avi_api_patch_op=dict(choices=['add', 'replace', 'delete', 'remove']),
         avi_patch_path=dict(type='str',),
         avi_patch_value=dict(type='str',),
-        ip_reputation_mappings=dict(type='list',),
+        ip_reputation_mappings=dict(type='list', elements='dict',),
         name=dict(type='str', required=True),
         tenant_ref=dict(type='str',),
         url=dict(type='str',),

plugins/modules/avi_botmapping.py

@@ -52,6 +52,7 @@
             - Field introduced in 21.1.1.
             - Allowed in enterprise edition with any value, enterprise with cloud services edition.
         type: list
+        elements: dict
     name:
         description:
             - The name of this mapping.
@@ -121,7 +122,7 @@ def main():
         avi_api_patch_op=dict(choices=['add', 'replace', 'delete', 'remove']),
         avi_patch_path=dict(type='str',),
         avi_patch_value=dict(type='str',),
-        mapping_rules=dict(type='list',),
+        mapping_rules=dict(type='list', elements='dict',),
         name=dict(type='str', required=True),
         tenant_ref=dict(type='str',),
         url=dict(type='str',),

plugins/modules/avi_certificatemanagementprofile.py

@@ -61,6 +61,7 @@
             - Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services
             - edition.
         type: list
+        elements: dict
     name:
         description:
             - Name of the pki profile.
@@ -79,6 +80,7 @@
         description:
             - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
         type: list
+        elements: dict
     tenant_ref:
         description:
             - It is a reference to an object of type tenant.
@@ -138,10 +140,10 @@ def main():
         avi_patch_path=dict(type='str',),
         avi_patch_value=dict(type='str',),
         configpb_attributes=dict(type='dict',),
-        markers=dict(type='list',),
+        markers=dict(type='list', elements='dict',),
         name=dict(type='str', required=True),
         run_script_ref=dict(type='str', required=True),
-        script_params=dict(type='list',),
+        script_params=dict(type='list', elements='dict',),
         tenant_ref=dict(type='str',),
         url=dict(type='str',),
         uuid=dict(type='str',),