From 48dad90096cbaf6b59eb3a33dfc018e4880a6883 Mon Sep 17 00:00:00 2001
From: gurunath-avi <gurunath-reddy.kambala@broadcom.com>
Date: Thu, 3 Apr 2025 07:23:25 +0000
Subject: [PATCH 01/12] Updated assets for terraform

Signed-off-by: gurunath-avi <gurunath-reddy.kambala@broadcom.com>
---
 README.md                                     |    2 +-
 avi/data_source_avi_alertconfig_test.go       |   24 -
 ...data_source_avi_applicationprofile_test.go |   10 +
 ...e_avi_certificatemanagementprofile_test.go |    2 +-
 avi/data_source_avi_cluster_test.go           |    2 +-
 avi/data_source_avi_pool_test.go              |    2 +-
 avi/data_source_avi_useraccount_test.go       |    2 +-
 ...ource_avi_applicationpersistenceprofile.go |    5 +
 avi/datasource_avi_applicationprofile.go      |    5 +
 avi/datasource_avi_availabilityzone.go        |   15 +-
 avi/datasource_avi_backupconfiguration.go     |    4 +
 avi/datasource_avi_botconfigconsolidator.go   |    5 +
 avi/datasource_avi_botdetectionpolicy.go      |    5 +
 ...tasource_avi_botipreputationtypemapping.go |    5 +
 avi/datasource_avi_botmapping.go              |    5 +
 avi/datasource_avi_cloud.go                   |    5 -
 avi/datasource_avi_cloudconnectoruser.go      |    5 -
 avi/datasource_avi_controllerproperties.go    |   45 +-
 avi/datasource_avi_csrfpolicy.go              |    4 +
 avi/datasource_avi_fileobject.go              |   18 +
 avi/datasource_avi_fileservice.go             |    2 +-
 avi/datasource_avi_gslb.go                    |    8 +
 avi/datasource_avi_gslbcrmruntime.go          |   71 +
 avi/datasource_avi_gslbhsmruntime.go          |   69 +
 avi/datasource_avi_gslbservice.go             |   12 +
 avi/datasource_avi_gslbsmruntime.go           |  114 ++
 avi/datasource_avi_healthmonitor.go           |   10 +
 avi/datasource_avi_ipreputationdb.go          |   14 +
 avi/datasource_avi_licensestatus.go           |    4 -
 avi/datasource_avi_localworkerfdsversion.go   |   37 +
 avi/datasource_avi_pool.go                    |    4 +
 avi/datasource_avi_pool_server.go             |   10 +
 avi/datasource_avi_retentionpolicy.go         |   48 +
 avi/datasource_avi_rmcloudopsproto.go         |    4 +
 avi/datasource_avi_serviceenginegroup.go      |   24 +
 avi/datasource_avi_systemconfiguration.go     |   25 +-
 avi/datasource_avi_systemreport.go            |   13 +
 avi/datasource_avi_taskjournal.go             |    5 +
 avi/datasource_avi_trustedhostprofile.go      |    2 +-
 avi/datasource_avi_upgradeprofile.go          |   44 +
 avi/datasource_avi_upgradestatusinfo.go       |   13 +
 avi/datasource_avi_vsvip.go                   |    4 -
 avi/datasource_avi_webapput.go                |    5 +
 avi/diff_suppress_func.go                     |    2 +-
 avi/provider.go                               |  328 ++--
 avi/provider_test.go                          |    2 +-
 avi/resource_avi_alertconfig_test.go          |   48 -
 avi/resource_avi_alertsyslogconfig_test.go    |    2 +-
 ...ource_avi_applicationpersistenceprofile.go |    6 +
 avi/resource_avi_applicationprofile.go        |    6 +
 avi/resource_avi_applicationprofile_test.go   |   20 +
 avi/resource_avi_availabilityzone.go          |   16 +-
 avi/resource_avi_backupconfiguration.go       |    6 +
 avi/resource_avi_botconfigconsolidator.go     |    6 +
 avi/resource_avi_botdetectionpolicy.go        |    6 +
 ...resource_avi_botipreputationtypemapping.go |    6 +
 avi/resource_avi_botmapping.go                |    6 +
 ...e_avi_certificatemanagementprofile_test.go |    2 +-
 avi/resource_avi_cloud.go                     |   35 +-
 avi/resource_avi_cloudconnectoruser.go        |    6 -
 avi/resource_avi_controllerproperties.go      |   72 +-
 avi/resource_avi_csrfpolicy.go                |    5 +
 avi/resource_avi_fileobject.go                |   21 +
 avi/resource_avi_fileservice.go               |    2 +-
 avi/resource_avi_gslb.go                      |   12 +
 avi/resource_avi_gslbcrmruntime.go            |  137 ++
 avi/resource_avi_gslbhsmruntime.go            |  137 ++
 avi/resource_avi_gslbservice.go               |   16 +
 avi/resource_avi_gslbsmruntime.go             |  192 ++
 avi/resource_avi_healthmonitor.go             |   12 +
 avi/resource_avi_httppolicyset_test.go        |    2 +-
 avi/resource_avi_ipreputationdb.go            |   15 +
 avi/resource_avi_licensestatus.go             |    5 -
 avi/resource_avi_localworkerfdsversion.go     |   98 +
 avi/resource_avi_pool.go                      |    6 +
 avi/resource_avi_pool_server.go               |   11 +
 avi/resource_avi_rest_dependants.go           | 1699 ++++++++++++++++-
 avi/resource_avi_retentionpolicy.go           |  109 ++
 avi/resource_avi_rmcloudopsproto.go           |    6 +
 avi/resource_avi_serviceenginegroup.go        |   40 +-
 avi/resource_avi_systemconfiguration.go       |   35 +-
 avi/resource_avi_systemreport.go              |   16 +
 avi/resource_avi_taskjournal.go               |    5 +
 avi/resource_avi_trustedhostprofile.go        |    2 +-
 avi/resource_avi_upgradeprofile.go            |  107 ++
 avi/resource_avi_upgradestatusinfo.go         |   16 +
 avi/resource_avi_useraccount.go               |    2 +-
 avi/resource_avi_virtualservice_test.go       |    2 +-
 avi/resource_avi_vsvip.go                     |    6 -
 avi/resource_avi_wafpolicy_test.go            |    2 +-
 avi/resource_avi_webapput.go                  |    5 +
 avi/utils.go                                  |   53 +-
 avi/utils_test.go                             |    2 +-
 conftest.py                                   |    2 +-
 go.mod                                        |    6 +-
 go.sum                                        |    2 +
 main.go                                       |    2 +-
 scripts/changelog-links.sh                    |    2 +-
 scripts/errcheck.sh                           |    2 +-
 scripts/gofmtcheck.sh                         |    2 +-
 scripts/gogetcookie.sh                        |    2 +-
 website/avi.erb                               |  822 ++++----
 .../d/avi_actiongroupconfig.html.markdown     |   24 +-
 .../d/avi_albservicesconfig.html.markdown     |   40 +-
 .../avi_albservicesfiledownload.html.markdown |   20 +-
 .../d/avi_albservicesfileupload.html.markdown |   16 +-
 .../docs/d/avi_albservicesjob.html.markdown   |   28 +-
 website/docs/d/avi_alertconfig.html.markdown  |   38 +-
 .../docs/d/avi_alertemailconfig.html.markdown |   14 +-
 .../d/avi_alertscriptconfig.html.markdown     |   12 +-
 .../d/avi_alertsyslogconfig.html.markdown     |   14 +-
 .../docs/d/avi_analyticsprofile.html.markdown |  174 +-
 ...pplicationpersistenceprofile.html.markdown |   27 +-
 .../d/avi_applicationprofile.html.markdown    |   39 +-
 .../d/avi_authmappingprofile.html.markdown    |   14 +-
 website/docs/d/avi_authprofile.html.markdown  |   26 +-
 .../d/avi_autoscalelaunchconfig.html.markdown |   20 +-
 .../docs/d/avi_availabilityzone.html.markdown |   13 +-
 website/docs/d/avi_backup.html.markdown       |   16 +-
 .../d/avi_backupconfiguration.html.markdown   |   39 +-
 .../d/avi_botconfigconsolidator.html.markdown |   11 +-
 .../d/avi_botdetectionpolicy.html.markdown    |   27 +-
 ...i_botipreputationtypemapping.html.markdown |    9 +-
 website/docs/d/avi_botmapping.html.markdown   |    9 +-
 ...certificatemanagementprofile.html.markdown |   14 +-
 website/docs/d/avi_cloud.html.markdown        |   87 +-
 .../d/avi_cloudconnectoruser.html.markdown    |   27 +-
 .../docs/d/avi_cloudproperties.html.markdown  |   12 +-
 website/docs/d/avi_cluster.html.markdown      |   14 +-
 .../d/avi_clusterclouddetails.html.markdown   |   10 +-
 ...controllerportalregistration.html.markdown |   10 +-
 .../d/avi_controllerproperties.html.markdown  |  219 ++-
 .../docs/d/avi_controllersite.html.markdown   |   12 +-
 website/docs/d/avi_csrfpolicy.html.markdown   |   17 +-
 .../d/avi_customipamdnsprofile.html.markdown  |   12 +-
 website/docs/d/avi_dnspolicy.html.markdown    |   18 +-
 .../docs/d/avi_dynamicdnsrecord.html.markdown |   40 +-
 .../docs/d/avi_errorpagebody.html.markdown    |   14 +-
 .../docs/d/avi_errorpageprofile.html.markdown |   12 +-
 .../d/avi_federationcheckpoint.html.markdown  |   14 +-
 website/docs/d/avi_fileobject.html.markdown   |   38 +-
 website/docs/d/avi_geodb.html.markdown        |   14 +-
 website/docs/d/avi_gslb.html.markdown         |   46 +-
 .../docs/d/avi_gslbcrmruntime.html.markdown   |   47 +
 .../docs/d/avi_gslbgeodbprofile.html.markdown |   16 +-
 .../docs/d/avi_gslbhsmruntime.html.markdown   |   47 +
 website/docs/d/avi_gslbservice.html.markdown  |   57 +-
 .../docs/d/avi_gslbsmruntime.html.markdown    |   58 +
 ..._hardwaresecuritymodulegroup.html.markdown |   12 +-
 .../docs/d/avi_healthmonitor.html.markdown    |   72 +-
 .../docs/d/avi_httppolicyset.html.markdown    |   28 +-
 website/docs/d/avi_icapprofile.html.markdown  |   36 +-
 website/docs/d/avi_image.html.markdown        |   44 +-
 .../d/avi_inventoryfaultconfig.html.markdown  |   14 +-
 website/docs/d/avi_ipaddrgroup.html.markdown  |   26 +-
 .../avi_ipamdnsproviderprofile.html.markdown  |   34 +-
 .../docs/d/avi_ipreputationdb.html.markdown   |   25 +-
 .../docs/d/avi_jwtserverprofile.html.markdown |   18 +-
 website/docs/d/avi_l4policyset.html.markdown  |   18 +-
 website/docs/d/avi_labelgroup.html.markdown   |    8 +-
 .../d/avi_licenseledgerdetails.html.markdown  |    8 +-
 .../docs/d/avi_licensestatus.html.markdown    |   11 +-
 .../d/avi_localworkerfdsversion.html.markdown |   40 +
 .../d/avi_memorybalancerrequest.html.markdown |   18 +-
 .../d/avi_microservicegroup.html.markdown     |   14 +-
 website/docs/d/avi_natpolicy.html.markdown    |   16 +-
 website/docs/d/avi_network.html.markdown      |   30 +-
 .../docs/d/avi_networkprofile.html.markdown   |   16 +-
 .../d/avi_networksecuritypolicy.html.markdown |   24 +-
 .../docs/d/avi_networkservice.html.markdown   |   20 +-
 .../d/avi_nsxtsegmentruntime.html.markdown    |   42 +-
 website/docs/d/avi_pkiprofile.html.markdown   |   26 +-
 website/docs/d/avi_pool.html.markdown         |  149 +-
 website/docs/d/avi_poolgroup.html.markdown    |   34 +-
 ...vi_poolgroupdeploymentpolicy.html.markdown |   26 +-
 .../docs/d/avi_prioritylabels.html.markdown   |   16 +-
 .../docs/d/avi_protocolparser.html.markdown   |   14 +-
 .../docs/d/avi_retentionpolicy.html.markdown  |   42 +
 .../docs/d/avi_rmcloudopsproto.html.markdown  |   11 +-
 website/docs/d/avi_role.html.markdown         |   14 +-
 website/docs/d/avi_scheduler.html.markdown    |   26 +-
 .../d/avi_securitymanagerdata.html.markdown   |    8 +-
 .../docs/d/avi_securitypolicy.html.markdown   |   26 +-
 website/docs/d/avi_seproperties.html.markdown |   10 +-
 .../d/avi_serverautoscalepolicy.html.markdown |   40 +-
 .../d/avi_serviceauthprofile.html.markdown    |   14 +-
 .../docs/d/avi_serviceengine.html.markdown    |   36 +-
 .../d/avi_serviceenginegroup.html.markdown    |  584 +++---
 website/docs/d/avi_siteversion.html.markdown  |   24 +-
 .../docs/d/avi_snmptrapprofile.html.markdown  |   10 +-
 .../d/avi_sslkeyandcertificate.html.markdown  |   56 +-
 website/docs/d/avi_sslprofile.html.markdown   |   44 +-
 website/docs/d/avi_ssopolicy.html.markdown    |   16 +-
 .../d/avi_statediffoperation.html.markdown    |   16 +-
 .../d/avi_statediffsnapshot.html.markdown     |   34 +-
 website/docs/d/avi_stringgroup.html.markdown  |   18 +-
 .../d/avi_systemconfiguration.html.markdown   |   64 +-
 website/docs/d/avi_systemlimits.html.markdown |   10 +-
 website/docs/d/avi_systemreport.html.markdown |   29 +-
 website/docs/d/avi_taskjournal.html.markdown  |   21 +-
 website/docs/d/avi_tenant.html.markdown       |   20 +-
 ...vi_tenantsystemconfiguration.html.markdown |   10 +-
 .../d/avi_testsedatastorelevel1.html.markdown |   10 +-
 .../d/avi_testsedatastorelevel2.html.markdown |   10 +-
 .../d/avi_testsedatastorelevel3.html.markdown |    8 +-
 .../d/avi_trafficcloneprofile.html.markdown   |   16 +-
 .../d/avi_trustedhostprofile.html.markdown    |   10 +-
 .../docs/d/avi_upgradeprofile.html.markdown   |   41 +
 .../d/avi_upgradestatusinfo.html.markdown     |   99 +-
 .../d/avi_upgradestatussummary.html.markdown  |   32 +-
 website/docs/d/avi_user.html.markdown         |   48 +-
 .../d/avi_useraccountprofile.html.markdown    |   18 +-
 .../docs/d/avi_vcenterserver.html.markdown    |   16 +-
 .../docs/d/avi_virtualservice.html.markdown   |  192 +-
 website/docs/d/avi_vrfcontext.html.markdown   |   32 +-
 .../docs/d/avi_vsdatascriptset.html.markdown  |   38 +-
 website/docs/d/avi_vsgs.html.markdown         |   18 +-
 website/docs/d/avi_vsvip.html.markdown        |   33 +-
 ...applicationsignatureprovider.html.markdown |   18 +-
 website/docs/d/avi_wafcrs.html.markdown       |   30 +-
 website/docs/d/avi_wafpolicy.html.markdown    |   60 +-
 .../d/avi_wafpolicypsmgroup.html.markdown     |   22 +-
 website/docs/d/avi_wafprofile.html.markdown   |   16 +-
 website/docs/d/avi_webapput.html.markdown     |   41 +-
 website/docs/d/avi_webhook.html.markdown      |   16 +-
 .../r/avi_actiongroupconfig.html.markdown     |   24 +-
 .../r/avi_albservicesconfig.html.markdown     |   40 +-
 .../avi_albservicesfiledownload.html.markdown |   20 +-
 .../r/avi_albservicesfileupload.html.markdown |   16 +-
 .../docs/r/avi_albservicesjob.html.markdown   |   28 +-
 website/docs/r/avi_alertconfig.html.markdown  |   38 +-
 .../docs/r/avi_alertemailconfig.html.markdown |   14 +-
 .../r/avi_alertscriptconfig.html.markdown     |   12 +-
 .../r/avi_alertsyslogconfig.html.markdown     |   14 +-
 .../docs/r/avi_analyticsprofile.html.markdown |  174 +-
 ...pplicationpersistenceprofile.html.markdown |   27 +-
 .../r/avi_applicationprofile.html.markdown    |   39 +-
 .../r/avi_authmappingprofile.html.markdown    |   14 +-
 website/docs/r/avi_authprofile.html.markdown  |   26 +-
 .../r/avi_autoscalelaunchconfig.html.markdown |   20 +-
 .../docs/r/avi_availabilityzone.html.markdown |   13 +-
 website/docs/r/avi_backup.html.markdown       |   16 +-
 .../r/avi_backupconfiguration.html.markdown   |   39 +-
 .../r/avi_botconfigconsolidator.html.markdown |   11 +-
 .../r/avi_botdetectionpolicy.html.markdown    |   27 +-
 ...i_botipreputationtypemapping.html.markdown |    9 +-
 website/docs/r/avi_botmapping.html.markdown   |    9 +-
 ...certificatemanagementprofile.html.markdown |   14 +-
 website/docs/r/avi_cloud.html.markdown        |   87 +-
 .../r/avi_cloudconnectoruser.html.markdown    |   27 +-
 .../docs/r/avi_cloudproperties.html.markdown  |   12 +-
 website/docs/r/avi_cluster.html.markdown      |   14 +-
 .../r/avi_clusterclouddetails.html.markdown   |   10 +-
 ...controllerportalregistration.html.markdown |   10 +-
 .../r/avi_controllerproperties.html.markdown  |  219 ++-
 .../docs/r/avi_controllersite.html.markdown   |   12 +-
 website/docs/r/avi_csrfpolicy.html.markdown   |   17 +-
 .../r/avi_customipamdnsprofile.html.markdown  |   12 +-
 website/docs/r/avi_dnspolicy.html.markdown    |   18 +-
 .../docs/r/avi_dynamicdnsrecord.html.markdown |   40 +-
 .../docs/r/avi_errorpagebody.html.markdown    |   14 +-
 .../docs/r/avi_errorpageprofile.html.markdown |   12 +-
 .../r/avi_federationcheckpoint.html.markdown  |   14 +-
 website/docs/r/avi_fileobject.html.markdown   |   38 +-
 website/docs/r/avi_geodb.html.markdown        |   14 +-
 website/docs/r/avi_gslb.html.markdown         |   46 +-
 .../docs/r/avi_gslbcrmruntime.html.markdown   |   56 +
 .../docs/r/avi_gslbgeodbprofile.html.markdown |   16 +-
 .../docs/r/avi_gslbhsmruntime.html.markdown   |   56 +
 website/docs/r/avi_gslbservice.html.markdown  |   57 +-
 .../docs/r/avi_gslbsmruntime.html.markdown    |   67 +
 ..._hardwaresecuritymodulegroup.html.markdown |   12 +-
 .../docs/r/avi_healthmonitor.html.markdown    |   72 +-
 .../docs/r/avi_httppolicyset.html.markdown    |   28 +-
 website/docs/r/avi_icapprofile.html.markdown  |   36 +-
 website/docs/r/avi_image.html.markdown        |   44 +-
 .../r/avi_inventoryfaultconfig.html.markdown  |   14 +-
 website/docs/r/avi_ipaddrgroup.html.markdown  |   26 +-
 .../avi_ipamdnsproviderprofile.html.markdown  |   34 +-
 .../docs/r/avi_ipreputationdb.html.markdown   |   25 +-
 .../docs/r/avi_jwtserverprofile.html.markdown |   18 +-
 website/docs/r/avi_l4policyset.html.markdown  |   18 +-
 website/docs/r/avi_labelgroup.html.markdown   |    8 +-
 .../r/avi_licenseledgerdetails.html.markdown  |    8 +-
 .../docs/r/avi_licensestatus.html.markdown    |   11 +-
 .../r/avi_localworkerfdsversion.html.markdown |   49 +
 .../r/avi_memorybalancerrequest.html.markdown |   18 +-
 .../r/avi_microservicegroup.html.markdown     |   14 +-
 website/docs/r/avi_natpolicy.html.markdown    |   16 +-
 website/docs/r/avi_network.html.markdown      |   30 +-
 .../docs/r/avi_networkprofile.html.markdown   |   16 +-
 .../r/avi_networksecuritypolicy.html.markdown |   24 +-
 .../docs/r/avi_networkservice.html.markdown   |   20 +-
 .../r/avi_nsxtsegmentruntime.html.markdown    |   42 +-
 website/docs/r/avi_pkiprofile.html.markdown   |   26 +-
 website/docs/r/avi_pool.html.markdown         |  149 +-
 website/docs/r/avi_poolgroup.html.markdown    |   34 +-
 ...vi_poolgroupdeploymentpolicy.html.markdown |   26 +-
 .../docs/r/avi_prioritylabels.html.markdown   |   16 +-
 .../docs/r/avi_protocolparser.html.markdown   |   14 +-
 .../docs/r/avi_retentionpolicy.html.markdown  |   51 +
 .../docs/r/avi_rmcloudopsproto.html.markdown  |   11 +-
 website/docs/r/avi_role.html.markdown         |   14 +-
 website/docs/r/avi_scheduler.html.markdown    |   26 +-
 .../r/avi_securitymanagerdata.html.markdown   |    8 +-
 .../docs/r/avi_securitypolicy.html.markdown   |   26 +-
 website/docs/r/avi_seproperties.html.markdown |   10 +-
 .../r/avi_serverautoscalepolicy.html.markdown |   40 +-
 .../r/avi_serviceauthprofile.html.markdown    |   14 +-
 .../docs/r/avi_serviceengine.html.markdown    |   36 +-
 .../r/avi_serviceenginegroup.html.markdown    |  584 +++---
 website/docs/r/avi_siteversion.html.markdown  |   24 +-
 .../docs/r/avi_snmptrapprofile.html.markdown  |   10 +-
 .../r/avi_sslkeyandcertificate.html.markdown  |   56 +-
 website/docs/r/avi_sslprofile.html.markdown   |   44 +-
 website/docs/r/avi_ssopolicy.html.markdown    |   16 +-
 .../r/avi_statediffoperation.html.markdown    |   16 +-
 .../r/avi_statediffsnapshot.html.markdown     |   34 +-
 website/docs/r/avi_stringgroup.html.markdown  |   18 +-
 .../r/avi_systemconfiguration.html.markdown   |   64 +-
 website/docs/r/avi_systemlimits.html.markdown |   10 +-
 website/docs/r/avi_systemreport.html.markdown |   29 +-
 website/docs/r/avi_taskjournal.html.markdown  |   21 +-
 website/docs/r/avi_tenant.html.markdown       |   20 +-
 ...vi_tenantsystemconfiguration.html.markdown |   10 +-
 .../r/avi_testsedatastorelevel1.html.markdown |   10 +-
 .../r/avi_testsedatastorelevel2.html.markdown |   10 +-
 .../r/avi_testsedatastorelevel3.html.markdown |    8 +-
 .../r/avi_trafficcloneprofile.html.markdown   |   16 +-
 .../r/avi_trustedhostprofile.html.markdown    |   10 +-
 .../docs/r/avi_upgradeprofile.html.markdown   |   50 +
 .../r/avi_upgradestatusinfo.html.markdown     |   99 +-
 .../r/avi_upgradestatussummary.html.markdown  |   32 +-
 website/docs/r/avi_user.html.markdown         |   48 +-
 .../r/avi_useraccountprofile.html.markdown    |   18 +-
 .../docs/r/avi_vcenterserver.html.markdown    |   16 +-
 .../docs/r/avi_virtualservice.html.markdown   |  192 +-
 website/docs/r/avi_vrfcontext.html.markdown   |   32 +-
 .../docs/r/avi_vsdatascriptset.html.markdown  |   38 +-
 website/docs/r/avi_vsgs.html.markdown         |   18 +-
 website/docs/r/avi_vsvip.html.markdown        |   33 +-
 ...applicationsignatureprovider.html.markdown |   18 +-
 website/docs/r/avi_wafcrs.html.markdown       |   30 +-
 website/docs/r/avi_wafpolicy.html.markdown    |   60 +-
 .../r/avi_wafpolicypsmgroup.html.markdown     |   22 +-
 website/docs/r/avi_wafprofile.html.markdown   |   16 +-
 website/docs/r/avi_webapput.html.markdown     |   35 +-
 website/docs/r/avi_webhook.html.markdown      |   16 +-
 348 files changed, 8722 insertions(+), 4895 deletions(-)
 create mode 100644 avi/datasource_avi_gslbcrmruntime.go
 create mode 100644 avi/datasource_avi_gslbhsmruntime.go
 create mode 100644 avi/datasource_avi_gslbsmruntime.go
 create mode 100644 avi/datasource_avi_localworkerfdsversion.go
 create mode 100644 avi/datasource_avi_retentionpolicy.go
 create mode 100644 avi/datasource_avi_upgradeprofile.go
 create mode 100644 avi/resource_avi_gslbcrmruntime.go
 create mode 100644 avi/resource_avi_gslbhsmruntime.go
 create mode 100644 avi/resource_avi_gslbsmruntime.go
 create mode 100644 avi/resource_avi_localworkerfdsversion.go
 create mode 100644 avi/resource_avi_retentionpolicy.go
 create mode 100644 avi/resource_avi_upgradeprofile.go
 create mode 100644 website/docs/d/avi_gslbcrmruntime.html.markdown
 create mode 100644 website/docs/d/avi_gslbhsmruntime.html.markdown
 create mode 100644 website/docs/d/avi_gslbsmruntime.html.markdown
 create mode 100644 website/docs/d/avi_localworkerfdsversion.html.markdown
 create mode 100644 website/docs/d/avi_retentionpolicy.html.markdown
 create mode 100644 website/docs/d/avi_upgradeprofile.html.markdown
 create mode 100644 website/docs/r/avi_gslbcrmruntime.html.markdown
 create mode 100644 website/docs/r/avi_gslbhsmruntime.html.markdown
 create mode 100644 website/docs/r/avi_gslbsmruntime.html.markdown
 create mode 100644 website/docs/r/avi_localworkerfdsversion.html.markdown
 create mode 100644 website/docs/r/avi_retentionpolicy.html.markdown
 create mode 100644 website/docs/r/avi_upgradeprofile.html.markdown

diff --git a/README.md b/README.md
index 2493543eb..06b440105 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Requirements
 ------------
 
 -	[Terraform](https://www.terraform.io/downloads.html) 0.12.x/0.13+ (0.11.x or lower is incompatible)
--	[Go](https://golang.org/doc/install) 1.22.6 (to build the provider plugin)
+-	[Go](https://golang.org/doc/install) 1.13 (to build the provider plugin)
 
 Building The Provider (Terraform v0.12+)
 ----------------------------------------
diff --git a/avi/data_source_avi_alertconfig_test.go b/avi/data_source_avi_alertconfig_test.go
index 7909d6911..70a882345 100644
--- a/avi/data_source_avi_alertconfig_test.go
+++ b/avi/data_source_avi_alertconfig_test.go
@@ -86,14 +86,6 @@ sys_event_rule {
 	event_id = "VCENTER_ACCESS_SLOW"
 	not_cond = false
 }
-sys_event_rule {
-	event_id = "OPENSTACK_ACCESS_FAILURE"
-	not_cond = false
-}
-sys_event_rule {
-	event_id = "OPENSTACK_IMAGE_UPLOAD_FAILURE"
-	not_cond = false
-}
 sys_event_rule {
 	event_id = "AWS_ACCESS_FAILURE"
 	not_cond = false
@@ -142,14 +134,6 @@ sys_event_rule {
 	event_id = "CLOUDSTACK_IMAGE_UPLOAD_FAILURE"
 	not_cond = false
 }
-sys_event_rule {
-	event_id = "DOCKER_UCP_ACCESS_FAILURE"
-	not_cond = false
-}
-sys_event_rule {
-	event_id = "DOCKER_UCP_IMAGE_UPLOAD_FAILURE"
-	not_cond = false
-}
 sys_event_rule {
 	event_id = "VCA_ACCESS_FAILURE"
 	not_cond = false
@@ -166,14 +150,6 @@ sys_event_rule {
 	event_id = "LS_IMAGE_UPLOAD_FAILURE"
 	not_cond = false
 }
-sys_event_rule {
-	event_id = "MESOS_ACCESS_FAILURE"
-	not_cond = false
-}
-sys_event_rule {
-	event_id = "MESOS_IMAGE_UPLOAD_FAILURE"
-	not_cond = false
-}
 sys_event_rule {
 	event_id = "CC_SE_CREATION_FAILURE"
 	not_cond = false
diff --git a/avi/data_source_avi_applicationprofile_test.go b/avi/data_source_avi_applicationprofile_test.go
index 408f93a81..cc3604bfc 100644
--- a/avi/data_source_avi_applicationprofile_test.go
+++ b/avi/data_source_avi_applicationprofile_test.go
@@ -93,6 +93,13 @@ resource "avi_applicationprofile" "testApplicationProfile" {
 			mime_types_group_refs = [data.avi_stringgroup.system_cacheablestringgroup.id]
 		}
 		http2_profile {
+			http2_initial_window_size = "64"
+			max_http2_concurrent_streams_per_connection = "128"
+			max_http2_control_frames_per_connection = "1000"
+			max_http2_empty_data_frames_per_connection = "1000"
+			max_http2_header_field_size = "4096"
+			max_http2_queued_frames_to_client_per_connection = "1000"
+			max_http2_requests_per_connection = "1000"
 		}
 		max_rps_unknown_uri = "0"
 		post_accept_timeout = "30000"
@@ -108,6 +115,9 @@ resource "avi_applicationprofile" "testApplicationProfile" {
 		use_app_keepalive_timeout = false
 	}
 	preserve_client_port = false
+	l4_ssl_profile {
+		ssl_stream_idle_timeout = "3600"
+	}
 }
 
 data "avi_applicationprofile" "testApplicationProfile" {
diff --git a/avi/data_source_avi_certificatemanagementprofile_test.go b/avi/data_source_avi_certificatemanagementprofile_test.go
index 07d438a6b..d88d8f9ed 100644
--- a/avi/data_source_avi_certificatemanagementprofile_test.go
+++ b/avi/data_source_avi_certificatemanagementprofile_test.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/avi/data_source_avi_cluster_test.go b/avi/data_source_avi_cluster_test.go
index 51390ab0a..fbd0d4130 100644
--- a/avi/data_source_avi_cluster_test.go
+++ b/avi/data_source_avi_cluster_test.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/avi/data_source_avi_pool_test.go b/avi/data_source_avi_pool_test.go
index b3be54926..bf3654163 100644
--- a/avi/data_source_avi_pool_test.go
+++ b/avi/data_source_avi_pool_test.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/avi/data_source_avi_useraccount_test.go b/avi/data_source_avi_useraccount_test.go
index 1517efd41..7653c3697 100644
--- a/avi/data_source_avi_useraccount_test.go
+++ b/avi/data_source_avi_useraccount_test.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/avi/datasource_avi_applicationpersistenceprofile.go b/avi/datasource_avi_applicationpersistenceprofile.go
index 27b39059d..994fe3641 100644
--- a/avi/datasource_avi_applicationpersistenceprofile.go
+++ b/avi/datasource_avi_applicationpersistenceprofile.go
@@ -23,6 +23,11 @@ func dataSourceAviApplicationPersistenceProfile() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"diameter_app_persistence_profile": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceDiameterAVPPersistenceProfileSchema(),
+			},
 			"hdr_persistence_profile": {
 				Type:     schema.TypeSet,
 				Computed: true,
diff --git a/avi/datasource_avi_applicationprofile.go b/avi/datasource_avi_applicationprofile.go
index 8ddc2628d..29fcd24ec 100644
--- a/avi/datasource_avi_applicationprofile.go
+++ b/avi/datasource_avi_applicationprofile.go
@@ -30,6 +30,11 @@ func dataSourceAviApplicationProfile() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"diameter_service_profile": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceDiameterServiceApplicationProfileSchema(),
+			},
 			"dns_service_profile": {
 				Type:     schema.TypeSet,
 				Computed: true,
diff --git a/avi/datasource_avi_availabilityzone.go b/avi/datasource_avi_availabilityzone.go
index b204ed34d..432a3432a 100644
--- a/avi/datasource_avi_availabilityzone.go
+++ b/avi/datasource_avi_availabilityzone.go
@@ -9,6 +9,16 @@ func dataSourceAviAvailabilityZone() *schema.Resource {
 	return &schema.Resource{
 		Read: ResourceAviAvailabilityZoneRead,
 		Schema: map[string]*schema.Schema{
+			"az_clusters": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceAZClusterSchema(),
+			},
+			"az_datastore": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceAZDatastoreSchema(),
+			},
 			"cloud_ref": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -34,11 +44,6 @@ func dataSourceAviAvailabilityZone() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
-			"vcenter_refs": {
-				Type:     schema.TypeList,
-				Computed: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
-			},
 		},
 	}
 }
diff --git a/avi/datasource_avi_backupconfiguration.go b/avi/datasource_avi_backupconfiguration.go
index e77ec9e80..b23d76674 100644
--- a/avi/datasource_avi_backupconfiguration.go
+++ b/avi/datasource_avi_backupconfiguration.go
@@ -33,6 +33,10 @@ func dataSourceAviBackupConfiguration() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"bundle_mode": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"configpb_attributes": {
 				Type:     schema.TypeSet,
 				Computed: true,
diff --git a/avi/datasource_avi_botconfigconsolidator.go b/avi/datasource_avi_botconfigconsolidator.go
index 2c2314c61..e3ec533a2 100644
--- a/avi/datasource_avi_botconfigconsolidator.go
+++ b/avi/datasource_avi_botconfigconsolidator.go
@@ -9,6 +9,11 @@ func dataSourceAviBotConfigConsolidator() *schema.Resource {
 	return &schema.Resource{
 		Read: ResourceAviBotConfigConsolidatorRead,
 		Schema: map[string]*schema.Schema{
+			"configpb_attributes": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceConfigPbAttributesSchema(),
+			},
 			"description": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_botdetectionpolicy.go b/avi/datasource_avi_botdetectionpolicy.go
index 0adfcca04..7bbc44b7b 100644
--- a/avi/datasource_avi_botdetectionpolicy.go
+++ b/avi/datasource_avi_botdetectionpolicy.go
@@ -19,6 +19,11 @@ func dataSourceAviBotDetectionPolicy() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceBotConfigClientBehaviorSchema(),
 			},
+			"configpb_attributes": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceConfigPbAttributesSchema(),
+			},
 			"description": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_botipreputationtypemapping.go b/avi/datasource_avi_botipreputationtypemapping.go
index 06062fb88..a53503f52 100644
--- a/avi/datasource_avi_botipreputationtypemapping.go
+++ b/avi/datasource_avi_botipreputationtypemapping.go
@@ -9,6 +9,11 @@ func dataSourceAviBotIPReputationTypeMapping() *schema.Resource {
 	return &schema.Resource{
 		Read: ResourceAviBotIPReputationTypeMappingRead,
 		Schema: map[string]*schema.Schema{
+			"configpb_attributes": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceConfigPbAttributesSchema(),
+			},
 			"ip_reputation_mappings": {
 				Type:     schema.TypeList,
 				Computed: true,
diff --git a/avi/datasource_avi_botmapping.go b/avi/datasource_avi_botmapping.go
index 94a87c305..8b8c7af78 100644
--- a/avi/datasource_avi_botmapping.go
+++ b/avi/datasource_avi_botmapping.go
@@ -9,6 +9,11 @@ func dataSourceAviBotMapping() *schema.Resource {
 	return &schema.Resource{
 		Read: ResourceAviBotMappingRead,
 		Schema: map[string]*schema.Schema{
+			"configpb_attributes": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceConfigPbAttributesSchema(),
+			},
 			"mapping_rules": {
 				Type:     schema.TypeList,
 				Computed: true,
diff --git a/avi/datasource_avi_cloud.go b/avi/datasource_avi_cloud.go
index 752cc15d6..8b4bcad63 100644
--- a/avi/datasource_avi_cloud.go
+++ b/avi/datasource_avi_cloud.go
@@ -146,11 +146,6 @@ func dataSourceAviCloud() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"openstack_configuration": {
-				Type:     schema.TypeSet,
-				Computed: true,
-				Elem:     ResourceOpenStackConfigurationSchema(),
-			},
 			"prefer_static_routes": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_cloudconnectoruser.go b/avi/datasource_avi_cloudconnectoruser.go
index e95584361..195b1a14b 100644
--- a/avi/datasource_avi_cloudconnectoruser.go
+++ b/avi/datasource_avi_cloudconnectoruser.go
@@ -39,11 +39,6 @@ func dataSourceAviCloudConnectorUser() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceNsxtCredentialsSchema(),
 			},
-			"oci_credentials": {
-				Type:     schema.TypeSet,
-				Computed: true,
-				Elem:     ResourceOCICredentialsSchema(),
-			},
 			"password": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_controllerproperties.go b/avi/datasource_avi_controllerproperties.go
index 6ca1fc386..156a14a81 100644
--- a/avi/datasource_avi_controllerproperties.go
+++ b/avi/datasource_avi_controllerproperties.go
@@ -41,6 +41,10 @@ func dataSourceAviControllerProperties() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"archive_retention_framework_period": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"async_patch_merge_period": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -150,6 +154,10 @@ func dataSourceAviControllerProperties() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"enable_nsx_streaming_agent": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"enable_per_process_stop": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -191,6 +199,10 @@ func dataSourceAviControllerProperties() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"gslb_fileobject_max_version_count": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"gslb_purge_batch_size": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -319,23 +331,11 @@ func dataSourceAviControllerProperties() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"seupgrade_copy_buffer_size": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"seupgrade_copy_pool_size": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"seupgrade_fabric_pool_size": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"seupgrade_segroup_min_dead_timeout": {
+			"shared_ssl_certificates": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"shared_ssl_certificates": {
+			"skip_beego_perf_collection": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
@@ -348,13 +348,10 @@ func dataSourceAviControllerProperties() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeInt},
 			},
-			"system_report_cleanup_interval": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"system_report_limit": {
-				Type:     schema.TypeString,
+			"statecache_properties": {
+				Type:     schema.TypeSet,
 				Computed: true,
+				Elem:     ResourceSCPropertiesSchema(),
 			},
 			"unresponsive_se_reboot": {
 				Type:     schema.TypeString,
@@ -372,14 +369,6 @@ func dataSourceAviControllerProperties() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"upgrade_fat_se_lease_time": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-			"upgrade_lease_time": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"upgrade_se_per_vs_scale_ops_txn_time": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_csrfpolicy.go b/avi/datasource_avi_csrfpolicy.go
index 0367e44ac..4cbfc1d63 100644
--- a/avi/datasource_avi_csrfpolicy.go
+++ b/avi/datasource_avi_csrfpolicy.go
@@ -18,6 +18,10 @@ func dataSourceAviCSRFPolicy() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"csrf_file_ref": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"description": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_fileobject.go b/avi/datasource_avi_fileobject.go
index da8f352a4..ae408f150 100644
--- a/avi/datasource_avi_fileobject.go
+++ b/avi/datasource_avi_fileobject.go
@@ -13,6 +13,11 @@ func dataSourceAviFileObject() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"child_refs": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 			"compressed": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -35,10 +40,23 @@ func dataSourceAviFileObject() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"events": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceFileObjectEventMapSchema(),
+			},
 			"expires_at": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"gslb_geodb_format": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"has_parent": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"is_federated": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_fileservice.go b/avi/datasource_avi_fileservice.go
index 4f844ae21..608b7953b 100755
--- a/avi/datasource_avi_fileservice.go
+++ b/avi/datasource_avi_fileservice.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/avi/datasource_avi_gslb.go b/avi/datasource_avi_gslb.go
index 84f1992d6..01d097b0b 100644
--- a/avi/datasource_avi_gslb.go
+++ b/avi/datasource_avi_gslb.go
@@ -48,6 +48,10 @@ func dataSourceAviGslb() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"gs_member_fqdn_resolution_on_se": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"is_federated": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -78,6 +82,10 @@ func dataSourceAviGslb() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"short_probe_interval": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"sites": {
 				Type:     schema.TypeList,
 				Computed: true,
diff --git a/avi/datasource_avi_gslbcrmruntime.go b/avi/datasource_avi_gslbcrmruntime.go
new file mode 100644
index 000000000..3cd24022e
--- /dev/null
+++ b/avi/datasource_avi_gslbcrmruntime.go
@@ -0,0 +1,71 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func dataSourceAviGslbCRMRuntime() *schema.Resource {
+	return &schema.Resource{
+		Read: ResourceAviGslbCRMRuntimeRead,
+		Schema: map[string]*schema.Schema{
+			"cluster_uuid": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"events": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceEventInfoSchema(),
+			},
+			"fds_info": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceFdsInfoSchema(),
+			},
+			"local_info": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceLocalInfoSchema(),
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"obj_uuid": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"remote_info": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceRemoteInfoSchema(),
+			},
+			"replication_policy": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceReplicationPolicySchema(),
+			},
+			"site_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"status_info": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceOperationalStatusSchema(),
+			},
+			"tenant_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
diff --git a/avi/datasource_avi_gslbhsmruntime.go b/avi/datasource_avi_gslbhsmruntime.go
new file mode 100644
index 000000000..3bdfe35d8
--- /dev/null
+++ b/avi/datasource_avi_gslbhsmruntime.go
@@ -0,0 +1,69 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func dataSourceAviGslbHSMRuntime() *schema.Resource {
+	return &schema.Resource{
+		Read: ResourceAviGslbHSMRuntimeRead,
+		Schema: map[string]*schema.Schema{
+			"cluster_uuid": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"enabled": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"events": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceEventInfoSchema(),
+			},
+			"local_info": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceLocalInfoSchema(),
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"obj_uuid": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"oper_status": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceOperationalStatusSchema(),
+			},
+			"remote_info": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceRemoteInfoSchema(),
+			},
+			"send_interval": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"site_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"tenant_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
diff --git a/avi/datasource_avi_gslbservice.go b/avi/datasource_avi_gslbservice.go
index 6347cd351..c52c05565 100644
--- a/avi/datasource_avi_gslbservice.go
+++ b/avi/datasource_avi_gslbservice.go
@@ -62,6 +62,10 @@ func dataSourceAviGslbService() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"include_additional_records": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"is_federated": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -92,6 +96,10 @@ func dataSourceAviGslbService() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"record_type": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"resolve_cname": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -122,6 +130,10 @@ func dataSourceAviGslbService() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"vrf_uuid_for_gs": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"wildcard_match": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_gslbsmruntime.go b/avi/datasource_avi_gslbsmruntime.go
new file mode 100644
index 000000000..6c41e545e
--- /dev/null
+++ b/avi/datasource_avi_gslbsmruntime.go
@@ -0,0 +1,114 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func dataSourceAviGslbSMRuntime() *schema.Resource {
+	return &schema.Resource{
+		Read: ResourceAviGslbSMRuntimeRead,
+		Schema: map[string]*schema.Schema{
+			"cluster_leader": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"cluster_uuid": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"dns_configs": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceDNSConfigSchema(),
+			},
+			"dns_info": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceGslbDnsInfoSchema(),
+			},
+			"enabled": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"events": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceEventInfoSchema(),
+			},
+			"health_monitor_info": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"leader_cluster_uuid": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"member_type": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"node_uuid": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"num_of_retries": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"obj_uuid": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"oper_status": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceOperationalStatusSchema(),
+			},
+			"remote_info": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceRemoteInfoSchema(),
+			},
+			"role": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"site_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"site_type": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"state": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"sw_version": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"tenant_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"view_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
diff --git a/avi/datasource_avi_healthmonitor.go b/avi/datasource_avi_healthmonitor.go
index f79f17815..b0a5897e8 100644
--- a/avi/datasource_avi_healthmonitor.go
+++ b/avi/datasource_avi_healthmonitor.go
@@ -55,6 +55,16 @@ func dataSourceAviHealthMonitor() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceHealthMonitorFtpSchema(),
 			},
+			"http2_monitor": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceHealthMonitorHttpSchema(),
+			},
+			"http2s_monitor": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceHealthMonitorHttpSchema(),
+			},
 			"http_monitor": {
 				Type:     schema.TypeSet,
 				Computed: true,
diff --git a/avi/datasource_avi_ipreputationdb.go b/avi/datasource_avi_ipreputationdb.go
index 9219ad2cd..f6f066d28 100644
--- a/avi/datasource_avi_ipreputationdb.go
+++ b/avi/datasource_avi_ipreputationdb.go
@@ -14,6 +14,11 @@ func dataSourceAviIPReputationDB() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+			"base_file_v6_refs": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 			"configpb_attributes": {
 				Type:     schema.TypeSet,
 				Computed: true,
@@ -28,6 +33,11 @@ func dataSourceAviIPReputationDB() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+			"incremental_file_v6_refs": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 			"markers": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -53,6 +63,10 @@ func dataSourceAviIPReputationDB() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"v6_version": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"vendor": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_licensestatus.go b/avi/datasource_avi_licensestatus.go
index 58fa91685..119d31744 100644
--- a/avi/datasource_avi_licensestatus.go
+++ b/avi/datasource_avi_licensestatus.go
@@ -14,10 +14,6 @@ func dataSourceAviLicenseStatus() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceConfigPbAttributesSchema(),
 			},
-			"essentials_enforced_at": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"saas_status": {
 				Type:     schema.TypeSet,
 				Computed: true,
diff --git a/avi/datasource_avi_localworkerfdsversion.go b/avi/datasource_avi_localworkerfdsversion.go
new file mode 100644
index 000000000..bad8ff4fa
--- /dev/null
+++ b/avi/datasource_avi_localworkerfdsversion.go
@@ -0,0 +1,37 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func dataSourceAviLocalWorkerFdsVersion() *schema.Resource {
+	return &schema.Resource{
+		Read: ResourceAviLocalWorkerFdsVersionRead,
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"tenant_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"timeline": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"version": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
diff --git a/avi/datasource_avi_pool.go b/avi/datasource_avi_pool.go
index 7fbb2ffd3..b0dee855b 100644
--- a/avi/datasource_avi_pool.go
+++ b/avi/datasource_avi_pool.go
@@ -126,6 +126,10 @@ func dataSourceAviPool() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"graceful_disable_timeout_sec": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"graceful_hm_down_disable_timeout": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_pool_server.go b/avi/datasource_avi_pool_server.go
index 5cf847499..fde234cc4 100644
--- a/avi/datasource_avi_pool_server.go
+++ b/avi/datasource_avi_pool_server.go
@@ -50,6 +50,11 @@ func dataSourceAviServer() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"health_monitor_refs": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 			"hostname": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -95,6 +100,11 @@ func dataSourceAviServer() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"srv_rdata": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceGslbServiceSrvRdataSchema(),
+			},
 			"static": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_retentionpolicy.go b/avi/datasource_avi_retentionpolicy.go
new file mode 100644
index 000000000..e41dc7d57
--- /dev/null
+++ b/avi/datasource_avi_retentionpolicy.go
@@ -0,0 +1,48 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func dataSourceAviRetentionPolicy() *schema.Resource {
+	return &schema.Resource{
+		Read: ResourceAviRetentionPolicyRead,
+		Schema: map[string]*schema.Schema{
+			"enabled": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"history": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceRetentionSummarySchema(),
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"policy": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourcePolicySpecSchema(),
+			},
+			"summary": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceRetentionSummarySchema(),
+			},
+			"tenant_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
diff --git a/avi/datasource_avi_rmcloudopsproto.go b/avi/datasource_avi_rmcloudopsproto.go
index 72c785072..340005974 100644
--- a/avi/datasource_avi_rmcloudopsproto.go
+++ b/avi/datasource_avi_rmcloudopsproto.go
@@ -26,6 +26,10 @@ func dataSourceAviRmCloudOpsProto() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"se_create_limit_reached": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"uuid": {
 				Type:     schema.TypeString,
 				Optional: true,
diff --git a/avi/datasource_avi_serviceenginegroup.go b/avi/datasource_avi_serviceenginegroup.go
index e9b337cd7..b2ad480a9 100644
--- a/avi/datasource_avi_serviceenginegroup.go
+++ b/avi/datasource_avi_serviceenginegroup.go
@@ -45,6 +45,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"arp_cache_timeout": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"async_ssl": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -273,6 +277,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"enable_qat": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"ephemeral_portrange_end": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -397,6 +405,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceKniPortRangeSchema(),
 			},
+			"kv_val_max_len": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"l7_conns_per_core": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -605,6 +617,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"nd6_cache_timeout": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"netlink_poller_threads": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -699,6 +715,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"pre_upgrade_se_available_mem_threshold": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"realtime_se_metrics": {
 				Type:     schema.TypeSet,
 				Computed: true,
@@ -1200,6 +1220,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"waf_use_jit_for_pcre": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
diff --git a/avi/datasource_avi_systemconfiguration.go b/avi/datasource_avi_systemconfiguration.go
index 201bc4339..55fc7e481 100644
--- a/avi/datasource_avi_systemconfiguration.go
+++ b/avi/datasource_avi_systemconfiguration.go
@@ -14,6 +14,10 @@ func dataSourceAviSystemConfiguration() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceAdminAuthConfigurationSchema(),
 			},
+			"avi_email_login_password": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"common_criteria_mode": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -59,10 +63,6 @@ func dataSourceAviSystemConfiguration() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"enable_telemetry": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"fips_mode": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -80,6 +80,10 @@ func dataSourceAviSystemConfiguration() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"legacy_ssl_support": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"linux_configuration": {
 				Type:     schema.TypeSet,
 				Computed: true,
@@ -113,6 +117,10 @@ func dataSourceAviSystemConfiguration() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"sddcmanager_fqdn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"secure_channel_configuration": {
 				Type:     schema.TypeSet,
 				Computed: true,
@@ -133,11 +141,20 @@ func dataSourceAviSystemConfiguration() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+			"telemetry_configuration": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceTelemetryConfigurationSchema(),
+			},
 			"trusted_host_profiles_refs": {
 				Type:     schema.TypeList,
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+			"truststore_pkiprofile_ref": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"uuid": {
 				Type:     schema.TypeString,
 				Optional: true,
diff --git a/avi/datasource_avi_systemreport.go b/avi/datasource_avi_systemreport.go
index 97af21a7e..8b5ecc38d 100644
--- a/avi/datasource_avi_systemreport.go
+++ b/avi/datasource_avi_systemreport.go
@@ -21,6 +21,11 @@ func dataSourceAviSystemReport() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"dryrun_info": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceDryrunInfoSchema(),
+			},
 			"events": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -35,6 +40,10 @@ func dataSourceAviSystemReport() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"operation": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"readiness_reports": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -64,6 +73,10 @@ func dataSourceAviSystemReport() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"type": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"uuid": {
 				Type:     schema.TypeString,
 				Optional: true,
diff --git a/avi/datasource_avi_taskjournal.go b/avi/datasource_avi_taskjournal.go
index 6dc41d82d..b2566a6a9 100644
--- a/avi/datasource_avi_taskjournal.go
+++ b/avi/datasource_avi_taskjournal.go
@@ -45,6 +45,11 @@ func dataSourceAviTaskJournal() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceJournalSummarySchema(),
 			},
+			"tasks": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceJournalTaskSchema(),
+			},
 			"tenant_ref": {
 				Type:     schema.TypeString,
 				Optional: true,
diff --git a/avi/datasource_avi_trustedhostprofile.go b/avi/datasource_avi_trustedhostprofile.go
index 705cb6998..7a21732c8 100644
--- a/avi/datasource_avi_trustedhostprofile.go
+++ b/avi/datasource_avi_trustedhostprofile.go
@@ -17,7 +17,7 @@ func dataSourceAviTrustedHostProfile() *schema.Resource {
 			"hosts": {
 				Type:     schema.TypeList,
 				Computed: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
+				Elem:     ResourceTrustedHostSchema(),
 			},
 			"name": {
 				Type:     schema.TypeString,
diff --git a/avi/datasource_avi_upgradeprofile.go b/avi/datasource_avi_upgradeprofile.go
new file mode 100644
index 000000000..fddad0433
--- /dev/null
+++ b/avi/datasource_avi_upgradeprofile.go
@@ -0,0 +1,44 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func dataSourceAviUpgradeProfile() *schema.Resource {
+	return &schema.Resource{
+		Read: ResourceAviUpgradeProfileRead,
+		Schema: map[string]*schema.Schema{
+			"controller_params": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceControllerParamsSchema(),
+			},
+			"dry_run": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceDryRunParamsSchema(),
+			},
+			"image": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceImageParamsSchema(),
+			},
+			"pre_checks": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourcePreChecksParamsSchema(),
+			},
+			"service_engine": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceServiceEngineParamsSchema(),
+			},
+			"uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
diff --git a/avi/datasource_avi_upgradestatusinfo.go b/avi/datasource_avi_upgradestatusinfo.go
index b561e94e3..044701a3b 100644
--- a/avi/datasource_avi_upgradestatusinfo.go
+++ b/avi/datasource_avi_upgradestatusinfo.go
@@ -21,6 +21,11 @@ func dataSourceAviUpgradeStatusInfo() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"dryrun_info": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceDryrunInfoSchema(),
+			},
 			"duration": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -105,6 +110,10 @@ func dataSourceAviUpgradeStatusInfo() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"prev_remote_image_ref": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"previous_image_ref": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -134,6 +143,10 @@ func dataSourceAviUpgradeStatusInfo() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"remote_image_ref": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"se_patch_image_path": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_vsvip.go b/avi/datasource_avi_vsvip.go
index 2f5612ec9..c6084c50a 100644
--- a/avi/datasource_avi_vsvip.go
+++ b/avi/datasource_avi_vsvip.go
@@ -65,10 +65,6 @@ func dataSourceAviVsVip() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"use_standard_alb": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"uuid": {
 				Type:     schema.TypeString,
 				Optional: true,
diff --git a/avi/datasource_avi_webapput.go b/avi/datasource_avi_webapput.go
index c66a430fd..e670f75d4 100644
--- a/avi/datasource_avi_webapput.go
+++ b/avi/datasource_avi_webapput.go
@@ -9,6 +9,11 @@ func dataSourceAviWebappUT() *schema.Resource {
 	return &schema.Resource{
 		Read: ResourceAviWebappUTRead,
 		Schema: map[string]*schema.Schema{
+			"cloud_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"configpb_attributes": {
 				Type:     schema.TypeSet,
 				Computed: true,
diff --git a/avi/diff_suppress_func.go b/avi/diff_suppress_func.go
index ff9ba2281..fa5d64129 100644
--- a/avi/diff_suppress_func.go
+++ b/avi/diff_suppress_func.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/avi/provider.go b/avi/provider.go
index d62eaf0d4..4a3f52251 100644
--- a/avi/provider.go
+++ b/avi/provider.go
@@ -71,244 +71,256 @@ func Provider() *schema.Provider {
 			},
 		},
 		DataSourcesMap: map[string]*schema.Resource{
+			"avi_autoscalelaunchconfig":           dataSourceAviAutoScaleLaunchConfig(),
+			"avi_serverautoscalepolicy":           dataSourceAviServerAutoScalePolicy(),
 			"avi_rmcloudopsproto":                 dataSourceAviRmCloudOpsProto(),
-			"avi_snmptrapprofile":                 dataSourceAviSnmpTrapProfile(),
-			"avi_gslb":                            dataSourceAviGslb(),
-			"avi_gslbservice":                     dataSourceAviGslbService(),
-			"avi_gslbgeodbprofile":                dataSourceAviGslbGeoDbProfile(),
-			"avi_healthmonitor":                   dataSourceAviHealthMonitor(),
-			"avi_albservicesconfig":               dataSourceAviALBServicesConfig(),
-			"avi_network":                         dataSourceAviNetwork(),
-			"avi_federationcheckpoint":            dataSourceAviFederationCheckpoint(),
-			"avi_siteversion":                     dataSourceAviSiteVersion(),
-			"avi_networkservice":                  dataSourceAviNetworkService(),
-			"avi_securitypolicy":                  dataSourceAviSecurityPolicy(),
 			"avi_statediffoperation":              dataSourceAviStatediffOperation(),
 			"avi_statediffsnapshot":               dataSourceAviStatediffSnapshot(),
-			"avi_csrfpolicy":                      dataSourceAviCSRFPolicy(),
-			"avi_vsvip":                           dataSourceAviVsVip(),
-			"avi_virtualservice":                  dataSourceAviVirtualService(),
-			"avi_serviceenginegroup":              dataSourceAviServiceEngineGroup(),
-			"avi_errorpagebody":                   dataSourceAviErrorPageBody(),
-			"avi_errorpageprofile":                dataSourceAviErrorPageProfile(),
-			"avi_fileobject":                      dataSourceAviFileObject(),
+			"avi_analyticsprofile":                dataSourceAviAnalyticsProfile(),
+			"avi_gslbsmruntime":                   dataSourceAviGslbSMRuntime(),
+			"avi_gslbcrmruntime":                  dataSourceAviGslbCRMRuntime(),
+			"avi_gslbhsmruntime":                  dataSourceAviGslbHSMRuntime(),
+			"avi_localworkerfdsversion":           dataSourceAviLocalWorkerFdsVersion(),
 			"avi_httppolicyset":                   dataSourceAviHTTPPolicySet(),
-			"avi_systemlimits":                    dataSourceAviSystemLimits(),
-			"avi_controllerportalregistration":    dataSourceAviControllerPortalRegistration(),
-			"avi_upgradestatusinfo":               dataSourceAviUpgradeStatusInfo(),
-			"avi_upgradestatussummary":            dataSourceAviUpgradeStatusSummary(),
-			"avi_licenseledgerdetails":            dataSourceAviLicenseLedgerDetails(),
-			"avi_ssopolicy":                       dataSourceAviSSOPolicy(),
 			"avi_systemreport":                    dataSourceAviSystemReport(),
 			"avi_taskjournal":                     dataSourceAviTaskJournal(),
 			"avi_authprofile":                     dataSourceAviAuthProfile(),
 			"avi_authmappingprofile":              dataSourceAviAuthMappingProfile(),
 			"avi_serviceauthprofile":              dataSourceAviServiceAuthProfile(),
-			"avi_controllerproperties":            dataSourceAviControllerProperties(),
+			"avi_icapprofile":                     dataSourceAviIcapProfile(),
+			"avi_ipreputationdb":                  dataSourceAviIPReputationDB(),
+			"avi_snmptrapprofile":                 dataSourceAviSnmpTrapProfile(),
+			"avi_dnspolicy":                       dataSourceAviDnsPolicy(),
 			"avi_l4policyset":                     dataSourceAviL4PolicySet(),
-			"avi_trustedhostprofile":              dataSourceAviTrustedHostProfile(),
-			"avi_systemconfiguration":             dataSourceAviSystemConfiguration(),
-			"avi_controllersite":                  dataSourceAviControllerSite(),
-			"avi_alertsyslogconfig":               dataSourceAviAlertSyslogConfig(),
-			"avi_alertemailconfig":                dataSourceAviAlertEmailConfig(),
-			"avi_alertscriptconfig":               dataSourceAviAlertScriptConfig(),
-			"avi_actiongroupconfig":               dataSourceAviActionGroupConfig(),
-			"avi_alertconfig":                     dataSourceAviAlertConfig(),
-			"avi_inventoryfaultconfig":            dataSourceAviInventoryFaultConfig(),
-			"avi_vrfcontext":                      dataSourceAviVrfContext(),
-			"avi_applicationprofile":              dataSourceAviApplicationProfile(),
+			"avi_vsvip":                           dataSourceAviVsVip(),
+			"avi_virtualservice":                  dataSourceAviVirtualService(),
 			"avi_ipaddrgroup":                     dataSourceAviIpAddrGroup(),
 			"avi_stringgroup":                     dataSourceAviStringGroup(),
 			"avi_microservicegroup":               dataSourceAviMicroServiceGroup(),
+			"avi_gslb":                            dataSourceAviGslb(),
+			"avi_gslbservice":                     dataSourceAviGslbService(),
+			"avi_gslbgeodbprofile":                dataSourceAviGslbGeoDbProfile(),
+			"avi_vrfcontext":                      dataSourceAviVrfContext(),
+			"avi_pool":                            dataSourceAviPool(),
+			"avi_prioritylabels":                  dataSourceAviPriorityLabels(),
+			"avi_poolgroupdeploymentpolicy":       dataSourceAviPoolGroupDeploymentPolicy(),
+			"avi_poolgroup":                       dataSourceAviPoolGroup(),
+			"avi_botmapping":                      dataSourceAviBotMapping(),
+			"avi_botipreputationtypemapping":      dataSourceAviBotIPReputationTypeMapping(),
+			"avi_botconfigconsolidator":           dataSourceAviBotConfigConsolidator(),
+			"avi_botdetectionpolicy":              dataSourceAviBotDetectionPolicy(),
+			"avi_geodb":                           dataSourceAviGeoDB(),
+			"avi_ipamdnsproviderprofile":          dataSourceAviIpamDnsProviderProfile(),
+			"avi_customipamdnsprofile":            dataSourceAviCustomIpamDnsProfile(),
+			"avi_vsgs":                            dataSourceAviVsGs(),
+			"avi_upgradestatusinfo":               dataSourceAviUpgradeStatusInfo(),
+			"avi_upgradestatussummary":            dataSourceAviUpgradeStatusSummary(),
+			"avi_csrfpolicy":                      dataSourceAviCSRFPolicy(),
+			"avi_networkservice":                  dataSourceAviNetworkService(),
+			"avi_serviceenginegroup":              dataSourceAviServiceEngineGroup(),
+			"avi_ssopolicy":                       dataSourceAviSSOPolicy(),
 			"avi_sslprofile":                      dataSourceAviSSLProfile(),
 			"avi_certificatemanagementprofile":    dataSourceAviCertificateManagementProfile(),
 			"avi_sslkeyandcertificate":            dataSourceAviSSLKeyAndCertificate(),
 			"avi_pkiprofile":                      dataSourceAviPKIProfile(),
+			"avi_role":                            dataSourceAviRole(),
+			"avi_useraccountprofile":              dataSourceAviUserAccountProfile(),
+			"avi_user":                            dataSourceAviUser(),
+			"avi_healthmonitor":                   dataSourceAviHealthMonitor(),
+			"avi_errorpagebody":                   dataSourceAviErrorPageBody(),
+			"avi_errorpageprofile":                dataSourceAviErrorPageProfile(),
+			"avi_systemlimits":                    dataSourceAviSystemLimits(),
 			"avi_tenant":                          dataSourceAviTenant(),
-			"avi_vsdatascriptset":                 dataSourceAviVSDataScriptSet(),
+			"avi_federationcheckpoint":            dataSourceAviFederationCheckpoint(),
+			"avi_siteversion":                     dataSourceAviSiteVersion(),
+			"avi_hardwaresecuritymodulegroup":     dataSourceAviHardwareSecurityModuleGroup(),
+			"avi_applicationpersistenceprofile":   dataSourceAviApplicationPersistenceProfile(),
+			"avi_memorybalancerrequest":           dataSourceAviMemoryBalancerRequest(),
+			"avi_alertsyslogconfig":               dataSourceAviAlertSyslogConfig(),
+			"avi_alertemailconfig":                dataSourceAviAlertEmailConfig(),
+			"avi_alertscriptconfig":               dataSourceAviAlertScriptConfig(),
+			"avi_actiongroupconfig":               dataSourceAviActionGroupConfig(),
+			"avi_alertconfig":                     dataSourceAviAlertConfig(),
+			"avi_inventoryfaultconfig":            dataSourceAviInventoryFaultConfig(),
 			"avi_cluster":                         dataSourceAviCluster(),
 			"avi_clusterclouddetails":             dataSourceAviClusterCloudDetails(),
+			"avi_retentionpolicy":                 dataSourceAviRetentionPolicy(),
 			"avi_licensestatus":                   dataSourceAviLicenseStatus(),
-			"avi_role":                            dataSourceAviRole(),
-			"avi_useraccountprofile":              dataSourceAviUserAccountProfile(),
-			"avi_user":                            dataSourceAviUser(),
-			"avi_analyticsprofile":                dataSourceAviAnalyticsProfile(),
-			"avi_wafprofile":                      dataSourceAviWafProfile(),
-			"avi_wafcrs":                          dataSourceAviWafCRS(),
-			"avi_wafpolicypsmgroup":               dataSourceAviWafPolicyPSMGroup(),
-			"avi_wafapplicationsignatureprovider": dataSourceAviWafApplicationSignatureProvider(),
-			"avi_wafpolicy":                       dataSourceAviWafPolicy(),
-			"avi_botmapping":                      dataSourceAviBotMapping(),
-			"avi_botipreputationtypemapping":      dataSourceAviBotIPReputationTypeMapping(),
-			"avi_botconfigconsolidator":           dataSourceAviBotConfigConsolidator(),
-			"avi_botdetectionpolicy":              dataSourceAviBotDetectionPolicy(),
-			"avi_vsgs":                            dataSourceAviVsGs(),
-			"avi_pool":                            dataSourceAviPool(),
-			"avi_prioritylabels":                  dataSourceAviPriorityLabels(),
-			"avi_poolgroupdeploymentpolicy":       dataSourceAviPoolGroupDeploymentPolicy(),
-			"avi_poolgroup":                       dataSourceAviPoolGroup(),
-			"avi_networksecuritypolicy":           dataSourceAviNetworkSecurityPolicy(),
+			"avi_controllerproperties":            dataSourceAviControllerProperties(),
 			"avi_serviceengine":                   dataSourceAviServiceEngine(),
-			"avi_geodb":                           dataSourceAviGeoDB(),
-			"avi_icapprofile":                     dataSourceAviIcapProfile(),
-			"avi_hardwaresecuritymodulegroup":     dataSourceAviHardwareSecurityModuleGroup(),
-			"avi_autoscalelaunchconfig":           dataSourceAviAutoScaleLaunchConfig(),
-			"avi_serverautoscalepolicy":           dataSourceAviServerAutoScalePolicy(),
+			"avi_network":                         dataSourceAviNetwork(),
+			"avi_networksecuritypolicy":           dataSourceAviNetworkSecurityPolicy(),
 			"avi_image":                           dataSourceAviImage(),
-			"avi_memorybalancerrequest":           dataSourceAviMemoryBalancerRequest(),
+			"avi_securitypolicy":                  dataSourceAviSecurityPolicy(),
+			"avi_controllerportalregistration":    dataSourceAviControllerPortalRegistration(),
+			"avi_applicationprofile":              dataSourceAviApplicationProfile(),
+			"avi_albservicesjob":                  dataSourceAviALBServicesJob(),
+			"avi_jwtserverprofile":                dataSourceAviJWTServerProfile(),
 			"avi_cloud":                           dataSourceAviCloud(),
 			"avi_cloudconnectoruser":              dataSourceAviCloudConnectorUser(),
 			"avi_availabilityzone":                dataSourceAviAvailabilityZone(),
 			"avi_vcenterserver":                   dataSourceAviVCenterServer(),
-			"avi_networkprofile":                  dataSourceAviNetworkProfile(),
-			"avi_dnspolicy":                       dataSourceAviDnsPolicy(),
-			"avi_jwtserverprofile":                dataSourceAviJWTServerProfile(),
-			"avi_albservicesjob":                  dataSourceAviALBServicesJob(),
-			"avi_nsxtsegmentruntime":              dataSourceAviNsxtSegmentRuntime(),
-			"avi_ipamdnsproviderprofile":          dataSourceAviIpamDnsProviderProfile(),
-			"avi_customipamdnsprofile":            dataSourceAviCustomIpamDnsProfile(),
 			"avi_backupconfiguration":             dataSourceAviBackupConfiguration(),
 			"avi_scheduler":                       dataSourceAviScheduler(),
-			"avi_ipreputationdb":                  dataSourceAviIPReputationDB(),
-			"avi_applicationpersistenceprofile":   dataSourceAviApplicationPersistenceProfile(),
+			"avi_wafprofile":                      dataSourceAviWafProfile(),
+			"avi_wafcrs":                          dataSourceAviWafCRS(),
+			"avi_wafpolicypsmgroup":               dataSourceAviWafPolicyPSMGroup(),
+			"avi_wafapplicationsignatureprovider": dataSourceAviWafApplicationSignatureProvider(),
+			"avi_wafpolicy":                       dataSourceAviWafPolicy(),
+			"avi_albservicesconfig":               dataSourceAviALBServicesConfig(),
+			"avi_licenseledgerdetails":            dataSourceAviLicenseLedgerDetails(),
+			"avi_fileobject":                      dataSourceAviFileObject(),
+			"avi_trustedhostprofile":              dataSourceAviTrustedHostProfile(),
+			"avi_systemconfiguration":             dataSourceAviSystemConfiguration(),
+			"avi_controllersite":                  dataSourceAviControllerSite(),
+			"avi_nsxtsegmentruntime":              dataSourceAviNsxtSegmentRuntime(),
 			"avi_natpolicy":                       dataSourceAviNatPolicy(),
-			"avi_webapput":                        dataSourceAviWebappUT(),
-			"avi_labelgroup":                      dataSourceAviLabelGroup(),
-			"avi_trafficcloneprofile":             dataSourceAviTrafficCloneProfile(),
+			"avi_vsdatascriptset":                 dataSourceAviVSDataScriptSet(),
+			"avi_networkprofile":                  dataSourceAviNetworkProfile(),
+			"avi_webhook":                         dataSourceAviWebhook(),
 			"avi_testsedatastorelevel1":           dataSourceAviTestSeDatastoreLevel1(),
 			"avi_testsedatastorelevel2":           dataSourceAviTestSeDatastoreLevel2(),
 			"avi_testsedatastorelevel3":           dataSourceAviTestSeDatastoreLevel3(),
-			"avi_albservicesfileupload":           dataSourceAviALBServicesFileUpload(),
 			"avi_dynamicdnsrecord":                dataSourceAviDynamicDnsRecord(),
+			"avi_albservicesfiledownload":         dataSourceAviALBServicesFileDownload(),
+			"avi_labelgroup":                      dataSourceAviLabelGroup(),
 			"avi_seproperties":                    dataSourceAviSeProperties(),
 			"avi_cloudproperties":                 dataSourceAviCloudProperties(),
-			"avi_albservicesfiledownload":         dataSourceAviALBServicesFileDownload(),
+			"avi_trafficcloneprofile":             dataSourceAviTrafficCloneProfile(),
+			"avi_upgradeprofile":                  dataSourceAviUpgradeProfile(),
 			"avi_protocolparser":                  dataSourceAviProtocolParser(),
-			"avi_webhook":                         dataSourceAviWebhook(),
-			"avi_backup":                          dataSourceAviBackup(),
-			"avi_securitymanagerdata":             dataSourceAviSecurityManagerData(),
 			"avi_tenantsystemconfiguration":       dataSourceAviTenantSystemConfiguration(),
+			"avi_albservicesfileupload":           dataSourceAviALBServicesFileUpload(),
+			"avi_webapput":                        dataSourceAviWebappUT(),
+			"avi_securitymanagerdata":             dataSourceAviSecurityManagerData(),
+			"avi_backup":                          dataSourceAviBackup(),
 			"avi_fileservice":                     dataSourceAviFileService(),
 			"avi_server":                          dataSourceAviServer(),
 		},
 		ResourcesMap: map[string]*schema.Resource{
+			"avi_autoscalelaunchconfig":           resourceAviAutoScaleLaunchConfig(),
+			"avi_serverautoscalepolicy":           resourceAviServerAutoScalePolicy(),
 			"avi_rmcloudopsproto":                 resourceAviRmCloudOpsProto(),
-			"avi_snmptrapprofile":                 resourceAviSnmpTrapProfile(),
-			"avi_gslb":                            resourceAviGslb(),
-			"avi_gslbservice":                     resourceAviGslbService(),
-			"avi_gslbgeodbprofile":                resourceAviGslbGeoDbProfile(),
-			"avi_healthmonitor":                   resourceAviHealthMonitor(),
-			"avi_albservicesconfig":               resourceAviALBServicesConfig(),
-			"avi_network":                         resourceAviNetwork(),
-			"avi_federationcheckpoint":            resourceAviFederationCheckpoint(),
-			"avi_siteversion":                     resourceAviSiteVersion(),
-			"avi_networkservice":                  resourceAviNetworkService(),
-			"avi_securitypolicy":                  resourceAviSecurityPolicy(),
 			"avi_statediffoperation":              resourceAviStatediffOperation(),
 			"avi_statediffsnapshot":               resourceAviStatediffSnapshot(),
-			"avi_csrfpolicy":                      resourceAviCSRFPolicy(),
-			"avi_vsvip":                           resourceAviVsVip(),
-			"avi_virtualservice":                  resourceAviVirtualService(),
-			"avi_serviceenginegroup":              resourceAviServiceEngineGroup(),
-			"avi_errorpagebody":                   resourceAviErrorPageBody(),
-			"avi_errorpageprofile":                resourceAviErrorPageProfile(),
-			"avi_fileobject":                      resourceAviFileObject(),
+			"avi_analyticsprofile":                resourceAviAnalyticsProfile(),
+			"avi_gslbsmruntime":                   resourceAviGslbSMRuntime(),
+			"avi_gslbcrmruntime":                  resourceAviGslbCRMRuntime(),
+			"avi_gslbhsmruntime":                  resourceAviGslbHSMRuntime(),
+			"avi_localworkerfdsversion":           resourceAviLocalWorkerFdsVersion(),
 			"avi_httppolicyset":                   resourceAviHTTPPolicySet(),
-			"avi_systemlimits":                    resourceAviSystemLimits(),
-			"avi_controllerportalregistration":    resourceAviControllerPortalRegistration(),
-			"avi_upgradestatusinfo":               resourceAviUpgradeStatusInfo(),
-			"avi_upgradestatussummary":            resourceAviUpgradeStatusSummary(),
-			"avi_licenseledgerdetails":            resourceAviLicenseLedgerDetails(),
-			"avi_ssopolicy":                       resourceAviSSOPolicy(),
 			"avi_systemreport":                    resourceAviSystemReport(),
 			"avi_taskjournal":                     resourceAviTaskJournal(),
 			"avi_authprofile":                     resourceAviAuthProfile(),
 			"avi_authmappingprofile":              resourceAviAuthMappingProfile(),
 			"avi_serviceauthprofile":              resourceAviServiceAuthProfile(),
-			"avi_controllerproperties":            resourceAviControllerProperties(),
+			"avi_icapprofile":                     resourceAviIcapProfile(),
+			"avi_ipreputationdb":                  resourceAviIPReputationDB(),
+			"avi_snmptrapprofile":                 resourceAviSnmpTrapProfile(),
+			"avi_dnspolicy":                       resourceAviDnsPolicy(),
 			"avi_l4policyset":                     resourceAviL4PolicySet(),
-			"avi_trustedhostprofile":              resourceAviTrustedHostProfile(),
-			"avi_systemconfiguration":             resourceAviSystemConfiguration(),
-			"avi_controllersite":                  resourceAviControllerSite(),
-			"avi_alertsyslogconfig":               resourceAviAlertSyslogConfig(),
-			"avi_alertemailconfig":                resourceAviAlertEmailConfig(),
-			"avi_alertscriptconfig":               resourceAviAlertScriptConfig(),
-			"avi_actiongroupconfig":               resourceAviActionGroupConfig(),
-			"avi_alertconfig":                     resourceAviAlertConfig(),
-			"avi_inventoryfaultconfig":            resourceAviInventoryFaultConfig(),
-			"avi_vrfcontext":                      resourceAviVrfContext(),
-			"avi_applicationprofile":              resourceAviApplicationProfile(),
+			"avi_vsvip":                           resourceAviVsVip(),
+			"avi_virtualservice":                  resourceAviVirtualService(),
 			"avi_ipaddrgroup":                     resourceAviIpAddrGroup(),
 			"avi_stringgroup":                     resourceAviStringGroup(),
 			"avi_microservicegroup":               resourceAviMicroServiceGroup(),
+			"avi_gslb":                            resourceAviGslb(),
+			"avi_gslbservice":                     resourceAviGslbService(),
+			"avi_gslbgeodbprofile":                resourceAviGslbGeoDbProfile(),
+			"avi_vrfcontext":                      resourceAviVrfContext(),
+			"avi_pool":                            resourceAviPool(),
+			"avi_prioritylabels":                  resourceAviPriorityLabels(),
+			"avi_poolgroupdeploymentpolicy":       resourceAviPoolGroupDeploymentPolicy(),
+			"avi_poolgroup":                       resourceAviPoolGroup(),
+			"avi_botmapping":                      resourceAviBotMapping(),
+			"avi_botipreputationtypemapping":      resourceAviBotIPReputationTypeMapping(),
+			"avi_botconfigconsolidator":           resourceAviBotConfigConsolidator(),
+			"avi_botdetectionpolicy":              resourceAviBotDetectionPolicy(),
+			"avi_geodb":                           resourceAviGeoDB(),
+			"avi_ipamdnsproviderprofile":          resourceAviIpamDnsProviderProfile(),
+			"avi_customipamdnsprofile":            resourceAviCustomIpamDnsProfile(),
+			"avi_vsgs":                            resourceAviVsGs(),
+			"avi_upgradestatusinfo":               resourceAviUpgradeStatusInfo(),
+			"avi_upgradestatussummary":            resourceAviUpgradeStatusSummary(),
+			"avi_csrfpolicy":                      resourceAviCSRFPolicy(),
+			"avi_networkservice":                  resourceAviNetworkService(),
+			"avi_serviceenginegroup":              resourceAviServiceEngineGroup(),
+			"avi_ssopolicy":                       resourceAviSSOPolicy(),
 			"avi_sslprofile":                      resourceAviSSLProfile(),
 			"avi_certificatemanagementprofile":    resourceAviCertificateManagementProfile(),
 			"avi_sslkeyandcertificate":            resourceAviSSLKeyAndCertificate(),
 			"avi_pkiprofile":                      resourceAviPKIProfile(),
+			"avi_role":                            resourceAviRole(),
+			"avi_useraccountprofile":              resourceAviUserAccountProfile(),
+			"avi_user":                            resourceAviUser(),
+			"avi_healthmonitor":                   resourceAviHealthMonitor(),
+			"avi_errorpagebody":                   resourceAviErrorPageBody(),
+			"avi_errorpageprofile":                resourceAviErrorPageProfile(),
+			"avi_systemlimits":                    resourceAviSystemLimits(),
 			"avi_tenant":                          resourceAviTenant(),
-			"avi_vsdatascriptset":                 resourceAviVSDataScriptSet(),
+			"avi_federationcheckpoint":            resourceAviFederationCheckpoint(),
+			"avi_siteversion":                     resourceAviSiteVersion(),
+			"avi_hardwaresecuritymodulegroup":     resourceAviHardwareSecurityModuleGroup(),
+			"avi_applicationpersistenceprofile":   resourceAviApplicationPersistenceProfile(),
+			"avi_memorybalancerrequest":           resourceAviMemoryBalancerRequest(),
+			"avi_alertsyslogconfig":               resourceAviAlertSyslogConfig(),
+			"avi_alertemailconfig":                resourceAviAlertEmailConfig(),
+			"avi_alertscriptconfig":               resourceAviAlertScriptConfig(),
+			"avi_actiongroupconfig":               resourceAviActionGroupConfig(),
+			"avi_alertconfig":                     resourceAviAlertConfig(),
+			"avi_inventoryfaultconfig":            resourceAviInventoryFaultConfig(),
 			"avi_cluster":                         resourceAviCluster(),
 			"avi_clusterclouddetails":             resourceAviClusterCloudDetails(),
+			"avi_retentionpolicy":                 resourceAviRetentionPolicy(),
 			"avi_licensestatus":                   resourceAviLicenseStatus(),
-			"avi_role":                            resourceAviRole(),
-			"avi_useraccountprofile":              resourceAviUserAccountProfile(),
-			"avi_user":                            resourceAviUser(),
-			"avi_analyticsprofile":                resourceAviAnalyticsProfile(),
-			"avi_wafprofile":                      resourceAviWafProfile(),
-			"avi_wafcrs":                          resourceAviWafCRS(),
-			"avi_wafpolicypsmgroup":               resourceAviWafPolicyPSMGroup(),
-			"avi_wafapplicationsignatureprovider": resourceAviWafApplicationSignatureProvider(),
-			"avi_wafpolicy":                       resourceAviWafPolicy(),
-			"avi_botmapping":                      resourceAviBotMapping(),
-			"avi_botipreputationtypemapping":      resourceAviBotIPReputationTypeMapping(),
-			"avi_botconfigconsolidator":           resourceAviBotConfigConsolidator(),
-			"avi_botdetectionpolicy":              resourceAviBotDetectionPolicy(),
-			"avi_vsgs":                            resourceAviVsGs(),
-			"avi_pool":                            resourceAviPool(),
-			"avi_prioritylabels":                  resourceAviPriorityLabels(),
-			"avi_poolgroupdeploymentpolicy":       resourceAviPoolGroupDeploymentPolicy(),
-			"avi_poolgroup":                       resourceAviPoolGroup(),
-			"avi_networksecuritypolicy":           resourceAviNetworkSecurityPolicy(),
+			"avi_controllerproperties":            resourceAviControllerProperties(),
 			"avi_serviceengine":                   resourceAviServiceEngine(),
-			"avi_geodb":                           resourceAviGeoDB(),
-			"avi_icapprofile":                     resourceAviIcapProfile(),
-			"avi_hardwaresecuritymodulegroup":     resourceAviHardwareSecurityModuleGroup(),
-			"avi_autoscalelaunchconfig":           resourceAviAutoScaleLaunchConfig(),
-			"avi_serverautoscalepolicy":           resourceAviServerAutoScalePolicy(),
+			"avi_network":                         resourceAviNetwork(),
+			"avi_networksecuritypolicy":           resourceAviNetworkSecurityPolicy(),
 			"avi_image":                           resourceAviImage(),
-			"avi_memorybalancerrequest":           resourceAviMemoryBalancerRequest(),
+			"avi_securitypolicy":                  resourceAviSecurityPolicy(),
+			"avi_controllerportalregistration":    resourceAviControllerPortalRegistration(),
+			"avi_applicationprofile":              resourceAviApplicationProfile(),
+			"avi_albservicesjob":                  resourceAviALBServicesJob(),
+			"avi_jwtserverprofile":                resourceAviJWTServerProfile(),
 			"avi_cloud":                           resourceAviCloud(),
 			"avi_cloudconnectoruser":              resourceAviCloudConnectorUser(),
 			"avi_availabilityzone":                resourceAviAvailabilityZone(),
 			"avi_vcenterserver":                   resourceAviVCenterServer(),
-			"avi_networkprofile":                  resourceAviNetworkProfile(),
-			"avi_dnspolicy":                       resourceAviDnsPolicy(),
-			"avi_jwtserverprofile":                resourceAviJWTServerProfile(),
-			"avi_albservicesjob":                  resourceAviALBServicesJob(),
-			"avi_nsxtsegmentruntime":              resourceAviNsxtSegmentRuntime(),
-			"avi_ipamdnsproviderprofile":          resourceAviIpamDnsProviderProfile(),
-			"avi_customipamdnsprofile":            resourceAviCustomIpamDnsProfile(),
 			"avi_backupconfiguration":             resourceAviBackupConfiguration(),
 			"avi_scheduler":                       resourceAviScheduler(),
-			"avi_ipreputationdb":                  resourceAviIPReputationDB(),
-			"avi_applicationpersistenceprofile":   resourceAviApplicationPersistenceProfile(),
+			"avi_wafprofile":                      resourceAviWafProfile(),
+			"avi_wafcrs":                          resourceAviWafCRS(),
+			"avi_wafpolicypsmgroup":               resourceAviWafPolicyPSMGroup(),
+			"avi_wafapplicationsignatureprovider": resourceAviWafApplicationSignatureProvider(),
+			"avi_wafpolicy":                       resourceAviWafPolicy(),
+			"avi_albservicesconfig":               resourceAviALBServicesConfig(),
+			"avi_licenseledgerdetails":            resourceAviLicenseLedgerDetails(),
+			"avi_fileobject":                      resourceAviFileObject(),
+			"avi_trustedhostprofile":              resourceAviTrustedHostProfile(),
+			"avi_systemconfiguration":             resourceAviSystemConfiguration(),
+			"avi_controllersite":                  resourceAviControllerSite(),
+			"avi_nsxtsegmentruntime":              resourceAviNsxtSegmentRuntime(),
 			"avi_natpolicy":                       resourceAviNatPolicy(),
-			"avi_webapput":                        resourceAviWebappUT(),
-			"avi_labelgroup":                      resourceAviLabelGroup(),
-			"avi_trafficcloneprofile":             resourceAviTrafficCloneProfile(),
+			"avi_vsdatascriptset":                 resourceAviVSDataScriptSet(),
+			"avi_networkprofile":                  resourceAviNetworkProfile(),
+			"avi_webhook":                         resourceAviWebhook(),
 			"avi_testsedatastorelevel1":           resourceAviTestSeDatastoreLevel1(),
 			"avi_testsedatastorelevel2":           resourceAviTestSeDatastoreLevel2(),
 			"avi_testsedatastorelevel3":           resourceAviTestSeDatastoreLevel3(),
-			"avi_albservicesfileupload":           resourceAviALBServicesFileUpload(),
 			"avi_dynamicdnsrecord":                resourceAviDynamicDnsRecord(),
+			"avi_albservicesfiledownload":         resourceAviALBServicesFileDownload(),
+			"avi_labelgroup":                      resourceAviLabelGroup(),
 			"avi_seproperties":                    resourceAviSeProperties(),
 			"avi_cloudproperties":                 resourceAviCloudProperties(),
-			"avi_albservicesfiledownload":         resourceAviALBServicesFileDownload(),
+			"avi_trafficcloneprofile":             resourceAviTrafficCloneProfile(),
+			"avi_upgradeprofile":                  resourceAviUpgradeProfile(),
 			"avi_protocolparser":                  resourceAviProtocolParser(),
-			"avi_webhook":                         resourceAviWebhook(),
-			"avi_backup":                          resourceAviBackup(),
-			"avi_securitymanagerdata":             resourceAviSecurityManagerData(),
 			"avi_tenantsystemconfiguration":       resourceAviTenantSystemConfiguration(),
+			"avi_albservicesfileupload":           resourceAviALBServicesFileUpload(),
+			"avi_webapput":                        resourceAviWebappUT(),
+			"avi_securitymanagerdata":             resourceAviSecurityManagerData(),
+			"avi_backup":                          resourceAviBackup(),
 			"avi_useraccount":                     resourceAviUserAccount(),
 			"avi_fileservice":                     resourceAviFileService(),
 			"avi_server":                          resourceAviServer(),
diff --git a/avi/provider_test.go b/avi/provider_test.go
index 73394a9bf..518b50e22 100644
--- a/avi/provider_test.go
+++ b/avi/provider_test.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/avi/resource_avi_alertconfig_test.go b/avi/resource_avi_alertconfig_test.go
index 15ca83ed3..7b79da3e3 100644
--- a/avi/resource_avi_alertconfig_test.go
+++ b/avi/resource_avi_alertconfig_test.go
@@ -160,14 +160,6 @@ sys_event_rule {
 	event_id = "VCENTER_ACCESS_SLOW"
 	not_cond = false
 }
-sys_event_rule {
-	event_id = "OPENSTACK_ACCESS_FAILURE"
-	not_cond = false
-}
-sys_event_rule {
-	event_id = "OPENSTACK_IMAGE_UPLOAD_FAILURE"
-	not_cond = false
-}
 sys_event_rule {
 	event_id = "AWS_ACCESS_FAILURE"
 	not_cond = false
@@ -216,14 +208,6 @@ sys_event_rule {
 	event_id = "CLOUDSTACK_IMAGE_UPLOAD_FAILURE"
 	not_cond = false
 }
-sys_event_rule {
-	event_id = "DOCKER_UCP_ACCESS_FAILURE"
-	not_cond = false
-}
-sys_event_rule {
-	event_id = "DOCKER_UCP_IMAGE_UPLOAD_FAILURE"
-	not_cond = false
-}
 sys_event_rule {
 	event_id = "VCA_ACCESS_FAILURE"
 	not_cond = false
@@ -240,14 +224,6 @@ sys_event_rule {
 	event_id = "LS_IMAGE_UPLOAD_FAILURE"
 	not_cond = false
 }
-sys_event_rule {
-	event_id = "MESOS_ACCESS_FAILURE"
-	not_cond = false
-}
-sys_event_rule {
-	event_id = "MESOS_IMAGE_UPLOAD_FAILURE"
-	not_cond = false
-}
 sys_event_rule {
 	event_id = "CC_SE_CREATION_FAILURE"
 	not_cond = false
@@ -425,14 +401,6 @@ sys_event_rule {
 	event_id = "VCENTER_ACCESS_SLOW"
 	not_cond = false
 }
-sys_event_rule {
-	event_id = "OPENSTACK_ACCESS_FAILURE"
-	not_cond = false
-}
-sys_event_rule {
-	event_id = "OPENSTACK_IMAGE_UPLOAD_FAILURE"
-	not_cond = false
-}
 sys_event_rule {
 	event_id = "AWS_ACCESS_FAILURE"
 	not_cond = false
@@ -481,14 +449,6 @@ sys_event_rule {
 	event_id = "CLOUDSTACK_IMAGE_UPLOAD_FAILURE"
 	not_cond = false
 }
-sys_event_rule {
-	event_id = "DOCKER_UCP_ACCESS_FAILURE"
-	not_cond = false
-}
-sys_event_rule {
-	event_id = "DOCKER_UCP_IMAGE_UPLOAD_FAILURE"
-	not_cond = false
-}
 sys_event_rule {
 	event_id = "VCA_ACCESS_FAILURE"
 	not_cond = false
@@ -505,14 +465,6 @@ sys_event_rule {
 	event_id = "LS_IMAGE_UPLOAD_FAILURE"
 	not_cond = false
 }
-sys_event_rule {
-	event_id = "MESOS_ACCESS_FAILURE"
-	not_cond = false
-}
-sys_event_rule {
-	event_id = "MESOS_IMAGE_UPLOAD_FAILURE"
-	not_cond = false
-}
 sys_event_rule {
 	event_id = "CC_SE_CREATION_FAILURE"
 	not_cond = false
diff --git a/avi/resource_avi_alertsyslogconfig_test.go b/avi/resource_avi_alertsyslogconfig_test.go
index 815898791..300425ee4 100644
--- a/avi/resource_avi_alertsyslogconfig_test.go
+++ b/avi/resource_avi_alertsyslogconfig_test.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/avi/resource_avi_applicationpersistenceprofile.go b/avi/resource_avi_applicationpersistenceprofile.go
index bc553fea7..c4f30ea6e 100644
--- a/avi/resource_avi_applicationpersistenceprofile.go
+++ b/avi/resource_avi_applicationpersistenceprofile.go
@@ -27,6 +27,12 @@ func ResourceApplicationPersistenceProfileSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"diameter_app_persistence_profile": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceDiameterAVPPersistenceProfileSchema(),
+		},
 		"hdr_persistence_profile": {
 			Type:     schema.TypeSet,
 			Optional: true,
diff --git a/avi/resource_avi_applicationprofile.go b/avi/resource_avi_applicationprofile.go
index a7dc62db4..c19c2a2fa 100644
--- a/avi/resource_avi_applicationprofile.go
+++ b/avi/resource_avi_applicationprofile.go
@@ -36,6 +36,12 @@ func ResourceApplicationProfileSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"diameter_service_profile": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceDiameterServiceApplicationProfileSchema(),
+		},
 		"dns_service_profile": {
 			Type:     schema.TypeSet,
 			Optional: true,
diff --git a/avi/resource_avi_applicationprofile_test.go b/avi/resource_avi_applicationprofile_test.go
index c7d0c44bf..91d06aaca 100644
--- a/avi/resource_avi_applicationprofile_test.go
+++ b/avi/resource_avi_applicationprofile_test.go
@@ -161,6 +161,13 @@ resource "avi_applicationprofile" "testApplicationProfile" {
 			mime_types_group_refs = [data.avi_stringgroup.system_cacheablestringgroup.id]
 		}
 		http2_profile {
+			http2_initial_window_size = "64"
+			max_http2_concurrent_streams_per_connection = "128"
+			max_http2_control_frames_per_connection = "1000"
+			max_http2_empty_data_frames_per_connection = "1000"
+			max_http2_header_field_size = "4096"
+			max_http2_queued_frames_to_client_per_connection = "1000"
+			max_http2_requests_per_connection = "1000"
 		}
 		max_rps_unknown_uri = "0"
 		post_accept_timeout = "30000"
@@ -176,6 +183,9 @@ resource "avi_applicationprofile" "testApplicationProfile" {
 		use_app_keepalive_timeout = false
 	}
 	preserve_client_port = false
+	l4_ssl_profile {
+		ssl_stream_idle_timeout = "3600"
+	}
 }
 `
 
@@ -242,6 +252,13 @@ resource "avi_applicationprofile" "testApplicationProfile" {
 			mime_types_group_refs = [data.avi_stringgroup.system_cacheablestringgroup.id]
 		}
 		http2_profile {
+			http2_initial_window_size = "64"
+			max_http2_concurrent_streams_per_connection = "128"
+			max_http2_control_frames_per_connection = "1000"
+			max_http2_empty_data_frames_per_connection = "1000"
+			max_http2_header_field_size = "4096"
+			max_http2_queued_frames_to_client_per_connection = "1000"
+			max_http2_requests_per_connection = "1000"
 		}
 		max_rps_unknown_uri = "0"
 		post_accept_timeout = "30000"
@@ -257,5 +274,8 @@ resource "avi_applicationprofile" "testApplicationProfile" {
 		use_app_keepalive_timeout = false
 	}
 	preserve_client_port = false
+	l4_ssl_profile {
+		ssl_stream_idle_timeout = "3600"
+	}
 }
 `
diff --git a/avi/resource_avi_availabilityzone.go b/avi/resource_avi_availabilityzone.go
index be2b54822..b1610d468 100644
--- a/avi/resource_avi_availabilityzone.go
+++ b/avi/resource_avi_availabilityzone.go
@@ -10,6 +10,17 @@ import (
 
 func ResourceAvailabilityZoneSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
+		"az_clusters": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceAZClusterSchema(),
+		},
+		"az_datastore": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceAZDatastoreSchema(),
+		},
 		"cloud_ref": {
 			Type:     schema.TypeString,
 			Optional: true,
@@ -35,11 +46,6 @@ func ResourceAvailabilityZoneSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
-		"vcenter_refs": {
-			Type:     schema.TypeList,
-			Required: true,
-			Elem:     &schema.Schema{Type: schema.TypeString},
-		},
 	}
 }
 
diff --git a/avi/resource_avi_backupconfiguration.go b/avi/resource_avi_backupconfiguration.go
index 0f9175a60..526b04406 100644
--- a/avi/resource_avi_backupconfiguration.go
+++ b/avi/resource_avi_backupconfiguration.go
@@ -46,6 +46,12 @@ func ResourceBackupConfigurationSchema() map[string]*schema.Schema {
 			Sensitive:        true,
 			DiffSuppressFunc: suppressSensitiveFieldDiffs,
 		},
+		"bundle_mode": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
 		"configpb_attributes": {
 			Type:     schema.TypeSet,
 			Optional: true,
diff --git a/avi/resource_avi_botconfigconsolidator.go b/avi/resource_avi_botconfigconsolidator.go
index ad714e4d6..2987906e0 100644
--- a/avi/resource_avi_botconfigconsolidator.go
+++ b/avi/resource_avi_botconfigconsolidator.go
@@ -10,6 +10,12 @@ import (
 
 func ResourceBotConfigConsolidatorSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
+		"configpb_attributes": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceConfigPbAttributesSchema(),
+		},
 		"description": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_botdetectionpolicy.go b/avi/resource_avi_botdetectionpolicy.go
index 25f7222eb..be66b1c31 100644
--- a/avi/resource_avi_botdetectionpolicy.go
+++ b/avi/resource_avi_botdetectionpolicy.go
@@ -22,6 +22,12 @@ func ResourceBotDetectionPolicySchema() map[string]*schema.Schema {
 			Computed: true,
 			Elem:     ResourceBotConfigClientBehaviorSchema(),
 		},
+		"configpb_attributes": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceConfigPbAttributesSchema(),
+		},
 		"description": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_botipreputationtypemapping.go b/avi/resource_avi_botipreputationtypemapping.go
index 5dedacfce..1cfc02699 100644
--- a/avi/resource_avi_botipreputationtypemapping.go
+++ b/avi/resource_avi_botipreputationtypemapping.go
@@ -10,6 +10,12 @@ import (
 
 func ResourceBotIPReputationTypeMappingSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
+		"configpb_attributes": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceConfigPbAttributesSchema(),
+		},
 		"ip_reputation_mappings": {
 			Type:     schema.TypeList,
 			Optional: true,
diff --git a/avi/resource_avi_botmapping.go b/avi/resource_avi_botmapping.go
index bedc5f6dc..10a9d2449 100644
--- a/avi/resource_avi_botmapping.go
+++ b/avi/resource_avi_botmapping.go
@@ -10,6 +10,12 @@ import (
 
 func ResourceBotMappingSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
+		"configpb_attributes": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceConfigPbAttributesSchema(),
+		},
 		"mapping_rules": {
 			Type:     schema.TypeList,
 			Optional: true,
diff --git a/avi/resource_avi_certificatemanagementprofile_test.go b/avi/resource_avi_certificatemanagementprofile_test.go
index d4c88c897..f6399aaae 100644
--- a/avi/resource_avi_certificatemanagementprofile_test.go
+++ b/avi/resource_avi_certificatemanagementprofile_test.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/avi/resource_avi_cloud.go b/avi/resource_avi_cloud.go
index 3945da3cf..898b29ad6 100644
--- a/avi/resource_avi_cloud.go
+++ b/avi/resource_avi_cloud.go
@@ -192,12 +192,6 @@ func ResourceCloudSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
-		"openstack_configuration": {
-			Type:     schema.TypeSet,
-			Optional: true,
-			Computed: true,
-			Elem:     ResourceOpenStackConfigurationSchema(),
-		},
 		"prefer_static_routes": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -296,16 +290,16 @@ func ResourceAviCloudRead(d *schema.ResourceData, meta interface{}) error {
 }
 
 // Wait until cloud is ready for the placement
-func waitForCloudState(cloudUUID string, expectedCloudState string, client *clients.AviClient, maxRetry int) error {
+func waitForCloudState(cloudUUID string, cloudName string, expectedCloudState string, client *clients.AviClient, maxRetry int) error {
 	var robj interface{}
 	var err error
 	var cloudState string
+	var resp *models.CloudInventory
 	path := "api/cloud-inventory?uuid=" + cloudUUID
 	i := 0
 	for ; i < maxRetry; i++ {
 		if err = client.AviSession.Get(path, &robj); err == nil {
 			if objCount := robj.(map[string]interface{})["count"].(float64); objCount == float64(1) {
-				var resp *models.CloudInventory
 				jsonString, marshalErr := json.Marshal(robj.(map[string]interface{})["results"].([]interface{})[0])
 				if marshalErr != nil {
 					log.Printf("[Error] Got error while marshaling the response from the cloud-inventory api. %s", marshalErr.Error())
@@ -331,7 +325,12 @@ func waitForCloudState(cloudUUID string, expectedCloudState string, client *clie
 		time.Sleep(10 * time.Second)
 	}
 	if i == maxRetry && err == nil {
-		err = errors.New("didn't get expected state CLOUD_STATE_PLACEMENT_READY in cloud-inventory. Current State: " + cloudState)
+		if resp.Status != nil && resp.Status.Reason != nil {
+			reason := *((*resp).Status.Reason)
+			err = errors.New("Cloud Status is not as expected or reason not null. Expected=" + expectedCloudState + " Received=" + cloudState + ", reason=" + reason)
+		} else {
+			err = errors.New("Failed to fetch the status of the cloud.:" + cloudName)
+		}
 	}
 	return err
 }
@@ -353,18 +352,26 @@ func setupVcenterMgmtNetwork(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*clients.AviClient)
 	vcenterConfig, _ := d.GetOk("vcenter_configuration")
 	mgmtNetwork := vcenterConfig.(*schema.Set).List()[0].(map[string]interface{})["management_network"].(string)
-	if err := APIUpdate(d, meta, "cloud", s); err != nil {
-		log.Printf("[Error] Got error for cloud create/update. Error: %s", err.Error())
-		return err
+	if _, ok := d.GetOk("uuid"); ok {
+		if err := APIUpdate(d, meta, "cloud", s); err != nil {
+			log.Printf("[Error] Got error for cloud update. Error: %s", err.Error())
+			return err
+		}
+	} else {
+		if err := APICreate(d, meta, "cloud", s); err != nil {
+			log.Printf("[Error] Got error for cloud create. Error: %s", err.Error())
+			return err
+		}
 	}
 	uuid := d.Get("uuid").(string)
+	name := d.Get("name").(string)
 	if ok := strings.Contains(mgmtNetwork, "api/"); !ok {
 		mgmtNetwork = "vimgrruntime?name=" + mgmtNetwork
 		vcenterConfig.(*schema.Set).List()[0].(map[string]interface{})["management_network"] = mgmtNetwork
 		if err := d.Set("vcenter_configuration", vcenterConfig); err != nil {
 			return err
 		}
-		if err := waitForCloudState(uuid, "CLOUD_STATE_FAILED", client, maxRetry); err != nil {
+		if err := waitForCloudState(uuid, name, "CLOUD_STATE_FAILED", client, maxRetry); err != nil {
 			return err
 		}
 		if err := APIUpdate(d, meta, "cloud", s); err != nil {
@@ -372,7 +379,7 @@ func setupVcenterMgmtNetwork(d *schema.ResourceData, meta interface{}) error {
 			return err
 		}
 	}
-	if err := waitForCloudState(uuid, "CLOUD_STATE_PLACEMENT_READY", client, maxRetry); err != nil {
+	if err := waitForCloudState(uuid, name, "CLOUD_STATE_PLACEMENT_READY", client, maxRetry); err != nil {
 		return err
 	}
 	return nil
diff --git a/avi/resource_avi_cloudconnectoruser.go b/avi/resource_avi_cloudconnectoruser.go
index bb034c7a4..1bfd2a1d6 100644
--- a/avi/resource_avi_cloudconnectoruser.go
+++ b/avi/resource_avi_cloudconnectoruser.go
@@ -44,12 +44,6 @@ func ResourceCloudConnectorUserSchema() map[string]*schema.Schema {
 			Computed: true,
 			Elem:     ResourceNsxtCredentialsSchema(),
 		},
-		"oci_credentials": {
-			Type:     schema.TypeSet,
-			Optional: true,
-			Computed: true,
-			Elem:     ResourceOCICredentialsSchema(),
-		},
 		"password": {
 			Type:             schema.TypeString,
 			Optional:         true,
diff --git a/avi/resource_avi_controllerproperties.go b/avi/resource_avi_controllerproperties.go
index 8d1c16544..723e8d8d8 100644
--- a/avi/resource_avi_controllerproperties.go
+++ b/avi/resource_avi_controllerproperties.go
@@ -58,6 +58,12 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema {
 			Default:      "false",
 			ValidateFunc: validateBool,
 		},
+		"archive_retention_framework_period": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "60",
+			ValidateFunc: validateInteger,
+		},
 		"async_patch_merge_period": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -220,6 +226,12 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema {
 			Default:      "true",
 			ValidateFunc: validateBool,
 		},
+		"enable_nsx_streaming_agent": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "true",
+			ValidateFunc: validateBool,
+		},
 		"enable_per_process_stop": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -280,6 +292,12 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema {
 			Default:      "3",
 			ValidateFunc: validateInteger,
 		},
+		"gslb_fileobject_max_version_count": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "3",
+			ValidateFunc: validateInteger,
+		},
 		"gslb_purge_batch_size": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -471,31 +489,13 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema {
 			Default:      "60",
 			ValidateFunc: validateInteger,
 		},
-		"seupgrade_copy_buffer_size": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "512",
-			ValidateFunc: validateInteger,
-		},
-		"seupgrade_copy_pool_size": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "5",
-			ValidateFunc: validateInteger,
-		},
-		"seupgrade_fabric_pool_size": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "20",
-			ValidateFunc: validateInteger,
-		},
-		"seupgrade_segroup_min_dead_timeout": {
+		"shared_ssl_certificates": {
 			Type:         schema.TypeString,
 			Optional:     true,
-			Default:      "360",
-			ValidateFunc: validateInteger,
+			Default:      "false",
+			ValidateFunc: validateBool,
 		},
-		"shared_ssl_certificates": {
+		"skip_beego_perf_collection": {
 			Type:         schema.TypeString,
 			Optional:     true,
 			Default:      "false",
@@ -512,17 +512,11 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema {
 			Optional: true,
 			Elem:     &schema.Schema{Type: schema.TypeInt},
 		},
-		"system_report_cleanup_interval": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "60",
-			ValidateFunc: validateInteger,
-		},
-		"system_report_limit": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "10",
-			ValidateFunc: validateInteger,
+		"statecache_properties": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceSCPropertiesSchema(),
 		},
 		"unresponsive_se_reboot": {
 			Type:         schema.TypeString,
@@ -548,18 +542,6 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema {
 			Default:      "5",
 			ValidateFunc: validateInteger,
 		},
-		"upgrade_fat_se_lease_time": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "1200",
-			ValidateFunc: validateInteger,
-		},
-		"upgrade_lease_time": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "600",
-			ValidateFunc: validateInteger,
-		},
 		"upgrade_se_per_vs_scale_ops_txn_time": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_csrfpolicy.go b/avi/resource_avi_csrfpolicy.go
index d940f0c5f..0e22fca3c 100644
--- a/avi/resource_avi_csrfpolicy.go
+++ b/avi/resource_avi_csrfpolicy.go
@@ -21,6 +21,11 @@ func ResourceCSRFPolicySchema() map[string]*schema.Schema {
 			Optional: true,
 			Default:  "X-CSRF-TOKEN",
 		},
+		"csrf_file_ref": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
 		"description": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_fileobject.go b/avi/resource_avi_fileobject.go
index 9815805db..73e1e2966 100644
--- a/avi/resource_avi_fileobject.go
+++ b/avi/resource_avi_fileobject.go
@@ -15,6 +15,11 @@ func ResourceFileObjectSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"child_refs": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     &schema.Schema{Type: schema.TypeString},
+		},
 		"compressed": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -43,11 +48,27 @@ func ResourceFileObjectSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"events": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceFileObjectEventMapSchema(),
+		},
 		"expires_at": {
 			Type:     schema.TypeString,
 			Optional: true,
 			Computed: true,
 		},
+		"gslb_geodb_format": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"has_parent": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
 		"is_federated": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_fileservice.go b/avi/resource_avi_fileservice.go
index fff4b4585..ffc04a515 100755
--- a/avi/resource_avi_fileservice.go
+++ b/avi/resource_avi_fileservice.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/avi/resource_avi_gslb.go b/avi/resource_avi_gslb.go
index 065a5f7c9..27d1a26e4 100644
--- a/avi/resource_avi_gslb.go
+++ b/avi/resource_avi_gslb.go
@@ -62,6 +62,12 @@ func ResourceGslbSchema() map[string]*schema.Schema {
 			Default:      "3",
 			ValidateFunc: validateInteger,
 		},
+		"gs_member_fqdn_resolution_on_se": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
 		"is_federated": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -100,6 +106,12 @@ func ResourceGslbSchema() map[string]*schema.Schema {
 			Computed:     true,
 			ValidateFunc: validateInteger,
 		},
+		"short_probe_interval": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "30",
+			ValidateFunc: validateInteger,
+		},
 		"sites": {
 			Type:     schema.TypeList,
 			Required: true,
diff --git a/avi/resource_avi_gslbcrmruntime.go b/avi/resource_avi_gslbcrmruntime.go
new file mode 100644
index 000000000..5f6324153
--- /dev/null
+++ b/avi/resource_avi_gslbcrmruntime.go
@@ -0,0 +1,137 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
+)
+
+func ResourceGslbCRMRuntimeSchema() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"cluster_uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"events": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceEventInfoSchema(),
+		},
+		"fds_info": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceFdsInfoSchema(),
+		},
+		"local_info": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceLocalInfoSchema(),
+		},
+		"name": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"obj_uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"remote_info": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceRemoteInfoSchema(),
+		},
+		"replication_policy": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceReplicationPolicySchema(),
+		},
+		"site_name": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"status_info": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceOperationalStatusSchema(),
+		},
+		"tenant_ref": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+	}
+}
+
+func resourceAviGslbCRMRuntime() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAviGslbCRMRuntimeCreate,
+		Read:   ResourceAviGslbCRMRuntimeRead,
+		Update: resourceAviGslbCRMRuntimeUpdate,
+		Delete: resourceAviGslbCRMRuntimeDelete,
+		Schema: ResourceGslbCRMRuntimeSchema(),
+		Importer: &schema.ResourceImporter{
+			State: ResourceGslbCRMRuntimeImporter,
+		},
+	}
+}
+
+func ResourceGslbCRMRuntimeImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
+	s := ResourceGslbCRMRuntimeSchema()
+	return ResourceImporter(d, m, "gslbcrmruntime", s)
+}
+
+func ResourceAviGslbCRMRuntimeRead(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceGslbCRMRuntimeSchema()
+	err := APIRead(d, meta, "gslbcrmruntime", s)
+	if err != nil {
+		log.Printf("[ERROR] in reading object %v\n", err)
+	}
+	return err
+}
+
+func resourceAviGslbCRMRuntimeCreate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceGslbCRMRuntimeSchema()
+	err := APICreate(d, meta, "gslbcrmruntime", s)
+	if err == nil {
+		err = ResourceAviGslbCRMRuntimeRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviGslbCRMRuntimeUpdate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceGslbCRMRuntimeSchema()
+	var err error
+	err = APIUpdate(d, meta, "gslbcrmruntime", s)
+	if err == nil {
+		err = ResourceAviGslbCRMRuntimeRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviGslbCRMRuntimeDelete(d *schema.ResourceData, meta interface{}) error {
+	var err error
+	if APIDeleteSystemDefaultCheck(d) {
+		return nil
+	}
+	err = APIDelete(d, meta, "gslbcrmruntime")
+	if err != nil {
+		log.Printf("[ERROR] in deleting object %v\n", err)
+	}
+	return err
+}
diff --git a/avi/resource_avi_gslbhsmruntime.go b/avi/resource_avi_gslbhsmruntime.go
new file mode 100644
index 000000000..ab9d36254
--- /dev/null
+++ b/avi/resource_avi_gslbhsmruntime.go
@@ -0,0 +1,137 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
+)
+
+func ResourceGslbHSMRuntimeSchema() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"cluster_uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"enabled": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Computed:     true,
+			ValidateFunc: validateBool,
+		},
+		"events": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceEventInfoSchema(),
+		},
+		"local_info": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceLocalInfoSchema(),
+		},
+		"name": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"obj_uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"oper_status": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceOperationalStatusSchema(),
+		},
+		"remote_info": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceRemoteInfoSchema(),
+		},
+		"send_interval": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Computed:     true,
+			ValidateFunc: validateInteger,
+		},
+		"site_name": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"tenant_ref": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+	}
+}
+
+func resourceAviGslbHSMRuntime() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAviGslbHSMRuntimeCreate,
+		Read:   ResourceAviGslbHSMRuntimeRead,
+		Update: resourceAviGslbHSMRuntimeUpdate,
+		Delete: resourceAviGslbHSMRuntimeDelete,
+		Schema: ResourceGslbHSMRuntimeSchema(),
+		Importer: &schema.ResourceImporter{
+			State: ResourceGslbHSMRuntimeImporter,
+		},
+	}
+}
+
+func ResourceGslbHSMRuntimeImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
+	s := ResourceGslbHSMRuntimeSchema()
+	return ResourceImporter(d, m, "gslbhsmruntime", s)
+}
+
+func ResourceAviGslbHSMRuntimeRead(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceGslbHSMRuntimeSchema()
+	err := APIRead(d, meta, "gslbhsmruntime", s)
+	if err != nil {
+		log.Printf("[ERROR] in reading object %v\n", err)
+	}
+	return err
+}
+
+func resourceAviGslbHSMRuntimeCreate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceGslbHSMRuntimeSchema()
+	err := APICreate(d, meta, "gslbhsmruntime", s)
+	if err == nil {
+		err = ResourceAviGslbHSMRuntimeRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviGslbHSMRuntimeUpdate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceGslbHSMRuntimeSchema()
+	var err error
+	err = APIUpdate(d, meta, "gslbhsmruntime", s)
+	if err == nil {
+		err = ResourceAviGslbHSMRuntimeRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviGslbHSMRuntimeDelete(d *schema.ResourceData, meta interface{}) error {
+	var err error
+	if APIDeleteSystemDefaultCheck(d) {
+		return nil
+	}
+	err = APIDelete(d, meta, "gslbhsmruntime")
+	if err != nil {
+		log.Printf("[ERROR] in deleting object %v\n", err)
+	}
+	return err
+}
diff --git a/avi/resource_avi_gslbservice.go b/avi/resource_avi_gslbservice.go
index b022426d5..7e0edafa8 100644
--- a/avi/resource_avi_gslbservice.go
+++ b/avi/resource_avi_gslbservice.go
@@ -75,6 +75,12 @@ func ResourceGslbServiceSchema() map[string]*schema.Schema {
 			Computed:     true,
 			ValidateFunc: validateBool,
 		},
+		"include_additional_records": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
 		"is_federated": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -112,6 +118,11 @@ func ResourceGslbServiceSchema() map[string]*schema.Schema {
 			Optional: true,
 			Default:  "GSLB_SERVICE_ALGORITHM_PRIORITY",
 		},
+		"record_type": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Default:  "GSLB_SERVICE_RECORD_TYPE_A_AAAA_CNAME",
+		},
 		"resolve_cname": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -152,6 +163,11 @@ func ResourceGslbServiceSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"vrf_uuid_for_gs": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
 		"wildcard_match": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_gslbsmruntime.go b/avi/resource_avi_gslbsmruntime.go
new file mode 100644
index 000000000..e00d16385
--- /dev/null
+++ b/avi/resource_avi_gslbsmruntime.go
@@ -0,0 +1,192 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
+)
+
+func ResourceGslbSMRuntimeSchema() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"cluster_leader": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"cluster_uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"dns_configs": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceDNSConfigSchema(),
+		},
+		"dns_info": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceGslbDnsInfoSchema(),
+		},
+		"enabled": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Computed:     true,
+			ValidateFunc: validateBool,
+		},
+		"events": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceEventInfoSchema(),
+		},
+		"health_monitor_info": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"leader_cluster_uuid": {
+			Type:     schema.TypeString,
+			Required: true,
+		},
+		"member_type": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Default:  "GSLB_PASSIVE_MEMBER",
+		},
+		"name": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"node_uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"num_of_retries": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "0",
+			ValidateFunc: validateInteger,
+		},
+		"obj_uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"oper_status": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceOperationalStatusSchema(),
+		},
+		"remote_info": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceRemoteInfoSchema(),
+		},
+		"role": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Default:  "GSLB_NOT_A_MEMBER",
+		},
+		"site_name": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"site_type": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"state": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Default:  "SITE_STATE_NULL",
+		},
+		"sw_version": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Default:  "Not-Initialized",
+		},
+		"tenant_ref": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"view_id": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "0",
+			ValidateFunc: validateInteger,
+		},
+	}
+}
+
+func resourceAviGslbSMRuntime() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAviGslbSMRuntimeCreate,
+		Read:   ResourceAviGslbSMRuntimeRead,
+		Update: resourceAviGslbSMRuntimeUpdate,
+		Delete: resourceAviGslbSMRuntimeDelete,
+		Schema: ResourceGslbSMRuntimeSchema(),
+		Importer: &schema.ResourceImporter{
+			State: ResourceGslbSMRuntimeImporter,
+		},
+	}
+}
+
+func ResourceGslbSMRuntimeImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
+	s := ResourceGslbSMRuntimeSchema()
+	return ResourceImporter(d, m, "gslbsmruntime", s)
+}
+
+func ResourceAviGslbSMRuntimeRead(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceGslbSMRuntimeSchema()
+	err := APIRead(d, meta, "gslbsmruntime", s)
+	if err != nil {
+		log.Printf("[ERROR] in reading object %v\n", err)
+	}
+	return err
+}
+
+func resourceAviGslbSMRuntimeCreate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceGslbSMRuntimeSchema()
+	err := APICreate(d, meta, "gslbsmruntime", s)
+	if err == nil {
+		err = ResourceAviGslbSMRuntimeRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviGslbSMRuntimeUpdate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceGslbSMRuntimeSchema()
+	var err error
+	err = APIUpdate(d, meta, "gslbsmruntime", s)
+	if err == nil {
+		err = ResourceAviGslbSMRuntimeRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviGslbSMRuntimeDelete(d *schema.ResourceData, meta interface{}) error {
+	var err error
+	if APIDeleteSystemDefaultCheck(d) {
+		return nil
+	}
+	err = APIDelete(d, meta, "gslbsmruntime")
+	if err != nil {
+		log.Printf("[ERROR] in deleting object %v\n", err)
+	}
+	return err
+}
diff --git a/avi/resource_avi_healthmonitor.go b/avi/resource_avi_healthmonitor.go
index ba620796a..990c500a7 100644
--- a/avi/resource_avi_healthmonitor.go
+++ b/avi/resource_avi_healthmonitor.go
@@ -69,6 +69,18 @@ func ResourceHealthMonitorSchema() map[string]*schema.Schema {
 			Computed: true,
 			Elem:     ResourceHealthMonitorFtpSchema(),
 		},
+		"http2_monitor": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceHealthMonitorHttpSchema(),
+		},
+		"http2s_monitor": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceHealthMonitorHttpSchema(),
+		},
 		"http_monitor": {
 			Type:     schema.TypeSet,
 			Optional: true,
diff --git a/avi/resource_avi_httppolicyset_test.go b/avi/resource_avi_httppolicyset_test.go
index ae599d16c..c7200a6ea 100644
--- a/avi/resource_avi_httppolicyset_test.go
+++ b/avi/resource_avi_httppolicyset_test.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/avi/resource_avi_ipreputationdb.go b/avi/resource_avi_ipreputationdb.go
index 40a909a1e..332987558 100644
--- a/avi/resource_avi_ipreputationdb.go
+++ b/avi/resource_avi_ipreputationdb.go
@@ -15,6 +15,11 @@ func ResourceIPReputationDBSchema() map[string]*schema.Schema {
 			Optional: true,
 			Elem:     &schema.Schema{Type: schema.TypeString},
 		},
+		"base_file_v6_refs": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     &schema.Schema{Type: schema.TypeString},
+		},
 		"configpb_attributes": {
 			Type:     schema.TypeSet,
 			Optional: true,
@@ -31,6 +36,11 @@ func ResourceIPReputationDBSchema() map[string]*schema.Schema {
 			Optional: true,
 			Elem:     &schema.Schema{Type: schema.TypeString},
 		},
+		"incremental_file_v6_refs": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     &schema.Schema{Type: schema.TypeString},
+		},
 		"markers": {
 			Type:     schema.TypeList,
 			Optional: true,
@@ -56,6 +66,11 @@ func ResourceIPReputationDBSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"v6_version": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
 		"vendor": {
 			Type:     schema.TypeString,
 			Required: true,
diff --git a/avi/resource_avi_licensestatus.go b/avi/resource_avi_licensestatus.go
index a422cc02a..ad2257857 100644
--- a/avi/resource_avi_licensestatus.go
+++ b/avi/resource_avi_licensestatus.go
@@ -16,11 +16,6 @@ func ResourceLicenseStatusSchema() map[string]*schema.Schema {
 			Computed: true,
 			Elem:     ResourceConfigPbAttributesSchema(),
 		},
-		"essentials_enforced_at": {
-			Type:     schema.TypeString,
-			Optional: true,
-			Computed: true,
-		},
 		"saas_status": {
 			Type:     schema.TypeSet,
 			Optional: true,
diff --git a/avi/resource_avi_localworkerfdsversion.go b/avi/resource_avi_localworkerfdsversion.go
new file mode 100644
index 000000000..768a5c39e
--- /dev/null
+++ b/avi/resource_avi_localworkerfdsversion.go
@@ -0,0 +1,98 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
+)
+
+func ResourceLocalWorkerFdsVersionSchema() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"name": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Default:  "default",
+		},
+		"tenant_ref": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"timeline": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"version": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "0",
+			ValidateFunc: validateInteger,
+		},
+	}
+}
+
+func resourceAviLocalWorkerFdsVersion() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAviLocalWorkerFdsVersionCreate,
+		Read:   ResourceAviLocalWorkerFdsVersionRead,
+		Update: resourceAviLocalWorkerFdsVersionUpdate,
+		Delete: resourceAviLocalWorkerFdsVersionDelete,
+		Schema: ResourceLocalWorkerFdsVersionSchema(),
+		Importer: &schema.ResourceImporter{
+			State: ResourceLocalWorkerFdsVersionImporter,
+		},
+	}
+}
+
+func ResourceLocalWorkerFdsVersionImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
+	s := ResourceLocalWorkerFdsVersionSchema()
+	return ResourceImporter(d, m, "localworkerfdsversion", s)
+}
+
+func ResourceAviLocalWorkerFdsVersionRead(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceLocalWorkerFdsVersionSchema()
+	err := APIRead(d, meta, "localworkerfdsversion", s)
+	if err != nil {
+		log.Printf("[ERROR] in reading object %v\n", err)
+	}
+	return err
+}
+
+func resourceAviLocalWorkerFdsVersionCreate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceLocalWorkerFdsVersionSchema()
+	err := APICreate(d, meta, "localworkerfdsversion", s)
+	if err == nil {
+		err = ResourceAviLocalWorkerFdsVersionRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviLocalWorkerFdsVersionUpdate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceLocalWorkerFdsVersionSchema()
+	var err error
+	err = APIUpdate(d, meta, "localworkerfdsversion", s)
+	if err == nil {
+		err = ResourceAviLocalWorkerFdsVersionRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviLocalWorkerFdsVersionDelete(d *schema.ResourceData, meta interface{}) error {
+	var err error
+	if APIDeleteSystemDefaultCheck(d) {
+		return nil
+	}
+	err = APIDelete(d, meta, "localworkerfdsversion")
+	if err != nil {
+		log.Printf("[ERROR] in deleting object %v\n", err)
+	}
+	return err
+}
diff --git a/avi/resource_avi_pool.go b/avi/resource_avi_pool.go
index 413e14bb3..f24e44bb4 100644
--- a/avi/resource_avi_pool.go
+++ b/avi/resource_avi_pool.go
@@ -160,6 +160,12 @@ func ResourcePoolSchema() map[string]*schema.Schema {
 			Default:      "1",
 			ValidateFunc: validateInteger,
 		},
+		"graceful_disable_timeout_sec": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "60",
+			ValidateFunc: validateInteger,
+		},
 		"graceful_hm_down_disable_timeout": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_pool_server.go b/avi/resource_avi_pool_server.go
index d4510a42a..1013a84cc 100644
--- a/avi/resource_avi_pool_server.go
+++ b/avi/resource_avi_pool_server.go
@@ -63,6 +63,11 @@ func ResourceAviPoolServerSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"health_monitor_refs": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     &schema.Schema{Type: schema.TypeString},
+		},
 		"hostname": {
 			Type:     schema.TypeString,
 			Optional: true,
@@ -124,6 +129,12 @@ func ResourceAviPoolServerSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"srv_rdata": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceGslbServiceSrvRdataSchema(),
+		},
 		"static": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go
index 6eaab551f..454d9db0c 100644
--- a/avi/resource_avi_rest_dependants.go
+++ b/avi/resource_avi_rest_dependants.go
@@ -469,6 +469,41 @@ func ResourceAWSSetupSchema() *schema.Resource {
 	}
 }
 
+func ResourceAZClusterSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"cluster_ids": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"vcenter_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func ResourceAZDatastoreSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"ds_ids": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"include": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
+		},
+	}
+}
+
 func ResourceAbPoolSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -486,6 +521,23 @@ func ResourceAbPoolSchema() *schema.Resource {
 	}
 }
 
+func ResourceActionArgsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"value": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceAdaptReplEventInfoSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -1192,7 +1244,7 @@ func ResourceAppLearningParamsSchema() *schema.Resource {
 			"enable_learn_from_bots": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Default:      "true",
+				Default:      "false",
 				ValidateFunc: validateBool,
 			},
 			"enable_per_uri_learning": {
@@ -4839,6 +4891,12 @@ func ResourceCfgStateSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceTimeStampSchema(),
 			},
+			"local_config": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceLocalConfigSchema(),
+			},
 			"reason": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -7040,6 +7098,12 @@ func ResourceConnectionLogSchema() *schema.Resource {
 				Required:     true,
 				ValidateFunc: validateBool,
 			},
+			"diameter_log": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceDiameterLogSchema(),
+			},
 			"dns_etype": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -8082,6 +8146,25 @@ func ResourceControllerLimitsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceWAFLimitsSchema(),
 			},
+			"waf_rule_metrics_enabled_vs": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
+func ResourceControllerParamsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"task_base_timeout": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "300",
+				ValidateFunc: validateInteger,
+			},
 		},
 	}
 }
@@ -8243,6 +8326,12 @@ func ResourceControllerSizingLimitsSchema() *schema.Resource {
 				Computed:     true,
 				ValidateFunc: validateInteger,
 			},
+			"num_virtualservices_rtmetrics_waf": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
 			"num_vrfs": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -8285,6 +8374,29 @@ func ResourceControllerVersionSchema() *schema.Resource {
 	}
 }
 
+func ResourceControlscriptDetailsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"exitcode": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"stderr": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"stdout": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceCookieMatchSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -9113,11 +9225,23 @@ func ResourceDebugServiceEngineSchema() *schema.Resource {
 				Optional: true,
 				Elem:     ResourceDebugSeDataplaneSchema(),
 			},
+			"mock_dl_fail_obj": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceDebugServiceEngineSeDataStoreMockDlFailSchema(),
+			},
 			"name": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Default:  "VM name unknown",
 			},
+			"objsync": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceDebugServiceEngineObjSyncSchema(),
+			},
 			"seagent_debug": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -9149,6 +9273,42 @@ func ResourceDebugServiceEngineSchema() *schema.Resource {
 	}
 }
 
+func ResourceDebugServiceEngineObjSyncSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"log_level": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "LOG_LVL_INFO",
+			},
+			"publish_packet_drops": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
+func ResourceDebugServiceEngineSeDataStoreMockDlFailSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"is_sedatastore_update_rpc": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateBool,
+			},
+			"object_type": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceDebugTraceMallocTypesSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -9459,6 +9619,125 @@ func ResourceDetachIpStatusEventDetailsSchema() *schema.Resource {
 	}
 }
 
+func ResourceDiameterAVPPersistenceProfileSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"avp_key_type": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "SESSION_ID",
+			},
+			"timeout": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
+func ResourceDiameterLogSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"application_id": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"avp_key_type": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"command_code": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"destination_host": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"destination_realm": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"end_to_end_identifier": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"hop_by_hop_identifier": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"origin_host": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"origin_realm": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func ResourceDiameterServiceApplicationProfileSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"client_origin_host": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"client_origin_realm": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"host_ip_addr_rewrite": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
+			"max_outstanding_req": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "4096",
+				ValidateFunc: validateInteger,
+			},
+			"req_timeout": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "60",
+				ValidateFunc: validateInteger,
+			},
+			"server_origin_host": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"server_origin_realm": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceDisableSeMigrateEventDetailsSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -9497,6 +9776,41 @@ func ResourceDiscoveredNetworkSchema() *schema.Resource {
 	}
 }
 
+func ResourceDiskThresholdSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"action": {
+				Type:     schema.TypeSet,
+				Required: true,
+				Elem:     ResourceRetentionActionSchema(),
+			},
+			"filepath": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"max_disk_percent": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"min_free_disk_percent": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"retain": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
 func ResourceDiskUsageSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -11140,6 +11454,104 @@ func ResourceDosThresholdProfileSchema() *schema.Resource {
 	}
 }
 
+func ResourceDryRunParamsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"allow_single_node": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
+			"memory": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "2",
+				ValidateFunc: validateFloat,
+			},
+			"num_cpu": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "2",
+				ValidateFunc: validateInteger,
+			},
+			"preferred_worker": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func ResourceDryrunInfoSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"duration": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"end_time": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"operation": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"params": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceUpgradeParamsSchema(),
+			},
+			"progress": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "0",
+				ValidateFunc: validateInteger,
+			},
+			"start_time": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"state": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceUpgradeOpsStateSchema(),
+			},
+			"tasks_completed": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"total_tasks": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"upgrade_events": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceEventMapSchema(),
+			},
+			"worker": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceDsrProfileSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -11334,6 +11746,18 @@ func ResourceEventDetailsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceApiVersionDeprecatedSchema(),
 			},
+			"apiserver_request_queue_full_event_info": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceRequestLimiterEventInfoSchema(),
+			},
+			"apiserver_request_queue_recovery_event_info": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceRequestLimiterEventInfoSchema(),
+			},
 			"app_signature_event_data": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -11688,6 +12112,12 @@ func ResourceEventDetailsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceControllerLicenseReconcileDetailsSchema(),
 			},
+			"controlscript_details": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceControlscriptDetailsSchema(),
+			},
 			"crs_deployment_failure": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -12084,6 +12514,12 @@ func ResourceEventDetailsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceVinfraPoolServerDeleteDetailsSchema(),
 			},
+			"postgres_event_details": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourcePostgresEventInfoSchema(),
+			},
 			"psm_program_details": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -12144,6 +12580,12 @@ func ResourceEventDetailsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceSeBgpPeerStateChangeDetailsSchema(),
 			},
+			"se_config_sedatastore_dl_fail": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceSeVsConfigSeDatastoreDownloadFailedSchema(),
+			},
 			"se_debug_mode_event_detail": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -12294,6 +12736,12 @@ func ResourceEventDetailsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceSePoolLbEventDetailsSchema(),
 			},
+			"se_process_crashed_details": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceSeProcessCrashedDetailsSchema(),
+			},
 			"se_reconcile_details": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -12492,6 +12940,12 @@ func ResourceEventDetailsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceSystemReportSchema(),
 			},
+			"task_journal_event_details": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceTaskJournalSchema(),
+			},
 			"tech_support_event": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -12618,6 +13072,12 @@ func ResourceEventDetailsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceVsAwaitingSeEventDetailsSchema(),
 			},
+			"vs_config_sedatastore_dl_fail": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceSeVsConfigSeDatastoreDownloadFailedSchema(),
+			},
 			"vs_error_details": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -12666,6 +13126,18 @@ func ResourceEventDetailsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceVsSwitchoverEventDetailsSchema(),
 			},
+			"vsgs_info": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceVsGsStatusSchema(),
+			},
+			"warning_event_details": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceWarningEventDetailsSchema(),
+			},
 		},
 	}
 }
@@ -12689,6 +13161,34 @@ func ResourceEventDetailsFilterSchema() *schema.Resource {
 	}
 }
 
+func ResourceEventInfoSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"msg": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"timestamp": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceTimeStampSchema(),
+			},
+			"uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceEventLogSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -12758,11 +13258,6 @@ func ResourceEventLogSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
-			"reason_code": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-			},
 			"related_uuids": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -13116,6 +13611,23 @@ func ResourceFbVsInfoSchema() *schema.Resource {
 	}
 }
 
+func ResourceFdsInfoSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"objects": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"timeline": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceFeProxyRoutePublishConfigSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -13162,6 +13674,56 @@ func ResourceFileObjectDetailsSchema() *schema.Resource {
 	}
 }
 
+func ResourceFileObjectEventSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"duration": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"end_time": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"message": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"start_time": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"status": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func ResourceFileObjectEventMapSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"task_event": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceFileObjectEventSchema(),
+			},
+			"task_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceFileReferenceMappingSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -13965,18 +14527,6 @@ func ResourceGslbDnsInfoSchema() *schema.Resource {
 				Optional: true,
 				Elem:     ResourceGslbPerDnsStateSchema(),
 			},
-			"gs_status": {
-				Type:     schema.TypeSet,
-				Optional: true,
-				Computed: true,
-				Elem:     ResourceGslbDnsGsStatusSchema(),
-			},
-			"retry_count": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				Computed:     true,
-				ValidateFunc: validateInteger,
-			},
 		},
 	}
 }
@@ -14052,10 +14602,10 @@ func ResourceGslbDownloadStatusSchema() *schema.Resource {
 func ResourceGslbGeoDbEntrySchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
-			"file": {
-				Type:     schema.TypeSet,
-				Required: true,
-				Elem:     ResourceGslbGeoDbFileSchema(),
+			"file_obj_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
 			},
 			"priority": {
 				Type:         schema.TypeString,
@@ -14174,6 +14724,19 @@ func ResourceGslbObjSchema() *schema.Resource {
 	}
 }
 
+func ResourceGslbObjInfoSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"repl_state": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceCfgStateSchema(),
+			},
+		},
+	}
+}
+
 func ResourceGslbObjectInfoSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -14390,6 +14953,12 @@ func ResourceGslbPoolMemberSchema() *schema.Resource {
 				Default:      "false",
 				ValidateFunc: validateBool,
 			},
+			"srv_rdata": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceGslbServiceSrvRdataSchema(),
+			},
 			"vs_uuid": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -14620,6 +15189,21 @@ func ResourceGslbRuntimeSchema() *schema.Resource {
 				Optional: true,
 				Elem:     ResourceCfgStateSchema(),
 			},
+			"gslb_crm_runtime": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceGslbCRMRuntimeSchema(),
+			},
+			"gslb_hsm_runtime": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceGslbHSMRuntimeSchema(),
+			},
+			"gslb_sm_runtime": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceGslbSMRuntimeSchema(),
+			},
 			"ldr_state": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -14687,7 +15271,7 @@ func ResourceGslbServiceDownResponseSchema() *schema.Resource {
 func ResourceGslbServiceRuntimeSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
-			"checksum": {
+			"cluster_uuid": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
@@ -14697,23 +15281,17 @@ func ResourceGslbServiceRuntimeSchema() *schema.Resource {
 				Optional: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
-			"flr_state": {
-				Type:     schema.TypeList,
-				Optional: true,
-				Elem:     ResourceCfgStateSchema(),
-			},
 			"groups": {
 				Type:     schema.TypeList,
 				Optional: true,
 				Elem:     ResourceGslbPoolRuntimeSchema(),
 			},
-			"ldr_state": {
-				Type:     schema.TypeSet,
+			"name": {
+				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
-				Elem:     ResourceCfgStateSchema(),
 			},
-			"name": {
+			"obj_uuid": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
@@ -14724,6 +15302,12 @@ func ResourceGslbServiceRuntimeSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceOperationalStatusSchema(),
 			},
+			"repl_state": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceCfgStateSchema(),
+			},
 			"send_event": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -14752,6 +15336,11 @@ func ResourceGslbServiceRuntimeSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"tenant_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"uuid": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -14787,10 +15376,10 @@ func ResourceGslbServiceSitePersistencePoolSchema() *schema.Resource {
 				Computed:     true,
 				ValidateFunc: validateInteger,
 			},
-			"servers": {
+			"server_info": {
 				Type:     schema.TypeList,
 				Optional: true,
-				Elem:     ResourceServerConfigSchema(),
+				Elem:     ResourceServerRuntimeSummarySchema(),
 			},
 			"uuid": {
 				Type:     schema.TypeString,
@@ -14801,6 +15390,28 @@ func ResourceGslbServiceSitePersistencePoolSchema() *schema.Resource {
 	}
 }
 
+func ResourceGslbServiceSrvRdataSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"port": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validateInteger,
+			},
+			"priority": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validateInteger,
+			},
+			"weight": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
 func ResourceGslbServiceStatusSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -14901,6 +15512,12 @@ func ResourceGslbSiteSchema() *schema.Resource {
 				Computed:     true,
 				ValidateFunc: validateInteger,
 			},
+			"replication_policy": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceReplicationPolicySchema(),
+			},
 			"suspend_mode": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -14940,6 +15557,12 @@ func ResourceGslbSiteCfgSyncInfoSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceConfigVersionStatusSchema(),
 			},
+			"prev_target_version": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
 			"reason": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -14950,11 +15573,23 @@ func ResourceGslbSiteCfgSyncInfoSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"site_version": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
 			"sync_state": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
+			"target_version": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
 		},
 	}
 }
@@ -17186,6 +17821,11 @@ func ResourceHdrMatchSchema() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"string_group_refs": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 			"value": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -17336,6 +17976,16 @@ func ResourceHealthMonitorHttpSchema() *schema.Resource {
 				Default:      "false",
 				ValidateFunc: validateBool,
 			},
+			"http_headers": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"http_method": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"http_request": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -17346,6 +17996,11 @@ func ResourceHealthMonitorHttpSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"http_request_header_path": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"http_response": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -17512,6 +18167,12 @@ func ResourceHealthMonitorSSLAttributesSchema() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"use_pool_sni_server_name": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateBool,
+			},
 		},
 	}
 }
@@ -18447,6 +19108,25 @@ func ResourceImageEventMapSchema() *schema.Resource {
 	}
 }
 
+func ResourceImageParamsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"image_replication_timeout": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "600",
+				ValidateFunc: validateInteger,
+			},
+			"max_image_size": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "10",
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
 func ResourceImageUploadOpsStatusSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -18991,11 +19671,6 @@ func ResourceIpamDnsInfobloxProfileSchema() *schema.Resource {
 				Sensitive:        true,
 				DiffSuppressFunc: suppressSensitiveFieldDiffs,
 			},
-			"profile_url": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-			},
 			"usable_alloc_subnets": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -19552,6 +20227,55 @@ func ResourceJournalSummarySchema() *schema.Resource {
 	}
 }
 
+func ResourceJournalTaskSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"duration": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"end_time": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"messages": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"reason": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"start_time": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"status": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateBool,
+			},
+			"task_description": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"task_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceJwtLogSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -20693,6 +21417,37 @@ func ResourceLinuxServerHostSchema() *schema.Resource {
 	}
 }
 
+func ResourceLocalConfigSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"vsgs_info": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceVsgsOpsInfoSchema(),
+			},
+		},
+	}
+}
+
+func ResourceLocalInfoSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"gs_status": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceGslbDnsGsStatusSchema(),
+			},
+			"gslb_info": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceGslbObjInfoSchema(),
+			},
+		},
+	}
+}
+
 func ResourceLocationHdrMatchSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -21299,6 +22054,12 @@ func ResourceMemoryBalancerInfoSchema() *schema.Resource {
 func ResourceMemoryUsageSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
+			"available": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
 			"free": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -23207,7 +23968,7 @@ func ResourceNsxtConfigurationSchema() *schema.Resource {
 			"automate_dfw_objects": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Default:      "true",
+				Default:      "false",
 				ValidateFunc: validateBool,
 			},
 			"automate_dfw_rules": {
@@ -23253,6 +24014,12 @@ func ResourceNsxtConfigurationSchema() *schema.Resource {
 				Optional: true,
 				Default:  "default",
 			},
+			"verify_certificate": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 			"vmc_mode": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -23474,6 +24241,11 @@ func ResourceNsxtSIRuleDetailsSchema() *schema.Resource {
 				Optional: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+			"vs": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -24498,7 +25270,7 @@ func ResourceObjSyncConfigSchema() *schema.Resource {
 			"objsync_cpu_limit": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Default:      "30",
+				Default:      "0",
 				ValidateFunc: validateInteger,
 			},
 			"objsync_hub_elect_interval": {
@@ -24517,6 +25289,29 @@ func ResourceObjSyncConfigSchema() *schema.Resource {
 	}
 }
 
+func ResourceObjectRuleSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"action": {
+				Type:     schema.TypeSet,
+				Required: true,
+				Elem:     ResourceRetentionActionSchema(),
+			},
+			"limit": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"model_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceOmittedWafLogStatsSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -25112,6 +25907,12 @@ func ResourceOpsHistorySchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"params": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceUpgradeOpsParamSchema(),
+			},
 			"patch_version": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -25158,6 +25959,18 @@ func ResourceOpsHistorySchema() *schema.Resource {
 	}
 }
 
+func ResourceOpsInfoSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"rrtoken": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+		},
+	}
+}
+
 func ResourceOrgServiceUnitsSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -25495,11 +26308,6 @@ func ResourceParamSizeClassSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
-			"timestamps": {
-				Type:     schema.TypeList,
-				Optional: true,
-				Elem:     &schema.Schema{Type: schema.TypeInt},
-			},
 		},
 	}
 }
@@ -25513,11 +26321,6 @@ func ResourceParamTypeClassSchema() *schema.Resource {
 				Computed:     true,
 				ValidateFunc: validateInteger,
 			},
-			"timestamps": {
-				Type:     schema.TypeList,
-				Optional: true,
-				Elem:     &schema.Schema{Type: schema.TypeInt},
-			},
 			"type": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -25748,6 +26551,24 @@ func ResourcePerformanceLimitsSchema() *schema.Resource {
 	}
 }
 
+func ResourcePeriodicitySchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"action": {
+				Type:     schema.TypeSet,
+				Required: true,
+				Elem:     ResourceRetentionActionSchema(),
+			},
+			"interval": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
 func ResourcePermissionSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -25857,6 +26678,31 @@ func ResourcePodTolerationSchema() *schema.Resource {
 	}
 }
 
+func ResourcePolicySpecSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"disk": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceDiskThresholdSchema(),
+			},
+			"object": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceObjectRuleSchema(),
+			},
+			"periodic": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourcePeriodicitySchema(),
+			},
+		},
+	}
+}
+
 func ResourcePoolAnalyticsPolicySchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -26164,6 +27010,12 @@ func ResourcePortalConfigurationSchema() *schema.Resource {
 				Computed:     true,
 				ValidateFunc: validateInteger,
 			},
+			"legacy_ssl_support": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 			"minimum_password_length": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -26250,6 +27102,47 @@ func ResourcePortalFeatureOptInSchema() *schema.Resource {
 	}
 }
 
+func ResourcePostgresEventInfoSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"db_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"event_desc": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"timestamp": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func ResourcePreChecksParamsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"export_config_timeout": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "3600",
+				ValidateFunc: validateInteger,
+			},
+			"max_alerts": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "200",
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
 func ResourceProactiveSupportDefaultsSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -26950,6 +27843,37 @@ func ResourceRemoteAuthConfigurationSchema() *schema.Resource {
 	}
 }
 
+func ResourceRemoteInfoSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"gslb_info": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceGslbObjInfoSchema(),
+			},
+			"ops_info": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceOpsInfoSchema(),
+			},
+			"sync_info": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceGslbSiteCfgSyncInfoSchema(),
+			},
+			"sync_stats": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceGslbReplicationStatsSchema(),
+			},
+		},
+	}
+}
+
 func ResourceReplaceStringVarSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -27127,6 +28051,47 @@ func ResourceReportTaskSchema() *schema.Resource {
 	}
 }
 
+func ResourceRequestLimiterEventInfoSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"client_ip": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"error_status_code": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"message": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"method": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"processed": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
+			"url": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"user_agent": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceResponseMatchTargetSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -27287,6 +28252,59 @@ func ResourceResumeSeGroupParamsSchema() *schema.Resource {
 	}
 }
 
+func ResourceRetentionActionSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"args": {
+				Type:     schema.TypeList,
+				Required: true,
+				Elem:     ResourceActionArgsSchema(),
+			},
+			"path": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"type": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+		},
+	}
+}
+
+func ResourceRetentionSummarySchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"duration": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"end_time": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"messages": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"start_time": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"status": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceRmAddNetworksEventDetailsSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -28166,6 +29184,51 @@ func ResourceSAMLSPConfigSchema() *schema.Resource {
 	}
 }
 
+func ResourceSCFaultOptionsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"delay_create": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"delay_delete": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"delay_update": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"fault_type": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"obj": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"object_type": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"se": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceSCPoolServerStateInfoSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -28205,6 +29268,18 @@ func ResourceSCPoolServerStateInfoSchema() *schema.Resource {
 	}
 }
 
+func ResourceSCPropertiesSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"delay_injections": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceSCFaultOptionsSchema(),
+			},
+		},
+	}
+}
+
 func ResourceSCServerStateInfoSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -28390,6 +29465,18 @@ func ResourceSETimeTrackerPropertiesSchema() *schema.Resource {
 	}
 }
 
+func ResourceSHMSummarySchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"health_monitor": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceServerHealthMonitorSchema(),
+			},
+		},
+	}
+}
+
 func ResourceSSHSeDeploymentSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{},
@@ -28801,6 +29888,12 @@ func ResourceSSLVersionSchema() *schema.Resource {
 func ResourceSaasLicensingInfoSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
+			"enable_notional_reserve": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "true",
+				ValidateFunc: validateBool,
+			},
 			"max_service_units": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -28838,6 +29931,11 @@ func ResourceSaasLicensingStatusSchema() *schema.Resource {
 				Computed:     true,
 				ValidateFunc: validateBool,
 			},
+			"last_refreshed_at": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"message": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -28853,6 +29951,17 @@ func ResourceSaasLicensingStatusSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"refresh_status": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateBool,
+			},
+			"refreshed_at": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"reserve_service_units": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -31401,6 +32510,29 @@ func ResourceSePoolLbEventDetailsSchema() *schema.Resource {
 	}
 }
 
+func ResourceSeProcessCrashedDetailsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"crash_counter": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"process_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"se_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceSeRateLimitersSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -31434,6 +32566,12 @@ func ResourceSeRateLimitersSchema() *schema.Resource {
 				Default:      "2000",
 				ValidateFunc: validateInteger,
 			},
+			"nd_rl": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "2000",
+				ValidateFunc: validateInteger,
+			},
 			"rst_rl": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -31520,6 +32658,11 @@ func ResourceSeResourcesSchema() *schema.Resource {
 				Required:     true,
 				ValidateFunc: validateInteger,
 			},
+			"qat_mode": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "QAT_OFF",
+			},
 			"sockets": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -32433,6 +33576,43 @@ func ResourceSeVnicUpEventDetailsSchema() *schema.Resource {
 	}
 }
 
+func ResourceSeVsConfigSeDatastoreDownloadFailedSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"fail_obj_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"fail_obj_uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"fail_reason": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"parent_obj_uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"se_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"vs_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceSeVsDelFlowsDisruptedSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -32949,6 +34129,11 @@ func ResourceServerSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"health_monitor_refs": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 			"hostname": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -33015,6 +34200,12 @@ func ResourceServerSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"srv_rdata": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceGslbServiceSrvRdataSchema(),
+			},
 			"static": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -33316,6 +34507,43 @@ func ResourceServerConfigSchema() *schema.Resource {
 	}
 }
 
+func ResourceServerHealthMonitorSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"avg_response_time": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"failure_code": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"reason": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"recent_response_time": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"state": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+		},
+	}
+}
+
 func ResourceServerIdSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -33338,6 +34566,79 @@ func ResourceServerIdSchema() *schema.Resource {
 	}
 }
 
+func ResourceServerRuntimeSummarySchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"get_state": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
+			"health_monitor_list": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceSHMSummarySchema(),
+			},
+			"hostname": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"ip_addr": {
+				Type:     schema.TypeSet,
+				Required: true,
+				Elem:     ResourceIpAddrSchema(),
+			},
+			"is_local": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "true",
+				ValidateFunc: validateBool,
+			},
+			"is_standby": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
+			"location": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceGeoLocationSchema(),
+			},
+			"oper_status": {
+				Type:     schema.TypeSet,
+				Required: true,
+				Elem:     ResourceOperationalStatusSchema(),
+			},
+			"port": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validateInteger,
+			},
+			"resolve_server_by_dns": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
+			"se_uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"vs_uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceServiceSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -33365,6 +34666,12 @@ func ResourceServiceSchema() *schema.Resource {
 				Default:      "false",
 				ValidateFunc: validateBool,
 			},
+			"is_passive_ftp_data_port": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 			"override_application_profile_ref": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -33431,58 +34738,83 @@ func ResourceServiceEngineCloudLimitsSchema() *schema.Resource {
 func ResourceServiceEngineLimitsSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
-			"all_virtualservices_per_serviceengine": {
+			"num_logical_intf_per_se": {
 				Type:         schema.TypeString,
 				Optional:     true,
 				Computed:     true,
 				ValidateFunc: validateInteger,
 			},
-			"ew_virtualservices_per_serviceengine": {
+			"num_phy_intf_per_se": {
 				Type:         schema.TypeString,
 				Optional:     true,
 				Computed:     true,
 				ValidateFunc: validateInteger,
 			},
-			"ns_virtualservices_per_serviceengine": {
+			"num_virtualservices_rt_metrics": {
 				Type:         schema.TypeString,
 				Optional:     true,
 				Computed:     true,
 				ValidateFunc: validateInteger,
 			},
-			"num_logical_intf_per_se": {
+			"num_vlan_intf_per_phy_intf": {
 				Type:         schema.TypeString,
 				Optional:     true,
 				Computed:     true,
 				ValidateFunc: validateInteger,
 			},
-			"num_phy_intf_per_se": {
+			"num_vlan_intf_per_se": {
 				Type:         schema.TypeString,
 				Optional:     true,
 				Computed:     true,
 				ValidateFunc: validateInteger,
 			},
-			"num_virtualservices_rt_metrics": {
+			"serviceengine_cloud_limits": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceServiceEngineCloudLimitsSchema(),
+			},
+		},
+	}
+}
+
+func ResourceServiceEngineParamsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"concurrent_segroup_upgrades": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Computed:     true,
+				Default:      "8",
 				ValidateFunc: validateInteger,
 			},
-			"num_vlan_intf_per_phy_intf": {
+			"image_data_transfer_size": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Computed:     true,
+				Default:      "512",
 				ValidateFunc: validateInteger,
 			},
-			"num_vlan_intf_per_se": {
+			"large_se_connect_timeout": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Computed:     true,
+				Default:      "1200",
 				ValidateFunc: validateInteger,
 			},
-			"serviceengine_cloud_limits": {
-				Type:     schema.TypeList,
-				Optional: true,
-				Elem:     ResourceServiceEngineCloudLimitsSchema(),
+			"se_connect_timeout": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "600",
+				ValidateFunc: validateInteger,
+			},
+			"simultaneous_image_downloads": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "5",
+				ValidateFunc: validateInteger,
+			},
+			"task_base_timeout": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "300",
+				ValidateFunc: validateInteger,
 			},
 		},
 	}
@@ -34553,6 +35885,24 @@ func ResourceSupportedMigrationsSchema() *schema.Resource {
 				Default:      "128",
 				ValidateFunc: validateInteger,
 			},
+			"dryrun_min_cores": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "1",
+				ValidateFunc: validateInteger,
+			},
+			"dryrun_min_free_disk_size": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "18",
+				ValidateFunc: validateInteger,
+			},
+			"dryrun_min_memory": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "1",
+				ValidateFunc: validateFloat,
+			},
 			"max_active_versions": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -34761,6 +36111,25 @@ func ResourceTCPFastPathProfileSchema() *schema.Resource {
 				Default:      "300",
 				ValidateFunc: validateInteger,
 			},
+			"tcp_fastpath_options": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceTCPOptionsSchema(),
+			},
+		},
+	}
+}
+
+func ResourceTCPOptionsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"strip_sack": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 		},
 	}
 }
@@ -34768,6 +36137,12 @@ func ResourceTCPFastPathProfileSchema() *schema.Resource {
 func ResourceTCPProxyProfileSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
+			"ack_on_push": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 			"aggressive_congestion_avoidance": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -34797,6 +36172,18 @@ func ResourceTCPProxyProfileSchema() *schema.Resource {
 				Default:      "2",
 				ValidateFunc: validateInteger,
 			},
+			"delayed_ack_mode": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateBool,
+			},
+			"delayed_ack_timer_delay": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "100",
+				ValidateFunc: validateInteger,
+			},
 			"idle_connection_timeout": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -35062,6 +36449,24 @@ func ResourceTechSupportStatusSchema() *schema.Resource {
 	}
 }
 
+func ResourceTelemetryConfigurationSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"enable": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "true",
+				ValidateFunc: validateBool,
+			},
+			"url": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceTenantConfigurationSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -35320,6 +36725,24 @@ func ResourceTrueClientIPConfigSchema() *schema.Resource {
 	}
 }
 
+func ResourceTrustedHostSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"host": {
+				Type:     schema.TypeSet,
+				Required: true,
+				Elem:     ResourceIpAddrSchema(),
+			},
+			"port": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
 func ResourceUDPFastPathProfileSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -35504,6 +36927,12 @@ func ResourceUpgradeControllerParamsSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"dryrun": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 			"image_ref": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -35621,6 +37050,12 @@ func ResourceUpgradeOpsEntrySchema() *schema.Resource {
 func ResourceUpgradeOpsParamSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
+			"controller": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceControllerParamsSchema(),
+			},
 			"image_ref": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -35643,6 +37078,12 @@ func ResourceUpgradeOpsParamSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceSeGroupResumeOptionsSchema(),
 			},
+			"service_engine": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceServiceEngineParamsSchema(),
+			},
 		},
 	}
 }
@@ -35684,6 +37125,12 @@ func ResourceUpgradeParamsSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"dryrun": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateBool,
+			},
 			"image_ref": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -35692,7 +37139,7 @@ func ResourceUpgradeParamsSchema() *schema.Resource {
 			"prechecks_only": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Default:      "false",
+				Computed:     true,
 				ValidateFunc: validateBool,
 			},
 			"se_group_options": {
@@ -35714,13 +37161,13 @@ func ResourceUpgradeParamsSchema() *schema.Resource {
 			"skip_warnings": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Default:      "false",
+				Computed:     true,
 				ValidateFunc: validateBool,
 			},
 			"system": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Default:      "false",
+				Computed:     true,
 				ValidateFunc: validateBool,
 			},
 		},
@@ -35762,6 +37209,12 @@ func ResourceUpgradeReadinessCheckObjSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"progress": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "0",
+				ValidateFunc: validateInteger,
+			},
 			"start_time": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -35835,6 +37288,12 @@ func ResourceUpgradeSystemParamsSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"dryrun": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 			"image_ref": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -37267,6 +38726,17 @@ func ResourceVersionInfoSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"reason": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"status": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
 			"uuid": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -38064,6 +39534,12 @@ func ResourceVipSeAssignedSchema() *schema.Resource {
 				Computed:     true,
 				ValidateFunc: validateBool,
 			},
+			"sec_idx": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "1",
+				ValidateFunc: validateInteger,
+			},
 			"snat_ip": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -38644,6 +40120,34 @@ func ResourceVsFsmEventDetailsSchema() *schema.Resource {
 	}
 }
 
+func ResourceVsGsStatusSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"details": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"vsgs_obj": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceVsGsSchema(),
+			},
+		},
+	}
+}
+
 func ResourceVsInitialPlacementEventDetailsSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -40723,6 +42227,29 @@ func ResourceVserverL7MetricsObjSchema() *schema.Resource {
 	}
 }
 
+func ResourceVsgsOpsInfoSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"dnsvs_uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"ops": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"timestamp": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceTimeStampSchema(),
+			},
+		},
+	}
+}
+
 func ResourceVssPlacementSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -40963,6 +42490,12 @@ func ResourceWafConfigSchema() *schema.Resource {
 				Default:      "0",
 				ValidateFunc: validateInteger,
 			},
+			"enforce_max_body_size": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 			"ignore_incomplete_request_body_error": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -41044,6 +42577,11 @@ func ResourceWafConfigSchema() *schema.Resource {
 				Optional: true,
 				Default:  "X-WAF-Result",
 			},
+			"xml_collection": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "WAF_XML_COLLECTION_XML",
+			},
 			"xml_xxe_protection": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -41845,6 +43383,23 @@ func ResourceWafWhitelistLogSchema() *schema.Resource {
 	}
 }
 
+func ResourceWarningEventDetailsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"event_data": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"warning_message": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceWebApplicationSignatureServiceStatusSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -41999,6 +43554,12 @@ func ResourcevCenterConfigurationSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"verify_certificate": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 		},
 	}
 }
diff --git a/avi/resource_avi_retentionpolicy.go b/avi/resource_avi_retentionpolicy.go
new file mode 100644
index 000000000..8f259b47e
--- /dev/null
+++ b/avi/resource_avi_retentionpolicy.go
@@ -0,0 +1,109 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
+)
+
+func ResourceRetentionPolicySchema() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"enabled": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "true",
+			ValidateFunc: validateBool,
+		},
+		"history": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceRetentionSummarySchema(),
+		},
+		"name": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"policy": {
+			Type:     schema.TypeSet,
+			Required: true,
+			Elem:     ResourcePolicySpecSchema(),
+		},
+		"summary": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceRetentionSummarySchema(),
+		},
+		"tenant_ref": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+	}
+}
+
+func resourceAviRetentionPolicy() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAviRetentionPolicyCreate,
+		Read:   ResourceAviRetentionPolicyRead,
+		Update: resourceAviRetentionPolicyUpdate,
+		Delete: resourceAviRetentionPolicyDelete,
+		Schema: ResourceRetentionPolicySchema(),
+		Importer: &schema.ResourceImporter{
+			State: ResourceRetentionPolicyImporter,
+		},
+	}
+}
+
+func ResourceRetentionPolicyImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
+	s := ResourceRetentionPolicySchema()
+	return ResourceImporter(d, m, "retentionpolicy", s)
+}
+
+func ResourceAviRetentionPolicyRead(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceRetentionPolicySchema()
+	err := APIRead(d, meta, "retentionpolicy", s)
+	if err != nil {
+		log.Printf("[ERROR] in reading object %v\n", err)
+	}
+	return err
+}
+
+func resourceAviRetentionPolicyCreate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceRetentionPolicySchema()
+	err := APICreate(d, meta, "retentionpolicy", s)
+	if err == nil {
+		err = ResourceAviRetentionPolicyRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviRetentionPolicyUpdate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceRetentionPolicySchema()
+	var err error
+	err = APIUpdate(d, meta, "retentionpolicy", s)
+	if err == nil {
+		err = ResourceAviRetentionPolicyRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviRetentionPolicyDelete(d *schema.ResourceData, meta interface{}) error {
+	var err error
+	if APIDeleteSystemDefaultCheck(d) {
+		return nil
+	}
+	err = APIDelete(d, meta, "retentionpolicy")
+	if err != nil {
+		log.Printf("[ERROR] in deleting object %v\n", err)
+	}
+	return err
+}
diff --git a/avi/resource_avi_rmcloudopsproto.go b/avi/resource_avi_rmcloudopsproto.go
index 016f93575..bffb981c9 100644
--- a/avi/resource_avi_rmcloudopsproto.go
+++ b/avi/resource_avi_rmcloudopsproto.go
@@ -33,6 +33,12 @@ func ResourceRmCloudOpsProtoSchema() map[string]*schema.Schema {
 			Computed:     true,
 			ValidateFunc: validateInteger,
 		},
+		"se_create_limit_reached": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
 		"uuid": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_serviceenginegroup.go b/avi/resource_avi_serviceenginegroup.go
index 6dd713cfc..321e4ba78 100644
--- a/avi/resource_avi_serviceenginegroup.go
+++ b/avi/resource_avi_serviceenginegroup.go
@@ -67,6 +67,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Default:      "8",
 			ValidateFunc: validateInteger,
 		},
+		"arp_cache_timeout": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "1200",
+			ValidateFunc: validateInteger,
+		},
 		"async_ssl": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -388,6 +394,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Computed:     true,
 			ValidateFunc: validateBool,
 		},
+		"enable_qat": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
 		"ephemeral_portrange_end": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -558,6 +570,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Optional: true,
 			Elem:     ResourceKniPortRangeSchema(),
 		},
+		"kv_val_max_len": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "4096",
+			ValidateFunc: validateInteger,
+		},
 		"l7_conns_per_core": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -857,6 +875,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Required: true,
 		},
+		"nd6_cache_timeout": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "86400",
+			ValidateFunc: validateInteger,
+		},
 		"netlink_poller_threads": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -990,6 +1014,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Optional: true,
 			Default:  "PLACEMENT_MODE_AUTO",
 		},
+		"pre_upgrade_se_available_mem_threshold": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "0",
+			ValidateFunc: validateInteger,
+		},
 		"realtime_se_metrics": {
 			Type:     schema.TypeSet,
 			Optional: true,
@@ -1509,13 +1539,13 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 		"use_objsync": {
 			Type:         schema.TypeString,
 			Optional:     true,
-			Default:      "false",
+			Default:      "true",
 			ValidateFunc: validateBool,
 		},
 		"use_standard_alb": {
 			Type:         schema.TypeString,
 			Optional:     true,
-			Computed:     true,
+			Default:      "true",
 			ValidateFunc: validateBool,
 		},
 		"user_agent_cache_config": {
@@ -1704,6 +1734,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Default:      "64",
 			ValidateFunc: validateInteger,
 		},
+		"waf_use_jit_for_pcre": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "true",
+			ValidateFunc: validateBool,
+		},
 	}
 }
 
diff --git a/avi/resource_avi_systemconfiguration.go b/avi/resource_avi_systemconfiguration.go
index 4486c3f12..af6140304 100644
--- a/avi/resource_avi_systemconfiguration.go
+++ b/avi/resource_avi_systemconfiguration.go
@@ -16,6 +16,13 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema {
 			Computed: true,
 			Elem:     ResourceAdminAuthConfigurationSchema(),
 		},
+		"avi_email_login_password": {
+			Type:             schema.TypeString,
+			Optional:         true,
+			Computed:         true,
+			Sensitive:        true,
+			DiffSuppressFunc: suppressSensitiveFieldDiffs,
+		},
 		"common_criteria_mode": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -74,12 +81,6 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema {
 			Default:      "false",
 			ValidateFunc: validateBool,
 		},
-		"enable_telemetry": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "true",
-			ValidateFunc: validateBool,
-		},
 		"fips_mode": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -102,6 +103,12 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"legacy_ssl_support": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
 		"linux_configuration": {
 			Type:     schema.TypeSet,
 			Optional: true,
@@ -142,6 +149,11 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema {
 			Optional: true,
 			Default:  "default",
 		},
+		"sddcmanager_fqdn": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
 		"secure_channel_configuration": {
 			Type:     schema.TypeSet,
 			Optional: true,
@@ -164,11 +176,22 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema {
 			Optional: true,
 			Elem:     &schema.Schema{Type: schema.TypeString},
 		},
+		"telemetry_configuration": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceTelemetryConfigurationSchema(),
+		},
 		"trusted_host_profiles_refs": {
 			Type:     schema.TypeList,
 			Optional: true,
 			Elem:     &schema.Schema{Type: schema.TypeString},
 		},
+		"truststore_pkiprofile_ref": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
 		"uuid": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_systemreport.go b/avi/resource_avi_systemreport.go
index 3268f738c..7d3831856 100644
--- a/avi/resource_avi_systemreport.go
+++ b/avi/resource_avi_systemreport.go
@@ -26,6 +26,12 @@ func ResourceSystemReportSchema() map[string]*schema.Schema {
 			Default:      "false",
 			ValidateFunc: validateBool,
 		},
+		"dryrun_info": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceDryrunInfoSchema(),
+		},
 		"events": {
 			Type:     schema.TypeList,
 			Optional: true,
@@ -41,6 +47,11 @@ func ResourceSystemReportSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"operation": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
 		"readiness_reports": {
 			Type:     schema.TypeList,
 			Optional: true,
@@ -73,6 +84,11 @@ func ResourceSystemReportSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"type": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
 		"uuid": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_taskjournal.go b/avi/resource_avi_taskjournal.go
index 8ce975e98..31ae8d7f1 100644
--- a/avi/resource_avi_taskjournal.go
+++ b/avi/resource_avi_taskjournal.go
@@ -51,6 +51,11 @@ func ResourceTaskJournalSchema() map[string]*schema.Schema {
 			Required: true,
 			Elem:     ResourceJournalSummarySchema(),
 		},
+		"tasks": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceJournalTaskSchema(),
+		},
 		"tenant_ref": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_trustedhostprofile.go b/avi/resource_avi_trustedhostprofile.go
index 296b2ca94..51b630059 100644
--- a/avi/resource_avi_trustedhostprofile.go
+++ b/avi/resource_avi_trustedhostprofile.go
@@ -19,7 +19,7 @@ func ResourceTrustedHostProfileSchema() map[string]*schema.Schema {
 		"hosts": {
 			Type:     schema.TypeList,
 			Required: true,
-			Elem:     &schema.Schema{Type: schema.TypeString},
+			Elem:     ResourceTrustedHostSchema(),
 		},
 		"name": {
 			Type:     schema.TypeString,
diff --git a/avi/resource_avi_upgradeprofile.go b/avi/resource_avi_upgradeprofile.go
new file mode 100644
index 000000000..1a83fcb72
--- /dev/null
+++ b/avi/resource_avi_upgradeprofile.go
@@ -0,0 +1,107 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
+)
+
+func ResourceUpgradeProfileSchema() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"controller_params": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceControllerParamsSchema(),
+		},
+		"dry_run": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceDryRunParamsSchema(),
+		},
+		"image": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceImageParamsSchema(),
+		},
+		"pre_checks": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourcePreChecksParamsSchema(),
+		},
+		"service_engine": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceServiceEngineParamsSchema(),
+		},
+		"uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+	}
+}
+
+func resourceAviUpgradeProfile() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAviUpgradeProfileCreate,
+		Read:   ResourceAviUpgradeProfileRead,
+		Update: resourceAviUpgradeProfileUpdate,
+		Delete: resourceAviUpgradeProfileDelete,
+		Schema: ResourceUpgradeProfileSchema(),
+		Importer: &schema.ResourceImporter{
+			State: ResourceUpgradeProfileImporter,
+		},
+	}
+}
+
+func ResourceUpgradeProfileImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
+	s := ResourceUpgradeProfileSchema()
+	return ResourceImporter(d, m, "upgradeprofile", s)
+}
+
+func ResourceAviUpgradeProfileRead(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceUpgradeProfileSchema()
+	err := APIRead(d, meta, "upgradeprofile", s)
+	if err != nil {
+		log.Printf("[ERROR] in reading object %v\n", err)
+	}
+	return err
+}
+
+func resourceAviUpgradeProfileCreate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceUpgradeProfileSchema()
+	err := APICreate(d, meta, "upgradeprofile", s)
+	if err == nil {
+		err = ResourceAviUpgradeProfileRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviUpgradeProfileUpdate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceUpgradeProfileSchema()
+	var err error
+	err = APIUpdate(d, meta, "upgradeprofile", s)
+	if err == nil {
+		err = ResourceAviUpgradeProfileRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviUpgradeProfileDelete(d *schema.ResourceData, meta interface{}) error {
+	var err error
+	if APIDeleteSystemDefaultCheck(d) {
+		return nil
+	}
+	err = APIDelete(d, meta, "upgradeprofile")
+	if err != nil {
+		log.Printf("[ERROR] in deleting object %v\n", err)
+	}
+	return err
+}
diff --git a/avi/resource_avi_upgradestatusinfo.go b/avi/resource_avi_upgradestatusinfo.go
index 63d66177e..06164768b 100644
--- a/avi/resource_avi_upgradestatusinfo.go
+++ b/avi/resource_avi_upgradestatusinfo.go
@@ -26,6 +26,12 @@ func ResourceUpgradeStatusInfoSchema() map[string]*schema.Schema {
 			Computed:     true,
 			ValidateFunc: validateBool,
 		},
+		"dryrun_info": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceDryrunInfoSchema(),
+		},
 		"duration": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -132,6 +138,11 @@ func ResourceUpgradeStatusInfoSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"prev_remote_image_ref": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
 		"previous_image_ref": {
 			Type:     schema.TypeString,
 			Optional: true,
@@ -168,6 +179,11 @@ func ResourceUpgradeStatusInfoSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"remote_image_ref": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
 		"se_patch_image_path": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_useraccount.go b/avi/resource_avi_useraccount.go
index e78c592ae..83f2e5883 100644
--- a/avi/resource_avi_useraccount.go
+++ b/avi/resource_avi_useraccount.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/avi/resource_avi_virtualservice_test.go b/avi/resource_avi_virtualservice_test.go
index 0e2779c52..3797f6469 100644
--- a/avi/resource_avi_virtualservice_test.go
+++ b/avi/resource_avi_virtualservice_test.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/avi/resource_avi_vsvip.go b/avi/resource_avi_vsvip.go
index 50f0cc867..4dcf90dda 100644
--- a/avi/resource_avi_vsvip.go
+++ b/avi/resource_avi_vsvip.go
@@ -75,12 +75,6 @@ func ResourceVsVipSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
-		"use_standard_alb": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Computed:     true,
-			ValidateFunc: validateBool,
-		},
 		"uuid": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_wafpolicy_test.go b/avi/resource_avi_wafpolicy_test.go
index 1b5107a45..ad1be908b 100644
--- a/avi/resource_avi_wafpolicy_test.go
+++ b/avi/resource_avi_wafpolicy_test.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/avi/resource_avi_webapput.go b/avi/resource_avi_webapput.go
index 79bf94fa9..6f2b5a435 100644
--- a/avi/resource_avi_webapput.go
+++ b/avi/resource_avi_webapput.go
@@ -10,6 +10,11 @@ import (
 
 func ResourceWebappUTSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
+		"cloud_ref": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
 		"configpb_attributes": {
 			Type:     schema.TypeSet,
 			Optional: true,
diff --git a/avi/utils.go b/avi/utils.go
index ec25e67f7..b74bcf5b7 100644
--- a/avi/utils.go
+++ b/avi/utils.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
@@ -354,7 +354,6 @@ func APIUpdate(d *schema.ResourceData, meta interface{}, objType string, s map[s
 			log.Printf("[INFO] APICreateOrUpdate Tenant ref found %v", tenantName)
 		}
 		if specialobj {
-			path = path + "?skip_default=true"
 			err = client.AviSession.Put(path, data, &robj)
 			if err != nil {
 				log.Printf("[ERROR] APICreateOrUpdate: PUT on %v Error %v path %v id %v\n", objType, err, path,
@@ -363,7 +362,7 @@ func APIUpdate(d *schema.ResourceData, meta interface{}, objType string, s map[s
 				SetIDFromObj(d, robj)
 			}
 		} else if uuid, ok := d.GetOk("uuid"); ok {
-			path = path + "/" + uuid.(string) + "?skip_default=true"
+			path = path + "/" + uuid.(string)
 			if !usePatchForUpdate {
 				err = client.AviSession.Put(path, data, &robj, session.SetOptTenant(tenantName))
 			} else {
@@ -415,7 +414,7 @@ func APIRead(d *schema.ResourceData, meta interface{}, objType string, s map[str
 		if specialobj {
 			path = "api/" + objType
 		} else {
-			path = "api/" + objType + "/" + uuid + "?skip_default=true"
+			path = "api/" + objType + "/" + uuid
 		}
 		log.Printf("[DEBUG] APIRead reading object with id %v path %v\n", uuid, path)
 		err := client.AviSession.Get(path, &obj, session.SetOptTenant(tenantName))
@@ -457,15 +456,7 @@ func APIRead(d *schema.ResourceData, meta interface{}, objType string, s map[str
 		log.Printf("[ERROR] APIRead not found %v\n", d.Get("uuid"))
 		return nil
 	}
-	if localData, err := SchemaToAviData(d, s); err == nil {
-		modAPIRes, err := SetDefaultsInAPIRes(obj, localData, s)
-		if err != nil {
-			log.Printf("[ERROR] APIRead in modifying api response object %v\n", err)
-		}
-		modAPIRes, err = PreprocessAPIRes(modAPIRes, s)
-		if err != nil {
-			log.Printf("[ERROR] APIRead in modifying api response object for conversion %v\n", err)
-		}
+	if modAPIRes, err := PreprocessAPIRes(obj, s); err == nil {
 		if _, err := APIDataToSchema(modAPIRes, d, s); err == nil {
 			if modAPIRes.(map[string]interface{})["uuid"] != nil {
 				uuid = modAPIRes.(map[string]interface{})["uuid"].(string)
@@ -484,10 +475,40 @@ func APIRead(d *schema.ResourceData, meta interface{}, objType string, s map[str
 		} else {
 			log.Printf("[ERROR] APIRead in setting read object %v\n", err)
 		}
-		log.Printf("[DEBUG] type: %v localData : %v", objType, localData)
 		log.Printf("[DEBUG] type: %v modAPIRes: %v", objType, modAPIRes)
+	} else {
+		log.Printf("[ERROR] APIRead in modifying api response object for conversion %v\n", err)
 	}
-
+	// if localData, err := SchemaToAviData(d, s); err == nil {
+	// 	// modAPIRes, err := SetDefaultsInAPIRes(obj, localData, s)
+	// 	if err != nil {
+	// 		log.Printf("[ERROR] APIRead in modifying api response object %v\n", err)
+	// 	}
+	// 	modAPIRes, err := PreprocessAPIRes(obj, s)
+	// 	if err != nil {
+	// 		log.Printf("[ERROR] APIRead in modifying api response object for conversion %v\n", err)
+	// 	}
+	// 	if _, err := APIDataToSchema(modAPIRes, d, s); err == nil {
+	// 		if modAPIRes.(map[string]interface{})["uuid"] != nil {
+	// 			uuid = modAPIRes.(map[string]interface{})["uuid"].(string)
+	// 		}
+	// 		if modAPIRes.(map[string]interface{})["url"] != nil {
+	// 			url = modAPIRes.(map[string]interface{})["url"].(string)
+	// 		}
+	// 		//url = strings.SplitN(url, "#", 2)[0]
+	// 		if url != "" {
+	// 			d.SetId(url)
+	// 			log.Printf("[DEBUG] APIRead read object with id %v\n", url)
+	// 		} else {
+	// 			d.SetId(uuid)
+	// 			log.Printf("[DEBUG] APIRead read object with id %v\n", uuid)
+	// 		}
+	// 	} else {
+	// 		log.Printf("[ERROR] APIRead in setting read object %v\n", err)
+	// 	}
+	// 	log.Printf("[DEBUG] type: %v localData : %v", objType, localData)
+	// 	log.Printf("[DEBUG] type: %v modAPIRes: %v", objType, modAPIRes)
+	// }
 	return nil
 }
 
@@ -527,7 +548,7 @@ func ResourceImporter(d *schema.ResourceData, meta interface{}, objType string,
 	}
 	var data interface{}
 	client := meta.(*clients.AviClient)
-	path := "api/" + objType + "?skip_default=true"
+	path := "api/" + objType
 	err := client.AviSession.Get(path, &data)
 	if err != nil {
 		log.Printf("[ERROR] ResourceImporter %v in GET of path %v\n", err, path)
diff --git a/avi/utils_test.go b/avi/utils_test.go
index 2252455fc..257d10b0c 100644
--- a/avi/utils_test.go
+++ b/avi/utils_test.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/conftest.py b/conftest.py
index c24e71366..a805526d3 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1,6 +1,6 @@
 ############################################################################
 # ========================================================================
-# Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+# Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
 # ========================================================================
 ###
 
diff --git a/go.mod b/go.mod
index 4227e3e4a..aec5bb295 100644
--- a/go.mod
+++ b/go.mod
@@ -1,12 +1,12 @@
 module github.com/vmware/terraform-provider-avi
 
-go 1.22
+go 1.22.2
 
-toolchain go1.22.6
+toolchain go1.23.2
 
 require (
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0
-	github.com/vmware/alb-sdk v0.0.0-20240605102317-cc857152bc67
+	github.com/vmware/alb-sdk v0.0.0-20250125055329-911aef493be4
 )
 
 require (
diff --git a/go.sum b/go.sum
index 025f97f38..7e26efc99 100644
--- a/go.sum
+++ b/go.sum
@@ -204,6 +204,8 @@ github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37w
 github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
 github.com/vmware/alb-sdk v0.0.0-20240605102317-cc857152bc67 h1:AbMBmnIbvNTVS6u94U14BKABMNkmPaSFwFXzXOr4fE0=
 github.com/vmware/alb-sdk v0.0.0-20240605102317-cc857152bc67/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
+github.com/vmware/alb-sdk v0.0.0-20250125055329-911aef493be4 h1:yT0eZ66Rc1uYRf3ruBWk/5BTBMARnCbxSn/2VPsc5ag=
+github.com/vmware/alb-sdk v0.0.0-20250125055329-911aef493be4/go.mod h1:4f6ExD6/N+8aP4Km/foEpCVlYqpiz+ogXL4QHbC03Xw=
 github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
 github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
 github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
diff --git a/main.go b/main.go
index 5afe207fa..3c1d4d0a0 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,6 @@
 /***************************************************************************
  * ========================================================================
- * Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+ * Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
  * ========================================================================
  */
 
diff --git a/scripts/changelog-links.sh b/scripts/changelog-links.sh
index 5692108e2..44b4a3541 100755
--- a/scripts/changelog-links.sh
+++ b/scripts/changelog-links.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ############################################################################
 # ========================================================================
-# Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+# Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
 # ========================================================================
 ###
 
diff --git a/scripts/errcheck.sh b/scripts/errcheck.sh
index 03132b502..b0dadadc3 100755
--- a/scripts/errcheck.sh
+++ b/scripts/errcheck.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 ############################################################################
 # ========================================================================
-# Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+# Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
 # ========================================================================
 ###
 
diff --git a/scripts/gofmtcheck.sh b/scripts/gofmtcheck.sh
index f5de0a42d..cce80e154 100755
--- a/scripts/gofmtcheck.sh
+++ b/scripts/gofmtcheck.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 ############################################################################
 # ========================================================================
-# Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+# Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
 # ========================================================================
 ###
 
diff --git a/scripts/gogetcookie.sh b/scripts/gogetcookie.sh
index 9449f0de5..3fd29ecf0 100755
--- a/scripts/gogetcookie.sh
+++ b/scripts/gogetcookie.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ############################################################################
 # ========================================================================
-# Copyright 2024 VMware, Inc. All rights reserved. VMware Confidential
+# Copyright (c) 2025 Broadcom Inc. and/or its subsidiaries. All Rights Reserved. Broadcom Confidential.
 # ========================================================================
 ###
 
diff --git a/website/avi.erb b/website/avi.erb
index d943be9d1..30f61030e 100644
--- a/website/avi.erb
+++ b/website/avi.erb
@@ -17,41 +17,14 @@
         <li<%= sidebar_current("docs-avi-datasource") %>>
           <a href="#">Avi Data Sources</a>
           <ul class="nav nav-visible">
-                      <li<%= sidebar_current("docs-avi-rmcloudopsproto") %>>
-              <a href="/docs/providers/avi/d/avi_rmcloudopsproto.html">RmCloudOpsProto</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-snmptrapprofile") %>>
-              <a href="/docs/providers/avi/d/avi_snmptrapprofile.html">SnmpTrapProfile</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-gslb") %>>
-              <a href="/docs/providers/avi/d/avi_gslb.html">Gslb</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-gslbservice") %>>
-              <a href="/docs/providers/avi/d/avi_gslbservice.html">GslbService</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-gslbgeodbprofile") %>>
-              <a href="/docs/providers/avi/d/avi_gslbgeodbprofile.html">GslbGeoDbProfile</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-healthmonitor") %>>
-              <a href="/docs/providers/avi/d/avi_healthmonitor.html">HealthMonitor</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-albservicesconfig") %>>
-              <a href="/docs/providers/avi/d/avi_albservicesconfig.html">ALBServicesConfig</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-network") %>>
-              <a href="/docs/providers/avi/d/avi_network.html">Network</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-federationcheckpoint") %>>
-              <a href="/docs/providers/avi/d/avi_federationcheckpoint.html">FederationCheckpoint</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-siteversion") %>>
-              <a href="/docs/providers/avi/d/avi_siteversion.html">SiteVersion</a>
+                      <li<%= sidebar_current("docs-avi-autoscalelaunchconfig") %>>
+              <a href="/docs/providers/avi/d/avi_autoscalelaunchconfig.html">AutoScaleLaunchConfig</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-networkservice") %>>
-              <a href="/docs/providers/avi/d/avi_networkservice.html">NetworkService</a>
+                      <li<%= sidebar_current("docs-avi-serverautoscalepolicy") %>>
+              <a href="/docs/providers/avi/d/avi_serverautoscalepolicy.html">ServerAutoScalePolicy</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-securitypolicy") %>>
-              <a href="/docs/providers/avi/d/avi_securitypolicy.html">SecurityPolicy</a>
+                      <li<%= sidebar_current("docs-avi-rmcloudopsproto") %>>
+              <a href="/docs/providers/avi/d/avi_rmcloudopsproto.html">RmCloudOpsProto</a>
             </li>
                       <li<%= sidebar_current("docs-avi-statediffoperation") %>>
               <a href="/docs/providers/avi/d/avi_statediffoperation.html">StatediffOperation</a>
@@ -59,47 +32,23 @@
                       <li<%= sidebar_current("docs-avi-statediffsnapshot") %>>
               <a href="/docs/providers/avi/d/avi_statediffsnapshot.html">StatediffSnapshot</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-csrfpolicy") %>>
-              <a href="/docs/providers/avi/d/avi_csrfpolicy.html">CSRFPolicy</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-vsvip") %>>
-              <a href="/docs/providers/avi/d/avi_vsvip.html">VsVip</a>
+                      <li<%= sidebar_current("docs-avi-analyticsprofile") %>>
+              <a href="/docs/providers/avi/d/avi_analyticsprofile.html">AnalyticsProfile</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-virtualservice") %>>
-              <a href="/docs/providers/avi/d/avi_virtualservice.html">VirtualService</a>
+                      <li<%= sidebar_current("docs-avi-gslbsmruntime") %>>
+              <a href="/docs/providers/avi/d/avi_gslbsmruntime.html">GslbSMRuntime</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-serviceenginegroup") %>>
-              <a href="/docs/providers/avi/d/avi_serviceenginegroup.html">ServiceEngineGroup</a>
+                      <li<%= sidebar_current("docs-avi-gslbcrmruntime") %>>
+              <a href="/docs/providers/avi/d/avi_gslbcrmruntime.html">GslbCRMRuntime</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-errorpagebody") %>>
-              <a href="/docs/providers/avi/d/avi_errorpagebody.html">ErrorPageBody</a>
+                      <li<%= sidebar_current("docs-avi-gslbhsmruntime") %>>
+              <a href="/docs/providers/avi/d/avi_gslbhsmruntime.html">GslbHSMRuntime</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-errorpageprofile") %>>
-              <a href="/docs/providers/avi/d/avi_errorpageprofile.html">ErrorPageProfile</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-fileobject") %>>
-              <a href="/docs/providers/avi/d/avi_fileobject.html">FileObject</a>
+                      <li<%= sidebar_current("docs-avi-localworkerfdsversion") %>>
+              <a href="/docs/providers/avi/d/avi_localworkerfdsversion.html">LocalWorkerFdsVersion</a>
             </li>
                       <li<%= sidebar_current("docs-avi-httppolicyset") %>>
               <a href="/docs/providers/avi/d/avi_httppolicyset.html">HTTPPolicySet</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-systemlimits") %>>
-              <a href="/docs/providers/avi/d/avi_systemlimits.html">SystemLimits</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-controllerportalregistration") %>>
-              <a href="/docs/providers/avi/d/avi_controllerportalregistration.html">ControllerPortalRegistration</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-upgradestatusinfo") %>>
-              <a href="/docs/providers/avi/d/avi_upgradestatusinfo.html">UpgradeStatusInfo</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-upgradestatussummary") %>>
-              <a href="/docs/providers/avi/d/avi_upgradestatussummary.html">UpgradeStatusSummary</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-licenseledgerdetails") %>>
-              <a href="/docs/providers/avi/d/avi_licenseledgerdetails.html">LicenseLedgerDetails</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-ssopolicy") %>>
-              <a href="/docs/providers/avi/d/avi_ssopolicy.html">SSOPolicy</a>
             </li>
                       <li<%= sidebar_current("docs-avi-systemreport") %>>
               <a href="/docs/providers/avi/d/avi_systemreport.html">SystemReport</a>
@@ -116,53 +65,101 @@
                       <li<%= sidebar_current("docs-avi-serviceauthprofile") %>>
               <a href="/docs/providers/avi/d/avi_serviceauthprofile.html">ServiceAuthProfile</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-controllerproperties") %>>
-              <a href="/docs/providers/avi/d/avi_controllerproperties.html">ControllerProperties</a>
+                      <li<%= sidebar_current("docs-avi-icapprofile") %>>
+              <a href="/docs/providers/avi/d/avi_icapprofile.html">IcapProfile</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-ipreputationdb") %>>
+              <a href="/docs/providers/avi/d/avi_ipreputationdb.html">IPReputationDB</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-snmptrapprofile") %>>
+              <a href="/docs/providers/avi/d/avi_snmptrapprofile.html">SnmpTrapProfile</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-dnspolicy") %>>
+              <a href="/docs/providers/avi/d/avi_dnspolicy.html">DnsPolicy</a>
             </li>
                       <li<%= sidebar_current("docs-avi-l4policyset") %>>
               <a href="/docs/providers/avi/d/avi_l4policyset.html">L4PolicySet</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-trustedhostprofile") %>>
-              <a href="/docs/providers/avi/d/avi_trustedhostprofile.html">TrustedHostProfile</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-systemconfiguration") %>>
-              <a href="/docs/providers/avi/d/avi_systemconfiguration.html">SystemConfiguration</a>
+                      <li<%= sidebar_current("docs-avi-vsvip") %>>
+              <a href="/docs/providers/avi/d/avi_vsvip.html">VsVip</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-controllersite") %>>
-              <a href="/docs/providers/avi/d/avi_controllersite.html">ControllerSite</a>
+                      <li<%= sidebar_current("docs-avi-virtualservice") %>>
+              <a href="/docs/providers/avi/d/avi_virtualservice.html">VirtualService</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-alertsyslogconfig") %>>
-              <a href="/docs/providers/avi/d/avi_alertsyslogconfig.html">AlertSyslogConfig</a>
+                      <li<%= sidebar_current("docs-avi-ipaddrgroup") %>>
+              <a href="/docs/providers/avi/d/avi_ipaddrgroup.html">IpAddrGroup</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-alertemailconfig") %>>
-              <a href="/docs/providers/avi/d/avi_alertemailconfig.html">AlertEmailConfig</a>
+                      <li<%= sidebar_current("docs-avi-stringgroup") %>>
+              <a href="/docs/providers/avi/d/avi_stringgroup.html">StringGroup</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-alertscriptconfig") %>>
-              <a href="/docs/providers/avi/d/avi_alertscriptconfig.html">AlertScriptConfig</a>
+                      <li<%= sidebar_current("docs-avi-microservicegroup") %>>
+              <a href="/docs/providers/avi/d/avi_microservicegroup.html">MicroServiceGroup</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-actiongroupconfig") %>>
-              <a href="/docs/providers/avi/d/avi_actiongroupconfig.html">ActionGroupConfig</a>
+                      <li<%= sidebar_current("docs-avi-gslb") %>>
+              <a href="/docs/providers/avi/d/avi_gslb.html">Gslb</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-alertconfig") %>>
-              <a href="/docs/providers/avi/d/avi_alertconfig.html">AlertConfig</a>
+                      <li<%= sidebar_current("docs-avi-gslbservice") %>>
+              <a href="/docs/providers/avi/d/avi_gslbservice.html">GslbService</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-inventoryfaultconfig") %>>
-              <a href="/docs/providers/avi/d/avi_inventoryfaultconfig.html">InventoryFaultConfig</a>
+                      <li<%= sidebar_current("docs-avi-gslbgeodbprofile") %>>
+              <a href="/docs/providers/avi/d/avi_gslbgeodbprofile.html">GslbGeoDbProfile</a>
             </li>
                       <li<%= sidebar_current("docs-avi-vrfcontext") %>>
               <a href="/docs/providers/avi/d/avi_vrfcontext.html">VrfContext</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-applicationprofile") %>>
-              <a href="/docs/providers/avi/d/avi_applicationprofile.html">ApplicationProfile</a>
+                      <li<%= sidebar_current("docs-avi-pool") %>>
+              <a href="/docs/providers/avi/d/avi_pool.html">Pool</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-ipaddrgroup") %>>
-              <a href="/docs/providers/avi/d/avi_ipaddrgroup.html">IpAddrGroup</a>
+                      <li<%= sidebar_current("docs-avi-prioritylabels") %>>
+              <a href="/docs/providers/avi/d/avi_prioritylabels.html">PriorityLabels</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-stringgroup") %>>
-              <a href="/docs/providers/avi/d/avi_stringgroup.html">StringGroup</a>
+                      <li<%= sidebar_current("docs-avi-poolgroupdeploymentpolicy") %>>
+              <a href="/docs/providers/avi/d/avi_poolgroupdeploymentpolicy.html">PoolGroupDeploymentPolicy</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-microservicegroup") %>>
-              <a href="/docs/providers/avi/d/avi_microservicegroup.html">MicroServiceGroup</a>
+                      <li<%= sidebar_current("docs-avi-poolgroup") %>>
+              <a href="/docs/providers/avi/d/avi_poolgroup.html">PoolGroup</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-botmapping") %>>
+              <a href="/docs/providers/avi/d/avi_botmapping.html">BotMapping</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-botipreputationtypemapping") %>>
+              <a href="/docs/providers/avi/d/avi_botipreputationtypemapping.html">BotIPReputationTypeMapping</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-botconfigconsolidator") %>>
+              <a href="/docs/providers/avi/d/avi_botconfigconsolidator.html">BotConfigConsolidator</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-botdetectionpolicy") %>>
+              <a href="/docs/providers/avi/d/avi_botdetectionpolicy.html">BotDetectionPolicy</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-geodb") %>>
+              <a href="/docs/providers/avi/d/avi_geodb.html">GeoDB</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-ipamdnsproviderprofile") %>>
+              <a href="/docs/providers/avi/d/avi_ipamdnsproviderprofile.html">IpamDnsProviderProfile</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-customipamdnsprofile") %>>
+              <a href="/docs/providers/avi/d/avi_customipamdnsprofile.html">CustomIpamDnsProfile</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-vsgs") %>>
+              <a href="/docs/providers/avi/d/avi_vsgs.html">VsGs</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-upgradestatusinfo") %>>
+              <a href="/docs/providers/avi/d/avi_upgradestatusinfo.html">UpgradeStatusInfo</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-upgradestatussummary") %>>
+              <a href="/docs/providers/avi/d/avi_upgradestatussummary.html">UpgradeStatusSummary</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-csrfpolicy") %>>
+              <a href="/docs/providers/avi/d/avi_csrfpolicy.html">CSRFPolicy</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-networkservice") %>>
+              <a href="/docs/providers/avi/d/avi_networkservice.html">NetworkService</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-serviceenginegroup") %>>
+              <a href="/docs/providers/avi/d/avi_serviceenginegroup.html">ServiceEngineGroup</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-ssopolicy") %>>
+              <a href="/docs/providers/avi/d/avi_ssopolicy.html">SSOPolicy</a>
             </li>
                       <li<%= sidebar_current("docs-avi-sslprofile") %>>
               <a href="/docs/providers/avi/d/avi_sslprofile.html">SSLProfile</a>
@@ -175,21 +172,6 @@
             </li>
                       <li<%= sidebar_current("docs-avi-pkiprofile") %>>
               <a href="/docs/providers/avi/d/avi_pkiprofile.html">PKIProfile</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-tenant") %>>
-              <a href="/docs/providers/avi/d/avi_tenant.html">Tenant</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-vsdatascriptset") %>>
-              <a href="/docs/providers/avi/d/avi_vsdatascriptset.html">VSDataScriptSet</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-cluster") %>>
-              <a href="/docs/providers/avi/d/avi_cluster.html">Cluster</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-clusterclouddetails") %>>
-              <a href="/docs/providers/avi/d/avi_clusterclouddetails.html">ClusterCloudDetails</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-licensestatus") %>>
-              <a href="/docs/providers/avi/d/avi_licensestatus.html">LicenseStatus</a>
             </li>
                       <li<%= sidebar_current("docs-avi-role") %>>
               <a href="/docs/providers/avi/d/avi_role.html">Role</a>
@@ -200,77 +182,95 @@
                       <li<%= sidebar_current("docs-avi-user") %>>
               <a href="/docs/providers/avi/d/avi_user.html">User</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-analyticsprofile") %>>
-              <a href="/docs/providers/avi/d/avi_analyticsprofile.html">AnalyticsProfile</a>
+                      <li<%= sidebar_current("docs-avi-healthmonitor") %>>
+              <a href="/docs/providers/avi/d/avi_healthmonitor.html">HealthMonitor</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-wafprofile") %>>
-              <a href="/docs/providers/avi/d/avi_wafprofile.html">WafProfile</a>
+                      <li<%= sidebar_current("docs-avi-errorpagebody") %>>
+              <a href="/docs/providers/avi/d/avi_errorpagebody.html">ErrorPageBody</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-wafcrs") %>>
-              <a href="/docs/providers/avi/d/avi_wafcrs.html">WafCRS</a>
+                      <li<%= sidebar_current("docs-avi-errorpageprofile") %>>
+              <a href="/docs/providers/avi/d/avi_errorpageprofile.html">ErrorPageProfile</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-wafpolicypsmgroup") %>>
-              <a href="/docs/providers/avi/d/avi_wafpolicypsmgroup.html">WafPolicyPSMGroup</a>
+                      <li<%= sidebar_current("docs-avi-systemlimits") %>>
+              <a href="/docs/providers/avi/d/avi_systemlimits.html">SystemLimits</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-wafapplicationsignatureprovider") %>>
-              <a href="/docs/providers/avi/d/avi_wafapplicationsignatureprovider.html">WafApplicationSignatureProvider</a>
+                      <li<%= sidebar_current("docs-avi-tenant") %>>
+              <a href="/docs/providers/avi/d/avi_tenant.html">Tenant</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-wafpolicy") %>>
-              <a href="/docs/providers/avi/d/avi_wafpolicy.html">WafPolicy</a>
+                      <li<%= sidebar_current("docs-avi-federationcheckpoint") %>>
+              <a href="/docs/providers/avi/d/avi_federationcheckpoint.html">FederationCheckpoint</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-botmapping") %>>
-              <a href="/docs/providers/avi/d/avi_botmapping.html">BotMapping</a>
+                      <li<%= sidebar_current("docs-avi-siteversion") %>>
+              <a href="/docs/providers/avi/d/avi_siteversion.html">SiteVersion</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-botipreputationtypemapping") %>>
-              <a href="/docs/providers/avi/d/avi_botipreputationtypemapping.html">BotIPReputationTypeMapping</a>
+                      <li<%= sidebar_current("docs-avi-hardwaresecuritymodulegroup") %>>
+              <a href="/docs/providers/avi/d/avi_hardwaresecuritymodulegroup.html">HardwareSecurityModuleGroup</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-botconfigconsolidator") %>>
-              <a href="/docs/providers/avi/d/avi_botconfigconsolidator.html">BotConfigConsolidator</a>
+                      <li<%= sidebar_current("docs-avi-applicationpersistenceprofile") %>>
+              <a href="/docs/providers/avi/d/avi_applicationpersistenceprofile.html">ApplicationPersistenceProfile</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-botdetectionpolicy") %>>
-              <a href="/docs/providers/avi/d/avi_botdetectionpolicy.html">BotDetectionPolicy</a>
+                      <li<%= sidebar_current("docs-avi-memorybalancerrequest") %>>
+              <a href="/docs/providers/avi/d/avi_memorybalancerrequest.html">MemoryBalancerRequest</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-vsgs") %>>
-              <a href="/docs/providers/avi/d/avi_vsgs.html">VsGs</a>
+                      <li<%= sidebar_current("docs-avi-alertsyslogconfig") %>>
+              <a href="/docs/providers/avi/d/avi_alertsyslogconfig.html">AlertSyslogConfig</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-pool") %>>
-              <a href="/docs/providers/avi/d/avi_pool.html">Pool</a>
+                      <li<%= sidebar_current("docs-avi-alertemailconfig") %>>
+              <a href="/docs/providers/avi/d/avi_alertemailconfig.html">AlertEmailConfig</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-prioritylabels") %>>
-              <a href="/docs/providers/avi/d/avi_prioritylabels.html">PriorityLabels</a>
+                      <li<%= sidebar_current("docs-avi-alertscriptconfig") %>>
+              <a href="/docs/providers/avi/d/avi_alertscriptconfig.html">AlertScriptConfig</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-poolgroupdeploymentpolicy") %>>
-              <a href="/docs/providers/avi/d/avi_poolgroupdeploymentpolicy.html">PoolGroupDeploymentPolicy</a>
+                      <li<%= sidebar_current("docs-avi-actiongroupconfig") %>>
+              <a href="/docs/providers/avi/d/avi_actiongroupconfig.html">ActionGroupConfig</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-poolgroup") %>>
-              <a href="/docs/providers/avi/d/avi_poolgroup.html">PoolGroup</a>
+                      <li<%= sidebar_current("docs-avi-alertconfig") %>>
+              <a href="/docs/providers/avi/d/avi_alertconfig.html">AlertConfig</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-networksecuritypolicy") %>>
-              <a href="/docs/providers/avi/d/avi_networksecuritypolicy.html">NetworkSecurityPolicy</a>
+                      <li<%= sidebar_current("docs-avi-inventoryfaultconfig") %>>
+              <a href="/docs/providers/avi/d/avi_inventoryfaultconfig.html">InventoryFaultConfig</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-serviceengine") %>>
-              <a href="/docs/providers/avi/d/avi_serviceengine.html">ServiceEngine</a>
+                      <li<%= sidebar_current("docs-avi-cluster") %>>
+              <a href="/docs/providers/avi/d/avi_cluster.html">Cluster</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-geodb") %>>
-              <a href="/docs/providers/avi/d/avi_geodb.html">GeoDB</a>
+                      <li<%= sidebar_current("docs-avi-clusterclouddetails") %>>
+              <a href="/docs/providers/avi/d/avi_clusterclouddetails.html">ClusterCloudDetails</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-icapprofile") %>>
-              <a href="/docs/providers/avi/d/avi_icapprofile.html">IcapProfile</a>
+                      <li<%= sidebar_current("docs-avi-retentionpolicy") %>>
+              <a href="/docs/providers/avi/d/avi_retentionpolicy.html">RetentionPolicy</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-hardwaresecuritymodulegroup") %>>
-              <a href="/docs/providers/avi/d/avi_hardwaresecuritymodulegroup.html">HardwareSecurityModuleGroup</a>
+                      <li<%= sidebar_current("docs-avi-licensestatus") %>>
+              <a href="/docs/providers/avi/d/avi_licensestatus.html">LicenseStatus</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-autoscalelaunchconfig") %>>
-              <a href="/docs/providers/avi/d/avi_autoscalelaunchconfig.html">AutoScaleLaunchConfig</a>
+                      <li<%= sidebar_current("docs-avi-controllerproperties") %>>
+              <a href="/docs/providers/avi/d/avi_controllerproperties.html">ControllerProperties</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-serviceengine") %>>
+              <a href="/docs/providers/avi/d/avi_serviceengine.html">ServiceEngine</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-network") %>>
+              <a href="/docs/providers/avi/d/avi_network.html">Network</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-serverautoscalepolicy") %>>
-              <a href="/docs/providers/avi/d/avi_serverautoscalepolicy.html">ServerAutoScalePolicy</a>
+                      <li<%= sidebar_current("docs-avi-networksecuritypolicy") %>>
+              <a href="/docs/providers/avi/d/avi_networksecuritypolicy.html">NetworkSecurityPolicy</a>
             </li>
                       <li<%= sidebar_current("docs-avi-image") %>>
               <a href="/docs/providers/avi/d/avi_image.html">Image</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-memorybalancerrequest") %>>
-              <a href="/docs/providers/avi/d/avi_memorybalancerrequest.html">MemoryBalancerRequest</a>
+                      <li<%= sidebar_current("docs-avi-securitypolicy") %>>
+              <a href="/docs/providers/avi/d/avi_securitypolicy.html">SecurityPolicy</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-controllerportalregistration") %>>
+              <a href="/docs/providers/avi/d/avi_controllerportalregistration.html">ControllerPortalRegistration</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-applicationprofile") %>>
+              <a href="/docs/providers/avi/d/avi_applicationprofile.html">ApplicationProfile</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-albservicesjob") %>>
+              <a href="/docs/providers/avi/d/avi_albservicesjob.html">ALBServicesJob</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-jwtserverprofile") %>>
+              <a href="/docs/providers/avi/d/avi_jwtserverprofile.html">JWTServerProfile</a>
             </li>
                       <li<%= sidebar_current("docs-avi-cloud") %>>
               <a href="/docs/providers/avi/d/avi_cloud.html">Cloud</a>
@@ -284,50 +284,59 @@
                       <li<%= sidebar_current("docs-avi-vcenterserver") %>>
               <a href="/docs/providers/avi/d/avi_vcenterserver.html">VCenterServer</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-networkprofile") %>>
-              <a href="/docs/providers/avi/d/avi_networkprofile.html">NetworkProfile</a>
+                      <li<%= sidebar_current("docs-avi-backupconfiguration") %>>
+              <a href="/docs/providers/avi/d/avi_backupconfiguration.html">BackupConfiguration</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-dnspolicy") %>>
-              <a href="/docs/providers/avi/d/avi_dnspolicy.html">DnsPolicy</a>
+                      <li<%= sidebar_current("docs-avi-scheduler") %>>
+              <a href="/docs/providers/avi/d/avi_scheduler.html">Scheduler</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-jwtserverprofile") %>>
-              <a href="/docs/providers/avi/d/avi_jwtserverprofile.html">JWTServerProfile</a>
+                      <li<%= sidebar_current("docs-avi-wafprofile") %>>
+              <a href="/docs/providers/avi/d/avi_wafprofile.html">WafProfile</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-albservicesjob") %>>
-              <a href="/docs/providers/avi/d/avi_albservicesjob.html">ALBServicesJob</a>
+                      <li<%= sidebar_current("docs-avi-wafcrs") %>>
+              <a href="/docs/providers/avi/d/avi_wafcrs.html">WafCRS</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-nsxtsegmentruntime") %>>
-              <a href="/docs/providers/avi/d/avi_nsxtsegmentruntime.html">NsxtSegmentRuntime</a>
+                      <li<%= sidebar_current("docs-avi-wafpolicypsmgroup") %>>
+              <a href="/docs/providers/avi/d/avi_wafpolicypsmgroup.html">WafPolicyPSMGroup</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-ipamdnsproviderprofile") %>>
-              <a href="/docs/providers/avi/d/avi_ipamdnsproviderprofile.html">IpamDnsProviderProfile</a>
+                      <li<%= sidebar_current("docs-avi-wafapplicationsignatureprovider") %>>
+              <a href="/docs/providers/avi/d/avi_wafapplicationsignatureprovider.html">WafApplicationSignatureProvider</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-customipamdnsprofile") %>>
-              <a href="/docs/providers/avi/d/avi_customipamdnsprofile.html">CustomIpamDnsProfile</a>
+                      <li<%= sidebar_current("docs-avi-wafpolicy") %>>
+              <a href="/docs/providers/avi/d/avi_wafpolicy.html">WafPolicy</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-backupconfiguration") %>>
-              <a href="/docs/providers/avi/d/avi_backupconfiguration.html">BackupConfiguration</a>
+                      <li<%= sidebar_current("docs-avi-albservicesconfig") %>>
+              <a href="/docs/providers/avi/d/avi_albservicesconfig.html">ALBServicesConfig</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-scheduler") %>>
-              <a href="/docs/providers/avi/d/avi_scheduler.html">Scheduler</a>
+                      <li<%= sidebar_current("docs-avi-licenseledgerdetails") %>>
+              <a href="/docs/providers/avi/d/avi_licenseledgerdetails.html">LicenseLedgerDetails</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-ipreputationdb") %>>
-              <a href="/docs/providers/avi/d/avi_ipreputationdb.html">IPReputationDB</a>
+                      <li<%= sidebar_current("docs-avi-fileobject") %>>
+              <a href="/docs/providers/avi/d/avi_fileobject.html">FileObject</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-applicationpersistenceprofile") %>>
-              <a href="/docs/providers/avi/d/avi_applicationpersistenceprofile.html">ApplicationPersistenceProfile</a>
+                      <li<%= sidebar_current("docs-avi-trustedhostprofile") %>>
+              <a href="/docs/providers/avi/d/avi_trustedhostprofile.html">TrustedHostProfile</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-systemconfiguration") %>>
+              <a href="/docs/providers/avi/d/avi_systemconfiguration.html">SystemConfiguration</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-controllersite") %>>
+              <a href="/docs/providers/avi/d/avi_controllersite.html">ControllerSite</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-nsxtsegmentruntime") %>>
+              <a href="/docs/providers/avi/d/avi_nsxtsegmentruntime.html">NsxtSegmentRuntime</a>
             </li>
                       <li<%= sidebar_current("docs-avi-natpolicy") %>>
               <a href="/docs/providers/avi/d/avi_natpolicy.html">NatPolicy</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-webapput") %>>
-              <a href="/docs/providers/avi/d/avi_webapput.html">WebappUT</a>
+                      <li<%= sidebar_current("docs-avi-vsdatascriptset") %>>
+              <a href="/docs/providers/avi/d/avi_vsdatascriptset.html">VSDataScriptSet</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-labelgroup") %>>
-              <a href="/docs/providers/avi/d/avi_labelgroup.html">LabelGroup</a>
+                      <li<%= sidebar_current("docs-avi-networkprofile") %>>
+              <a href="/docs/providers/avi/d/avi_networkprofile.html">NetworkProfile</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-trafficcloneprofile") %>>
-              <a href="/docs/providers/avi/d/avi_trafficcloneprofile.html">TrafficCloneProfile</a>
+                      <li<%= sidebar_current("docs-avi-webhook") %>>
+              <a href="/docs/providers/avi/d/avi_webhook.html">Webhook</a>
             </li>
                       <li<%= sidebar_current("docs-avi-testsedatastorelevel1") %>>
               <a href="/docs/providers/avi/d/avi_testsedatastorelevel1.html">TestSeDatastoreLevel1</a>
@@ -337,12 +346,15 @@
             </li>
                       <li<%= sidebar_current("docs-avi-testsedatastorelevel3") %>>
               <a href="/docs/providers/avi/d/avi_testsedatastorelevel3.html">TestSeDatastoreLevel3</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-albservicesfileupload") %>>
-              <a href="/docs/providers/avi/d/avi_albservicesfileupload.html">ALBServicesFileUpload</a>
             </li>
                       <li<%= sidebar_current("docs-avi-dynamicdnsrecord") %>>
               <a href="/docs/providers/avi/d/avi_dynamicdnsrecord.html">DynamicDnsRecord</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-albservicesfiledownload") %>>
+              <a href="/docs/providers/avi/d/avi_albservicesfiledownload.html">ALBServicesFileDownload</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-labelgroup") %>>
+              <a href="/docs/providers/avi/d/avi_labelgroup.html">LabelGroup</a>
             </li>
                       <li<%= sidebar_current("docs-avi-seproperties") %>>
               <a href="/docs/providers/avi/d/avi_seproperties.html">SeProperties</a>
@@ -350,23 +362,29 @@
                       <li<%= sidebar_current("docs-avi-cloudproperties") %>>
               <a href="/docs/providers/avi/d/avi_cloudproperties.html">CloudProperties</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-albservicesfiledownload") %>>
-              <a href="/docs/providers/avi/d/avi_albservicesfiledownload.html">ALBServicesFileDownload</a>
+                      <li<%= sidebar_current("docs-avi-trafficcloneprofile") %>>
+              <a href="/docs/providers/avi/d/avi_trafficcloneprofile.html">TrafficCloneProfile</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-upgradeprofile") %>>
+              <a href="/docs/providers/avi/d/avi_upgradeprofile.html">UpgradeProfile</a>
             </li>
                       <li<%= sidebar_current("docs-avi-protocolparser") %>>
               <a href="/docs/providers/avi/d/avi_protocolparser.html">ProtocolParser</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-webhook") %>>
-              <a href="/docs/providers/avi/d/avi_webhook.html">Webhook</a>
+                      <li<%= sidebar_current("docs-avi-tenantsystemconfiguration") %>>
+              <a href="/docs/providers/avi/d/avi_tenantsystemconfiguration.html">TenantSystemConfiguration</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-backup") %>>
-              <a href="/docs/providers/avi/d/avi_backup.html">Backup</a>
+                      <li<%= sidebar_current("docs-avi-albservicesfileupload") %>>
+              <a href="/docs/providers/avi/d/avi_albservicesfileupload.html">ALBServicesFileUpload</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-webapput") %>>
+              <a href="/docs/providers/avi/d/avi_webapput.html">WebappUT</a>
             </li>
                       <li<%= sidebar_current("docs-avi-securitymanagerdata") %>>
               <a href="/docs/providers/avi/d/avi_securitymanagerdata.html">SecurityManagerData</a>
             </li>
-                      <li<%= sidebar_current("docs-avi-tenantsystemconfiguration") %>>
-              <a href="/docs/providers/avi/d/avi_tenantsystemconfiguration.html">TenantSystemConfiguration</a>
+                      <li<%= sidebar_current("docs-avi-backup") %>>
+              <a href="/docs/providers/avi/d/avi_backup.html">Backup</a>
             </li>
                       <li<%= sidebar_current("docs-avi-fileservice") %>>
               <a href="/docs/providers/avi/d/avi_fileservice.html">FileService</a>
@@ -380,41 +398,14 @@
         <li<%= sidebar_current("docs-avi-resource") %>>
           <a href="#">Resources</a>
           <ul class="nav nav-visible">
-                      <li<%= sidebar_current("docs-avi-rmcloudopsproto") %>>
-              <a href="/docs/providers/avi/r/avi_rmcloudopsproto.html">RmCloudOpsProto</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-snmptrapprofile") %>>
-              <a href="/docs/providers/avi/r/avi_snmptrapprofile.html">SnmpTrapProfile</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-gslb") %>>
-              <a href="/docs/providers/avi/r/avi_gslb.html">Gslb</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-gslbservice") %>>
-              <a href="/docs/providers/avi/r/avi_gslbservice.html">GslbService</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-gslbgeodbprofile") %>>
-              <a href="/docs/providers/avi/r/avi_gslbgeodbprofile.html">GslbGeoDbProfile</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-healthmonitor") %>>
-              <a href="/docs/providers/avi/r/avi_healthmonitor.html">HealthMonitor</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-albservicesconfig") %>>
-              <a href="/docs/providers/avi/r/avi_albservicesconfig.html">ALBServicesConfig</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-network") %>>
-              <a href="/docs/providers/avi/r/avi_network.html">Network</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-federationcheckpoint") %>>
-              <a href="/docs/providers/avi/r/avi_federationcheckpoint.html">FederationCheckpoint</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-siteversion") %>>
-              <a href="/docs/providers/avi/r/avi_siteversion.html">SiteVersion</a>
+                      <li<%= sidebar_current("docs-avi-autoscalelaunchconfig") %>>
+              <a href="/docs/providers/avi/r/avi_autoscalelaunchconfig.html">AutoScaleLaunchConfig</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-networkservice") %>>
-              <a href="/docs/providers/avi/r/avi_networkservice.html">NetworkService</a>
+		              <li<%= sidebar_current("docs-avi-serverautoscalepolicy") %>>
+              <a href="/docs/providers/avi/r/avi_serverautoscalepolicy.html">ServerAutoScalePolicy</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-securitypolicy") %>>
-              <a href="/docs/providers/avi/r/avi_securitypolicy.html">SecurityPolicy</a>
+		              <li<%= sidebar_current("docs-avi-rmcloudopsproto") %>>
+              <a href="/docs/providers/avi/r/avi_rmcloudopsproto.html">RmCloudOpsProto</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-statediffoperation") %>>
               <a href="/docs/providers/avi/r/avi_statediffoperation.html">StatediffOperation</a>
@@ -422,47 +413,23 @@
 		              <li<%= sidebar_current("docs-avi-statediffsnapshot") %>>
               <a href="/docs/providers/avi/r/avi_statediffsnapshot.html">StatediffSnapshot</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-csrfpolicy") %>>
-              <a href="/docs/providers/avi/r/avi_csrfpolicy.html">CSRFPolicy</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-vsvip") %>>
-              <a href="/docs/providers/avi/r/avi_vsvip.html">VsVip</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-virtualservice") %>>
-              <a href="/docs/providers/avi/r/avi_virtualservice.html">VirtualService</a>
+		              <li<%= sidebar_current("docs-avi-analyticsprofile") %>>
+              <a href="/docs/providers/avi/r/avi_analyticsprofile.html">AnalyticsProfile</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-serviceenginegroup") %>>
-              <a href="/docs/providers/avi/r/avi_serviceenginegroup.html">ServiceEngineGroup</a>
+		              <li<%= sidebar_current("docs-avi-gslbsmruntime") %>>
+              <a href="/docs/providers/avi/r/avi_gslbsmruntime.html">GslbSMRuntime</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-errorpagebody") %>>
-              <a href="/docs/providers/avi/r/avi_errorpagebody.html">ErrorPageBody</a>
+		              <li<%= sidebar_current("docs-avi-gslbcrmruntime") %>>
+              <a href="/docs/providers/avi/r/avi_gslbcrmruntime.html">GslbCRMRuntime</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-errorpageprofile") %>>
-              <a href="/docs/providers/avi/r/avi_errorpageprofile.html">ErrorPageProfile</a>
+		              <li<%= sidebar_current("docs-avi-gslbhsmruntime") %>>
+              <a href="/docs/providers/avi/r/avi_gslbhsmruntime.html">GslbHSMRuntime</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-fileobject") %>>
-              <a href="/docs/providers/avi/r/avi_fileobject.html">FileObject</a>
+		              <li<%= sidebar_current("docs-avi-localworkerfdsversion") %>>
+              <a href="/docs/providers/avi/r/avi_localworkerfdsversion.html">LocalWorkerFdsVersion</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-httppolicyset") %>>
               <a href="/docs/providers/avi/r/avi_httppolicyset.html">HTTPPolicySet</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-systemlimits") %>>
-              <a href="/docs/providers/avi/r/avi_systemlimits.html">SystemLimits</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-controllerportalregistration") %>>
-              <a href="/docs/providers/avi/r/avi_controllerportalregistration.html">ControllerPortalRegistration</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-upgradestatusinfo") %>>
-              <a href="/docs/providers/avi/r/avi_upgradestatusinfo.html">UpgradeStatusInfo</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-upgradestatussummary") %>>
-              <a href="/docs/providers/avi/r/avi_upgradestatussummary.html">UpgradeStatusSummary</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-licenseledgerdetails") %>>
-              <a href="/docs/providers/avi/r/avi_licenseledgerdetails.html">LicenseLedgerDetails</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-ssopolicy") %>>
-              <a href="/docs/providers/avi/r/avi_ssopolicy.html">SSOPolicy</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-systemreport") %>>
               <a href="/docs/providers/avi/r/avi_systemreport.html">SystemReport</a>
@@ -479,53 +446,101 @@
 		              <li<%= sidebar_current("docs-avi-serviceauthprofile") %>>
               <a href="/docs/providers/avi/r/avi_serviceauthprofile.html">ServiceAuthProfile</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-controllerproperties") %>>
-              <a href="/docs/providers/avi/r/avi_controllerproperties.html">ControllerProperties</a>
+		              <li<%= sidebar_current("docs-avi-icapprofile") %>>
+              <a href="/docs/providers/avi/r/avi_icapprofile.html">IcapProfile</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-ipreputationdb") %>>
+              <a href="/docs/providers/avi/r/avi_ipreputationdb.html">IPReputationDB</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-snmptrapprofile") %>>
+              <a href="/docs/providers/avi/r/avi_snmptrapprofile.html">SnmpTrapProfile</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-dnspolicy") %>>
+              <a href="/docs/providers/avi/r/avi_dnspolicy.html">DnsPolicy</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-l4policyset") %>>
               <a href="/docs/providers/avi/r/avi_l4policyset.html">L4PolicySet</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-trustedhostprofile") %>>
-              <a href="/docs/providers/avi/r/avi_trustedhostprofile.html">TrustedHostProfile</a>
+		              <li<%= sidebar_current("docs-avi-vsvip") %>>
+              <a href="/docs/providers/avi/r/avi_vsvip.html">VsVip</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-systemconfiguration") %>>
-              <a href="/docs/providers/avi/r/avi_systemconfiguration.html">SystemConfiguration</a>
+		              <li<%= sidebar_current("docs-avi-virtualservice") %>>
+              <a href="/docs/providers/avi/r/avi_virtualservice.html">VirtualService</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-controllersite") %>>
-              <a href="/docs/providers/avi/r/avi_controllersite.html">ControllerSite</a>
+		              <li<%= sidebar_current("docs-avi-ipaddrgroup") %>>
+              <a href="/docs/providers/avi/r/avi_ipaddrgroup.html">IpAddrGroup</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-alertsyslogconfig") %>>
-              <a href="/docs/providers/avi/r/avi_alertsyslogconfig.html">AlertSyslogConfig</a>
+		              <li<%= sidebar_current("docs-avi-stringgroup") %>>
+              <a href="/docs/providers/avi/r/avi_stringgroup.html">StringGroup</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-microservicegroup") %>>
+              <a href="/docs/providers/avi/r/avi_microservicegroup.html">MicroServiceGroup</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-gslb") %>>
+              <a href="/docs/providers/avi/r/avi_gslb.html">Gslb</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-gslbservice") %>>
+              <a href="/docs/providers/avi/r/avi_gslbservice.html">GslbService</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-gslbgeodbprofile") %>>
+              <a href="/docs/providers/avi/r/avi_gslbgeodbprofile.html">GslbGeoDbProfile</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-vrfcontext") %>>
+              <a href="/docs/providers/avi/r/avi_vrfcontext.html">VrfContext</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-pool") %>>
+              <a href="/docs/providers/avi/r/avi_pool.html">Pool</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-prioritylabels") %>>
+              <a href="/docs/providers/avi/r/avi_prioritylabels.html">PriorityLabels</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-poolgroupdeploymentpolicy") %>>
+              <a href="/docs/providers/avi/r/avi_poolgroupdeploymentpolicy.html">PoolGroupDeploymentPolicy</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-poolgroup") %>>
+              <a href="/docs/providers/avi/r/avi_poolgroup.html">PoolGroup</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-botmapping") %>>
+              <a href="/docs/providers/avi/r/avi_botmapping.html">BotMapping</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-botipreputationtypemapping") %>>
+              <a href="/docs/providers/avi/r/avi_botipreputationtypemapping.html">BotIPReputationTypeMapping</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-botconfigconsolidator") %>>
+              <a href="/docs/providers/avi/r/avi_botconfigconsolidator.html">BotConfigConsolidator</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-botdetectionpolicy") %>>
+              <a href="/docs/providers/avi/r/avi_botdetectionpolicy.html">BotDetectionPolicy</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-alertemailconfig") %>>
-              <a href="/docs/providers/avi/r/avi_alertemailconfig.html">AlertEmailConfig</a>
+		              <li<%= sidebar_current("docs-avi-geodb") %>>
+              <a href="/docs/providers/avi/r/avi_geodb.html">GeoDB</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-alertscriptconfig") %>>
-              <a href="/docs/providers/avi/r/avi_alertscriptconfig.html">AlertScriptConfig</a>
+		              <li<%= sidebar_current("docs-avi-ipamdnsproviderprofile") %>>
+              <a href="/docs/providers/avi/r/avi_ipamdnsproviderprofile.html">IpamDnsProviderProfile</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-actiongroupconfig") %>>
-              <a href="/docs/providers/avi/r/avi_actiongroupconfig.html">ActionGroupConfig</a>
+		              <li<%= sidebar_current("docs-avi-customipamdnsprofile") %>>
+              <a href="/docs/providers/avi/r/avi_customipamdnsprofile.html">CustomIpamDnsProfile</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-alertconfig") %>>
-              <a href="/docs/providers/avi/r/avi_alertconfig.html">AlertConfig</a>
+		              <li<%= sidebar_current("docs-avi-vsgs") %>>
+              <a href="/docs/providers/avi/r/avi_vsgs.html">VsGs</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-inventoryfaultconfig") %>>
-              <a href="/docs/providers/avi/r/avi_inventoryfaultconfig.html">InventoryFaultConfig</a>
+		              <li<%= sidebar_current("docs-avi-upgradestatusinfo") %>>
+              <a href="/docs/providers/avi/r/avi_upgradestatusinfo.html">UpgradeStatusInfo</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-vrfcontext") %>>
-              <a href="/docs/providers/avi/r/avi_vrfcontext.html">VrfContext</a>
+		              <li<%= sidebar_current("docs-avi-upgradestatussummary") %>>
+              <a href="/docs/providers/avi/r/avi_upgradestatussummary.html">UpgradeStatusSummary</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-applicationprofile") %>>
-              <a href="/docs/providers/avi/r/avi_applicationprofile.html">ApplicationProfile</a>
+		              <li<%= sidebar_current("docs-avi-csrfpolicy") %>>
+              <a href="/docs/providers/avi/r/avi_csrfpolicy.html">CSRFPolicy</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-ipaddrgroup") %>>
-              <a href="/docs/providers/avi/r/avi_ipaddrgroup.html">IpAddrGroup</a>
+		              <li<%= sidebar_current("docs-avi-networkservice") %>>
+              <a href="/docs/providers/avi/r/avi_networkservice.html">NetworkService</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-stringgroup") %>>
-              <a href="/docs/providers/avi/r/avi_stringgroup.html">StringGroup</a>
+		              <li<%= sidebar_current("docs-avi-serviceenginegroup") %>>
+              <a href="/docs/providers/avi/r/avi_serviceenginegroup.html">ServiceEngineGroup</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-microservicegroup") %>>
-              <a href="/docs/providers/avi/r/avi_microservicegroup.html">MicroServiceGroup</a>
+		              <li<%= sidebar_current("docs-avi-ssopolicy") %>>
+              <a href="/docs/providers/avi/r/avi_ssopolicy.html">SSOPolicy</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-sslprofile") %>>
               <a href="/docs/providers/avi/r/avi_sslprofile.html">SSLProfile</a>
@@ -538,21 +553,6 @@
             </li>
 		              <li<%= sidebar_current("docs-avi-pkiprofile") %>>
               <a href="/docs/providers/avi/r/avi_pkiprofile.html">PKIProfile</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-tenant") %>>
-              <a href="/docs/providers/avi/r/avi_tenant.html">Tenant</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-vsdatascriptset") %>>
-              <a href="/docs/providers/avi/r/avi_vsdatascriptset.html">VSDataScriptSet</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-cluster") %>>
-              <a href="/docs/providers/avi/r/avi_cluster.html">Cluster</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-clusterclouddetails") %>>
-              <a href="/docs/providers/avi/r/avi_clusterclouddetails.html">ClusterCloudDetails</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-licensestatus") %>>
-              <a href="/docs/providers/avi/r/avi_licensestatus.html">LicenseStatus</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-role") %>>
               <a href="/docs/providers/avi/r/avi_role.html">Role</a>
@@ -563,77 +563,95 @@
 		              <li<%= sidebar_current("docs-avi-user") %>>
               <a href="/docs/providers/avi/r/avi_user.html">User</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-analyticsprofile") %>>
-              <a href="/docs/providers/avi/r/avi_analyticsprofile.html">AnalyticsProfile</a>
+		              <li<%= sidebar_current("docs-avi-healthmonitor") %>>
+              <a href="/docs/providers/avi/r/avi_healthmonitor.html">HealthMonitor</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-wafprofile") %>>
-              <a href="/docs/providers/avi/r/avi_wafprofile.html">WafProfile</a>
+		              <li<%= sidebar_current("docs-avi-errorpagebody") %>>
+              <a href="/docs/providers/avi/r/avi_errorpagebody.html">ErrorPageBody</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-wafcrs") %>>
-              <a href="/docs/providers/avi/r/avi_wafcrs.html">WafCRS</a>
+		              <li<%= sidebar_current("docs-avi-errorpageprofile") %>>
+              <a href="/docs/providers/avi/r/avi_errorpageprofile.html">ErrorPageProfile</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-wafpolicypsmgroup") %>>
-              <a href="/docs/providers/avi/r/avi_wafpolicypsmgroup.html">WafPolicyPSMGroup</a>
+		              <li<%= sidebar_current("docs-avi-systemlimits") %>>
+              <a href="/docs/providers/avi/r/avi_systemlimits.html">SystemLimits</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-wafapplicationsignatureprovider") %>>
-              <a href="/docs/providers/avi/r/avi_wafapplicationsignatureprovider.html">WafApplicationSignatureProvider</a>
+		              <li<%= sidebar_current("docs-avi-tenant") %>>
+              <a href="/docs/providers/avi/r/avi_tenant.html">Tenant</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-wafpolicy") %>>
-              <a href="/docs/providers/avi/r/avi_wafpolicy.html">WafPolicy</a>
+		              <li<%= sidebar_current("docs-avi-federationcheckpoint") %>>
+              <a href="/docs/providers/avi/r/avi_federationcheckpoint.html">FederationCheckpoint</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-botmapping") %>>
-              <a href="/docs/providers/avi/r/avi_botmapping.html">BotMapping</a>
+		              <li<%= sidebar_current("docs-avi-siteversion") %>>
+              <a href="/docs/providers/avi/r/avi_siteversion.html">SiteVersion</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-botipreputationtypemapping") %>>
-              <a href="/docs/providers/avi/r/avi_botipreputationtypemapping.html">BotIPReputationTypeMapping</a>
+		              <li<%= sidebar_current("docs-avi-hardwaresecuritymodulegroup") %>>
+              <a href="/docs/providers/avi/r/avi_hardwaresecuritymodulegroup.html">HardwareSecurityModuleGroup</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-botconfigconsolidator") %>>
-              <a href="/docs/providers/avi/r/avi_botconfigconsolidator.html">BotConfigConsolidator</a>
+		              <li<%= sidebar_current("docs-avi-applicationpersistenceprofile") %>>
+              <a href="/docs/providers/avi/r/avi_applicationpersistenceprofile.html">ApplicationPersistenceProfile</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-botdetectionpolicy") %>>
-              <a href="/docs/providers/avi/r/avi_botdetectionpolicy.html">BotDetectionPolicy</a>
+		              <li<%= sidebar_current("docs-avi-memorybalancerrequest") %>>
+              <a href="/docs/providers/avi/r/avi_memorybalancerrequest.html">MemoryBalancerRequest</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-vsgs") %>>
-              <a href="/docs/providers/avi/r/avi_vsgs.html">VsGs</a>
+		              <li<%= sidebar_current("docs-avi-alertsyslogconfig") %>>
+              <a href="/docs/providers/avi/r/avi_alertsyslogconfig.html">AlertSyslogConfig</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-pool") %>>
-              <a href="/docs/providers/avi/r/avi_pool.html">Pool</a>
+		              <li<%= sidebar_current("docs-avi-alertemailconfig") %>>
+              <a href="/docs/providers/avi/r/avi_alertemailconfig.html">AlertEmailConfig</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-prioritylabels") %>>
-              <a href="/docs/providers/avi/r/avi_prioritylabels.html">PriorityLabels</a>
+		              <li<%= sidebar_current("docs-avi-alertscriptconfig") %>>
+              <a href="/docs/providers/avi/r/avi_alertscriptconfig.html">AlertScriptConfig</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-poolgroupdeploymentpolicy") %>>
-              <a href="/docs/providers/avi/r/avi_poolgroupdeploymentpolicy.html">PoolGroupDeploymentPolicy</a>
+		              <li<%= sidebar_current("docs-avi-actiongroupconfig") %>>
+              <a href="/docs/providers/avi/r/avi_actiongroupconfig.html">ActionGroupConfig</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-poolgroup") %>>
-              <a href="/docs/providers/avi/r/avi_poolgroup.html">PoolGroup</a>
+		              <li<%= sidebar_current("docs-avi-alertconfig") %>>
+              <a href="/docs/providers/avi/r/avi_alertconfig.html">AlertConfig</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-networksecuritypolicy") %>>
-              <a href="/docs/providers/avi/r/avi_networksecuritypolicy.html">NetworkSecurityPolicy</a>
+		              <li<%= sidebar_current("docs-avi-inventoryfaultconfig") %>>
+              <a href="/docs/providers/avi/r/avi_inventoryfaultconfig.html">InventoryFaultConfig</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-serviceengine") %>>
-              <a href="/docs/providers/avi/r/avi_serviceengine.html">ServiceEngine</a>
+		              <li<%= sidebar_current("docs-avi-cluster") %>>
+              <a href="/docs/providers/avi/r/avi_cluster.html">Cluster</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-geodb") %>>
-              <a href="/docs/providers/avi/r/avi_geodb.html">GeoDB</a>
+		              <li<%= sidebar_current("docs-avi-clusterclouddetails") %>>
+              <a href="/docs/providers/avi/r/avi_clusterclouddetails.html">ClusterCloudDetails</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-icapprofile") %>>
-              <a href="/docs/providers/avi/r/avi_icapprofile.html">IcapProfile</a>
+		              <li<%= sidebar_current("docs-avi-retentionpolicy") %>>
+              <a href="/docs/providers/avi/r/avi_retentionpolicy.html">RetentionPolicy</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-hardwaresecuritymodulegroup") %>>
-              <a href="/docs/providers/avi/r/avi_hardwaresecuritymodulegroup.html">HardwareSecurityModuleGroup</a>
+		              <li<%= sidebar_current("docs-avi-licensestatus") %>>
+              <a href="/docs/providers/avi/r/avi_licensestatus.html">LicenseStatus</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-autoscalelaunchconfig") %>>
-              <a href="/docs/providers/avi/r/avi_autoscalelaunchconfig.html">AutoScaleLaunchConfig</a>
+		              <li<%= sidebar_current("docs-avi-controllerproperties") %>>
+              <a href="/docs/providers/avi/r/avi_controllerproperties.html">ControllerProperties</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-serverautoscalepolicy") %>>
-              <a href="/docs/providers/avi/r/avi_serverautoscalepolicy.html">ServerAutoScalePolicy</a>
+		              <li<%= sidebar_current("docs-avi-serviceengine") %>>
+              <a href="/docs/providers/avi/r/avi_serviceengine.html">ServiceEngine</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-network") %>>
+              <a href="/docs/providers/avi/r/avi_network.html">Network</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-networksecuritypolicy") %>>
+              <a href="/docs/providers/avi/r/avi_networksecuritypolicy.html">NetworkSecurityPolicy</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-image") %>>
               <a href="/docs/providers/avi/r/avi_image.html">Image</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-memorybalancerrequest") %>>
-              <a href="/docs/providers/avi/r/avi_memorybalancerrequest.html">MemoryBalancerRequest</a>
+		              <li<%= sidebar_current("docs-avi-securitypolicy") %>>
+              <a href="/docs/providers/avi/r/avi_securitypolicy.html">SecurityPolicy</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-controllerportalregistration") %>>
+              <a href="/docs/providers/avi/r/avi_controllerportalregistration.html">ControllerPortalRegistration</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-applicationprofile") %>>
+              <a href="/docs/providers/avi/r/avi_applicationprofile.html">ApplicationProfile</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-albservicesjob") %>>
+              <a href="/docs/providers/avi/r/avi_albservicesjob.html">ALBServicesJob</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-jwtserverprofile") %>>
+              <a href="/docs/providers/avi/r/avi_jwtserverprofile.html">JWTServerProfile</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-cloud") %>>
               <a href="/docs/providers/avi/r/avi_cloud.html">Cloud</a>
@@ -647,50 +665,59 @@
 		              <li<%= sidebar_current("docs-avi-vcenterserver") %>>
               <a href="/docs/providers/avi/r/avi_vcenterserver.html">VCenterServer</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-networkprofile") %>>
-              <a href="/docs/providers/avi/r/avi_networkprofile.html">NetworkProfile</a>
+		              <li<%= sidebar_current("docs-avi-backupconfiguration") %>>
+              <a href="/docs/providers/avi/r/avi_backupconfiguration.html">BackupConfiguration</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-dnspolicy") %>>
-              <a href="/docs/providers/avi/r/avi_dnspolicy.html">DnsPolicy</a>
+		              <li<%= sidebar_current("docs-avi-scheduler") %>>
+              <a href="/docs/providers/avi/r/avi_scheduler.html">Scheduler</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-jwtserverprofile") %>>
-              <a href="/docs/providers/avi/r/avi_jwtserverprofile.html">JWTServerProfile</a>
+		              <li<%= sidebar_current("docs-avi-wafprofile") %>>
+              <a href="/docs/providers/avi/r/avi_wafprofile.html">WafProfile</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-albservicesjob") %>>
-              <a href="/docs/providers/avi/r/avi_albservicesjob.html">ALBServicesJob</a>
+		              <li<%= sidebar_current("docs-avi-wafcrs") %>>
+              <a href="/docs/providers/avi/r/avi_wafcrs.html">WafCRS</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-nsxtsegmentruntime") %>>
-              <a href="/docs/providers/avi/r/avi_nsxtsegmentruntime.html">NsxtSegmentRuntime</a>
+		              <li<%= sidebar_current("docs-avi-wafpolicypsmgroup") %>>
+              <a href="/docs/providers/avi/r/avi_wafpolicypsmgroup.html">WafPolicyPSMGroup</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-ipamdnsproviderprofile") %>>
-              <a href="/docs/providers/avi/r/avi_ipamdnsproviderprofile.html">IpamDnsProviderProfile</a>
+		              <li<%= sidebar_current("docs-avi-wafapplicationsignatureprovider") %>>
+              <a href="/docs/providers/avi/r/avi_wafapplicationsignatureprovider.html">WafApplicationSignatureProvider</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-customipamdnsprofile") %>>
-              <a href="/docs/providers/avi/r/avi_customipamdnsprofile.html">CustomIpamDnsProfile</a>
+		              <li<%= sidebar_current("docs-avi-wafpolicy") %>>
+              <a href="/docs/providers/avi/r/avi_wafpolicy.html">WafPolicy</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-backupconfiguration") %>>
-              <a href="/docs/providers/avi/r/avi_backupconfiguration.html">BackupConfiguration</a>
+		              <li<%= sidebar_current("docs-avi-albservicesconfig") %>>
+              <a href="/docs/providers/avi/r/avi_albservicesconfig.html">ALBServicesConfig</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-scheduler") %>>
-              <a href="/docs/providers/avi/r/avi_scheduler.html">Scheduler</a>
+		              <li<%= sidebar_current("docs-avi-licenseledgerdetails") %>>
+              <a href="/docs/providers/avi/r/avi_licenseledgerdetails.html">LicenseLedgerDetails</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-ipreputationdb") %>>
-              <a href="/docs/providers/avi/r/avi_ipreputationdb.html">IPReputationDB</a>
+		              <li<%= sidebar_current("docs-avi-fileobject") %>>
+              <a href="/docs/providers/avi/r/avi_fileobject.html">FileObject</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-applicationpersistenceprofile") %>>
-              <a href="/docs/providers/avi/r/avi_applicationpersistenceprofile.html">ApplicationPersistenceProfile</a>
+		              <li<%= sidebar_current("docs-avi-trustedhostprofile") %>>
+              <a href="/docs/providers/avi/r/avi_trustedhostprofile.html">TrustedHostProfile</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-systemconfiguration") %>>
+              <a href="/docs/providers/avi/r/avi_systemconfiguration.html">SystemConfiguration</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-controllersite") %>>
+              <a href="/docs/providers/avi/r/avi_controllersite.html">ControllerSite</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-nsxtsegmentruntime") %>>
+              <a href="/docs/providers/avi/r/avi_nsxtsegmentruntime.html">NsxtSegmentRuntime</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-natpolicy") %>>
               <a href="/docs/providers/avi/r/avi_natpolicy.html">NatPolicy</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-webapput") %>>
-              <a href="/docs/providers/avi/r/avi_webapput.html">WebappUT</a>
+		              <li<%= sidebar_current("docs-avi-vsdatascriptset") %>>
+              <a href="/docs/providers/avi/r/avi_vsdatascriptset.html">VSDataScriptSet</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-labelgroup") %>>
-              <a href="/docs/providers/avi/r/avi_labelgroup.html">LabelGroup</a>
+		              <li<%= sidebar_current("docs-avi-networkprofile") %>>
+              <a href="/docs/providers/avi/r/avi_networkprofile.html">NetworkProfile</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-trafficcloneprofile") %>>
-              <a href="/docs/providers/avi/r/avi_trafficcloneprofile.html">TrafficCloneProfile</a>
+		              <li<%= sidebar_current("docs-avi-webhook") %>>
+              <a href="/docs/providers/avi/r/avi_webhook.html">Webhook</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-testsedatastorelevel1") %>>
               <a href="/docs/providers/avi/r/avi_testsedatastorelevel1.html">TestSeDatastoreLevel1</a>
@@ -700,12 +727,15 @@
             </li>
 		              <li<%= sidebar_current("docs-avi-testsedatastorelevel3") %>>
               <a href="/docs/providers/avi/r/avi_testsedatastorelevel3.html">TestSeDatastoreLevel3</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-albservicesfileupload") %>>
-              <a href="/docs/providers/avi/r/avi_albservicesfileupload.html">ALBServicesFileUpload</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-dynamicdnsrecord") %>>
               <a href="/docs/providers/avi/r/avi_dynamicdnsrecord.html">DynamicDnsRecord</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-albservicesfiledownload") %>>
+              <a href="/docs/providers/avi/r/avi_albservicesfiledownload.html">ALBServicesFileDownload</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-labelgroup") %>>
+              <a href="/docs/providers/avi/r/avi_labelgroup.html">LabelGroup</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-seproperties") %>>
               <a href="/docs/providers/avi/r/avi_seproperties.html">SeProperties</a>
@@ -713,23 +743,29 @@
 		              <li<%= sidebar_current("docs-avi-cloudproperties") %>>
               <a href="/docs/providers/avi/r/avi_cloudproperties.html">CloudProperties</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-albservicesfiledownload") %>>
-              <a href="/docs/providers/avi/r/avi_albservicesfiledownload.html">ALBServicesFileDownload</a>
+		              <li<%= sidebar_current("docs-avi-trafficcloneprofile") %>>
+              <a href="/docs/providers/avi/r/avi_trafficcloneprofile.html">TrafficCloneProfile</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-upgradeprofile") %>>
+              <a href="/docs/providers/avi/r/avi_upgradeprofile.html">UpgradeProfile</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-protocolparser") %>>
               <a href="/docs/providers/avi/r/avi_protocolparser.html">ProtocolParser</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-webhook") %>>
-              <a href="/docs/providers/avi/r/avi_webhook.html">Webhook</a>
+		              <li<%= sidebar_current("docs-avi-tenantsystemconfiguration") %>>
+              <a href="/docs/providers/avi/r/avi_tenantsystemconfiguration.html">TenantSystemConfiguration</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-backup") %>>
-              <a href="/docs/providers/avi/r/avi_backup.html">Backup</a>
+		              <li<%= sidebar_current("docs-avi-albservicesfileupload") %>>
+              <a href="/docs/providers/avi/r/avi_albservicesfileupload.html">ALBServicesFileUpload</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-webapput") %>>
+              <a href="/docs/providers/avi/r/avi_webapput.html">WebappUT</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-securitymanagerdata") %>>
               <a href="/docs/providers/avi/r/avi_securitymanagerdata.html">SecurityManagerData</a>
             </li>
-		              <li<%= sidebar_current("docs-avi-tenantsystemconfiguration") %>>
-              <a href="/docs/providers/avi/r/avi_tenantsystemconfiguration.html">TenantSystemConfiguration</a>
+		              <li<%= sidebar_current("docs-avi-backup") %>>
+              <a href="/docs/providers/avi/r/avi_backup.html">Backup</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-useraccount") %>>
               <a href="/docs/providers/avi/r/avi_useraccount.html">UserAccount</a>
diff --git a/website/docs/d/avi_actiongroupconfig.html.markdown b/website/docs/d/avi_actiongroupconfig.html.markdown
index 6b939de02..4ae48e9c9 100644
--- a/website/docs/d/avi_actiongroupconfig.html.markdown
+++ b/website/docs/d/avi_actiongroupconfig.html.markdown
@@ -32,16 +32,16 @@ data "avi_actiongroupconfig" "foo_actiongroupconfig" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `action_script_config_ref` - Reference of the action script configuration to be used. It is a reference to an object of type alertscriptconfig. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `autoscale_trigger_notification` - Trigger notification to autoscale manager. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `email_config_ref` - Select the email notification configuration to use when sending alerts via email. It is a reference to an object of type alertemailconfig. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `external_only` - Generate alert only to external destinations. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `level` - When an alert is generated, mark its priority via the alert level. Enum options - ALERT_LOW, ALERT_MEDIUM, ALERT_HIGH. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `snmp_trap_profile_ref` - Select the snmp trap notification to use when sending alerts via snmp trap. It is a reference to an object of type snmptrapprofile. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `syslog_config_ref` - Select the syslog notification configuration to use when sending alerts via syslog. It is a reference to an object of type alertsyslogconfig. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `action_script_config_ref` - Reference of the action script configuration to be used. It is a reference to an object of type alertscriptconfig. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `autoscale_trigger_notification` - Trigger notification to autoscale manager. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `email_config_ref` - Select the email notification configuration to use when sending alerts via email. It is a reference to an object of type alertemailconfig. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `external_only` - Generate alert only to external destinations. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `level` - When an alert is generated, mark its priority via the alert level. Enum options - ALERT_LOW, ALERT_MEDIUM, ALERT_HIGH. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `snmp_trap_profile_ref` - Select the snmp trap notification to use when sending alerts via snmp trap. It is a reference to an object of type snmptrapprofile. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `syslog_config_ref` - Select the syslog notification configuration to use when sending alerts via syslog. It is a reference to an object of type alertsyslogconfig. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_albservicesconfig.html.markdown b/website/docs/d/avi_albservicesconfig.html.markdown
index 8367eb0d2..61c9e2e2d 100644
--- a/website/docs/d/avi_albservicesconfig.html.markdown
+++ b/website/docs/d/avi_albservicesconfig.html.markdown
@@ -32,25 +32,25 @@ data "avi_albservicesconfig" "foo_albservicesconfig" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `app_signature_config` - 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.
-* `asset_contact` - 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.
-* `case_config` - 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.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
+* `app_signature_config` - Default values for application signature sync. Field introduced in 20.1.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `asset_contact` - Default contact for this controller cluster. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `case_config` - Default values for case management. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `feature_opt_in_status` - Features opt-in for pulse cloud services. Field introduced in 20.1.1.
-* `inventory_config` - Inventory configurations for pulse cloud services. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `ip_reputation_config` - Default values to be used for ip reputation sync. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `mode` - Mode helps log collection and upload. Enum options - MODE_UNKNOWN, SALESFORCE, SYSTEST, MYVMWARE, BROADCOM. Field introduced in 20.1.2. Allowed in enterprise edition with any value, essentials edition(allowed values- salesforce,myvmware,systest), basic edition(allowed values- salesforce,myvmware,systest), enterprise with cloud services edition.
-* `name` - 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.
-* `polling_interval` - Time interval in minutes. Allowed values are 5-60. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `portal_url` - 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.
-* `saas_licensing_config` - Saas licensing configuration. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `session_config` - Session configuration data. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `split_proxy_configuration` - 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.
-* `tenant_config` - Tenant based configuration data. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - 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.
-* `use_split_proxy` - 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.
-* `use_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.
-* `user_agent_db_config` - 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.
-* `uuid` - Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `waf_config` - 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.
+* `inventory_config` - Inventory configurations for pulse cloud services. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ip_reputation_config` - Default values to be used for ip reputation sync. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mode` - Mode helps log collection and upload. Enum options - MODE_UNKNOWN, SALESFORCE, SYSTEST, MYVMWARE, BROADCOM. Field introduced in 20.1.2. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- salesforce,myvmware,systest), basic (allowed values- salesforce,myvmware,systest) edition.
+* `name` - Name of the albservicesconfig object. Field introduced in 30.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `polling_interval` - Time interval in minutes. Allowed values are 5-60. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `portal_url` - The fqdn or ip address of the pulse cloud services. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `saas_licensing_config` - Saas licensing configuration. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `session_config` - Session configuration data. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `split_proxy_configuration` - Split proxy configuration to connect external pulse cloud services. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_config` - Tenant based configuration data. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 30.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_split_proxy` - 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 with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_tls` - Secure the controller to pulse cloud services communication over tls. Field introduced in 20.1.3. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `user_agent_db_config` - Default values for user agent db service. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `waf_config` - Default values for waf management. Field introduced in 21.1.1. Allowed with any value in essentials, basic, enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_albservicesfiledownload.html.markdown b/website/docs/d/avi_albservicesfiledownload.html.markdown
index d54742406..ab9d7ba5c 100644
--- a/website/docs/d/avi_albservicesfiledownload.html.markdown
+++ b/website/docs/d/avi_albservicesfiledownload.html.markdown
@@ -32,14 +32,14 @@ data "avi_albservicesfiledownload" "foo_albservicesfiledownload" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `destination_dir` - Destination of the file to be saved. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `file_type` - Software / crs/ inventory. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `file_uri` - File uri on the cloud bucket. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `message` - Download's success / failure message. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `metadata` - Metadata of the file from pulse. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - The name of the file with which it is saved to the disk. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `status` - Status of file download. 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... Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Unique id of the object. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `destination_dir` - Destination of the file to be saved. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `file_type` - Software / crs/ inventory. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `file_uri` - File uri on the cloud bucket. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `message` - Download's success / failure message. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `metadata` - Metadata of the file from pulse. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - The name of the file with which it is saved to the disk. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `status` - Status of file download. 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_FAILED... Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Unique id of the object. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_albservicesfileupload.html.markdown b/website/docs/d/avi_albservicesfileupload.html.markdown
index 61337c56b..9b1016a34 100644
--- a/website/docs/d/avi_albservicesfileupload.html.markdown
+++ b/website/docs/d/avi_albservicesfileupload.html.markdown
@@ -32,12 +32,12 @@ data "avi_albservicesfileupload" "foo_albservicesfileupload" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `case_id` - Salesforce alphanumeric caseid to attach uploaded file to. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `error` - Error reported during file upload. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `file_path` - Stores output file path, for upload to aws s3. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `s3_directory` - Custom aws s3 directory path to upload file. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `status` - 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... Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `case_id` - Salesforce alphanumeric caseid to attach uploaded file to. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `error` - Error reported during file upload. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `file_path` - Stores output file path, for upload to aws s3. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `s3_directory` - Custom aws s3 directory path to upload file. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `status` - 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_FAILED... Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_albservicesjob.html.markdown b/website/docs/d/avi_albservicesjob.html.markdown
index e4cdeaf2f..cfb33064b 100644
--- a/website/docs/d/avi_albservicesjob.html.markdown
+++ b/website/docs/d/avi_albservicesjob.html.markdown
@@ -32,18 +32,18 @@ data "avi_albservicesjob" "foo_albservicesjob" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `command` - The command to be triggered by the albservicesjob. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `end_time` - Time at which the albservicesjob ended. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - The name of the albservicesjob. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `params` - Job params. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pulse_job_id` - 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.
-* `pulse_sync_status` - 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.
-* `result` - Job result. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `start_time` - Time at which the albservicesjob started. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `status` - The status of the albservicesjob. 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.
-* `status_update_time` - Time at which the status of albservicesjob updated. Field introduced in 22.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - The unique identifier of the tenant to which this albservicesjob belongs. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `token` - Job token. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - A unique identifier for this albservicesjob entry. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `command` - The command to be triggered by the albservicesjob. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `end_time` - Time at which the albservicesjob ended. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - The name of the albservicesjob. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `params` - Job params. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pulse_job_id` - A unique identifier for this job entry on the pulse cloud services. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pulse_sync_status` - Status of sync to pulse cloud services(result uploads/state updates). Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `result` - Job result. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `start_time` - Time at which the albservicesjob started. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `status` - The status of the albservicesjob. Enum options - UNDETERMINED, PENDING, IN_PROGRESS, COMPLETED, FAILED, NOT_ENABLED. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `status_update_time` - Time at which the status of albservicesjob updated. Field introduced in 22.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - The unique identifier of the tenant to which this albservicesjob belongs. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `token` - Job token. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - A unique identifier for this albservicesjob entry. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_alertconfig.html.markdown b/website/docs/d/avi_alertconfig.html.markdown
index b1007e87b..83da33d53 100644
--- a/website/docs/d/avi_alertconfig.html.markdown
+++ b/website/docs/d/avi_alertconfig.html.markdown
@@ -32,23 +32,23 @@ data "avi_alertconfig" "foo_alertconfig" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `action_group_ref` - The alert config will trigger the selected alert action, which can send notifications and execute a controlscript. It is a reference to an object of type actiongroupconfig. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `alert_rule` - List of filters matching on events or client logs used for triggering alerts. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `autoscale_alert` - This alert config applies to auto scale alerts. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `category` - Determines whether an alert is raised immediately when event occurs (realtime) or after specified number of events occurs within rolling time window. Enum options - REALTIME, ROLLINGWINDOW, WATERMARK. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - A custom description field. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enabled` - Enable or disable this alert config from generating new alerts. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `expiry_time` - An alert is expired and deleted after the expiry time has elapsed. The original event triggering the alert remains in the event's log. Allowed values are 1-31536000. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Name of the alert configuration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `obj_uuid` - Instance of the resource for which alert was raised. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `object_type` - The object type to which the alert config is associated with. Valid object types are - virtual service, pool, service engine. Enum options - VIRTUALSERVICE, POOL, HEALTHMONITOR, NETWORKPROFILE, APPLICATIONPROFILE, HTTPPOLICYSET, DNSPOLICY, SECURITYPOLICY, IPADDRGROUP, STRINGGROUP, SSLPROFILE, SSLKEYANDCERTIFICATE, NETWORKSECURITYPOLICY, APPLICATIONPERSISTENCEPROFILE, ANALYTICSPROFILE, VSDATASCRIPTSET, TENANT, PKIPROFILE, AUTHPROFILE, CLOUD... Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `recommendation` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `rolling_window` - Only if the number of events is reached or exceeded within the time window will an alert be generated. Allowed values are 1-31536000. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `source` - Signifies system events or the type of client logsused in this alert configuration. Enum options - CONN_LOGS, APP_LOGS, EVENT_LOGS, METRICS. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `summary` - Summary of reason why alert is generated. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `threshold` - An alert is created only when the number of events meets or exceeds this number within the chosen time frame. Allowed values are 1-65536. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `throttle` - Alerts are suppressed (throttled) for this duration of time since the last alert was raised for this alert config. Allowed values are 0-31536000. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `action_group_ref` - The alert config will trigger the selected alert action, which can send notifications and execute a controlscript. It is a reference to an object of type actiongroupconfig. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `alert_rule` - List of filters matching on events or client logs used for triggering alerts. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `autoscale_alert` - This alert config applies to auto scale alerts. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `category` - Determines whether an alert is raised immediately when event occurs (realtime) or after specified number of events occurs within rolling time window. Enum options - REALTIME, ROLLINGWINDOW, WATERMARK. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - A custom description field. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enabled` - Enable or disable this alert config from generating new alerts. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `expiry_time` - An alert is expired and deleted after the expiry time has elapsed. The original event triggering the alert remains in the event's log. Allowed values are 1-31536000. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the alert configuration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `obj_uuid` - Instance of the resource for which alert was raised. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `object_type` - The object type to which the alert config is associated with. Valid object types are - virtual service, pool, service engine. Enum options - VIRTUALSERVICE, POOL, HEALTHMONITOR, NETWORKPROFILE, APPLICATIONPROFILE, HTTPPOLICYSET, DNSPOLICY, SECURITYPOLICY, IPADDRGROUP, STRINGGROUP, SSLPROFILE, SSLKEYANDCERTIFICATE, NETWORKSECURITYPOLICY, APPLICATIONPERSISTENCEPROFILE, ANALYTICSPROFILE, VSDATASCRIPTSET, TENANT, PKIPROFILE, AUTHPROFILE, CLOUD... Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `recommendation` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rolling_window` - Only if the number of events is reached or exceeded within the time window will an alert be generated. Allowed values are 1-31536000. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `source` - Signifies system events or the type of client logsused in this alert configuration. Enum options - CONN_LOGS, APP_LOGS, EVENT_LOGS, METRICS. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `summary` - Summary of reason why alert is generated. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `threshold` - An alert is created only when the number of events meets or exceeds this number within the chosen time frame. Allowed values are 1-65536. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `throttle` - Alerts are suppressed (throttled) for this duration of time since the last alert was raised for this alert config. Allowed values are 0-31536000. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_alertemailconfig.html.markdown b/website/docs/d/avi_alertemailconfig.html.markdown
index 7b63f8d03..4e5f0732e 100644
--- a/website/docs/d/avi_alertemailconfig.html.markdown
+++ b/website/docs/d/avi_alertemailconfig.html.markdown
@@ -32,11 +32,11 @@ data "avi_alertemailconfig" "foo_alertemailconfig" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `cc_emails` - Alerts are copied to the comma separated list of  email recipients. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - A user-friendly name of the email notification service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `to_emails` - Alerts are sent to the comma separated list of  email recipients. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `cc_emails` - Alerts are copied to the comma separated list of  email recipients. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - A user-friendly name of the email notification service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `to_emails` - Alerts are sent to the comma separated list of  email recipients. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_alertscriptconfig.html.markdown b/website/docs/d/avi_alertscriptconfig.html.markdown
index 762aaccca..8b4d5a185 100644
--- a/website/docs/d/avi_alertscriptconfig.html.markdown
+++ b/website/docs/d/avi_alertscriptconfig.html.markdown
@@ -32,10 +32,10 @@ data "avi_alertscriptconfig" "foo_alertscriptconfig" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `action_script` - User defined alert action script. Please refer to kb.avinetworks.com for more information. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `name` - A user-friendly name of the script. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `timeout` - Controlscript excution timeout. Field introduced in 22.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `action_script` - User defined alert action script. Please refer to kb.avinetworks.com for more information. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - A user-friendly name of the script. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `timeout` - Controlscript excution timeout. Field introduced in 22.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_alertsyslogconfig.html.markdown b/website/docs/d/avi_alertsyslogconfig.html.markdown
index a7b1c597e..5cce053d9 100644
--- a/website/docs/d/avi_alertsyslogconfig.html.markdown
+++ b/website/docs/d/avi_alertsyslogconfig.html.markdown
@@ -32,11 +32,11 @@ data "avi_alertsyslogconfig" "foo_alertsyslogconfig" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - User defined description for alert syslog config. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - A user-friendly name of the syslog notification. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sender_hostname` - User defined sender hostname in syslog message. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `syslog_servers` - The list of syslog servers. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - User defined description for alert syslog config. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - A user-friendly name of the syslog notification. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sender_hostname` - User defined sender hostname in syslog message. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `syslog_servers` - The list of syslog servers. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_analyticsprofile.html.markdown b/website/docs/d/avi_analyticsprofile.html.markdown
index 4006e7df3..61ea6523b 100644
--- a/website/docs/d/avi_analyticsprofile.html.markdown
+++ b/website/docs/d/avi_analyticsprofile.html.markdown
@@ -32,91 +32,91 @@ data "avi_analyticsprofile" "foo_analyticsprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `apdex_response_threshold` - If a client receives an http response in less than the satisfactory latency threshold, the request is considered satisfied. It is considered tolerated if it is not satisfied and less than tolerated latency factor multiplied by the satisfactory latency threshold. Greater than this number and the client's request is considered frustrated. Allowed values are 1-30000. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 500), basic edition(allowed values- 500), enterprise with cloud services edition.
-* `apdex_response_tolerated_factor` - Client tolerated response latency factor. Client must receive a response within this factor times the satisfactory threshold (apdex_response_threshold) to be considered tolerated. Allowed values are 1-1000. Allowed in enterprise edition with any value, essentials edition(allowed values- 4), basic edition(allowed values- 4), enterprise with cloud services edition.
-* `apdex_rtt_threshold` - Satisfactory client to avi round trip time(rtt). Allowed values are 1-2000. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 250), basic edition(allowed values- 250), enterprise with cloud services edition.
-* `apdex_rtt_tolerated_factor` - Tolerated client to avi round trip time(rtt) factor. It is a multiple of apdex_rtt_tolerated_factor. Allowed values are 1-1000. Allowed in enterprise edition with any value, essentials edition(allowed values- 4), basic edition(allowed values- 4), enterprise with cloud services edition.
-* `apdex_rum_threshold` - If a client is able to load a page in less than the satisfactory latency threshold, the pageload is considered satisfied. It is considered tolerated if it is greater than satisfied but less than the tolerated latency multiplied by satisifed latency. Greater than this number and the client's request is considered frustrated. A pageload includes the time for dns lookup, download of all http objects, and page render time. Allowed values are 1-30000. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 5000), basic edition(allowed values- 5000), enterprise with cloud services edition.
-* `apdex_rum_tolerated_factor` - Virtual service threshold factor for tolerated page load time (plt) as multiple of apdex_rum_threshold. Allowed values are 1-1000. Allowed in enterprise edition with any value, essentials edition(allowed values- 4), basic edition(allowed values- 4), enterprise with cloud services edition.
-* `apdex_server_response_threshold` - A server http response is considered satisfied if latency is less than the satisfactory latency threshold. The response is considered tolerated when it is greater than satisfied but less than the tolerated latency factor * s_latency. Greater than this number and the server response is considered frustrated. Allowed values are 1-30000. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 400), basic edition(allowed values- 400), enterprise with cloud services edition.
-* `apdex_server_response_tolerated_factor` - Server tolerated response latency factor. Servermust response within this factor times the satisfactory threshold (apdex_server_response_threshold) to be considered tolerated. Allowed values are 1-1000. Allowed in enterprise edition with any value, essentials edition(allowed values- 4), basic edition(allowed values- 4), enterprise with cloud services edition.
-* `apdex_server_rtt_threshold` - Satisfactory client to avi round trip time(rtt). Allowed values are 1-2000. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 125), basic edition(allowed values- 125), enterprise with cloud services edition.
-* `apdex_server_rtt_tolerated_factor` - Tolerated client to avi round trip time(rtt) factor. It is a multiple of apdex_rtt_tolerated_factor. Allowed values are 1-1000. Allowed in enterprise edition with any value, essentials edition(allowed values- 4), basic edition(allowed values- 4), enterprise with cloud services edition.
-* `client_log_config` - Configure which logs are sent to the avi controller from ses and how they are processed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `client_log_streaming_config` - Configure to stream logs to an external server. Field introduced in 17.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `conn_lossy_ooo_threshold` - A connection between client and avi is considered lossy when more than this percentage of out of order packets are received. Allowed values are 1-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 50), basic edition(allowed values- 50), enterprise with cloud services edition.
-* `conn_lossy_timeo_rexmt_threshold` - A connection between client and avi is considered lossy when more than this percentage of packets are retransmitted due to timeout. Allowed values are 1-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 20), basic edition(allowed values- 20), enterprise with cloud services edition.
-* `conn_lossy_total_rexmt_threshold` - A connection between client and avi is considered lossy when more than this percentage of packets are retransmitted. Allowed values are 1-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 50), basic edition(allowed values- 50), enterprise with cloud services edition.
-* `conn_lossy_zero_win_size_event_threshold` - A client connection is considered lossy when percentage of times a packet could not be trasmitted due to tcp zero window is above this threshold. Allowed values are 0-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 2), basic edition(allowed values- 2), enterprise with cloud services edition.
-* `conn_server_lossy_ooo_threshold` - A connection between avi and server is considered lossy when more than this percentage of out of order packets are received. Allowed values are 1-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 50), basic edition(allowed values- 50), enterprise with cloud services edition.
-* `conn_server_lossy_timeo_rexmt_threshold` - A connection between avi and server is considered lossy when more than this percentage of packets are retransmitted due to timeout. Allowed values are 1-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 20), basic edition(allowed values- 20), enterprise with cloud services edition.
-* `conn_server_lossy_total_rexmt_threshold` - A connection between avi and server is considered lossy when more than this percentage of packets are retransmitted. Allowed values are 1-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 50), basic edition(allowed values- 50), enterprise with cloud services edition.
-* `conn_server_lossy_zero_win_size_event_threshold` - A server connection is considered lossy when percentage of times a packet could not be trasmitted due to tcp zero window is above this threshold. Allowed values are 0-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 2), basic edition(allowed values- 2), enterprise with cloud services edition.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_adaptive_config` - Enable adaptive configuration for optimizing resource usage. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_advanced_analytics` - Enables advanced analytics features like anomaly detection. If set to false, anomaly computation (and associated rules/events) for vs, pool and server metrics will be deactivated. However, setting it to false reduces cpu and memory requirements for analytics subsystem. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition. Special default for essentials edition is false, basic edition is false, enterprise is true.
-* `enable_ondemand_metrics` - Virtual service (vs) metrics are processed only when there is live data traffic on the vs. In case, vs is idle for a period of time as specified by ondemand_metrics_idle_timeout then metrics processing is suspended for that vs. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_se_analytics` - Enable node (service engine) level analytics forvs metrics. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_server_analytics` - Enables analytics on backend servers. This may be desired in container environment when there are large number of ephemeral servers. Additionally, no healthscore of servers is computed when server analytics is enabled. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_vs_analytics` - Enable virtualservice (frontend) analytics. This flag enables metrics and healthscore for virtualservice. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `exclude_client_close_before_request_as_error` - Exclude client closed connection before an http request could be completed from being classified as an error. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_dns_policy_drop_as_significant` - Exclude dns policy drops from the list of errors. Field introduced in 17.2.2. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_gs_down_as_error` - Exclude queries to gslb services that are operationally down from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_http_error_codes` - List of http status codes to be excluded from being classified as an error. Error connections or responses impacts health score, are included as significant logs, and may be classified as part of a dos attack. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `exclude_invalid_dns_domain_as_error` - Exclude dns queries to domains outside the domains configured in the dns application profile from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_invalid_dns_query_as_error` - Exclude invalid dns queries from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_issuer_revoked_ocsp_responses_as_error` - Exclude the issuer-revoked ocsp responses from the list of errors. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `exclude_no_dns_record_as_error` - Exclude queries to domains that did not have configured services/records from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_no_valid_gs_member_as_error` - Exclude queries to gslb services that have no available members from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_persistence_change_as_error` - Exclude persistence server changed while load balancing' from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_revoked_ocsp_responses_as_error` - Exclude the revoked ocsp certificate status responses from the list of errors. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `exclude_server_dns_error_as_error` - Exclude server dns error response from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_server_tcp_reset_as_error` - Exclude server tcp reset from errors. It is common for applications like ms exchange. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_sip_error_codes` - List of sip status codes to be excluded from being classified as an error. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `exclude_stale_ocsp_responses_as_error` - Exclude the stale ocsp certificate status responses from the list of errors. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `exclude_syn_retransmit_as_error` - Exclude 'server unanswered syns' from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_tcp_reset_as_error` - Exclude tcp resets by client from the list of potential errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_unavailable_ocsp_responses_as_error` - Exclude the unavailable ocsp responses from the list of errors. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `exclude_unsupported_dns_query_as_error` - Exclude unsupported dns queries from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `healthscore_max_server_limit` - Skips health score computation of pool servers when number of servers in a pool is more than this setting. Allowed values are 0-5000. Special values are 0- server health score is deactivated. Field introduced in 17.2.13, 18.1.4. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition. Special default for essentials edition is 0, basic edition is 0, enterprise is 20.
-* `hs_event_throttle_window` - Time window (in secs) within which only unique health change events should occur. Allowed in enterprise edition with any value, essentials edition(allowed values- 1209600), basic edition(allowed values- 1209600), enterprise with cloud services edition.
-* `hs_max_anomaly_penalty` - Maximum penalty that may be deducted from health score for anomalies. Allowed values are 0-100. Allowed in enterprise edition with any value, essentials edition(allowed values- 10), basic edition(allowed values- 10), enterprise with cloud services edition.
-* `hs_max_resources_penalty` - Maximum penalty that may be deducted from health score for high resource utilization. Allowed values are 0-100. Allowed in enterprise edition with any value, essentials edition(allowed values- 25), basic edition(allowed values- 25), enterprise with cloud services edition.
-* `hs_max_security_penalty` - Maximum penalty that may be deducted from health score based on security assessment. Allowed values are 0-100. Allowed in enterprise edition with any value, essentials edition(allowed values- 100), basic edition(allowed values- 100), enterprise with cloud services edition.
-* `hs_min_dos_rate` - Dos connection rate below which the dos security assessment will not kick in. Allowed in enterprise edition with any value, essentials edition(allowed values- 1000), basic edition(allowed values- 1000), enterprise with cloud services edition.
-* `hs_performance_boost` - Adds free performance score credits to health score. It can be used for compensating health score for known slow applications. Allowed values are 0-100. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `hs_pscore_traffic_threshold_l4_client` - Threshold number of connections in 5min, below which apdexr, apdexc, rum_apdex, and other network quality metrics are not computed. Allowed in enterprise edition with any value, essentials edition(allowed values- 10), basic edition(allowed values- 10), enterprise with cloud services edition.
-* `hs_pscore_traffic_threshold_l4_server` - Threshold number of connections in 5min, below which apdexr, apdexc, rum_apdex, and other network quality metrics are not computed. Allowed in enterprise edition with any value, essentials edition(allowed values- 10), basic edition(allowed values- 10), enterprise with cloud services edition.
-* `hs_security_certscore_expired` - Score assigned when the certificate has expired. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 0.0), basic edition(allowed values- 0.0), enterprise with cloud services edition.
-* `hs_security_certscore_gt30d` - Score assigned when the certificate expires in more than 30 days. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 5.0), basic edition(allowed values- 5.0), enterprise with cloud services edition.
-* `hs_security_certscore_le07d` - Score assigned when the certificate expires in less than or equal to 7 days. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 2.0), basic edition(allowed values- 2.0), enterprise with cloud services edition.
-* `hs_security_certscore_le30d` - Score assigned when the certificate expires in less than or equal to 30 days. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 4.0), basic edition(allowed values- 4.0), enterprise with cloud services edition.
-* `hs_security_chain_invalidity_penalty` - Penalty for allowing certificates with invalid chain. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 1.0), basic edition(allowed values- 1.0), enterprise with cloud services edition.
-* `hs_security_cipherscore_eq000b` - Score assigned when the minimum cipher strength is 0 bits. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 0.0), basic edition(allowed values- 0.0), enterprise with cloud services edition.
-* `hs_security_cipherscore_ge128b` - Score assigned when the minimum cipher strength is greater than equal to 128 bits. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 5.0), basic edition(allowed values- 5.0), enterprise with cloud services edition.
-* `hs_security_cipherscore_lt128b` - Score assigned when the minimum cipher strength is less than 128 bits. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 3.5), basic edition(allowed values- 3.5), enterprise with cloud services edition.
-* `hs_security_encalgo_score_none` - Score assigned when no algorithm is used for encryption. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 0.0), basic edition(allowed values- 0.0), enterprise with cloud services edition.
-* `hs_security_encalgo_score_rc4` - Score assigned when rc4 algorithm is used for encryption. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 2.5), basic edition(allowed values- 2.5), enterprise with cloud services edition.
-* `hs_security_hsts_penalty` - Penalty for not enabling hsts. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 1.0), basic edition(allowed values- 1.0), enterprise with cloud services edition.
-* `hs_security_nonpfs_penalty` - Penalty for allowing non-pfs handshakes. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 1.0), basic edition(allowed values- 1.0), enterprise with cloud services edition.
-* `hs_security_ocsp_revoked_score` - Score assigned when ocsp certificate status is set to revoked or issuer revoked. Allowed values are 0.0-5.0. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 0.0), basic edition(allowed values- 0.0), enterprise with cloud services edition.
-* `hs_security_selfsignedcert_penalty` - Deprecated. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 1.0), basic edition(allowed values- 1.0), enterprise with cloud services edition.
-* `hs_security_ssl30_score` - Score assigned when supporting ssl3.0 encryption protocol. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 3.5), basic edition(allowed values- 3.5), enterprise with cloud services edition.
-* `hs_security_tls10_score` - Score assigned when supporting tls1.0 encryption protocol. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 5.0), basic edition(allowed values- 5.0), enterprise with cloud services edition.
-* `hs_security_tls11_score` - Score assigned when supporting tls1.1 encryption protocol. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 5.0), basic edition(allowed values- 5.0), enterprise with cloud services edition.
-* `hs_security_tls12_score` - Score assigned when supporting tls1.2 encryption protocol. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 5.0), basic edition(allowed values- 5.0), enterprise with cloud services edition.
-* `hs_security_tls13_score` - Score assigned when supporting tls1.3 encryption protocol. Allowed values are 0-5. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials edition(allowed values- 5.0), basic edition(allowed values- 5.0), enterprise with cloud services edition.
-* `hs_security_weak_signature_algo_penalty` - Penalty for allowing weak signature algorithm(s). Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 1.0), basic edition(allowed values- 1.0), enterprise with cloud services edition.
-* `latency_audit_props` - Deprecated in 22.1.1. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - The name of the analytics profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ondemand_metrics_idle_timeout` - This flag sets the time duration of no live data traffic after which virtual service metrics processing is suspended. It is applicable only when enable_ondemand_metrics is set to false. Field introduced in 18.1.1. Unit is seconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ranges` - List of http status code ranges to be excluded from being classified as an error. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `resp_code_block` - Block of http response codes to be excluded from being classified as an error. Enum options - AP_HTTP_RSP_4XX, AP_HTTP_RSP_5XX. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `sensitive_log_profile` - Rules applied to the http application log for filtering sensitive information. Field introduced in 17.2.10, 18.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `sip_log_depth` - Maximum number of sip messages added in logs for a sip transaction. By default, this value is 20. Allowed values are 1-1000. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 20), basic edition(allowed values- 20), enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `time_tracker_props` - Time tracker properties for connection establishment audit. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid of the analytics profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `apdex_response_threshold` - If a client receives an http response in less than the satisfactory latency threshold, the request is considered satisfied. It is considered tolerated if it is not satisfied and less than tolerated latency factor multiplied by the satisfactory latency threshold. Greater than this number and the client's request is considered frustrated. Allowed values are 1-30000. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 500), basic (allowed values- 500) edition.
+* `apdex_response_tolerated_factor` - Client tolerated response latency factor. Client must receive a response within this factor times the satisfactory threshold (apdex_response_threshold) to be considered tolerated. Allowed values are 1-1000. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 4), basic (allowed values- 4) edition.
+* `apdex_rtt_threshold` - Satisfactory client to avi round trip time(rtt). Allowed values are 1-2000. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 250), basic (allowed values- 250) edition.
+* `apdex_rtt_tolerated_factor` - Tolerated client to avi round trip time(rtt) factor. It is a multiple of apdex_rtt_tolerated_factor. Allowed values are 1-1000. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 4), basic (allowed values- 4) edition.
+* `apdex_rum_threshold` - If a client is able to load a page in less than the satisfactory latency threshold, the pageload is considered satisfied. It is considered tolerated if it is greater than satisfied but less than the tolerated latency multiplied by satisifed latency. Greater than this number and the client's request is considered frustrated. A pageload includes the time for dns lookup, download of all http objects, and page render time. Allowed values are 1-30000. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5000), basic (allowed values- 5000) edition.
+* `apdex_rum_tolerated_factor` - Virtual service threshold factor for tolerated page load time (plt) as multiple of apdex_rum_threshold. Allowed values are 1-1000. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 4), basic (allowed values- 4) edition.
+* `apdex_server_response_threshold` - A server http response is considered satisfied if latency is less than the satisfactory latency threshold. The response is considered tolerated when it is greater than satisfied but less than the tolerated latency factor * s_latency. Greater than this number and the server response is considered frustrated. Allowed values are 1-30000. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 400), basic (allowed values- 400) edition.
+* `apdex_server_response_tolerated_factor` - Server tolerated response latency factor. Servermust response within this factor times the satisfactory threshold (apdex_server_response_threshold) to be considered tolerated. Allowed values are 1-1000. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 4), basic (allowed values- 4) edition.
+* `apdex_server_rtt_threshold` - Satisfactory client to avi round trip time(rtt). Allowed values are 1-2000. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 125), basic (allowed values- 125) edition.
+* `apdex_server_rtt_tolerated_factor` - Tolerated client to avi round trip time(rtt) factor. It is a multiple of apdex_rtt_tolerated_factor. Allowed values are 1-1000. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 4), basic (allowed values- 4) edition.
+* `client_log_config` - Configure which logs are sent to the avi controller from ses and how they are processed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `client_log_streaming_config` - Configure to stream logs to an external server. Field introduced in 17.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `conn_lossy_ooo_threshold` - A connection between client and avi is considered lossy when more than this percentage of out of order packets are received. Allowed values are 1-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 50), basic (allowed values- 50) edition.
+* `conn_lossy_timeo_rexmt_threshold` - A connection between client and avi is considered lossy when more than this percentage of packets are retransmitted due to timeout. Allowed values are 1-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 20), basic (allowed values- 20) edition.
+* `conn_lossy_total_rexmt_threshold` - A connection between client and avi is considered lossy when more than this percentage of packets are retransmitted. Allowed values are 1-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 50), basic (allowed values- 50) edition.
+* `conn_lossy_zero_win_size_event_threshold` - A client connection is considered lossy when percentage of times a packet could not be trasmitted due to tcp zero window is above this threshold. Allowed values are 0-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 2), basic (allowed values- 2) edition.
+* `conn_server_lossy_ooo_threshold` - A connection between avi and server is considered lossy when more than this percentage of out of order packets are received. Allowed values are 1-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 50), basic (allowed values- 50) edition.
+* `conn_server_lossy_timeo_rexmt_threshold` - A connection between avi and server is considered lossy when more than this percentage of packets are retransmitted due to timeout. Allowed values are 1-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 20), basic (allowed values- 20) edition.
+* `conn_server_lossy_total_rexmt_threshold` - A connection between avi and server is considered lossy when more than this percentage of packets are retransmitted. Allowed values are 1-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 50), basic (allowed values- 50) edition.
+* `conn_server_lossy_zero_win_size_event_threshold` - A server connection is considered lossy when percentage of times a packet could not be trasmitted due to tcp zero window is above this threshold. Allowed values are 0-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 2), basic (allowed values- 2) edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_adaptive_config` - Enable adaptive configuration for optimizing resource usage. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_advanced_analytics` - Enables advanced analytics features like anomaly detection. If set to false, anomaly computation (and associated rules/events) for vs, pool and server metrics will be deactivated. However, setting it to false reduces cpu and memory requirements for analytics subsystem. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition. Special default for essentials edition is false, basic edition is false, enterprise edition is true.
+* `enable_ondemand_metrics` - Virtual service (vs) metrics are processed only when there is live data traffic on the vs. In case, vs is idle for a period of time as specified by ondemand_metrics_idle_timeout then metrics processing is suspended for that vs. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_se_analytics` - Enable node (service engine) level analytics forvs metrics. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_server_analytics` - Enables analytics on backend servers. This may be desired in container environment when there are large number of ephemeral servers. Additionally, no healthscore of servers is computed when server analytics is enabled. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_vs_analytics` - Enable virtualservice (frontend) analytics. This flag enables metrics and healthscore for virtualservice. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `exclude_client_close_before_request_as_error` - Exclude client closed connection before an http request could be completed from being classified as an error. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_dns_policy_drop_as_significant` - Exclude dns policy drops from the list of errors. Field introduced in 17.2.2. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_gs_down_as_error` - Exclude queries to gslb services that are operationally down from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_http_error_codes` - List of http status codes to be excluded from being classified as an error. Error connections or responses impacts health score, are included as significant logs, and may be classified as part of a dos attack. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `exclude_invalid_dns_domain_as_error` - Exclude dns queries to domains outside the domains configured in the dns application profile from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_invalid_dns_query_as_error` - Exclude invalid dns queries from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_issuer_revoked_ocsp_responses_as_error` - Exclude the issuer-revoked ocsp responses from the list of errors. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `exclude_no_dns_record_as_error` - Exclude queries to domains that did not have configured services/records from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_no_valid_gs_member_as_error` - Exclude queries to gslb services that have no available members from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_persistence_change_as_error` - Exclude persistence server changed while load balancing' from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_revoked_ocsp_responses_as_error` - Exclude the revoked ocsp certificate status responses from the list of errors. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `exclude_server_dns_error_as_error` - Exclude server dns error response from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_server_tcp_reset_as_error` - Exclude server tcp reset from errors. It is common for applications like ms exchange. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_sip_error_codes` - List of sip status codes to be excluded from being classified as an error. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `exclude_stale_ocsp_responses_as_error` - Exclude the stale ocsp certificate status responses from the list of errors. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `exclude_syn_retransmit_as_error` - Exclude 'server unanswered syns' from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_tcp_reset_as_error` - Exclude tcp resets by client from the list of potential errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_unavailable_ocsp_responses_as_error` - Exclude the unavailable ocsp responses from the list of errors. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `exclude_unsupported_dns_query_as_error` - Exclude unsupported dns queries from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `healthscore_max_server_limit` - Skips health score computation of pool servers when number of servers in a pool is more than this setting. Allowed values are 0-5000. Special values are 0- server health score is deactivated. Field introduced in 17.2.13, 18.1.4. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition. Special default for essentials edition is 0, basic edition is 0, enterprise edition is 20.
+* `hs_event_throttle_window` - Time window (in secs) within which only unique health change events should occur. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1209600), basic (allowed values- 1209600) edition.
+* `hs_max_anomaly_penalty` - Maximum penalty that may be deducted from health score for anomalies. Allowed values are 0-100. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 10), basic (allowed values- 10) edition.
+* `hs_max_resources_penalty` - Maximum penalty that may be deducted from health score for high resource utilization. Allowed values are 0-100. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 25), basic (allowed values- 25) edition.
+* `hs_max_security_penalty` - Maximum penalty that may be deducted from health score based on security assessment. Allowed values are 0-100. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 100), basic (allowed values- 100) edition.
+* `hs_min_dos_rate` - Dos connection rate below which the dos security assessment will not kick in. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1000), basic (allowed values- 1000) edition.
+* `hs_performance_boost` - Adds free performance score credits to health score. It can be used for compensating health score for known slow applications. Allowed values are 0-100. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `hs_pscore_traffic_threshold_l4_client` - Threshold number of connections in 5min, below which apdexr, apdexc, rum_apdex, and other network quality metrics are not computed. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 10), basic (allowed values- 10) edition.
+* `hs_pscore_traffic_threshold_l4_server` - Threshold number of connections in 5min, below which apdexr, apdexc, rum_apdex, and other network quality metrics are not computed. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 10), basic (allowed values- 10) edition.
+* `hs_security_certscore_expired` - Score assigned when the certificate has expired. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0.0), basic (allowed values- 0.0) edition.
+* `hs_security_certscore_gt30d` - Score assigned when the certificate expires in more than 30 days. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5.0), basic (allowed values- 5.0) edition.
+* `hs_security_certscore_le07d` - Score assigned when the certificate expires in less than or equal to 7 days. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 2.0), basic (allowed values- 2.0) edition.
+* `hs_security_certscore_le30d` - Score assigned when the certificate expires in less than or equal to 30 days. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 4.0), basic (allowed values- 4.0) edition.
+* `hs_security_chain_invalidity_penalty` - Penalty for allowing certificates with invalid chain. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1.0), basic (allowed values- 1.0) edition.
+* `hs_security_cipherscore_eq000b` - Score assigned when the minimum cipher strength is 0 bits. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0.0), basic (allowed values- 0.0) edition.
+* `hs_security_cipherscore_ge128b` - Score assigned when the minimum cipher strength is greater than equal to 128 bits. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5.0), basic (allowed values- 5.0) edition.
+* `hs_security_cipherscore_lt128b` - Score assigned when the minimum cipher strength is less than 128 bits. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 3.5), basic (allowed values- 3.5) edition.
+* `hs_security_encalgo_score_none` - Score assigned when no algorithm is used for encryption. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0.0), basic (allowed values- 0.0) edition.
+* `hs_security_encalgo_score_rc4` - Score assigned when rc4 algorithm is used for encryption. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 2.5), basic (allowed values- 2.5) edition.
+* `hs_security_hsts_penalty` - Penalty for not enabling hsts. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1.0), basic (allowed values- 1.0) edition.
+* `hs_security_nonpfs_penalty` - Penalty for allowing non-pfs handshakes. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1.0), basic (allowed values- 1.0) edition.
+* `hs_security_ocsp_revoked_score` - Score assigned when ocsp certificate status is set to revoked or issuer revoked. Allowed values are 0.0-5.0. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0.0), basic (allowed values- 0.0) edition.
+* `hs_security_selfsignedcert_penalty` - Deprecated. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1.0), basic (allowed values- 1.0) edition.
+* `hs_security_ssl30_score` - Score assigned when supporting ssl3.0 encryption protocol. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 3.5), basic (allowed values- 3.5) edition.
+* `hs_security_tls10_score` - Score assigned when supporting tls1.0 encryption protocol. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5.0), basic (allowed values- 5.0) edition.
+* `hs_security_tls11_score` - Score assigned when supporting tls1.1 encryption protocol. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5.0), basic (allowed values- 5.0) edition.
+* `hs_security_tls12_score` - Score assigned when supporting tls1.2 encryption protocol. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5.0), basic (allowed values- 5.0) edition.
+* `hs_security_tls13_score` - Score assigned when supporting tls1.3 encryption protocol. Allowed values are 0-5. Field introduced in 18.2.6. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5.0), basic (allowed values- 5.0) edition.
+* `hs_security_weak_signature_algo_penalty` - Penalty for allowing weak signature algorithm(s). Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1.0), basic (allowed values- 1.0) edition.
+* `latency_audit_props` - Deprecated in 22.1.1. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - The name of the analytics profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ondemand_metrics_idle_timeout` - This flag sets the time duration of no live data traffic after which virtual service metrics processing is suspended. It is applicable only when enable_ondemand_metrics is set to false. Field introduced in 18.1.1. Unit is seconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ranges` - List of http status code ranges to be excluded from being classified as an error. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `resp_code_block` - Block of http response codes to be excluded from being classified as an error. Enum options - AP_HTTP_RSP_4XX, AP_HTTP_RSP_5XX. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sensitive_log_profile` - Rules applied to the http application log for filtering sensitive information. Field introduced in 17.2.10, 18.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sip_log_depth` - Maximum number of sip messages added in logs for a sip transaction. By default, this value is 20. Allowed values are 1-1000. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 20), basic (allowed values- 20) edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `time_tracker_props` - Time tracker properties for connection establishment audit. Field introduced in 22.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the analytics profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_applicationpersistenceprofile.html.markdown b/website/docs/d/avi_applicationpersistenceprofile.html.markdown
index ba5532a47..da0282e2e 100644
--- a/website/docs/d/avi_applicationpersistenceprofile.html.markdown
+++ b/website/docs/d/avi_applicationpersistenceprofile.html.markdown
@@ -32,17 +32,18 @@ data "avi_applicationpersistenceprofile" "foo_applicationpersistenceprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `app_cookie_persistence_profile` - Specifies the application cookie persistence profile parameters. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `hdr_persistence_profile` - Specifies the custom http header persistence profile parameters. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `http_cookie_persistence_profile` - Specifies the http cookie persistence profile parameters. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ip_persistence_profile` - Specifies the client ip persistence profile parameters. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_federated` - This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - A user-friendly name for the persistence profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `persistence_type` - Method used to persist clients to the same server for a duration of time or a session. Enum options - PERSISTENCE_TYPE_CLIENT_IP_ADDRESS, PERSISTENCE_TYPE_HTTP_COOKIE, PERSISTENCE_TYPE_TLS, PERSISTENCE_TYPE_CLIENT_IPV6_ADDRESS, PERSISTENCE_TYPE_CUSTOM_HTTP_HEADER, PERSISTENCE_TYPE_APP_COOKIE, PERSISTENCE_TYPE_GSLB_SITE. Allowed in enterprise edition with any value, essentials edition(allowed values- persistence_type_client_ip_address,persistence_type_http_cookie), basic edition(allowed values- persistence_type_client_ip_address,persistence_type_http_cookie), enterprise with cloud services edition.
-* `server_hm_down_recovery` - Specifies behavior when a persistent server has been marked down by a health monitor. Enum options - HM_DOWN_PICK_NEW_SERVER, HM_DOWN_ABORT_CONNECTION, HM_DOWN_CONTINUE_PERSISTENT_SERVER. Allowed in enterprise edition with any value, essentials edition(allowed values- hm_down_pick_new_server), basic edition(allowed values- hm_down_pick_new_server), enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the persistence profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `app_cookie_persistence_profile` - Specifies the application cookie persistence profile parameters. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `diameter_app_persistence_profile` - Specifies the diameter persistence profile parameters. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `hdr_persistence_profile` - Specifies the custom http header persistence profile parameters. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `http_cookie_persistence_profile` - Specifies the http cookie persistence profile parameters. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ip_persistence_profile` - Specifies the client ip persistence profile parameters. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_federated` - This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - A user-friendly name for the persistence profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `persistence_type` - Method used to persist clients to the same server for a duration of time or a session. Enum options - PERSISTENCE_TYPE_CLIENT_IP_ADDRESS, PERSISTENCE_TYPE_HTTP_COOKIE, PERSISTENCE_TYPE_TLS, PERSISTENCE_TYPE_CLIENT_IPV6_ADDRESS, PERSISTENCE_TYPE_CUSTOM_HTTP_HEADER, PERSISTENCE_TYPE_APP_COOKIE, PERSISTENCE_TYPE_GSLB_SITE, PERSISTENCE_TYPE_APP_DIAMETER. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- persistence_type_client_ip_address,persistence_type_http_cookie), basic (allowed values- persistence_type_client_ip_address,persistence_type_http_cookie) edition.
+* `server_hm_down_recovery` - Specifies behavior when a persistent server has been marked down by a health monitor. Enum options - HM_DOWN_PICK_NEW_SERVER, HM_DOWN_ABORT_CONNECTION, HM_DOWN_CONTINUE_PERSISTENT_SERVER. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- hm_down_pick_new_server), basic (allowed values- hm_down_pick_new_server) edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the persistence profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_applicationprofile.html.markdown b/website/docs/d/avi_applicationprofile.html.markdown
index cf176c463..520bb1d2a 100644
--- a/website/docs/d/avi_applicationprofile.html.markdown
+++ b/website/docs/d/avi_applicationprofile.html.markdown
@@ -32,23 +32,24 @@ data "avi_applicationprofile" "foo_applicationprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `app_service_type` - Specifies app service type for an application. Enum options - APP_SERVICE_TYPE_L7_HORIZON, APP_SERVICE_TYPE_L4_BLAST, APP_SERVICE_TYPE_L4_PCOIP, APP_SERVICE_TYPE_L4_FTP. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `cloud_config_cksum` - Checksum of application profiles. Internally set by cloud connector. Field introduced in 17.2.14, 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `created_by` - Name of the application profile creator. Field introduced in 17.2.14, 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dns_service_profile` - Specifies various dns service related controls for virtual service. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dos_rl_profile` - Specifies various security related controls for virtual service. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `http_profile` - Specifies the http application proxy profile parameters. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `l4_ssl_profile` - Specifies various l4 ssl service related controls for virtual service. Field introduced in 22.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - The name of the application profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `preserve_client_ip` - Specifies if client ip needs to be preserved for backend connection. Not compatible with connection multiplexing. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `preserve_client_port` - Specifies if we need to preserve client port while preserving client ip for backend connections. Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `preserve_dest_ip_port` - Specifies if destination ip and port needs to be preserved for backend connection. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `sip_service_profile` - Specifies various sip service related controls for virtual service. Field introduced in 17.2.8, 18.1.3, 18.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tcp_app_profile` - Specifies the tcp application proxy profile parameters. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - Specifies which application layer proxy is enabled for the virtual service. Enum options - APPLICATION_PROFILE_TYPE_L4, APPLICATION_PROFILE_TYPE_HTTP, APPLICATION_PROFILE_TYPE_SYSLOG, APPLICATION_PROFILE_TYPE_DNS, APPLICATION_PROFILE_TYPE_SSL, APPLICATION_PROFILE_TYPE_SIP. Allowed in enterprise edition with any value, essentials edition(allowed values- application_profile_type_l4), basic edition(allowed values- application_profile_type_l4,application_profile_type_http), enterprise with cloud services edition.
-* `uuid` - Uuid of the application profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `app_service_type` - Specifies app service type for an application. Enum options - APP_SERVICE_TYPE_L7_HORIZON, APP_SERVICE_TYPE_L4_BLAST, APP_SERVICE_TYPE_L4_PCOIP, APP_SERVICE_TYPE_L4_FTP. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cloud_config_cksum` - Checksum of application profiles. Internally set by cloud connector. Field introduced in 17.2.14, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - Name of the application profile creator. Field introduced in 17.2.14, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `diameter_service_profile` - Specifies various diameter service related controls for virtual service. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dns_service_profile` - Specifies various dns service related controls for virtual service. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dos_rl_profile` - Specifies various security related controls for virtual service. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `http_profile` - Specifies the http application proxy profile parameters. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `l4_ssl_profile` - Specifies various l4 ssl service related controls for virtual service. Field introduced in 22.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - The name of the application profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `preserve_client_ip` - Specifies if client ip needs to be preserved for backend connection. Not compatible with connection multiplexing. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `preserve_client_port` - Specifies if we need to preserve client port while preserving client ip for backend connections. Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `preserve_dest_ip_port` - Specifies if destination ip and port needs to be preserved for backend connection. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `sip_service_profile` - Specifies various sip service related controls for virtual service. Field introduced in 17.2.8, 18.1.3, 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tcp_app_profile` - Specifies the tcp application proxy profile parameters. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - Specifies which application layer proxy is enabled for the virtual service. Enum options - APPLICATION_PROFILE_TYPE_L4, APPLICATION_PROFILE_TYPE_HTTP, APPLICATION_PROFILE_TYPE_SYSLOG, APPLICATION_PROFILE_TYPE_DNS, APPLICATION_PROFILE_TYPE_SSL, APPLICATION_PROFILE_TYPE_SIP, APPLICATION_PROFILE_TYPE_DIAMETER. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- application_profile_type_l4), basic (allowed values- application_profile_type_l4,application_profile_type_http) edition.
+* `uuid` - Uuid of the application profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_authmappingprofile.html.markdown b/website/docs/d/avi_authmappingprofile.html.markdown
index 4bdeeb9d8..d1898fec3 100644
--- a/website/docs/d/avi_authmappingprofile.html.markdown
+++ b/website/docs/d/avi_authmappingprofile.html.markdown
@@ -32,11 +32,11 @@ data "avi_authmappingprofile" "foo_authmappingprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 22.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `description` - Description for the authmappingprofile. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mapping_rules` - Rules list for tenant or role mapping. Field introduced in 22.1.1. Minimum of 1 items required. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Name of the authmappingprofile. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Tenant ref for the auth mapping profile. It is a reference to an object of type tenant. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `type` - Type of the auth profile for which these rules can be linked. Enum options - AUTH_PROFILE_LDAP, AUTH_PROFILE_TACACS_PLUS, AUTH_PROFILE_SAML, AUTH_PROFILE_PINGACCESS, AUTH_PROFILE_JWT, AUTH_PROFILE_OAUTH. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid of the authmappingprofile. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 22.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Description for the authmappingprofile. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `mapping_rules` - Rules list for tenant or role mapping. Field introduced in 22.1.1. Minimum of 1 items required. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of the authmappingprofile. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant ref for the auth mapping profile. It is a reference to an object of type tenant. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `type` - Type of the auth profile for which these rules can be linked. Enum options - AUTH_PROFILE_LDAP, AUTH_PROFILE_TACACS_PLUS, AUTH_PROFILE_SAML, AUTH_PROFILE_PINGACCESS, AUTH_PROFILE_JWT, AUTH_PROFILE_OAUTH. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid of the authmappingprofile. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_authprofile.html.markdown b/website/docs/d/avi_authprofile.html.markdown
index 503b4b2ac..c3cc4a55f 100644
--- a/website/docs/d/avi_authprofile.html.markdown
+++ b/website/docs/d/avi_authprofile.html.markdown
@@ -32,17 +32,17 @@ data "avi_authprofile" "foo_authprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `http` - Http user authentication params. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `jwt_profile_ref` - Jwtserverprofile to be used for authentication. It is a reference to an object of type jwtserverprofile. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ldap` - Ldap server and directory settings. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name of the auth profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `oauth_profile` - Oauth profile - common endpoint information. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `saml` - Saml settings. Field introduced in 17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tacacs_plus` - Tacacs+ settings. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - Type of the auth profile. Enum options - AUTH_PROFILE_LDAP, AUTH_PROFILE_TACACS_PLUS, AUTH_PROFILE_SAML, AUTH_PROFILE_PINGACCESS, AUTH_PROFILE_JWT, AUTH_PROFILE_OAUTH. Allowed in enterprise edition with any value, essentials edition(allowed values- auth_profile_ldap,auth_profile_tacacs_plus,auth_profile_saml,auth_profile_jwt,auth_profile_oauth), basic edition(allowed values- auth_profile_ldap,auth_profile_tacacs_plus,auth_profile_saml,auth_profile_jwt,auth_profile_oauth), enterprise with cloud services edition.
-* `uuid` - Uuid of the auth profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `http` - Http user authentication params. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `jwt_profile_ref` - Jwtserverprofile to be used for authentication. It is a reference to an object of type jwtserverprofile. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ldap` - Ldap server and directory settings. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the auth profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `oauth_profile` - Oauth profile - common endpoint information. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `saml` - Saml settings. Field introduced in 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tacacs_plus` - Tacacs+ settings. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - Type of the auth profile. Enum options - AUTH_PROFILE_LDAP, AUTH_PROFILE_TACACS_PLUS, AUTH_PROFILE_SAML, AUTH_PROFILE_PINGACCESS, AUTH_PROFILE_JWT, AUTH_PROFILE_OAUTH. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- auth_profile_ldap,auth_profile_tacacs_plus,auth_profile_saml,auth_profile_jwt,auth_profile_oauth), basic (allowed values- auth_profile_ldap,auth_profile_tacacs_plus,auth_profile_saml,auth_profile_jwt,auth_profile_oauth) edition.
+* `uuid` - Uuid of the auth profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_autoscalelaunchconfig.html.markdown b/website/docs/d/avi_autoscalelaunchconfig.html.markdown
index aec60ed4e..ccc145557 100644
--- a/website/docs/d/avi_autoscalelaunchconfig.html.markdown
+++ b/website/docs/d/avi_autoscalelaunchconfig.html.markdown
@@ -32,14 +32,14 @@ data "avi_autoscalelaunchconfig" "foo_autoscalelaunchconfig" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `image_id` - Unique id of the amazon machine image (ami)  or openstack vm id. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `mesos` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `openstack` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `use_external_asg` - If set to true, serverautoscalepolicy will use the autoscaling group (external_autoscaling_groups) from pool to perform scale up and scale down. Pool should have single autoscaling group configured. Field introduced in 17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `image_id` - Unique id of the amazon machine image (ami)  or openstack vm id. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mesos` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `openstack` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_external_asg` - If set to true, serverautoscalepolicy will use the autoscaling group (external_autoscaling_groups) from pool to perform scale up and scale down. Pool should have single autoscaling group configured. Field introduced in 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_availabilityzone.html.markdown b/website/docs/d/avi_availabilityzone.html.markdown
index 67f9e8718..604f87ae9 100644
--- a/website/docs/d/avi_availabilityzone.html.markdown
+++ b/website/docs/d/avi_availabilityzone.html.markdown
@@ -34,10 +34,11 @@ data "avi_availabilityzone" "foo_availabilityzone" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `cloud_ref` - Availability zone belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `name` - Availabilty zone where vcenter list belongs to. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - Availabilityzone belongs to tenant. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Availability zone config uuid. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_refs` - Group of vcenter list belong to availabilty zone. It is a reference to an object of type vcenterserver. Field introduced in 20.1.1. Minimum of 1 items required. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `az_clusters` - Group of clusters belongs to the az. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `az_datastore` - Datastores associated with the az. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cloud_ref` - Availability zone belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Availabilty zone where vcenter list belongs to. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Availabilityzone belongs to tenant. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Availability zone config uuid. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_backup.html.markdown b/website/docs/d/avi_backup.html.markdown
index 73cc70fee..ea6fb76b9 100644
--- a/website/docs/d/avi_backup.html.markdown
+++ b/website/docs/d/avi_backup.html.markdown
@@ -32,12 +32,12 @@ data "avi_backup" "foo_backup" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `backup_config_ref` - Backupconfiguration information. It is a reference to an object of type backupconfiguration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `file_name` - The file name of backup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `local_file_url` - Url to download the backup file. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `remote_file_url` - Url to download the backup file. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scheduler_ref` - Scheduler information. It is a reference to an object of type scheduler. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `timestamp` - Unix timestamp of when the backup file is created. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `backup_config_ref` - Backupconfiguration information. It is a reference to an object of type backupconfiguration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `file_name` - The file name of backup. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `local_file_url` - Url to download the backup file. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `remote_file_url` - Url to download the backup file. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scheduler_ref` - Scheduler information. It is a reference to an object of type scheduler. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `timestamp` - Unix timestamp of when the backup file is created. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_backupconfiguration.html.markdown b/website/docs/d/avi_backupconfiguration.html.markdown
index d1ac1967b..b711326e7 100644
--- a/website/docs/d/avi_backupconfiguration.html.markdown
+++ b/website/docs/d/avi_backupconfiguration.html.markdown
@@ -32,23 +32,24 @@ data "avi_backupconfiguration" "foo_backupconfiguration" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `aws_access_key` - Aws access key id. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `aws_bucket_id` - Aws bucket. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `aws_bucket_region` - The name of the aws region associated with the bucket. Field introduced in 21.1.5, 22.1.1, 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `aws_secret_access` - Aws secret access key. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `backup_file_prefix` - Prefix of the exported configuration file. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `backup_passphrase` - Default passphrase to encrypt sensitive fields for configuration export and periodic backup. The same passphrase must be provided to import the configuration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `maximum_backups_stored` - Rotate the backup files based on this count. Allowed values are 1-20. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Name of backup configuration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `remote_directory` - Directory at remote destination with write permission for ssh user. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `remote_file_transfer_protocol` - Remote file transfer protocol type. Enum options - SCP, SFTP. Field introduced in 22.1.1. Allowed in enterprise edition with any value, basic edition(allowed values- scp,sftp), enterprise with cloud services edition.
-* `remote_hostname` - Remote destination. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `s3_bucket_folder` - 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.
-* `save_local` - Local backup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssh_user_ref` - Access credentials for remote destination. It is a reference to an object of type cloudconnectoruser. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upload_to_remote_host` - Remote backup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upload_to_s3` - Cloud backup. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `aws_access_key` - Aws access key id. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `aws_bucket_id` - Aws bucket. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `aws_bucket_region` - The name of the aws region associated with the bucket. Field introduced in 21.1.5, 22.1.1, 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `aws_secret_access` - Aws secret access key. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `backup_file_prefix` - Prefix of the exported configuration file. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `backup_passphrase` - Default passphrase to encrypt sensitive fields for configuration export and periodic backup. The same passphrase must be provided to import the configuration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `bundle_mode` - By default, json backups are generated. When this flag is enabled, bundle backups will be generated. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `maximum_backups_stored` - Rotate the backup files based on this count. Allowed values are 1-20. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of backup configuration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `remote_directory` - Directory at remote destination with write permission for ssh user. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `remote_file_transfer_protocol` - Remote file transfer protocol type. Enum options - SCP, SFTP. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in basic (allowed values- scp,sftp) edition.
+* `remote_hostname` - Remote destination. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `s3_bucket_folder` - The folder name in s3 bucket where backup will be stored. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `save_local` - Local backup. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssh_user_ref` - Access credentials for remote destination. It is a reference to an object of type cloudconnectoruser. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `upload_to_remote_host` - Remote backup. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `upload_to_s3` - Cloud backup. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_botconfigconsolidator.html.markdown b/website/docs/d/avi_botconfigconsolidator.html.markdown
index 3c09d46f3..7079a0e34 100644
--- a/website/docs/d/avi_botconfigconsolidator.html.markdown
+++ b/website/docs/d/avi_botconfigconsolidator.html.markdown
@@ -32,9 +32,10 @@ data "avi_botconfigconsolidator" "foo_botconfigconsolidator" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `description` - Human-readable description of this consolidator. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - The name of this consolidator. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `script` - Script that consolidates results from all bot decision components. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - The unique identifier of the tenant to which this consolidator belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - A unique identifier for this consolidator. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Human-readable description of this consolidator. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - The name of this consolidator. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `script` - Script that consolidates results from all bot decision components. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - The unique identifier of the tenant to which this consolidator belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - A unique identifier for this consolidator. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_botdetectionpolicy.html.markdown b/website/docs/d/avi_botdetectionpolicy.html.markdown
index f015ced8d..cc29ab6d3 100644
--- a/website/docs/d/avi_botdetectionpolicy.html.markdown
+++ b/website/docs/d/avi_botdetectionpolicy.html.markdown
@@ -32,17 +32,18 @@ data "avi_botdetectionpolicy" "foo_botdetectionpolicy" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `allow_list` - Allow the user to skip botmanagement for selected requests. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `client_behavior_detector` - The client behavior configuration used in this policy. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - Human-readable description of this bot detection policy. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ip_location_detector` - The ip location configuration used in this policy. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ip_reputation_detector` - The ip reputation configuration used in this policy. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - The name of this bot detection policy. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `system_bot_mapping_ref` - System-defined rules for classification. It is a reference to an object of type botmapping. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `system_consolidator_ref` - The installation provides an updated ruleset for consolidating the results of different decider phases. It is a reference to an object of type botconfigconsolidator. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - The unique identifier of the tenant to which this policy belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `user_agent_detector` - The user-agent configuration used in this policy. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `user_bot_mapping_ref` - User-defined rules for classification. These are applied before the system classification rules. If a rule matches, processing terminates and the system-defined rules will not run. It is a reference to an object of type botmapping. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `user_consolidator_ref` - The user-provided ruleset for consolidating the results of different decider phases. This runs before the system consolidator. If it successfully sets a consolidation, the system consolidator will not change it. It is a reference to an object of type botconfigconsolidator. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - A unique identifier to this bot detection policy. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `allow_list` - Allow the user to skip botmanagement for selected requests. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `client_behavior_detector` - The client behavior configuration used in this policy. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Human-readable description of this bot detection policy. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ip_location_detector` - The ip location configuration used in this policy. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ip_reputation_detector` - The ip reputation configuration used in this policy. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - The name of this bot detection policy. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `system_bot_mapping_ref` - System-defined rules for classification. It is a reference to an object of type botmapping. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `system_consolidator_ref` - The installation provides an updated ruleset for consolidating the results of different decider phases. It is a reference to an object of type botconfigconsolidator. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - The unique identifier of the tenant to which this policy belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `user_agent_detector` - The user-agent configuration used in this policy. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `user_bot_mapping_ref` - User-defined rules for classification. These are applied before the system classification rules. If a rule matches, processing terminates and the system-defined rules will not run. It is a reference to an object of type botmapping. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `user_consolidator_ref` - The user-provided ruleset for consolidating the results of different decider phases. This runs before the system consolidator. If it successfully sets a consolidation, the system consolidator will not change it. It is a reference to an object of type botconfigconsolidator. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - A unique identifier to this bot detection policy. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_botipreputationtypemapping.html.markdown b/website/docs/d/avi_botipreputationtypemapping.html.markdown
index f8c59e39c..889882103 100644
--- a/website/docs/d/avi_botipreputationtypemapping.html.markdown
+++ b/website/docs/d/avi_botipreputationtypemapping.html.markdown
@@ -32,8 +32,9 @@ data "avi_botipreputationtypemapping" "foo_botipreputationtypemapping" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `ip_reputation_mappings` - Map every ipreputationtype to a bot type (can be unknown). Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - The name of this mapping. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - The unique identifier of the tenant to which this mapping belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - A unique identifier of this mapping. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ip_reputation_mappings` - Map every ipreputationtype to a bot type (can be unknown). Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - The name of this mapping. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - The unique identifier of the tenant to which this mapping belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - A unique identifier of this mapping. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_botmapping.html.markdown b/website/docs/d/avi_botmapping.html.markdown
index edf04550c..030730809 100644
--- a/website/docs/d/avi_botmapping.html.markdown
+++ b/website/docs/d/avi_botmapping.html.markdown
@@ -32,8 +32,9 @@ data "avi_botmapping" "foo_botmapping" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `mapping_rules` - Rules for bot classification. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - The name of this mapping. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - The unique identifier of the tenant to which this mapping belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - A unique identifier for this mapping. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mapping_rules` - Rules for bot classification. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - The name of this mapping. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - The unique identifier of the tenant to which this mapping belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - A unique identifier for this mapping. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_certificatemanagementprofile.html.markdown b/website/docs/d/avi_certificatemanagementprofile.html.markdown
index 82ecd020b..bdf79d8e0 100644
--- a/website/docs/d/avi_certificatemanagementprofile.html.markdown
+++ b/website/docs/d/avi_certificatemanagementprofile.html.markdown
@@ -32,11 +32,11 @@ data "avi_certificatemanagementprofile" "foo_certificatemanagementprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name of the pki profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `run_script_ref` - Alert script config object for certificate management profile. It is a reference to an object of type alertscriptconfig. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `script_params` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the pki profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `run_script_ref` - Alert script config object for certificate management profile. It is a reference to an object of type alertscriptconfig. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `script_params` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_cloud.html.markdown b/website/docs/d/avi_cloud.html.markdown
index e2a8f038b..53c598a5a 100644
--- a/website/docs/d/avi_cloud.html.markdown
+++ b/website/docs/d/avi_cloud.html.markdown
@@ -32,48 +32,47 @@ data "avi_cloud" "foo_cloud" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `autoscale_polling_interval` - Cloudconnector polling interval in seconds for external autoscale groups, minimum 60 seconds. Allowed values are 60-3600. Field introduced in 18.2.2. Unit is seconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 60), basic edition(allowed values- 60), enterprise with cloud services edition.
-* `aws_configuration` - Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `azure_configuration` - Field introduced in 17.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `cloudstack_configuration` - Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `custom_tags` - Custom tags for all avi created resources in the cloud infrastructure. Field introduced in 17.1.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dhcp_enabled` - Select the ip address management scheme. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dns_provider_ref` - Dns profile for the cloud. It is a reference to an object of type ipamdnsproviderprofile. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dns_resolution_on_se` - By default, pool member fqdns are resolved on the controller. When this is set, pool member fqdns are instead resolved on service engines in this cloud. This is useful in scenarios where pool member fqdns can only be resolved from service engines and not from the controller. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `dns_resolvers` - Dns resolver for the cloud. Field introduced in 20.1.5. Maximum of 1 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `docker_configuration` - Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `east_west_dns_provider_ref` - Dns profile for east-west services. It is a reference to an object of type ipamdnsproviderprofile. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `east_west_ipam_provider_ref` - Ipam profile for east-west services. Warning - please use virtual subnets in this ipam profile that do not conflict with the underlay networks or any overlay networks in the cluster. For example in aws and gcp, 169.254.0.0/16 is used for storing instance metadata. Hence, it should not be used in this profile. It is a reference to an object of type ipamdnsproviderprofile. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_vip_on_all_interfaces` - Enable vip on all data interfaces for the cloud. Field introduced in 18.2.9, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_vip_static_routes` - Use static routes for vip side network resolution during virtualservice placement. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `gcp_configuration` - Google cloud platform configuration. Field introduced in 18.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ip6_autocfg_enabled` - Enable ipv6 auto configuration. Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ipam_provider_ref` - Ipam profile for the cloud. It is a reference to an object of type ipamdnsproviderprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `license_tier` - Specifies the default license tier which would be used by new se groups. This field by default inherits the value from system configuration. Enum options - ENTERPRISE_16, ENTERPRISE, ENTERPRISE_18, BASIC, ESSENTIALS, ENTERPRISE_WITH_CLOUD_SERVICES. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `license_type` - If no license type is specified then default license enforcement for the cloud type is chosen. The default mappings are container cloud is max ses, openstack and vmware is cores and linux it is sockets. Enum options - LIC_BACKEND_SERVERS, LIC_SOCKETS, LIC_CORES, LIC_HOSTS, LIC_SE_BANDWIDTH, LIC_METERED_SE_BANDWIDTH. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `linuxserver_configuration` - Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `maintenance_mode` - Cloud is in maintenance mode. Field introduced in 20.1.7,21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 22.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `metrics_polling_interval` - Cloud metrics collector polling interval in seconds. Field introduced in 22.1.1. Unit is seconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `mgmt_ip_v4_enabled` - Enable ipv4 on the management interface of the serviceengine. Defaults to dhcp if no static config on network present. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mgmt_ip_v6_enabled` - Enable ipv6 on the management interface of the serviceengine. Defaults to autocfg if no static config on network present. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mtu` - Mtu setting for the cloud. Unit is bytes. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nsxt_configuration` - Nsx-t cloud platform configuration. Field introduced in 20.1.1. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `ntp_configuration` - Ntp configuration for the cloud. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `obj_name_prefix` - Default prefix for all automatically created objects in this cloud. This prefix can be overridden by the se-group template. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `openstack_configuration` - Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `prefer_static_routes` - Prefer static routes over interface routes during virtualservice placement. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `proxy_configuration` - Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `rancher_configuration` - Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `resolve_fqdn_to_ipv6` - Resolve ipv6 address for pool member fqdns. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_group_template_ref` - The service engine group to use as template. It is a reference to an object of type serviceenginegroup. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `state_based_dns_registration` - Dns records for vips are added/deleted based on the operational state of the vips. Field introduced in 17.1.12. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vca_configuration` - Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vcenter_configuration` - Allowed in enterprise edition with any value, essentials, enterprise with cloud services edition.
-* `vmc_deployment` - This deployment is vmware on aws cloud. Field introduced in 20.1.5, 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vtype` - Cloud type. Enum options - CLOUD_NONE, CLOUD_VCENTER, CLOUD_OPENSTACK, CLOUD_AWS, CLOUD_VCA, CLOUD_APIC, CLOUD_MESOS, CLOUD_LINUXSERVER, CLOUD_DOCKER_UCP, CLOUD_RANCHER, CLOUD_OSHIFT_K8S, CLOUD_AZURE, CLOUD_GCP, CLOUD_NSXT. Allowed in enterprise edition with any value, essentials edition(allowed values- cloud_none,cloud_vcenter), basic edition(allowed values- cloud_none,cloud_nsxt), enterprise with cloud services edition.
+* `autoscale_polling_interval` - Cloudconnector polling interval in seconds for external autoscale groups, minimum 60 seconds. Allowed values are 60-3600. Field introduced in 18.2.2. Unit is seconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 60), basic (allowed values- 60) edition.
+* `aws_configuration` - Allowed with any value in enterprise, enterprise with cloud services edition.
+* `azure_configuration` - Field introduced in 17.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cloudstack_configuration` - Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `custom_tags` - Custom tags for all avi created resources in the cloud infrastructure. Field introduced in 17.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dhcp_enabled` - Select the ip address management scheme. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_provider_ref` - Dns profile for the cloud. It is a reference to an object of type ipamdnsproviderprofile. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dns_resolution_on_se` - By default, pool member fqdns are resolved on the controller. When this is set, pool member fqdns are instead resolved on service engines in this cloud. This is useful in scenarios where pool member fqdns can only be resolved from service engines and not from the controller. Field introduced in 18.2.6. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `dns_resolvers` - Dns resolver for the cloud. Field introduced in 20.1.5. Maximum of 1 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `docker_configuration` - Allowed with any value in enterprise, enterprise with cloud services edition.
+* `east_west_dns_provider_ref` - Dns profile for east-west services. It is a reference to an object of type ipamdnsproviderprofile. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `east_west_ipam_provider_ref` - Ipam profile for east-west services. Warning - please use virtual subnets in this ipam profile that do not conflict with the underlay networks or any overlay networks in the cluster. For example in aws and gcp, 169.254.0.0/16 is used for storing instance metadata. Hence, it should not be used in this profile. It is a reference to an object of type ipamdnsproviderprofile. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_vip_on_all_interfaces` - Enable vip on all data interfaces for the cloud. Field introduced in 18.2.9, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_vip_static_routes` - Use static routes for vip side network resolution during virtualservice placement. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `gcp_configuration` - Google cloud platform configuration. Field introduced in 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ip6_autocfg_enabled` - Enable ipv6 auto configuration. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ipam_provider_ref` - Ipam profile for the cloud. It is a reference to an object of type ipamdnsproviderprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `license_tier` - Specifies the default license tier which would be used by new se groups. This field by default inherits the value from system configuration. Enum options - ENTERPRISE_16, ENTERPRISE, ENTERPRISE_18, BASIC, ESSENTIALS, ENTERPRISE_WITH_CLOUD_SERVICES. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `license_type` - If no license type is specified then default license enforcement for the cloud type is chosen. The default mappings are container cloud is max ses, openstack and vmware is cores and linux it is sockets. Enum options - LIC_BACKEND_SERVERS, LIC_SOCKETS, LIC_CORES, LIC_HOSTS, LIC_SE_BANDWIDTH, LIC_METERED_SE_BANDWIDTH. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `linuxserver_configuration` - Allowed with any value in enterprise, enterprise with cloud services edition.
+* `maintenance_mode` - Cloud is in maintenance mode. Field introduced in 20.1.7,21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 22.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `metrics_polling_interval` - Cloud metrics collector polling interval in seconds. Field introduced in 22.1.1. Unit is seconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mgmt_ip_v4_enabled` - Enable ipv4 on the management interface of the serviceengine. Defaults to dhcp if no static config on network present. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `mgmt_ip_v6_enabled` - Enable ipv6 on the management interface of the serviceengine. Defaults to autocfg if no static config on network present. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `mtu` - Mtu setting for the cloud. Unit is bytes. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nsxt_configuration` - Nsx-t cloud platform configuration. Field introduced in 20.1.1. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `ntp_configuration` - Ntp configuration for the cloud. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_name_prefix` - Default prefix for all automatically created objects in this cloud. This prefix can be overridden by the se-group template. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `prefer_static_routes` - Prefer static routes over interface routes during virtualservice placement. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `proxy_configuration` - Allowed with any value in enterprise, enterprise with cloud services edition.
+* `rancher_configuration` - Allowed with any value in enterprise, enterprise with cloud services edition.
+* `resolve_fqdn_to_ipv6` - Resolve ipv6 address for pool member fqdns. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_group_template_ref` - The service engine group to use as template. It is a reference to an object of type serviceenginegroup. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `state_based_dns_registration` - Dns records for vips are added/deleted based on the operational state of the vips. Field introduced in 17.1.12. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vca_configuration` - Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vcenter_configuration` - Allowed with any value in enterprise, essentials, enterprise with cloud services edition.
+* `vmc_deployment` - This deployment is vmware on aws cloud. Field introduced in 20.1.5, 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vtype` - Cloud type. Enum options - CLOUD_NONE, CLOUD_VCENTER, CLOUD_OPENSTACK, CLOUD_AWS, CLOUD_VCA, CLOUD_APIC, CLOUD_MESOS, CLOUD_LINUXSERVER, CLOUD_DOCKER_UCP, CLOUD_RANCHER, CLOUD_OSHIFT_K8S, CLOUD_AZURE, CLOUD_GCP, CLOUD_NSXT. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- cloud_none,cloud_vcenter), basic (allowed values- cloud_none,cloud_nsxt) edition.
 
diff --git a/website/docs/d/avi_cloudconnectoruser.html.markdown b/website/docs/d/avi_cloudconnectoruser.html.markdown
index ff34fdfc3..604d6cc8f 100644
--- a/website/docs/d/avi_cloudconnectoruser.html.markdown
+++ b/website/docs/d/avi_cloudconnectoruser.html.markdown
@@ -32,18 +32,17 @@ data "avi_cloudconnectoruser" "foo_cloudconnectoruser" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `azure_serviceprincipal` - Field introduced in 17.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `azure_userpass` - Field introduced in 17.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `gcp_credentials` - Credentials for google cloud platform. Field introduced in 18.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nsxt_credentials` - Credentials to talk to nsx-t manager. Field introduced in 20.1.1. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `oci_credentials` - Credentials for oracle cloud infrastructure. Field introduced in 18.2.1,18.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `password` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `private_key` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `public_key` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tencent_credentials` - Credentials for tencent cloud. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_credentials` - Credentials to talk to vcenter. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `azure_serviceprincipal` - Field introduced in 17.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `azure_userpass` - Field introduced in 17.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `gcp_credentials` - Credentials for google cloud platform. Field introduced in 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nsxt_credentials` - Credentials to talk to nsx-t manager. Field introduced in 20.1.1. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `password` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `private_key` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `public_key` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tencent_credentials` - Credentials for tencent cloud. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_credentials` - Credentials to talk to vcenter. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_cloudproperties.html.markdown b/website/docs/d/avi_cloudproperties.html.markdown
index f58efdbbc..7f7218e9a 100644
--- a/website/docs/d/avi_cloudproperties.html.markdown
+++ b/website/docs/d/avi_cloudproperties.html.markdown
@@ -32,10 +32,10 @@ data "avi_cloudproperties" "foo_cloudproperties" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `cc_props` - Cloudconnector properties. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cc_vtypes` - Cloud types supported by cloudconnector. Enum options - CLOUD_NONE, CLOUD_VCENTER, CLOUD_OPENSTACK, CLOUD_AWS, CLOUD_VCA, CLOUD_APIC, CLOUD_MESOS, CLOUD_LINUXSERVER, CLOUD_DOCKER_UCP, CLOUD_RANCHER, CLOUD_OSHIFT_K8S, CLOUD_AZURE, CLOUD_GCP, CLOUD_NSXT. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `hyp_props` - Hypervisor properties. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `info` - Properties specific to a cloud type. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `cc_props` - Cloudconnector properties. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cc_vtypes` - Cloud types supported by cloudconnector. Enum options - CLOUD_NONE, CLOUD_VCENTER, CLOUD_OPENSTACK, CLOUD_AWS, CLOUD_VCA, CLOUD_APIC, CLOUD_MESOS, CLOUD_LINUXSERVER, CLOUD_DOCKER_UCP, CLOUD_RANCHER, CLOUD_OSHIFT_K8S, CLOUD_AZURE, CLOUD_GCP, CLOUD_NSXT. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `hyp_props` - Hypervisor properties. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `info` - Properties specific to a cloud type. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_cluster.html.markdown b/website/docs/d/avi_cluster.html.markdown
index f477a4072..1a59902ce 100644
--- a/website/docs/d/avi_cluster.html.markdown
+++ b/website/docs/d/avi_cluster.html.markdown
@@ -32,11 +32,11 @@ data "avi_cluster" "foo_cluster" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nodes` - Minimum of 1 items required. Maximum of 7 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `rejoin_nodes_automatically` - Re-join cluster nodes automatically in the event one of the node is reset to factory. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `virtual_ip` - A v4 virtual ip address. This v4 ip address will be dynamically reconfigured so that it always is the ip of the cluster leader. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `virtual_ip6` - A v6 virtual ip address. This v6 ip address will be dynamically reconfigured so that it always is the ip of the cluster leader. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nodes` - Minimum of 1 items required. Maximum of 7 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rejoin_nodes_automatically` - Re-join cluster nodes automatically in the event one of the node is reset to factory. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `virtual_ip` - A v4 virtual ip address for the cluster that always points to the v4 ip of the leader node in cluster. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `virtual_ip6` - A v6 virtual ip address for the cluster that always points to the v6 ip of the leader node in cluster. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_clusterclouddetails.html.markdown b/website/docs/d/avi_clusterclouddetails.html.markdown
index dc884d8c6..e449513b1 100644
--- a/website/docs/d/avi_clusterclouddetails.html.markdown
+++ b/website/docs/d/avi_clusterclouddetails.html.markdown
@@ -32,9 +32,9 @@ data "avi_clusterclouddetails" "foo_clusterclouddetails" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `azure_info` - Azure info to configure cluster_vip on the controller. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `name` - Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `azure_info` - Azure info to configure cluster_vip on the controller. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_controllerportalregistration.html.markdown b/website/docs/d/avi_controllerportalregistration.html.markdown
index c378a932a..69b5ff318 100644
--- a/website/docs/d/avi_controllerportalregistration.html.markdown
+++ b/website/docs/d/avi_controllerportalregistration.html.markdown
@@ -32,9 +32,9 @@ data "avi_controllerportalregistration" "foo_controllerportalregistration" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `asset` - Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `portal_auth` - Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `asset` - Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `portal_auth` - Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_controllerproperties.html.markdown b/website/docs/d/avi_controllerproperties.html.markdown
index b2f8b62db..7b9bf3332 100644
--- a/website/docs/d/avi_controllerproperties.html.markdown
+++ b/website/docs/d/avi_controllerproperties.html.markdown
@@ -32,115 +32,112 @@ data "avi_controllerproperties" "foo_controllerproperties" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `alert_manager_use_evms` - Enable to use event manager as source of eventsdisable to use log manager as source of events. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `allow_admin_network_updates` - Allow non-admin tenants to update admin vrfcontext and network objects. Field introduced in 18.2.7, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `allow_ip_forwarding` - Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `allow_unauthenticated_apis` - Allow unauthenticated access for special apis. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `allow_unauthenticated_nodes` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `api_idle_timeout` - Allowed values are 0-1440. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `api_perf_logging_threshold` - Threshold to log request timing in portal_performance.log and server-timing response header. Any stage taking longer than 1% of the threshold will be included in the server-timing header. Field introduced in 18.1.4, 18.2.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `appviewx_compat_mode` - Export configuration in appviewx compatibility mode. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `async_patch_merge_period` - Period for which asynchronous patch requests are queued. Allowed values are 30-120. Special values are 0 - deactivated. Field introduced in 18.2.11, 20.1.3. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `async_patch_request_cleanup_duration` - Duration for which asynchronous patch requests should be kept, after being marked as success or fail. Allowed values are 5-120. Field introduced in 18.2.11, 20.1.3. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `attach_ip_retry_interval` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `attach_ip_retry_limit` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `bm_use_ansible` - Use ansible for se creation in baremetal. Field introduced in 17.2.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `check_vsvip_fqdn_syntax` - Enforce vsvip fqdn syntax checks. Field introduced in 20.1.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `cleanup_expired_authtoken_timeout_period` - Period for auth token cleanup job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cleanup_sessions_timeout_period` - Period for sessions cleanup job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_discovery_interval` - Time in minutes to wait between consecutive cloud discovery cycles. Allowed values are 1-1440. Field introduced in 22.1.5, 30.2.1. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `cloud_reconcile` - Enable/disable periodic reconcile for all the clouds. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_reconcile_interval` - Time in minutes to wait between consecutive cloud reconcile cycles. Allowed values are 1-1440. Field introduced in 22.1.5, 30.2.1. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `cluster_ip_gratuitous_arp_period` - Period for cluster ip gratuitous arp job. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `consistency_check_timeout_period` - Period for consistency check job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `controller_resource_info_collection_period` - Periodically collect stats. Field introduced in 20.1.3. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `crashed_se_reboot` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dead_se_detection_timer` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `default_minimum_api_timeout` - Minimum api timeout value.if this value is not 60, it will be the default timeout for all apis that do not have a specific timeout.if an api has a specific timeout but is less than this value, this value will become the new timeout. Allowed values are 60-3600. Field introduced in 18.2.6. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `del_offline_se_after_reboot_delay` - The amount of time the controller will wait before deleting an offline se after it has been rebooted. For unresponsive ses, the total time will be  unresponsive_se_reboot + del_offline_se_after_reboot_delay. For crashed ses, the total time will be crashed_se_reboot + del_offline_se_after_reboot_delay. Field introduced in 20.1.5. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `detach_ip_retry_interval` - Amount of time to wait after last detach ip failure before attempting next detach ip retry. Field introduced in 21.1.3. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `detach_ip_retry_limit` - Maximum number of detach ip retries. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `detach_ip_timeout` - Time to wait before marking detach ip as failed. Field introduced in 21.1.3. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dns_refresh_period` - Period for refresh pool and gslb dns job. Unit is min. Allowed in enterprise edition with any value, essentials edition(allowed values- 60), basic edition(allowed values- 60), enterprise with cloud services edition.
-* `dummy` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `edit_system_limits` - Allow editing of system limits. Keep in mind that these system limits have been carefully selected based on rigorous testing in our testig environments. Modifying these limits could destabilize your cluster. Do this at your own risk!. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_api_sharding` - This setting enables the controller leader to shard api requests to the followers (if any). Field introduced in 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_memory_balancer` - Enable/disable memory balancer. Field introduced in 17.2.8. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_per_process_stop` - Enable stopping of individual processes if process cross the given threshold limit, even when the total controller memory usage is belowits threshold limit. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_resmgr_log_cache_print` - Enable printing of cached logs inside resource manager. Used for debugging purposes only. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `event_manager_max_goroutines` - Maximum number of goroutines for event manager process. Allowed values are 1-64. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `event_manager_max_subscribers` - Maximum number of subscribers for event manager process. Allowed values are 1-6. Special values are 0 - disabled. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `event_manager_processing_time_threshold` - Log instances for event manager processing delay; recorded whenever event processing delay exceeds configured interval specified in seconds. Allowed values are 1-5. Special values are 0 - disabled. Field introduced in 30.2.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `false_positive_learning_config` - False positive learning configuration. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `fatal_error_lease_time` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `federated_datastore_cleanup_duration` - Federated datastore will not cleanup diffs unless they are at least this duration in the past. Field introduced in 20.1.1. Unit is hours. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `file_object_cleanup_period` - Period for file object cleanup job. Field introduced in 20.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fileobject_max_file_versions` - This is the max number of file versions that will be retained for a file referenced by the local fileobject. Subsequent uploads of file will result in the file rotation of the older version and the latest version retained. Example  when a file upload is done for the first time, there will be a v1 version. Subsequent uploads will get mapped to v1, v2 and v3 versions. On the fourth upload of the file, the v1 will be file rotated and v2, v3 and v4 will be retained. Allowed values are 1-5. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gslb_purge_batch_size` - Batch size for the vs_mgr to perform datastrorecleanup during a gslb purge. Allowed values are 50-1200. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gslb_purge_sleep_time_ms` - Sleep time in the vs_mgr during a federatedpurge rpc call. Allowed values are 50-100. Field introduced in 22.1.3. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ignore_vrf_in_networksubnetlist` - Ignore the vrf_context filter for /networksubnetlist api. Field introduced in 22.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `max_dead_se_in_grp` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_pcap_per_tenant` - Maximum number of pcap files stored per tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_se_spawn_interval_delay` - Maximum delay possible to add to se_spawn_retry_interval after successive se spawn failure. Field introduced in 20.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_seq_attach_ip_failures` - Maximum number of consecutive attach ip failures that halts vs placement. Field introduced in 17.2.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_seq_vnic_failures` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_threads_cc_vip_bg_worker` - Maximum number of threads in threadpool used by cloud connector ccvipbgworker. Allowed values are 1-100. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `permission_scoped_shared_admin_networks` - Network and vrfcontext objects from the admin tenant will not be shared to non-admin tenants unless admin permissions are granted. Field introduced in 18.2.7, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `persistence_key_rotate_period` - Period for rotate app persistence keys job. Allowed values are 1-1051200. Special values are 0 - disabled. Unit is min. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `portal_request_burst_limit` - Burst limit on number of incoming requests. 0 to disable. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `portal_request_rate_limit` - Maximum average number of requests allowed per second. 0 to disable. Field introduced in 20.1.1. Unit is per_second. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `portal_token` - Token used for uploading tech-support to portal. Field introduced in 16.4.6,17.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `postgres_vacuum_period` - Period for which postgres vacuum are executed. Allowed values are 30-40320. Special values are 0 - deactivated. Field introduced in 22.1.3. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `process_locked_useraccounts_timeout_period` - Period for process locked user accounts job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `process_pki_profile_timeout_period` - Period for process pki profile job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `query_host_fail` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `resmgr_log_caching_period` - Period for each cycle of log caching in resource manager. At the end of each cycle, the in memory cached log history will be cleared. Field introduced in 20.1.5. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `restrict_cloud_read_access` - Restrict read access to cloud. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `safenet_hsm_version` - Version of the safenet package installed on the controller. Field introduced in 16.5.2,17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_create_timeout` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_failover_attempt_interval` - Interval between attempting failovers to an se. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_from_marketplace` - This setting decides whether se is to be deployed from the cloud marketplace or to be created by the controller. The setting is applicable only when byol license is selected. Enum options - MARKETPLACE, IMAGE_SE. Field introduced in 18.1.4, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_offline_del` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_spawn_retry_interval` - Default retry period before attempting another service engine spawn in se group. Field introduced in 20.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_upgrade_flow_cleanup_timeout` - Timeout for flows cleanup by serviceengine during upgrade.internal knob  to be exercised under the surveillance of vmware avi support team. Field introduced in 22.1.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_vnic_cooldown` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_vnic_gc_wait_time` - Duration to wait after last vnic addition before proceeding with vnic garbage collection. Used for testing purposes. Field introduced in 20.1.4. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `secure_channel_cleanup_timeout` - Period for secure channel cleanup job. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `secure_channel_controller_token_timeout` - Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `secure_channel_se_token_timeout` - Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `seupgrade_copy_buffer_size` - This parameter defines the buffer size during se image downloads in a segroup. It is used to pace the se downloads so that controller network/cpu bandwidth is a bounded operation. Field introduced in 22.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `seupgrade_copy_pool_size` - This parameter defines the number of simultaneous se image downloads in a segroup. It is used to pace the se downloads so that controller network/cpu bandwidth is a bounded operation. A value of 0 will disable the pacing scheme and all the se(s) in the segroup will attempt to download the image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `seupgrade_fabric_pool_size` - The pool size is used to control the number of concurrent segroup upgrades. This field value takes affect upon controller warm reboot. Allowed values are 2-20. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `seupgrade_segroup_min_dead_timeout` - Time to wait before marking segroup upgrade as stuck. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `shared_ssl_certificates` - Ssl certificates in the admin tenant can be used in non-admin tenants. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `soft_min_mem_per_se_limit` - Soft limit on the minimum se memory that an se needs to have on se register. Field introduced in 30.1.1. Unit is mb. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ssl_certificate_expiry_warning_days` - Number of days for ssl certificate expiry warning. Unit is days. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `system_report_cleanup_interval` - Time in minutes to wait between cleanup of systemreports. Allowed values are 15-300. Field introduced in 22.1.6, 30.2.1. Unit is min. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `system_report_limit` - Number of systemreports retained in the system. Once the number of system reports exceed this threshold, the oldest systemreport will be removed and the latest one retained. I.e. The systemreport will be rotated and the reports don't exceed the threshold. Allowed values are 5-50. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `unresponsive_se_reboot` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `update_dns_entry_retry_limit` - Number of times to retry a dns entry update/delete operation. Field introduced in 21.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `update_dns_entry_timeout` - Timeout period for a dns entry update/delete operation. Field introduced in 21.1.4. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `upgrade_dns_ttl` - Time to account for dns ttl during upgrade. This is in addition to vs_scalein_timeout_for_upgrade in se_group. Field introduced in 17.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials edition(allowed values- 5), basic edition(allowed values- 5), enterprise with cloud services edition.
-* `upgrade_fat_se_lease_time` - Amount of time controller waits for a large-sized se (>=128gb memory) to reconnect after it is rebooted during upgrade. Field introduced in 18.2.10, 20.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upgrade_lease_time` - Amount of time controller waits for a regular-sized se (<128gb memory) to reconnect after it is rebooted during upgrade. Starting 18.2.10/20.1.1, the default time has increased from 360 seconds to 600 seconds. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upgrade_se_per_vs_scale_ops_txn_time` - This parameter defines the upper-bound value of the vs scale-in or vs scale-out operation executed in the sescalein and sescale context. User can tweak this parameter to a higher value if the segroup gets suspended due to sescalein or sescaleout timeout failure typically associated with high number of vs(es) scaled out. Field introduced in 18.2.10, 20.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `user_agent_cache_config` - Configuration for user-agent cache used in bot management. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vnic_op_fail_time` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_awaiting_se_timeout` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_key_rotate_period` - Period for rotate vs keys job. Allowed values are 1-1051200. Special values are 0 - disabled. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_scaleout_ready_check_interval` - Interval for checking scaleout_ready status while controller is waiting for scaleoutready rpc from the service engine. Field introduced in 18.2.2. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_attach_ip_fail` - Time to wait before marking attach ip operation on an se as failed. Field introduced in 17.2.2. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_bootup_fail` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_bootup_fail_patch` - Wait for longer for patch ses to boot up. Field introduced in 30.2.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vs_se_create_fail` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_ping_fail` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_vnic_fail` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_vnic_ip_fail` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vsphere_ha_detection_timeout` - Vsphere ha monitor detection timeout. If vsphere_ha_enabled is true and the controller is not able to reach the se, placement will wait for this duration for vsphere_ha_inprogress to be marked true before taking corrective action. Field introduced in 20.1.7, 21.1.3. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vsphere_ha_recovery_timeout` - Vsphere ha monitor recovery timeout. Once vsphere_ha_inprogress is set to true (meaning host failure detected and vsphere ha will recover the service engine), placement will wait for at least this duration for the se to reconnect to the controller before taking corrective action. Field introduced in 20.1.7, 21.1.3. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vsphere_ha_timer_interval` - Vsphere ha monitor timer interval for sending cc_check_se_status to cloud connector. Field introduced in 20.1.7, 21.1.3. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `warmstart_se_reconnect_wait_time` - Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `warmstart_vs_resync_wait_time` - Timeout for warmstart vs resync. Field introduced in 18.1.4, 18.2.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `alert_manager_use_evms` - Enable to use event manager as source of eventsdisable to use log manager as source of events. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `allow_admin_network_updates` - Allow non-admin tenants to update admin vrfcontext and network objects. Field introduced in 18.2.7, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allow_ip_forwarding` - Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allow_unauthenticated_apis` - Allow unauthenticated access for special apis. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allow_unauthenticated_nodes` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `api_idle_timeout` - Allowed values are 0-1440. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `api_perf_logging_threshold` - Threshold to log request timing in portal_performance.log and server-timing response header. Any stage taking longer than 1% of the threshold will be included in the server-timing header. Field introduced in 18.1.4, 18.2.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `appviewx_compat_mode` - Export configuration in appviewx compatibility mode. Field introduced in 17.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `archive_retention_framework_period` - Period for archive and retention framework job. Allowed values are 1-240. Field introduced in 31.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `async_patch_merge_period` - Period for which asynchronous patch requests are queued. Allowed values are 30-120. Special values are 0 - deactivated. Field introduced in 18.2.11, 20.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `async_patch_request_cleanup_duration` - Duration for which asynchronous patch requests should be kept, after being marked as success or fail. Allowed values are 5-120. Field introduced in 18.2.11, 20.1.3. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `attach_ip_retry_interval` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `attach_ip_retry_limit` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `bm_use_ansible` - Use ansible for se creation in baremetal. Field introduced in 17.2.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `check_vsvip_fqdn_syntax` - Enforce vsvip fqdn syntax checks. Field introduced in 20.1.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cleanup_expired_authtoken_timeout_period` - Period for auth token cleanup job. Field introduced in 18.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cleanup_sessions_timeout_period` - Period for sessions cleanup job. Field introduced in 18.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_discovery_interval` - Time in minutes to wait between consecutive cloud discovery cycles. Allowed values are 1-1440. Field introduced in 22.1.5, 30.2.1. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cloud_reconcile` - Enable/disable periodic reconcile for all the clouds. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_reconcile_interval` - Time in minutes to wait between consecutive cloud reconcile cycles. Allowed values are 1-1440. Field introduced in 22.1.5, 30.2.1. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cluster_ip_gratuitous_arp_period` - Period for cluster ip gratuitous arp job. Allowed values are 1-1440. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `consistency_check_timeout_period` - Period for consistency check job. Field introduced in 18.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_resource_info_collection_period` - Periodically collect stats. Field introduced in 20.1.3. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `crashed_se_reboot` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dead_se_detection_timer` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `default_minimum_api_timeout` - Minimum api timeout value.if this value is not 60, it will be the default timeout for all apis that do not have a specific timeout.if an api has a specific timeout but is less than this value, this value will become the new timeout. Allowed values are 60-3600. Field introduced in 18.2.6. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `del_offline_se_after_reboot_delay` - The amount of time the controller will wait before deleting an offline se after it has been rebooted. For unresponsive ses, the total time will be  unresponsive_se_reboot + del_offline_se_after_reboot_delay. For crashed ses, the total time will be crashed_se_reboot + del_offline_se_after_reboot_delay. Field introduced in 20.1.5. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `detach_ip_retry_interval` - Amount of time to wait after last detach ip failure before attempting next detach ip retry. Field introduced in 21.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `detach_ip_retry_limit` - Maximum number of detach ip retries. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `detach_ip_timeout` - Time to wait before marking detach ip as failed. Field introduced in 21.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dns_refresh_period` - Period for refresh pool and gslb dns job. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 60), basic (allowed values- 60) edition.
+* `dummy` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `edit_system_limits` - Allow editing of system limits. Keep in mind that these system limits have been carefully selected based on rigorous testing in our testig environments. Modifying these limits could destabilize your cluster. Do this at your own risk!. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_api_sharding` - This setting enables the controller leader to shard api requests to the followers (if any). Field introduced in 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_memory_balancer` - Enable/disable memory balancer. Field introduced in 17.2.8. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_nsx_streaming_agent` - When set to true, avi controller will connect to dynamic config streaming agent on nsx manager to get live updates. If it cannot connect, it will fallback to using rest apis based periodic polling. Dynamic streaming is supported from nsx version 4.2.1 onwards. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_per_process_stop` - Enable stopping of individual processes if process cross the given threshold limit, even when the total controller memory usage is belowits threshold limit. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_resmgr_log_cache_print` - Enable printing of cached logs inside resource manager. Used for debugging purposes only. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `event_manager_max_goroutines` - Maximum number of goroutines for event manager process. Allowed values are 1-64. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `event_manager_max_subscribers` - Maximum number of subscribers for event manager process. Allowed values are 1-6. Special values are 0 - disabled. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `event_manager_processing_time_threshold` - Log instances for event manager processing delay; recorded whenever event processing delay exceeds configured interval specified in seconds. Allowed values are 1-5. Special values are 0 - disabled. Field introduced in 30.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `false_positive_learning_config` - False positive learning configuration. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `fatal_error_lease_time` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `federated_datastore_cleanup_duration` - Federated datastore will not cleanup diffs unless they are at least this duration in the past. Field introduced in 20.1.1. Unit is hours. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `file_object_cleanup_period` - Period for file object cleanup job. Field introduced in 20.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fileobject_max_file_versions` - This is the max number of file versions that will be retained for a file referenced by the local fileobject. Subsequent uploads of file will result in the file rotation of the older version and the latest version retained. Example  when a file upload is done for the first time, there will be a v1 version. Subsequent uploads will get mapped to v1, v2 and v3 versions. On the fourth upload of the file, the v1 will be file rotated and v2, v3 and v4 will be retained. Allowed values are 1-5. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gslb_fileobject_max_version_count` - Number of version copies for a givenfile object of gslb_geo_db type. Allowed values are 2-50000. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gslb_purge_batch_size` - Batch size for the vs_mgr to perform datastrorecleanup during a gslb purge. Allowed values are 50-1200. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gslb_purge_sleep_time_ms` - Sleep time in the vs_mgr during a federatedpurge rpc call. Allowed values are 50-100. Field introduced in 22.1.3. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ignore_vrf_in_networksubnetlist` - Ignore the vrf_context filter for /networksubnetlist api. Field introduced in 22.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `max_dead_se_in_grp` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_pcap_per_tenant` - Maximum number of pcap files stored per tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_se_spawn_interval_delay` - Maximum delay possible to add to se_spawn_retry_interval after successive se spawn failure. Field introduced in 20.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_seq_attach_ip_failures` - Maximum number of consecutive attach ip failures that halts vs placement. Field introduced in 17.2.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_seq_vnic_failures` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_threads_cc_vip_bg_worker` - Maximum number of threads in threadpool used by cloud connector ccvipbgworker. Allowed values are 1-100. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `permission_scoped_shared_admin_networks` - Network and vrfcontext objects from the admin tenant will not be shared to non-admin tenants unless admin permissions are granted. Field introduced in 18.2.7, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `persistence_key_rotate_period` - Period for rotate app persistence keys job. Allowed values are 1-1051200. Special values are 0 - disabled. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `portal_request_burst_limit` - Burst limit on number of incoming requests. 0 to disable. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `portal_request_rate_limit` - Maximum average number of requests allowed per second. 0 to disable. Field introduced in 20.1.1. Unit is per_second. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `portal_token` - Token used for uploading tech-support to portal. Field introduced in 16.4.6,17.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `postgres_vacuum_period` - Period for which postgres vacuum are executed. Allowed values are 30-40320. Special values are 0 - deactivated. Field introduced in 22.1.3. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `process_locked_useraccounts_timeout_period` - Period for process locked user accounts job. Field introduced in 18.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `process_pki_profile_timeout_period` - Period for process pki profile job. Field introduced in 18.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `query_host_fail` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `resmgr_log_caching_period` - Period for each cycle of log caching in resource manager. At the end of each cycle, the in memory cached log history will be cleared. Field introduced in 20.1.5. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `restrict_cloud_read_access` - Restrict read access to cloud. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `safenet_hsm_version` - Version of the safenet package installed on the controller. Field introduced in 16.5.2,17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_create_timeout` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_failover_attempt_interval` - Interval between attempting failovers to an se. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_from_marketplace` - This setting decides whether se is to be deployed from the cloud marketplace or to be created by the controller. The setting is applicable only when byol license is selected. Enum options - MARKETPLACE, IMAGE_SE. Field introduced in 18.1.4, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_offline_del` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_spawn_retry_interval` - Default retry period before attempting another service engine spawn in se group. Field introduced in 20.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_upgrade_flow_cleanup_timeout` - Timeout for flows cleanup by serviceengine during upgrade.internal knob  to be exercised under the surveillance of vmware avi support team. Field introduced in 22.1.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_vnic_cooldown` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_vnic_gc_wait_time` - Duration to wait after last vnic addition before proceeding with vnic garbage collection. Used for testing purposes. Field introduced in 20.1.4. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `secure_channel_cleanup_timeout` - Period for secure channel cleanup job. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `secure_channel_controller_token_timeout` - Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `secure_channel_se_token_timeout` - Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `shared_ssl_certificates` - Ssl certificates in the admin tenant can be used in non-admin tenants. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `skip_beego_perf_collection` - Skip api performance collection for requests going through the apiserver. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `soft_min_mem_per_se_limit` - Soft limit on the minimum se memory that an se needs to have on se register. Field introduced in 30.1.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ssl_certificate_expiry_warning_days` - Number of days for ssl certificate expiry warning. Unit is days. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `statecache_properties` - Configure statecache behavior for config, se, resmgr. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `unresponsive_se_reboot` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `update_dns_entry_retry_limit` - Number of times to retry a dns entry update/delete operation. Field introduced in 21.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `update_dns_entry_timeout` - Timeout period for a dns entry update/delete operation. Field introduced in 21.1.4. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `upgrade_dns_ttl` - Time to account for dns ttl during upgrade. This is in addition to vs_scalein_timeout_for_upgrade in se_group. Field introduced in 17.1.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5), basic (allowed values- 5) edition.
+* `upgrade_se_per_vs_scale_ops_txn_time` - This parameter defines the upper-bound value of the vs scale-in or vs scale-out operation executed in the sescalein and sescale context. User can tweak this parameter to a higher value if the segroup gets suspended due to sescalein or sescaleout timeout failure typically associated with high number of vs(es) scaled out. Field introduced in 18.2.10, 20.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `user_agent_cache_config` - Configuration for user-agent cache used in bot management. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vnic_op_fail_time` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_awaiting_se_timeout` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_key_rotate_period` - Period for rotate vs keys job. Allowed values are 1-1051200. Special values are 0 - disabled. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_scaleout_ready_check_interval` - Interval for checking scaleout_ready status while controller is waiting for scaleoutready rpc from the service engine. Field introduced in 18.2.2. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_attach_ip_fail` - Time to wait before marking attach ip operation on an se as failed. Field introduced in 17.2.2. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_bootup_fail` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_bootup_fail_patch` - Wait for longer for patch ses to boot up. Field introduced in 30.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vs_se_create_fail` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_ping_fail` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_vnic_fail` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_vnic_ip_fail` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vsphere_ha_detection_timeout` - Vsphere ha monitor detection timeout. If vsphere_ha_enabled is true and the controller is not able to reach the se, placement will wait for this duration for vsphere_ha_inprogress to be marked true before taking corrective action. Field introduced in 20.1.7, 21.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vsphere_ha_recovery_timeout` - Vsphere ha monitor recovery timeout. Once vsphere_ha_inprogress is set to true (meaning host failure detected and vsphere ha will recover the service engine), placement will wait for at least this duration for the se to reconnect to the controller before taking corrective action. Field introduced in 20.1.7, 21.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vsphere_ha_timer_interval` - Vsphere ha monitor timer interval for sending cc_check_se_status to cloud connector. Field introduced in 20.1.7, 21.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `warmstart_se_reconnect_wait_time` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `warmstart_vs_resync_wait_time` - Timeout for warmstart vs resync. Field introduced in 18.1.4, 18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_controllersite.html.markdown b/website/docs/d/avi_controllersite.html.markdown
index bb76b0be7..d51927d19 100644
--- a/website/docs/d/avi_controllersite.html.markdown
+++ b/website/docs/d/avi_controllersite.html.markdown
@@ -32,10 +32,10 @@ data "avi_controllersite" "foo_controllersite" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `address` - Ip address or a dns resolvable, fully qualified domain name of the site controller cluster. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `name` - Name for the site controller cluster. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `port` - The controller site cluster's rest api port number. Allowed values are 1-65535. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - Reference for the tenant. It is a reference to an object of type tenant. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Reference for the site controller cluster. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `address` - Ip address or a dns resolvable, fully qualified domain name of the site controller cluster. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name for the site controller cluster. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `port` - The controller site cluster's rest api port number. Allowed values are 1-65535. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Reference for the tenant. It is a reference to an object of type tenant. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Reference for the site controller cluster. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_csrfpolicy.html.markdown b/website/docs/d/avi_csrfpolicy.html.markdown
index f09fe266f..9fedb4949 100644
--- a/website/docs/d/avi_csrfpolicy.html.markdown
+++ b/website/docs/d/avi_csrfpolicy.html.markdown
@@ -32,12 +32,13 @@ data "avi_csrfpolicy" "foo_csrfpolicy" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `cookie_name` - Name of the cookie to be used for csrf token. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - Human-readable description of this csrf protection policy. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - The name of this csrf protection policy. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `rules` - Rules to control which requests undergo csrf protection.if the client's request doesn't match with any rules matchtarget, bypass_csrf action is applied. Field introduced in 30.2.1. Minimum of 1 items required. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - The unique identifier of the tenant to which this policy belongs. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `token_validity_time_min` - Csrf token is rotated when this time expires. Tokens will be acceptable for twice the token_validity_time time. Allowed values are 10-1440. Special values are 0- unlimited. Field introduced in 30.2.1. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - A unique identifier to this csrf protection policy. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cookie_name` - Name of the cookie to be used for csrf token. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `csrf_file_ref` - The file object that contains csrf javascript content. Must be of type 'csrf'. It is a reference to an object of type fileobject. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - Human-readable description of this csrf protection policy. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - The name of this csrf protection policy. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `rules` - Rules to control which requests undergo csrf protection.if the client's request doesn't match with any rules matchtarget, bypass_csrf action is applied. Field introduced in 30.2.1. Minimum of 1 items required. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - The unique identifier of the tenant to which this policy belongs. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `token_validity_time_min` - A csrf token is rotated when this amount of time has passed. Even after that, tokens will be accepted until twice this amount of time has passed. Note, however, that other timeouts from the underlying session layer also affect how long a given token can be used. A token will be invalidated (rotated or deleted) after one of 'token_validity_time_min' (this value), 'session_establishment_timeout', 'session_idle_timeout', 'session_maximum_timeout' is reached, whichever occurs first. Allowed values are 10-1440. Special values are 0- unlimited. Field introduced in 30.2.1. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - A unique identifier to this csrf protection policy. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_customipamdnsprofile.html.markdown b/website/docs/d/avi_customipamdnsprofile.html.markdown
index fe75a6a96..c9168a454 100644
--- a/website/docs/d/avi_customipamdnsprofile.html.markdown
+++ b/website/docs/d/avi_customipamdnsprofile.html.markdown
@@ -32,10 +32,10 @@ data "avi_customipamdnsprofile" "foo_customipamdnsprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `name` - Name of the custom ipam dns profile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `script_params` - Parameters that are always passed to the ipam/dns script. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `script_uri` - Script uri of form controller //ipamdnsscripts/<file-name>, file-name must have a .py extension and conform to pep8 naming convention. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the custom ipam dns profile. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `script_params` - Parameters that are always passed to the ipam/dns script. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `script_uri` - Script uri of form controller //ipamdnsscripts/<file-name>, file-name must have a .py extension and conform to pep8 naming convention. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_dnspolicy.html.markdown b/website/docs/d/avi_dnspolicy.html.markdown
index a869c3df2..a772ee67b 100644
--- a/website/docs/d/avi_dnspolicy.html.markdown
+++ b/website/docs/d/avi_dnspolicy.html.markdown
@@ -32,13 +32,13 @@ data "avi_dnspolicy" "foo_dnspolicy" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `created_by` - Creator name. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `internal` - The dns policy is created and modified by internal modules only. This should not be modified by users. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name of the dns policy. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `rule` - Dns rules. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the dns policy. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - Creator name. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `internal` - The dns policy is created and modified by internal modules only. This should not be modified by users. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the dns policy. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rule` - Dns rules. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the dns policy. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_dynamicdnsrecord.html.markdown b/website/docs/d/avi_dynamicdnsrecord.html.markdown
index b1cd019dd..4b8a0ec98 100644
--- a/website/docs/d/avi_dynamicdnsrecord.html.markdown
+++ b/website/docs/d/avi_dynamicdnsrecord.html.markdown
@@ -32,24 +32,24 @@ data "avi_dynamicdnsrecord" "foo_dynamicdnsrecord" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `algorithm` - Specifies the algorithm to pick the ip address(es) to be returned,when multiple entries are configured. This does not apply if num_records_in_response is 0. Default is round-robin. Enum options - DNS_RECORD_RESPONSE_ROUND_ROBIN, DNS_RECORD_RESPONSE_CONSISTENT_HASH. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `cname` - Canonical name in cname record. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `delegated` - Configured fqdns are delegated domains (i.e. They represent a zone cut). Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - Details of dns record. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dns_vs_uuid` - Uuid of the dns vs. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `fqdn` - Fully qualified domain name. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ip6_address` - Ipv6 address in aaaa record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ip_address` - Ip address in a record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `metadata` - Internal metadata for the dns record. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mx_records` - Mx record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Dynamicdnsrecord name, needed for a top level uuid protobuf, for display in shell. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ns` - Name server information in ns record. Field introduced in 20.1.3. Maximum of 13 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `num_records_in_response` - Specifies the number of records returned by the dns service.enter 0 to return all records. Default is 0. Allowed values are 0-20. Special values are 0- return all records. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `service_locators` - Service locator info in srv record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Tenant_uuid from dns vs's tenant_uuid. It is a reference to an object of type tenant. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ttl` - Time to live for this dns record. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `txt_records` - Text record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `type` - Dns record type. Enum options - DNS_RECORD_OTHER, DNS_RECORD_A, DNS_RECORD_NS, DNS_RECORD_CNAME, DNS_RECORD_SOA, DNS_RECORD_PTR, DNS_RECORD_HINFO, DNS_RECORD_MX, DNS_RECORD_TXT, DNS_RECORD_RP, DNS_RECORD_DNSKEY, DNS_RECORD_AAAA, DNS_RECORD_SRV, DNS_RECORD_OPT, DNS_RECORD_RRSIG, DNS_RECORD_AXFR, DNS_RECORD_ANY. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid of the dns record. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `wildcard_match` - Enable wild-card match of fqdn  if an exact match is not found in the dns table, the longest match is chosen by wild-carding the fqdn in the dns request. Default is false. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `algorithm` - Specifies the algorithm to pick the ip address(es) to be returned,when multiple entries are configured. This does not apply if num_records_in_response is 0. Default is round-robin. Enum options - DNS_RECORD_RESPONSE_ROUND_ROBIN, DNS_RECORD_RESPONSE_CONSISTENT_HASH. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cname` - Canonical name in cname record. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `delegated` - Configured fqdns are delegated domains (i.e. They represent a zone cut). Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - Details of dns record. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dns_vs_uuid` - Uuid of the dns vs. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `fqdn` - Fully qualified domain name. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ip6_address` - Ipv6 address in aaaa record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ip_address` - Ip address in a record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `metadata` - Internal metadata for the dns record. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `mx_records` - Mx record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Dynamicdnsrecord name, needed for a top level uuid protobuf, for display in shell. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ns` - Name server information in ns record. Field introduced in 20.1.3. Maximum of 13 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `num_records_in_response` - Specifies the number of records returned by the dns service.enter 0 to return all records. Default is 0. Allowed values are 0-20. Special values are 0- return all records. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `service_locators` - Service locator info in srv record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant_uuid from dns vs's tenant_uuid. It is a reference to an object of type tenant. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ttl` - Time to live for this dns record. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `txt_records` - Text record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `type` - Dns record type. Enum options - DNS_RECORD_OTHER, DNS_RECORD_A, DNS_RECORD_NS, DNS_RECORD_CNAME, DNS_RECORD_SOA, DNS_RECORD_PTR, DNS_RECORD_HINFO, DNS_RECORD_MX, DNS_RECORD_TXT, DNS_RECORD_RP, DNS_RECORD_DNSKEY, DNS_RECORD_AAAA, DNS_RECORD_SRV, DNS_RECORD_OPT, DNS_RECORD_RRSIG, DNS_RECORD_AXFR, DNS_RECORD_ANY. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid of the dns record. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `wildcard_match` - Enable wild-card match of fqdn  if an exact match is not found in the dns table, the longest match is chosen by wild-carding the fqdn in the dns request. Default is false. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_errorpagebody.html.markdown b/website/docs/d/avi_errorpagebody.html.markdown
index bae56b6b5..b6fb62f46 100644
--- a/website/docs/d/avi_errorpagebody.html.markdown
+++ b/website/docs/d/avi_errorpagebody.html.markdown
@@ -32,11 +32,11 @@ data "avi_errorpagebody" "foo_errorpagebody" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `error_page_body` - Error page body sent to client when match. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `format` - Format of an error page body html or json. Enum options - ERROR_PAGE_FORMAT_HTML, ERROR_PAGE_FORMAT_JSON. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `error_page_body` - Error page body sent to client when match. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `format` - Format of an error page body html or json. Enum options - ERROR_PAGE_FORMAT_HTML, ERROR_PAGE_FORMAT_JSON. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_errorpageprofile.html.markdown b/website/docs/d/avi_errorpageprofile.html.markdown
index eb62a8b9f..4922c2bb1 100644
--- a/website/docs/d/avi_errorpageprofile.html.markdown
+++ b/website/docs/d/avi_errorpageprofile.html.markdown
@@ -32,10 +32,10 @@ data "avi_errorpageprofile" "foo_errorpageprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `error_pages` - Defined error pages for http status codes. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `error_pages` - Defined error pages for http status codes. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_federationcheckpoint.html.markdown b/website/docs/d/avi_federationcheckpoint.html.markdown
index d001afc32..acf977e54 100644
--- a/website/docs/d/avi_federationcheckpoint.html.markdown
+++ b/website/docs/d/avi_federationcheckpoint.html.markdown
@@ -32,11 +32,11 @@ data "avi_federationcheckpoint" "foo_federationcheckpoint" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `date` - Date when the checkpoint was created. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - Description for this checkpoint. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_federated` - This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Name of the checkpoint. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the checkpoint. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `date` - Date when the checkpoint was created. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Description for this checkpoint. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_federated` - This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the checkpoint. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the checkpoint. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_fileobject.html.markdown b/website/docs/d/avi_fileobject.html.markdown
index 8d5eba075..ccd7fe831 100644
--- a/website/docs/d/avi_fileobject.html.markdown
+++ b/website/docs/d/avi_fileobject.html.markdown
@@ -32,21 +32,25 @@ data "avi_fileobject" "foo_fileobject" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `checksum` - Sha1 checksum of the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `compressed` - This field indicates whether the file is gzip-compressed. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `created` - Timestamp of creation for the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `crl_info` - This field contains certificate revocation list metadata. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - Description of the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `expires_at` - Timestamp when the file will be no longer needed and can be removed by the system. If this is set, a garbage collector process will try to remove the file after this time. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_federated` - This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Name of the file object. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `path` - Path to the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `read_only` - Enforce read-only on the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `restrict_download` - Flag to allow/restrict download of the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `size` - Size of the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - Type of the file. Enum options - OTHER_FILE_TYPES, IP_REPUTATION, GEO_DB, TECH_SUPPORT, HSMPACKAGES, IPAMDNSSCRIPTS, CONTROLLER_IMAGE, CRL_DATA. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- other_file_types), basic edition(allowed values- other_file_types), enterprise with cloud services edition.
-* `uuid` - Uuid of the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `version` - Version of the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `checksum` - Sha1 checksum of the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `child_refs` - Avi internal formatted/converted files. It is a reference to an object of type fileobject. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `compressed` - This field indicates whether the file is gzip-compressed. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created` - Timestamp of creation for the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `crl_info` - This field contains certificate revocation list metadata. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - Description of the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `events` - List of all fileobject events. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `expires_at` - Timestamp when the file will be no longer needed and can be removed by the system. If this is set, a garbage collector process will try to remove the file after this time. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `gslb_geodb_format` - This field indicates the file format of gslb geodb file type. Enum options - GSLB_GEODB_FILE_FORMAT_AVI, GSLB_GEODB_FILE_FORMAT_MAXMIND_CITY, GSLB_GEODB_FILE_FORMAT_MAXMIND_CITY_V6, GSLB_GEODB_FILE_FORMAT_MAXMIND_CITY_V4_AND_V6, GSLB_GEODB_FILE_FORMAT_AVI_V6, GSLB_GEODB_FILE_FORMAT_AVI_V4_AND_V6. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `has_parent` - This field indicates if the the given fileobjecthas a parent fileobject or not. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_federated` - This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the file object. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `path` - Path to the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `read_only` - Enforce read-only on the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `restrict_download` - Flag to allow/restrict download of the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `size` - Size of the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - Type of the file. Enum options - OTHER_FILE_TYPES, IP_REPUTATION, GEO_DB, TECH_SUPPORT, HSMPACKAGES, IPAMDNSSCRIPTS, CONTROLLER_IMAGE, CRL_DATA, IP_REPUTATION_IPV6, GSLB_GEO_DB, CSRF_JS. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- other_file_types), basic (allowed values- other_file_types) edition.
+* `uuid` - Uuid of the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `version` - Version of the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_geodb.html.markdown b/website/docs/d/avi_geodb.html.markdown
index 2b81d57c0..96046eb90 100644
--- a/website/docs/d/avi_geodb.html.markdown
+++ b/website/docs/d/avi_geodb.html.markdown
@@ -32,11 +32,11 @@ data "avi_geodb" "foo_geodb" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `description` - Description. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `files` - Geo database files. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `is_federated` - This field indicates that this object is replicated across gslb federation. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mappings` - Custom mappings of geo values. All mappings which start with the prefix 'system-' (any case) are reserved for system default objects and may be overwritten. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Geo database name. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid of this object. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `description` - Description. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `files` - Geo database files. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_federated` - This field indicates that this object is replicated across gslb federation. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `mappings` - Custom mappings of geo values. All mappings which start with the prefix 'system-' (any case) are reserved for system default objects and may be overwritten. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Geo database name. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid of this object. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_gslb.html.markdown b/website/docs/d/avi_gslb.html.markdown
index 9cbd2438c..3518cf185 100644
--- a/website/docs/d/avi_gslb.html.markdown
+++ b/website/docs/d/avi_gslb.html.markdown
@@ -32,26 +32,28 @@ data "avi_gslb" "foo_gslb" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `async_interval` - Frequency with which messages are propagated to vs mgr. Value of 0 disables async behavior and rpc are sent inline. Allowed values are 0-5. Field introduced in 18.2.3. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `clear_on_max_retries` - Max retries after which the remote site is treated as a fresh start. In fresh start all the configs are downloaded. Allowed values are 1-1024. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `client_ip_addr_group` - Group to specify if the client ip addresses are public or private. Field introduced in 17.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dns_configs` - Sub domain configuration for the gslb. Gslb service's fqdn must be a match one of these subdomains. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_config_by_members` - Allows enable/disable of gslbservice pool groups and pool members from the gslb follower members. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `error_resync_interval` - Frequency with which errored messages are resynced to follower sites. Value of 0 disables resync behavior. Allowed values are 60-3600. Special values are 0 - disable. Field introduced in 18.2.3. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fileobject_max_file_versions` - This is the max number of file versions that will be retained for a file referenced by the federated fileobject. Subsequent uploads of file will result in the file rotation of the older version and the latest version retained. Example  when a file upload is done for the first time, there will be a v1 version. Subsequent uploads will get mapped to v1, v2 and v3 versions. On the fourth upload of the file, the v1 will be file rotated and v2, v3 and v4 will be retained. Allowed values are 1-5. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `is_federated` - This field indicates that this object is replicated across gslb federation. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `leader_cluster_uuid` - Mark this site as leader of gslb configuration. This site is the one among the avi sites. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `maintenance_mode` - This field disables the configuration operations on the leader for all federated objects. Cud operations on gslb, gslbservice, gslbgeodbprofile and other federated objects will be rejected. The rest-api disabling helps in upgrade scenarios where we don't want configuration sync operations to the gslb member when the member is being upgraded. This configuration programmatically blocks the leader from accepting new gslb configuration when member sites are undergoing upgrade. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Name for the gslb object. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `replication_policy` - Policy for replicating configuration to the active follower sites. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `send_interval` - Frequency with which group members communicate. Allowed values are 1-3600. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `send_interval_prior_to_maintenance_mode` - The user can specify a send-interval while entering maintenance mode. The validity of this 'maintenance send-interval' is only during maintenance mode. When the user leaves maintenance mode, the original send-interval is reinstated. This internal variable is used to store the original send-interval. Field introduced in 18.2.3. Unit is sec. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `sites` - Select avi site member belonging to this gslb. Minimum of 1 items required. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_scoped` - This field indicates tenant visibility for gs pool member selection across the gslb federated objects.tenant scope can be set only during the gslb create and cannot be changed once it is set. Field introduced in 18.2.12,20.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `third_party_sites` - Third party site member belonging to this gslb. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the gslb object. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `view_id` - The view-id is used in change-leader mode to differentiate partitioned groups while they have the same gslb namespace. Each partitioned group will be able to operate independently by using the view-id. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `async_interval` - Frequency with which messages are propagated to vs mgr. Value of 0 disables async behavior and rpc are sent inline. Allowed values are 0-5. Field introduced in 18.2.3. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `clear_on_max_retries` - Max retries after which the remote site is treated as a fresh start. In fresh start all the configs are downloaded. Allowed values are 1-1024. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `client_ip_addr_group` - Group to specify if the client ip addresses are public or private. Field introduced in 17.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_configs` - Sub domain configuration for the gslb. Gslb service's fqdn must be a match one of these subdomains. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_config_by_members` - Allows enable/disable of gslbservice pool groups and pool members from the gslb follower members. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `error_resync_interval` - Frequency with which errored messages are resynced to follower sites. Value of 0 disables resync behavior. Allowed values are 60-3600. Special values are 0 - disable. Field introduced in 18.2.3. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fileobject_max_file_versions` - This is the max number of file versions that will be retained for a file referenced by the federated fileobject. Subsequent uploads of file will result in the file rotation of the older version and the latest version retained. Example  when a file upload is done for the first time, there will be a v1 version. Subsequent uploads will get mapped to v1, v2 and v3 versions. On the fourth upload of the file, the v1 will be file rotated and v2, v3 and v4 will be retained. Allowed values are 1-5. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gs_member_fqdn_resolution_on_se` - If this knob is enabled, gslb service member fqdn will be resolved by the service engines hosting the gslb service. Each service engine will resolve and consume the resolved ip addresses locally. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_federated` - This field indicates that this object is replicated across gslb federation. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `leader_cluster_uuid` - Mark this site as leader of gslb configuration. This site is the one among the avi sites. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `maintenance_mode` - This field disables the configuration operations on the leader for all federated objects. Cud operations on gslb, gslbservice, gslbgeodbprofile and other federated objects will be rejected. The rest-api disabling helps in upgrade scenarios where we don't want configuration sync operations to the gslb member when the member is being upgraded. This configuration programmatically blocks the leader from accepting new gslb configuration when member sites are undergoing upgrade. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name for the gslb object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `replication_policy` - Policy for replicating configuration to the active follower sites. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `send_interval` - Frequency with which group members communicate. Allowed values are 1-3600. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `send_interval_prior_to_maintenance_mode` - The user can specify a send-interval while entering maintenance mode. The validity of this 'maintenance send-interval' is only during maintenance mode. When the user leaves maintenance mode, the original send-interval is reinstated. This internal variable is used to store the original send-interval. Field introduced in 18.2.3. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `short_probe_interval` - Wait time between two consecutive short probe health checks. Allowed values are 1-3600. Field introduced in 31.1.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sites` - Select avi site member belonging to this gslb. Minimum of 1 items required. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_scoped` - This field indicates tenant visibility for gs pool member selection across the gslb federated objects.tenant scope can be set only during the gslb create and cannot be changed once it is set. Field introduced in 18.2.12,20.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `third_party_sites` - Third party site member belonging to this gslb. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the gslb object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `view_id` - The view-id is used in change-leader mode to differentiate partitioned groups while they have the same gslb namespace. Each partitioned group will be able to operate independently by using the view-id. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_gslbcrmruntime.html.markdown b/website/docs/d/avi_gslbcrmruntime.html.markdown
new file mode 100644
index 000000000..f2b8ba7b3
--- /dev/null
+++ b/website/docs/d/avi_gslbcrmruntime.html.markdown
@@ -0,0 +1,47 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "AVI: avi_gslbcrmruntime"
+sidebar_current: "docs-avi-datasource-gslbcrmruntime"
+description: |-
+  Get information of Avi GslbCRMRuntime.
+---
+
+# avi_gslbcrmruntime
+
+This data source is used to to get avi_gslbcrmruntime objects.
+
+## Example Usage
+
+```hcl
+data "avi_gslbcrmruntime" "foo_gslbcrmruntime" {
+    uuid = "gslbcrmruntime-f9cf6b3e-a411-436f-95e2-2982ba2b217b"
+    name = "foo"
+}
+```
+
+## Argument Reference
+
+* `name` - (Optional) Search GslbCRMRuntime by name.
+* `uuid` - (Optional) Search GslbCRMRuntime by uuid.
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `cluster_uuid` - This field tracks the site_uuid for local/remote site. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `events` - Events captured wrt to config replication. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `fds_info` - Federated data store related info. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `local_info` - Represents local info for the site. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - The name of db entry. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_uuid` - Gslb crm runtime object uuid. Points to the gslb to which this belongs. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `remote_info` - Respresents remote site's info wrt to replication. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `replication_policy` - Policy for replicating configuration to the active follower sites. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `site_name` - This field tracks the site name. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `status_info` - Crm operational status. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - The uuid of db entry. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/d/avi_gslbgeodbprofile.html.markdown b/website/docs/d/avi_gslbgeodbprofile.html.markdown
index fd1e56af6..61eb41b71 100644
--- a/website/docs/d/avi_gslbgeodbprofile.html.markdown
+++ b/website/docs/d/avi_gslbgeodbprofile.html.markdown
@@ -32,12 +32,12 @@ data "avi_gslbgeodbprofile" "foo_gslbgeodbprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `entries` - List of geodb entries. An entry can either be a geodb file or an ip address group with geo properties. Field introduced in 17.1.1. Minimum of 1 items required. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_federated` - This field indicates that this object is replicated across gslb federation. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - A user-friendly name for the geodb profile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the geodb profile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `entries` - List of geodb entries. An entry can either be a geodb file or an ip address group with geo properties. Field introduced in 17.1.1. Minimum of 1 items required. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_federated` - This field indicates that this object is replicated across gslb federation. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - A user-friendly name for the geodb profile. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the geodb profile. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_gslbhsmruntime.html.markdown b/website/docs/d/avi_gslbhsmruntime.html.markdown
new file mode 100644
index 000000000..1b5723a1f
--- /dev/null
+++ b/website/docs/d/avi_gslbhsmruntime.html.markdown
@@ -0,0 +1,47 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "AVI: avi_gslbhsmruntime"
+sidebar_current: "docs-avi-datasource-gslbhsmruntime"
+description: |-
+  Get information of Avi GslbHSMRuntime.
+---
+
+# avi_gslbhsmruntime
+
+This data source is used to to get avi_gslbhsmruntime objects.
+
+## Example Usage
+
+```hcl
+data "avi_gslbhsmruntime" "foo_gslbhsmruntime" {
+    uuid = "gslbhsmruntime-f9cf6b3e-a411-436f-95e2-2982ba2b217b"
+    name = "foo"
+}
+```
+
+## Argument Reference
+
+* `name` - (Optional) Search GslbHSMRuntime by name.
+* `uuid` - (Optional) Search GslbHSMRuntime by uuid.
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `cluster_uuid` - The site controller cluster uuid. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enabled` - Represents whether hsm is enabled/disabled. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `events` - Events captured wrt to config replication. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `local_info` - Represents local info for the site. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - The name of db entry. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_uuid` - Gslb hsm runtime object uuid. Points to the gslb to which this belongs. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `oper_status` - Gslb site operational status, represents whether site is up or down. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `remote_info` - Remote info is basically updated by grw. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `send_interval` - Frequency with which group members communicate. This field shadows glb_cfg.send_interval. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `site_name` - The gslb site name. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - The uuid of db entry. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/d/avi_gslbservice.html.markdown b/website/docs/d/avi_gslbservice.html.markdown
index c6282c163..564e54fc5 100644
--- a/website/docs/d/avi_gslbservice.html.markdown
+++ b/website/docs/d/avi_gslbservice.html.markdown
@@ -32,31 +32,34 @@ data "avi_gslbservice" "foo_gslbservice" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `application_persistence_profile_ref` - The federated application persistence associated with gslbservice site persistence functionality. It is a reference to an object of type applicationpersistenceprofile. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `controller_health_status_enabled` - Gs member's overall health status is derived based on a combination of controller and datapath health-status inputs. Note that the datapath status is determined by the association of health monitor profiles. Only the controller provided status is determined through this configuration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `created_by` - Creator name. Field introduced in 17.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `domain_names` - Fully qualified domain name of the gslb service. Minimum of 1 items required. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `down_response` - Response to the client query when the gslb service is down. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enabled` - Enable or disable the gslb service. If the gslb service is enabled, then the vips are sent in the dns responses based on reachability and configured algorithm. If the gslb service is disabled, then the vips are no longer available in the dns response. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `groups` - Select list of pools belonging to this gslb service. Minimum of 1 items required. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `health_monitor_refs` - Verify vs health by applying one or more health monitors. Active monitors generate synthetic traffic from dns service engine and to mark a vs up or down based on the response. It is a reference to an object of type healthmonitor. Maximum of 6 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `health_monitor_scope` - Health monitor probe can be executed for all the members or it can be executed only for third-party members. This operational mode is useful to reduce the number of health monitor probes in case of a hybrid scenario. In such a case, avi members can have controller derived status while non-avi members can be probed by via health monitor probes in dataplane. Enum options - GSLB_SERVICE_HEALTH_MONITOR_ALL_MEMBERS, GSLB_SERVICE_HEALTH_MONITOR_ONLY_NON_AVI_MEMBERS. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `hm_off` - This field is an internal field and is used in se. Field introduced in 18.2.2. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `is_federated` - This field indicates that this object is replicated across gslb federation. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `min_members` - The minimum number of members to distribute traffic to. Allowed values are 1-65535. Special values are 0 - disable. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Name for the gslb service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `num_dns_ip` - Number of ip addresses of this gslb service to be returned by the dns service. Enter 0 to return all ip addresses. Allowed values are 1-20. Special values are 0- return all ip addresses. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pki_profile_ref` - Pki profile associated with the gslb service. It is a reference to an object of type pkiprofile. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pool_algorithm` - The load balancing algorithm will pick a gslb pool within the gslb service list of available pools. Enum options - GSLB_SERVICE_ALGORITHM_PRIORITY, GSLB_SERVICE_ALGORITHM_GEO. Field introduced in 17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `resolve_cname` - This field indicates that for a cname query, respond with resolved cnames in the additional section with a records. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `site_persistence_enabled` - Enable site-persistence for the gslbservice. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `topology_policy_enabled` - When enabled, topology policy rules are used for member selection first. If no valid member is found using the topology policy rules, configured gslb algorithms for pool selection and member selection are used. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ttl` - Ttl value (in seconds) for records served for this gslb service by the dns service. Allowed values are 0-86400. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `use_edns_client_subnet` - Use the client ip subnet from the edns option as source ipaddress for client geo-location and consistent hash algorithm. Default is true. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the gslb service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `wildcard_match` - Enable wild-card match of fqdn  if an exact match is not found in the dns table, the longest match is chosen by wild-carding the fqdn in the dns request. Default is false. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `application_persistence_profile_ref` - The federated application persistence associated with gslbservice site persistence functionality. It is a reference to an object of type applicationpersistenceprofile. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_health_status_enabled` - Gs member's overall health status is derived based on a combination of controller and datapath health-status inputs. Note that the datapath status is determined by the association of health monitor profiles. Only the controller provided status is determined through this configuration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - Creator name. Field introduced in 17.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `domain_names` - Fully qualified domain name of the gslb service. Minimum of 1 items required. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `down_response` - Response to the client query when the gslb service is down. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enabled` - Enable or disable the gslb service. If the gslb service is enabled, then the vips are sent in the dns responses based on reachability and configured algorithm. If the gslb service is disabled, then the vips are no longer available in the dns response. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `groups` - Select list of pools belonging to this gslb service. Minimum of 1 items required. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `health_monitor_refs` - Verify vs health by applying one or more health monitors. Active monitors generate synthetic traffic from dns service engine and to mark a vs up or down based on the response. It is a reference to an object of type healthmonitor. Maximum of 6 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `health_monitor_scope` - Health monitor probe can be executed for all the members or it can be executed only for third-party members. This operational mode is useful to reduce the number of health monitor probes in case of a hybrid scenario. In such a case, avi members can have controller derived status while non-avi members can be probed by via health monitor probes in dataplane. Enum options - GSLB_SERVICE_HEALTH_MONITOR_ALL_MEMBERS, GSLB_SERVICE_HEALTH_MONITOR_ONLY_NON_AVI_MEMBERS. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `hm_off` - This field is an internal field and is used in se. Field introduced in 18.2.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `include_additional_records` - If enabled, provide the srv target's resolved ip in the response srv gslb service. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_federated` - This field indicates that this object is replicated across gslb federation. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `min_members` - The minimum number of members to distribute traffic to. Allowed values are 1-65535. Special values are 0 - disable. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name for the gslb service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `num_dns_ip` - Number of ip addresses of this gslb service to be returned by the dns service. Enter 0 to return all ip addresses. Allowed values are 1-20. Special values are 0- return all ip addresses. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pki_profile_ref` - Pki profile associated with the gslb service. It is a reference to an object of type pkiprofile. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pool_algorithm` - The load balancing algorithm will pick a gslb pool within the gslb service list of available pools. Enum options - GSLB_SERVICE_ALGORITHM_PRIORITY, GSLB_SERVICE_ALGORITHM_GEO. Field introduced in 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `record_type` - Field to specify the type of gslb service. Enum options - GSLB_SERVICE_RECORD_TYPE_A_AAAA_CNAME, GSLB_SERVICE_RECORD_TYPE_SRV. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `resolve_cname` - This field indicates that for a cname query, respond with resolved cnames in the additional section with a records. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `site_persistence_enabled` - Enable site-persistence for the gslbservice. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `topology_policy_enabled` - When enabled, topology policy rules are used for member selection first. If no valid member is found using the topology policy rules, configured gslb algorithms for pool selection and member selection are used. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ttl` - Ttl value (in seconds) for records served for this gslb service by the dns service. Allowed values are 0-86400. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_edns_client_subnet` - Use the client ip subnet from the edns option as source ipaddress for client geo-location and consistent hash algorithm. Default is true. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the gslb service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vrf_uuid_for_gs` - Vrf name of the dns vs to which this gs is bound to. In case it is bound to multiple dns vses on the se, this field will be inherited from the first dns vs in the configuration order. Field introduced in 31.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `wildcard_match` - Enable wild-card match of fqdn  if an exact match is not found in the dns table, the longest match is chosen by wild-carding the fqdn in the dns request. Default is false. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_gslbsmruntime.html.markdown b/website/docs/d/avi_gslbsmruntime.html.markdown
new file mode 100644
index 000000000..b44586450
--- /dev/null
+++ b/website/docs/d/avi_gslbsmruntime.html.markdown
@@ -0,0 +1,58 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "AVI: avi_gslbsmruntime"
+sidebar_current: "docs-avi-datasource-gslbsmruntime"
+description: |-
+  Get information of Avi GslbSMRuntime.
+---
+
+# avi_gslbsmruntime
+
+This data source is used to to get avi_gslbsmruntime objects.
+
+## Example Usage
+
+```hcl
+data "avi_gslbsmruntime" "foo_gslbsmruntime" {
+    uuid = "gslbsmruntime-f9cf6b3e-a411-436f-95e2-2982ba2b217b"
+    name = "foo"
+}
+```
+
+## Argument Reference
+
+* `name` - (Optional) Search GslbSMRuntime by name.
+* `uuid` - (Optional) Search GslbSMRuntime by uuid.
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `cluster_leader` - The controller cluster leader node uuid. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cluster_uuid` - The site controller cluster uuid. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dns_configs` - Sub domain configuration for the gslb. Gslb service's fqdn must be a match one of these subdomains. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dns_info` - Dns info at the site. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enabled` - Activate/de-activate state retrieved from the cfg. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `events` - Captures sm related events. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `health_monitor_info` - This field will provide information on origin(site name) of the health monitoring information. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `leader_cluster_uuid` - Mark this site as leader of gslb configuration. This site is the one among the avi sites. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `member_type` - The site's member type  a leader is set to active while all members are set to passive. Enum options - GSLB_ACTIVE_MEMBER, GSLB_PASSIVE_MEMBER. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - The name of db entry. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `node_uuid` - The controller cluster node uuid that processes the site.sites are sharded across the cluster nodes. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `num_of_retries` - Number of retry attempts to reach the remote site. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_uuid` - Gslb sm runtime object uuid. Points to the gslb to which this belongs. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `oper_status` - Gslb site operational status, represents whether site is up or down. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `remote_info` - Remote info is basically updated by grw. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `role` - Site role  leader or follower. Enum options - GSLB_LEADER, GSLB_MEMBER, GSLB_NOT_A_MEMBER. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `site_name` - The gslb site name. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `site_type` - Indicates if it is avi site or third-party. Enum options - GSLB_AVI_SITE, GSLB_THIRD_PARTY_SITE. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `state` - Represents the state of the site. Enum options - SITE_STATE_NULL, SITE_STATE_JOIN_IN_PROGRESS, SITE_STATE_LEAVE_IN_PROGRESS, SITE_STATE_INIT, SITE_STATE_UNREACHABLE, SITE_STATE_MMODE, SITE_STATE_DISABLE_IN_PROGRESS, SITE_STATE_DISABLED, SITE_STATE_HS_IN_PROGRESS. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sw_version` - Current software version of the site. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - The uuid of db entry. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `view_id` - The view-id is used in change-leader mode to differentiate partitioned groups while they have the same gslb namespace. Each partitioned group will be able to operate independently by using the view-id. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/d/avi_hardwaresecuritymodulegroup.html.markdown b/website/docs/d/avi_hardwaresecuritymodulegroup.html.markdown
index 3d1e1d21a..8bbf61c54 100644
--- a/website/docs/d/avi_hardwaresecuritymodulegroup.html.markdown
+++ b/website/docs/d/avi_hardwaresecuritymodulegroup.html.markdown
@@ -32,10 +32,10 @@ data "avi_hardwaresecuritymodulegroup" "foo_hardwaresecuritymodulegroup" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `hsm` - Hardware security module configuration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name of the hsm group configuration object. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the hsm group configuration object. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `hsm` - Hardware security module configuration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the hsm group configuration object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the hsm group configuration object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_healthmonitor.html.markdown b/website/docs/d/avi_healthmonitor.html.markdown
index 8af70089a..6b084b756 100644
--- a/website/docs/d/avi_healthmonitor.html.markdown
+++ b/website/docs/d/avi_healthmonitor.html.markdown
@@ -32,39 +32,41 @@ data "avi_healthmonitor" "foo_healthmonitor" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `allow_duplicate_monitors` - By default, multiple instances of the same healthmonitor to the same server are suppressed intelligently. In rare cases, the monitor may have specific constructs that go beyond the server keys (ip, port, etc.) during which such suppression is not desired. Use this knob to allow duplicates. Field introduced in 18.2.8. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `authentication` - Authentication information for username/password. Field introduced in 20.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `disable_quickstart` - During addition of a server or healthmonitors or during bootup, avi performs sequential health checks rather than waiting for send-interval to kick in, to mark the server up as soon as possible. This knob may be used to turn this feature off. Field introduced in 18.2.7. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `dns_monitor` - Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `external_monitor` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `failed_checks` - Number of continuous failed health checks before the server is marked down. Allowed values are 1-50. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ftp_monitor` - Health monitor for ftp. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ftps_monitor` - Health monitor for ftps. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `http_monitor` - Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `https_monitor` - Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `imap_monitor` - Health monitor for imap. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `imaps_monitor` - Health monitor for imaps. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `is_federated` - This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `ldap_monitor` - Health monitor for ldap. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ldaps_monitor` - Health monitor for ldaps. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `monitor_port` - Use this port instead of the port defined for the server in the pool. If the monitor succeeds to this port, the load balanced traffic will still be sent to the port of the server defined within the pool. Allowed values are 1-65535. Special values are 0 - use server port. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - A user friendly name for this health monitor. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pop3_monitor` - Health monitor for pop3. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pop3s_monitor` - Health monitor for pop3s. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `radius_monitor` - Health monitor for radius. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `receive_timeout` - A valid response from the server is expected within the receive timeout window. This timeout must be less than the send interval. If server status is regularly flapping up and down, consider increasing this value. Allowed values are 1-2400. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sctp_monitor` - Health monitor for sctp. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `send_interval` - Frequency, in seconds, that monitors are sent to a server. Allowed values are 1-3600. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sip_monitor` - Health monitor for sip. Field introduced in 17.2.8, 18.1.3, 18.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `smtp_monitor` - Health monitor for smtp. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `smtps_monitor` - Health monitor for smtps. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `successful_checks` - Number of continuous successful health checks before server is marked up. Allowed values are 1-50. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tcp_monitor` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - Type of the health monitor. Enum options - HEALTH_MONITOR_PING, HEALTH_MONITOR_TCP, HEALTH_MONITOR_HTTP, HEALTH_MONITOR_HTTPS, HEALTH_MONITOR_EXTERNAL, HEALTH_MONITOR_UDP, HEALTH_MONITOR_DNS, HEALTH_MONITOR_GSLB, HEALTH_MONITOR_SIP, HEALTH_MONITOR_RADIUS, HEALTH_MONITOR_SMTP, HEALTH_MONITOR_SMTPS, HEALTH_MONITOR_POP3, HEALTH_MONITOR_POP3S, HEALTH_MONITOR_IMAP, HEALTH_MONITOR_IMAPS, HEALTH_MONITOR_FTP, HEALTH_MONITOR_FTPS, HEALTH_MONITOR_LDAP, HEALTH_MONITOR_LDAPS... Allowed in enterprise edition with any value, essentials edition(allowed values- health_monitor_ping,health_monitor_tcp,health_monitor_udp), basic edition(allowed values- health_monitor_ping,health_monitor_tcp,health_monitor_udp,health_monitor_http,health_monitor_https), enterprise with cloud services edition.
-* `udp_monitor` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the health monitor. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `allow_duplicate_monitors` - By default, multiple instances of the same healthmonitor to the same server are suppressed intelligently. In rare cases, the monitor may have specific constructs that go beyond the server keys (ip, port, etc.) during which such suppression is not desired. Use this knob to allow duplicates. Field introduced in 18.2.8. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `authentication` - Authentication information for username/password. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disable_quickstart` - During addition of a server or healthmonitors or during bootup, avi performs sequential health checks rather than waiting for send-interval to kick in, to mark the server up as soon as possible. This knob may be used to turn this feature off. Field introduced in 18.2.7. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `dns_monitor` - Allowed with any value in enterprise, enterprise with cloud services edition.
+* `external_monitor` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `failed_checks` - Number of continuous failed health checks before the server is marked down. Allowed values are 1-50. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ftp_monitor` - Health monitor for ftp. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ftps_monitor` - Health monitor for ftps. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `http2_monitor` - Health monitor for http2. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `http2s_monitor` - Health monitor for http2s. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `http_monitor` - Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `https_monitor` - Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `imap_monitor` - Health monitor for imap. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `imaps_monitor` - Health monitor for imaps. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_federated` - This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 17.1.3. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `ldap_monitor` - Health monitor for ldap. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ldaps_monitor` - Health monitor for ldaps. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `monitor_port` - Use this port instead of the port defined for the server in the pool. If the monitor succeeds to this port, the load balanced traffic will still be sent to the port of the server defined within the pool. Allowed values are 1-65535. Special values are 0 - use server port. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - A user friendly name for this health monitor. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pop3_monitor` - Health monitor for pop3. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pop3s_monitor` - Health monitor for pop3s. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `radius_monitor` - Health monitor for radius. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `receive_timeout` - A valid response from the server is expected within the receive timeout window. This timeout must be less than the send interval. If server status is regularly flapping up and down, consider increasing this value. Allowed values are 1-2400. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sctp_monitor` - Health monitor for sctp. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `send_interval` - Frequency, in seconds, that monitors are sent to a server. Allowed values are 1-3600. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sip_monitor` - Health monitor for sip. Field introduced in 17.2.8, 18.1.3, 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `smtp_monitor` - Health monitor for smtp. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `smtps_monitor` - Health monitor for smtps. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `successful_checks` - Number of continuous successful health checks before server is marked up. Allowed values are 1-50. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tcp_monitor` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - Type of the health monitor. Enum options - HEALTH_MONITOR_PING, HEALTH_MONITOR_TCP, HEALTH_MONITOR_HTTP, HEALTH_MONITOR_HTTPS, HEALTH_MONITOR_EXTERNAL, HEALTH_MONITOR_UDP, HEALTH_MONITOR_DNS, HEALTH_MONITOR_GSLB, HEALTH_MONITOR_SIP, HEALTH_MONITOR_RADIUS, HEALTH_MONITOR_SMTP, HEALTH_MONITOR_SMTPS, HEALTH_MONITOR_POP3, HEALTH_MONITOR_POP3S, HEALTH_MONITOR_IMAP, HEALTH_MONITOR_IMAPS, HEALTH_MONITOR_FTP, HEALTH_MONITOR_FTPS, HEALTH_MONITOR_LDAP, HEALTH_MONITOR_LDAPS... Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- health_monitor_ping,health_monitor_tcp,health_monitor_udp), basic (allowed values- health_monitor_ping,health_monitor_tcp,health_monitor_udp,health_monitor_http,health_monitor_https) edition.
+* `udp_monitor` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the health monitor. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_httppolicyset.html.markdown b/website/docs/d/avi_httppolicyset.html.markdown
index ec37a3bae..da6e3a993 100644
--- a/website/docs/d/avi_httppolicyset.html.markdown
+++ b/website/docs/d/avi_httppolicyset.html.markdown
@@ -32,18 +32,18 @@ data "avi_httppolicyset" "foo_httppolicyset" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `cloud_config_cksum` - Checksum of cloud configuration for pool. Internally set by cloud connector. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `created_by` - Creator name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `geo_db_ref` - Geo database. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `http_request_policy` - Http request policy for the virtual service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `http_response_policy` - Http response policy for the virtual service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `http_security_policy` - Http security policy for the virtual service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ip_reputation_db_ref` - Ip reputation database. It is a reference to an object of type ipreputationdb. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `is_internal_policy` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name of the http policy set. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the http policy set. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `cloud_config_cksum` - Checksum of cloud configuration for pool. Internally set by cloud connector. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - Creator name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `geo_db_ref` - Geo database. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `http_request_policy` - Http request policy for the virtual service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `http_response_policy` - Http response policy for the virtual service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `http_security_policy` - Http security policy for the virtual service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ip_reputation_db_ref` - Ip reputation database. It is a reference to an object of type ipreputationdb. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_internal_policy` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the http policy set. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the http policy set. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_icapprofile.html.markdown b/website/docs/d/avi_icapprofile.html.markdown
index 51a07255c..a724c3a6e 100644
--- a/website/docs/d/avi_icapprofile.html.markdown
+++ b/website/docs/d/avi_icapprofile.html.markdown
@@ -34,22 +34,22 @@ data "avi_icapprofile" "foo_icapprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `allow_204` - Allow icap server to send 204 response as described in rfc 3507 section 4.5. Service engine will buffer the complete request if alllow_204 is enabled. If disabled, preview_size request body will be buffered if enable_preview is set to true, and rest of the request body will be streamed to the icap server. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `buffer_size` - The maximum buffer size for the http request body. If the request body exceeds this size, the request will not be checked by the icap server. In this case, the configured action will be executed and a significant log entry will be generated. Allowed values are 1-51200. Field introduced in 20.1.1. Unit is kb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `buffer_size_exceed_action` - Decide what should happen if the request body size exceeds the configured buffer size. If this is set to fail open, the request will not be checked by the icap server. If this is set to fail closed, the request will be rejected with 413 status code. Enum options - ICAP_FAIL_OPEN, ICAP_FAIL_CLOSED. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - The cloud where this object belongs to. This must match the cloud referenced in the pool group below. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - A description for this icap profile. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_preview` - Use the icap preview feature as described in rfc 3507 section 4.5. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fail_action` - Decide what should happen if there is a problem with the icap server like communication timeout, protocol error, pool error, etc. If the icap server responds with 4xx-5xx error code the configured fail action is performed. If this is set to fail open, the request will continue, but will create a significant log entry. If this is set to fail closed, the request will be rejected with a 500 status code. Enum options - ICAP_FAIL_OPEN, ICAP_FAIL_CLOSED. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Name of the icap profile. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nsx_defender_config` - Nsxdefender specific icap configurations. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pool_group_ref` - The pool group which is used to connect to icap servers. It is a reference to an object of type poolgroup. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `preview_size` - The icap preview size as described in rfc 3507 section 4.5. This should not exceed the size supported by the icap server. If this is set to 0, only the http header will be sent to the icap server as a preview. To disable preview completely, set the enable-preview option to false.if vendor is lastline, recommended preview size is 1000 bytes,minimum preview size is 10 bytes. Allowed values are 0-5000. Field introduced in 20.1.1. Unit is bytes. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `response_timeout` - Maximum time, client's request will be paused for icap processing. If this timeout is exceeded, the request to the icap server will be aborted and the configured fail action is executed. Allowed values are 50-3600000. Field introduced in 20.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `service_uri` - The path and query component of the icap url. Host name and port will be taken from the pool. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `slow_response_warning_threshold` - If the icap request takes longer than this value, this request will generate a significant log entry. Allowed values are 50-3600000. Field introduced in 20.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - Tenant which this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the icap profile. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vendor` - The vendor of the icap server. Enum options - ICAP_VENDOR_GENERIC, ICAP_VENDOR_OPSWAT, ICAP_VENDOR_LASTLINE. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `allow_204` - Allow icap server to send 204 response as described in rfc 3507 section 4.5. Service engine will buffer the complete request if alllow_204 is enabled. If disabled, preview_size request body will be buffered if enable_preview is set to true, and rest of the request body will be streamed to the icap server. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `buffer_size` - The maximum buffer size for the http request body. If the request body exceeds this size, the request will not be checked by the icap server. In this case, the configured action will be executed and a significant log entry will be generated. Allowed values are 1-51200. Field introduced in 20.1.1. Unit is kb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `buffer_size_exceed_action` - Decide what should happen if the request body size exceeds the configured buffer size. If this is set to fail open, the request will not be checked by the icap server. If this is set to fail closed, the request will be rejected with 413 status code. Enum options - ICAP_FAIL_OPEN, ICAP_FAIL_CLOSED. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - The cloud where this object belongs to. This must match the cloud referenced in the pool group below. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - A description for this icap profile. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_preview` - Use the icap preview feature as described in rfc 3507 section 4.5. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fail_action` - Decide what should happen if there is a problem with the icap server like communication timeout, protocol error, pool error, etc. If the icap server responds with 4xx-5xx error code the configured fail action is performed. If this is set to fail open, the request will continue, but will create a significant log entry. If this is set to fail closed, the request will be rejected with a 500 status code. Enum options - ICAP_FAIL_OPEN, ICAP_FAIL_CLOSED. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the icap profile. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nsx_defender_config` - Nsxdefender specific icap configurations. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pool_group_ref` - The pool group which is used to connect to icap servers. It is a reference to an object of type poolgroup. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `preview_size` - The icap preview size as described in rfc 3507 section 4.5. This should not exceed the size supported by the icap server. If this is set to 0, only the http header will be sent to the icap server as a preview. To disable preview completely, set the enable-preview option to false.if vendor is lastline, recommended preview size is 1000 bytes,minimum preview size is 10 bytes. Allowed values are 0-5000. Field introduced in 20.1.1. Unit is bytes. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `response_timeout` - Maximum time, client's request will be paused for icap processing. If this timeout is exceeded, the request to the icap server will be aborted and the configured fail action is executed. Allowed values are 50-3600000. Field introduced in 20.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_uri` - The path and query component of the icap url. Host name and port will be taken from the pool. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `slow_response_warning_threshold` - If the icap request takes longer than this value, this request will generate a significant log entry. Allowed values are 50-3600000. Field introduced in 20.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Tenant which this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the icap profile. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vendor` - The vendor of the icap server. Enum options - ICAP_VENDOR_GENERIC, ICAP_VENDOR_OPSWAT, ICAP_VENDOR_LASTLINE. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_image.html.markdown b/website/docs/d/avi_image.html.markdown
index 34ec6f071..1953a5906 100644
--- a/website/docs/d/avi_image.html.markdown
+++ b/website/docs/d/avi_image.html.markdown
@@ -32,26 +32,26 @@ data "avi_image" "foo_image" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `cloud_info_values` - This field describes the cloud info specific to the base image. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `controller_info` - Controller package details. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `controller_patch_name` - Mandatory controller patch name that is applied along with this base image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `controller_patch_ref` - It references the controller-patch associated with the uber image. It is a reference to an object of type image. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `duration` - Time taken to upload the image in seconds. Field introduced in 21.1.3. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `end_time` - Image upload end time. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `events` - Image events for image upload operation. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `fips_mode_transition_applicable` - Specifies whether fips mode can be enabled on this image. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `img_state` - Status of the image. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `migrations` - This field describes the api migration related information. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Name of the image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `progress` - Image upload progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 21.1.3. Unit is percent. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_info` - Se package details. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_patch_name` - Mandatory serviceengine patch name that is applied along with this base image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_patch_ref` - It references the service engine patch associated with the uber image. It is a reference to an object of type image. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `start_time` - Image upload start time. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tasks_completed` - Completed set of tasks for image upload. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `total_tasks` - Total number of tasks for image upload. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `type` - Type of the image patch/system. Enum options - IMAGE_TYPE_PATCH, IMAGE_TYPE_SYSTEM, IMAGE_TYPE_MUST_CHECK. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uber_bundle` - Status to check if the image is an uber bundle. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `cloud_info_values` - This field describes the cloud info specific to the base image. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_info` - Controller package details. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_patch_name` - Mandatory controller patch name that is applied along with this base image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_patch_ref` - It references the controller-patch associated with the uber image. It is a reference to an object of type image. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `duration` - Time taken to upload the image in seconds. Field introduced in 21.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `end_time` - Image upload end time. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `events` - Image events for image upload operation. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `fips_mode_transition_applicable` - Specifies whether fips mode can be enabled on this image. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `img_state` - Status of the image. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `migrations` - This field describes the api migration related information. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `progress` - Image upload progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 21.1.3. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_info` - Se package details. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_patch_name` - Mandatory serviceengine patch name that is applied along with this base image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_patch_ref` - It references the service engine patch associated with the uber image. It is a reference to an object of type image. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `start_time` - Image upload start time. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks_completed` - Completed set of tasks for image upload. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `total_tasks` - Total number of tasks for image upload. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `type` - Type of the image patch/system. Enum options - IMAGE_TYPE_PATCH, IMAGE_TYPE_SYSTEM, IMAGE_TYPE_MUST_CHECK. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uber_bundle` - Status to check if the image is an uber bundle. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_inventoryfaultconfig.html.markdown b/website/docs/d/avi_inventoryfaultconfig.html.markdown
index 8d2901f23..3656bdb3b 100644
--- a/website/docs/d/avi_inventoryfaultconfig.html.markdown
+++ b/website/docs/d/avi_inventoryfaultconfig.html.markdown
@@ -32,11 +32,11 @@ data "avi_inventoryfaultconfig" "foo_inventoryfaultconfig" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `controller_faults` - Configure controller faults. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Name. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `serviceengine_faults` - Configure serviceengine faults. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Tenant. It is a reference to an object of type tenant. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid auto generated. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `virtualservice_faults` - Configure virtualservice faults. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_faults` - Configure controller faults. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `serviceengine_faults` - Configure serviceengine faults. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant. It is a reference to an object of type tenant. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid auto generated. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `virtualservice_faults` - Configure virtualservice faults. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_ipaddrgroup.html.markdown b/website/docs/d/avi_ipaddrgroup.html.markdown
index f2d285c88..71b83d19a 100644
--- a/website/docs/d/avi_ipaddrgroup.html.markdown
+++ b/website/docs/d/avi_ipaddrgroup.html.markdown
@@ -32,17 +32,17 @@ data "avi_ipaddrgroup" "foo_ipaddrgroup" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `addrs` - Configure ip address(es). Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `country_codes` - Populate the ip address ranges from the geo database for this country. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ip_ports` - Configure (ip address, port) tuple(s). Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `marathon_app_name` - Populate ip addresses from tasks of this marathon app. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `marathon_service_port` - Task port associated with marathon service port. If marathon app has multiple service ports, this is required. Else, the first task port is used. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name of the ip address group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `prefixes` - Configure ip address prefix(es). Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ranges` - Configure ip address range(s). Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the ip address group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `addrs` - Configure ip address(es). Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `country_codes` - Populate the ip address ranges from the geo database for this country. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ip_ports` - Configure (ip address, port) tuple(s). Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `marathon_app_name` - Populate ip addresses from tasks of this marathon app. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `marathon_service_port` - Task port associated with marathon service port. If marathon app has multiple service ports, this is required. Else, the first task port is used. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the ip address group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `prefixes` - Configure ip address prefix(es). Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ranges` - Configure ip address range(s). Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the ip address group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_ipamdnsproviderprofile.html.markdown b/website/docs/d/avi_ipamdnsproviderprofile.html.markdown
index 960741b9e..389a72f1e 100644
--- a/website/docs/d/avi_ipamdnsproviderprofile.html.markdown
+++ b/website/docs/d/avi_ipamdnsproviderprofile.html.markdown
@@ -32,21 +32,21 @@ data "avi_ipamdnsproviderprofile" "foo_ipamdnsproviderprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `allocate_ip_in_vrf` - If this flag is set, only allocate ip from networks in the virtual service vrf. Applicable for avi vantage ipam only. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `aws_profile` - Provider details if type is aws. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `azure_profile` - Provider details if type is microsoft azure. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `custom_profile` - Provider details if type is custom. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `gcp_profile` - Provider details if type is google cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `infoblox_profile` - Provider details if type is infoblox. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `internal_profile` - Provider details if type is avi. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name for the ipam/dns provider profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `oci_profile` - Provider details for oracle cloud. Field introduced in 18.2.1,18.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `openstack_profile` - Provider details if type is openstack. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `proxy_configuration` - Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tencent_profile` - Provider details for tencent cloud. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - Provider type for the ipam/dns provider profile. Enum options - IPAMDNS_TYPE_INFOBLOX, IPAMDNS_TYPE_AWS, IPAMDNS_TYPE_OPENSTACK, IPAMDNS_TYPE_GCP, IPAMDNS_TYPE_INFOBLOX_DNS, IPAMDNS_TYPE_CUSTOM, IPAMDNS_TYPE_CUSTOM_DNS, IPAMDNS_TYPE_AZURE, IPAMDNS_TYPE_OCI, IPAMDNS_TYPE_TENCENT, IPAMDNS_TYPE_INTERNAL, IPAMDNS_TYPE_INTERNAL_DNS, IPAMDNS_TYPE_AWS_DNS, IPAMDNS_TYPE_AZURE_DNS. Allowed in enterprise edition with any value, essentials edition(allowed values- ipamdns_type_internal), basic edition(allowed values- ipamdns_type_internal), enterprise with cloud services edition.
-* `uuid` - Uuid of the ipam/dns provider profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `allocate_ip_in_vrf` - If this flag is set, only allocate ip from networks in the virtual service vrf. Applicable for avi ipam only. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `aws_profile` - Provider details if type is aws. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `azure_profile` - Provider details if type is microsoft azure. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `custom_profile` - Provider details if type is custom. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `gcp_profile` - Provider details if type is google cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `infoblox_profile` - Provider details if type is infoblox. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `internal_profile` - Provider details if type is avi. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name for the ipam/dns provider profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `oci_profile` - Provider details for oracle cloud. Field introduced in 18.2.1,18.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `openstack_profile` - Provider details if type is openstack. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `proxy_configuration` - Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tencent_profile` - Provider details for tencent cloud. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - Provider type for the ipam/dns provider profile. Enum options - IPAMDNS_TYPE_INFOBLOX, IPAMDNS_TYPE_AWS, IPAMDNS_TYPE_OPENSTACK, IPAMDNS_TYPE_GCP, IPAMDNS_TYPE_INFOBLOX_DNS, IPAMDNS_TYPE_CUSTOM, IPAMDNS_TYPE_CUSTOM_DNS, IPAMDNS_TYPE_AZURE, IPAMDNS_TYPE_OCI, IPAMDNS_TYPE_TENCENT, IPAMDNS_TYPE_INTERNAL, IPAMDNS_TYPE_INTERNAL_DNS, IPAMDNS_TYPE_AWS_DNS, IPAMDNS_TYPE_AZURE_DNS. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- ipamdns_type_internal), basic (allowed values- ipamdns_type_internal) edition.
+* `uuid` - Uuid of the ipam/dns provider profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_ipreputationdb.html.markdown b/website/docs/d/avi_ipreputationdb.html.markdown
index c450a1032..728cdfbc2 100644
--- a/website/docs/d/avi_ipreputationdb.html.markdown
+++ b/website/docs/d/avi_ipreputationdb.html.markdown
@@ -32,15 +32,18 @@ data "avi_ipreputationdb" "foo_ipreputationdb" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `base_file_refs` - Ip reputation db base file. It is a reference to an object of type fileobject. Field introduced in 20.1.1. Maximum of 1 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Description. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `incremental_file_refs` - Ip reputation db incremental update files. It is a reference to an object of type fileobject. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Ip reputation db name. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `service_status` - If this object is managed by the ip reputation service, this field contain the status of this syncronization. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of this object. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vendor` - Organization providing ip reputation data. Enum options - IP_REPUTATION_VENDOR_WEBROOT. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `version` - A version number for this database object. This is informal for the consumer of this api only, a tool which manages this object can store version information here. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `base_file_refs` - Ip reputation db base file. It is a reference to an object of type fileobject. Field introduced in 20.1.1. Maximum of 1 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `base_file_v6_refs` - Ip reputation db base file for ipv6. It is a reference to an object of type fileobject. Field introduced in 31.1.1. Maximum of 1 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Description. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `incremental_file_refs` - Ip reputation db incremental update files. It is a reference to an object of type fileobject. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `incremental_file_v6_refs` - Ip reputation db incremental update files for ipv6. It is a reference to an object of type fileobject. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Ip reputation db name. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_status` - If this object is managed by the ip reputation service, this field contain the status of this syncronization. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of this object. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `v6_version` - A version number for ipv6 files for the object. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vendor` - Organization providing ip reputation data. Enum options - IP_REPUTATION_VENDOR_WEBROOT. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `version` - A version number for this database object. This is informal for the consumer of this api only, a tool which manages this object can store version information here. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_jwtserverprofile.html.markdown b/website/docs/d/avi_jwtserverprofile.html.markdown
index 7e8e5d000..f8e30fdf2 100644
--- a/website/docs/d/avi_jwtserverprofile.html.markdown
+++ b/website/docs/d/avi_jwtserverprofile.html.markdown
@@ -32,13 +32,13 @@ data "avi_jwtserverprofile" "foo_jwtserverprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `controller_internal_auth` - Jwt auth configuration for profile_type controller_internal_auth. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `is_federated` - This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster. If the field is set to true, then the object is replicated across the federation. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `issuer` - Uniquely identifiable name of the token issuer, only allowed with profile_type client_auth. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `jwks_keys` - Jwks key set used for validating the jwt, only allowed with profile_type client_auth. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `jwt_profile_type` - Type of jwt server profile which defines the usage type. Enum options - CLIENT_AUTH, CONTROLLER_INTERNAL_AUTH. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Name of the jwt profile. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid of the jwtprofile. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_internal_auth` - Jwt auth configuration for profile_type controller_internal_auth. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_federated` - This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster. If the field is set to true, then the object is replicated across the federation. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `issuer` - Uniquely identifiable name of the token issuer, only allowed with profile_type client_auth. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `jwks_keys` - Jwks key set used for validating the jwt, only allowed with profile_type client_auth. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `jwt_profile_type` - Type of jwt server profile which defines the usage type. Enum options - CLIENT_AUTH, CONTROLLER_INTERNAL_AUTH. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of the jwt profile. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid of the jwtprofile. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_l4policyset.html.markdown b/website/docs/d/avi_l4policyset.html.markdown
index 60cfae0d3..0c4325df8 100644
--- a/website/docs/d/avi_l4policyset.html.markdown
+++ b/website/docs/d/avi_l4policyset.html.markdown
@@ -32,13 +32,13 @@ data "avi_l4policyset" "foo_l4policyset" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `created_by` - Creator name. Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_internal_policy` - Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `l4_connection_policy` - Policy to apply when a new transport connection is setup. Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name of the l4 policy set. Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Id of the l4 policy set. Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - Creator name. Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_internal_policy` - Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `l4_connection_policy` - Policy to apply when a new transport connection is setup. Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the l4 policy set. Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Id of the l4 policy set. Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_labelgroup.html.markdown b/website/docs/d/avi_labelgroup.html.markdown
index 8eea53207..5d0835a24 100644
--- a/website/docs/d/avi_labelgroup.html.markdown
+++ b/website/docs/d/avi_labelgroup.html.markdown
@@ -32,8 +32,8 @@ data "avi_labelgroup" "foo_labelgroup" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `labels` - List of allowed or suggested labels for the label group. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Name of the label group. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid of the label group. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `labels` - List of allowed or suggested labels for the label group. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of the label group. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid of the label group. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_licenseledgerdetails.html.markdown b/website/docs/d/avi_licenseledgerdetails.html.markdown
index 94ba2920b..80cd7c0c5 100644
--- a/website/docs/d/avi_licenseledgerdetails.html.markdown
+++ b/website/docs/d/avi_licenseledgerdetails.html.markdown
@@ -32,8 +32,8 @@ data "avi_licenseledgerdetails" "foo_licenseledgerdetails" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `escrow_infos` - Maintain information about reservation against cookie. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_infos` - Maintain information about consumed licenses against se_uuid. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tier_usages` - License usage per tier. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid for reference. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `escrow_infos` - Maintain information about reservation against cookie. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_infos` - Maintain information about consumed licenses against se_uuid. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tier_usages` - License usage per tier. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid for reference. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_licensestatus.html.markdown b/website/docs/d/avi_licensestatus.html.markdown
index 68fb6ec29..fd77b0a87 100644
--- a/website/docs/d/avi_licensestatus.html.markdown
+++ b/website/docs/d/avi_licensestatus.html.markdown
@@ -32,10 +32,9 @@ data "avi_licensestatus" "foo_licensestatus" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `essentials_enforced_at` - License enforcement date when we upgrade controller to 31.1.1 and license tier is essential before upgrade. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `saas_status` - Saas licensing status. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `service_update` - Pulse license service update. Field introduced in 21.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_uuid` - Tenant uuid. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `saas_status` - Saas licensing status. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `service_update` - Pulse license service update. Field introduced in 21.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_uuid` - Tenant uuid. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_localworkerfdsversion.html.markdown b/website/docs/d/avi_localworkerfdsversion.html.markdown
new file mode 100644
index 000000000..bc14f2bae
--- /dev/null
+++ b/website/docs/d/avi_localworkerfdsversion.html.markdown
@@ -0,0 +1,40 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "AVI: avi_localworkerfdsversion"
+sidebar_current: "docs-avi-datasource-localworkerfdsversion"
+description: |-
+  Get information of Avi LocalWorkerFdsVersion.
+---
+
+# avi_localworkerfdsversion
+
+This data source is used to to get avi_localworkerfdsversion objects.
+
+## Example Usage
+
+```hcl
+data "avi_localworkerfdsversion" "foo_localworkerfdsversion" {
+    uuid = "localworkerfdsversion-f9cf6b3e-a411-436f-95e2-2982ba2b217b"
+    name = "foo"
+}
+```
+
+## Argument Reference
+
+* `name` - (Optional) Search LocalWorkerFdsVersion by name.
+* `uuid` - (Optional) Search LocalWorkerFdsVersion by uuid.
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `name` - Default glw fds version name. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `timeline` - Fds timeline maintained by glw. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Default glw fds version uuid. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `version` - Fds version maintained by glw. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/d/avi_memorybalancerrequest.html.markdown b/website/docs/d/avi_memorybalancerrequest.html.markdown
index 6212eb018..69de74eb8 100644
--- a/website/docs/d/avi_memorybalancerrequest.html.markdown
+++ b/website/docs/d/avi_memorybalancerrequest.html.markdown
@@ -32,13 +32,13 @@ data "avi_memorybalancerrequest" "foo_memorybalancerrequest" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `controller_info` - Current details regarding controller. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Name of controller process. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `node_uuid` - Uuid of node. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `process_info` - Current process information of the controller process. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `process_instance` - Instance of the controller process. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Uuid of tenant object. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `timestamp` - Time at which memory balancer request was created/updated. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid of memory balancer request object. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_info` - Current details regarding controller. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of controller process. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `node_uuid` - Uuid of node. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `process_info` - Current process information of the controller process. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `process_instance` - Instance of the controller process. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Uuid of tenant object. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `timestamp` - Time at which memory balancer request was created/updated. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid of memory balancer request object. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_microservicegroup.html.markdown b/website/docs/d/avi_microservicegroup.html.markdown
index 1e3792287..78c0a2a78 100644
--- a/website/docs/d/avi_microservicegroup.html.markdown
+++ b/website/docs/d/avi_microservicegroup.html.markdown
@@ -32,11 +32,11 @@ data "avi_microservicegroup" "foo_microservicegroup" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `created_by` - Creator name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Name of the microservice group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `service_refs` - Configure microservice(es). It is a reference to an object of type microservice. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the microservice group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - Creator name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the microservice group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_refs` - Configure microservice(es). It is a reference to an object of type microservice. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the microservice group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_natpolicy.html.markdown b/website/docs/d/avi_natpolicy.html.markdown
index cda3646e1..7cd802325 100644
--- a/website/docs/d/avi_natpolicy.html.markdown
+++ b/website/docs/d/avi_natpolicy.html.markdown
@@ -32,12 +32,12 @@ data "avi_natpolicy" "foo_natpolicy" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `created_by` - Creator name. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name of the nat policy. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `rules` - Nat policy rules. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the nat policy. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - Creator name. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the nat policy. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rules` - Nat policy rules. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the nat policy. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_network.html.markdown b/website/docs/d/avi_network.html.markdown
index 9edf859fe..07b5c37ff 100644
--- a/website/docs/d/avi_network.html.markdown
+++ b/website/docs/d/avi_network.html.markdown
@@ -34,19 +34,19 @@ data "avi_network" "foo_network" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `attrs` - Key/value network attributes. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `configured_subnets` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dhcp_enabled` - Select the ip address management scheme for this network. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `exclude_discovered_subnets` - When selected, excludes all discovered subnets in this network from consideration for virtual service placement. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ip6_autocfg_enabled` - Enable ipv6 auto configuration. Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `synced_from_se` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_dvs` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vimgrnw_ref` - It is a reference to an object of type vimgrnwruntime. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `vrf_context_ref` - It is a reference to an object of type vrfcontext. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `attrs` - Key/value network attributes. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configured_subnets` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dhcp_enabled` - Select the ip address management scheme for this network. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `exclude_discovered_subnets` - When selected, excludes all discovered subnets in this network from consideration for virtual service placement. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ip6_autocfg_enabled` - Enable ipv6 auto configuration. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `synced_from_se` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_dvs` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vimgrnw_ref` - It is a reference to an object of type vimgrnwruntime. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vrf_context_ref` - It is a reference to an object of type vrfcontext. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_networkprofile.html.markdown b/website/docs/d/avi_networkprofile.html.markdown
index 171c9a23b..dca44fb35 100644
--- a/website/docs/d/avi_networkprofile.html.markdown
+++ b/website/docs/d/avi_networkprofile.html.markdown
@@ -32,12 +32,12 @@ data "avi_networkprofile" "foo_networkprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `connection_mirror` - When enabled, avi mirrors all tcp fastpath connections to standby. Applicable only in legacy ha mode. Field introduced in 18.1.3,18.2.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic, enterprise with cloud services edition.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - The name of the network profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `profile` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the network profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `connection_mirror` - When enabled, avi mirrors all tcp fastpath connections to standby. Applicable only in legacy ha mode. Field introduced in 18.1.3,18.2.1. Allowed with any value in enterprise, basic, enterprise with cloud services edition. Allowed in essentials (allowed values- false) edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - The name of the network profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `profile` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the network profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_networksecuritypolicy.html.markdown b/website/docs/d/avi_networksecuritypolicy.html.markdown
index 479778fde..0bd974dee 100644
--- a/website/docs/d/avi_networksecuritypolicy.html.markdown
+++ b/website/docs/d/avi_networksecuritypolicy.html.markdown
@@ -32,16 +32,16 @@ data "avi_networksecuritypolicy" "foo_networksecuritypolicy" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `cloud_config_cksum` - Checksum of cloud configuration for network sec policy. Internally set by cloud connector. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `created_by` - Creator name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `geo_db_ref` - Geo database. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `internal` - Network security policy is created and modified by internal modules only. Should not be modified by users. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ip_reputation_db_ref` - Ip reputation database. It is a reference to an object of type ipreputationdb. Field introduced in 20.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `rules` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `cloud_config_cksum` - Checksum of cloud configuration for network sec policy. Internally set by cloud connector. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - Creator name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `geo_db_ref` - Geo database. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `internal` - Network security policy is created and modified by internal modules only. Should not be modified by users. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ip_reputation_db_ref` - Ip reputation database. It is a reference to an object of type ipreputationdb. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rules` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_networkservice.html.markdown b/website/docs/d/avi_networkservice.html.markdown
index 17f9eef01..5adf65a53 100644
--- a/website/docs/d/avi_networkservice.html.markdown
+++ b/website/docs/d/avi_networkservice.html.markdown
@@ -34,14 +34,14 @@ data "avi_networkservice" "foo_networkservice" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `cloud_ref` - It is a reference to an object of type cloud. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name of the networkservice. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `routing_service` - Routing information of the networkservice. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_group_ref` - Service engine group to which the service is applied. It is a reference to an object of type serviceenginegroup. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `service_type` - Indicates the type of networkservice. Enum options - ROUTING_SERVICE. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the networkservice. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vrf_ref` - Vrf context to which the service is scoped. It is a reference to an object of type vrfcontext. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - It is a reference to an object of type cloud. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the networkservice. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `routing_service` - Routing information of the networkservice. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_group_ref` - Service engine group to which the service is applied. It is a reference to an object of type serviceenginegroup. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_type` - Indicates the type of networkservice. Enum options - ROUTING_SERVICE. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the networkservice. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vrf_ref` - Vrf context to which the service is scoped. It is a reference to an object of type vrfcontext. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_nsxtsegmentruntime.html.markdown b/website/docs/d/avi_nsxtsegmentruntime.html.markdown
index f922c04cc..5ede1b764 100644
--- a/website/docs/d/avi_nsxtsegmentruntime.html.markdown
+++ b/website/docs/d/avi_nsxtsegmentruntime.html.markdown
@@ -34,25 +34,25 @@ data "avi_nsxtsegmentruntime" "foo_nsxtsegmentruntime" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `cloud_ref` - Nsxt segment belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dhcp6_ranges` - V6 dhcp ranges configured in nsxt. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dhcp_enabled` - Ip address management scheme for this segment associated network. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dhcp_ranges` - Dhcp ranges configured in nsxt. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Segment object name. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nw_name` - Network name. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nw_ref` - Corresponding network object in avi. It is a reference to an object of type network. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `opaque_network_id` - Opaque network id. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `origin_id` - Origin id applicable to security only cloud. Field introduced in 22.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `security_only_nsxt` - Nsxt segment belongs to security only cloud. Field introduced in 22.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `segment_gw` - Segment gateway. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `segment_gw6` - V6 segment gateway. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `segment_id` - Segment id. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `segname` - Segment name. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `subnet` - Segment cidr. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `subnet6` - V6 segment cidr. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - Nsxt segment belongs to tenant. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tier1_id` - Tier1 router id. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vlan_ids` - Segment vlan ids. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vrf_context_ref` - Corresponding vrf context object in avi. It is a reference to an object of type vrfcontext. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - Nsxt segment belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dhcp6_ranges` - V6 dhcp ranges configured in nsxt. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dhcp_enabled` - Ip address management scheme for this segment associated network. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dhcp_ranges` - Dhcp ranges configured in nsxt. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Segment object name. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nw_name` - Network name. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nw_ref` - Corresponding network object in avi. It is a reference to an object of type network. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `opaque_network_id` - Opaque network id. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `origin_id` - Origin id applicable to security only cloud. Field introduced in 22.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `security_only_nsxt` - Nsxt segment belongs to security only cloud. Field introduced in 22.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `segment_gw` - Segment gateway. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `segment_gw6` - V6 segment gateway. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `segment_id` - Segment id. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `segname` - Segment name. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `subnet` - Segment cidr. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `subnet6` - V6 segment cidr. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Nsxt segment belongs to tenant. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tier1_id` - Tier1 router id. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vlan_ids` - Segment vlan ids. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vrf_context_ref` - Corresponding vrf context object in avi. It is a reference to an object of type vrfcontext. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_pkiprofile.html.markdown b/website/docs/d/avi_pkiprofile.html.markdown
index 6fe2fc332..64c4c07e8 100644
--- a/website/docs/d/avi_pkiprofile.html.markdown
+++ b/website/docs/d/avi_pkiprofile.html.markdown
@@ -32,17 +32,17 @@ data "avi_pkiprofile" "foo_pkiprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `allow_pki_errors` - Exempt errors during certificate verification. Enum options - ALLOW_EXPIRED_CRL, ALLOW_ALL_ERRORS. Field introduced in 30.1.1. Maximum of 1 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ca_certs` - List of certificate authorities (root and intermediate) trusted that is used for certificate validation. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `created_by` - Creator name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `crl_check` - When enabled, avi will verify via crl checks that certificates in the trust chain have not been revoked. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `crl_file_refs` - Refers to fileobject containing crl body. It is a reference to an object of type fileobject. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ignore_peer_chain` - When enabled, avi will not trust intermediate and root certs presented by a client. Instead, only the chain certs configured in the certificate authority section will be used to verify trust of the client's cert. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition. Special default for essentials edition is true, basic edition is true, enterprise is false.
-* `is_federated` - This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name of the pki profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `validate_only_leaf_crl` - When enabled, avi will only validate the revocation status of the leaf certificate using crl. To enable validation for the entire chain, disable this option and provide all the relevant crls. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
+* `allow_pki_errors` - Exempt errors during certificate verification. Enum options - ALLOW_EXPIRED_CRL, ALLOW_ALL_ERRORS. Field introduced in 30.1.1. Maximum of 1 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ca_certs` - List of certificate authorities (root and intermediate) trusted that is used for certificate validation. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - Creator name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `crl_check` - When enabled, avi will verify via crl checks that certificates in the trust chain have not been revoked. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `crl_file_refs` - Refers to fileobject containing crl body. It is a reference to an object of type fileobject. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ignore_peer_chain` - When enabled, avi will not trust intermediate and root certs presented by a client. Instead, only the chain certs configured in the certificate authority section will be used to verify trust of the client's cert. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition. Special default for essentials edition is true, basic edition is true, enterprise edition is false.
+* `is_federated` - This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the pki profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `validate_only_leaf_crl` - When enabled, avi will only validate the revocation status of the leaf certificate using crl. To enable validation for the entire chain, disable this option and provide all the relevant crls. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
 
diff --git a/website/docs/d/avi_pool.html.markdown b/website/docs/d/avi_pool.html.markdown
index 7cbb44a0a..b1e075bcb 100644
--- a/website/docs/d/avi_pool.html.markdown
+++ b/website/docs/d/avi_pool.html.markdown
@@ -34,78 +34,79 @@ data "avi_pool" "foo_pool" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `analytics_policy` - Determines analytics settings for the pool. Field introduced in 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `analytics_profile_ref` - Specifies settings related to analytics. It is a reference to an object of type analyticsprofile. Field introduced in 18.1.4,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `append_port` - Allows the option to append port to hostname in the host header while sending a request to the server. By default, port is appended for non-default ports. This setting will apply for pool's 'rewrite host header to server name', 'rewrite host header to sni' features and server's 'rewrite host header' settings as well as http healthmonitors attached to pools. Enum options - NON_DEFAULT_80_443, NEVER, ALWAYS. Field introduced in 21.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- never), basic edition(allowed values- never), enterprise with cloud services edition. Special default for essentials edition is never, basic edition is never, enterprise is non_default_80_443.
-* `application_persistence_profile_ref` - Persistence will ensure the same user sticks to the same server for a desired duration of time. It is a reference to an object of type applicationpersistenceprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `autoscale_launch_config_ref` - If configured then avi will trigger orchestration of pool server creation and deletion. It is a reference to an object of type autoscalelaunchconfig. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `autoscale_networks` - Network ids for the launch configuration. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `autoscale_policy_ref` - Reference to server autoscale policy. It is a reference to an object of type serverautoscalepolicy. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `capacity_estimation` - Inline estimation of capacity of servers. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `capacity_estimation_ttfb_thresh` - The maximum time-to-first-byte of a server. Allowed values are 1-5000. Special values are 0 - automatic. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `cloud_config_cksum` - Checksum of cloud configuration for pool. Internally set by cloud connector. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `conn_pool_properties` - Connnection pool properties. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `connection_ramp_duration` - Duration for which new connections will be gradually ramped up to a server recently brought online. Useful for lb algorithms that are least connection based. Allowed values are 1-300. Special values are 0 - immediate. Unit is min. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition. Special default for essentials edition is 0, basic edition is 0, enterprise is 10.
-* `created_by` - Creator name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `default_server_port` - Traffic sent to servers will use this destination server port unless overridden by the server's specific port attribute. The ssl checkbox enables avi to server encryption. Allowed values are 1-65535. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `delete_server_on_dns_refresh` - Indicates whether existing ips are disabled(false) or deleted(true) on dns hostname refreshdetail -- on a dns refresh, some ips set on pool may no longer be returned by the resolver. These ips are deleted from the pool when this knob is set to true. They are disabled, if the knob is set to false. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `description` - A description of the pool. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `domain_name` - Comma separated list of domain names which will be used to verify the common names or subject alternative names presented by server certificates. It is performed only when common name check host_check_enabled is enabled. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `east_west` - Inherited config from virtualservice. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_http2` - Enable http/2 for traffic from virtualservice to all backend servers in this pool. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `enabled` - Enable or disable the pool. Disabling will terminate all open connections and pause health monitors. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `external_autoscale_groups` - Names of external auto-scale groups for pool servers. Currently available only for aws and azure. Field introduced in 17.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fail_action` - Enable an action - close connection, http redirect or local http response - when a pool failure happens. By default, a connection will be closed, in case the pool experiences a failure. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fewest_tasks_feedback_delay` - Periodicity of feedback for fewest tasks server selection algorithm. Allowed values are 1-300. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `graceful_disable_timeout` - Used to gracefully disable a server. Virtual service waits for the specified time before terminating the existing connections  to the servers that are disabled. Allowed values are 1-7200. Special values are 0 - immediate, -1 - infinite. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `graceful_hm_down_disable_timeout` - Time interval for gracefully closing the connections on server, when health monitoring marks the server down. Allowed values are 1-432000. Special values are 0 - immediate, -1 - infinite. Field introduced in 30.2.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gslb_sp_enabled` - Indicates if the pool is a site-persistence pool. Field introduced in 17.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `health_monitor_refs` - Verify server health by applying one or more health monitors. Active monitors generate synthetic traffic from each service engine and mark a server up or down based on the response. The passive monitor listens only to client to server communication. It raises or lowers the ratio of traffic destined to a server based on successful responses. It is a reference to an object of type healthmonitor. Maximum of 50 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `horizon_profile` - Horizon uag configuration. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `host_check_enabled` - Enable common name check for server certificate. If enabled and no explicit domain name is specified, avi will use the incoming host header to do the match. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `http2_properties` - Http2 pool properties. 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.
-* `ignore_server_port` - Ignore the server port in building the load balancing state.applicable only for consistent hash load balancing algorithm or disable port translation (use_service_port) use cases. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `inline_health_monitor` - The passive monitor will monitor client to server connections and requests and adjust traffic load to servers based on successful responses. This may alter the expected behavior of the lb method, such as round robin. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ipaddrgroup_ref` - Use list of servers from ip address group. It is a reference to an object of type ipaddrgroup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `lb_algo_rr_per_se` - Do round robin load load balancing at se level instead of the default per core load balancing. Field introduced in 21.1.5, 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `lb_algorithm` - The load balancing algorithm will pick a server within the pool's list of available servers. Values lb_algorithm_nearest_server and lb_algorithm_topology are only allowed for gslb pool. Enum options - LB_ALGORITHM_LEAST_CONNECTIONS, LB_ALGORITHM_ROUND_ROBIN, LB_ALGORITHM_FASTEST_RESPONSE, LB_ALGORITHM_CONSISTENT_HASH, LB_ALGORITHM_LEAST_LOAD, LB_ALGORITHM_FEWEST_SERVERS, LB_ALGORITHM_RANDOM, LB_ALGORITHM_FEWEST_TASKS, LB_ALGORITHM_NEAREST_SERVER, LB_ALGORITHM_CORE_AFFINITY, LB_ALGORITHM_TOPOLOGY. Allowed in enterprise edition with any value, essentials edition(allowed values- lb_algorithm_least_connections,lb_algorithm_round_robin,lb_algorithm_consistent_hash), basic edition(allowed values- lb_algorithm_least_connections,lb_algorithm_round_robin,lb_algorithm_consistent_hash), enterprise with cloud services edition.
-* `lb_algorithm_consistent_hash_hdr` - Http header name to be used for the hash key. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `lb_algorithm_core_nonaffinity` - Degree of non-affinity for core affinity based server selection. Allowed values are 1-65535. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials edition(allowed values- 2), basic edition(allowed values- 2), enterprise with cloud services edition.
-* `lb_algorithm_hash` - Criteria used as a key for determining the hash between the client and  server. Enum options - LB_ALGORITHM_CONSISTENT_HASH_SOURCE_IP_ADDRESS, LB_ALGORITHM_CONSISTENT_HASH_SOURCE_IP_ADDRESS_AND_PORT, LB_ALGORITHM_CONSISTENT_HASH_URI, LB_ALGORITHM_CONSISTENT_HASH_CUSTOM_HEADER, LB_ALGORITHM_CONSISTENT_HASH_CUSTOM_STRING, LB_ALGORITHM_CONSISTENT_HASH_CALLID. Allowed in enterprise edition with any value, essentials edition(allowed values- lb_algorithm_consistent_hash_source_ip_address), basic edition(allowed values- lb_algorithm_consistent_hash_source_ip_address), enterprise with cloud services edition.
-* `lookup_server_by_name` - Allow server lookup by name. Field introduced in 17.1.11,17.2.4. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `max_concurrent_connections_per_server` - The maximum number of concurrent connections allowed to each server within the pool. Note  applied value will be no less than the number of service engines that the pool is placed on. If set to 0, no limit is applied. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_conn_rate_per_server` - Rate limit connections to each server. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `min_health_monitors_up` - Minimum number of health monitors in up state to mark server up. Field introduced in 18.2.1, 17.2.12. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `min_servers_up` - Minimum number of servers in up state for marking the pool up. Field introduced in 18.2.1, 17.2.12. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - The name of the pool. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `networks` - (internal-use) networks designated as containing servers for this pool. The servers may be further narrowed down by a filter. This field is used internally by avi, not editable by the user. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nsx_securitygroup` - A list of nsx groups where the servers for the pool are created. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pki_profile_ref` - Avi will validate the ssl certificate present by a server against the selected pki profile. It is a reference to an object of type pkiprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `placement_networks` - Manually select the networks and subnets used to provide reachability to the pool's servers. Specify the subnet using the following syntax  10-1-1-0/24. Use static routes in vrf configuration when pool servers are not directly connected but routable from the service engine. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pool_type` - Type or purpose, the pool is to be used for. Enum options - POOL_TYPE_GENERIC_APP, POOL_TYPE_OAUTH. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `request_queue_depth` - Minimum number of requests to be queued when pool is full. Allowed in enterprise edition with any value, essentials edition(allowed values- 128), basic edition(allowed values- 128), enterprise with cloud services edition.
-* `request_queue_enabled` - Enable request queue when pool is full. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `resolve_pool_by_dns` - This field is used as a flag to create a job for jobmanager. Field introduced in 18.2.10,20.1.2. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `rewrite_host_header_to_server_name` - Rewrite incoming host header to server name of the server to which the request is proxied. Enabling this feature rewrites host header for requests to all servers in the pool. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `rewrite_host_header_to_sni` - If sni server name is specified, rewrite incoming host header to the sni server name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `routing_pool` - Enable to do routing when this pool is selected to send traffic. No servers present in routing pool. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `server_disable_type` - Server graceful disable timeout behaviour. Enum options - DISALLOW_NEW_CONNECTION, ALLOW_NEW_CONNECTION_IF_PERSISTENCE_PRESENT. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `server_name` - Fully qualified dns hostname which will be used in the tls sni extension in server connections if sni is enabled. If no value is specified, avi will use the incoming host header instead. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `server_reselect` - Server reselect configuration for http requests. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `server_timeout` - Server timeout value specifies the time within which a server connection needs to be established and a request-response exchange completes between avi and the server. Value of 0 results in using default timeout of 60 minutes. Allowed values are 0-21600000. Field introduced in 18.1.5,18.2.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `servers` - The pool directs load balanced traffic to this list of destination servers. The servers can be configured by ip address, name, network or via ip address group. Maximum of 5000 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `service_metadata` - Metadata pertaining to the service provided by this pool. In openshift/kubernetes environments, app metadata info is stored. Any user input to this field will be overwritten by avi vantage. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sni_enabled` - Enable tls sni for server connections. If disabled, avi will not send the sni extension as part of the handshake. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sp_gs_info` - Gslb service associated with the site persistence pool. 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.
-* `ssl_key_and_certificate_ref` - Service engines will present a client ssl certificate to the server. It is a reference to an object of type sslkeyandcertificate. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssl_profile_ref` - When enabled, avi re-encrypts traffic to the backend servers. The specific ssl profile defines which ciphers and ssl versions will be supported. It is a reference to an object of type sslprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tier1_lr` - This tier1_lr field should be set same as virtualservice associated for nsx-t. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `use_service_port` - Do not translate the client's destination port when sending the connection to the server. Monitor port needs to be specified for health monitors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic, enterprise with cloud services edition.
-* `use_service_ssl_mode` - This applies only when use_service_port is set to true. If enabled, ssl mode of the connection to the server is decided by the ssl mode on the virtualservice service port, on which the request was received. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid of the pool. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vrf_ref` - Virtual routing context that the pool is bound to. This is used to provide the isolation of the set of networks the pool is attached to. The pool inherits the virtual routing context of the virtual service, and this field is used only internally, and is set by pb-transform. It is a reference to an object of type vrfcontext. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `analytics_policy` - Determines analytics settings for the pool. Field introduced in 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `analytics_profile_ref` - Specifies settings related to analytics. It is a reference to an object of type analyticsprofile. Field introduced in 18.1.4,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `append_port` - Allows the option to append port to hostname in the host header while sending a request to the server. By default, port is appended for non-default ports. This setting will apply for pool's 'rewrite host header to server name', 'rewrite host header to sni' features and server's 'rewrite host header' settings as well as http healthmonitors attached to pools. Enum options - NON_DEFAULT_80_443, NEVER, ALWAYS. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- never), basic (allowed values- never) edition. Special default for essentials edition is never, basic edition is never, enterprise edition is non_default_80_443.
+* `application_persistence_profile_ref` - Persistence will ensure the same user sticks to the same server for a desired duration of time. It is a reference to an object of type applicationpersistenceprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `autoscale_launch_config_ref` - If configured then avi will trigger orchestration of pool server creation and deletion. It is a reference to an object of type autoscalelaunchconfig. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `autoscale_networks` - Network ids for the launch configuration. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `autoscale_policy_ref` - Reference to server autoscale policy. It is a reference to an object of type serverautoscalepolicy. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `capacity_estimation` - Inline estimation of capacity of servers. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `capacity_estimation_ttfb_thresh` - The maximum time-to-first-byte of a server. Allowed values are 1-5000. Special values are 0 - automatic. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `cloud_config_cksum` - Checksum of cloud configuration for pool. Internally set by cloud connector. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `conn_pool_properties` - Connnection pool properties. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `connection_ramp_duration` - Duration for which new connections will be gradually ramped up to a server recently brought online. Useful for lb algorithms that are least connection based. Allowed values are 1-300. Special values are 0 - immediate. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition. Special default for essentials edition is 0, basic edition is 0, enterprise edition is 10.
+* `created_by` - Creator name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `default_server_port` - Traffic sent to servers will use this destination server port unless overridden by the server's specific port attribute. The ssl checkbox enables avi to server encryption. Allowed values are 1-65535. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `delete_server_on_dns_refresh` - Indicates whether existing ips are disabled(false) or deleted(true) on dns hostname refreshdetail -- on a dns refresh, some ips set on pool may no longer be returned by the resolver. These ips are deleted from the pool when this knob is set to true. They are disabled, if the knob is set to false. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `description` - A description of the pool. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `domain_name` - Comma separated list of domain names which will be used to verify the common names or subject alternative names presented by server certificates. It is performed only when common name check host_check_enabled is enabled. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `east_west` - Inherited config from virtualservice. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_http2` - Enable http/2 for traffic from virtualservice to all backend servers in this pool. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `enabled` - Enable or disable the pool. Disabling will terminate all open connections and pause health monitors. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `external_autoscale_groups` - Names of external auto-scale groups for pool servers. Currently available only for aws and azure. Field introduced in 17.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fail_action` - Enable an action - close connection, http redirect or local http response - when a pool failure happens. By default, a connection will be closed, in case the pool experiences a failure. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fewest_tasks_feedback_delay` - Periodicity of feedback for fewest tasks server selection algorithm. Allowed values are 1-300. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `graceful_disable_timeout` - Used to gracefully disable a server. Virtual service waits for the specified time before terminating the existing connections  to the servers that are disabled. Not used anymore .graceful_disable_timeout_sec is introduced. Allowed values are 1-7200. Special values are 0 - immediate, -1 - infinite. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `graceful_disable_timeout_sec` - Used to gracefully disable a server. Virtual service waits for the specified time before terminating the existing connections  to the servers that are disabled. Allowed values are 1-432000. Special values are 0 - immediate, -1 - infinite. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `graceful_hm_down_disable_timeout` - Time interval for gracefully closing the connections on server, when health monitoring marks the server down. Allowed values are 1-432000. Special values are 0 - immediate, -1 - infinite. Field introduced in 30.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gslb_sp_enabled` - Indicates if the pool is a site-persistence pool. Field introduced in 17.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `health_monitor_refs` - Verify server health by applying one or more health monitors. Active monitors generate synthetic traffic from each service engine and mark a server up or down based on the response. The passive monitor listens only to client to server communication. It raises or lowers the ratio of traffic destined to a server based on successful responses. It is a reference to an object of type healthmonitor. Maximum of 50 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `horizon_profile` - Horizon uag configuration. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `host_check_enabled` - Enable common name check for server certificate. If enabled and no explicit domain name is specified, avi will use the incoming host header to do the match. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `http2_properties` - Http2 pool properties. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ignore_server_port` - Ignore the server port in building the load balancing state.applicable only for consistent hash load balancing algorithm or disable port translation (use_service_port) use cases. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `inline_health_monitor` - The passive monitor will monitor client to server connections and requests and adjust traffic load to servers based on successful responses. This may alter the expected behavior of the lb method, such as round robin. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ipaddrgroup_ref` - Use list of servers from ip address group. It is a reference to an object of type ipaddrgroup. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `lb_algo_rr_per_se` - Do load balancing at se level instead of the default per core load balancing. Field introduced in 21.1.5, 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `lb_algorithm` - The load balancing algorithm will pick a server within the pool's list of available servers. Values lb_algorithm_nearest_server and lb_algorithm_topology are only allowed for gslb pool. Enum options - LB_ALGORITHM_LEAST_CONNECTIONS, LB_ALGORITHM_ROUND_ROBIN, LB_ALGORITHM_FASTEST_RESPONSE, LB_ALGORITHM_CONSISTENT_HASH, LB_ALGORITHM_LEAST_LOAD, LB_ALGORITHM_FEWEST_SERVERS, LB_ALGORITHM_RANDOM, LB_ALGORITHM_FEWEST_TASKS, LB_ALGORITHM_NEAREST_SERVER, LB_ALGORITHM_CORE_AFFINITY, LB_ALGORITHM_TOPOLOGY. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- lb_algorithm_least_connections,lb_algorithm_round_robin,lb_algorithm_consistent_hash), basic (allowed values- lb_algorithm_least_connections,lb_algorithm_round_robin,lb_algorithm_consistent_hash) edition.
+* `lb_algorithm_consistent_hash_hdr` - Http header name to be used for the hash key. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `lb_algorithm_core_nonaffinity` - Degree of non-affinity for core affinity based server selection. Allowed values are 1-65535. Field introduced in 17.1.3. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 2), basic (allowed values- 2) edition.
+* `lb_algorithm_hash` - Criteria used as a key for determining the hash between the client and  server. Enum options - LB_ALGORITHM_CONSISTENT_HASH_SOURCE_IP_ADDRESS, LB_ALGORITHM_CONSISTENT_HASH_SOURCE_IP_ADDRESS_AND_PORT, LB_ALGORITHM_CONSISTENT_HASH_URI, LB_ALGORITHM_CONSISTENT_HASH_CUSTOM_HEADER, LB_ALGORITHM_CONSISTENT_HASH_CUSTOM_STRING, LB_ALGORITHM_CONSISTENT_HASH_CALLID. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- lb_algorithm_consistent_hash_source_ip_address), basic (allowed values- lb_algorithm_consistent_hash_source_ip_address) edition.
+* `lookup_server_by_name` - Allow server lookup by name. Field introduced in 17.1.11,17.2.4. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_concurrent_connections_per_server` - The maximum number of concurrent connections allowed to each server within the pool. Note  applied value will be no less than the number of service engines that the pool is placed on. If set to 0, no limit is applied. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_conn_rate_per_server` - Rate limit connections to each server. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `min_health_monitors_up` - Minimum number of health monitors in up state to mark server up. Field introduced in 18.2.1, 17.2.12. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `min_servers_up` - Minimum number of servers in up state for marking the pool up. Field introduced in 18.2.1, 17.2.12. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - The name of the pool. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `networks` - (internal-use) networks designated as containing servers for this pool. The servers may be further narrowed down by a filter. This field is used internally by avi, not editable by the user. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nsx_securitygroup` - A list of nsx groups where the servers for the pool are created. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pki_profile_ref` - Avi will validate the ssl certificate present by a server against the selected pki profile. It is a reference to an object of type pkiprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `placement_networks` - Manually select the networks and subnets used to provide reachability to the pool's servers. Specify the subnet using the following syntax  10-1-1-0/24. Use static routes in vrf configuration when pool servers are not directly connected but routable from the service engine. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pool_type` - Type or purpose, the pool is to be used for. Enum options - POOL_TYPE_GENERIC_APP, POOL_TYPE_OAUTH. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `request_queue_depth` - Minimum number of requests to be queued when pool is full. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 128), basic (allowed values- 128) edition.
+* `request_queue_enabled` - Enable request queue when pool is full. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `resolve_pool_by_dns` - This field is used as a flag to create a job for jobmanager. Field introduced in 18.2.10,20.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rewrite_host_header_to_server_name` - Rewrite incoming host header to server name of the server to which the request is proxied. Enabling this feature rewrites host header for requests to all servers in the pool. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rewrite_host_header_to_sni` - If sni server name is specified, rewrite incoming host header to the sni server name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `routing_pool` - Enable to do routing when this pool is selected to send traffic. No servers present in routing pool. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `server_disable_type` - Server graceful disable timeout behaviour. Enum options - DISALLOW_NEW_CONNECTION, ALLOW_NEW_CONNECTION_IF_PERSISTENCE_PRESENT. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `server_name` - Fully qualified dns hostname which will be used in the tls sni extension in server connections if sni is enabled. If no value is specified, avi will use the incoming host header instead. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `server_reselect` - Server reselect configuration for http requests. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `server_timeout` - Server timeout value specifies the time within which a server connection needs to be established and a request-response exchange completes between avi and the server. Value of 0 results in using default timeout of 60 minutes. Allowed values are 0-21600000. Field introduced in 18.1.5,18.2.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `servers` - The pool directs load balanced traffic to this list of destination servers. The servers can be configured by ip address, name, network or via ip address group. Maximum of 5000 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_metadata` - Metadata pertaining to the service provided by this pool. In openshift/kubernetes environments, app metadata info is stored. Any user input to this field will be overwritten by avi vantage. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sni_enabled` - Enable tls sni for server connections. If disabled, avi will not send the sni extension as part of the handshake. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sp_gs_info` - Gslb service associated with the site persistence pool. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_key_and_certificate_ref` - Service engines will present a client ssl certificate to the server. It is a reference to an object of type sslkeyandcertificate. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_profile_ref` - When enabled, avi re-encrypts traffic to the backend servers. The specific ssl profile defines which ciphers and ssl versions will be supported. It is a reference to an object of type sslprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tier1_lr` - This tier1_lr field should be set same as virtualservice associated for nsx-t. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_service_port` - Do not translate the client's destination port when sending the connection to the server. Monitor port needs to be specified for health monitors. Allowed with any value in enterprise, basic, enterprise with cloud services edition. Allowed in essentials (allowed values- false) edition.
+* `use_service_ssl_mode` - This applies only when use_service_port is set to true. If enabled, ssl mode of the connection to the server is decided by the ssl mode on the virtualservice service port, on which the request was received. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid of the pool. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vrf_ref` - Virtual routing context that the pool is bound to. This is used to provide the isolation of the set of networks the pool is attached to. The pool inherits the virtual routing context of the virtual service, and this field is used only internally, and is set by pb-transform. It is a reference to an object of type vrfcontext. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_poolgroup.html.markdown b/website/docs/d/avi_poolgroup.html.markdown
index ac8b504a7..2c15e4e06 100644
--- a/website/docs/d/avi_poolgroup.html.markdown
+++ b/website/docs/d/avi_poolgroup.html.markdown
@@ -34,21 +34,21 @@ data "avi_poolgroup" "foo_poolgroup" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `cloud_config_cksum` - Checksum of cloud configuration for poolgroup. Internally set by cloud connector. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `created_by` - Name of the user who created the object. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `deactivate_primary_pool_on_down` - Deactivate primary pool for selection when down until it is activated by user via clear poolgroup command. Field introduced in 20.1.7, 21.1.2, 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `deployment_policy_ref` - When setup autoscale manager will automatically promote new pools into production when deployment goals are met. It is a reference to an object of type poolgroupdeploymentpolicy. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - Description of pool group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fail_action` - Enable an action - close connection, http redirect, or local http response - when a pool group failure happens. By default, a connection will be closed, in case the pool group experiences a failure. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `implicit_priority_labels` - Whether an implicit set of priority labels is generated. Field introduced in 17.1.9,17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `members` - List of pool group members object of type poolgroupmember. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `min_servers` - The minimum number of servers to distribute traffic to. Allowed values are 1-65535. Special values are 0 - disable. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `name` - The name of the pool group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `priority_labels_ref` - Uuid of the priority labels. If not provided, pool group member priority label will be interpreted as a number with a larger number considered higher priority. It is a reference to an object of type prioritylabels. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `service_metadata` - Metadata pertaining to the service provided by this poolgroup. In openshift/kubernetes environments, app metadata info is stored. Any user input to this field will be overwritten by avi vantage. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the pool group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `cloud_config_cksum` - Checksum of cloud configuration for poolgroup. Internally set by cloud connector. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - Name of the user who created the object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `deactivate_primary_pool_on_down` - Deactivate primary pool for selection when down until it is activated by user via clear poolgroup command. Field introduced in 20.1.7, 21.1.2, 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `deployment_policy_ref` - When setup autoscale manager will automatically promote new pools into production when deployment goals are met. It is a reference to an object of type poolgroupdeploymentpolicy. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - Description of pool group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fail_action` - Enable an action - close connection, http redirect, or local http response - when a pool group failure happens. By default, a connection will be closed, in case the pool group experiences a failure. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `implicit_priority_labels` - Whether an implicit set of priority labels is generated. Field introduced in 17.1.9,17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `members` - List of pool group members object of type poolgroupmember. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `min_servers` - The minimum number of servers to distribute traffic to. Allowed values are 1-65535. Special values are 0 - disable. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `name` - The name of the pool group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `priority_labels_ref` - Uuid of the priority labels. If not provided, pool group member priority label will be interpreted as a number with a larger number considered higher priority. It is a reference to an object of type prioritylabels. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `service_metadata` - Metadata pertaining to the service provided by this poolgroup. In openshift/kubernetes environments, app metadata info is stored. Any user input to this field will be overwritten by avi vantage. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the pool group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_poolgroupdeploymentpolicy.html.markdown b/website/docs/d/avi_poolgroupdeploymentpolicy.html.markdown
index 2a1adf749..6895f0a78 100644
--- a/website/docs/d/avi_poolgroupdeploymentpolicy.html.markdown
+++ b/website/docs/d/avi_poolgroupdeploymentpolicy.html.markdown
@@ -32,17 +32,17 @@ data "avi_poolgroupdeploymentpolicy" "foo_poolgroupdeploymentpolicy" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `auto_disable_old_prod_pools` - It will automatically disable old production pools once there is a new production candidate. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `evaluation_duration` - Duration of evaluation period for automatic deployment. Allowed values are 60-86400. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - The name of the pool group deployment policy. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `rules` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scheme` - Deployment scheme. Enum options - BLUE_GREEN, CANARY. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `target_test_traffic_ratio` - Target traffic ratio before pool is made production. Allowed values are 1-100. Unit is ratio. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `test_traffic_ratio_rampup` - Ratio of the traffic that is sent to the pool under test. Test ratio of 100 means blue green. Allowed values are 1-100. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the pool group deployment policy. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `webhook_ref` - Webhook configured with url that avi controller will pass back information about pool group, old and new pool information and current deployment rule results. It is a reference to an object of type webhook. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `auto_disable_old_prod_pools` - It will automatically disable old production pools once there is a new production candidate. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `evaluation_duration` - Duration of evaluation period for automatic deployment. Allowed values are 60-86400. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - The name of the pool group deployment policy. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rules` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scheme` - Deployment scheme. Enum options - BLUE_GREEN, CANARY. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `target_test_traffic_ratio` - Target traffic ratio before pool is made production. Allowed values are 1-100. Unit is ratio. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `test_traffic_ratio_rampup` - Ratio of the traffic that is sent to the pool under test. Test ratio of 100 means blue green. Allowed values are 1-100. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the pool group deployment policy. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `webhook_ref` - Webhook configured with url that avi controller will pass back information about pool group, old and new pool information and current deployment rule results. It is a reference to an object of type webhook. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_prioritylabels.html.markdown b/website/docs/d/avi_prioritylabels.html.markdown
index de0e74847..d7f462133 100644
--- a/website/docs/d/avi_prioritylabels.html.markdown
+++ b/website/docs/d/avi_prioritylabels.html.markdown
@@ -34,12 +34,12 @@ data "avi_prioritylabels" "foo_prioritylabels" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `cloud_ref` - It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - A description of the priority labels. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `equivalent_labels` - Equivalent priority labels in descending order. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - The name of the priority labels. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the priority labels. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - A description of the priority labels. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `equivalent_labels` - Equivalent priority labels in descending order. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - The name of the priority labels. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the priority labels. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_protocolparser.html.markdown b/website/docs/d/avi_protocolparser.html.markdown
index 12fb12f5c..a92356707 100644
--- a/website/docs/d/avi_protocolparser.html.markdown
+++ b/website/docs/d/avi_protocolparser.html.markdown
@@ -32,11 +32,11 @@ data "avi_protocolparser" "foo_protocolparser" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Description of the protocol parser. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name of the protocol parser. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `parser_code` - Command script provided inline. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - Tenant uuid of the protocol parser. It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the protocol parser. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Description of the protocol parser. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the protocol parser. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `parser_code` - Command script provided inline. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Tenant uuid of the protocol parser. It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the protocol parser. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_retentionpolicy.html.markdown b/website/docs/d/avi_retentionpolicy.html.markdown
new file mode 100644
index 000000000..192ff6ee4
--- /dev/null
+++ b/website/docs/d/avi_retentionpolicy.html.markdown
@@ -0,0 +1,42 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "AVI: avi_retentionpolicy"
+sidebar_current: "docs-avi-datasource-retentionpolicy"
+description: |-
+  Get information of Avi RetentionPolicy.
+---
+
+# avi_retentionpolicy
+
+This data source is used to to get avi_retentionpolicy objects.
+
+## Example Usage
+
+```hcl
+data "avi_retentionpolicy" "foo_retentionpolicy" {
+    uuid = "retentionpolicy-f9cf6b3e-a411-436f-95e2-2982ba2b217b"
+    name = "foo"
+}
+```
+
+## Argument Reference
+
+* `name` - (Optional) Search RetentionPolicy by name.
+* `uuid` - (Optional) Search RetentionPolicy by uuid.
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `enabled` - Enables the policy. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `history` - History of previous runs. Field introduced in 31.1.1. Maximum of 10 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the policy. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `policy` - Policy specification. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `summary` - Details of most recent run. Field introduced in 31.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid identifier for the policy. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/d/avi_rmcloudopsproto.html.markdown b/website/docs/d/avi_rmcloudopsproto.html.markdown
index 3703457c3..1355511f4 100644
--- a/website/docs/d/avi_rmcloudopsproto.html.markdown
+++ b/website/docs/d/avi_rmcloudopsproto.html.markdown
@@ -32,9 +32,10 @@ data "avi_rmcloudopsproto" "foo_rmcloudopsproto" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `last_queried_se_creation_limit` - The most recent value of concurrent se creation limit from cloudconnectorstatus. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Cloud name. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pending_se_creation_count` - Number of se creations in progress. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pending_vnic_op_count` - Number of vnic operations in progress (both add and delete). Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Cloud uuid. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `last_queried_se_creation_limit` - The most recent value of concurrent se creation limit from cloudconnectorstatus. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Cloud name. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pending_se_creation_count` - Number of se creations in progress. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pending_vnic_op_count` - Number of vnic operations in progress (both add and delete). Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_create_limit_reached` - Se creation limit reached. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Cloud uuid. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_role.html.markdown b/website/docs/d/avi_role.html.markdown
index 59ae2fe02..d1f41220d 100644
--- a/website/docs/d/avi_role.html.markdown
+++ b/website/docs/d/avi_role.html.markdown
@@ -32,11 +32,11 @@ data "avi_role" "foo_role" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `allow_unlabelled_access` - Allow access to unlabelled objects. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `filters` - Filters for granular object access control based on object labels. Multiple filters are merged using the and operator. If empty, all objects according to the privileges will be accessible to the user. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `privileges` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `allow_unlabelled_access` - Allow access to unlabelled objects. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `filters` - Filters for granular object access control based on object labels. Multiple filters are merged using the and operator. If empty, all objects according to the privileges will be accessible to the user. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `privileges` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_scheduler.html.markdown b/website/docs/d/avi_scheduler.html.markdown
index 18336e7d9..5a72e6240 100644
--- a/website/docs/d/avi_scheduler.html.markdown
+++ b/website/docs/d/avi_scheduler.html.markdown
@@ -32,17 +32,17 @@ data "avi_scheduler" "foo_scheduler" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `backup_config_ref` - Backup configuration to be executed by this scheduler. It is a reference to an object of type backupconfiguration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `enabled` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `end_date_time` - Scheduler end date and time. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `frequency` - Frequency at which custom scheduler will run. Allowed values are 0-60. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `frequency_unit` - Unit at which custom scheduler will run. Enum options - SCHEDULER_FREQUENCY_UNIT_MIN, SCHEDULER_FREQUENCY_UNIT_HOUR, SCHEDULER_FREQUENCY_UNIT_DAY, SCHEDULER_FREQUENCY_UNIT_WEEK, SCHEDULER_FREQUENCY_UNIT_MONTH. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Name of scheduler. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `run_mode` - Scheduler run mode. Enum options - RUN_MODE_PERIODIC, RUN_MODE_AT, RUN_MODE_NOW. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `run_script_ref` - Control script to be executed by this scheduler. It is a reference to an object of type alertscriptconfig. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scheduler_action` - Define scheduler action. Enum options - SCHEDULER_ACTION_RUN_A_SCRIPT, SCHEDULER_ACTION_BACKUP. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `start_date_time` - Scheduler start date and time. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `backup_config_ref` - Backup configuration to be executed by this scheduler. It is a reference to an object of type backupconfiguration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enabled` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `end_date_time` - Scheduler end date and time. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `frequency` - Frequency at which custom scheduler will run. Allowed values are 0-60. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `frequency_unit` - Unit at which custom scheduler will run. Enum options - SCHEDULER_FREQUENCY_UNIT_MIN, SCHEDULER_FREQUENCY_UNIT_HOUR, SCHEDULER_FREQUENCY_UNIT_DAY, SCHEDULER_FREQUENCY_UNIT_WEEK, SCHEDULER_FREQUENCY_UNIT_MONTH. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of scheduler. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `run_mode` - Scheduler run mode. Enum options - RUN_MODE_PERIODIC, RUN_MODE_AT, RUN_MODE_NOW. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `run_script_ref` - Control script to be executed by this scheduler. It is a reference to an object of type alertscriptconfig. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scheduler_action` - Define scheduler action. Enum options - SCHEDULER_ACTION_RUN_A_SCRIPT, SCHEDULER_ACTION_BACKUP. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `start_date_time` - Scheduler start date and time. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_securitymanagerdata.html.markdown b/website/docs/d/avi_securitymanagerdata.html.markdown
index d6908535d..1cdc50686 100644
--- a/website/docs/d/avi_securitymanagerdata.html.markdown
+++ b/website/docs/d/avi_securitymanagerdata.html.markdown
@@ -32,8 +32,8 @@ data "avi_securitymanagerdata" "foo_securitymanagerdata" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `app_learning_info` - Information about various applications. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Virtualservice name. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Virtualservice uuid. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `app_learning_info` - Information about various applications. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Virtualservice name. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Virtualservice uuid. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_securitypolicy.html.markdown b/website/docs/d/avi_securitypolicy.html.markdown
index 510ddd383..d7c3869b4 100644
--- a/website/docs/d/avi_securitypolicy.html.markdown
+++ b/website/docs/d/avi_securitypolicy.html.markdown
@@ -32,17 +32,17 @@ data "avi_securitypolicy" "foo_securitypolicy" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Security policy is used to specify various configuration information used to perform distributed denial of service (ddos) attacks detection and mitigation. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dns_amplification_denyports` - Source ports and port ranges to deny in dns amplification attacks. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dns_attacks` - Attacks utilizing the dns protocol operations. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dns_policy_index` - Index of the dns policy to use for the mitigation rules applied to the dns attacks. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - The name of the security policy. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `network_security_policy_index` - Index of the network security policy to use for the mitigation rules applied to the attacks. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `oper_mode` - Mode of dealing with the attacks - perform detection only, or detect and mitigate the attacks. Enum options - DETECTION, MITIGATION. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tcp_attacks` - Attacks utilizing the tcp protocol operations. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - Tenancy of the security policy. It is a reference to an object of type tenant. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `udp_attacks` - Attacks utilizing the udp protocol operations. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - The uuid of the security policy. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Security policy is used to specify various configuration information used to perform distributed denial of service (ddos) attacks detection and mitigation. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_amplification_denyports` - Source ports and port ranges to deny in dns amplification attacks. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_attacks` - Attacks utilizing the dns protocol operations. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_policy_index` - Index of the dns policy to use for the mitigation rules applied to the dns attacks. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - The name of the security policy. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `network_security_policy_index` - Index of the network security policy to use for the mitigation rules applied to the attacks. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `oper_mode` - Mode of dealing with the attacks - perform detection only, or detect and mitigate the attacks. Enum options - DETECTION, MITIGATION. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tcp_attacks` - Attacks utilizing the tcp protocol operations. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Tenancy of the security policy. It is a reference to an object of type tenant. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `udp_attacks` - Attacks utilizing the udp protocol operations. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - The uuid of the security policy. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_seproperties.html.markdown b/website/docs/d/avi_seproperties.html.markdown
index 2ed76e489..1df6d3097 100644
--- a/website/docs/d/avi_seproperties.html.markdown
+++ b/website/docs/d/avi_seproperties.html.markdown
@@ -32,9 +32,9 @@ data "avi_seproperties" "foo_seproperties" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `se_agent_properties` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_bootup_properties` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_runtime_properties` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_agent_properties` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_bootup_properties` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_runtime_properties` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_serverautoscalepolicy.html.markdown b/website/docs/d/avi_serverautoscalepolicy.html.markdown
index a6486ab91..c553cc83a 100644
--- a/website/docs/d/avi_serverautoscalepolicy.html.markdown
+++ b/website/docs/d/avi_serverautoscalepolicy.html.markdown
@@ -32,24 +32,24 @@ data "avi_serverautoscalepolicy" "foo_serverautoscalepolicy" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `delay_for_server_garbage_collection` - Delay in minutes after which a down server will be removed from pool. Value 0 disables this functionality. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `intelligent_autoscale` - Use avi intelligent autoscale algorithm where autoscale is performed by comparing load on the pool against estimated capacity of all the servers. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `intelligent_scalein_margin` - Maximum extra capacity as percentage of load used by the intelligent scheme. Scale-in is triggered when available capacity is more than this margin. Allowed values are 1-99. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `intelligent_scaleout_margin` - Minimum extra capacity as percentage of load used by the intelligent scheme. Scale-out is triggered when available capacity is less than this margin. Allowed values are 1-99. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `max_scalein_adjustment_step` - Maximum number of servers to scale-in simultaneously. The actual number of servers to scale-in is chosen such that target number of servers is always more than or equal to the min_size. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_scaleout_adjustment_step` - Maximum number of servers to scale-out simultaneously. The actual number of servers to scale-out is chosen such that target number of servers is always less than or equal to the max_size. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_size` - Maximum number of servers after scale-out. Allowed values are 0-400. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `min_size` - No scale-in happens once number of operationally up servers reach min_servers. Allowed values are 0-400. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scalein_alertconfig_refs` - Trigger scale-in when alerts due to any of these alert configurations are raised. It is a reference to an object of type alertconfig. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scalein_cooldown` - Cooldown period during which no new scale-in is triggered to allow previous scale-in to successfully complete. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scaleout_alertconfig_refs` - Trigger scale-out when alerts due to any of these alert configurations are raised. It is a reference to an object of type alertconfig. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scaleout_cooldown` - Cooldown period during which no new scale-out is triggered to allow previous scale-out to successfully complete. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scheduled_scalings` - Scheduled-based scale-in/out policy. During scheduled intervals, metrics based autoscale is not enabled and number of servers will be solely derived from schedulescale policy. Field introduced in 21.1.1. Maximum of 1 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `use_predicted_load` - Use predicted load rather than current load. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `delay_for_server_garbage_collection` - Delay in minutes after which a down server will be removed from pool. Value 0 disables this functionality. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `intelligent_autoscale` - Use avi intelligent autoscale algorithm where autoscale is performed by comparing load on the pool against estimated capacity of all the servers. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `intelligent_scalein_margin` - Maximum extra capacity as percentage of load used by the intelligent scheme. Scale-in is triggered when available capacity is more than this margin. Allowed values are 1-99. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `intelligent_scaleout_margin` - Minimum extra capacity as percentage of load used by the intelligent scheme. Scale-out is triggered when available capacity is less than this margin. Allowed values are 1-99. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_scalein_adjustment_step` - Maximum number of servers to scale-in simultaneously. The actual number of servers to scale-in is chosen such that target number of servers is always more than or equal to the min_size. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_scaleout_adjustment_step` - Maximum number of servers to scale-out simultaneously. The actual number of servers to scale-out is chosen such that target number of servers is always less than or equal to the max_size. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_size` - Maximum number of servers after scale-out. Allowed values are 0-400. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `min_size` - No scale-in happens once number of operationally up servers reach min_servers. Allowed values are 0-400. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scalein_alertconfig_refs` - Trigger scale-in when alerts due to any of these alert configurations are raised. It is a reference to an object of type alertconfig. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scalein_cooldown` - Cooldown period during which no new scale-in is triggered to allow previous scale-in to successfully complete. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scaleout_alertconfig_refs` - Trigger scale-out when alerts due to any of these alert configurations are raised. It is a reference to an object of type alertconfig. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scaleout_cooldown` - Cooldown period during which no new scale-out is triggered to allow previous scale-out to successfully complete. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scheduled_scalings` - Scheduled-based scale-in/out policy. During scheduled intervals, metrics based autoscale is not enabled and number of servers will be solely derived from schedulescale policy. Field introduced in 21.1.1. Maximum of 1 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_predicted_load` - Use predicted load rather than current load. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_serviceauthprofile.html.markdown b/website/docs/d/avi_serviceauthprofile.html.markdown
index 86dbabba0..7e04d970b 100644
--- a/website/docs/d/avi_serviceauthprofile.html.markdown
+++ b/website/docs/d/avi_serviceauthprofile.html.markdown
@@ -32,11 +32,11 @@ data "avi_serviceauthprofile" "foo_serviceauthprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Description for the service auth profile. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Name of the service auth profile. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `service_oauth_profile` - Oauth profile - common endpoint information for service authentication. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Tenant ref for the service auth profile. It is a reference to an object of type tenant. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `type` - Type of the service auth profile. Enum options - SERVICE_AUTH_OAUTH. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid of the service auth profile. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 30.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Description for the service auth profile. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of the service auth profile. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `service_oauth_profile` - Oauth profile - common endpoint information for service authentication. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant ref for the service auth profile. It is a reference to an object of type tenant. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `type` - Type of the service auth profile. Enum options - SERVICE_AUTH_OAUTH. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid of the service auth profile. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_serviceengine.html.markdown b/website/docs/d/avi_serviceengine.html.markdown
index 7aa46758d..ecdae870a 100644
--- a/website/docs/d/avi_serviceengine.html.markdown
+++ b/website/docs/d/avi_serviceengine.html.markdown
@@ -34,22 +34,22 @@ data "avi_serviceengine" "foo_serviceengine" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `availability_zone` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `container_mode` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `container_type` - Enum options - container_type_bridge, container_type_host, container_type_host_dpdk. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `controller_created` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `controller_ip` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `data_vnics` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_state` - Inorder to disable se set this field appropriately. Enum options - SE_STATE_ENABLED, SE_STATE_DISABLED_FOR_PLACEMENT, SE_STATE_DISABLED, SE_STATE_DISABLED_FORCE. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `flavor` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `host_ref` - It is a reference to an object of type vimgrhostruntime. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `hypervisor` - Enum options - default, vmware_esx, kvm, vmware_vsan, xen. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `mgmt_vnic` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nsxt_no_hotplug` - If set to true, controller does not hotplugg the vnics. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `resources` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_group_ref` - It is a reference to an object of type serviceenginegroup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `availability_zone` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `container_mode` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `container_type` - Enum options - container_type_bridge, container_type_host, container_type_host_dpdk. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_created` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_ip` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `data_vnics` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_state` - Inorder to disable se set this field appropriately. Enum options - SE_STATE_ENABLED, SE_STATE_DISABLED_FOR_PLACEMENT, SE_STATE_DISABLED, SE_STATE_DISABLED_FORCE, SE_STATE_DISABLED_WITH_SCALEIN, SE_STATE_DISABLED_NO_TRAFFIC, SE_STATE_DISABLED_FORCE_WITH_MIGRATE. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `flavor` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `host_ref` - It is a reference to an object of type vimgrhostruntime. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `hypervisor` - Enum options - default, vmware_esx, kvm, vmware_vsan, xen. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mgmt_vnic` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nsxt_no_hotplug` - If set to true, controller does not hotplugg the vnics. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `resources` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_group_ref` - It is a reference to an object of type serviceenginegroup. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_serviceenginegroup.html.markdown b/website/docs/d/avi_serviceenginegroup.html.markdown
index 48514301b..3596b01dd 100644
--- a/website/docs/d/avi_serviceenginegroup.html.markdown
+++ b/website/docs/d/avi_serviceenginegroup.html.markdown
@@ -34,293 +34,299 @@ data "avi_serviceenginegroup" "foo_serviceenginegroup" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `accelerated_networking` - Enable accelerated networking option for azure se. Accelerated networking enables single root i/o virtualization (sr-iov) to a se vm. This improves networking performance. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `active_standby` - Service engines in active/standby mode for ha failover. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `aggressive_failure_detection` - Enable aggressive failover configuration for ha. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `algo` - In compact placement, virtual services are placed on existing ses until max_vs_per_se limit is reached. In distributed placement, virtual services are placed on new ses until max_se limit is reached. Once this limit is reached, virtual services are placed on ses with least load. Enum options - PLACEMENT_ALGO_PACKED, PLACEMENT_ALGO_DISTRIBUTED. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `allow_burst` - Allow ses to be created using burst license. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `app_cache_percent` - A percent value of total se memory reserved for applicationcaching. This is an se bootup property and requires se restart.requires se reboot. Allowed values are 0 - 100. Special values are 0- disable. Field introduced in 18.2.3. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition. Special default for essentials edition is 0, basic edition is 0, enterprise is 10.
-* `app_cache_threshold` - The max memory that can be allocated for the app cache. This value will act as an upper bound on the cache size specified in app_cache_percent. Special values are 0- disable. Field introduced in 20.1.1. Unit is gb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `app_learning_memory_percent` - A percent value of total se memory reserved for application learning. This is an se bootup property and requires se restart. Allowed values are 0 - 10. Field introduced in 18.2.3. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `archive_shm_limit` - Amount of se memory in gb until which shared memory is collected in core archive. Field introduced in 17.1.3. Unit is gb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `async_ssl` - Ssl handshakes will be handled by dedicated ssl threads.requires se reboot. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `async_ssl_threads` - Number of async ssl threads per se_dp.requires se reboot. Allowed values are 1-16. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `auto_rebalance` - If set, virtual services will be automatically migrated when load on an se is less than minimum or more than maximum thresholds. Only alerts are generated when the auto_rebalance is not set. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `auto_rebalance_capacity_per_se` - Capacities of se for auto rebalance for each criteria. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `auto_rebalance_criteria` - Set of criteria for se auto rebalance. Enum options - SE_AUTO_REBALANCE_CPU, SE_AUTO_REBALANCE_PPS, SE_AUTO_REBALANCE_MBPS, SE_AUTO_REBALANCE_OPEN_CONNS, SE_AUTO_REBALANCE_CPS. Field introduced in 17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `auto_rebalance_interval` - Frequency of rebalance, if 'auto rebalance' is enabled. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `auto_redistribute_active_standby_load` - Redistribution of virtual services from the takeover se to the replacement se can cause momentary traffic loss. If the auto-redistribute load option is left in its default off state, any desired rebalancing requires calls to rest api. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `availability_zone_refs` - Availability zones for virtual service high availability. It is a reference to an object of type availabilityzone. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `baremetal_dispatcher_handles_flows` - Control if dispatcher core also handles tcp flows in baremetal se. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `bgp_peer_monitor_failover_enabled` - Enable bgp peer monitoring based failover. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `bgp_state_update_interval` - Bgp peer state update interval. Allowed values are 5-100. Field introduced in 17.2.14,18.1.5,18.2.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `buffer_se` - Excess service engine capacity provisioned for ha failover. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `compress_ip_rules_for_each_ns_subnet` - Compress ip rules into a single subnet based ip rule for each north-south ipam subnet configured in pcap mode in openshift/kubernetes node. Field introduced in 18.2.9, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `config_debugs_on_all_cores` - Enable config debugs on all cores of se. Field introduced in 17.2.13,18.1.5,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `connection_memory_percentage` - Percentage of memory for connection state. This will come at the expense of memory used for http in-memory cache. Allowed values are 10-90. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `core_shm_app_cache` - Include shared memory for app cache in core file.requires se reboot. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `core_shm_app_learning` - Include shared memory for app learning in core file.requires se reboot. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cpu_reserve` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cpu_socket_affinity` - Allocate all the cpu cores for the service engine virtual machines  on the same cpu socket. Applicable only for vcenter cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `custom_securitygroups_data` - Custom security groups to be associated with data vnics for se instances in openstack and aws clouds. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `custom_securitygroups_mgmt` - Custom security groups to be associated with management vnic for se instances in openstack and aws clouds. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `custom_tag` - Custom tag will be used to create the tags for se instance in aws. Note this is not the same as the prefix for se name. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `data_network_id` - Subnet used to spin up the data nic for service engines, used only for azure cloud. Overrides the cloud level setting for service engine subnet. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `datascript_timeout` - Number of instructions before datascript times out. Allowed values are 0-100000000. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `deactivate_ipv6_discovery` - If activated, ipv6 address and route discovery are deactivated.requires se reboot. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `deactivate_kni_filtering_at_dispatcher` - Deactivate filtering of packets to kni interface. To be used under surveillance of avi support. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dedicated_dispatcher_core` - Dedicate the core that handles packet receive/transmit from the network to just the dispatching function. Don't use it for tcp/ip and ssl functions. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `disable_avi_securitygroups` - By default, avi creates and manages security groups along with custom sg provided by user. Set this to true to disallow avi to create and manage new security groups. Avi will only make use of custom security groups provided by user. This option is supported for aws and openstack cloud types. Field introduced in 17.2.13,18.1.4,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `disable_csum_offloads` - Stop using tcp/udp and ip checksum offload features of nics. Field introduced in 17.1.14, 17.2.5, 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `disable_flow_probes` - Disable flow probes for scaled out vs'es. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `disable_gro` - Disable generic receive offload (gro) in dpdk poll-mode driver packet receive path. Gro can be enabled on nics that do not support lro (large receive offload) or do not gain performance boost from lro. Gro is on by default on nics in a system with 8 vcpus or higher. Field introduced in 17.2.5, 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `disable_se_memory_check` - If set, disable the config memory check done in service engine. Field introduced in 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `disable_tso` - Disable tcp segmentation offload (tso) in dpdk poll-mode driver packet transmit path. Tso is on by default on nics that support it. Field introduced in 17.2.5, 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `disk_per_se` - Amount of disk space for each of the service engine virtual machines. Unit is gb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `distribute_load_active_standby` - Use both the active and standby service engines for virtual service placement in the legacy active standby ha mode. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `distribute_queues` - Distributes queue ownership among cores so multiple cores handle dispatcher duties. Requires se reboot. Deprecated from 18.2.8, instead use max_queues_per_vnic. Field introduced in 17.2.8. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `distribute_vnics` - Distributes vnic ownership among cores so multiple cores handle dispatcher duties.requires se reboot. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `downstream_send_timeout` - Timeout for downstream to become writable. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dp_aggressive_deq_interval_msec` - Dequeue interval for receive queue from se_dp in aggressive mode. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `dp_aggressive_enq_interval_msec` - Enqueue interval for request queue to se_dp in aggressive mode. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `dp_aggressive_hb_frequency` - Frequency of se - se hb messages when aggressive failure mode detection is enabled. Field introduced in 20.1.3. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dp_aggressive_hb_timeout_count` - Consecutive hb failures after which failure is reported to controller,when aggressive failure mode detection is enabled. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dp_deq_interval_msec` - Dequeue interval for receive queue from se_dp. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `dp_enq_interval_msec` - Enqueue interval for request queue to se_dp. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `dp_hb_frequency` - Frequency of se - se hb messages when aggressive failure mode detection is not enabled. Field introduced in 20.1.3. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dp_hb_timeout_count` - Consecutive hb failures after which failure is reported to controller, when aggressive failure mode detection is not enabled. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dpdk_gro_timeout_interval` - The timeout for gro coalescing interval. 0 indicates non-timer based gro. Allowed values are 0-900. Field introduced in 22.1.1. Unit is microseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_gratarp_permanent` - Enable gratarp for vip_ip. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_hsm_log` - Enable hsm luna engine logs. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_hsm_priming` - (this is a beta feature). Enable hsm key priming. If enabled, key handles on the hsm will be synced to se before processing client connections. Field introduced in 17.2.7, 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_multi_lb` - Applicable only for azure cloud with basic sku lb. If set, additional azure lbs will be automatically created if resources in existing lb are exhausted. Field introduced in 17.2.10, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_pcap_tx_ring` - Enable tx ring support in pcap mode of operation. Tso feature is not supported with tx ring enabled. Deprecated from 18.2.8, instead use pcap_tx_mode. Requires se reboot. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ephemeral_portrange_end` - End local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ephemeral_portrange_start` - Start local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `extra_config_multiplier` - Multiplier for extra config to support large vs/pool config. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `extra_shared_config_memory` - Extra config memory to support large geo db configuration. Field introduced in 17.1.1. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `flow_table_new_syn_max_entries` - Maximum number of flow table entries that have not completed tcp three-way handshake yet. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `free_list_size` - Number of entries in the free list. Field introduced in 17.2.10, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `gcp_config` - Google cloud platform, service engine group configuration. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gratarp_permanent_periodicity` - Gratarp periodicity for vip-ip. Allowed values are 5-30. Field introduced in 18.2.3. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `grpc_channel_connect_timeout` - Timeout in seconds that se waits for a grpc channel to connect to server, before it retries. Allowed values are 5-45. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gve_enabled` - Deploys google virtual ethernet (gve) - gvnic for all supported intances types in gcp. Applies only to newly created se's. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ha_mode` - High availability mode for all the virtual services using this service engine group. Enum options - HA_MODE_SHARED_PAIR, HA_MODE_SHARED, HA_MODE_LEGACY_ACTIVE_STANDBY. Allowed in enterprise edition with any value, essentials edition(allowed values- ha_mode_legacy_active_standby), basic edition(allowed values- ha_mode_legacy_active_standby), enterprise with cloud services edition. Special default for essentials edition is ha_mode_legacy_active_standby, basic edition is ha_mode_legacy_active_standby, enterprise is ha_mode_shared.
-* `handle_per_pkt_attack` - Configuration to handle per packet attack handling.for example, dns reflection attack is a type of attack where a response packet is sent to the dns vs.this configuration tells if such packets should be dropped without further processing. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `hardwaresecuritymodulegroup_ref` - It is a reference to an object of type hardwaresecuritymodulegroup. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `heap_minimum_config_memory` - Minimum required heap memory to apply any configuration. Allowed values are 0-100. Field introduced in 18.1.2. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `hm_on_standby` - Enable active health monitoring from the standby se for all placed virtual services. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition. Special default for essentials edition is false, basic edition is false, enterprise is true.
-* `host_attribute_key` - Key of a (key, value) pair identifying a label for a set of nodes usually in container clouds. Needs to be specified together with host_attribute_value. Ses can be configured differently including ha modes across different se groups. May also be used for isolation between different classes of virtualservices. Virtualservices' se group may be specified via annotations/labels. A openshift/kubernetes namespace maybe annotated with a matching se group label as openshift.io/node-selector  apptype=prod. When multiple se groups are used in a cloud with host attributes specified,just a single se group can exist as a match-all se group without a host_attribute_key. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `host_attribute_value` - Value of a (key, value) pair identifying a label for a set of nodes usually in container clouds. Needs to be specified together with host_attribute_key. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `host_gateway_monitor` - Enable the host gateway monitor when service engine is deployed as docker container. Disabled by default. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `http_rum_console_log` - Enable javascript console logs on the client browser when collecting client insights. Field introduced in 21.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `http_rum_min_content_length` - Minimum response size content length to sample for client insights. Field introduced in 21.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 64), basic edition(allowed values- 64), enterprise with cloud services edition.
-* `hybrid_rss_mode` - Toggles se hybrid only mode of operation in dpdk mode with rss configured;where-in each se datapath instance operates as a standalone hybrid instance performing both dispatcher and proxy function. Requires reboot. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `hypervisor` - Override default hypervisor. Enum options - DEFAULT, VMWARE_ESX, KVM, VMWARE_VSAN, XEN. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ignore_docker_mac_change` - Ignore docker mac change. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `ignore_rtt_threshold` - Ignore rtt samples if it is above threshold. Field introduced in 17.1.6,17.2.2. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ingress_access_data` - Program se security group ingress rules to allow vip data access from remote cidr type. Enum options - SG_INGRESS_ACCESS_NONE, SG_INGRESS_ACCESS_ALL, SG_INGRESS_ACCESS_VPC. Field introduced in 17.1.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ingress_access_mgmt` - Program se security group ingress rules to allow ssh/icmp management access from remote cidr type. Enum options - SG_INGRESS_ACCESS_NONE, SG_INGRESS_ACCESS_ALL, SG_INGRESS_ACCESS_VPC. Field introduced in 17.1.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `instance_flavor` - Instance/flavor name for se instance. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `instance_flavor_info` - Additional information associated with instance_flavor. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `iptables` - Iptable rules. Maximum of 128 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `kni_allowed_server_ports` - Port ranges for any servers running in inband linuxserver clouds. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `l7_conns_per_core` - Number of l7 connections that can be cached per core. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `l7_resvd_listen_conns_per_core` - Number of reserved l7 listener connections per core. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `labels` - Labels associated with this se group. Field introduced in 20.1.1. Maximum of 1 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `lbaction_num_requests_to_dispatch` - Number of requests to dispatch from the request. Queue at a regular interval. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `lbaction_rq_per_request_max_retries` - Maximum retries per request in the request queue. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `least_load_core_selection` - Select core with least load for new flow. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `license_tier` - Specifies the license tier which would be used. This field by default inherits the value from cloud. Enum options - ENTERPRISE_16, ENTERPRISE, ENTERPRISE_18, BASIC, ESSENTIALS, ENTERPRISE_WITH_CLOUD_SERVICES. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `license_type` - If no license type is specified then default license enforcement for the cloud type is chosen. Enum options - LIC_BACKEND_SERVERS, LIC_SOCKETS, LIC_CORES, LIC_HOSTS, LIC_SE_BANDWIDTH, LIC_METERED_SE_BANDWIDTH. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `log_agent_compress_logs` - Flag to indicate if log files are compressed upon full on the service engine. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_debug_enabled` - Enable debug logs by default on service engine. This includes all other debugging logs. Debug logs can also be explcitly enabled from the cli shell. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_file_sz_appl` - Maximum application log file size before rollover. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_file_sz_conn` - Maximum connection log file size before rollover. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_file_sz_debug` - Maximum debug log file size before rollover. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_file_sz_event` - Maximum event log file size before rollover. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_log_storage_min_sz` - Minimum storage allocated for logs irrespective of memory and cores. Field introduced in 21.1.1. Unit is mb. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_max_concurrent_rsync` - Maximum concurrent rsync requests initiated from log-agent to the controller. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_max_storage_excess_percent` - Excess percentage threshold of disk size to trigger cleanup of logs on the service engine. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_max_storage_ignore_percent` - Maximum storage on the disk not allocated for logs on the service engine. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_min_storage_per_vs` - Minimum storage allocated to any given virtualservice on the service engine. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_sleep_interval` - Internal timer to stall log-agent and prevent it from hogging cpu cycles on the service engine. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_trace_enabled` - Enable trace logs by default on service engine. Configuration operations are logged along with other important logs by service engine. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_unknown_vs_timer` - Timeout to purge unknown virtual service logs from the service engine. Field introduced in 21.1.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_disksz` - Maximum disk capacity (in mb) to be allocated to an se. This is exclusively used for debug and log data. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `log_malloc_failure` - Se will log memory allocation related failure to the se_trace file, wherever available. Field introduced in 20.1.2. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `log_message_max_file_list_size` - Maximum number of file names in a log message. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.7. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `max_concurrent_external_hm` - Maximum number of external health monitors that can run concurrently in a service engine. This helps control the cpu and memory use by external health monitors. Special values are 0- value will be internally calculated based on cpu and memory. Field introduced in 18.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_cpu_usage` - When cpu usage on an se exceeds this threshold, virtual services hosted on this se may be rebalanced to other ses to reduce load. A new se may be created as part of this process. Allowed values are 40-90. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_memory_per_mempool` - Max bytes that can be allocated in a single mempool. Field introduced in 18.1.5. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_num_http_sessions_to_store` - Maximum number of http session that will be created. Each session uses about 1kb in the key-value storage in shared memory. Setting this value too high can lead to exhaustion of shared memory and affect services. Allowed values are 1-2000000. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `max_num_se_dps` - Configures the maximum number of se_dp processes that handles traffic. If not configured, defaults to the number of cpus on the se. If decreased, it will only take effect after se reboot. Allowed values are 1-128. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `max_public_ips_per_lb` - Applicable to azure platform only. Maximum number of public ips per azure lb. Field introduced in 17.2.12, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_queues_per_vnic` - Maximum number of queues per vnic setting to '0' utilises all queues that are distributed across dispatcher cores. Allowed values are 0,1,2,4,8,16. Field introduced in 18.2.7, 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 1), basic edition(allowed values- 1), enterprise with cloud services edition.
-* `max_rules_per_lb` - Applicable to azure platform only. Maximum number of rules per azure lb. Field introduced in 17.2.12, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_scaleout_per_vs` - Maximum number of active service engines for the virtual service. Allowed values are 1-64. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_se` - Maximum number of services engines in this group. Allowed values are 0-1000. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_skb_frags` - Maximum of number of 4 kb pages allocated to the linux kernel gro subsystem for packet coalescing. This parameter is limited to supported kernels only. Requires se reboot. Allowed values are 1-17. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `max_vs_per_se` - Maximum number of virtual services that can be placed on a single service engine. Allowed values are 1-1000. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `mem_reserve` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `memory_for_config_update` - Indicates the percent of memory reserved for config updates. Allowed values are 0-100. Field introduced in 18.1.2. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `memory_per_se` - Amount of memory for each of the service engine virtual machines. Changes to this setting do not affect existing ses. Allowed values are 2048-262144. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `metrics_collection_mode` - Metrics collection mode, 0 = pull mode. Se_agent pulls metrics from se_dp,  1 = push mode. Se_dp pushes metrics to se_agent. 9 = special value to reset collection state in push mode. Allowed values are 0-1. Special values are 9- reset metrics collection state. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mgmt_network_ref` - Management network to use for avi service engines. It is a reference to an object of type network. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `mgmt_subnet` - Management subnet to use for avi service engines. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `min_cpu_usage` - When cpu usage on an se falls below the minimum threshold, virtual services hosted on the se may be consolidated onto other underutilized ses. After consolidation, unused service engines may then be eligible for deletion. Allowed values are 20-60. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `min_scaleout_per_vs` - Minimum number of active service engines for the virtual service. Allowed values are 1-64. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `min_se` - Minimum number of services engines in this group (relevant for se autorebalance only). Allowed values are 0-1000. Field introduced in 17.2.13,18.1.3,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `minimum_connection_memory` - Indicates the percent of memory reserved for connections. Allowed values are 0-100. Field introduced in 18.1.2. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `multicast_enable` - This knob enables the service engine to process multicast traffic(for vmware hypervisor). Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `n_log_streaming_threads` - Number of threads to use for log streaming. Allowed values are 1-100. Field introduced in 17.2.12, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `netlink_poller_threads` - Number of threads to poll for netlink messages excluding the thread for default namespace. Requires se reboot. Allowed values are 1-32. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `netlink_sock_buf_size` - Socket buffer size for the netlink sockets. Requires se reboot. Allowed values are 1-128. Field introduced in 21.1.1. Unit is mega_bytes. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ngx_free_connection_stack` - Free the connection stack. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `non_significant_log_throttle` - This setting limits the number of non-significant logs generated per second per core on this se. Default is 100 logs per second. Set it to zero (0) to deactivate throttling. Field introduced in 17.1.3. Unit is per_second. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ns_helper_deq_interval_msec` - Dequeue interval for receive queue from ns helper. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `ntp_sync_fail_event` - Toggle se ntp synchronization failure events generation. Disabled by default. Field introduced in 22.1.2. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `ntp_sync_status_interval` - Configures the interval at which se synchronization status with ntp server(s) is verified. A value of zero disables se ntp synchronization status validation. Allowed values are 120-900. Special values are 0- disable. Field introduced in 22.1.2. Unit is sec. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `num_dispatcher_cores` - Number of dispatcher cores (0,1,2,4,8 or 16). If set to 0, then number of dispatcher cores is deduced automatically.requires se reboot. Allowed values are 0,1,2,4,8,16. Field introduced in 17.2.12, 18.1.3, 18.2.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `num_dispatcher_queues` - Number of queues to each dispatcher. Allowed values are 1-2. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `num_flow_cores_sum_changes_to_ignore` - Number of changes in num flow cores sum to ignore. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `objsync_config` - Configuration knobs for interse object distribution. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `objsync_port` - Tcp port on se management interface for interse object distribution. Supported only for externally managed security groups. Not supported on full access deployments. Requires se reboot. Allowed values are 1024-65535. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `openstack_availability_zones` - Field introduced in 17.1.1. Maximum of 5 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `openstack_mgmt_network_name` - Avi management network name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `openstack_mgmt_network_uuid` - Management network uuid. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `os_reserved_memory` - Amount of extra memory to be reserved for use by the operating system on a service engine. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `path_mtu_discovery_v4` - Enable path mtu discovery feature for ipv4. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `path_mtu_discovery_v6` - Enable path mtu discovery feature for ipv6. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pcap_tx_mode` - Determines the pcap transmit mode of operation. Requires se reboot. Enum options - PCAP_TX_AUTO, PCAP_TX_SOCKET, PCAP_TX_RING. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pcap_tx_ring_rd_balancing_factor` - In pcap mode, reserve a configured portion of tx ring resources for itself and the remaining portion for the rx ring to achieve better balance in terms of queue depth. Requires se reboot. Allowed values are 10-100. Field introduced in 20.1.3. Unit is percent. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `per_app` - Per-app se mode is designed for deploying dedicated load balancers per app (vs). In this mode, each se is limited to a max of 2 vss. Vcpus in per-app ses count towards licensing usage at 25% rate. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `per_vs_admission_control` - Enable/disable per vs level admission control.enabling this feature will cause the connection and packet throttling on a particular vs that has high packet buffer consumption. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `placement_mode` - If placement mode is 'auto', virtual services are automatically placed on service engines. Enum options - PLACEMENT_MODE_AUTO. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `realtime_se_metrics` - Enable or deactivate real time se metrics. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `reboot_on_panic` - Reboot the vm or host on kernel panic. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `replay_vrf_routes_interval` - Routes in vrf are replayed at the specified interval. This should be increased if there are large number of routes. Allowed values are 0-3000. Field introduced in 22.1.3. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `resync_time_interval` - Time interval to re-sync se's time with wall clock time. Allowed values are 8-600000. Field introduced in 20.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sdb_flush_interval` - Sdb pipeline flush interval. Allowed values are 1-10000. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `sdb_pipeline_size` - Sdb pipeline size. Allowed values are 1-10000. 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.
-* `sdb_scan_count` - Sdb scan count. Allowed values are 1-1000. 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.
-* `se_bandwidth_type` - Select the se bandwidth for the bandwidth license. Enum options - SE_BANDWIDTH_UNLIMITED, SE_BANDWIDTH_25M, SE_BANDWIDTH_200M, SE_BANDWIDTH_1000M, SE_BANDWIDTH_10000M. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials edition(allowed values- se_bandwidth_unlimited), basic edition(allowed values- se_bandwidth_unlimited), enterprise with cloud services edition.
-* `se_debug_trace_sz` - Use to cap the size of debug ring min(se_debug_trace_sz, num_dispatcher_cores). Only applicable to > 8g systems. Requires se reboot. Allowed values are 1,2,4,8,255. Field introduced in 22.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_delayed_flow_delete` - Delay the cleanup of flowtable entry. To be used under surveillance of avi support. Field introduced in 20.1.2. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `se_deprovision_delay` - Duration to preserve unused service engine virtual machines before deleting them. If traffic to a virtual service were to spike up abruptly, this se would still be available to be utilized again rather than creating a new se. If this value is set to 0, controller will never delete any ses and administrator has to manually cleanup unused ses. Allowed values are 0-525600. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dos_profile` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dp_hm_drops` - Internal only. Used to simulate se - se hb failure. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_dp_if_state_poll_interval` - Number of jiffies between polling interface state. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `se_dp_isolation` - Toggle support to run se datapath instances in isolation on exclusive cpus. This improves latency and performance. However, this could reduce the total number of se_dp instances created on that se instance. Supported for >= 8 cpus. Requires se reboot. Field introduced in 20.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_dp_isolation_num_non_dp_cpus` - Number of cpus for non se-dp tasks in se datapath isolation mode. Translates total cpus minus 'num_non_dp_cpus' for datapath use. It is recommended to reserve an even number of cpus for hyper-threaded processors. Requires se reboot. Allowed values are 1-8. Special values are 0- auto. Field introduced in 20.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_dp_log_nf_enqueue_percent` - Internal buffer full indicator on the service engine beyond which the unfiltered logs are abandoned. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_dp_log_udf_enqueue_percent` - Internal buffer full indicator on the service engine beyond which the user filtered logs are abandoned. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_dp_max_hb_version` - The highest supported se-se heartbeat protocol version. This version is reported by secondary se to primary se in heartbeat response messages. Allowed values are 1-3. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dp_vnic_queue_stall_event_sleep` - Time (in seconds) service engine waits for after generating a vnic transmit queue stall event before resetting thenic. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dp_vnic_queue_stall_threshold` - Number of consecutive transmit failures to look for before generating a vnic transmit queue stall event. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dp_vnic_queue_stall_timeout` - Time (in milliseconds) to wait for network/nic recovery on detecting a transmit queue stall after which service engine resets the nic. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dp_vnic_restart_on_queue_stall_count` - Number of consecutive transmit queue stall events in se_dp_vnic_stall_se_restart_window to look for before restarting se. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dp_vnic_stall_se_restart_window` - Window of time (in seconds) during which se_dp_vnic_restart_on_queue_stall_count number of consecutive stalls results in a se restart. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dpdk_pmd` - Determines if dpdk pool mode driver should be used or not   0  automatically determine based on hypervisor/nic type 1  unconditionally use dpdk poll mode driver 2  don't use dpdk poll mode driver.requires se reboot. Allowed values are 0-2. Field introduced in 18.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dump_core_on_assert` - Enable core dump on assert. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `se_emulated_cores` - Use this to emulate more/less cpus than is actually available. One datapath process is started for each core. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `se_flow_probe_retries` - Flow probe retry count if no replies are received.requires se reboot. Allowed values are 0-5. Field introduced in 18.1.4, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_flow_probe_retry_timer` - Timeout in milliseconds for flow probe retries.requires se reboot. Allowed values are 20-50. Field introduced in 18.2.5. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_group_analytics_policy` - Analytics policy for serviceenginegroup. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_hyperthreaded_mode` - Controls the distribution of se data path processes on cpus which support hyper-threading. Requires hyper-threading to be enabled at host level. Requires se reboot. For more details please refer to se placement kb. Enum options - SE_CPU_HT_AUTO, SE_CPU_HT_SPARSE_DISPATCHER_PRIORITY, SE_CPU_HT_SPARSE_PROXY_PRIORITY, SE_CPU_HT_PACKED_CORES. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_ip_encap_ipc` - Determines if se-se ipc messages are encapsulated in an ip header       0        automatically determine based on hypervisor type    1        use ip encap unconditionally    ~[0,1]   don't use ip encaprequires se reboot. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_kni_burst_factor` - This knob controls the resource availability and burst size used between se datapath and kni. This helps in minimising packet drops when there is higher kni traffic (non-vip traffic from and to linux). The factor takes the following values      0-default. 1-doubles the burst size and kni resources. 2-quadruples the burst size and kni resources. Allowed values are 0-2. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_l3_encap_ipc` - Determines if se-se ipc messages use se interface ip instead of vip        0        automatically determine based on hypervisor type    1        use se interface ip unconditionally    ~[0,1]   don't use se interface iprequires se reboot. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_log_buffer_app_blocking_dequeue` - Internal flag that blocks dataplane until all application logs are flushed to log-agent process. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_log_buffer_conn_blocking_dequeue` - Internal flag that blocks dataplane until all connection logs are flushed to log-agent process. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_log_buffer_events_blocking_dequeue` - Internal flag that blocks dataplane until all outstanding events are flushed to log-agent process. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_lro` - Enable or disable large receive optimization for vnics.supported on vmxnet3.requires se reboot. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_mp_ring_retry_count` - The retry count for the multi-producer enqueue before yielding the cpu. To be used under surveillance of avi support. Field introduced in 20.1.3. Allowed in enterprise edition with any value, essentials edition(allowed values- 500), basic edition(allowed values- 500), enterprise with cloud services edition.
-* `se_mtu` - Mtu for the vnics of ses in the se group. Allowed values are 512-9000. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_name_prefix` - Prefix to use for virtual machine name of service engines. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_packet_buffer_max` - Internal use only. Used to artificially reduce the available number of packet buffers. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `se_pcap_lookahead` - Enables lookahead mode of packet receive in pcap mode. Introduced to overcome an issue with hv_netvsc driver. Lookahead mode attempts to ensure that application and kernel's view of the receive rings are consistent. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_pcap_pkt_count` - Max number of packets the pcap interface can hold and if the value is 0 the optimum value will be chosen. The optimum value will be chosen based on se-memory, cloud type and number of interfaces.requires se reboot. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_pcap_pkt_sz` - Max size of each packet in the pcap interface. Requires se reboot. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_pcap_qdisc_bypass` - Bypass the kernel's traffic control layer, to deliver packets directly to the driver. Enabling this feature results in egress packets not being captured in host tcpdump. Note   brief packet reordering or loss may occur upon toggle. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_pcap_reinit_frequency` - Frequency in seconds at which periodically a pcap reinit check is triggered. May be used in conjunction with the configuration pcap_reinit_threshold. (valid range   15 mins - 12 hours, 0 - disables). Allowed values are 900-43200. Special values are 0- disable. Field introduced in 17.2.13, 18.1.3, 18.2.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_pcap_reinit_threshold` - Threshold for input packet receive errors in pcap mode exceeding which a pcap reinit is triggered. If not set, an unconditional reinit is performed. This value is checked every pcap_reinit_frequency interval. Field introduced in 17.2.13, 18.1.3, 18.2.1. Unit is metric_count. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_probe_port` - Tcp port on se where echo service will be run. Field introduced in 17.2.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_rl_prop` - Rate limiter properties. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_rum_sampling_nav_interval` - Minimum time to wait on server between taking sampleswhen sampling the navigation timing data from the end user client. Field introduced in 18.2.6. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_rum_sampling_nav_percent` - Percentage of navigation timing data from the end user client, used for sampling to get client insights. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_rum_sampling_res_interval` - Minimum time to wait on server between taking sampleswhen sampling the resource timing data from the end user client. Field introduced in 18.2.6. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_rum_sampling_res_percent` - Percentage of resource timing data from the end user client used for sampling to get client insight. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_sb_dedicated_core` - Sideband traffic will be handled by a dedicated core.requires se reboot. Field introduced in 16.5.2, 17.1.9, 17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_sb_threads` - Number of sideband threads per se.requires se reboot. Allowed values are 1-128. Field introduced in 16.5.2, 17.1.9, 17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_thread_multiplier` - Multiplier for se threads based on vcpu. Allowed values are 1-10. Allowed in enterprise edition with any value, essentials edition(allowed values- 1), basic edition(allowed values- 1), enterprise with cloud services edition.
-* `se_time_tracker_props` - Time tracker properties for latency audit. Field introduced in 22.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `se_tracert_port_range` - Traceroute port range. Field introduced in 17.2.8. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_tunnel_mode` - Determines if direct secondary return (dsr) from secondary se is active or not  0  automatically determine based on hypervisor type. 1  enable tunnel mode - dsr is unconditionally disabled. 2  disable tunnel mode - dsr is unconditionally enabled. Tunnel mode can be enabled or disabled at run-time. Allowed values are 0-2. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `se_tunnel_udp_port` - Udp port for tunneled packets from secondary to primary se in docker bridge mode.requires se reboot. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_tx_batch_size` - Number of packets to batch for transmit to the nic. Requires se reboot. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_txq_threshold` - Once the tx queue of the dispatcher reaches this threshold, hardware queues are not polled for further packets. To be used under surveillance of avi support. Allowed values are 512-32768. Field introduced in 20.1.2. Allowed in enterprise edition with any value, essentials edition(allowed values- 2048), basic edition(allowed values- 2048), enterprise with cloud services edition.
-* `se_udp_encap_ipc` - Determines if se-se ipc messages are encapsulated in a udp header  0  automatically determine based on hypervisor type. 1  use udp encap unconditionally.requires se reboot. Allowed values are 0-1. Field introduced in 17.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_use_dpdk` - Determines if dpdk library should be used or not   0  automatically determine based on hypervisor type 1  use dpdk if pcap is not enabled 2  don't use dpdk. Allowed values are 0-2. Field introduced in 18.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_vnic_tx_sw_queue_flush_frequency` - Configure the frequency in milliseconds of software transmit spillover queue flush when enabled. This is necessary to flush any packets in the spillover queue in the absence of a packet transmit in the normal course of operation. Allowed values are 50-500. Special values are 0- disable. Field introduced in 20.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_vnic_tx_sw_queue_size` - Configure the size of software transmit spillover queue when enabled. Requires se reboot. Allowed values are 128-2048. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_vs_hb_max_pkts_in_batch` - Maximum number of aggregated vs heartbeat packets to send in a batch. Allowed values are 1-256. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_vs_hb_max_vs_in_pkt` - Maximum number of virtualservices for which heartbeat messages are aggregated in one packet. Allowed values are 1-1024. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `self_se_election` - Enable ses to elect a primary amongst themselves in the absence of a connectivity to controller. Field introduced in 18.1.2. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `send_se_ready_timeout` - Timeout for sending se_ready without ns helper registration completion. Allowed values are 10-600. Field introduced in 21.1.1. Unit is seconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `service_ip6_subnets` - Ipv6 subnets assigned to the se group. Required for vs group placement. Field introduced in 18.1.1. Maximum of 128 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `service_ip_subnets` - Subnets assigned to the se group. Required for vs group placement. Field introduced in 17.1.1. Maximum of 128 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `shm_minimum_config_memory` - Minimum required shared memory to apply any configuration. Allowed values are 0-100. Field introduced in 18.1.2. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `significant_log_throttle` - This setting limits the number of significant logs generated per second per core on this se. Default is 100 logs per second. Set it to zero (0) to deactivate throttling. Field introduced in 17.1.3. Unit is per_second. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssl_preprocess_sni_hostname` - (beta) preprocess ssl client hello for sni hostname extension.if set to true, this will apply sni child's ssl protocol(s), if they are different from sni parent's allowed ssl protocol(s). Field introduced in 17.2.12, 18.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssl_sess_cache_per_vs` - Number of ssl sessions that can be cached per vs. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `transient_shared_memory_max` - The threshold for the transient shared config memory in the se. Allowed values are 0-100. Field introduced in 20.1.1. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `udf_log_throttle` - This setting limits the number of udf logs generated per second per core on this se. Udf logs are generated due to the configured client log filters or the rules with logging enabled. Default is 100 logs per second. Set it to zero (0) to deactivate throttling. Field introduced in 17.1.3. Unit is per_second. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upstream_connect_timeout` - Timeout for backend connection. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `upstream_connpool_enable` - Enable upstream connection pool,. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `upstream_read_timeout` - Timeout for data to be received from backend. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `upstream_send_timeout` - Timeout for upstream to become writable. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 3600000), basic edition(allowed values- 3600000), enterprise with cloud services edition.
-* `use_dp_util_for_scaleout` - If enabled, the datapath cpu utilization is consulted by the auto scale-out logic. 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.
-* `use_hyperthreaded_cores` - Enables the use of hyper-threaded cores on se. Requires se reboot. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `use_legacy_netlink` - Enable legacy model of netlink notifications. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `use_objsync` - Enable interse objsyc distribution framework. Field introduced in 20.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `use_standard_alb` - Use standard sku azure load balancer. By default cloud level flag is set. If not set, it inherits/uses the use_standard_alb flag from the cloud. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `user_agent_cache_config` - Configuration for user-agent cache used in bot management. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `user_defined_metric_age` - Defines in seconds how long before an unused user-defined-metric is garbage collected. Field introduced in 21.1.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_clusters` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_datastore_mode` - Enum options - vcenter_datastore_any, vcenter_datastore_local, vcenter_datastore_shared. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_datastores` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_datastores_include` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_folder` - Folder to place all the service engine virtual machines in vcenter. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_hosts` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_parking_vnic_pg` - Parking port group to be used by 9 vnics at the time of se creation. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vcenters` - Vcenter information for scoping at host/cluster level. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcpus_per_se` - Number of vcpus for each of the service engine virtual machines. Changes to this setting do not affect existing ses. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vip_asg` - When vip_asg is set, vip configuration will be managed by avi.user will be able to configure vip_asg or vips individually at the time of create. Field introduced in 17.2.12, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vnic_dhcp_ip_check_interval` - Dhcp ip check interval. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `vnic_dhcp_ip_max_retries` - Dhcp ip max retries. 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.
-* `vnic_ip_delete_interval` - Wait interval before deleting ip. Field introduced in 21.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `vnic_probe_interval` - Probe vnic interval. Field introduced in 21.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `vnic_rpc_retry_interval` - Time interval for retrying the failed vnic rpc requests. Field introduced in 21.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `vnicdb_cmd_history_size` - Size of vnicdb command history. Allowed values are 0-65535. 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.
-* `vs_host_redundancy` - Ensure primary and secondary service engines are deployed on different physical hosts. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition. Special default for essentials edition is true, basic edition is true, enterprise is true.
-* `vs_scalein_timeout` - Time to wait for the scaled in se to drain existing flows before marking the scalein done. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_scalein_timeout_for_upgrade` - During se upgrade, time to wait for the scaled-in se to drain existing flows before marking the scalein done. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_scaleout_timeout` - Time to wait for the scaled out se to become ready before marking the scaleout done. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_primary_switchover_additional_wait_time` - Wait time for primary switchover ready notification after flows are completed. In certain deployments, there may be an additional delay to accept traffic. For example, for bgp, some time is needed for route advertisement. Allowed values are 0-300. Field introduced in 30.2.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vs_se_scalein_additional_wait_time` - Wait time for sending scalein ready notification after flows are completed. In certain deployments, there may be an additional delay to accept traffic. For example, for bgp, some time is needed for route advertisement. Allowed values are 0-300. Field introduced in 30.2.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vs_se_scaleout_additional_wait_time` - Wait time for sending scaleout ready notification after virtual service is marked up. In certain deployments, there may be an additional delay to accept traffic. For example, for bgp, some time is needed for route advertisement. Allowed values are 0-300. Field introduced in 18.1.5,18.2.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_scaleout_ready_timeout` - Timeout in seconds for service engine to sendscaleout ready notification of a virtual service. Allowed values are 0-90. Field introduced in 18.1.5,18.2.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_switchover_timeout` - During se upgrade in a legacy active/standby segroup, time to wait for the new primary se to accept flows before marking the switchover done. Field introduced in 17.2.13,18.1.4,18.2.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vss_placement` - Parameters to place virtual services on only a subset of the cores of an se. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vss_placement_enabled` - If set, virtual services will be placed on only a subset of the cores of an se. Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `waf_mempool` - Enable memory pool for waf.requires se reboot. Field introduced in 17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `waf_mempool_size` - Memory pool size used for waf.requires se reboot. Field introduced in 17.2.3. Unit is kb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `accelerated_networking` - Enable accelerated networking option for azure se. Accelerated networking enables single root i/o virtualization (sr-iov) to a se vm. This improves networking performance. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `active_standby` - Service engines in active/standby mode for ha failover. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `aggressive_failure_detection` - Enable aggressive failover configuration for ha. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `algo` - In compact placement, virtual services are placed on existing ses until max_vs_per_se limit is reached. In distributed placement, virtual services are placed on new ses until max_se limit is reached. Once this limit is reached, virtual services are placed on ses with least load. Enum options - PLACEMENT_ALGO_PACKED, PLACEMENT_ALGO_DISTRIBUTED. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allow_burst` - Allow ses to be created using burst license. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `app_cache_percent` - A percent value of total se memory reserved for applicationcaching. This is an se bootup property and requires se restart.requires se reboot. Allowed values are 0 - 100. Special values are 0- disable. Field introduced in 18.2.3. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition. Special default for essentials edition is 0, basic edition is 0, enterprise edition is 10.
+* `app_cache_threshold` - The max memory that can be allocated for the app cache. This value will act as an upper bound on the cache size specified in app_cache_percent. Special values are 0- disable. Field introduced in 20.1.1. Unit is gb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `app_learning_memory_percent` - A percent value of total se memory reserved for application learning. This is an se bootup property and requires se restart. Allowed values are 0 - 10. Field introduced in 18.2.3. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `archive_shm_limit` - Amount of se memory in gb until which shared memory is collected in core archive. Field introduced in 17.1.3. Unit is gb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `arp_cache_timeout` - Timeout in seconds for idle arp entries. Allowed values are 0-86400. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `async_ssl` - Ssl handshakes will be handled by dedicated ssl threads.requires se reboot. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `async_ssl_threads` - Number of async ssl threads per se_dp.requires se reboot. Allowed values are 1-16. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_rebalance` - If set, virtual services will be automatically migrated when load on an se is less than minimum or more than maximum thresholds. Only alerts are generated when the auto_rebalance is not set. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `auto_rebalance_capacity_per_se` - Capacities of se for auto rebalance for each criteria. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_rebalance_criteria` - Set of criteria for se auto rebalance. Enum options - SE_AUTO_REBALANCE_CPU, SE_AUTO_REBALANCE_PPS, SE_AUTO_REBALANCE_MBPS, SE_AUTO_REBALANCE_OPEN_CONNS, SE_AUTO_REBALANCE_CPS. Field introduced in 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_rebalance_interval` - Frequency of rebalance, if 'auto rebalance' is enabled. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_redistribute_active_standby_load` - Redistribution of virtual services from the takeover se to the replacement se can cause momentary traffic loss. If the auto-redistribute load option is left in its default off state, any desired rebalancing requires calls to rest api. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `availability_zone_refs` - Availability zones for virtual service high availability. It is a reference to an object of type availabilityzone. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `baremetal_dispatcher_handles_flows` - Control if dispatcher core also handles tcp flows in baremetal se. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `bgp_peer_monitor_failover_enabled` - Enable bgp peer monitoring based failover. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `bgp_state_update_interval` - Bgp peer state update interval. Allowed values are 5-100. Field introduced in 17.2.14,18.1.5,18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `buffer_se` - Excess service engine capacity provisioned for ha failover. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `compress_ip_rules_for_each_ns_subnet` - Compress ip rules into a single subnet based ip rule for each north-south ipam subnet configured in pcap mode in openshift/kubernetes node. Field introduced in 18.2.9, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `config_debugs_on_all_cores` - Enable config debugs on all cores of se. Field introduced in 17.2.13,18.1.5,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `connection_memory_percentage` - Percentage of memory for connection state. This will come at the expense of memory used for http in-memory cache. Allowed values are 10-90. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `core_shm_app_cache` - Include shared memory for app cache in core file.requires se reboot. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `core_shm_app_learning` - Include shared memory for app learning in core file.requires se reboot. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cpu_reserve` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cpu_socket_affinity` - Allocate all the cpu cores for the service engine virtual machines  on the same cpu socket. Applicable only for vcenter cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `custom_securitygroups_data` - Custom security groups to be associated with data vnics for se instances in openstack and aws clouds. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `custom_securitygroups_mgmt` - Custom security groups to be associated with management vnic for se instances in openstack and aws clouds. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `custom_tag` - Custom tag will be used to create the tags for se instance in aws. Note this is not the same as the prefix for se name. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `data_network_id` - Subnet used to spin up the data nic for service engines, used only for azure cloud. Overrides the cloud level setting for service engine subnet. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `datascript_timeout` - Number of instructions before datascript times out. Allowed values are 0-100000000. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `deactivate_ipv6_discovery` - If activated, ipv6 address and route discovery are deactivated.requires se reboot. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `deactivate_kni_filtering_at_dispatcher` - Deactivate filtering of packets to kni interface. To be used under surveillance of avi support. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dedicated_dispatcher_core` - Dedicate the core that handles packet receive/transmit from the network to just the dispatching function. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disable_avi_securitygroups` - By default, avi creates and manages security groups along with custom sg provided by user. Set this to true to disallow avi to create and manage new security groups. Avi will only make use of custom security groups provided by user. This option is supported for aws and openstack cloud types. Field introduced in 17.2.13,18.1.4,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disable_csum_offloads` - Stop using tcp/udp and ip checksum offload features of nics. Field introduced in 17.1.14, 17.2.5, 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disable_flow_probes` - Disable flow probes for scaled out vs'es. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `disable_gro` - Disable generic receive offload (gro) in dpdk poll-mode driver packet receive path. Gro can be enabled on nics that do not support lro (large receive offload) or do not gain performance boost from lro. Gro is on by default on nics in a system with 8 vcpus or higher. Field introduced in 17.2.5, 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disable_se_memory_check` - If set, disable the config memory check done in service engine. Field introduced in 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disable_tso` - Disable tcp segmentation offload (tso) in dpdk poll-mode driver packet transmit path. Tso is on by default on nics that support it. Field introduced in 17.2.5, 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disk_per_se` - Amount of disk space for each of the service engine virtual machines. Unit is gb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `distribute_load_active_standby` - Use both the active and standby service engines for virtual service placement in the legacy active standby ha mode. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `distribute_queues` - Distributes queue ownership among cores so multiple cores handle dispatcher duties. Requires se reboot. Deprecated from 18.2.8, instead use max_queues_per_vnic. Field introduced in 17.2.8. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `distribute_vnics` - Distributes vnic ownership among cores so multiple cores handle dispatcher duties.requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `downstream_send_timeout` - Timeout for downstream to become writable. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dp_aggressive_deq_interval_msec` - Dequeue interval for receive queue from se_dp in aggressive mode. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dp_aggressive_enq_interval_msec` - Enqueue interval for request queue to se_dp in aggressive mode. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dp_aggressive_hb_frequency` - Frequency of se - se hb messages when aggressive failure mode detection is enabled. Field introduced in 20.1.3. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dp_aggressive_hb_timeout_count` - Consecutive hb failures after which failure is reported to controller,when aggressive failure mode detection is enabled. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dp_deq_interval_msec` - Dequeue interval for receive queue from se_dp. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dp_enq_interval_msec` - Enqueue interval for request queue to se_dp. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dp_hb_frequency` - Frequency of se - se hb messages when aggressive failure mode detection is not enabled. Field introduced in 20.1.3. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dp_hb_timeout_count` - Consecutive hb failures after which failure is reported to controller, when aggressive failure mode detection is not enabled. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dpdk_gro_timeout_interval` - The timeout for gro coalescing interval. 0 indicates non-timer based gro. Allowed values are 0-900. Field introduced in 22.1.1. Unit is microseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_gratarp_permanent` - Enable gratarp for vip_ip. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_hsm_log` - Enable hsm luna engine logs. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_hsm_priming` - (this is a beta feature). Enable hsm key priming. If enabled, key handles on the hsm will be synced to se before processing client connections. Field introduced in 17.2.7, 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_multi_lb` - Applicable only for azure cloud with basic sku lb. If set, additional azure lbs will be automatically created if resources in existing lb are exhausted. Field introduced in 17.2.10, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_pcap_tx_ring` - Enable tx ring support in pcap mode of operation. Tso feature is not supported with tx ring enabled. Deprecated from 18.2.8, instead use pcap_tx_mode. Requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_qat` - This knob enables the service engine to use qat offloads (if the host cpu is capable, and the qat device is exposed). Requires se reboot. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ephemeral_portrange_end` - End local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ephemeral_portrange_start` - Start local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `extra_config_multiplier` - Multiplier for extra config to support large vs/pool config. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `extra_shared_config_memory` - Extra config memory to support large geo db configuration. Field introduced in 17.1.1. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `flow_table_new_syn_max_entries` - Maximum number of flow table entries that have not completed tcp three-way handshake yet. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `free_list_size` - Number of entries in the free list. Field introduced in 17.2.10, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `gcp_config` - Google cloud platform, service engine group configuration. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gratarp_permanent_periodicity` - Gratarp periodicity for vip-ip. Allowed values are 5-30. Field introduced in 18.2.3. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `grpc_channel_connect_timeout` - Timeout in seconds that se waits for a grpc channel to connect to server, before it retries. Allowed values are 5-45. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gve_enabled` - Deploys google virtual ethernet (gve) - gvnic for all supported intances types in gcp. Applies only to newly created se's. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ha_mode` - High availability mode for all the virtual services using this service engine group. Enum options - HA_MODE_SHARED_PAIR, HA_MODE_SHARED, HA_MODE_LEGACY_ACTIVE_STANDBY. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- ha_mode_legacy_active_standby), basic (allowed values- ha_mode_legacy_active_standby) edition. Special default for essentials edition is ha_mode_legacy_active_standby, basic edition is ha_mode_legacy_active_standby, enterprise edition is ha_mode_shared.
+* `handle_per_pkt_attack` - Configuration to handle per packet attack handling.for example, dns reflection attack is a type of attack where a response packet is sent to the dns vs.this configuration tells if such packets should be dropped without further processing. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `hardwaresecuritymodulegroup_ref` - It is a reference to an object of type hardwaresecuritymodulegroup. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `heap_minimum_config_memory` - Minimum required heap memory to apply any configuration. Allowed values are 0-100. Field introduced in 18.1.2. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `hm_on_standby` - Enable active health monitoring from the standby se for all placed virtual services. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition. Special default for essentials edition is false, basic edition is false, enterprise edition is true.
+* `host_attribute_key` - Key of a (key, value) pair identifying a label for a set of nodes usually in container clouds. Needs to be specified together with host_attribute_value. Ses can be configured differently including ha modes across different se groups. May also be used for isolation between different classes of virtualservices. Virtualservices' se group may be specified via annotations/labels. A openshift/kubernetes namespace maybe annotated with a matching se group label as openshift.io/node-selector  apptype=prod. When multiple se groups are used in a cloud with host attributes specified,just a single se group can exist as a match-all se group without a host_attribute_key. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `host_attribute_value` - Value of a (key, value) pair identifying a label for a set of nodes usually in container clouds. Needs to be specified together with host_attribute_key. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `host_gateway_monitor` - Enable the host gateway monitor when service engine is deployed as docker container. Disabled by default. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `http_rum_console_log` - Enable javascript console logs on the client browser when collecting client insights. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `http_rum_min_content_length` - Minimum response size content length to sample for client insights. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 64), basic (allowed values- 64) edition.
+* `hybrid_rss_mode` - Toggles se hybrid only mode of operation in dpdk mode with rss configured;where-in each se datapath instance operates as a standalone hybrid instance performing both dispatcher and proxy function. Requires reboot. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `hypervisor` - Override default hypervisor. Enum options - DEFAULT, VMWARE_ESX, KVM, VMWARE_VSAN, XEN. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ignore_docker_mac_change` - Ignore docker mac change. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ignore_rtt_threshold` - Ignore rtt samples if it is above threshold. Field introduced in 17.1.6,17.2.2. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ingress_access_data` - Program se security group ingress rules to allow vip data access from remote cidr type. Enum options - SG_INGRESS_ACCESS_NONE, SG_INGRESS_ACCESS_ALL, SG_INGRESS_ACCESS_VPC. Field introduced in 17.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ingress_access_mgmt` - Program se security group ingress rules to allow ssh/icmp management access from remote cidr type. Enum options - SG_INGRESS_ACCESS_NONE, SG_INGRESS_ACCESS_ALL, SG_INGRESS_ACCESS_VPC. Field introduced in 17.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `instance_flavor` - Instance/flavor name for se instance. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `instance_flavor_info` - Additional information associated with instance_flavor. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `iptables` - Iptable rules. Maximum of 128 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `kni_allowed_server_ports` - Port ranges for any servers running in inband linuxserver clouds. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `kv_val_max_len` - Max length allowed for the value in a kv pair. Allowed values are 128,256,512,1024,2048,4096,8192. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `l7_conns_per_core` - Number of l7 connections that can be cached per core. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `l7_resvd_listen_conns_per_core` - Number of reserved l7 listener connections per core. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `labels` - Labels associated with this se group. Field introduced in 20.1.1. Maximum of 1 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `lbaction_num_requests_to_dispatch` - Number of requests to dispatch from the request. Queue at a regular interval. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `lbaction_rq_per_request_max_retries` - Maximum retries per request in the request queue. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `least_load_core_selection` - Select core with least load for new flow. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `license_tier` - Specifies the license tier which would be used. This field by default inherits the value from cloud. Enum options - ENTERPRISE_16, ENTERPRISE, ENTERPRISE_18, BASIC, ESSENTIALS, ENTERPRISE_WITH_CLOUD_SERVICES. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `license_type` - If no license type is specified then default license enforcement for the cloud type is chosen. Enum options - LIC_BACKEND_SERVERS, LIC_SOCKETS, LIC_CORES, LIC_HOSTS, LIC_SE_BANDWIDTH, LIC_METERED_SE_BANDWIDTH. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `log_agent_compress_logs` - Flag to indicate if log files are compressed upon full on the service engine. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_debug_enabled` - Enable debug logs by default on service engine. This includes all other debugging logs. Debug logs can also be explcitly enabled from the cli shell. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_file_sz_appl` - Maximum application log file size before rollover. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_file_sz_conn` - Maximum connection log file size before rollover. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_file_sz_debug` - Maximum debug log file size before rollover. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_file_sz_event` - Maximum event log file size before rollover. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_log_storage_min_sz` - Minimum storage allocated for logs irrespective of memory and cores. Field introduced in 21.1.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_max_concurrent_rsync` - Maximum concurrent rsync requests initiated from log-agent to the controller. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_max_storage_excess_percent` - Excess percentage threshold of disk size to trigger cleanup of logs on the service engine. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_max_storage_ignore_percent` - Maximum storage on the disk not allocated for logs on the service engine. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_min_storage_per_vs` - Minimum storage allocated to any given virtualservice on the service engine. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_sleep_interval` - Internal timer to stall log-agent and prevent it from hogging cpu cycles on the service engine. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_trace_enabled` - Enable trace logs by default on service engine. Configuration operations are logged along with other important logs by service engine. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_unknown_vs_timer` - Timeout to purge unknown virtual service logs from the service engine. Field introduced in 21.1.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_disksz` - Maximum disk capacity (in mb) to be allocated to an se. This is exclusively used for debug and log data. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `log_malloc_failure` - Se will log memory allocation related failure to the se_trace file, wherever available. Field introduced in 20.1.2. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `log_message_max_file_list_size` - Maximum number of file names in a log message. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_concurrent_external_hm` - Maximum number of external health monitors that can run concurrently in a service engine. This helps control the cpu and memory use by external health monitors. Special values are 0- value will be internally calculated based on cpu and memory. Field introduced in 18.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_cpu_usage` - When cpu usage on an se exceeds this threshold, virtual services hosted on this se may be rebalanced to other ses to reduce load. A new se may be created as part of this process. Allowed values are 40-90. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_memory_per_mempool` - Max bytes that can be allocated in a single mempool. Field introduced in 18.1.5. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_num_http_sessions_to_store` - Maximum number of http session that will be created. Each session uses about 1kb in the key-value storage in shared memory. Setting this value too high can lead to exhaustion of shared memory and affect services. Allowed values are 1-2000000. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `max_num_se_dps` - Configures the maximum number of se_dp processes that handles traffic. If not configured, defaults to the number of cpus on the se. If decreased, it will only take effect after se reboot. Allowed values are 1-128. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `max_public_ips_per_lb` - Applicable to azure platform only. Maximum number of public ips per azure lb. Field introduced in 17.2.12, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_queues_per_vnic` - Maximum number of queues per vnic setting to '0' utilises all queues that are distributed across dispatcher cores. Allowed values are 0,1,2,4,8,16. Field introduced in 18.2.7, 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1), basic (allowed values- 1) edition.
+* `max_rules_per_lb` - Applicable to azure platform only. Maximum number of rules per azure lb. Field introduced in 17.2.12, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_scaleout_per_vs` - Maximum number of active service engines for the virtual service. Allowed values are 1-64. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_se` - Maximum number of services engines in this group. Allowed values are 0-1000. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_skb_frags` - Maximum of number of 4 kb pages allocated to the linux kernel gro subsystem for packet coalescing. This parameter is limited to supported kernels only. Requires se reboot. Allowed values are 1-17. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `max_vs_per_se` - Maximum number of virtual services that can be placed on a single service engine. Allowed values are 1-1000. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mem_reserve` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `memory_for_config_update` - Indicates the percent of memory reserved for config updates. Allowed values are 0-100. Field introduced in 18.1.2. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `memory_per_se` - Amount of memory for each of the service engine virtual machines. Changes to this setting do not affect existing ses. Allowed values are 2048-262144. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `metrics_collection_mode` - Metrics collection mode, 0 = pull mode. Se_agent pulls metrics from se_dp,  1 = push mode. Se_dp pushes metrics to se_agent. 9 = special value to reset collection state in push mode. Allowed values are 0-1. Special values are 9- reset metrics collection state. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `mgmt_network_ref` - Management network to use for avi service engines. It is a reference to an object of type network. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mgmt_subnet` - Management subnet to use for avi service engines. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `min_cpu_usage` - When cpu usage on an se falls below the minimum threshold, virtual services hosted on the se may be consolidated onto other underutilized ses. After consolidation, unused service engines may then be eligible for deletion. Allowed values are 20-60. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `min_scaleout_per_vs` - Minimum number of active service engines for the virtual service. Allowed values are 1-64. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `min_se` - Minimum number of services engines in this group (relevant for se autorebalance only). Allowed values are 0-1000. Field introduced in 17.2.13,18.1.3,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `minimum_connection_memory` - Indicates the percent of memory reserved for connections. Allowed values are 0-100. Field introduced in 18.1.2. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `multicast_enable` - This knob enables the service engine to process multicast traffic(for vmware hypervisor). Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `n_log_streaming_threads` - Number of threads to use for log streaming. Allowed values are 1-100. Field introduced in 17.2.12, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nd6_cache_timeout` - Timeout in seconds for idle nd6 entries. Allowed values are 0-86400. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `netlink_poller_threads` - Number of threads to poll for netlink messages excluding the thread for default namespace. Requires se reboot. Allowed values are 1-32. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `netlink_sock_buf_size` - Socket buffer size for the netlink sockets. Requires se reboot. Allowed values are 1-128. Field introduced in 21.1.1. Unit is mega_bytes. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ngx_free_connection_stack` - Free the connection stack. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `non_significant_log_throttle` - This setting limits the number of non-significant logs generated per second per core on this se. Default is 100 logs per second. Set it to zero (0) to deactivate throttling. Field introduced in 17.1.3. Unit is per_second. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ns_helper_deq_interval_msec` - Dequeue interval for receive queue from ns helper. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ntp_sync_fail_event` - Toggle se ntp synchronization failure events generation. Disabled by default. Field introduced in 22.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ntp_sync_status_interval` - Configures the interval at which se synchronization status with ntp server(s) is verified. A value of zero disables se ntp synchronization status validation. Allowed values are 120-900. Special values are 0- disable. Field introduced in 22.1.2. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `num_dispatcher_cores` - Number of dispatcher cores (0,1,2,4,8 or 16). If set to 0, then number of dispatcher cores is deduced automatically.requires se reboot. Allowed values are 0,1,2,4,8,16. Field introduced in 17.2.12, 18.1.3, 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `num_dispatcher_queues` - Number of queues to each dispatcher. Allowed values are 1-2. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `num_flow_cores_sum_changes_to_ignore` - Number of changes in num flow cores sum to ignore. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `objsync_config` - Configuration knobs for interse object distribution. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `objsync_port` - Tcp port on se management interface for interse object distribution. Supported only for externally managed security groups. Not supported on full access deployments. Requires se reboot. Allowed values are 1024-65535. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `openstack_availability_zones` - Field introduced in 17.1.1. Maximum of 5 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `openstack_mgmt_network_name` - Avi management network name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `openstack_mgmt_network_uuid` - Management network uuid. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `os_reserved_memory` - Amount of extra memory to be reserved for use by the operating system on a service engine. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `path_mtu_discovery_v4` - Enable path mtu discovery feature for ipv4. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `path_mtu_discovery_v6` - Enable path mtu discovery feature for ipv6. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pcap_tx_mode` - Determines the pcap transmit mode of operation. Requires se reboot. Enum options - PCAP_TX_AUTO, PCAP_TX_SOCKET, PCAP_TX_RING. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pcap_tx_ring_rd_balancing_factor` - In pcap mode, reserve a configured portion of tx ring resources for itself and the remaining portion for the rx ring to achieve better balance in terms of queue depth. Requires se reboot. Allowed values are 10-100. Field introduced in 20.1.3. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `per_app` - Per-app se mode is designed for deploying dedicated load balancers per app (vs). In this mode, each se is limited to a max of 2 vss. Vcpus in per-app ses count towards licensing usage at 25% rate. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `per_vs_admission_control` - Enable/disable per vs level admission control.enabling this feature will cause the connection and packet throttling on a particular vs that has high packet buffer consumption. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `placement_mode` - If placement mode is 'auto', virtual services are automatically placed on service engines. Enum options - PLACEMENT_MODE_AUTO. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pre_upgrade_se_available_mem_threshold` - Available memory threshold on se in mb, to get qualified for upgrade operation. Adjusting this knob will override the internal value of available memory threshold for se, thereby qualifying it for upgrade operation. '0' is a special auto value, which will indicate that memory threshold is calculated based on total memory size of the se. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `realtime_se_metrics` - Enable or deactivate real time se metrics. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `reboot_on_panic` - Reboot the vm or host on kernel panic. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `replay_vrf_routes_interval` - Routes in vrf are replayed at the specified interval. This should be increased if there are large number of routes. Allowed values are 0-3000. Field introduced in 22.1.3. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `resync_time_interval` - Time interval to re-sync se's time with wall clock time. Allowed values are 8-600000. Field introduced in 20.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sdb_flush_interval` - Sdb pipeline flush interval. Allowed values are 1-10000. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sdb_pipeline_size` - Sdb pipeline size. Allowed values are 1-10000. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sdb_scan_count` - Sdb scan count. Allowed values are 1-1000. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_bandwidth_type` - Select the se bandwidth for the bandwidth license. Enum options - SE_BANDWIDTH_UNLIMITED, SE_BANDWIDTH_25M, SE_BANDWIDTH_200M, SE_BANDWIDTH_1000M, SE_BANDWIDTH_10000M. Field introduced in 17.2.5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- se_bandwidth_unlimited), basic (allowed values- se_bandwidth_unlimited) edition.
+* `se_debug_trace_sz` - Use to cap the size of debug ring min(se_debug_trace_sz, num_dispatcher_cores). Only applicable to > 8g systems. Requires se reboot. Allowed values are 1,2,4,8,255. Field introduced in 22.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_delayed_flow_delete` - Delay the cleanup of flowtable entry. To be used under surveillance of avi support. Field introduced in 20.1.2. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `se_deprovision_delay` - Duration to preserve unused service engine virtual machines before deleting them. If traffic to a virtual service were to spike up abruptly, this se would still be available to be utilized again rather than creating a new se. If this value is set to 0, controller will never delete any ses and administrator has to manually cleanup unused ses. Allowed values are 0-525600. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dos_profile` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dp_hm_drops` - Internal only. Used to simulate se - se hb failure. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_dp_if_state_poll_interval` - Number of jiffies between polling interface state. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dp_isolation` - Toggle support to run se datapath instances in isolation on exclusive cpus. This improves latency and performance. However, this could reduce the total number of se_dp instances created on that se instance. Supported for >= 8 cpus. Requires se reboot. Field introduced in 20.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_dp_isolation_num_non_dp_cpus` - Number of cpus for non se-dp tasks in se datapath isolation mode. Translates total cpus minus 'num_non_dp_cpus' for datapath use. It is recommended to reserve an even number of cpus for hyper-threaded processors. Requires se reboot. Allowed values are 1-8. Special values are 0- auto. Field introduced in 20.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_dp_log_nf_enqueue_percent` - Internal buffer full indicator on the service engine beyond which the unfiltered logs are abandoned. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_dp_log_udf_enqueue_percent` - Internal buffer full indicator on the service engine beyond which the user filtered logs are abandoned. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_dp_max_hb_version` - The highest supported se-se heartbeat protocol version. This version is reported by secondary se to primary se in heartbeat response messages. Allowed values are 1-3. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dp_vnic_queue_stall_event_sleep` - Time (in seconds) service engine waits for after generating a vnic transmit queue stall event before resetting thenic. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dp_vnic_queue_stall_threshold` - Number of consecutive transmit failures to look for before generating a vnic transmit queue stall event. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dp_vnic_queue_stall_timeout` - Time (in milliseconds) to wait for network/nic recovery on detecting a transmit queue stall after which service engine resets the nic. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dp_vnic_restart_on_queue_stall_count` - Number of consecutive transmit queue stall events in se_dp_vnic_stall_se_restart_window to look for before restarting se. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dp_vnic_stall_se_restart_window` - Window of time (in seconds) during which se_dp_vnic_restart_on_queue_stall_count number of consecutive stalls results in a se restart. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dpdk_pmd` - Determines if dpdk pool mode driver should be used or not   0  automatically determine based on hypervisor/nic type 1  unconditionally use dpdk poll mode driver 2  don't use dpdk poll mode driver.requires se reboot. Allowed values are 0-2. Field introduced in 18.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dump_core_on_assert` - Enable core dump on assert. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_emulated_cores` - Use this to emulate more/less cpus than is actually available. One datapath process is started for each core. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `se_flow_probe_retries` - Flow probe retry count if no replies are received.requires se reboot. Allowed values are 0-5. Field introduced in 18.1.4, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_flow_probe_retry_timer` - Timeout in milliseconds for flow probe retries.requires se reboot. Allowed values are 20-50. Field introduced in 18.2.5. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_group_analytics_policy` - Analytics policy for serviceenginegroup. Field introduced in 20.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_hyperthreaded_mode` - Controls the distribution of se data path processes on cpus which support hyper-threading. Requires hyper-threading to be enabled at host level. Requires se reboot. For more details please refer to se placement kb. Enum options - SE_CPU_HT_AUTO, SE_CPU_HT_SPARSE_DISPATCHER_PRIORITY, SE_CPU_HT_SPARSE_PROXY_PRIORITY, SE_CPU_HT_PACKED_CORES. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_ip_encap_ipc` - Determines if se-se ipc messages are encapsulated in an ip header       0        automatically determine based on hypervisor type    1        use ip encap unconditionally    ~[0,1]   don't use ip encaprequires se reboot. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_kni_burst_factor` - This knob controls the resource availability and burst size used between se datapath and kni. This helps in minimising packet drops when there is higher kni traffic (non-vip traffic from and to linux). The factor takes the following values      0-default. 1-doubles the burst size and kni resources. 2-quadruples the burst size and kni resources. 3-increases the burst size and kni resources by a factor of eight. Allowed values are 0-3. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_l3_encap_ipc` - Determines if se-se ipc messages use se interface ip instead of vip        0        automatically determine based on hypervisor type    1        use se interface ip unconditionally    ~[0,1]   don't use se interface iprequires se reboot. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_log_buffer_app_blocking_dequeue` - Internal flag that blocks dataplane until all application logs are flushed to log-agent process. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_log_buffer_conn_blocking_dequeue` - Internal flag that blocks dataplane until all connection logs are flushed to log-agent process. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_log_buffer_events_blocking_dequeue` - Internal flag that blocks dataplane until all outstanding events are flushed to log-agent process. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_lro` - Enable or disable large receive optimization for vnics.supported on vmxnet3.requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_mp_ring_retry_count` - The retry count for the multi-producer enqueue before yielding the cpu. To be used under surveillance of avi support. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 500), basic (allowed values- 500) edition.
+* `se_mtu` - Mtu for the vnics of ses in the se group. Allowed values are 512-9000. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_name_prefix` - Prefix to use for virtual machine name of service engines. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_packet_buffer_max` - Internal use only. Used to artificially reduce the available number of packet buffers. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_pcap_lookahead` - Enables lookahead mode of packet receive in pcap mode. Introduced to overcome an issue with hv_netvsc driver. Lookahead mode attempts to ensure that application and kernel's view of the receive rings are consistent. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_pcap_pkt_count` - Max number of packets the pcap interface can hold and if the value is 0 the optimum value will be chosen. The optimum value will be chosen based on se-memory, cloud type and number of interfaces.requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_pcap_pkt_sz` - Max size of each packet in the pcap interface. Requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_pcap_qdisc_bypass` - Bypass the kernel's traffic control layer, to deliver packets directly to the driver. Enabling this feature results in egress packets not being captured in host tcpdump. Note   brief packet reordering or loss may occur upon toggle. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_pcap_reinit_frequency` - Frequency in seconds at which periodically a pcap reinit check is triggered. May be used in conjunction with the configuration pcap_reinit_threshold. (valid range   15 mins - 12 hours, 0 - disables). Allowed values are 900-43200. Special values are 0- disable. Field introduced in 17.2.13, 18.1.3, 18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_pcap_reinit_threshold` - Threshold for input packet receive errors in pcap mode exceeding which a pcap reinit is triggered. If not set, an unconditional reinit is performed. This value is checked every pcap_reinit_frequency interval. Field introduced in 17.2.13, 18.1.3, 18.2.1. Unit is metric_count. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_probe_port` - Tcp port on se where echo service will be run. Field introduced in 17.2.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_rl_prop` - Rate limiter properties. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_rum_sampling_nav_interval` - Minimum time to wait on server between taking sampleswhen sampling the navigation timing data from the end user client. Field introduced in 18.2.6. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_rum_sampling_nav_percent` - Percentage of navigation timing data from the end user client, used for sampling to get client insights. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_rum_sampling_res_interval` - Minimum time to wait on server between taking sampleswhen sampling the resource timing data from the end user client. Field introduced in 18.2.6. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_rum_sampling_res_percent` - Percentage of resource timing data from the end user client used for sampling to get client insight. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_sb_dedicated_core` - Sideband traffic will be handled by a dedicated core.requires se reboot. Field introduced in 16.5.2, 17.1.9, 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_sb_threads` - Number of sideband threads per se.requires se reboot. Allowed values are 1-128. Field introduced in 16.5.2, 17.1.9, 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_thread_multiplier` - Multiplier for se threads based on vcpu. Allowed values are 1-10. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1), basic (allowed values- 1) edition.
+* `se_time_tracker_props` - Time tracker properties for latency audit. Field introduced in 22.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_tracert_port_range` - Traceroute port range. Field introduced in 17.2.8. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_tunnel_mode` - Determines if direct secondary return (dsr) from secondary se is active or not  0  automatically determine based on hypervisor type. 1  enable tunnel mode - dsr is unconditionally disabled. 2  disable tunnel mode - dsr is unconditionally enabled. Tunnel mode can be enabled or disabled at run-time. Allowed values are 0-2. Field introduced in 17.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `se_tunnel_udp_port` - Udp port for tunneled packets from secondary to primary se in docker bridge mode.requires se reboot. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_tx_batch_size` - Number of packets to batch for transmit to the nic. Requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_txq_threshold` - Once the tx queue of the dispatcher reaches this threshold, hardware queues are not polled for further packets. To be used under surveillance of avi support. Allowed values are 512-32768. Field introduced in 20.1.2. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 2048), basic (allowed values- 2048) edition.
+* `se_udp_encap_ipc` - Determines if se-se ipc messages are encapsulated in a udp header  0  automatically determine based on hypervisor type. 1  use udp encap unconditionally.requires se reboot. Allowed values are 0-1. Field introduced in 17.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_use_dpdk` - Determines if dpdk library should be used or not   0  automatically determine based on hypervisor type 1  use dpdk if pcap is not enabled 2  don't use dpdk. Allowed values are 0-2. Field introduced in 18.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_vnic_tx_sw_queue_flush_frequency` - Configure the frequency in milliseconds of software transmit spillover queue flush when enabled. This is necessary to flush any packets in the spillover queue in the absence of a packet transmit in the normal course of operation. Allowed values are 50-500. Special values are 0- disable. Field introduced in 20.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_vnic_tx_sw_queue_size` - Configure the size of software transmit spillover queue when enabled. Requires se reboot. Allowed values are 128-2048. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_vs_hb_max_pkts_in_batch` - Maximum number of aggregated vs heartbeat packets to send in a batch. Allowed values are 1-256. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_vs_hb_max_vs_in_pkt` - Maximum number of virtualservices for which heartbeat messages are aggregated in one packet. Allowed values are 1-1024. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `self_se_election` - Enable ses to elect a primary amongst themselves in the absence of a connectivity to controller. Field introduced in 18.1.2. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `send_se_ready_timeout` - Timeout for sending se_ready without ns helper registration completion. Allowed values are 10-600. Field introduced in 21.1.1. Unit is seconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_ip6_subnets` - Ipv6 subnets assigned to the se group. Required for vs group placement. Field introduced in 18.1.1. Maximum of 128 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_ip_subnets` - Subnets assigned to the se group. Required for vs group placement. Field introduced in 17.1.1. Maximum of 128 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `shm_minimum_config_memory` - Minimum required shared memory to apply any configuration. Allowed values are 0-100. Field introduced in 18.1.2. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `significant_log_throttle` - This setting limits the number of significant logs generated per second per core on this se. Default is 100 logs per second. Set it to zero (0) to deactivate throttling. Field introduced in 17.1.3. Unit is per_second. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_preprocess_sni_hostname` - (beta) preprocess ssl client hello for sni hostname extension.if set to true, this will apply sni child's ssl protocol(s), if they are different from sni parent's allowed ssl protocol(s). Field introduced in 17.2.12, 18.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_sess_cache_per_vs` - Number of ssl sessions that can be cached per vs. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `transient_shared_memory_max` - The threshold for the transient shared config memory in the se. Allowed values are 0-100. Field introduced in 20.1.1. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `udf_log_throttle` - This setting limits the number of udf logs generated per second per core on this se. Udf logs are generated due to the configured client log filters or the rules with logging enabled. Default is 100 logs per second. Set it to zero (0) to deactivate throttling. Field introduced in 17.1.3. Unit is per_second. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `upstream_connect_timeout` - Timeout for backend connection. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `upstream_connpool_enable` - Enable upstream connection pool,. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `upstream_read_timeout` - Timeout for data to be received from backend. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `upstream_send_timeout` - Timeout for upstream to become writable. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 3600000), basic (allowed values- 3600000) edition.
+* `use_dp_util_for_scaleout` - If enabled, the datapath cpu utilization is consulted by the auto scale-out logic. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_hyperthreaded_cores` - Enables the use of hyper-threaded cores on se. Requires se reboot. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_legacy_netlink` - Enable legacy model of netlink notifications. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `use_objsync` - Enable interse objsyc distribution framework. Field introduced in 20.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_standard_alb` - Use standard sku azure load balancer. By default cloud level flag is set. If not set, it inherits/uses the use_standard_alb flag from the cloud. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `user_agent_cache_config` - Configuration for user-agent cache used in bot management. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `user_defined_metric_age` - Defines in seconds how long before an unused user-defined-metric is garbage collected. Field introduced in 21.1.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_clusters` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_datastore_mode` - Enum options - vcenter_datastore_any, vcenter_datastore_local, vcenter_datastore_shared. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_datastores` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_datastores_include` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_folder` - Folder to place all the service engine virtual machines in vcenter. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_hosts` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_parking_vnic_pg` - Parking port group to be used by 9 vnics at the time of se creation. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vcenters` - Vcenter information for scoping at host/cluster level. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcpus_per_se` - Number of vcpus for each of the service engine virtual machines. Changes to this setting do not affect existing ses. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vip_asg` - When vip_asg is set, vip configuration will be managed by avi.user will be able to configure vip_asg or vips individually at the time of create. Field introduced in 17.2.12, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vnic_dhcp_ip_check_interval` - Dhcp ip check interval. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vnic_dhcp_ip_max_retries` - Dhcp ip max retries. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vnic_ip_delete_interval` - Wait interval before deleting ip. Field introduced in 21.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vnic_probe_interval` - Probe vnic interval. Field introduced in 21.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vnic_rpc_retry_interval` - Time interval for retrying the failed vnic rpc requests. Field introduced in 21.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vnicdb_cmd_history_size` - Size of vnicdb command history. Allowed values are 0-65535. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_host_redundancy` - Ensure primary and secondary service engines are deployed on different physical hosts. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition. Special default for essentials edition is true, basic edition is true, enterprise edition is true.
+* `vs_scalein_timeout` - Time to wait for the scaled in se to drain existing flows before marking the scalein done. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_scalein_timeout_for_upgrade` - During se upgrade, time to wait for the scaled-in se to drain existing flows before marking the scalein done. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_scaleout_timeout` - Time to wait for the scaled out se to become ready before marking the scaleout done. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_primary_switchover_additional_wait_time` - Wait time for primary switchover ready notification after flows are completed. In certain deployments, there may be an additional delay to accept traffic. For example, for bgp, some time is needed for route advertisement. Allowed values are 0-300. Field introduced in 30.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vs_se_scalein_additional_wait_time` - Wait time for sending scalein ready notification after flows are completed. In certain deployments, there may be an additional delay to accept traffic. For example, for bgp, some time is needed for route advertisement. Allowed values are 0-300. Field introduced in 30.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vs_se_scaleout_additional_wait_time` - Wait time for sending scaleout ready notification after virtual service is marked up. In certain deployments, there may be an additional delay to accept traffic. For example, for bgp, some time is needed for route advertisement. Allowed values are 0-300. Field introduced in 18.1.5,18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_scaleout_ready_timeout` - Timeout in seconds for service engine to sendscaleout ready notification of a virtual service. Allowed values are 0-90. Field introduced in 18.1.5,18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_switchover_timeout` - During se upgrade in a legacy active/standby segroup, time to wait for the new primary se to accept flows before marking the switchover done. Field introduced in 17.2.13,18.1.4,18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vss_placement` - Parameters to place virtual services on only a subset of the cores of an se. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vss_placement_enabled` - If set, virtual services will be placed on only a subset of the cores of an se. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `waf_mempool` - Enable memory pool for waf.requires se reboot. Field introduced in 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `waf_mempool_size` - Memory pool size used for waf.requires se reboot. Field introduced in 17.2.3. Unit is kb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `waf_use_jit_for_pcre` - Use the jit compiler for pcre regular expressions in waf. Setting this to false will impact performance. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_siteversion.html.markdown b/website/docs/d/avi_siteversion.html.markdown
index a9d5f30a5..335eac921 100644
--- a/website/docs/d/avi_siteversion.html.markdown
+++ b/website/docs/d/avi_siteversion.html.markdown
@@ -32,16 +32,16 @@ data "avi_siteversion" "foo_siteversion" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `datetime` - This field represents the creation time of the federateddiff. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Name of the site. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `prev_target_version` - Previous targer version for a site. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `replication_state` - Replication state for a site. Enum options - REPLICATION_STATE_FASTFORWARD, REPLICATION_STATE_FORCESYNC, REPLICATION_STATE_STREAMING, REPLICATION_STATE_SUSPENDED, REPLICATION_STATE_INIT, REPLICATION_STATE_WAIT, REPLICATION_STATE_NOT_APPLICABLE. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `site_id` - Cluster uuid of the site. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `target_timeline` - Target timeline of the site. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `target_version` - Target version of the site. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `timeline` - Timeline of the site. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the siteversion object. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `version` - Version of the site. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `version_type` - Type of message for which version is maintained. Enum options - CONFIG_VERSION, HEALTH_STATUS_VERSION. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `datetime` - This field represents the creation time of the federateddiff. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the site. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `prev_target_version` - Previous targer version for a site. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `replication_state` - Replication state for a site. Enum options - REPLICATION_STATE_FASTFORWARD, REPLICATION_STATE_FORCESYNC, REPLICATION_STATE_STREAMING, REPLICATION_STATE_SUSPENDED, REPLICATION_STATE_INIT, REPLICATION_STATE_WAIT, REPLICATION_STATE_NOT_APPLICABLE, REPLICATION_STATE_SYNC_STALLED. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `site_id` - Cluster uuid of the site. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `target_timeline` - Target timeline of the site. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `target_version` - Target version of the site. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `timeline` - Timeline of the site. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the siteversion object. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `version` - Version of the site. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `version_type` - Type of message for which version is maintained. Enum options - CONFIG_VERSION, HEALTH_STATUS_VERSION. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_snmptrapprofile.html.markdown b/website/docs/d/avi_snmptrapprofile.html.markdown
index 5f709c1c9..a3c3a79f1 100644
--- a/website/docs/d/avi_snmptrapprofile.html.markdown
+++ b/website/docs/d/avi_snmptrapprofile.html.markdown
@@ -32,9 +32,9 @@ data "avi_snmptrapprofile" "foo_snmptrapprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `name` - A user-friendly name of the snmp trap configuration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `trap_servers` - The ip address or hostname of the snmp trap destination server. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the snmp trap profile object. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - A user-friendly name of the snmp trap configuration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `trap_servers` - The ip address or hostname of the snmp trap destination server. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the snmp trap profile object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_sslkeyandcertificate.html.markdown b/website/docs/d/avi_sslkeyandcertificate.html.markdown
index 835a2bde0..f4cc23425 100644
--- a/website/docs/d/avi_sslkeyandcertificate.html.markdown
+++ b/website/docs/d/avi_sslkeyandcertificate.html.markdown
@@ -32,32 +32,32 @@ data "avi_sslkeyandcertificate" "foo_sslkeyandcertificate" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `ca_certs` - Ca certificates in certificate chain. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `certificate` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `certificate_base64` - States if the certificate is base64 encoded. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `certificate_management_profile_ref` - It is a reference to an object of type certificatemanagementprofile. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `created_by` - Creator name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dynamic_params` - Dynamic parameters needed for certificate management profile. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_ocsp_stapling` - Enables ocsp stapling. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `enckey_base64` - Encrypted private key corresponding to the private key (e.g. Those generated by an hsm such as thales nshield). Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enckey_name` - Name of the encrypted private key (e.g. Those generated by an hsm such as thales nshield). Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `format` - Format of the key/certificate file. Enum options - SSL_PEM, SSL_PKCS12. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `hardwaresecuritymodulegroup_ref` - It is a reference to an object of type hardwaresecuritymodulegroup. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `import_key_to_hsm` - Flag to enable private key import to hsm while importing the certificate. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `is_federated` - It specifies whether the object has to be replicated to the gslb followers. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `key` - Private key. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `key_base64` - States if the private key is base64 encoded. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `key_params` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `key_passphrase` - Passphrase used to encrypt the private key. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ocsp_config` - Configuration related to ocsp. Field introduced in 20.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ocsp_error_status` - Error reported during ocsp status query. Enum options - OCSP_ERR_CERTSTATUS_GOOD, OCSP_ERR_CERTSTATUS_REVOKED, OCSP_ERR_CERTSTATUS_UNKNOWN, OCSP_ERR_CERTSTATUS_SERVERFAIL_ERR, OCSP_ERR_CERTSTATUS_JOBDB, OCSP_ERR_CERTSTATUS_DISABLED, OCSP_ERR_CERTSTATUS_GETCERT, OCSP_ERR_CERTSTATUS_NONVSCERT, OCSP_ERR_CERTSTATUS_SELFSIGNED, OCSP_ERR_CERTSTATUS_CERTFINISH, OCSP_ERR_CERTSTATUS_CACERT, OCSP_ERR_CERTSTATUS_REQUEST, OCSP_ERR_CERTSTATUS_ISSUER_REVOKED, OCSP_ERR_CERTSTATUS_PARSE_CERT, OCSP_ERR_CERTSTATUS_HTTP_REQ, OCSP_ERR_CERTSTATUS_URL_LIST, OCSP_ERR_CERTSTATUS_HTTP_SEND, OCSP_ERR_CERTSTATUS_HTTP_RECV, OCSP_ERR_CERTSTATUS_HTTP_RESP. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- ocsp_err_certstatus_disabled), basic edition(allowed values- ocsp_err_certstatus_disabled), enterprise with cloud services edition.
-* `ocsp_responder_url_list_from_certs` - This is an internal field to store the ocsp responder urls contained in the certificate. Field introduced in 20.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ocsp_response_info` - Information related to ocsp response. Field introduced in 20.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `status` - Enum options - ssl_certificate_finished, ssl_certificate_pending. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - Enum options - ssl_certificate_type_virtualservice, ssl_certificate_type_system, ssl_certificate_type_ca. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `ca_certs` - Ca certificates in certificate chain. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `certificate` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `certificate_base64` - States if the certificate is base64 encoded. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `certificate_management_profile_ref` - It is a reference to an object of type certificatemanagementprofile. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - Creator name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dynamic_params` - Dynamic parameters needed for certificate management profile. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_ocsp_stapling` - Enables ocsp stapling. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `enckey_base64` - Encrypted private key corresponding to the private key (e.g. Those generated by an hsm such as thales nshield). Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enckey_name` - Name of the encrypted private key (e.g. Those generated by an hsm such as thales nshield). Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `format` - Format of the key/certificate file. Enum options - SSL_PEM, SSL_PKCS12. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `hardwaresecuritymodulegroup_ref` - It is a reference to an object of type hardwaresecuritymodulegroup. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `import_key_to_hsm` - Flag to enable private key import to hsm while importing the certificate. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_federated` - It specifies whether the object has to be replicated to the gslb followers. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `key` - Private key. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `key_base64` - States if the private key is base64 encoded. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `key_params` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `key_passphrase` - Passphrase used to encrypt the private key. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ocsp_config` - Configuration related to ocsp. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ocsp_error_status` - Error reported during ocsp status query. Enum options - OCSP_ERR_CERTSTATUS_GOOD, OCSP_ERR_CERTSTATUS_REVOKED, OCSP_ERR_CERTSTATUS_UNKNOWN, OCSP_ERR_CERTSTATUS_SERVERFAIL_ERR, OCSP_ERR_CERTSTATUS_JOBDB, OCSP_ERR_CERTSTATUS_DISABLED, OCSP_ERR_CERTSTATUS_GETCERT, OCSP_ERR_CERTSTATUS_NONVSCERT, OCSP_ERR_CERTSTATUS_SELFSIGNED, OCSP_ERR_CERTSTATUS_CERTFINISH, OCSP_ERR_CERTSTATUS_CACERT, OCSP_ERR_CERTSTATUS_REQUEST, OCSP_ERR_CERTSTATUS_ISSUER_REVOKED, OCSP_ERR_CERTSTATUS_PARSE_CERT, OCSP_ERR_CERTSTATUS_HTTP_REQ, OCSP_ERR_CERTSTATUS_URL_LIST, OCSP_ERR_CERTSTATUS_HTTP_SEND, OCSP_ERR_CERTSTATUS_HTTP_RECV, OCSP_ERR_CERTSTATUS_HTTP_RESP. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- ocsp_err_certstatus_disabled), basic (allowed values- ocsp_err_certstatus_disabled) edition.
+* `ocsp_responder_url_list_from_certs` - This is an internal field to store the ocsp responder urls contained in the certificate. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ocsp_response_info` - Information related to ocsp response. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `status` - Enum options - ssl_certificate_finished, ssl_certificate_pending. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - Enum options - ssl_certificate_type_virtualservice, ssl_certificate_type_system, ssl_certificate_type_ca. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_sslprofile.html.markdown b/website/docs/d/avi_sslprofile.html.markdown
index 05b2738f5..44e57312f 100644
--- a/website/docs/d/avi_sslprofile.html.markdown
+++ b/website/docs/d/avi_sslprofile.html.markdown
@@ -32,26 +32,26 @@ data "avi_sslprofile" "foo_sslprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `accepted_ciphers` - Ciphers suites represented as defined by https //www.openssl.org/docs/man1.1.1/man1/ciphers.html. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `accepted_versions` - Set of versions accepted by the server. Minimum of 1 items required. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cipher_enums` - Enum options - tls_ecdhe_ecdsa_with_aes_128_gcm_sha256, tls_ecdhe_ecdsa_with_aes_256_gcm_sha384, tls_ecdhe_rsa_with_aes_128_gcm_sha256, tls_ecdhe_rsa_with_aes_256_gcm_sha384, tls_ecdhe_ecdsa_with_aes_128_cbc_sha256, tls_ecdhe_ecdsa_with_aes_256_cbc_sha384, tls_ecdhe_rsa_with_aes_128_cbc_sha256, tls_ecdhe_rsa_with_aes_256_cbc_sha384, tls_rsa_with_aes_128_gcm_sha256, tls_rsa_with_aes_256_gcm_sha384, tls_rsa_with_aes_128_cbc_sha256, tls_rsa_with_aes_256_cbc_sha256, tls_ecdhe_ecdsa_with_aes_128_cbc_sha, tls_ecdhe_ecdsa_with_aes_256_cbc_sha, tls_ecdhe_rsa_with_aes_128_cbc_sha, tls_ecdhe_rsa_with_aes_256_cbc_sha, tls_rsa_with_aes_128_cbc_sha, tls_rsa_with_aes_256_cbc_sha, tls_rsa_with_3des_ede_cbc_sha, tls_aes_256_gcm_sha384... Allowed in enterprise edition with any value, essentials edition(allowed values- tls_ecdhe_ecdsa_with_aes_128_gcm_sha256,tls_ecdhe_ecdsa_with_aes_256_gcm_sha384,tls_ecdhe_rsa_with_aes_128_gcm_sha256,tls_ecdhe_rsa_with_aes_256_gcm_sha384,tls_ecdhe_ecdsa_with_aes_128_cbc_sha256,tls_ecdhe_ecdsa_with_aes_256_cbc_sha384,tls_ecdhe_rsa_with_aes_128_cbc_sha256,tls_ecdhe_rsa_with_aes_256_cbc_sha384,tls_rsa_with_aes_128_gcm_sha256,tls_rsa_with_aes_256_gcm_sha384,tls_rsa_with_aes_128_cbc_sha256,tls_rsa_with_aes_256_cbc_sha256,tls_ecdhe_ecdsa_with_aes_128_cbc_sha,tls_ecdhe_ecdsa_with_aes_256_cbc_sha,tls_ecdhe_rsa_with_aes_128_cbc_sha,tls_ecdhe_rsa_with_aes_256_cbc_sha,tls_rsa_with_aes_128_cbc_sha,tls_rsa_with_aes_256_cbc_sha,tls_rsa_with_3des_ede_cbc_sha), basic edition(allowed values- tls_ecdhe_ecdsa_with_aes_128_gcm_sha256,tls_ecdhe_ecdsa_with_aes_256_gcm_sha384,tls_ecdhe_rsa_with_aes_128_gcm_sha256,tls_ecdhe_rsa_with_aes_256_gcm_sha384,tls_ecdhe_ecdsa_with_aes_128_cbc_sha256,tls_ecdhe_ecdsa_with_aes_256_cbc_sha384,tls_ecdhe_rsa_with_aes_128_cbc_sha256,tls_ecdhe_rsa_with_aes_256_cbc_sha384,tls_rsa_with_aes_128_gcm_sha256,tls_rsa_with_aes_256_gcm_sha384,tls_rsa_with_aes_128_cbc_sha256,tls_rsa_with_aes_256_cbc_sha256,tls_ecdhe_ecdsa_with_aes_128_cbc_sha,tls_ecdhe_ecdsa_with_aes_256_cbc_sha,tls_ecdhe_rsa_with_aes_128_cbc_sha,tls_ecdhe_rsa_with_aes_256_cbc_sha,tls_rsa_with_aes_128_cbc_sha,tls_rsa_with_aes_256_cbc_sha,tls_rsa_with_3des_ede_cbc_sha), enterprise with cloud services edition.
-* `ciphersuites` - Tls 1.3 ciphers suites represented as defined by u(https //www.openssl.org/docs/man1.1.1/man1/ciphers.html). Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is tls_aes_256_gcm_sha384-tls_aes_128_gcm_sha256, basic edition is tls_aes_256_gcm_sha384-tls_aes_128_gcm_sha256, enterprise is tls_aes_256_gcm_sha384-tls_chacha20_poly1305_sha256-tls_aes_128_gcm_sha256.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dhparam` - Dh parameters used in ssl. At this time, it is not configurable and is set to 2048 bits. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ec_named_curve` - Elliptic curve cryptography namedcurves (tls supported groups)represented as defined by rfc 8422-section 5.1.1 andhttps //www.openssl.org/docs/man1.1.0/man3/ssl_ctx_set1_curves.html. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_early_data` - Enable early data processing for tls1.3 connections. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `enable_ssl_session_reuse` - Enable ssl session re-use. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_federated` - It specifies whether the object has to be replicated to the gslb followers. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `prefer_client_cipher_ordering` - Prefer the ssl cipher ordering presented by the client during the ssl handshake over the one specified in the ssl profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `send_close_notify` - Send 'close notify' alert message for a clean shutdown of the ssl connection. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `signature_algorithm` - Signature algorithms represented as defined by rfc5246-section 7.4.1.4.1 andhttps //www.openssl.org/docs/man1.1.0/man3/ssl_ctx_set1_client_sigalgs_list.html. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ssl_rating` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssl_session_timeout` - The amount of time in seconds before an ssl session expires. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tags` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - Ssl profile type. Enum options - SSL_PROFILE_TYPE_APPLICATION, SSL_PROFILE_TYPE_SYSTEM. Field introduced in 17.2.8. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `accepted_ciphers` - Ciphers suites represented as defined by https //www.openssl.org/docs/man1.1.1/man1/ciphers.html. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `accepted_versions` - Set of versions accepted by the server. Minimum of 1 items required. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cipher_enums` - Enum options - tls_ecdhe_ecdsa_with_aes_128_gcm_sha256, tls_ecdhe_ecdsa_with_aes_256_gcm_sha384, tls_ecdhe_rsa_with_aes_128_gcm_sha256, tls_ecdhe_rsa_with_aes_256_gcm_sha384, tls_ecdhe_ecdsa_with_aes_128_cbc_sha256, tls_ecdhe_ecdsa_with_aes_256_cbc_sha384, tls_ecdhe_rsa_with_aes_128_cbc_sha256, tls_ecdhe_rsa_with_aes_256_cbc_sha384, tls_rsa_with_aes_128_gcm_sha256, tls_rsa_with_aes_256_gcm_sha384, tls_rsa_with_aes_128_cbc_sha256, tls_rsa_with_aes_256_cbc_sha256, tls_ecdhe_ecdsa_with_aes_128_cbc_sha, tls_ecdhe_ecdsa_with_aes_256_cbc_sha, tls_ecdhe_rsa_with_aes_128_cbc_sha, tls_ecdhe_rsa_with_aes_256_cbc_sha, tls_rsa_with_aes_128_cbc_sha, tls_rsa_with_aes_256_cbc_sha, tls_rsa_with_3des_ede_cbc_sha, tls_aes_256_gcm_sha384... Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- tls_ecdhe_ecdsa_with_aes_128_gcm_sha256,tls_ecdhe_ecdsa_with_aes_256_gcm_sha384,tls_ecdhe_rsa_with_aes_128_gcm_sha256,tls_ecdhe_rsa_with_aes_256_gcm_sha384,tls_ecdhe_ecdsa_with_aes_128_cbc_sha256,tls_ecdhe_ecdsa_with_aes_256_cbc_sha384,tls_ecdhe_rsa_with_aes_128_cbc_sha256,tls_ecdhe_rsa_with_aes_256_cbc_sha384,tls_rsa_with_aes_128_gcm_sha256,tls_rsa_with_aes_256_gcm_sha384,tls_rsa_with_aes_128_cbc_sha256,tls_rsa_with_aes_256_cbc_sha256,tls_ecdhe_ecdsa_with_aes_128_cbc_sha,tls_ecdhe_ecdsa_with_aes_256_cbc_sha,tls_ecdhe_rsa_with_aes_128_cbc_sha,tls_ecdhe_rsa_with_aes_256_cbc_sha,tls_rsa_with_aes_128_cbc_sha,tls_rsa_with_aes_256_cbc_sha,tls_rsa_with_3des_ede_cbc_sha), basic (allowed values- tls_ecdhe_ecdsa_with_aes_128_gcm_sha256,tls_ecdhe_ecdsa_with_aes_256_gcm_sha384,tls_ecdhe_rsa_with_aes_128_gcm_sha256,tls_ecdhe_rsa_with_aes_256_gcm_sha384,tls_ecdhe_ecdsa_with_aes_128_cbc_sha256,tls_ecdhe_ecdsa_with_aes_256_cbc_sha384,tls_ecdhe_rsa_with_aes_128_cbc_sha256,tls_ecdhe_rsa_with_aes_256_cbc_sha384,tls_rsa_with_aes_128_gcm_sha256,tls_rsa_with_aes_256_gcm_sha384,tls_rsa_with_aes_128_cbc_sha256,tls_rsa_with_aes_256_cbc_sha256,tls_ecdhe_ecdsa_with_aes_128_cbc_sha,tls_ecdhe_ecdsa_with_aes_256_cbc_sha,tls_ecdhe_rsa_with_aes_128_cbc_sha,tls_ecdhe_rsa_with_aes_256_cbc_sha,tls_rsa_with_aes_128_cbc_sha,tls_rsa_with_aes_256_cbc_sha,tls_rsa_with_3des_ede_cbc_sha) edition.
+* `ciphersuites` - Tls 1.3 ciphers suites represented as defined by u(https //www.openssl.org/docs/man1.1.1/man1/ciphers.html). Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is tls_aes_256_gcm_sha384-tls_aes_128_gcm_sha256, basic edition is tls_aes_256_gcm_sha384-tls_aes_128_gcm_sha256, enterprise edition is tls_aes_256_gcm_sha384-tls_chacha20_poly1305_sha256-tls_aes_128_gcm_sha256.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dhparam` - Dh parameters used in ssl. At this time, it is not configurable and is set to 2048 bits. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ec_named_curve` - Elliptic curve cryptography namedcurves (tls supported groups)represented as defined by rfc 8422-section 5.1.1 andhttps //www.openssl.org/docs/man1.1.0/man3/ssl_ctx_set1_curves.html. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_early_data` - Enable early data processing for tls1.3 connections. Field introduced in 18.2.6. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `enable_ssl_session_reuse` - Enable ssl session re-use. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_federated` - It specifies whether the object has to be replicated to the gslb followers. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `prefer_client_cipher_ordering` - Prefer the ssl cipher ordering presented by the client during the ssl handshake over the one specified in the ssl profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `send_close_notify` - Send 'close notify' alert message for a clean shutdown of the ssl connection. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `signature_algorithm` - Signature algorithms represented as defined by rfc5246-section 7.4.1.4.1 andhttps //www.openssl.org/docs/man1.1.0/man3/ssl_ctx_set1_client_sigalgs_list.html. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ssl_rating` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_session_timeout` - The amount of time in seconds before an ssl session expires. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tags` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - Ssl profile type. Enum options - SSL_PROFILE_TYPE_APPLICATION, SSL_PROFILE_TYPE_SYSTEM. Field introduced in 17.2.8. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_ssopolicy.html.markdown b/website/docs/d/avi_ssopolicy.html.markdown
index aca4c8db8..89b67e6c9 100644
--- a/website/docs/d/avi_ssopolicy.html.markdown
+++ b/website/docs/d/avi_ssopolicy.html.markdown
@@ -32,12 +32,12 @@ data "avi_ssopolicy" "foo_ssopolicy" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `authentication_policy` - Authentication policy settings. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `authorization_policy` - Authorization policy settings. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name of the sso policy. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - Sso policy type. Enum options - SSO_TYPE_SAML, SSO_TYPE_PINGACCESS, SSO_TYPE_JWT, SSO_TYPE_LDAP, SSO_TYPE_OAUTH. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition(allowed values- sso_type_saml, sso_type_jwt, sso_type_ldap, sso_type_oauth), enterprise with cloud services edition.
-* `uuid` - Uuid of the sso policy. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `authentication_policy` - Authentication policy settings. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `authorization_policy` - Authorization policy settings. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the sso policy. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - Sso policy type. Enum options - SSO_TYPE_SAML, SSO_TYPE_PINGACCESS, SSO_TYPE_JWT, SSO_TYPE_LDAP, SSO_TYPE_OAUTH. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, enterprise with cloud services edition. Allowed in basic (allowed values- sso_type_saml, sso_type_jwt, sso_type_ldap, sso_type_oauth) edition.
+* `uuid` - Uuid of the sso policy. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_statediffoperation.html.markdown b/website/docs/d/avi_statediffoperation.html.markdown
index 56800c2b8..b6b8a64b2 100644
--- a/website/docs/d/avi_statediffoperation.html.markdown
+++ b/website/docs/d/avi_statediffoperation.html.markdown
@@ -32,12 +32,12 @@ data "avi_statediffoperation" "foo_statediffoperation" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `events` - Info for each statediff event. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Name of statediff operation. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `node_uuid` - Uuid of node for statediff operation entry. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `operation` - Type of statediff operation. Enum options - FB_UPGRADE, FB_ROLLBACK, FB_PATCH, FB_ROLLBACK_PATCH. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `phase` - Phase of statediff operation. Enum options - FB_PRE_SNAPSHOT, FB_POST_SNAPSHOT. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `status` - Status of statediff operation. Enum options - FB_INIT, FB_IN_PROGRESS, FB_COMPLETED, FB_FAILED, FB_COMPLETED_WITH_ERRORS. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Unique identifier for statediff entry. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `events` - Info for each statediff event. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of statediff operation. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `node_uuid` - Uuid of node for statediff operation entry. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `operation` - Type of statediff operation. Enum options - FB_UPGRADE, FB_ROLLBACK, FB_PATCH, FB_ROLLBACK_PATCH. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `phase` - Phase of statediff operation. Enum options - FB_PRE_SNAPSHOT, FB_POST_SNAPSHOT. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `status` - Status of statediff operation. Enum options - FB_INIT, FB_IN_PROGRESS, FB_COMPLETED, FB_FAILED, FB_COMPLETED_WITH_ERRORS. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Unique identifier for statediff entry. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_statediffsnapshot.html.markdown b/website/docs/d/avi_statediffsnapshot.html.markdown
index fb1c75eac..dc937224b 100644
--- a/website/docs/d/avi_statediffsnapshot.html.markdown
+++ b/website/docs/d/avi_statediffsnapshot.html.markdown
@@ -32,21 +32,21 @@ data "avi_statediffsnapshot" "foo_statediffsnapshot" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `gslb_name` - Name of gslb object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gslb_uuid` - Reference to base gslb object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Name of statediff operation. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pool_name` - Name of pool object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pool_uuid` - Reference to base pool object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `post_snapshot` - Post-upgrade snapshot for vs. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pre_snapshot` - Pre-upgrade snapshot for vs. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_group_name` - Name of seg object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_group_uuid` - Reference to base seg object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_name` - Name of seg object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_uuid` - Reference to base se object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `snapshot_type` - Type of snapshot eg. Vs_snapshot, se_snapshot etc. Enum options - FB_VS_SNAPSHOT, FB_SE_SNAPSHOT, FB_GSLB_SNAPSHOT, FB_POOL_SNAPSHOT. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `statediff_operation_ref` - Statediff operation uuid for identifying the operation. It is a reference to an object of type statediffoperation. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Unique identifier for statediff entry. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vs_name` - Name of vs object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vs_uuid` - Reference to base vs object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `gslb_name` - Name of gslb object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gslb_uuid` - Reference to base gslb object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of statediff operation. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pool_name` - Name of pool object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pool_uuid` - Reference to base pool object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `post_snapshot` - Post-upgrade snapshot for vs. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pre_snapshot` - Pre-upgrade snapshot for vs. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_group_name` - Name of seg object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_group_uuid` - Reference to base seg object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_name` - Name of seg object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_uuid` - Reference to base se object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `snapshot_type` - Type of snapshot eg. Vs_snapshot, se_snapshot etc. Enum options - FB_VS_SNAPSHOT, FB_SE_SNAPSHOT, FB_GSLB_SNAPSHOT, FB_POOL_SNAPSHOT. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `statediff_operation_ref` - Statediff operation uuid for identifying the operation. It is a reference to an object of type statediffoperation. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Unique identifier for statediff entry. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vs_name` - Name of vs object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vs_uuid` - Reference to base vs object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_stringgroup.html.markdown b/website/docs/d/avi_stringgroup.html.markdown
index 321e85f96..3abe1b995 100644
--- a/website/docs/d/avi_stringgroup.html.markdown
+++ b/website/docs/d/avi_stringgroup.html.markdown
@@ -32,13 +32,13 @@ data "avi_stringgroup" "foo_stringgroup" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `kv` - Configure key value in the string group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `longest_match` - Enable the longest match, default is the shortest match. Field introduced in 18.2.8. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name of the string group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - Type of stringgroup. Enum options - SG_TYPE_STRING, SG_TYPE_KEYVAL. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the string group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `kv` - Configure key value in the string group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `longest_match` - Enable the longest match, default is the shortest match. Field introduced in 18.2.8. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the string group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - Type of stringgroup. Enum options - SG_TYPE_STRING, SG_TYPE_KEYVAL. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the string group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_systemconfiguration.html.markdown b/website/docs/d/avi_systemconfiguration.html.markdown
index eec55ae86..c6554ee48 100644
--- a/website/docs/d/avi_systemconfiguration.html.markdown
+++ b/website/docs/d/avi_systemconfiguration.html.markdown
@@ -32,34 +32,38 @@ data "avi_systemconfiguration" "foo_systemconfiguration" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `admin_auth_configuration` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `common_criteria_mode` - Common criteria mode's current state. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `controller_analytics_policy` - Controller metrics event dynamic thresholds can be set here. Controller_cpu_high and controller_mem_high evets can take configured dynamic thresholds. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `default_license_tier` - Specifies the default license tier which would be used by new clouds. Enum options - ENTERPRISE_16, ENTERPRISE, ENTERPRISE_18, BASIC, ESSENTIALS, ENTERPRISE_WITH_CLOUD_SERVICES. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is essentials, basic edition is basic, enterprise is enterprise_with_cloud_services.
-* `dns_configuration` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dns_virtualservice_refs` - Dns virtualservices hosting fqdn records for applications across avi vantage. If no virtualservices are provided, avi vantage will provide dns services for configured applications. Switching back to avi vantage from dns virtualservices is not allowed. It is a reference to an object of type virtualservice. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `docker_mode` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `email_configuration` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_cors` - Enable cors header. Field introduced in 20.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `enable_host_header_check` - Host header check. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_telemetry` - Enables sending anonymous operational metrics to avi. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `fips_mode` - Fips mode current state. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `global_tenant_config` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `host_key_algorithm_exclude` - Users can specify comma separated list of deprecated host key algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `kex_algorithm_exclude` - Users can specify comma separated list of deprecated key exchange algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `linux_configuration` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `mgmt_ip_access_control` - Configure ip access control for controller to restrict open access. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ntp_configuration` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `portal_configuration` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `proxy_configuration` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `rekey_time_limit` - Users can specify and update the time limit of rekeylimit in sshd_config.if nothing is specified, the default setting will be none. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `rekey_volume_limit` - Users can specify and update the size/volume limit of rekeylimit in sshd_config.if nothing is specified, the default setting will be default. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `secure_channel_configuration` - Configure secure channel properties. Field introduced in 18.1.4, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `snmp_configuration` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssh_ciphers` - Allowed ciphers list for ssh to the management interface on the controller and service engines. If this is not specified, all the default ciphers are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssh_hmacs` - Allowed hmac list for ssh to the management interface on the controller and service engines. If this is not specified, all the default hmacs are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `trusted_host_profiles_refs` - Trusted host profiles for host header validation. Only function when enable_host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 22.1.7, 30.2.2, 31.1.1. Maximum of 20 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `welcome_workflow_complete` - This flag is set once the initial controller setup workflow is complete. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `admin_auth_configuration` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `avi_email_login_password` - Password for avi_email_login user. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `common_criteria_mode` - Common criteria mode's current state. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_analytics_policy` - Controller metrics event dynamic thresholds can be set here. Controller_cpu_high and controller_mem_high evets can take configured dynamic thresholds. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `default_license_tier` - Specifies the default license tier which would be used by new clouds. Enum options - ENTERPRISE_16, ENTERPRISE, ENTERPRISE_18, BASIC, ESSENTIALS, ENTERPRISE_WITH_CLOUD_SERVICES. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is essentials, basic edition is basic, enterprise edition is enterprise_with_cloud_services.
+* `dns_configuration` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_virtualservice_refs` - Dns virtualservices hosting fqdn records for applications across avi vantage. If no virtualservices are provided, avi vantage will provide dns services for configured applications. Switching back to avi vantage from dns virtualservices is not allowed. It is a reference to an object of type virtualservice. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `docker_mode` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `email_configuration` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_cors` - Enable cors header. Field introduced in 20.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_host_header_check` - Validates the host header against a list of trusted domains. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `fips_mode` - Fips mode current state. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `global_tenant_config` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `host_key_algorithm_exclude` - Users can specify comma separated list of deprecated host key algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `kex_algorithm_exclude` - Users can specify comma separated list of deprecated key exchange algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `legacy_ssl_support` - Allow outgoing connections from controller to servers using tls 1.0/1.1. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `linux_configuration` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mgmt_ip_access_control` - Configure ip access control for controller to restrict open access. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ntp_configuration` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `portal_configuration` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `proxy_configuration` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rekey_time_limit` - Users can specify and update the time limit of rekeylimit in sshd_config.if nothing is specified, the default setting will be none. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `rekey_volume_limit` - Users can specify and update the size/volume limit of rekeylimit in sshd_config.if nothing is specified, the default setting will be default. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sddcmanager_fqdn` - Fqdn of sddc manager in vcf responsible for management of this alb controller cluster. Field introduced in 22.1.6,31.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `secure_channel_configuration` - Configure secure channel properties. Field introduced in 18.1.4, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `snmp_configuration` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssh_ciphers` - Allowed ciphers list for ssh to the management interface on the controller and service engines. If this is not specified, all the default ciphers are allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssh_hmacs` - Allowed hmac list for ssh to the management interface on the controller and service engines. If this is not specified, all the default hmacs are allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `telemetry_configuration` - Telemetry configuration. Field introduced in 31.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `trusted_host_profiles_refs` - Trusted host profiles for host header validation. Only works when host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 31.1.1. Maximum of 20 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `truststore_pkiprofile_ref` - Reference to pkiprofile used for validating the ca certificates for external comminications from avi load balancer controller  this acts as trust store for avi load balancer controller. It is a reference to an object of type pkiprofile. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `welcome_workflow_complete` - This flag is set once the initial controller setup workflow is complete. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_systemlimits.html.markdown b/website/docs/d/avi_systemlimits.html.markdown
index 4dcaaceff..443f74937 100644
--- a/website/docs/d/avi_systemlimits.html.markdown
+++ b/website/docs/d/avi_systemlimits.html.markdown
@@ -32,9 +32,9 @@ data "avi_systemlimits" "foo_systemlimits" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `controller_limits` - System limits for the entire controller cluster. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `controller_sizes` - Possible controller sizes. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `serviceengine_limits` - System limits that apply to a serviceengine. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid for the system limits object. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_limits` - System limits for the entire controller cluster. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_sizes` - Possible controller sizes. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `serviceengine_limits` - System limits that apply to a serviceengine. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid for the system limits object. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_systemreport.html.markdown b/website/docs/d/avi_systemreport.html.markdown
index 8b1d1161a..f3155e0ae 100644
--- a/website/docs/d/avi_systemreport.html.markdown
+++ b/website/docs/d/avi_systemreport.html.markdown
@@ -32,17 +32,20 @@ data "avi_systemreport" "foo_systemreport" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `archive_ref` - Relative path to the report archive file on filesystem.the archive includes exported system configuration and current object as json. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `controller_patch_image_ref` - Controller patch image associated with the report. It is a reference to an object of type image. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `downloadable` - Indicates whether this report is downloadable as an archive. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `events` - List of events associated with the report. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `image_ref` - System image associated with the report. It is a reference to an object of type image. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Name of the report derived from operation in a readable format. Ex  upgrade_system_1a5c. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `readiness_reports` - Readiness state of the system. Ex  upgrade pre-check results. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_patch_image_ref` - Se patch image associated with the report. It is a reference to an object of type image. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `state` - Report state combines all applicable states. Ex  readiness_reports.system_readiness.state. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `summary` - Summary of the report. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tasks` - List of tasks associated with the report. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid identifier for the report. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `archive_ref` - Relative path to the report archive file on filesystem.the archive includes exported system configuration and current object as json. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `controller_patch_image_ref` - Controller patch image associated with the report. It is a reference to an object of type image. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `downloadable` - Indicates whether this report is downloadable as an archive. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dryrun_info` - Dry-run report. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `events` - List of events associated with the report. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `image_ref` - System image associated with the report. It is a reference to an object of type image. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of the report derived from operation in a readable format. Ex  upgrade_system_1a5c. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `operation` - Nature of operation. Ex  controller upgrade, system patch, etc. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `readiness_reports` - Readiness state of the system. Ex  upgrade pre-check results. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_patch_image_ref` - Se patch image associated with the report. It is a reference to an object of type image. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `state` - Report state combines all applicable states. Ex  readiness_reports.system_readiness.state. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `summary` - Summary of the report. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks` - List of tasks associated with the report. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `type` - Type of report. Pre-checks, dry-run or an upgrade operation. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid identifier for the report. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_taskjournal.html.markdown b/website/docs/d/avi_taskjournal.html.markdown
index a6304c4f0..64318c10a 100644
--- a/website/docs/d/avi_taskjournal.html.markdown
+++ b/website/docs/d/avi_taskjournal.html.markdown
@@ -32,14 +32,15 @@ data "avi_taskjournal" "foo_taskjournal" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `errors` - List of errors in the process. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `image_ref` - Image uuid for identifying the current base image. It is a reference to an object of type image. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `info` - Detailed information of journal. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Name for the task journal. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `obj_cloud_ref` - Cloud that this object belongs to. It is a reference to an object of type cloud. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `operation` - Operation for which the task journal created. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `patch_image_ref` - Image uuid for identifying the current patch. It is a reference to an object of type image. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `summary` - Summary of journal. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid identifier for the task journal. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `errors` - List of errors in the process. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `image_ref` - Image uuid for identifying the current base image. It is a reference to an object of type image. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `info` - Detailed information of journal. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name for the task journal. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_cloud_ref` - Cloud that this object belongs to. It is a reference to an object of type cloud. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `operation` - Operation for which the task journal created. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `patch_image_ref` - Image uuid for identifying the current patch. It is a reference to an object of type image. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `summary` - Summary of journal. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks` - List of all the tasks executed with details. For example, details of tasks to be executed for upgrade filecopy. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid identifier for the task journal. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_tenant.html.markdown b/website/docs/d/avi_tenant.html.markdown
index 0c4c5814d..20bc87d41 100644
--- a/website/docs/d/avi_tenant.html.markdown
+++ b/website/docs/d/avi_tenant.html.markdown
@@ -32,14 +32,14 @@ data "avi_tenant" "foo_tenant" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `attrs` - Key/value tenant attributes. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `config_settings` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `created_by` - Creator of this tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enforce_label_group` - The referred label groups are enforced on the tenant if this is set to true.if this is set to false, the label groups are suggested for the tenant. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `label_group_refs` - The label_groups to be enforced on the tenant. This is strictly enforced only if enforce_label_group is set to true. It is a reference to an object of type labelgroup. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `local` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `attrs` - Key/value tenant attributes. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `config_settings` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - Creator of this tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enforce_label_group` - The referred label groups are enforced on the tenant if this is set to true.if this is set to false, the label groups are suggested for the tenant. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `label_group_refs` - The label_groups to be enforced on the tenant. This is strictly enforced only if enforce_label_group is set to true. It is a reference to an object of type labelgroup. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `local` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_tenantsystemconfiguration.html.markdown b/website/docs/d/avi_tenantsystemconfiguration.html.markdown
index 5b98d4530..4a6691ca9 100644
--- a/website/docs/d/avi_tenantsystemconfiguration.html.markdown
+++ b/website/docs/d/avi_tenantsystemconfiguration.html.markdown
@@ -32,9 +32,9 @@ data "avi_tenantsystemconfiguration" "foo_tenantsystemconfiguration" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `dns_virtualservice_refs` - Dns virtual services hosting fqdn records for applications configured within this tenant. It is a reference to an object of type virtualservice. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Name of the tenant system configuration object. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Unique identifier of the tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Tenant system configuration uuid. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 30.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_virtualservice_refs` - Dns virtual services hosting fqdn records for applications configured within this tenant. It is a reference to an object of type virtualservice. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of the tenant system configuration object. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Unique identifier of the tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Tenant system configuration uuid. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_testsedatastorelevel1.html.markdown b/website/docs/d/avi_testsedatastorelevel1.html.markdown
index f9d41cee5..7d5d2f35c 100644
--- a/website/docs/d/avi_testsedatastorelevel1.html.markdown
+++ b/website/docs/d/avi_testsedatastorelevel1.html.markdown
@@ -32,9 +32,9 @@ data "avi_testsedatastorelevel1" "foo_testsedatastorelevel1" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `test_se_datastore_level_2_ref` - It is a reference to an object of type testsedatastorelevel2. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `test_se_datastore_level_2_ref` - It is a reference to an object of type testsedatastorelevel2. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_testsedatastorelevel2.html.markdown b/website/docs/d/avi_testsedatastorelevel2.html.markdown
index 220e2faf6..a6b7d2645 100644
--- a/website/docs/d/avi_testsedatastorelevel2.html.markdown
+++ b/website/docs/d/avi_testsedatastorelevel2.html.markdown
@@ -32,9 +32,9 @@ data "avi_testsedatastorelevel2" "foo_testsedatastorelevel2" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `test_se_datastore_level_3_refs` - It is a reference to an object of type testsedatastorelevel3. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `test_se_datastore_level_3_refs` - It is a reference to an object of type testsedatastorelevel3. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_testsedatastorelevel3.html.markdown b/website/docs/d/avi_testsedatastorelevel3.html.markdown
index 8e671cf46..cde1e4103 100644
--- a/website/docs/d/avi_testsedatastorelevel3.html.markdown
+++ b/website/docs/d/avi_testsedatastorelevel3.html.markdown
@@ -32,8 +32,8 @@ data "avi_testsedatastorelevel3" "foo_testsedatastorelevel3" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_trafficcloneprofile.html.markdown b/website/docs/d/avi_trafficcloneprofile.html.markdown
index 9aaba3417..79df722dd 100644
--- a/website/docs/d/avi_trafficcloneprofile.html.markdown
+++ b/website/docs/d/avi_trafficcloneprofile.html.markdown
@@ -34,12 +34,12 @@ data "avi_trafficcloneprofile" "foo_trafficcloneprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `clone_servers` - Field introduced in 17.1.1. Maximum of 10 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - It is a reference to an object of type cloud. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name for the traffic clone profile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `preserve_client_ip` - Specifies if client ip needs to be preserved to clone destination. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the traffic clone profile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `clone_servers` - Field introduced in 17.1.1. Maximum of 10 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - It is a reference to an object of type cloud. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name for the traffic clone profile. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `preserve_client_ip` - Specifies if client ip needs to be preserved to clone destination. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the traffic clone profile. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_trustedhostprofile.html.markdown b/website/docs/d/avi_trustedhostprofile.html.markdown
index c45e57464..b6065ad15 100644
--- a/website/docs/d/avi_trustedhostprofile.html.markdown
+++ b/website/docs/d/avi_trustedhostprofile.html.markdown
@@ -32,9 +32,9 @@ data "avi_trustedhostprofile" "foo_trustedhostprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `hosts` - List of host ip(v4/v6) addresses or fqdns. Field introduced in 22.1.7, 30.2.2, 31.1.1. Minimum of 1 items required. Maximum of 20 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Trustedhostprofile name. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Tenant ref for trusted host profile. It is a reference to an object of type tenant. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Trustedhostprofile uuid. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 31.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `hosts` - List of host ip(v4/v6) addresses or fqdns. Field introduced in 31.1.1. Minimum of 1 items required. Maximum of 20 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Trustedhostprofile name. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant ref for trusted host profile. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Trustedhostprofile uuid. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_upgradeprofile.html.markdown b/website/docs/d/avi_upgradeprofile.html.markdown
new file mode 100644
index 000000000..386ec9e24
--- /dev/null
+++ b/website/docs/d/avi_upgradeprofile.html.markdown
@@ -0,0 +1,41 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "AVI: avi_upgradeprofile"
+sidebar_current: "docs-avi-datasource-upgradeprofile"
+description: |-
+  Get information of Avi UpgradeProfile.
+---
+
+# avi_upgradeprofile
+
+This data source is used to to get avi_upgradeprofile objects.
+
+## Example Usage
+
+```hcl
+data "avi_upgradeprofile" "foo_upgradeprofile" {
+    uuid = "upgradeprofile-f9cf6b3e-a411-436f-95e2-2982ba2b217b"
+    name = "foo"
+}
+```
+
+## Argument Reference
+
+* `name` - (Optional) Search UpgradeProfile by name.
+* `uuid` - (Optional) Search UpgradeProfile by uuid.
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `controller_params` - List of controller upgrade related configurable parameters. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dry_run` - List of dryrun related configurable parameters. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `image` - List of image related configurable parameters. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pre_checks` - List of upgrade pre-checks related configurable parameters. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `service_engine` - List of service engine upgrade related configurable parameters. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid identifier for the upgradeprofile object. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/d/avi_upgradestatusinfo.html.markdown b/website/docs/d/avi_upgradestatusinfo.html.markdown
index 75ce56397..ac27952b6 100644
--- a/website/docs/d/avi_upgradestatusinfo.html.markdown
+++ b/website/docs/d/avi_upgradestatusinfo.html.markdown
@@ -32,52 +32,55 @@ data "avi_upgradestatusinfo" "foo_upgradestatusinfo" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `after_reboot_rollback_fnc` - Backward compatible abort function name. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `after_reboot_task_name` - Backward compatible task dict name. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `clean` - Flag for clean installation. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `duration` - Duration of upgrade operation in seconds. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_patch_rollback` - Check if the patch rollback is possible on this node. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_rollback` - Check if the rollback is possible on this node. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `end_time` - End time of upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enqueue_time` - Enqueue time of upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fips_mode` - Fips mode for the entire system. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `history` - Record of past operations on this node. Field introduced in 20.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `image_path` - Image path of current base image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `image_ref` - Image uuid for identifying the current base image. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Name of the system such as cluster name, se group name and se name. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `node_type` - Type of the system such as controller_cluster, se_group or se. Enum options - NODE_CONTROLLER_CLUSTER, NODE_SE_GROUP, NODE_SE_TYPE. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `obj_cloud_ref` - Cloud that this object belongs to. It is a reference to an object of type cloud. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `params` - Parameters associated with the upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `patch_image_path` - Image path of current patch image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `patch_image_ref` - Image uuid for identifying the current patch.example  base-image is 18.2.6 and a patch 6p1 is applied, then this field will indicate the 6p1 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `patch_list` - List of patches applied to this node. Example  base-image is 18.2.6 and a patch 6p1 is applied, then a patch 6p5 applied. This field will indicate the [{'6p1', '6p1_image_uuid'}, {'6p5', '6p5_image_uuid'}] value. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `patch_reboot` - Flag for patch op with reboot. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `patch_version` - Current patch version applied to this node. Example  base-image is 18.2.6 and a patch 6p1 is applied, then this field will indicate the 6p1 value. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `prev_image_path` - Image path of previous base image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `prev_patch_image_path` - Image path of previous patch image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `previous_image_ref` - Image uuid for identifying previous base image.example  base-image was 18.2.5 and an upgrade was done to 18.2.6, then this field will indicate the 18.2.5 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `previous_patch_image_ref` - Image uuid for identifying previous patch.example  base-image was 18.2.6 with a patch 6p1. Upgrade was initiated to 18.2.8 with patch 8p1. The previous_image field will contain 18.2.6 and this field will indicate the 6p1 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `previous_patch_list` - List of patches applied to this node on previous major version. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `previous_patch_version` - Previous patch version applied to this node.example  base-image was 18.2.6 with a patch 6p1. Upgrade was initiated to 18.2.8 with patch 8p1. The previous_image field will contain 18.2.6 and this field will indicate the 6p1 value. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `previous_version` - Previous version prior to upgrade.example  base-image was 18.2.5 and an upgrade was done to 18.2.6, then this field will indicate the 18.2.5 value. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `progress` - Upgrade operations progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 18.2.8, 20.1.1. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `reason` - Descriptive reason for the upgrade state. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_patch_image_path` - Image path of se patch image.(required in case of reimage and upgrade + patch). Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_patch_image_ref` - Image uuid for identifying the current se patch required in case of system upgrade(re-image) with se patch. It is a reference to an object of type image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_upgrade_events` - Serviceenginegroup upgrade errors. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `seg_params` - Se_patch may be different from the controller_patch. It has to be saved in the journal for subsequent consumption. The segroup params will be saved in the controller entry as seg_params. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `seg_status` - Detailed segroup status. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `start_time` - Start time of upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `state` - Current status of the upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `statediff_ref` - Record of pre/post snapshot captured for current upgrade operation. It is a reference to an object of type statediffoperation. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `system` - Flag is set only in the cluster if the upgrade is initiated as a system-upgrade. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `system_report_refs` - Tracks the list of reports created for node. It is a reference to an object of type systemreport. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tasks_completed` - Completed set of tasks in the upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `total_tasks` - Total number of tasks in the upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upgrade_events` - Events performed for upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upgrade_ops` - Upgrade operations requested. Enum options - UPGRADE, PATCH, ROLLBACK, ROLLBACKPATCH, SEGROUP_RESUME, EVAL_UPGRADE, EVAL_PATCH, EVAL_ROLLBACK, EVAL_ROLLBACKPATCH, EVAL_SEGROUP_RESUME, EVAL_RESTORE, RESTORE. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upgrade_readiness` - Upgrade readiness check execution detail. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid identifier for the system such as cluster, se group and se. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `version` - Current base image applied to this node. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `after_reboot_rollback_fnc` - Backward compatible abort function name. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `after_reboot_task_name` - Backward compatible task dict name. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `clean` - Flag for clean installation. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dryrun_info` - Upgrade dry-run operation details. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `duration` - Duration of upgrade operation in seconds. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_patch_rollback` - Check if the patch rollback is possible on this node. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_rollback` - Check if the rollback is possible on this node. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `end_time` - End time of upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enqueue_time` - Enqueue time of upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fips_mode` - Fips mode for the entire system. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `history` - Record of past operations on this node. Field introduced in 20.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `image_path` - Image path of current base image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `image_ref` - Image uuid for identifying the current base image. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the system such as cluster name, se group name and se name. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `node_type` - Type of the system such as controller_cluster, se_group or se. Enum options - NODE_CONTROLLER_CLUSTER, NODE_SE_GROUP, NODE_SE_TYPE. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `obj_cloud_ref` - Cloud that this object belongs to. It is a reference to an object of type cloud. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `params` - Parameters associated with the upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `patch_image_path` - Image path of current patch image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `patch_image_ref` - Image uuid for identifying the current patch.example  base-image is 18.2.6 and a patch 6p1 is applied, then this field will indicate the 6p1 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `patch_list` - List of patches applied to this node. Example  base-image is 18.2.6 and a patch 6p1 is applied, then a patch 6p5 applied. This field will indicate the [{'6p1', '6p1_image_uuid'}, {'6p5', '6p5_image_uuid'}] value. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `patch_reboot` - Flag for patch op with reboot. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `patch_version` - Current patch version applied to this node. Example  base-image is 18.2.6 and a patch 6p1 is applied, then this field will indicate the 6p1 value. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `prev_image_path` - Image path of previous base image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `prev_patch_image_path` - Image path of previous patch image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `prev_remote_image_ref` - Remote image reference of previous base image. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `previous_image_ref` - Image uuid for identifying previous base image.example  base-image was 18.2.5 and an upgrade was done to 18.2.6, then this field will indicate the 18.2.5 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `previous_patch_image_ref` - Image uuid for identifying previous patch.example  base-image was 18.2.6 with a patch 6p1. Upgrade was initiated to 18.2.8 with patch 8p1. The previous_image field will contain 18.2.6 and this field will indicate the 6p1 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `previous_patch_list` - List of patches applied to this node on previous major version. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `previous_patch_version` - Previous patch version applied to this node.example  base-image was 18.2.6 with a patch 6p1. Upgrade was initiated to 18.2.8 with patch 8p1. The previous_image field will contain 18.2.6 and this field will indicate the 6p1 value. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `previous_version` - Previous version prior to upgrade.example  base-image was 18.2.5 and an upgrade was done to 18.2.6, then this field will indicate the 18.2.5 value. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `progress` - Upgrade operations progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 18.2.8, 20.1.1. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `reason` - Descriptive reason for the upgrade state. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `remote_image_ref` - Remote image reference of current base image. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_patch_image_path` - Image path of se patch image.(required in case of reimage and upgrade + patch). Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_patch_image_ref` - Image uuid for identifying the current se patch required in case of system upgrade(re-image) with se patch. It is a reference to an object of type image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_upgrade_events` - Serviceenginegroup upgrade errors. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `seg_params` - Se_patch may be different from the controller_patch. It has to be saved in the journal for subsequent consumption. The segroup params will be saved in the controller entry as seg_params. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `seg_status` - Detailed segroup status. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `start_time` - Start time of upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `state` - Current status of the upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `statediff_ref` - Record of pre/post snapshot captured for current upgrade operation. It is a reference to an object of type statediffoperation. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `system` - Flag is set only in the cluster if the upgrade is initiated as a system-upgrade. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `system_report_refs` - Tracks the list of reports created for node. It is a reference to an object of type systemreport. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks_completed` - Completed set of tasks in the upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `total_tasks` - Total number of tasks in the upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `upgrade_events` - Events performed for upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `upgrade_ops` - Upgrade operations requested. Enum options - UPGRADE, PATCH, ROLLBACK, ROLLBACKPATCH, SEGROUP_RESUME, EVAL_UPGRADE, EVAL_PATCH, EVAL_ROLLBACK, EVAL_ROLLBACKPATCH, EVAL_SEGROUP_RESUME, EVAL_RESTORE, RESTORE, UPGRADE_DRYRUN. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `upgrade_readiness` - Upgrade readiness check execution detail. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid identifier for the system such as cluster, se group and se. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `version` - Current base image applied to this node. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_upgradestatussummary.html.markdown b/website/docs/d/avi_upgradestatussummary.html.markdown
index fc8577049..811cc318d 100644
--- a/website/docs/d/avi_upgradestatussummary.html.markdown
+++ b/website/docs/d/avi_upgradestatussummary.html.markdown
@@ -32,20 +32,20 @@ data "avi_upgradestatussummary" "foo_upgradestatussummary" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `enable_patch_rollback` - Check if the patch rollback is possible on this node. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_rollback` - Check if the rollback is possible on this node. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `end_time` - End time of upgrade operations. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `image_ref` - Image uuid for identifying the current base image. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Name of the system such as cluster name, se group name and se name. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `node_type` - Type of the system such as controller_cluster, se_group or se. Enum options - NODE_CONTROLLER_CLUSTER, NODE_SE_GROUP, NODE_SE_TYPE. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `obj_cloud_ref` - Cloud that this object belongs to. It is a reference to an object of type cloud. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `patch_image_ref` - Image uuid for identifying the current patch. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `start_time` - Start time of upgrade operations. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `state` - Current status of the upgrade operations. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tasks_completed` - Upgrade tasks completed. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `total_tasks` - Total upgrade tasks. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upgrade_ops` - Upgrade operations requested. Enum options - UPGRADE, PATCH, ROLLBACK, ROLLBACKPATCH, SEGROUP_RESUME, EVAL_UPGRADE, EVAL_PATCH, EVAL_ROLLBACK, EVAL_ROLLBACKPATCH, EVAL_SEGROUP_RESUME, EVAL_RESTORE, RESTORE. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid identifier for the system such as cluster, se group and se. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `version` - Current base image applied to this node. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `enable_patch_rollback` - Check if the patch rollback is possible on this node. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_rollback` - Check if the rollback is possible on this node. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `end_time` - End time of upgrade operations. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `image_ref` - Image uuid for identifying the current base image. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name of the system such as cluster name, se group name and se name. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `node_type` - Type of the system such as controller_cluster, se_group or se. Enum options - NODE_CONTROLLER_CLUSTER, NODE_SE_GROUP, NODE_SE_TYPE. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `obj_cloud_ref` - Cloud that this object belongs to. It is a reference to an object of type cloud. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `patch_image_ref` - Image uuid for identifying the current patch. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `start_time` - Start time of upgrade operations. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `state` - Current status of the upgrade operations. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tasks_completed` - Upgrade tasks completed. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `total_tasks` - Total upgrade tasks. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `upgrade_ops` - Upgrade operations requested. Enum options - UPGRADE, PATCH, ROLLBACK, ROLLBACKPATCH, SEGROUP_RESUME, EVAL_UPGRADE, EVAL_PATCH, EVAL_ROLLBACK, EVAL_ROLLBACKPATCH, EVAL_SEGROUP_RESUME, EVAL_RESTORE, RESTORE, UPGRADE_DRYRUN. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid identifier for the system such as cluster, se group and se. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `version` - Current base image applied to this node. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_user.html.markdown b/website/docs/d/avi_user.html.markdown
index 99c3406db..39ed60066 100644
--- a/website/docs/d/avi_user.html.markdown
+++ b/website/docs/d/avi_user.html.markdown
@@ -32,28 +32,28 @@ data "avi_user" "foo_user" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `access` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `anonymous_user` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `date_joined` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `default_tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `email` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `full_name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_active` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_internal_user` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_staff` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_superuser` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `local` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `logged_in` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `password` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `passwordless` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `recovery_token` - Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `service_user` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `token_expiration_date` - Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `ui_property` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uid` - Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `unix_crypt_password` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `user_profile_ref` - It is a reference to an object of type useraccountprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `username` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `access` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `anonymous_user` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `date_joined` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `default_tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `email` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `full_name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_active` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_internal_user` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_staff` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_superuser` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `local` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `logged_in` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `password` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `passwordless` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `recovery_token` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_user` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `token_expiration_date` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ui_property` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `unix_crypt_password` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `user_profile_ref` - It is a reference to an object of type useraccountprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `username` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_useraccountprofile.html.markdown b/website/docs/d/avi_useraccountprofile.html.markdown
index 62786bda6..a378a65a7 100644
--- a/website/docs/d/avi_useraccountprofile.html.markdown
+++ b/website/docs/d/avi_useraccountprofile.html.markdown
@@ -32,13 +32,13 @@ data "avi_useraccountprofile" "foo_useraccountprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `account_lock_timeout` - Lock timeout period (in minutes). Default is 30 minutes. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `credentials_timeout_threshold` - The time period after which credentials expire. Default is 180 days. Unit is days. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `login_failure_count_expiry_window` - The configurable time window beyond which we need to pop all the login failure timestamps from the login_failure_timestamps. Special values are 0 - do not reset login_failure_counts on the basis of time. Field introduced in 22.1.1. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `max_concurrent_sessions` - Maximum number of concurrent sessions allowed. There are unlimited sessions by default. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_login_failure_count` - Number of login attempts before lockout. Default is 3 attempts. Allowed values are 3-20. Special values are 0- unlimited login attempts allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_password_history_count` - Maximum number of passwords to be maintained in the password history. Default is 4 passwords. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `account_lock_timeout` - Lock timeout period (in minutes). Default is 30 minutes. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `credentials_timeout_threshold` - The time period after which credentials expire. Default is 180 days. Unit is days. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `login_failure_count_expiry_window` - The configurable time window beyond which we need to pop all the login failure timestamps from the login_failure_timestamps. Special values are 0 - do not reset login_failure_counts on the basis of time. Field introduced in 22.1.1. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `max_concurrent_sessions` - Maximum number of concurrent sessions allowed. There are unlimited sessions by default. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_login_failure_count` - Number of login attempts before lockout. Default is 3 attempts. Allowed values are 3-20. Special values are 0- unlimited login attempts allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_password_history_count` - Maximum number of passwords to be maintained in the password history. Default is 4 passwords. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_vcenterserver.html.markdown b/website/docs/d/avi_vcenterserver.html.markdown
index e216bf7d2..15cd156b0 100644
--- a/website/docs/d/avi_vcenterserver.html.markdown
+++ b/website/docs/d/avi_vcenterserver.html.markdown
@@ -34,12 +34,12 @@ data "avi_vcenterserver" "foo_vcenterserver" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `cloud_ref` - Vcenter belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `content_lib` - Vcenter template to create service engine. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Availabilty zone where vcenter list belongs to. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - Vcenter belongs to tenant. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Vcenter config uuid. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_credentials_ref` - Credentials to access vcenter. It is a reference to an object of type cloudconnectoruser. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_url` - Vcenter hostname or ip address. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - Vcenter belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `content_lib` - Vcenter template to create service engine. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Availabilty zone where vcenter list belongs to. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Vcenter belongs to tenant. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Vcenter config uuid. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_credentials_ref` - Credentials to access vcenter. It is a reference to an object of type cloudconnectoruser. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_url` - Vcenter hostname or ip address. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_virtualservice.html.markdown b/website/docs/d/avi_virtualservice.html.markdown
index 7f95d5ab8..ca8df7941 100644
--- a/website/docs/d/avi_virtualservice.html.markdown
+++ b/website/docs/d/avi_virtualservice.html.markdown
@@ -34,100 +34,100 @@ data "avi_virtualservice" "foo_virtualservice" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `active_standby_se_tag` - This configuration only applies if the virtualservice is in legacy active standby ha mode and load distribution among active standby is enabled. This field is used to tag the virtualservice so that virtualservices with the same tag will share the same active serviceengine. Virtualservices with different tags will have different active serviceengines. If one of the serviceengine's in the serviceenginegroup fails, all virtualservices will end up using the same active serviceengine. Redistribution of the virtualservices can be either manual or automated when the failed serviceengine recovers. Redistribution is based on the auto redistribute property of the serviceenginegroup. Enum options - ACTIVE_STANDBY_SE_1, ACTIVE_STANDBY_SE_2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `advertise_down_vs` - Keep advertising virtual service via bgp even if it is marked down by health monitor. This setting takes effect for future virtual service flaps. To advertise current vses that are down, please disable and re-enable the virtual service. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `allow_invalid_client_cert` - Process request even if invalid client certificate is presented. Datascript apis need to be used for processing of such requests. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `analytics_policy` - Determines analytics settings for the application. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `analytics_profile_ref` - Specifies settings related to analytics. It is a reference to an object of type analyticsprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `application_profile_ref` - Enable application layer specific features for the virtual service. It is a reference to an object of type applicationprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is system-l4-application.
-* `azure_availability_set` - (internal-use)applicable for azure only. Azure availability set to which this vs is associated. Internally set by the cloud connector. Field introduced in 17.2.12, 18.1.2. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `bgp_local_preference` - Local_pref to be used for vsvip advertised. Applicable only over ibgp. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `bgp_num_as_path_prepend` - Number of times the local as should be prepended additionally to vsvip. Applicable only over ebgp. Allowed values are 1-10. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `bgp_peer_labels` - Select bgp peers, using peer label, for vsvip advertisement. Field introduced in 20.1.5. Maximum of 128 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `bot_policy_ref` - Bot detection policy for the virtual service. It is a reference to an object of type botdetectionpolicy. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `bulk_sync_kvcache` - (this is a beta feature). Sync key-value cache to the new ses when vs is scaled out. For ex  ssl sessions are stored using vs's key-value cache. When the vs is scaled out, the ssl session information is synced to the new se, allowing existing ssl sessions to be reused on the new se. Field introduced in 17.2.7, 18.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `close_client_conn_on_config_update` - Close client connection on vs config update. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `cloud_config_cksum` - Checksum of cloud configuration for vs. Internally set by cloud connector. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_type` - Enum options - cloud_none, cloud_vcenter, cloud_openstack, cloud_aws, cloud_vca, cloud_apic, cloud_mesos, cloud_linuxserver, cloud_docker_ucp, cloud_rancher, cloud_oshift_k8s, cloud_azure, cloud_gcp, cloud_nsxt. Allowed in enterprise edition with any value, essentials edition(allowed values- cloud_none,cloud_vcenter), basic edition(allowed values- cloud_none,cloud_nsxt), enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `connections_rate_limit` - Rate limit the incoming connections to this virtual service. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `content_rewrite` - Profile used to match and rewrite strings in request and/or response body. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `created_by` - Creator name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `csrf_policy_ref` - Csrf protection policy for the virtual service. It is a reference to an object of type csrfpolicy. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `delay_fairness` - Select the algorithm for qos fairness. This determines how multiple virtual services sharing the same service engines will prioritize traffic over a congested network. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dns_info` - Service discovery specific data including fully qualified domain name, type and time-to-live of the dns record. Note that only one of fqdn and dns_info setting is allowed. Maximum of 1000 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dns_policies` - Dns policies applied on the dns traffic of the virtual service. Field introduced in 17.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `east_west_placement` - Force placement on all se's in service group (mesos mode only). Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `enable_autogw` - Response traffic to clients will be sent back to the source mac address of the connection, rather than statically sent to a default gateway. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition. Special default for essentials edition is false, basic edition is false, enterprise is true.
-* `enable_rhi` - Enable route health injection using the bgp config in the vrf context. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_rhi_snat` - Enable route health injection for source nat'ted floating ip address using the bgp config in the vrf context. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_session` - Enable http sessions for this virtual service. If enabled, a session cookie will be added to http responses and persistent key-value store will be activated. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enabled` - Enable or disable the virtual service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `error_page_profile_ref` - Error page profile to be used for this virtualservice.this profile is used to send the custom error page to the client generated by the proxy. It is a reference to an object of type errorpageprofile. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `flow_dist` - Criteria for flow distribution among ses. Enum options - LOAD_AWARE, CONSISTENT_HASH_SOURCE_IP_ADDRESS, CONSISTENT_HASH_SOURCE_IP_ADDRESS_AND_PORT. Allowed in enterprise edition with any value, essentials edition(allowed values- load_aware), basic edition(allowed values- load_aware), enterprise with cloud services edition.
-* `flow_label_type` - Criteria for flow labelling. Enum options - NO_LABEL, APPLICATION_LABEL, SERVICE_LABEL. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fqdn` - Dns resolvable, fully qualified domain name of the virtualservice. Only one of 'fqdn' and 'dns_info' configuration is allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `host_name_xlate` - Translate the host name sent to the servers to this value. Translate the host name sent from servers back to the value used by the client. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `http_policies` - Http policies applied on the data traffic of the virtual service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `icap_request_profile_refs` - The config settings for the icap server when checking the http request. It is a reference to an object of type icapprofile. Field introduced in 20.1.1. Maximum of 1 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ign_pool_net_reach` - Ignore pool servers network reachability constraints for virtual service placement. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `jwt_config` - Application-specific config for jwt validation. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `l4_policies` - L4 policies applied to the data traffic of the virtual service. Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ldap_vs_config` - Application-specific ldap config. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `limit_doser` - Limit potential dos attackers who exceed max_cps_per_client significantly to a fraction of max_cps_per_client for a while. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `max_cps_per_client` - Maximum connections per second per client ip. Allowed values are 10-1000. Special values are 0- unlimited. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `microservice_ref` - Microservice representing the virtual service. It is a reference to an object of type microservice. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `min_pools_up` - Minimum number of up pools to mark vs up. Field introduced in 18.2.1, 17.2.12. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Name for the virtual service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `network_profile_ref` - Determines network settings such as protocol, tcp or udp, and related options for the protocol. It is a reference to an object of type networkprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is system-tcp-fast-path.
-* `network_security_policy_ref` - Network security policies for the virtual service. It is a reference to an object of type networksecuritypolicy. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nsx_securitygroup` - A list of nsx groups representing the clients which can access the virtual ip of the virtual service. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `oauth_vs_config` - Virtualservice specific oauth config. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `performance_limits` - Optional settings that determine performance limits like max connections or bandwdith etc. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pool_group_ref` - The pool group is an object that contains pools. It is a reference to an object of type poolgroup. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `pool_ref` - The pool is an object that contains destination servers and related attributes such as load-balancing and persistence. It is a reference to an object of type pool. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `remove_listening_port_on_vs_down` - Remove listening port if virtualservice is down. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `requests_rate_limit` - Rate limit the incoming requests to this virtual service. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `revoke_vip_route` - Revoke the advertisement of virtual service via the cloud if it is marked down by health monitor. Supported for nsxt clouds only.this setting takes effect for future virtual service flaps. To advertise current vses that are down, please disable and re-enable the virtual service. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `saml_sp_config` - Application-specific saml config. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `scaleout_ecmp` - Disable re-distribution of flows across service engines for a virtual service. Enable if the network itself performs flow hashing with ecmp in environments such as gcp. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_group_ref` - The service engine group to use for this virtual service. Moving to a new se group is disruptive to existing connections for this vs. It is a reference to an object of type serviceenginegroup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `security_policy_ref` - Security policy applied on the traffic of the virtual service. This policy is used to perform security actions such as distributed denial of service (ddos) attack mitigation, etc. It is a reference to an object of type securitypolicy. Field introduced in 18.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `server_network_profile_ref` - Determines the network settings profile for the server side of tcp proxied connections. Leave blank to use the same settings as the client to vs side of the connection. It is a reference to an object of type networkprofile. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `service_metadata` - Metadata pertaining to the service provided by this virtual service. In openshift/kubernetes environments, egress pod info is stored. Any user input to this field will be overwritten by avi vantage. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `service_pool_select` - Select pool based on destination port. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `services` - List of services defined for this virtual service. Maximum of 2048 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sideband_profile` - Sideband configuration to be used for this virtualservice.it can be used for sending traffic to sideband vips for external inspection etc. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `snat_ip` - Nat'ted floating source ip address(es) for upstream connection to servers. Maximum of 32 items allowed. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `snat_ip6_addresses` - Ipv6 address for se snat. Field introduced in 30.2.1. Maximum of 32 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `sp_pool_refs` - Gslb pools used to manage site-persistence functionality. Each site-persistence pool contains the virtualservices in all the other sites, that is auto-generated by the gslb manager. This is a read-only field for the user. It is a reference to an object of type pool. Field introduced in 17.2.2. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `ssl_key_and_certificate_refs` - Select or create one or two certificates, ec and/or rsa, that will be presented to ssl/tls terminated connections. It is a reference to an object of type sslkeyandcertificate. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssl_profile_ref` - Determines the set of ssl versions and ciphers to accept for ssl/tls terminated connections. It is a reference to an object of type sslprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssl_profile_selectors` - Select ssl profile based on client ip address match. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ssl_sess_cache_avg_size` - Expected number of ssl session cache entries (may be exceeded). Allowed values are 1024-16383. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sso_policy_ref` - The sso policy attached to the virtualservice. It is a reference to an object of type ssopolicy. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `static_dns_records` - List of static dns records applied to this virtual service. These are static entries and no health monitoring is performed against the ip addresses. Maximum of 1000 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `test_se_datastore_level_1_ref` - Used for testing se datastore upgrade 2.0 functionality. It is a reference to an object of type testsedatastorelevel1. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `topology_policies` - Topology policies applied on the dns traffic of the virtual service based ongslb topology algorithm. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `traffic_clone_profile_ref` - Server network or list of servers for cloning traffic. It is a reference to an object of type trafficcloneprofile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `traffic_enabled` - Knob to enable the virtual service traffic on its assigned service engines. This setting is effective only when the enabled flag is set to true. Field introduced in 17.2.8. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - Specify if this is a normal virtual service, or if it is the parent or child of an sni-enabled virtual hosted virtual service. Enum options - VS_TYPE_NORMAL, VS_TYPE_VH_PARENT, VS_TYPE_VH_CHILD. Allowed in enterprise edition with any value, essentials edition(allowed values- vs_type_normal), basic edition(allowed values- vs_type_normal,vs_type_vh_parent), enterprise with cloud services edition.
-* `use_bridge_ip_as_vip` - Use bridge ip as vip on each host in mesos deployments. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `use_vip_as_snat` - Use the virtual ip as the snat ip for health monitoring and sending traffic to the backend servers instead of the service engine interface ip. The caveat of enabling this option is that the virtualservice cannot be configued in an active-active ha mode. Dns based multi vip solution has to be used for ha & non-disruptive upgrade purposes. Field introduced in 17.1.9,17.2.3. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the virtualservice. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vh_domain_name` - The exact name requested from the client's sni-enabled tls hello domain name field. If this is a match, the parent vs will forward the connection to this child vs. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vh_matches` - Match criteria to select this child vs. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vh_parent_vs_ref` - Specifies the virtual service acting as virtual hosting (sni) parent. It is a reference to an object of type virtualservice. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vh_type` - Specify if the virtual hosting vs is of type sni or enhanced. Enum options - VS_TYPE_VH_SNI, VS_TYPE_VH_ENHANCED. Field introduced in 20.1.3. Allowed in enterprise edition with any value, basic edition(allowed values- vs_type_vh_sni,vs_type_vh_enhanced), enterprise with cloud services edition.
-* `vip` - List of virtual service ips. While creating a 'shared vs',please use vsvip_ref to point to the shared entities. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vrf_context_ref` - Virtual routing context that the virtual service is bound to. This is used to provide the isolation of the set of networks the application is attached to. It is a reference to an object of type vrfcontext. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_datascripts` - Datascripts applied on the data traffic of the virtual service. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `vsvip_cloud_config_cksum` - Checksum of cloud configuration for vsvip. Internally set by cloud connector. Field introduced in 17.2.9, 18.1.2. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `vsvip_ref` - Mostly used during the creation of shared vs, this field refers to entities that can be shared across virtual services. It is a reference to an object of type vsvip. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `waf_policy_ref` - Waf policy for the virtual service. It is a reference to an object of type wafpolicy. Field introduced in 17.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `weight` - The quality of service weight to assign to traffic transmitted from this virtual service. A higher weight will prioritize traffic versus other virtual services sharing the same service engines. Allowed values are 1-128. Allowed in enterprise edition with any value, essentials edition(allowed values- 1), basic edition(allowed values- 1), enterprise with cloud services edition.
+* `active_standby_se_tag` - This configuration only applies if the virtualservice is in legacy active standby ha mode and load distribution among active standby is enabled. This field is used to tag the virtualservice so that virtualservices with the same tag will share the same active serviceengine. Virtualservices with different tags will have different active serviceengines. If one of the serviceengine's in the serviceenginegroup fails, all virtualservices will end up using the same active serviceengine. Redistribution of the virtualservices can be either manual or automated when the failed serviceengine recovers. Redistribution is based on the auto redistribute property of the serviceenginegroup. Enum options - ACTIVE_STANDBY_SE_1, ACTIVE_STANDBY_SE_2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `advertise_down_vs` - Keep advertising virtual service via bgp even if it is marked down by health monitor. This setting takes effect for future virtual service flaps. To advertise current vses that are down, please disable and re-enable the virtual service. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `allow_invalid_client_cert` - Process request even if invalid client certificate is presented. Datascript apis need to be used for processing of such requests. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `analytics_policy` - Determines analytics settings for the application. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `analytics_profile_ref` - Specifies settings related to analytics. It is a reference to an object of type analyticsprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `application_profile_ref` - Enable application layer specific features for the virtual service. It is a reference to an object of type applicationprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is system-l4-application.
+* `azure_availability_set` - (internal-use)applicable for azure only. Azure availability set to which this vs is associated. Internally set by the cloud connector. Field introduced in 17.2.12, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `bgp_local_preference` - Local_pref to be used for vsvip advertised. Applicable only over ibgp. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `bgp_num_as_path_prepend` - Number of times the local as should be prepended additionally to vsvip. Applicable only over ebgp. Allowed values are 1-10. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `bgp_peer_labels` - Select bgp peers, using peer label, for vsvip advertisement. Field introduced in 20.1.5. Maximum of 128 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `bot_policy_ref` - Bot detection policy for the virtual service. It is a reference to an object of type botdetectionpolicy. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `bulk_sync_kvcache` - (this is a beta feature). Sync key-value cache to the new ses when vs is scaled out. For ex  ssl sessions are stored using vs's key-value cache. When the vs is scaled out, the ssl session information is synced to the new se, allowing existing ssl sessions to be reused on the new se. Field introduced in 17.2.7, 18.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `close_client_conn_on_config_update` - Close client connection on vs config update. Field introduced in 17.2.4. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `cloud_config_cksum` - Checksum of cloud configuration for vs. Internally set by cloud connector. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_type` - Enum options - cloud_none, cloud_vcenter, cloud_openstack, cloud_aws, cloud_vca, cloud_apic, cloud_mesos, cloud_linuxserver, cloud_docker_ucp, cloud_rancher, cloud_oshift_k8s, cloud_azure, cloud_gcp, cloud_nsxt. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- cloud_none,cloud_vcenter), basic (allowed values- cloud_none,cloud_nsxt) edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `connections_rate_limit` - Rate limit the incoming connections to this virtual service. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `content_rewrite` - Profile used to match and rewrite strings in request and/or response body. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `created_by` - Creator name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `csrf_policy_ref` - Csrf protection policy for the virtual service. It is a reference to an object of type csrfpolicy. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `delay_fairness` - Select the algorithm for qos fairness. This determines how multiple virtual services sharing the same service engines will prioritize traffic over a congested network. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_info` - Service discovery specific data including fully qualified domain name, type and time-to-live of the dns record. Note that only one of fqdn and dns_info setting is allowed. Maximum of 1000 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dns_policies` - Dns policies applied on the dns traffic of the virtual service. Field introduced in 17.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `east_west_placement` - Force placement on all se's in service group (mesos mode only). Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `enable_autogw` - Response traffic to clients will be sent back to the source mac address of the connection, rather than statically sent to a default gateway. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition. Special default for essentials edition is false, basic edition is false, enterprise edition is true.
+* `enable_rhi` - Enable route health injection using the bgp config in the vrf context. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_rhi_snat` - Enable route health injection for source nat'ted floating ip address using the bgp config in the vrf context. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_session` - Enable http sessions for this virtual service. If enabled, a session cookie will be added to http responses and persistent key-value store will be activated. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enabled` - Enable or disable the virtual service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `error_page_profile_ref` - Error page profile to be used for this virtualservice.this profile is used to send the custom error page to the client generated by the proxy. It is a reference to an object of type errorpageprofile. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `flow_dist` - Criteria for flow distribution among ses. Enum options - LOAD_AWARE, CONSISTENT_HASH_SOURCE_IP_ADDRESS, CONSISTENT_HASH_SOURCE_IP_ADDRESS_AND_PORT. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- load_aware), basic (allowed values- load_aware) edition.
+* `flow_label_type` - Criteria for flow labelling. Enum options - NO_LABEL, APPLICATION_LABEL, SERVICE_LABEL. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fqdn` - Dns resolvable, fully qualified domain name of the virtualservice. Only one of 'fqdn' and 'dns_info' configuration is allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `host_name_xlate` - Translate the host name sent to the servers to this value. Translate the host name sent from servers back to the value used by the client. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `http_policies` - Http policies applied on the data traffic of the virtual service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `icap_request_profile_refs` - The config settings for the icap server when checking the http request. It is a reference to an object of type icapprofile. Field introduced in 20.1.1. Maximum of 1 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ign_pool_net_reach` - Ignore pool servers network reachability constraints for virtual service placement. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `jwt_config` - Application-specific config for jwt validation. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `l4_policies` - L4 policies applied to the data traffic of the virtual service. Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ldap_vs_config` - Application-specific ldap config. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `limit_doser` - Limit potential dos attackers who exceed max_cps_per_client significantly to a fraction of max_cps_per_client for a while. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_cps_per_client` - Maximum connections per second per client ip. Allowed values are 10-1000. Special values are 0- unlimited. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `microservice_ref` - Microservice representing the virtual service. It is a reference to an object of type microservice. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `min_pools_up` - Minimum number of up pools to mark vs up. Field introduced in 18.2.1, 17.2.12. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name for the virtual service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `network_profile_ref` - Determines network settings such as protocol, tcp or udp, and related options for the protocol. It is a reference to an object of type networkprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is system-tcp-fast-path.
+* `network_security_policy_ref` - Network security policies for the virtual service. It is a reference to an object of type networksecuritypolicy. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nsx_securitygroup` - A list of nsx groups representing the clients which can access the virtual ip of the virtual service. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `oauth_vs_config` - Virtualservice specific oauth config. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `performance_limits` - Optional settings that determine performance limits like max connections or bandwdith etc. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pool_group_ref` - The pool group is an object that contains pools. It is a reference to an object of type poolgroup. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `pool_ref` - The pool is an object that contains destination servers and related attributes such as load-balancing and persistence. It is a reference to an object of type pool. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `remove_listening_port_on_vs_down` - Remove listening port if virtualservice is down. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `requests_rate_limit` - Rate limit the incoming requests to this virtual service. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `revoke_vip_route` - Revoke the advertisement of virtual service via the cloud if it is marked down by health monitor. Supported for nsxt clouds only.this setting takes effect for future virtual service flaps. To advertise current vses that are down, please disable and re-enable the virtual service. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `saml_sp_config` - Application-specific saml config. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `scaleout_ecmp` - Disable re-distribution of flows across service engines for a virtual service. Enable if the network itself performs flow hashing with ecmp in environments such as gcp. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_group_ref` - The service engine group to use for this virtual service. Moving to a new se group is disruptive to existing connections for this vs. It is a reference to an object of type serviceenginegroup. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `security_policy_ref` - Security policy applied on the traffic of the virtual service. This policy is used to perform security actions such as distributed denial of service (ddos) attack mitigation, etc. It is a reference to an object of type securitypolicy. Field introduced in 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `server_network_profile_ref` - Determines the network settings profile for the server side of tcp proxied connections. Leave blank to use the same settings as the client to vs side of the connection. It is a reference to an object of type networkprofile. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `service_metadata` - Metadata pertaining to the service provided by this virtual service. In openshift/kubernetes environments, egress pod info is stored. Any user input to this field will be overwritten by avi vantage. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_pool_select` - Select pool based on destination port. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `services` - List of services defined for this virtual service. Maximum of 2048 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sideband_profile` - Sideband configuration to be used for this virtualservice.it can be used for sending traffic to sideband vips for external inspection etc. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `snat_ip` - Nat'ted floating source ip address(es) for upstream connection to servers. Maximum of 32 items allowed. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `snat_ip6_addresses` - Ipv6 address for se snat. Field introduced in 30.2.1. Maximum of 32 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sp_pool_refs` - Gslb pools used to manage site-persistence functionality. Each site-persistence pool contains the virtualservices in all the other sites, that is auto-generated by the gslb manager. This is a read-only field for the user. It is a reference to an object of type pool. Field introduced in 17.2.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_key_and_certificate_refs` - Select or create one or two certificates, ec and/or rsa, that will be presented to ssl/tls terminated connections. It is a reference to an object of type sslkeyandcertificate. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_profile_ref` - Determines the set of ssl versions and ciphers to accept for ssl/tls terminated connections. It is a reference to an object of type sslprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_profile_selectors` - Select ssl profile based on client ip address match. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ssl_sess_cache_avg_size` - Expected number of ssl session cache entries (may be exceeded). Allowed values are 1024-16383. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sso_policy_ref` - The sso policy attached to the virtualservice. It is a reference to an object of type ssopolicy. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `static_dns_records` - List of static dns records applied to this virtual service. These are static entries and no health monitoring is performed against the ip addresses. Maximum of 2000 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `test_se_datastore_level_1_ref` - Used for testing se datastore upgrade 2.0 functionality. It is a reference to an object of type testsedatastorelevel1. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `topology_policies` - Topology policies applied on the dns traffic of the virtual service based ongslb topology algorithm. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `traffic_clone_profile_ref` - Server network or list of servers for cloning traffic. It is a reference to an object of type trafficcloneprofile. Field introduced in 17.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `traffic_enabled` - Knob to enable the virtual service traffic on its assigned service engines. This setting is effective only when the enabled flag is set to true. Field introduced in 17.2.8. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - Specify if this is a normal virtual service, or if it is the parent or child of an sni-enabled virtual hosted virtual service. Enum options - VS_TYPE_NORMAL, VS_TYPE_VH_PARENT, VS_TYPE_VH_CHILD. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- vs_type_normal), basic (allowed values- vs_type_normal,vs_type_vh_parent) edition.
+* `use_bridge_ip_as_vip` - Use bridge ip as vip on each host in mesos deployments. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `use_vip_as_snat` - Use the virtual ip as the snat ip for health monitoring and sending traffic to the backend servers instead of the service engine interface ip. The caveat of enabling this option is that the virtualservice cannot be configued in an active-active ha mode. Dns based multi vip solution has to be used for ha & non-disruptive upgrade purposes. Field introduced in 17.1.9,17.2.3. Allowed with any value in enterprise, basic, enterprise with cloud services edition. Allowed in essentials (allowed values- false) edition.
+* `uuid` - Uuid of the virtualservice. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vh_domain_name` - The exact name requested from the client's sni-enabled tls hello domain name field. If this is a match, the parent vs will forward the connection to this child vs. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vh_matches` - Match criteria to select this child vs. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vh_parent_vs_ref` - Specifies the virtual service acting as virtual hosting (sni) parent. It is a reference to an object of type virtualservice. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vh_type` - Specify if the virtual hosting vs is of type sni or enhanced. Enum options - VS_TYPE_VH_SNI, VS_TYPE_VH_ENHANCED. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in basic (allowed values- vs_type_vh_sni,vs_type_vh_enhanced) edition.
+* `vip` - List of virtual service ips. While creating a 'shared vs',please use vsvip_ref to point to the shared entities. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vrf_context_ref` - Virtual routing context that the virtual service is bound to. This is used to provide the isolation of the set of networks the application is attached to. It is a reference to an object of type vrfcontext. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_datascripts` - Datascripts applied on the data traffic of the virtual service. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `vsvip_cloud_config_cksum` - Checksum of cloud configuration for vsvip. Internally set by cloud connector. Field introduced in 17.2.9, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vsvip_ref` - Mostly used during the creation of shared vs, this field refers to entities that can be shared across virtual services. It is a reference to an object of type vsvip. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `waf_policy_ref` - Waf policy for the virtual service. It is a reference to an object of type wafpolicy. Field introduced in 17.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `weight` - The quality of service weight to assign to traffic transmitted from this virtual service. A higher weight will prioritize traffic versus other virtual services sharing the same service engines. Allowed values are 1-128. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1), basic (allowed values- 1) edition.
 
diff --git a/website/docs/d/avi_vrfcontext.html.markdown b/website/docs/d/avi_vrfcontext.html.markdown
index 41dc765a7..3ef3439bc 100644
--- a/website/docs/d/avi_vrfcontext.html.markdown
+++ b/website/docs/d/avi_vrfcontext.html.markdown
@@ -34,20 +34,20 @@ data "avi_vrfcontext" "foo_vrfcontext" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `attrs` - Key/value vrfcontext attributes. Field introduced in 20.1.2. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `bfd_profile` - Bfd configuration profile. Field introduced in 20.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `bgp_profile` - Bgp local and peer info. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `cloud_ref` - It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `debugvrfcontext` - Configure debug flags for vrf. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `gateway_mon` - Configure ping based heartbeat check for gateway in service engines of vrf. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `internal_gateway_monitor` - Configure ping based heartbeat check for all default gateways in service engines of vrf. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `lldp_enable` - Enable lldp. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `static_routes` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `system_default` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `attrs` - Key/value vrfcontext attributes. Field introduced in 20.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `bfd_profile` - Bfd configuration profile. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `bgp_profile` - Bgp local and peer info. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cloud_ref` - It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `debugvrfcontext` - Configure debug flags for vrf. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `gateway_mon` - Configure ping based heartbeat check for gateway in service engines of vrf. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `internal_gateway_monitor` - Configure ping based heartbeat check for all default gateways in service engines of vrf. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `lldp_enable` - Enable lldp. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `static_routes` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `system_default` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_vsdatascriptset.html.markdown b/website/docs/d/avi_vsdatascriptset.html.markdown
index 65f1f9cd4..ce66a86f8 100644
--- a/website/docs/d/avi_vsdatascriptset.html.markdown
+++ b/website/docs/d/avi_vsdatascriptset.html.markdown
@@ -32,23 +32,23 @@ data "avi_vsdatascriptset" "foo_vsdatascriptset" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `created_by` - Creator name. Field introduced in 17.1.11,17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `datascript` - Datascripts to execute. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `geo_db_ref` - Geo location mapping database used by this datascriptset. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ip_reputation_db_ref` - Ip reputation database that can be used by datascript functions. It is a reference to an object of type ipreputationdb. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ipgroup_refs` - Uuid of ip groups that could be referred by vsdatascriptset objects. It is a reference to an object of type ipaddrgroup. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name for the virtual service datascript collection. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pki_profile_refs` - Uuids of pkiprofile objects that could be referred by vsdatascriptset objects. It is a reference to an object of type pkiprofile. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pool_group_refs` - Uuid of pool groups that could be referred by vsdatascriptset objects. It is a reference to an object of type poolgroup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pool_refs` - Uuid of pools that could be referred by vsdatascriptset objects. It is a reference to an object of type pool. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `protocol_parser_refs` - List of protocol parsers that could be referred by vsdatascriptset objects. It is a reference to an object of type protocolparser. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `rate_limiters` - The rate limit definitions needed for this datascript. The name is composed of the virtual service name and the datascript name. Field introduced in 18.2.9. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ssl_key_certificate_refs` - Uuids of sslkeyandcertificate objects that could be referred by vsdatascriptset objects. It is a reference to an object of type sslkeyandcertificate. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ssl_profile_refs` - Uuids of sslprofile objects that could be referred by vsdatascriptset objects. It is a reference to an object of type sslprofile. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `string_group_refs` - Uuid of string groups that could be referred by vsdatascriptset objects. It is a reference to an object of type stringgroup. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the virtual service datascript collection. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - Creator name. Field introduced in 17.1.11,17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `datascript` - Datascripts to execute. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `geo_db_ref` - Geo location mapping database used by this datascriptset. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ip_reputation_db_ref` - Ip reputation database that can be used by datascript functions. It is a reference to an object of type ipreputationdb. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ipgroup_refs` - Uuid of ip groups that could be referred by vsdatascriptset objects. It is a reference to an object of type ipaddrgroup. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name for the virtual service datascript collection. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pki_profile_refs` - Uuids of pkiprofile objects that could be referred by vsdatascriptset objects. It is a reference to an object of type pkiprofile. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pool_group_refs` - Uuid of pool groups that could be referred by vsdatascriptset objects. It is a reference to an object of type poolgroup. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pool_refs` - Uuid of pools that could be referred by vsdatascriptset objects. It is a reference to an object of type pool. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `protocol_parser_refs` - List of protocol parsers that could be referred by vsdatascriptset objects. It is a reference to an object of type protocolparser. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `rate_limiters` - The rate limit definitions needed for this datascript. The name is composed of the virtual service name and the datascript name. Field introduced in 18.2.9. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ssl_key_certificate_refs` - Uuids of sslkeyandcertificate objects that could be referred by vsdatascriptset objects. It is a reference to an object of type sslkeyandcertificate. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ssl_profile_refs` - Uuids of sslprofile objects that could be referred by vsdatascriptset objects. It is a reference to an object of type sslprofile. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `string_group_refs` - Uuid of string groups that could be referred by vsdatascriptset objects. It is a reference to an object of type stringgroup. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the virtual service datascript collection. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_vsgs.html.markdown b/website/docs/d/avi_vsgs.html.markdown
index 677555590..1ee2c62fd 100644
--- a/website/docs/d/avi_vsgs.html.markdown
+++ b/website/docs/d/avi_vsgs.html.markdown
@@ -32,13 +32,13 @@ data "avi_vsgs" "foo_vsgs" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `geodb_uuid` - Gslb geodb being associated using this object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gs_uuid` - Gslb service being associated using this object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gslb_uuid` - Gslb being associated using this object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Name of the vs-gs association object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Tenant. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `type` - Type of the vs-gs association object. Enum options - VSGS_TYPE_GSLB, VSGS_TYPE_GS, VSGS_TYPE_GEO_DB. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid of the vs-gs association object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vs_uuid` - Virtual service being associated using this object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `geodb_uuid` - Gslb geodb being associated using this object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gs_uuid` - Gslb service being associated using this object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gslb_uuid` - Gslb being associated using this object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of the vs-gs association object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `type` - Type of the vs-gs association object. Enum options - VSGS_TYPE_GSLB, VSGS_TYPE_GS, VSGS_TYPE_GEO_DB. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid of the vs-gs association object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vs_uuid` - Virtual service being associated using this object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_vsvip.html.markdown b/website/docs/d/avi_vsvip.html.markdown
index 6595261b4..ecefd96cf 100644
--- a/website/docs/d/avi_vsvip.html.markdown
+++ b/website/docs/d/avi_vsvip.html.markdown
@@ -34,21 +34,20 @@ data "avi_vsvip" "foo_vsvip" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `bgp_local_preference` - Local_pref to be used for vsvip advertised. Applicable only over ibgp. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `bgp_num_as_path_prepend` - Number of times the local as should be prepended additionally to vsvip. Applicable only over ebgp. Allowed values are 1-10. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `bgp_peer_labels` - Select bgp peers, using peer label, for vsvip advertisement. Field introduced in 20.1.5. Maximum of 128 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `cloud_ref` - It is a reference to an object of type cloud. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `dns_info` - Service discovery specific data including fully qualified domain name, type and time-to-live of the dns record. This takes effect only if dns profile isassociated with cloud. Field introduced in 17.1.1. Maximum of 1000 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `east_west_placement` - Force placement on all service engines in the service engine group (container clouds only). Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `ipam_selector` - Determines the set of ipam networks to use for this vsvip. Selector type must be selector_ipam and only one label is supported. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Name for the vsvip object. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tier1_lr` - This sets the placement scope of virtualservice to given tier1 logical router in nsx-t. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `use_standard_alb` - This overrides the cloud level default and needs to match the se group value in which it will be used if the se group use_standard_alb value is set. This is only used when fip is used for vs on azure cloud. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid of the vsvip object. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vip` - List of virtual service ips and other shareable entities. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vrf_context_ref` - Virtual routing context that the virtual service is bound to. This is used to provide the isolation of the set of networks the application is attached to. It is a reference to an object of type vrfcontext. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vsvip_cloud_config_cksum` - Checksum of cloud configuration for vsvip. Internally set by cloud connector. Field introduced in 17.2.9, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `bgp_local_preference` - Local_pref to be used for vsvip advertised. Applicable only over ibgp. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `bgp_num_as_path_prepend` - Number of times the local as should be prepended additionally to vsvip. Applicable only over ebgp. Allowed values are 1-10. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `bgp_peer_labels` - Select bgp peers, using peer label, for vsvip advertisement. Field introduced in 20.1.5. Maximum of 128 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cloud_ref` - It is a reference to an object of type cloud. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_info` - Service discovery specific data including fully qualified domain name, type and time-to-live of the dns record. This takes effect only if dns profile isassociated with cloud. Field introduced in 17.1.1. Maximum of 1000 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `east_west_placement` - Force placement on all service engines in the service engine group (container clouds only). Field introduced in 17.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `ipam_selector` - Determines the set of ipam networks to use for this vsvip. Selector type must be selector_ipam and only one label is supported. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Name for the vsvip object. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tier1_lr` - This sets the placement scope of virtualservice to given tier1 logical router in nsx-t. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the vsvip object. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vip` - List of virtual service ips and other shareable entities. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vrf_context_ref` - Virtual routing context that the virtual service is bound to. This is used to provide the isolation of the set of networks the application is attached to. It is a reference to an object of type vrfcontext. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vsvip_cloud_config_cksum` - Checksum of cloud configuration for vsvip. Internally set by cloud connector. Field introduced in 17.2.9, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_wafapplicationsignatureprovider.html.markdown b/website/docs/d/avi_wafapplicationsignatureprovider.html.markdown
index 1229344eb..66875e257 100644
--- a/website/docs/d/avi_wafapplicationsignatureprovider.html.markdown
+++ b/website/docs/d/avi_wafapplicationsignatureprovider.html.markdown
@@ -32,13 +32,13 @@ data "avi_wafapplicationsignatureprovider" "foo_wafapplicationsignatureprovider"
 
 In addition to all arguments above, the following attributes are exported:
 
-* `available_applications` - Available application names and the ruleset version, when the rules for an application changed the last time. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `filter_rules_on_import` - If this is set to false, all provided rules are imported when updating this object. If this is set to true, only newer rules are considered for import. Newer rules are rules where the rule id is not in the range of 2,000,000 to 2,080,000 or where the rule has a tag with a cve from 2013 or newer. All other rules are ignored on rule import. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Name of application specific ruleset provider. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ruleset_version` - Version of signatures. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `service_status` - If this object is managed by the application signatures update service, this field contain the status of this syncronization. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `signatures` - The waf rules. Not visible in the api. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `available_applications` - Available application names and the ruleset version, when the rules for an application changed the last time. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `filter_rules_on_import` - If this is set to false, all provided rules are imported when updating this object. If this is set to true, only newer rules are considered for import. Newer rules are rules where the rule id is not in the range of 2,000,000 to 2,080,000 or where the rule has a tag with a cve from 2013 or newer. All other rules are ignored on rule import. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of application specific ruleset provider. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ruleset_version` - Version of signatures. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_status` - If this object is managed by the application signatures update service, this field contain the status of this syncronization. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `signatures` - The waf rules. Not visible in the api. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_wafcrs.html.markdown b/website/docs/d/avi_wafcrs.html.markdown
index 745d79dd4..18e3ebcff 100644
--- a/website/docs/d/avi_wafcrs.html.markdown
+++ b/website/docs/d/avi_wafcrs.html.markdown
@@ -32,19 +32,19 @@ data "avi_wafcrs" "foo_wafcrs" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `allowed_request_content_type_charsets` - Allowed request content type character sets in waf. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - A short description of this ruleset. Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `files` - List of data files used for waf rules. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `groups` - Waf rules are sorted in groups based on their characterization. Field introduced in 18.1.1. Maximum of 64 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `integrity` - Integrity protection value. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `integrity_values` - Integrity protection values for crs. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - The name of this ruleset object. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `release_date` - The release date of this version in rfc 3339 / iso 8601 format. Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `restricted_extensions` - Waf restricted file extensions. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `restricted_headers` - Waf restricted http headers. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `version` - The version of this ruleset object. Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `allowed_request_content_type_charsets` - Allowed request content type character sets in waf. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - A short description of this ruleset. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `files` - List of data files used for waf rules. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `groups` - Waf rules are sorted in groups based on their characterization. Field introduced in 18.1.1. Maximum of 64 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `integrity` - Integrity protection value. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `integrity_values` - Integrity protection values for crs. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - The name of this ruleset object. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `release_date` - The release date of this version in rfc 3339 / iso 8601 format. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `restricted_extensions` - Waf restricted file extensions. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `restricted_headers` - Waf restricted http headers. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `version` - The version of this ruleset object. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_wafpolicy.html.markdown b/website/docs/d/avi_wafpolicy.html.markdown
index cdf7d8b8a..068ceed4e 100644
--- a/website/docs/d/avi_wafpolicy.html.markdown
+++ b/website/docs/d/avi_wafpolicy.html.markdown
@@ -32,34 +32,34 @@ data "avi_wafpolicy" "foo_wafpolicy" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `allow_mode_delegation` - Allow rules to overwrite the policy mode. This must be set if the policy mode is set to enforcement. Field introduced in 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `allowlist` - A set of rules which describe conditions under which the request will bypass the waf. This will be processed in the request header phase before any other waf related code. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `application_signatures` - Application specific signatures. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `auto_update_crs` - If this flag is set, the system will try to keep the crs version used in this policy up-to-date. If a newer crs object is available on this controller, the system will issue the crs upgrade process for this waf policy. It will not update polices if the current crs version is crs-version-not-applicable. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `bypass_static_extensions` - Enable the functionality to bypass waf for static file extensions. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `confidence_override` - Configure thresholds for confidence labels. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `created_by` - Creator name. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `crs_overrides` - Override attributes for crs rules. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_app_learning` - Enable application learning for this waf policy. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_auto_rule_updates` - Enable application learning based rule updates on the waf profile. Rules will be programmed in dedicated waf learning group. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_regex_learning` - Enable dynamic regex generation for positive security model rules. This is an experimental feature and shouldn't be used in production. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `failure_mode` - Waf policy failure mode. This can be 'open' or 'closed'. Enum options - WAF_FAILURE_MODE_OPEN, WAF_FAILURE_MODE_CLOSED. Field introduced in 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `geo_db_ref` - Geo location mapping database used by this wafpolicy. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `learning_params` - Parameters for tuning application learning. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `min_confidence` - Minimum confidence label required for auto rule updates. Enum options - CONFIDENCE_VERY_HIGH, CONFIDENCE_HIGH, CONFIDENCE_PROBABLE, CONFIDENCE_LOW, CONFIDENCE_NONE. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `mode` - Waf policy mode. This can be detection or enforcement. It can be overwritten by rules if allow_mode_delegation is set. Enum options - WAF_MODE_DETECTION_ONLY, WAF_MODE_ENFORCEMENT. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `paranoia_level` - Waf ruleset paranoia  mode. This is used to select rules based on the paranoia-level tag. Enum options - WAF_PARANOIA_LEVEL_LOW, WAF_PARANOIA_LEVEL_MEDIUM, WAF_PARANOIA_LEVEL_HIGH, WAF_PARANOIA_LEVEL_EXTREME. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `positive_security_model` - The positive security model. This is used to describe how the request or parts of the request should look like. It is executed in the request body phase of avi waf. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `post_crs_groups` - Waf rules are categorized in to groups based on their characterization. These groups are created by the user and will be enforced after the crs groups. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pre_crs_groups` - Waf rules are categorized in to groups based on their characterization. These groups are created by the user and will be  enforced before the crs groups. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `required_data_files` - The data files and types referred in this waf policy. 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.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `updated_crs_rules_in_detection_mode` - While updating crs, the system will make sure that new rules are added in detection mode. It only has an effect if the policy is in enforcement mode. In this case, the update will set new rules into detection mode by adding crs_overrides for the new rules. If this flag is not set or if the policy mode is detection, rules will be added without new crs_overrides. This option is used for the auto_update_crs workflow as well as for the ui based crs update workflow. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `waf_crs_ref` - Waf core ruleset used for the crs part of this policy. It is a reference to an object of type wafcrs. Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `waf_profile_ref` - Waf profile for waf policy. It is a reference to an object of type wafprofile. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `allow_mode_delegation` - Allow rules to overwrite the policy mode. This must be set if the policy mode is set to enforcement. Field introduced in 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allowlist` - A set of rules which describe conditions under which the request will bypass the waf. This will be processed in the request header phase before any other waf related code. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `application_signatures` - Application specific signatures. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_update_crs` - If this flag is set, the system will try to keep the crs version used in this policy up-to-date. If a newer crs object is available on this controller, the system will issue the crs upgrade process for this waf policy. It will not update polices if the current crs version is crs-version-not-applicable. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `bypass_static_extensions` - Enable the functionality to bypass waf for static file extensions. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `confidence_override` - Configure thresholds for confidence labels. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - Creator name. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `crs_overrides` - Override attributes for crs rules. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_app_learning` - Enable application learning for this waf policy. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_auto_rule_updates` - Enable application learning based rule updates on the waf profile. Rules will be programmed in dedicated waf learning group. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_regex_learning` - Enable dynamic regex generation for positive security model rules. This is an experimental feature and shouldn't be used in production. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `failure_mode` - Waf policy failure mode. This can be 'open' or 'closed'. Enum options - WAF_FAILURE_MODE_OPEN, WAF_FAILURE_MODE_CLOSED. Field introduced in 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `geo_db_ref` - Geo location mapping database used by this wafpolicy. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `learning_params` - Parameters for tuning application learning. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `min_confidence` - Minimum confidence label required for auto rule updates. Enum options - CONFIDENCE_VERY_HIGH, CONFIDENCE_HIGH, CONFIDENCE_PROBABLE, CONFIDENCE_LOW, CONFIDENCE_NONE. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mode` - Waf policy mode. This can be detection or enforcement. It can be overwritten by rules if allow_mode_delegation is set. Enum options - WAF_MODE_DETECTION_ONLY, WAF_MODE_ENFORCEMENT. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `paranoia_level` - Waf ruleset paranoia  mode. This is used to select rules based on the paranoia-level tag. Enum options - WAF_PARANOIA_LEVEL_LOW, WAF_PARANOIA_LEVEL_MEDIUM, WAF_PARANOIA_LEVEL_HIGH, WAF_PARANOIA_LEVEL_EXTREME. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `positive_security_model` - The positive security model. This is used to describe how the request or parts of the request should look like. It is executed in the request body phase of avi waf. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `post_crs_groups` - Waf rules are categorized in to groups based on their characterization. These groups are created by the user and will be enforced after the crs groups. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pre_crs_groups` - Waf rules are categorized in to groups based on their characterization. These groups are created by the user and will be  enforced before the crs groups. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `required_data_files` - The data files and types referred in this waf policy. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `updated_crs_rules_in_detection_mode` - While updating crs, the system will make sure that new rules are added in detection mode. It only has an effect if the policy is in enforcement mode. In this case, the update will set new rules into detection mode by adding crs_overrides for the new rules. If this flag is not set or if the policy mode is detection, rules will be added without new crs_overrides. This option is used for the auto_update_crs workflow as well as for the ui based crs update workflow. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `waf_crs_ref` - Waf core ruleset used for the crs part of this policy. It is a reference to an object of type wafcrs. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `waf_profile_ref` - Waf profile for waf policy. It is a reference to an object of type wafprofile. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_wafpolicypsmgroup.html.markdown b/website/docs/d/avi_wafpolicypsmgroup.html.markdown
index e649a6da9..259005a92 100644
--- a/website/docs/d/avi_wafpolicypsmgroup.html.markdown
+++ b/website/docs/d/avi_wafpolicypsmgroup.html.markdown
@@ -32,15 +32,15 @@ data "avi_wafpolicypsmgroup" "foo_wafpolicypsmgroup" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Free-text comment about this group. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable` - Enable or disable this waf rule group. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `hit_action` - If a rule in this group matches the match_value pattern, this action will be executed. Allowed actions are waf_action_no_op and waf_action_allow_parameter. Enum options - WAF_ACTION_NO_OP, WAF_ACTION_BLOCK, WAF_ACTION_ALLOW_PARAMETER. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_learning_group` - This field indicates that this group is used for learning. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `locations` - Positive security model locations. These are used to partition the application name space. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `miss_action` - If a rule in this group does not match the match_value pattern, this action will be executed. Allowed actions are waf_action_no_op and waf_action_block. Enum options - WAF_ACTION_NO_OP, WAF_ACTION_BLOCK, WAF_ACTION_ALLOW_PARAMETER. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - User defined name of the group. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of this object. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Free-text comment about this group. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable` - Enable or disable this waf rule group. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `hit_action` - If a rule in this group matches the match_value pattern, this action will be executed. Allowed actions are waf_action_no_op and waf_action_allow_parameter. Enum options - WAF_ACTION_NO_OP, WAF_ACTION_BLOCK, WAF_ACTION_ALLOW_PARAMETER. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_learning_group` - This field indicates that this group is used for learning. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `locations` - Positive security model locations. These are used to partition the application name space. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `miss_action` - If a rule in this group does not match the match_value pattern, this action will be executed. Allowed actions are waf_action_no_op and waf_action_block. Enum options - WAF_ACTION_NO_OP, WAF_ACTION_BLOCK, WAF_ACTION_ALLOW_PARAMETER. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - User defined name of the group. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of this object. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_wafprofile.html.markdown b/website/docs/d/avi_wafprofile.html.markdown
index 3de97267f..0e583911f 100644
--- a/website/docs/d/avi_wafprofile.html.markdown
+++ b/website/docs/d/avi_wafprofile.html.markdown
@@ -32,12 +32,12 @@ data "avi_wafprofile" "foo_wafprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `config` - Config params for waf. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `files` - List of data files used for waf rules. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `config` - Config params for waf. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `files` - List of data files used for waf rules. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_webapput.html.markdown b/website/docs/d/avi_webapput.html.markdown
index 7c73fb803..7a53cf923 100644
--- a/website/docs/d/avi_webapput.html.markdown
+++ b/website/docs/d/avi_webapput.html.markdown
@@ -20,33 +20,36 @@ This data source is used to to get avi_webapput objects.
 data "avi_webapput" "foo_webapput" {
     uuid = "webapput-f9cf6b3e-a411-436f-95e2-2982ba2b217b"
     name = "foo"
-}
+    cloud_ref = "/api/cloud/?tenant=admin&name=Default-Cloud"
+  }
 ```
 
 ## Argument Reference
 
 * `name` - (Optional) Search WebappUT by name.
 * `uuid` - (Optional) Search WebappUT by uuid.
-
+* `cloud_ref` - (Optional) Search WebappUT by cloud_ref.
+  
 ## Attributes Reference
 
 In addition to all arguments above, the following attributes are exported:
 
-* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `default_first_int` - Default uint64 field. Field introduced in 30.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `default_second_int` - Default int64 field. Field introduced in 30.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `default_string` - Default string field. Field introduced in 30.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `default_third_int` - Default int32 field. Field introduced in 30.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mandatory_test` - Optional message for nested f_mandatory test cases defined at level1. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mandatory_tests` - Repeated message for nested f_mandatory test cases-level1. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - Name of the webapput object-level0. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `sensitive_test` - Optional message for nested f_sensitive test cases defined at level1. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `sensitive_tests` - Repeated message for nested f_sensitive test cases-level1. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `skip_optional_check_tests` - Optional bool for nested skip_optional_check test cases-level1. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `string_length_test` - Optional message for nested  max string length test cases. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `string_length_tests` - Repeated message for nested  max string length test cases. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - Tenant of the webapput object-level0. It is a reference to an object of type tenant. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `test_sensitive_string` - The string for sensitive (secret) field. Object-level0. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `test_string` - The maximum string length. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `uuid` - Uuid of the webapput object-level0. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `cloud_ref` - Cloud of the webapput object-level0. It is a reference to an object of type cloud. Field introduced in 30.2.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `default_first_int` - Default uint64 field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `default_second_int` - Default int64 field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `default_string` - Default string field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `default_third_int` - Default int32 field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `mandatory_test` - Optional message for nested f_mandatory test cases defined at level1. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `mandatory_tests` - Repeated message for nested f_mandatory test cases-level1. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of the webapput object-level0. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sensitive_test` - Optional message for nested f_sensitive test cases defined at level1. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sensitive_tests` - Repeated message for nested f_sensitive test cases-level1. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `skip_optional_check_tests` - Optional bool for nested skip_optional_check test cases-level1. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `string_length_test` - Optional message for nested  max string length test cases. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `string_length_tests` - Repeated message for nested  max string length test cases. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant of the webapput object-level0. It is a reference to an object of type tenant. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `test_sensitive_string` - The string for sensitive (secret) field. Object-level0. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `test_string` - The maximum string length. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid of the webapput object-level0. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_webhook.html.markdown b/website/docs/d/avi_webhook.html.markdown
index bc78ba6c4..88482b6fe 100644
--- a/website/docs/d/avi_webhook.html.markdown
+++ b/website/docs/d/avi_webhook.html.markdown
@@ -32,12 +32,12 @@ data "avi_webhook" "foo_webhook" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `callback_url` - Callback url for the webhook. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - Protobuf versioning for config pbs. 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.
-* `description` - Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - The name of the webhook profile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uuid` - Uuid of the webhook profile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `verification_token` - Verification token sent back with the callback asquery parameters. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `callback_url` - Callback url for the webhook. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - The name of the webhook profile. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uuid` - Uuid of the webhook profile. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `verification_token` - Verification token sent back with the callback asquery parameters. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_actiongroupconfig.html.markdown b/website/docs/r/avi_actiongroupconfig.html.markdown
index abc422c82..14bd52bd5 100644
--- a/website/docs/r/avi_actiongroupconfig.html.markdown
+++ b/website/docs/r/avi_actiongroupconfig.html.markdown
@@ -27,17 +27,17 @@ resource "avi_actiongroupconfig" "foo" {
 
 The following arguments are supported:
 
-* `external_only` - (Required) Generate alert only to external destinations. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `level` - (Required) When an alert is generated, mark its priority via the alert level. Enum options - ALERT_LOW, ALERT_MEDIUM, ALERT_HIGH. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `action_script_config_ref` - (Optional) Reference of the action script configuration to be used. It is a reference to an object of type alertscriptconfig. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `autoscale_trigger_notification` - (Optional) Trigger notification to autoscale manager. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `email_config_ref` - (Optional) Select the email notification configuration to use when sending alerts via email. It is a reference to an object of type alertemailconfig. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `snmp_trap_profile_ref` - (Optional) Select the snmp trap notification to use when sending alerts via snmp trap. It is a reference to an object of type snmptrapprofile. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `syslog_config_ref` - (Optional) Select the syslog notification configuration to use when sending alerts via syslog. It is a reference to an object of type alertsyslogconfig. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `external_only` - (Required) Generate alert only to external destinations. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `level` - (Required) When an alert is generated, mark its priority via the alert level. Enum options - ALERT_LOW, ALERT_MEDIUM, ALERT_HIGH. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `action_script_config_ref` - (Optional) Reference of the action script configuration to be used. It is a reference to an object of type alertscriptconfig. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `autoscale_trigger_notification` - (Optional) Trigger notification to autoscale manager. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `email_config_ref` - (Optional) Select the email notification configuration to use when sending alerts via email. It is a reference to an object of type alertemailconfig. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `snmp_trap_profile_ref` - (Optional) Select the snmp trap notification to use when sending alerts via snmp trap. It is a reference to an object of type snmptrapprofile. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `syslog_config_ref` - (Optional) Select the syslog notification configuration to use when sending alerts via syslog. It is a reference to an object of type alertsyslogconfig. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -52,5 +52,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_albservicesconfig.html.markdown b/website/docs/r/avi_albservicesconfig.html.markdown
index 756c753db..371255807 100644
--- a/website/docs/r/avi_albservicesconfig.html.markdown
+++ b/website/docs/r/avi_albservicesconfig.html.markdown
@@ -27,26 +27,26 @@ resource "avi_albservicesconfig" "foo" {
 
 The following arguments are supported:
 
-* `app_signature_config` - (Required) 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.
-* `case_config` - (Required) 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.
+* `app_signature_config` - (Required) Default values for application signature sync. Field introduced in 20.1.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `case_config` - (Required) Default values for case management. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `feature_opt_in_status` - (Required) Features opt-in for pulse cloud services. Field introduced in 20.1.1.
-* `inventory_config` - (Required) Inventory configurations for pulse cloud services. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `ip_reputation_config` - (Required) Default values to be used for ip reputation sync. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `portal_url` - (Required) 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.
-* `saas_licensing_config` - (Required) Saas licensing configuration. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `user_agent_db_config` - (Required) 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.
-* `waf_config` - (Required) 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.
-* `asset_contact` - (Optional) 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.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `mode` - (Optional) Mode helps log collection and upload. Enum options - MODE_UNKNOWN, SALESFORCE, SYSTEST, MYVMWARE, BROADCOM. Field introduced in 20.1.2. Allowed in enterprise edition with any value, essentials edition(allowed values- salesforce,myvmware,systest), basic edition(allowed values- salesforce,myvmware,systest), enterprise with cloud services edition.
-* `name` - (Optional) 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.
-* `polling_interval` - (Optional) Time interval in minutes. Allowed values are 5-60. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `session_config` - (Optional) Session configuration data. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `split_proxy_configuration` - (Optional) 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.
-* `tenant_config` - (Optional) Tenant based configuration data. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) 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.
-* `use_split_proxy` - (Optional) 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.
-* `use_tls` - (Optional) 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.
+* `inventory_config` - (Required) Inventory configurations for pulse cloud services. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ip_reputation_config` - (Required) Default values to be used for ip reputation sync. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `portal_url` - (Required) The fqdn or ip address of the pulse cloud services. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `saas_licensing_config` - (Required) Saas licensing configuration. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `user_agent_db_config` - (Required) Default values for user agent db service. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `waf_config` - (Required) Default values for waf management. Field introduced in 21.1.1. Allowed with any value in essentials, basic, enterprise, enterprise with cloud services edition.
+* `asset_contact` - (Optional) Default contact for this controller cluster. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mode` - (Optional) Mode helps log collection and upload. Enum options - MODE_UNKNOWN, SALESFORCE, SYSTEST, MYVMWARE, BROADCOM. Field introduced in 20.1.2. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- salesforce,myvmware,systest), basic (allowed values- salesforce,myvmware,systest) edition.
+* `name` - (Optional) Name of the albservicesconfig object. Field introduced in 30.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `polling_interval` - (Optional) Time interval in minutes. Allowed values are 5-60. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `session_config` - (Optional) Session configuration data. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `split_proxy_configuration` - (Optional) Split proxy configuration to connect external pulse cloud services. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_config` - (Optional) Tenant based configuration data. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 30.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_split_proxy` - (Optional) 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 with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_tls` - (Optional) Secure the controller to pulse cloud services communication over tls. Field introduced in 20.1.3. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -61,5 +61,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_albservicesfiledownload.html.markdown b/website/docs/r/avi_albservicesfiledownload.html.markdown
index 2d4794351..900caa684 100644
--- a/website/docs/r/avi_albservicesfiledownload.html.markdown
+++ b/website/docs/r/avi_albservicesfiledownload.html.markdown
@@ -27,15 +27,15 @@ resource "avi_albservicesfiledownload" "foo" {
 
 The following arguments are supported:
 
-* `destination_dir` - (Required) Destination of the file to be saved. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `file_type` - (Required) Software / crs/ inventory. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `file_uri` - (Required) File uri on the cloud bucket. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - (Required) The name of the file with which it is saved to the disk. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `message` - (Optional) Download's success / failure message. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `metadata` - (Optional) Metadata of the file from pulse. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `status` - (Optional) Status of file download. 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... Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `destination_dir` - (Required) Destination of the file to be saved. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `file_type` - (Required) Software / crs/ inventory. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `file_uri` - (Required) File uri on the cloud bucket. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Required) The name of the file with which it is saved to the disk. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `message` - (Optional) Download's success / failure message. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `metadata` - (Optional) Metadata of the file from pulse. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `status` - (Optional) Status of file download. 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_FAILED... Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -50,5 +50,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Unique id of the object. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Unique id of the object. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_albservicesfileupload.html.markdown b/website/docs/r/avi_albservicesfileupload.html.markdown
index ec6c32eb9..64ca14402 100644
--- a/website/docs/r/avi_albservicesfileupload.html.markdown
+++ b/website/docs/r/avi_albservicesfileupload.html.markdown
@@ -27,13 +27,13 @@ resource "avi_albservicesfileupload" "foo" {
 
 The following arguments are supported:
 
-* `file_path` - (Required) Stores output file path, for upload to aws s3. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Required) Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `case_id` - (Optional) Salesforce alphanumeric caseid to attach uploaded file to. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `error` - (Optional) Error reported during file upload. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `s3_directory` - (Optional) Custom aws s3 directory path to upload file. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `status` - (Optional) 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... Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `file_path` - (Required) Stores output file path, for upload to aws s3. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `case_id` - (Optional) Salesforce alphanumeric caseid to attach uploaded file to. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `error` - (Optional) Error reported during file upload. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `s3_directory` - (Optional) Custom aws s3 directory path to upload file. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `status` - (Optional) 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_FAILED... Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -48,5 +48,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_albservicesjob.html.markdown b/website/docs/r/avi_albservicesjob.html.markdown
index a4e2bc88a..4a2fe60d5 100644
--- a/website/docs/r/avi_albservicesjob.html.markdown
+++ b/website/docs/r/avi_albservicesjob.html.markdown
@@ -27,19 +27,19 @@ resource "avi_albservicesjob" "foo" {
 
 The following arguments are supported:
 
-* `command` - (Required) The command to be triggered by the albservicesjob. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - (Required) The name of the albservicesjob. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `end_time` - (Optional) Time at which the albservicesjob ended. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `params` - (Optional) Job params. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pulse_job_id` - (Optional) 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.
-* `pulse_sync_status` - (Optional) 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.
-* `result` - (Optional) Job result. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `start_time` - (Optional) Time at which the albservicesjob started. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `status` - (Optional) The status of the albservicesjob. 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.
-* `status_update_time` - (Optional) Time at which the status of albservicesjob updated. Field introduced in 22.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) The unique identifier of the tenant to which this albservicesjob belongs. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `token` - (Optional) Job token. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `command` - (Required) The command to be triggered by the albservicesjob. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Required) The name of the albservicesjob. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `end_time` - (Optional) Time at which the albservicesjob ended. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `params` - (Optional) Job params. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pulse_job_id` - (Optional) A unique identifier for this job entry on the pulse cloud services. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pulse_sync_status` - (Optional) Status of sync to pulse cloud services(result uploads/state updates). Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `result` - (Optional) Job result. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `start_time` - (Optional) Time at which the albservicesjob started. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `status` - (Optional) The status of the albservicesjob. Enum options - UNDETERMINED, PENDING, IN_PROGRESS, COMPLETED, FAILED, NOT_ENABLED. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `status_update_time` - (Optional) Time at which the status of albservicesjob updated. Field introduced in 22.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) The unique identifier of the tenant to which this albservicesjob belongs. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `token` - (Optional) Job token. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -54,5 +54,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  A unique identifier for this albservicesjob entry. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  A unique identifier for this albservicesjob entry. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_alertconfig.html.markdown b/website/docs/r/avi_alertconfig.html.markdown
index fe8c6db48..c0550c30c 100644
--- a/website/docs/r/avi_alertconfig.html.markdown
+++ b/website/docs/r/avi_alertconfig.html.markdown
@@ -27,24 +27,24 @@ resource "avi_alertconfig" "foo" {
 
 The following arguments are supported:
 
-* `alert_rule` - (Required) List of filters matching on events or client logs used for triggering alerts. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `category` - (Required) Determines whether an alert is raised immediately when event occurs (realtime) or after specified number of events occurs within rolling time window. Enum options - REALTIME, ROLLINGWINDOW, WATERMARK. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Required) Name of the alert configuration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `source` - (Required) Signifies system events or the type of client logsused in this alert configuration. Enum options - CONN_LOGS, APP_LOGS, EVENT_LOGS, METRICS. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `action_group_ref` - (Optional) The alert config will trigger the selected alert action, which can send notifications and execute a controlscript. It is a reference to an object of type actiongroupconfig. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `autoscale_alert` - (Optional) This alert config applies to auto scale alerts. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) A custom description field. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enabled` - (Optional) Enable or disable this alert config from generating new alerts. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `expiry_time` - (Optional) An alert is expired and deleted after the expiry time has elapsed. The original event triggering the alert remains in the event's log. Allowed values are 1-31536000. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `obj_uuid` - (Optional) Instance of the resource for which alert was raised. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `object_type` - (Optional) The object type to which the alert config is associated with. Valid object types are - virtual service, pool, service engine. Enum options - VIRTUALSERVICE, POOL, HEALTHMONITOR, NETWORKPROFILE, APPLICATIONPROFILE, HTTPPOLICYSET, DNSPOLICY, SECURITYPOLICY, IPADDRGROUP, STRINGGROUP, SSLPROFILE, SSLKEYANDCERTIFICATE, NETWORKSECURITYPOLICY, APPLICATIONPERSISTENCEPROFILE, ANALYTICSPROFILE, VSDATASCRIPTSET, TENANT, PKIPROFILE, AUTHPROFILE, CLOUD... Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `recommendation` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `rolling_window` - (Optional) Only if the number of events is reached or exceeded within the time window will an alert be generated. Allowed values are 1-31536000. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `summary` - (Optional) Summary of reason why alert is generated. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `threshold` - (Optional) An alert is created only when the number of events meets or exceeds this number within the chosen time frame. Allowed values are 1-65536. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `throttle` - (Optional) Alerts are suppressed (throttled) for this duration of time since the last alert was raised for this alert config. Allowed values are 0-31536000. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `alert_rule` - (Required) List of filters matching on events or client logs used for triggering alerts. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `category` - (Required) Determines whether an alert is raised immediately when event occurs (realtime) or after specified number of events occurs within rolling time window. Enum options - REALTIME, ROLLINGWINDOW, WATERMARK. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the alert configuration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `source` - (Required) Signifies system events or the type of client logsused in this alert configuration. Enum options - CONN_LOGS, APP_LOGS, EVENT_LOGS, METRICS. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `action_group_ref` - (Optional) The alert config will trigger the selected alert action, which can send notifications and execute a controlscript. It is a reference to an object of type actiongroupconfig. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `autoscale_alert` - (Optional) This alert config applies to auto scale alerts. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) A custom description field. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enabled` - (Optional) Enable or disable this alert config from generating new alerts. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `expiry_time` - (Optional) An alert is expired and deleted after the expiry time has elapsed. The original event triggering the alert remains in the event's log. Allowed values are 1-31536000. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `obj_uuid` - (Optional) Instance of the resource for which alert was raised. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `object_type` - (Optional) The object type to which the alert config is associated with. Valid object types are - virtual service, pool, service engine. Enum options - VIRTUALSERVICE, POOL, HEALTHMONITOR, NETWORKPROFILE, APPLICATIONPROFILE, HTTPPOLICYSET, DNSPOLICY, SECURITYPOLICY, IPADDRGROUP, STRINGGROUP, SSLPROFILE, SSLKEYANDCERTIFICATE, NETWORKSECURITYPOLICY, APPLICATIONPERSISTENCEPROFILE, ANALYTICSPROFILE, VSDATASCRIPTSET, TENANT, PKIPROFILE, AUTHPROFILE, CLOUD... Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `recommendation` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rolling_window` - (Optional) Only if the number of events is reached or exceeded within the time window will an alert be generated. Allowed values are 1-31536000. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `summary` - (Optional) Summary of reason why alert is generated. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `threshold` - (Optional) An alert is created only when the number of events meets or exceeds this number within the chosen time frame. Allowed values are 1-65536. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `throttle` - (Optional) Alerts are suppressed (throttled) for this duration of time since the last alert was raised for this alert config. Allowed values are 0-31536000. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -59,5 +59,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_alertemailconfig.html.markdown b/website/docs/r/avi_alertemailconfig.html.markdown
index 6c0abdaf9..6dd18c9ae 100644
--- a/website/docs/r/avi_alertemailconfig.html.markdown
+++ b/website/docs/r/avi_alertemailconfig.html.markdown
@@ -27,12 +27,12 @@ resource "avi_alertemailconfig" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) A user-friendly name of the email notification service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `to_emails` - (Required) Alerts are sent to the comma separated list of  email recipients. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cc_emails` - (Optional) Alerts are copied to the comma separated list of  email recipients. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) A user-friendly name of the email notification service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `to_emails` - (Required) Alerts are sent to the comma separated list of  email recipients. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cc_emails` - (Optional) Alerts are copied to the comma separated list of  email recipients. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -47,5 +47,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_alertscriptconfig.html.markdown b/website/docs/r/avi_alertscriptconfig.html.markdown
index 08fc2a0a9..dcad71fec 100644
--- a/website/docs/r/avi_alertscriptconfig.html.markdown
+++ b/website/docs/r/avi_alertscriptconfig.html.markdown
@@ -27,11 +27,11 @@ resource "avi_alertscriptconfig" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) A user-friendly name of the script. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `action_script` - (Optional) User defined alert action script. Please refer to kb.avinetworks.com for more information. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `timeout` - (Optional) Controlscript excution timeout. Field introduced in 22.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) A user-friendly name of the script. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `action_script` - (Optional) User defined alert action script. Please refer to kb.avinetworks.com for more information. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `timeout` - (Optional) Controlscript excution timeout. Field introduced in 22.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -46,5 +46,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_alertsyslogconfig.html.markdown b/website/docs/r/avi_alertsyslogconfig.html.markdown
index 8a78f8216..22cd2add5 100644
--- a/website/docs/r/avi_alertsyslogconfig.html.markdown
+++ b/website/docs/r/avi_alertsyslogconfig.html.markdown
@@ -27,12 +27,12 @@ resource "avi_alertsyslogconfig" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) A user-friendly name of the syslog notification. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) User defined description for alert syslog config. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sender_hostname` - (Optional) User defined sender hostname in syslog message. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `syslog_servers` - (Optional) The list of syslog servers. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) A user-friendly name of the syslog notification. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) User defined description for alert syslog config. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sender_hostname` - (Optional) User defined sender hostname in syslog message. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `syslog_servers` - (Optional) The list of syslog servers. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -47,5 +47,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_analyticsprofile.html.markdown b/website/docs/r/avi_analyticsprofile.html.markdown
index a9329b7fc..01c811834 100644
--- a/website/docs/r/avi_analyticsprofile.html.markdown
+++ b/website/docs/r/avi_analyticsprofile.html.markdown
@@ -27,92 +27,92 @@ resource "avi_analyticsprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) The name of the analytics profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `apdex_response_threshold` - (Optional) If a client receives an http response in less than the satisfactory latency threshold, the request is considered satisfied. It is considered tolerated if it is not satisfied and less than tolerated latency factor multiplied by the satisfactory latency threshold. Greater than this number and the client's request is considered frustrated. Allowed values are 1-30000. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 500), basic edition(allowed values- 500), enterprise with cloud services edition.
-* `apdex_response_tolerated_factor` - (Optional) Client tolerated response latency factor. Client must receive a response within this factor times the satisfactory threshold (apdex_response_threshold) to be considered tolerated. Allowed values are 1-1000. Allowed in enterprise edition with any value, essentials edition(allowed values- 4), basic edition(allowed values- 4), enterprise with cloud services edition.
-* `apdex_rtt_threshold` - (Optional) Satisfactory client to avi round trip time(rtt). Allowed values are 1-2000. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 250), basic edition(allowed values- 250), enterprise with cloud services edition.
-* `apdex_rtt_tolerated_factor` - (Optional) Tolerated client to avi round trip time(rtt) factor. It is a multiple of apdex_rtt_tolerated_factor. Allowed values are 1-1000. Allowed in enterprise edition with any value, essentials edition(allowed values- 4), basic edition(allowed values- 4), enterprise with cloud services edition.
-* `apdex_rum_threshold` - (Optional) If a client is able to load a page in less than the satisfactory latency threshold, the pageload is considered satisfied. It is considered tolerated if it is greater than satisfied but less than the tolerated latency multiplied by satisifed latency. Greater than this number and the client's request is considered frustrated. A pageload includes the time for dns lookup, download of all http objects, and page render time. Allowed values are 1-30000. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 5000), basic edition(allowed values- 5000), enterprise with cloud services edition.
-* `apdex_rum_tolerated_factor` - (Optional) Virtual service threshold factor for tolerated page load time (plt) as multiple of apdex_rum_threshold. Allowed values are 1-1000. Allowed in enterprise edition with any value, essentials edition(allowed values- 4), basic edition(allowed values- 4), enterprise with cloud services edition.
-* `apdex_server_response_threshold` - (Optional) A server http response is considered satisfied if latency is less than the satisfactory latency threshold. The response is considered tolerated when it is greater than satisfied but less than the tolerated latency factor * s_latency. Greater than this number and the server response is considered frustrated. Allowed values are 1-30000. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 400), basic edition(allowed values- 400), enterprise with cloud services edition.
-* `apdex_server_response_tolerated_factor` - (Optional) Server tolerated response latency factor. Servermust response within this factor times the satisfactory threshold (apdex_server_response_threshold) to be considered tolerated. Allowed values are 1-1000. Allowed in enterprise edition with any value, essentials edition(allowed values- 4), basic edition(allowed values- 4), enterprise with cloud services edition.
-* `apdex_server_rtt_threshold` - (Optional) Satisfactory client to avi round trip time(rtt). Allowed values are 1-2000. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 125), basic edition(allowed values- 125), enterprise with cloud services edition.
-* `apdex_server_rtt_tolerated_factor` - (Optional) Tolerated client to avi round trip time(rtt) factor. It is a multiple of apdex_rtt_tolerated_factor. Allowed values are 1-1000. Allowed in enterprise edition with any value, essentials edition(allowed values- 4), basic edition(allowed values- 4), enterprise with cloud services edition.
-* `client_log_config` - (Optional) Configure which logs are sent to the avi controller from ses and how they are processed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `client_log_streaming_config` - (Optional) Configure to stream logs to an external server. Field introduced in 17.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `conn_lossy_ooo_threshold` - (Optional) A connection between client and avi is considered lossy when more than this percentage of out of order packets are received. Allowed values are 1-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 50), basic edition(allowed values- 50), enterprise with cloud services edition.
-* `conn_lossy_timeo_rexmt_threshold` - (Optional) A connection between client and avi is considered lossy when more than this percentage of packets are retransmitted due to timeout. Allowed values are 1-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 20), basic edition(allowed values- 20), enterprise with cloud services edition.
-* `conn_lossy_total_rexmt_threshold` - (Optional) A connection between client and avi is considered lossy when more than this percentage of packets are retransmitted. Allowed values are 1-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 50), basic edition(allowed values- 50), enterprise with cloud services edition.
-* `conn_lossy_zero_win_size_event_threshold` - (Optional) A client connection is considered lossy when percentage of times a packet could not be trasmitted due to tcp zero window is above this threshold. Allowed values are 0-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 2), basic edition(allowed values- 2), enterprise with cloud services edition.
-* `conn_server_lossy_ooo_threshold` - (Optional) A connection between avi and server is considered lossy when more than this percentage of out of order packets are received. Allowed values are 1-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 50), basic edition(allowed values- 50), enterprise with cloud services edition.
-* `conn_server_lossy_timeo_rexmt_threshold` - (Optional) A connection between avi and server is considered lossy when more than this percentage of packets are retransmitted due to timeout. Allowed values are 1-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 20), basic edition(allowed values- 20), enterprise with cloud services edition.
-* `conn_server_lossy_total_rexmt_threshold` - (Optional) A connection between avi and server is considered lossy when more than this percentage of packets are retransmitted. Allowed values are 1-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 50), basic edition(allowed values- 50), enterprise with cloud services edition.
-* `conn_server_lossy_zero_win_size_event_threshold` - (Optional) A server connection is considered lossy when percentage of times a packet could not be trasmitted due to tcp zero window is above this threshold. Allowed values are 0-100. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 2), basic edition(allowed values- 2), enterprise with cloud services edition.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_adaptive_config` - (Optional) Enable adaptive configuration for optimizing resource usage. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_advanced_analytics` - (Optional) Enables advanced analytics features like anomaly detection. If set to false, anomaly computation (and associated rules/events) for vs, pool and server metrics will be deactivated. However, setting it to false reduces cpu and memory requirements for analytics subsystem. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition. Special default for essentials edition is false, basic edition is false, enterprise is true.
-* `enable_ondemand_metrics` - (Optional) Virtual service (vs) metrics are processed only when there is live data traffic on the vs. In case, vs is idle for a period of time as specified by ondemand_metrics_idle_timeout then metrics processing is suspended for that vs. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_se_analytics` - (Optional) Enable node (service engine) level analytics forvs metrics. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_server_analytics` - (Optional) Enables analytics on backend servers. This may be desired in container environment when there are large number of ephemeral servers. Additionally, no healthscore of servers is computed when server analytics is enabled. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_vs_analytics` - (Optional) Enable virtualservice (frontend) analytics. This flag enables metrics and healthscore for virtualservice. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `exclude_client_close_before_request_as_error` - (Optional) Exclude client closed connection before an http request could be completed from being classified as an error. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_dns_policy_drop_as_significant` - (Optional) Exclude dns policy drops from the list of errors. Field introduced in 17.2.2. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_gs_down_as_error` - (Optional) Exclude queries to gslb services that are operationally down from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_http_error_codes` - (Optional) List of http status codes to be excluded from being classified as an error. Error connections or responses impacts health score, are included as significant logs, and may be classified as part of a dos attack. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `exclude_invalid_dns_domain_as_error` - (Optional) Exclude dns queries to domains outside the domains configured in the dns application profile from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_invalid_dns_query_as_error` - (Optional) Exclude invalid dns queries from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_issuer_revoked_ocsp_responses_as_error` - (Optional) Exclude the issuer-revoked ocsp responses from the list of errors. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `exclude_no_dns_record_as_error` - (Optional) Exclude queries to domains that did not have configured services/records from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_no_valid_gs_member_as_error` - (Optional) Exclude queries to gslb services that have no available members from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_persistence_change_as_error` - (Optional) Exclude persistence server changed while load balancing' from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_revoked_ocsp_responses_as_error` - (Optional) Exclude the revoked ocsp certificate status responses from the list of errors. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `exclude_server_dns_error_as_error` - (Optional) Exclude server dns error response from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_server_tcp_reset_as_error` - (Optional) Exclude server tcp reset from errors. It is common for applications like ms exchange. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_sip_error_codes` - (Optional) List of sip status codes to be excluded from being classified as an error. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `exclude_stale_ocsp_responses_as_error` - (Optional) Exclude the stale ocsp certificate status responses from the list of errors. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `exclude_syn_retransmit_as_error` - (Optional) Exclude 'server unanswered syns' from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_tcp_reset_as_error` - (Optional) Exclude tcp resets by client from the list of potential errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `exclude_unavailable_ocsp_responses_as_error` - (Optional) Exclude the unavailable ocsp responses from the list of errors. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `exclude_unsupported_dns_query_as_error` - (Optional) Exclude unsupported dns queries from the list of errors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `healthscore_max_server_limit` - (Optional) Skips health score computation of pool servers when number of servers in a pool is more than this setting. Allowed values are 0-5000. Special values are 0- server health score is deactivated. Field introduced in 17.2.13, 18.1.4. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition. Special default for essentials edition is 0, basic edition is 0, enterprise is 20.
-* `hs_event_throttle_window` - (Optional) Time window (in secs) within which only unique health change events should occur. Allowed in enterprise edition with any value, essentials edition(allowed values- 1209600), basic edition(allowed values- 1209600), enterprise with cloud services edition.
-* `hs_max_anomaly_penalty` - (Optional) Maximum penalty that may be deducted from health score for anomalies. Allowed values are 0-100. Allowed in enterprise edition with any value, essentials edition(allowed values- 10), basic edition(allowed values- 10), enterprise with cloud services edition.
-* `hs_max_resources_penalty` - (Optional) Maximum penalty that may be deducted from health score for high resource utilization. Allowed values are 0-100. Allowed in enterprise edition with any value, essentials edition(allowed values- 25), basic edition(allowed values- 25), enterprise with cloud services edition.
-* `hs_max_security_penalty` - (Optional) Maximum penalty that may be deducted from health score based on security assessment. Allowed values are 0-100. Allowed in enterprise edition with any value, essentials edition(allowed values- 100), basic edition(allowed values- 100), enterprise with cloud services edition.
-* `hs_min_dos_rate` - (Optional) Dos connection rate below which the dos security assessment will not kick in. Allowed in enterprise edition with any value, essentials edition(allowed values- 1000), basic edition(allowed values- 1000), enterprise with cloud services edition.
-* `hs_performance_boost` - (Optional) Adds free performance score credits to health score. It can be used for compensating health score for known slow applications. Allowed values are 0-100. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `hs_pscore_traffic_threshold_l4_client` - (Optional) Threshold number of connections in 5min, below which apdexr, apdexc, rum_apdex, and other network quality metrics are not computed. Allowed in enterprise edition with any value, essentials edition(allowed values- 10), basic edition(allowed values- 10), enterprise with cloud services edition.
-* `hs_pscore_traffic_threshold_l4_server` - (Optional) Threshold number of connections in 5min, below which apdexr, apdexc, rum_apdex, and other network quality metrics are not computed. Allowed in enterprise edition with any value, essentials edition(allowed values- 10), basic edition(allowed values- 10), enterprise with cloud services edition.
-* `hs_security_certscore_expired` - (Optional) Score assigned when the certificate has expired. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 0.0), basic edition(allowed values- 0.0), enterprise with cloud services edition.
-* `hs_security_certscore_gt30d` - (Optional) Score assigned when the certificate expires in more than 30 days. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 5.0), basic edition(allowed values- 5.0), enterprise with cloud services edition.
-* `hs_security_certscore_le07d` - (Optional) Score assigned when the certificate expires in less than or equal to 7 days. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 2.0), basic edition(allowed values- 2.0), enterprise with cloud services edition.
-* `hs_security_certscore_le30d` - (Optional) Score assigned when the certificate expires in less than or equal to 30 days. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 4.0), basic edition(allowed values- 4.0), enterprise with cloud services edition.
-* `hs_security_chain_invalidity_penalty` - (Optional) Penalty for allowing certificates with invalid chain. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 1.0), basic edition(allowed values- 1.0), enterprise with cloud services edition.
-* `hs_security_cipherscore_eq000b` - (Optional) Score assigned when the minimum cipher strength is 0 bits. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 0.0), basic edition(allowed values- 0.0), enterprise with cloud services edition.
-* `hs_security_cipherscore_ge128b` - (Optional) Score assigned when the minimum cipher strength is greater than equal to 128 bits. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 5.0), basic edition(allowed values- 5.0), enterprise with cloud services edition.
-* `hs_security_cipherscore_lt128b` - (Optional) Score assigned when the minimum cipher strength is less than 128 bits. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 3.5), basic edition(allowed values- 3.5), enterprise with cloud services edition.
-* `hs_security_encalgo_score_none` - (Optional) Score assigned when no algorithm is used for encryption. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 0.0), basic edition(allowed values- 0.0), enterprise with cloud services edition.
-* `hs_security_encalgo_score_rc4` - (Optional) Score assigned when rc4 algorithm is used for encryption. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 2.5), basic edition(allowed values- 2.5), enterprise with cloud services edition.
-* `hs_security_hsts_penalty` - (Optional) Penalty for not enabling hsts. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 1.0), basic edition(allowed values- 1.0), enterprise with cloud services edition.
-* `hs_security_nonpfs_penalty` - (Optional) Penalty for allowing non-pfs handshakes. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 1.0), basic edition(allowed values- 1.0), enterprise with cloud services edition.
-* `hs_security_ocsp_revoked_score` - (Optional) Score assigned when ocsp certificate status is set to revoked or issuer revoked. Allowed values are 0.0-5.0. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 0.0), basic edition(allowed values- 0.0), enterprise with cloud services edition.
-* `hs_security_selfsignedcert_penalty` - (Optional) Deprecated. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 1.0), basic edition(allowed values- 1.0), enterprise with cloud services edition.
-* `hs_security_ssl30_score` - (Optional) Score assigned when supporting ssl3.0 encryption protocol. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 3.5), basic edition(allowed values- 3.5), enterprise with cloud services edition.
-* `hs_security_tls10_score` - (Optional) Score assigned when supporting tls1.0 encryption protocol. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 5.0), basic edition(allowed values- 5.0), enterprise with cloud services edition.
-* `hs_security_tls11_score` - (Optional) Score assigned when supporting tls1.1 encryption protocol. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 5.0), basic edition(allowed values- 5.0), enterprise with cloud services edition.
-* `hs_security_tls12_score` - (Optional) Score assigned when supporting tls1.2 encryption protocol. Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 5.0), basic edition(allowed values- 5.0), enterprise with cloud services edition.
-* `hs_security_tls13_score` - (Optional) Score assigned when supporting tls1.3 encryption protocol. Allowed values are 0-5. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials edition(allowed values- 5.0), basic edition(allowed values- 5.0), enterprise with cloud services edition.
-* `hs_security_weak_signature_algo_penalty` - (Optional) Penalty for allowing weak signature algorithm(s). Allowed values are 0-5. Allowed in enterprise edition with any value, essentials edition(allowed values- 1.0), basic edition(allowed values- 1.0), enterprise with cloud services edition.
-* `latency_audit_props` - (Optional) Deprecated in 22.1.1. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `ondemand_metrics_idle_timeout` - (Optional) This flag sets the time duration of no live data traffic after which virtual service metrics processing is suspended. It is applicable only when enable_ondemand_metrics is set to false. Field introduced in 18.1.1. Unit is seconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ranges` - (Optional) List of http status code ranges to be excluded from being classified as an error. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `resp_code_block` - (Optional) Block of http response codes to be excluded from being classified as an error. Enum options - AP_HTTP_RSP_4XX, AP_HTTP_RSP_5XX. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `sensitive_log_profile` - (Optional) Rules applied to the http application log for filtering sensitive information. Field introduced in 17.2.10, 18.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `sip_log_depth` - (Optional) Maximum number of sip messages added in logs for a sip transaction. By default, this value is 20. Allowed values are 1-1000. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 20), basic edition(allowed values- 20), enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `time_tracker_props` - (Optional) Time tracker properties for connection establishment audit. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) The name of the analytics profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `apdex_response_threshold` - (Optional) If a client receives an http response in less than the satisfactory latency threshold, the request is considered satisfied. It is considered tolerated if it is not satisfied and less than tolerated latency factor multiplied by the satisfactory latency threshold. Greater than this number and the client's request is considered frustrated. Allowed values are 1-30000. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 500), basic (allowed values- 500) edition.
+* `apdex_response_tolerated_factor` - (Optional) Client tolerated response latency factor. Client must receive a response within this factor times the satisfactory threshold (apdex_response_threshold) to be considered tolerated. Allowed values are 1-1000. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 4), basic (allowed values- 4) edition.
+* `apdex_rtt_threshold` - (Optional) Satisfactory client to avi round trip time(rtt). Allowed values are 1-2000. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 250), basic (allowed values- 250) edition.
+* `apdex_rtt_tolerated_factor` - (Optional) Tolerated client to avi round trip time(rtt) factor. It is a multiple of apdex_rtt_tolerated_factor. Allowed values are 1-1000. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 4), basic (allowed values- 4) edition.
+* `apdex_rum_threshold` - (Optional) If a client is able to load a page in less than the satisfactory latency threshold, the pageload is considered satisfied. It is considered tolerated if it is greater than satisfied but less than the tolerated latency multiplied by satisifed latency. Greater than this number and the client's request is considered frustrated. A pageload includes the time for dns lookup, download of all http objects, and page render time. Allowed values are 1-30000. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5000), basic (allowed values- 5000) edition.
+* `apdex_rum_tolerated_factor` - (Optional) Virtual service threshold factor for tolerated page load time (plt) as multiple of apdex_rum_threshold. Allowed values are 1-1000. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 4), basic (allowed values- 4) edition.
+* `apdex_server_response_threshold` - (Optional) A server http response is considered satisfied if latency is less than the satisfactory latency threshold. The response is considered tolerated when it is greater than satisfied but less than the tolerated latency factor * s_latency. Greater than this number and the server response is considered frustrated. Allowed values are 1-30000. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 400), basic (allowed values- 400) edition.
+* `apdex_server_response_tolerated_factor` - (Optional) Server tolerated response latency factor. Servermust response within this factor times the satisfactory threshold (apdex_server_response_threshold) to be considered tolerated. Allowed values are 1-1000. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 4), basic (allowed values- 4) edition.
+* `apdex_server_rtt_threshold` - (Optional) Satisfactory client to avi round trip time(rtt). Allowed values are 1-2000. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 125), basic (allowed values- 125) edition.
+* `apdex_server_rtt_tolerated_factor` - (Optional) Tolerated client to avi round trip time(rtt) factor. It is a multiple of apdex_rtt_tolerated_factor. Allowed values are 1-1000. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 4), basic (allowed values- 4) edition.
+* `client_log_config` - (Optional) Configure which logs are sent to the avi controller from ses and how they are processed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `client_log_streaming_config` - (Optional) Configure to stream logs to an external server. Field introduced in 17.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `conn_lossy_ooo_threshold` - (Optional) A connection between client and avi is considered lossy when more than this percentage of out of order packets are received. Allowed values are 1-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 50), basic (allowed values- 50) edition.
+* `conn_lossy_timeo_rexmt_threshold` - (Optional) A connection between client and avi is considered lossy when more than this percentage of packets are retransmitted due to timeout. Allowed values are 1-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 20), basic (allowed values- 20) edition.
+* `conn_lossy_total_rexmt_threshold` - (Optional) A connection between client and avi is considered lossy when more than this percentage of packets are retransmitted. Allowed values are 1-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 50), basic (allowed values- 50) edition.
+* `conn_lossy_zero_win_size_event_threshold` - (Optional) A client connection is considered lossy when percentage of times a packet could not be trasmitted due to tcp zero window is above this threshold. Allowed values are 0-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 2), basic (allowed values- 2) edition.
+* `conn_server_lossy_ooo_threshold` - (Optional) A connection between avi and server is considered lossy when more than this percentage of out of order packets are received. Allowed values are 1-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 50), basic (allowed values- 50) edition.
+* `conn_server_lossy_timeo_rexmt_threshold` - (Optional) A connection between avi and server is considered lossy when more than this percentage of packets are retransmitted due to timeout. Allowed values are 1-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 20), basic (allowed values- 20) edition.
+* `conn_server_lossy_total_rexmt_threshold` - (Optional) A connection between avi and server is considered lossy when more than this percentage of packets are retransmitted. Allowed values are 1-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 50), basic (allowed values- 50) edition.
+* `conn_server_lossy_zero_win_size_event_threshold` - (Optional) A server connection is considered lossy when percentage of times a packet could not be trasmitted due to tcp zero window is above this threshold. Allowed values are 0-100. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 2), basic (allowed values- 2) edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_adaptive_config` - (Optional) Enable adaptive configuration for optimizing resource usage. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_advanced_analytics` - (Optional) Enables advanced analytics features like anomaly detection. If set to false, anomaly computation (and associated rules/events) for vs, pool and server metrics will be deactivated. However, setting it to false reduces cpu and memory requirements for analytics subsystem. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition. Special default for essentials edition is false, basic edition is false, enterprise edition is true.
+* `enable_ondemand_metrics` - (Optional) Virtual service (vs) metrics are processed only when there is live data traffic on the vs. In case, vs is idle for a period of time as specified by ondemand_metrics_idle_timeout then metrics processing is suspended for that vs. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_se_analytics` - (Optional) Enable node (service engine) level analytics forvs metrics. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_server_analytics` - (Optional) Enables analytics on backend servers. This may be desired in container environment when there are large number of ephemeral servers. Additionally, no healthscore of servers is computed when server analytics is enabled. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_vs_analytics` - (Optional) Enable virtualservice (frontend) analytics. This flag enables metrics and healthscore for virtualservice. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `exclude_client_close_before_request_as_error` - (Optional) Exclude client closed connection before an http request could be completed from being classified as an error. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_dns_policy_drop_as_significant` - (Optional) Exclude dns policy drops from the list of errors. Field introduced in 17.2.2. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_gs_down_as_error` - (Optional) Exclude queries to gslb services that are operationally down from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_http_error_codes` - (Optional) List of http status codes to be excluded from being classified as an error. Error connections or responses impacts health score, are included as significant logs, and may be classified as part of a dos attack. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `exclude_invalid_dns_domain_as_error` - (Optional) Exclude dns queries to domains outside the domains configured in the dns application profile from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_invalid_dns_query_as_error` - (Optional) Exclude invalid dns queries from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_issuer_revoked_ocsp_responses_as_error` - (Optional) Exclude the issuer-revoked ocsp responses from the list of errors. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `exclude_no_dns_record_as_error` - (Optional) Exclude queries to domains that did not have configured services/records from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_no_valid_gs_member_as_error` - (Optional) Exclude queries to gslb services that have no available members from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_persistence_change_as_error` - (Optional) Exclude persistence server changed while load balancing' from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_revoked_ocsp_responses_as_error` - (Optional) Exclude the revoked ocsp certificate status responses from the list of errors. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `exclude_server_dns_error_as_error` - (Optional) Exclude server dns error response from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_server_tcp_reset_as_error` - (Optional) Exclude server tcp reset from errors. It is common for applications like ms exchange. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_sip_error_codes` - (Optional) List of sip status codes to be excluded from being classified as an error. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `exclude_stale_ocsp_responses_as_error` - (Optional) Exclude the stale ocsp certificate status responses from the list of errors. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `exclude_syn_retransmit_as_error` - (Optional) Exclude 'server unanswered syns' from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_tcp_reset_as_error` - (Optional) Exclude tcp resets by client from the list of potential errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_unavailable_ocsp_responses_as_error` - (Optional) Exclude the unavailable ocsp responses from the list of errors. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `exclude_unsupported_dns_query_as_error` - (Optional) Exclude unsupported dns queries from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `healthscore_max_server_limit` - (Optional) Skips health score computation of pool servers when number of servers in a pool is more than this setting. Allowed values are 0-5000. Special values are 0- server health score is deactivated. Field introduced in 17.2.13, 18.1.4. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition. Special default for essentials edition is 0, basic edition is 0, enterprise edition is 20.
+* `hs_event_throttle_window` - (Optional) Time window (in secs) within which only unique health change events should occur. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1209600), basic (allowed values- 1209600) edition.
+* `hs_max_anomaly_penalty` - (Optional) Maximum penalty that may be deducted from health score for anomalies. Allowed values are 0-100. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 10), basic (allowed values- 10) edition.
+* `hs_max_resources_penalty` - (Optional) Maximum penalty that may be deducted from health score for high resource utilization. Allowed values are 0-100. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 25), basic (allowed values- 25) edition.
+* `hs_max_security_penalty` - (Optional) Maximum penalty that may be deducted from health score based on security assessment. Allowed values are 0-100. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 100), basic (allowed values- 100) edition.
+* `hs_min_dos_rate` - (Optional) Dos connection rate below which the dos security assessment will not kick in. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1000), basic (allowed values- 1000) edition.
+* `hs_performance_boost` - (Optional) Adds free performance score credits to health score. It can be used for compensating health score for known slow applications. Allowed values are 0-100. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `hs_pscore_traffic_threshold_l4_client` - (Optional) Threshold number of connections in 5min, below which apdexr, apdexc, rum_apdex, and other network quality metrics are not computed. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 10), basic (allowed values- 10) edition.
+* `hs_pscore_traffic_threshold_l4_server` - (Optional) Threshold number of connections in 5min, below which apdexr, apdexc, rum_apdex, and other network quality metrics are not computed. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 10), basic (allowed values- 10) edition.
+* `hs_security_certscore_expired` - (Optional) Score assigned when the certificate has expired. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0.0), basic (allowed values- 0.0) edition.
+* `hs_security_certscore_gt30d` - (Optional) Score assigned when the certificate expires in more than 30 days. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5.0), basic (allowed values- 5.0) edition.
+* `hs_security_certscore_le07d` - (Optional) Score assigned when the certificate expires in less than or equal to 7 days. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 2.0), basic (allowed values- 2.0) edition.
+* `hs_security_certscore_le30d` - (Optional) Score assigned when the certificate expires in less than or equal to 30 days. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 4.0), basic (allowed values- 4.0) edition.
+* `hs_security_chain_invalidity_penalty` - (Optional) Penalty for allowing certificates with invalid chain. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1.0), basic (allowed values- 1.0) edition.
+* `hs_security_cipherscore_eq000b` - (Optional) Score assigned when the minimum cipher strength is 0 bits. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0.0), basic (allowed values- 0.0) edition.
+* `hs_security_cipherscore_ge128b` - (Optional) Score assigned when the minimum cipher strength is greater than equal to 128 bits. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5.0), basic (allowed values- 5.0) edition.
+* `hs_security_cipherscore_lt128b` - (Optional) Score assigned when the minimum cipher strength is less than 128 bits. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 3.5), basic (allowed values- 3.5) edition.
+* `hs_security_encalgo_score_none` - (Optional) Score assigned when no algorithm is used for encryption. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0.0), basic (allowed values- 0.0) edition.
+* `hs_security_encalgo_score_rc4` - (Optional) Score assigned when rc4 algorithm is used for encryption. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 2.5), basic (allowed values- 2.5) edition.
+* `hs_security_hsts_penalty` - (Optional) Penalty for not enabling hsts. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1.0), basic (allowed values- 1.0) edition.
+* `hs_security_nonpfs_penalty` - (Optional) Penalty for allowing non-pfs handshakes. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1.0), basic (allowed values- 1.0) edition.
+* `hs_security_ocsp_revoked_score` - (Optional) Score assigned when ocsp certificate status is set to revoked or issuer revoked. Allowed values are 0.0-5.0. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0.0), basic (allowed values- 0.0) edition.
+* `hs_security_selfsignedcert_penalty` - (Optional) Deprecated. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1.0), basic (allowed values- 1.0) edition.
+* `hs_security_ssl30_score` - (Optional) Score assigned when supporting ssl3.0 encryption protocol. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 3.5), basic (allowed values- 3.5) edition.
+* `hs_security_tls10_score` - (Optional) Score assigned when supporting tls1.0 encryption protocol. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5.0), basic (allowed values- 5.0) edition.
+* `hs_security_tls11_score` - (Optional) Score assigned when supporting tls1.1 encryption protocol. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5.0), basic (allowed values- 5.0) edition.
+* `hs_security_tls12_score` - (Optional) Score assigned when supporting tls1.2 encryption protocol. Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5.0), basic (allowed values- 5.0) edition.
+* `hs_security_tls13_score` - (Optional) Score assigned when supporting tls1.3 encryption protocol. Allowed values are 0-5. Field introduced in 18.2.6. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5.0), basic (allowed values- 5.0) edition.
+* `hs_security_weak_signature_algo_penalty` - (Optional) Penalty for allowing weak signature algorithm(s). Allowed values are 0-5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1.0), basic (allowed values- 1.0) edition.
+* `latency_audit_props` - (Optional) Deprecated in 22.1.1. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ondemand_metrics_idle_timeout` - (Optional) This flag sets the time duration of no live data traffic after which virtual service metrics processing is suspended. It is applicable only when enable_ondemand_metrics is set to false. Field introduced in 18.1.1. Unit is seconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ranges` - (Optional) List of http status code ranges to be excluded from being classified as an error. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `resp_code_block` - (Optional) Block of http response codes to be excluded from being classified as an error. Enum options - AP_HTTP_RSP_4XX, AP_HTTP_RSP_5XX. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sensitive_log_profile` - (Optional) Rules applied to the http application log for filtering sensitive information. Field introduced in 17.2.10, 18.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sip_log_depth` - (Optional) Maximum number of sip messages added in logs for a sip transaction. By default, this value is 20. Allowed values are 1-1000. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 20), basic (allowed values- 20) edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `time_tracker_props` - (Optional) Time tracker properties for connection establishment audit. Field introduced in 22.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -127,5 +127,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the analytics profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the analytics profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_applicationpersistenceprofile.html.markdown b/website/docs/r/avi_applicationpersistenceprofile.html.markdown
index 40f55e8e5..8996d6bc6 100644
--- a/website/docs/r/avi_applicationpersistenceprofile.html.markdown
+++ b/website/docs/r/avi_applicationpersistenceprofile.html.markdown
@@ -27,18 +27,19 @@ resource "avi_applicationpersistenceprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) A user-friendly name for the persistence profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `persistence_type` - (Required) Method used to persist clients to the same server for a duration of time or a session. Enum options - PERSISTENCE_TYPE_CLIENT_IP_ADDRESS, PERSISTENCE_TYPE_HTTP_COOKIE, PERSISTENCE_TYPE_TLS, PERSISTENCE_TYPE_CLIENT_IPV6_ADDRESS, PERSISTENCE_TYPE_CUSTOM_HTTP_HEADER, PERSISTENCE_TYPE_APP_COOKIE, PERSISTENCE_TYPE_GSLB_SITE. Allowed in enterprise edition with any value, essentials edition(allowed values- persistence_type_client_ip_address,persistence_type_http_cookie), basic edition(allowed values- persistence_type_client_ip_address,persistence_type_http_cookie), enterprise with cloud services edition.
-* `app_cookie_persistence_profile` - (Optional) Specifies the application cookie persistence profile parameters. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `hdr_persistence_profile` - (Optional) Specifies the custom http header persistence profile parameters. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `http_cookie_persistence_profile` - (Optional) Specifies the http cookie persistence profile parameters. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ip_persistence_profile` - (Optional) Specifies the client ip persistence profile parameters. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_federated` - (Optional) This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `server_hm_down_recovery` - (Optional) Specifies behavior when a persistent server has been marked down by a health monitor. Enum options - HM_DOWN_PICK_NEW_SERVER, HM_DOWN_ABORT_CONNECTION, HM_DOWN_CONTINUE_PERSISTENT_SERVER. Allowed in enterprise edition with any value, essentials edition(allowed values- hm_down_pick_new_server), basic edition(allowed values- hm_down_pick_new_server), enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) A user-friendly name for the persistence profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `persistence_type` - (Required) Method used to persist clients to the same server for a duration of time or a session. Enum options - PERSISTENCE_TYPE_CLIENT_IP_ADDRESS, PERSISTENCE_TYPE_HTTP_COOKIE, PERSISTENCE_TYPE_TLS, PERSISTENCE_TYPE_CLIENT_IPV6_ADDRESS, PERSISTENCE_TYPE_CUSTOM_HTTP_HEADER, PERSISTENCE_TYPE_APP_COOKIE, PERSISTENCE_TYPE_GSLB_SITE, PERSISTENCE_TYPE_APP_DIAMETER. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- persistence_type_client_ip_address,persistence_type_http_cookie), basic (allowed values- persistence_type_client_ip_address,persistence_type_http_cookie) edition.
+* `app_cookie_persistence_profile` - (Optional) Specifies the application cookie persistence profile parameters. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `diameter_app_persistence_profile` - (Optional) Specifies the diameter persistence profile parameters. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `hdr_persistence_profile` - (Optional) Specifies the custom http header persistence profile parameters. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `http_cookie_persistence_profile` - (Optional) Specifies the http cookie persistence profile parameters. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ip_persistence_profile` - (Optional) Specifies the client ip persistence profile parameters. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_federated` - (Optional) This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `server_hm_down_recovery` - (Optional) Specifies behavior when a persistent server has been marked down by a health monitor. Enum options - HM_DOWN_PICK_NEW_SERVER, HM_DOWN_ABORT_CONNECTION, HM_DOWN_CONTINUE_PERSISTENT_SERVER. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- hm_down_pick_new_server), basic (allowed values- hm_down_pick_new_server) edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -53,5 +54,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the persistence profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the persistence profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_applicationprofile.html.markdown b/website/docs/r/avi_applicationprofile.html.markdown
index 1ceeefd56..e7121fffd 100644
--- a/website/docs/r/avi_applicationprofile.html.markdown
+++ b/website/docs/r/avi_applicationprofile.html.markdown
@@ -27,24 +27,25 @@ resource "avi_applicationprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) The name of the application profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - (Required) Specifies which application layer proxy is enabled for the virtual service. Enum options - APPLICATION_PROFILE_TYPE_L4, APPLICATION_PROFILE_TYPE_HTTP, APPLICATION_PROFILE_TYPE_SYSLOG, APPLICATION_PROFILE_TYPE_DNS, APPLICATION_PROFILE_TYPE_SSL, APPLICATION_PROFILE_TYPE_SIP. Allowed in enterprise edition with any value, essentials edition(allowed values- application_profile_type_l4), basic edition(allowed values- application_profile_type_l4,application_profile_type_http), enterprise with cloud services edition.
-* `app_service_type` - (Optional) Specifies app service type for an application. Enum options - APP_SERVICE_TYPE_L7_HORIZON, APP_SERVICE_TYPE_L4_BLAST, APP_SERVICE_TYPE_L4_PCOIP, APP_SERVICE_TYPE_L4_FTP. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `cloud_config_cksum` - (Optional) Checksum of application profiles. Internally set by cloud connector. Field introduced in 17.2.14, 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `created_by` - (Optional) Name of the application profile creator. Field introduced in 17.2.14, 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dns_service_profile` - (Optional) Specifies various dns service related controls for virtual service. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dos_rl_profile` - (Optional) Specifies various security related controls for virtual service. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `http_profile` - (Optional) Specifies the http application proxy profile parameters. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `l4_ssl_profile` - (Optional) Specifies various l4 ssl service related controls for virtual service. Field introduced in 22.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `preserve_client_ip` - (Optional) Specifies if client ip needs to be preserved for backend connection. Not compatible with connection multiplexing. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `preserve_client_port` - (Optional) Specifies if we need to preserve client port while preserving client ip for backend connections. Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `preserve_dest_ip_port` - (Optional) Specifies if destination ip and port needs to be preserved for backend connection. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `sip_service_profile` - (Optional) Specifies various sip service related controls for virtual service. Field introduced in 17.2.8, 18.1.3, 18.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tcp_app_profile` - (Optional) Specifies the tcp application proxy profile parameters. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) The name of the application profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - (Required) Specifies which application layer proxy is enabled for the virtual service. Enum options - APPLICATION_PROFILE_TYPE_L4, APPLICATION_PROFILE_TYPE_HTTP, APPLICATION_PROFILE_TYPE_SYSLOG, APPLICATION_PROFILE_TYPE_DNS, APPLICATION_PROFILE_TYPE_SSL, APPLICATION_PROFILE_TYPE_SIP, APPLICATION_PROFILE_TYPE_DIAMETER. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- application_profile_type_l4), basic (allowed values- application_profile_type_l4,application_profile_type_http) edition.
+* `app_service_type` - (Optional) Specifies app service type for an application. Enum options - APP_SERVICE_TYPE_L7_HORIZON, APP_SERVICE_TYPE_L4_BLAST, APP_SERVICE_TYPE_L4_PCOIP, APP_SERVICE_TYPE_L4_FTP. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cloud_config_cksum` - (Optional) Checksum of application profiles. Internally set by cloud connector. Field introduced in 17.2.14, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - (Optional) Name of the application profile creator. Field introduced in 17.2.14, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `diameter_service_profile` - (Optional) Specifies various diameter service related controls for virtual service. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dns_service_profile` - (Optional) Specifies various dns service related controls for virtual service. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dos_rl_profile` - (Optional) Specifies various security related controls for virtual service. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `http_profile` - (Optional) Specifies the http application proxy profile parameters. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `l4_ssl_profile` - (Optional) Specifies various l4 ssl service related controls for virtual service. Field introduced in 22.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `preserve_client_ip` - (Optional) Specifies if client ip needs to be preserved for backend connection. Not compatible with connection multiplexing. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `preserve_client_port` - (Optional) Specifies if we need to preserve client port while preserving client ip for backend connections. Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `preserve_dest_ip_port` - (Optional) Specifies if destination ip and port needs to be preserved for backend connection. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `sip_service_profile` - (Optional) Specifies various sip service related controls for virtual service. Field introduced in 17.2.8, 18.1.3, 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tcp_app_profile` - (Optional) Specifies the tcp application proxy profile parameters. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -59,5 +60,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the application profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the application profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_authmappingprofile.html.markdown b/website/docs/r/avi_authmappingprofile.html.markdown
index 0ce9113ff..593bbfdb5 100644
--- a/website/docs/r/avi_authmappingprofile.html.markdown
+++ b/website/docs/r/avi_authmappingprofile.html.markdown
@@ -27,12 +27,12 @@ resource "avi_authmappingprofile" "foo" {
 
 The following arguments are supported:
 
-* `mapping_rules` - (Required) Rules list for tenant or role mapping. Field introduced in 22.1.1. Minimum of 1 items required. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - (Required) Name of the authmappingprofile. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `type` - (Required) Type of the auth profile for which these rules can be linked. Enum options - AUTH_PROFILE_LDAP, AUTH_PROFILE_TACACS_PLUS, AUTH_PROFILE_SAML, AUTH_PROFILE_PINGACCESS, AUTH_PROFILE_JWT, AUTH_PROFILE_OAUTH. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 22.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `description` - (Optional) Description for the authmappingprofile. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant ref for the auth mapping profile. It is a reference to an object of type tenant. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `mapping_rules` - (Required) Rules list for tenant or role mapping. Field introduced in 22.1.1. Minimum of 1 items required. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Required) Name of the authmappingprofile. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `type` - (Required) Type of the auth profile for which these rules can be linked. Enum options - AUTH_PROFILE_LDAP, AUTH_PROFILE_TACACS_PLUS, AUTH_PROFILE_SAML, AUTH_PROFILE_PINGACCESS, AUTH_PROFILE_JWT, AUTH_PROFILE_OAUTH. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 22.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Description for the authmappingprofile. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant ref for the auth mapping profile. It is a reference to an object of type tenant. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -47,5 +47,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the authmappingprofile. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Uuid of the authmappingprofile. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_authprofile.html.markdown b/website/docs/r/avi_authprofile.html.markdown
index 2bd3a2977..16f572e73 100644
--- a/website/docs/r/avi_authprofile.html.markdown
+++ b/website/docs/r/avi_authprofile.html.markdown
@@ -27,18 +27,18 @@ resource "avi_authprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the auth profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - (Required) Type of the auth profile. Enum options - AUTH_PROFILE_LDAP, AUTH_PROFILE_TACACS_PLUS, AUTH_PROFILE_SAML, AUTH_PROFILE_PINGACCESS, AUTH_PROFILE_JWT, AUTH_PROFILE_OAUTH. Allowed in enterprise edition with any value, essentials edition(allowed values- auth_profile_ldap,auth_profile_tacacs_plus,auth_profile_saml,auth_profile_jwt,auth_profile_oauth), basic edition(allowed values- auth_profile_ldap,auth_profile_tacacs_plus,auth_profile_saml,auth_profile_jwt,auth_profile_oauth), enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `http` - (Optional) Http user authentication params. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `jwt_profile_ref` - (Optional) Jwtserverprofile to be used for authentication. It is a reference to an object of type jwtserverprofile. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ldap` - (Optional) Ldap server and directory settings. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `oauth_profile` - (Optional) Oauth profile - common endpoint information. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `saml` - (Optional) Saml settings. Field introduced in 17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tacacs_plus` - (Optional) Tacacs+ settings. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the auth profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - (Required) Type of the auth profile. Enum options - AUTH_PROFILE_LDAP, AUTH_PROFILE_TACACS_PLUS, AUTH_PROFILE_SAML, AUTH_PROFILE_PINGACCESS, AUTH_PROFILE_JWT, AUTH_PROFILE_OAUTH. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- auth_profile_ldap,auth_profile_tacacs_plus,auth_profile_saml,auth_profile_jwt,auth_profile_oauth), basic (allowed values- auth_profile_ldap,auth_profile_tacacs_plus,auth_profile_saml,auth_profile_jwt,auth_profile_oauth) edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `http` - (Optional) Http user authentication params. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `jwt_profile_ref` - (Optional) Jwtserverprofile to be used for authentication. It is a reference to an object of type jwtserverprofile. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ldap` - (Optional) Ldap server and directory settings. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `oauth_profile` - (Optional) Oauth profile - common endpoint information. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `saml` - (Optional) Saml settings. Field introduced in 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tacacs_plus` - (Optional) Tacacs+ settings. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -53,5 +53,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the auth profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the auth profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_autoscalelaunchconfig.html.markdown b/website/docs/r/avi_autoscalelaunchconfig.html.markdown
index 35dcb4371..e36486301 100644
--- a/website/docs/r/avi_autoscalelaunchconfig.html.markdown
+++ b/website/docs/r/avi_autoscalelaunchconfig.html.markdown
@@ -27,15 +27,15 @@ resource "avi_autoscalelaunchconfig" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `image_id` - (Optional) Unique id of the amazon machine image (ami)  or openstack vm id. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `mesos` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `openstack` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `use_external_asg` - (Optional) If set to true, serverautoscalepolicy will use the autoscaling group (external_autoscaling_groups) from pool to perform scale up and scale down. Pool should have single autoscaling group configured. Field introduced in 17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `image_id` - (Optional) Unique id of the amazon machine image (ami)  or openstack vm id. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mesos` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `openstack` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_external_asg` - (Optional) If set to true, serverautoscalepolicy will use the autoscaling group (external_autoscaling_groups) from pool to perform scale up and scale down. Pool should have single autoscaling group configured. Field introduced in 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -50,5 +50,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_availabilityzone.html.markdown b/website/docs/r/avi_availabilityzone.html.markdown
index b0743b5fc..f4eb7a029 100644
--- a/website/docs/r/avi_availabilityzone.html.markdown
+++ b/website/docs/r/avi_availabilityzone.html.markdown
@@ -27,11 +27,12 @@ resource "avi_availabilityzone" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Availabilty zone where vcenter list belongs to. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_refs` - (Required) Group of vcenter list belong to availabilty zone. It is a reference to an object of type vcenterserver. Field introduced in 20.1.1. Minimum of 1 items required. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - (Optional) Availability zone belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `tenant_ref` - (Optional) Availabilityzone belongs to tenant. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Availabilty zone where vcenter list belongs to. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `az_clusters` - (Optional) Group of clusters belongs to the az. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `az_datastore` - (Optional) Datastores associated with the az. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) Availability zone belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Availabilityzone belongs to tenant. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -46,5 +47,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Availability zone config uuid. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Availability zone config uuid. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_backup.html.markdown b/website/docs/r/avi_backup.html.markdown
index e4d78d498..51223e1c2 100644
--- a/website/docs/r/avi_backup.html.markdown
+++ b/website/docs/r/avi_backup.html.markdown
@@ -27,13 +27,13 @@ resource "avi_backup" "foo" {
 
 The following arguments are supported:
 
-* `file_name` - (Required) The file name of backup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `backup_config_ref` - (Optional) Backupconfiguration information. It is a reference to an object of type backupconfiguration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `local_file_url` - (Optional) Url to download the backup file. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `remote_file_url` - (Optional) Url to download the backup file. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scheduler_ref` - (Optional) Scheduler information. It is a reference to an object of type scheduler. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `timestamp` - (Optional) Unix timestamp of when the backup file is created. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `file_name` - (Required) The file name of backup. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `backup_config_ref` - (Optional) Backupconfiguration information. It is a reference to an object of type backupconfiguration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `local_file_url` - (Optional) Url to download the backup file. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `remote_file_url` - (Optional) Url to download the backup file. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scheduler_ref` - (Optional) Scheduler information. It is a reference to an object of type scheduler. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `timestamp` - (Optional) Unix timestamp of when the backup file is created. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -48,5 +48,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_backupconfiguration.html.markdown b/website/docs/r/avi_backupconfiguration.html.markdown
index fa1dba75a..08eee0d0f 100644
--- a/website/docs/r/avi_backupconfiguration.html.markdown
+++ b/website/docs/r/avi_backupconfiguration.html.markdown
@@ -27,24 +27,25 @@ resource "avi_backupconfiguration" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of backup configuration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `aws_access_key` - (Optional) Aws access key id. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `aws_bucket_id` - (Optional) Aws bucket. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `aws_bucket_region` - (Optional) The name of the aws region associated with the bucket. Field introduced in 21.1.5, 22.1.1, 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `aws_secret_access` - (Optional) Aws secret access key. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `backup_file_prefix` - (Optional) Prefix of the exported configuration file. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `backup_passphrase` - (Optional) Default passphrase to encrypt sensitive fields for configuration export and periodic backup. The same passphrase must be provided to import the configuration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `maximum_backups_stored` - (Optional) Rotate the backup files based on this count. Allowed values are 1-20. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `remote_directory` - (Optional) Directory at remote destination with write permission for ssh user. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `remote_file_transfer_protocol` - (Optional) Remote file transfer protocol type. Enum options - SCP, SFTP. Field introduced in 22.1.1. Allowed in enterprise edition with any value, basic edition(allowed values- scp,sftp), enterprise with cloud services edition.
-* `remote_hostname` - (Optional) Remote destination. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `s3_bucket_folder` - (Optional) 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.
-* `save_local` - (Optional) Local backup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssh_user_ref` - (Optional) Access credentials for remote destination. It is a reference to an object of type cloudconnectoruser. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upload_to_remote_host` - (Optional) Remote backup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upload_to_s3` - (Optional) Cloud backup. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) Name of backup configuration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `aws_access_key` - (Optional) Aws access key id. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `aws_bucket_id` - (Optional) Aws bucket. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `aws_bucket_region` - (Optional) The name of the aws region associated with the bucket. Field introduced in 21.1.5, 22.1.1, 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `aws_secret_access` - (Optional) Aws secret access key. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `backup_file_prefix` - (Optional) Prefix of the exported configuration file. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `backup_passphrase` - (Optional) Default passphrase to encrypt sensitive fields for configuration export and periodic backup. The same passphrase must be provided to import the configuration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `bundle_mode` - (Optional) By default, json backups are generated. When this flag is enabled, bundle backups will be generated. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `maximum_backups_stored` - (Optional) Rotate the backup files based on this count. Allowed values are 1-20. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `remote_directory` - (Optional) Directory at remote destination with write permission for ssh user. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `remote_file_transfer_protocol` - (Optional) Remote file transfer protocol type. Enum options - SCP, SFTP. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in basic (allowed values- scp,sftp) edition.
+* `remote_hostname` - (Optional) Remote destination. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `s3_bucket_folder` - (Optional) The folder name in s3 bucket where backup will be stored. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `save_local` - (Optional) Local backup. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssh_user_ref` - (Optional) Access credentials for remote destination. It is a reference to an object of type cloudconnectoruser. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `upload_to_remote_host` - (Optional) Remote backup. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `upload_to_s3` - (Optional) Cloud backup. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -59,5 +60,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_botconfigconsolidator.html.markdown b/website/docs/r/avi_botconfigconsolidator.html.markdown
index c9e8494fb..eb0a6e142 100644
--- a/website/docs/r/avi_botconfigconsolidator.html.markdown
+++ b/website/docs/r/avi_botconfigconsolidator.html.markdown
@@ -27,10 +27,11 @@ resource "avi_botconfigconsolidator" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) The name of this consolidator. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - (Optional) Human-readable description of this consolidator. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `script` - (Optional) Script that consolidates results from all bot decision components. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) The unique identifier of the tenant to which this consolidator belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) The name of this consolidator. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Human-readable description of this consolidator. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `script` - (Optional) Script that consolidates results from all bot decision components. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) The unique identifier of the tenant to which this consolidator belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -45,5 +46,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  A unique identifier for this consolidator. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  A unique identifier for this consolidator. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_botdetectionpolicy.html.markdown b/website/docs/r/avi_botdetectionpolicy.html.markdown
index 717d32faf..8f19cbce7 100644
--- a/website/docs/r/avi_botdetectionpolicy.html.markdown
+++ b/website/docs/r/avi_botdetectionpolicy.html.markdown
@@ -27,18 +27,19 @@ resource "avi_botdetectionpolicy" "foo" {
 
 The following arguments are supported:
 
-* `ip_location_detector` - (Required) The ip location configuration used in this policy. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ip_reputation_detector` - (Required) The ip reputation configuration used in this policy. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - (Required) The name of this bot detection policy. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `user_agent_detector` - (Required) The user-agent configuration used in this policy. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `allow_list` - (Optional) Allow the user to skip botmanagement for selected requests. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `client_behavior_detector` - (Optional) The client behavior configuration used in this policy. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - (Optional) Human-readable description of this bot detection policy. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `system_bot_mapping_ref` - (Optional) System-defined rules for classification. It is a reference to an object of type botmapping. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `system_consolidator_ref` - (Optional) The installation provides an updated ruleset for consolidating the results of different decider phases. It is a reference to an object of type botconfigconsolidator. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) The unique identifier of the tenant to which this policy belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `user_bot_mapping_ref` - (Optional) User-defined rules for classification. These are applied before the system classification rules. If a rule matches, processing terminates and the system-defined rules will not run. It is a reference to an object of type botmapping. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `user_consolidator_ref` - (Optional) The user-provided ruleset for consolidating the results of different decider phases. This runs before the system consolidator. If it successfully sets a consolidation, the system consolidator will not change it. It is a reference to an object of type botconfigconsolidator. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `ip_location_detector` - (Required) The ip location configuration used in this policy. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ip_reputation_detector` - (Required) The ip reputation configuration used in this policy. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Required) The name of this bot detection policy. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `user_agent_detector` - (Required) The user-agent configuration used in this policy. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `allow_list` - (Optional) Allow the user to skip botmanagement for selected requests. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `client_behavior_detector` - (Optional) The client behavior configuration used in this policy. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Human-readable description of this bot detection policy. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `system_bot_mapping_ref` - (Optional) System-defined rules for classification. It is a reference to an object of type botmapping. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `system_consolidator_ref` - (Optional) The installation provides an updated ruleset for consolidating the results of different decider phases. It is a reference to an object of type botconfigconsolidator. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) The unique identifier of the tenant to which this policy belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `user_bot_mapping_ref` - (Optional) User-defined rules for classification. These are applied before the system classification rules. If a rule matches, processing terminates and the system-defined rules will not run. It is a reference to an object of type botmapping. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `user_consolidator_ref` - (Optional) The user-provided ruleset for consolidating the results of different decider phases. This runs before the system consolidator. If it successfully sets a consolidation, the system consolidator will not change it. It is a reference to an object of type botconfigconsolidator. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -53,5 +54,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  A unique identifier to this bot detection policy. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  A unique identifier to this bot detection policy. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_botipreputationtypemapping.html.markdown b/website/docs/r/avi_botipreputationtypemapping.html.markdown
index e4aa2ae5c..4719a7e44 100644
--- a/website/docs/r/avi_botipreputationtypemapping.html.markdown
+++ b/website/docs/r/avi_botipreputationtypemapping.html.markdown
@@ -27,9 +27,10 @@ resource "avi_botipreputationtypemapping" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) The name of this mapping. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ip_reputation_mappings` - (Optional) Map every ipreputationtype to a bot type (can be unknown). Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) The unique identifier of the tenant to which this mapping belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) The name of this mapping. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ip_reputation_mappings` - (Optional) Map every ipreputationtype to a bot type (can be unknown). Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) The unique identifier of the tenant to which this mapping belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -44,5 +45,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  A unique identifier of this mapping. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  A unique identifier of this mapping. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_botmapping.html.markdown b/website/docs/r/avi_botmapping.html.markdown
index e6924cf6b..23983f9f8 100644
--- a/website/docs/r/avi_botmapping.html.markdown
+++ b/website/docs/r/avi_botmapping.html.markdown
@@ -27,9 +27,10 @@ resource "avi_botmapping" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) The name of this mapping. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mapping_rules` - (Optional) Rules for bot classification. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) The unique identifier of the tenant to which this mapping belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) The name of this mapping. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mapping_rules` - (Optional) Rules for bot classification. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) The unique identifier of the tenant to which this mapping belongs. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -44,5 +45,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  A unique identifier for this mapping. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  A unique identifier for this mapping. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_certificatemanagementprofile.html.markdown b/website/docs/r/avi_certificatemanagementprofile.html.markdown
index 400fe50eb..d1d0eaf74 100644
--- a/website/docs/r/avi_certificatemanagementprofile.html.markdown
+++ b/website/docs/r/avi_certificatemanagementprofile.html.markdown
@@ -27,12 +27,12 @@ resource "avi_certificatemanagementprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the pki profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `run_script_ref` - (Required) Alert script config object for certificate management profile. It is a reference to an object of type alertscriptconfig. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `script_params` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the pki profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `run_script_ref` - (Required) Alert script config object for certificate management profile. It is a reference to an object of type alertscriptconfig. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `script_params` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -47,5 +47,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_cloud.html.markdown b/website/docs/r/avi_cloud.html.markdown
index e17cdeb96..80d8bbd98 100644
--- a/website/docs/r/avi_cloud.html.markdown
+++ b/website/docs/r/avi_cloud.html.markdown
@@ -27,49 +27,48 @@ resource "avi_cloud" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vtype` - (Required) Cloud type. Enum options - CLOUD_NONE, CLOUD_VCENTER, CLOUD_OPENSTACK, CLOUD_AWS, CLOUD_VCA, CLOUD_APIC, CLOUD_MESOS, CLOUD_LINUXSERVER, CLOUD_DOCKER_UCP, CLOUD_RANCHER, CLOUD_OSHIFT_K8S, CLOUD_AZURE, CLOUD_GCP, CLOUD_NSXT. Allowed in enterprise edition with any value, essentials edition(allowed values- cloud_none,cloud_vcenter), basic edition(allowed values- cloud_none,cloud_nsxt), enterprise with cloud services edition.
-* `autoscale_polling_interval` - (Optional) Cloudconnector polling interval in seconds for external autoscale groups, minimum 60 seconds. Allowed values are 60-3600. Field introduced in 18.2.2. Unit is seconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 60), basic edition(allowed values- 60), enterprise with cloud services edition.
-* `aws_configuration` - (Optional) Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `azure_configuration` - (Optional) Field introduced in 17.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `cloudstack_configuration` - (Optional) Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `custom_tags` - (Optional) Custom tags for all avi created resources in the cloud infrastructure. Field introduced in 17.1.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dhcp_enabled` - (Optional) Select the ip address management scheme. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dns_provider_ref` - (Optional) Dns profile for the cloud. It is a reference to an object of type ipamdnsproviderprofile. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dns_resolution_on_se` - (Optional) By default, pool member fqdns are resolved on the controller. When this is set, pool member fqdns are instead resolved on service engines in this cloud. This is useful in scenarios where pool member fqdns can only be resolved from service engines and not from the controller. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `dns_resolvers` - (Optional) Dns resolver for the cloud. Field introduced in 20.1.5. Maximum of 1 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `docker_configuration` - (Optional) Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `east_west_dns_provider_ref` - (Optional) Dns profile for east-west services. It is a reference to an object of type ipamdnsproviderprofile. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `east_west_ipam_provider_ref` - (Optional) Ipam profile for east-west services. Warning - please use virtual subnets in this ipam profile that do not conflict with the underlay networks or any overlay networks in the cluster. For example in aws and gcp, 169.254.0.0/16 is used for storing instance metadata. Hence, it should not be used in this profile. It is a reference to an object of type ipamdnsproviderprofile. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_vip_on_all_interfaces` - (Optional) Enable vip on all data interfaces for the cloud. Field introduced in 18.2.9, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_vip_static_routes` - (Optional) Use static routes for vip side network resolution during virtualservice placement. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `gcp_configuration` - (Optional) Google cloud platform configuration. Field introduced in 18.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ip6_autocfg_enabled` - (Optional) Enable ipv6 auto configuration. Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ipam_provider_ref` - (Optional) Ipam profile for the cloud. It is a reference to an object of type ipamdnsproviderprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `license_tier` - (Optional) Specifies the default license tier which would be used by new se groups. This field by default inherits the value from system configuration. Enum options - ENTERPRISE_16, ENTERPRISE, ENTERPRISE_18, BASIC, ESSENTIALS, ENTERPRISE_WITH_CLOUD_SERVICES. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `license_type` - (Optional) If no license type is specified then default license enforcement for the cloud type is chosen. The default mappings are container cloud is max ses, openstack and vmware is cores and linux it is sockets. Enum options - LIC_BACKEND_SERVERS, LIC_SOCKETS, LIC_CORES, LIC_HOSTS, LIC_SE_BANDWIDTH, LIC_METERED_SE_BANDWIDTH. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `linuxserver_configuration` - (Optional) Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `maintenance_mode` - (Optional) Cloud is in maintenance mode. Field introduced in 20.1.7,21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 22.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `metrics_polling_interval` - (Optional) Cloud metrics collector polling interval in seconds. Field introduced in 22.1.1. Unit is seconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `mgmt_ip_v4_enabled` - (Optional) Enable ipv4 on the management interface of the serviceengine. Defaults to dhcp if no static config on network present. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mgmt_ip_v6_enabled` - (Optional) Enable ipv6 on the management interface of the serviceengine. Defaults to autocfg if no static config on network present. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mtu` - (Optional) Mtu setting for the cloud. Unit is bytes. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nsxt_configuration` - (Optional) Nsx-t cloud platform configuration. Field introduced in 20.1.1. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `ntp_configuration` - (Optional) Ntp configuration for the cloud. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `obj_name_prefix` - (Optional) Default prefix for all automatically created objects in this cloud. This prefix can be overridden by the se-group template. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `openstack_configuration` - (Optional) Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `prefer_static_routes` - (Optional) Prefer static routes over interface routes during virtualservice placement. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `proxy_configuration` - (Optional) Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `rancher_configuration` - (Optional) Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `resolve_fqdn_to_ipv6` - (Optional) Resolve ipv6 address for pool member fqdns. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_group_template_ref` - (Optional) The service engine group to use as template. It is a reference to an object of type serviceenginegroup. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `state_based_dns_registration` - (Optional) Dns records for vips are added/deleted based on the operational state of the vips. Field introduced in 17.1.12. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vca_configuration` - (Optional) Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vcenter_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, enterprise with cloud services edition.
-* `vmc_deployment` - (Optional) This deployment is vmware on aws cloud. Field introduced in 20.1.5, 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vtype` - (Required) Cloud type. Enum options - CLOUD_NONE, CLOUD_VCENTER, CLOUD_OPENSTACK, CLOUD_AWS, CLOUD_VCA, CLOUD_APIC, CLOUD_MESOS, CLOUD_LINUXSERVER, CLOUD_DOCKER_UCP, CLOUD_RANCHER, CLOUD_OSHIFT_K8S, CLOUD_AZURE, CLOUD_GCP, CLOUD_NSXT. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- cloud_none,cloud_vcenter), basic (allowed values- cloud_none,cloud_nsxt) edition.
+* `autoscale_polling_interval` - (Optional) Cloudconnector polling interval in seconds for external autoscale groups, minimum 60 seconds. Allowed values are 60-3600. Field introduced in 18.2.2. Unit is seconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 60), basic (allowed values- 60) edition.
+* `aws_configuration` - (Optional) Allowed with any value in enterprise, enterprise with cloud services edition.
+* `azure_configuration` - (Optional) Field introduced in 17.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cloudstack_configuration` - (Optional) Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `custom_tags` - (Optional) Custom tags for all avi created resources in the cloud infrastructure. Field introduced in 17.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dhcp_enabled` - (Optional) Select the ip address management scheme. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_provider_ref` - (Optional) Dns profile for the cloud. It is a reference to an object of type ipamdnsproviderprofile. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dns_resolution_on_se` - (Optional) By default, pool member fqdns are resolved on the controller. When this is set, pool member fqdns are instead resolved on service engines in this cloud. This is useful in scenarios where pool member fqdns can only be resolved from service engines and not from the controller. Field introduced in 18.2.6. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `dns_resolvers` - (Optional) Dns resolver for the cloud. Field introduced in 20.1.5. Maximum of 1 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `docker_configuration` - (Optional) Allowed with any value in enterprise, enterprise with cloud services edition.
+* `east_west_dns_provider_ref` - (Optional) Dns profile for east-west services. It is a reference to an object of type ipamdnsproviderprofile. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `east_west_ipam_provider_ref` - (Optional) Ipam profile for east-west services. Warning - please use virtual subnets in this ipam profile that do not conflict with the underlay networks or any overlay networks in the cluster. For example in aws and gcp, 169.254.0.0/16 is used for storing instance metadata. Hence, it should not be used in this profile. It is a reference to an object of type ipamdnsproviderprofile. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_vip_on_all_interfaces` - (Optional) Enable vip on all data interfaces for the cloud. Field introduced in 18.2.9, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_vip_static_routes` - (Optional) Use static routes for vip side network resolution during virtualservice placement. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `gcp_configuration` - (Optional) Google cloud platform configuration. Field introduced in 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ip6_autocfg_enabled` - (Optional) Enable ipv6 auto configuration. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ipam_provider_ref` - (Optional) Ipam profile for the cloud. It is a reference to an object of type ipamdnsproviderprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `license_tier` - (Optional) Specifies the default license tier which would be used by new se groups. This field by default inherits the value from system configuration. Enum options - ENTERPRISE_16, ENTERPRISE, ENTERPRISE_18, BASIC, ESSENTIALS, ENTERPRISE_WITH_CLOUD_SERVICES. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `license_type` - (Optional) If no license type is specified then default license enforcement for the cloud type is chosen. The default mappings are container cloud is max ses, openstack and vmware is cores and linux it is sockets. Enum options - LIC_BACKEND_SERVERS, LIC_SOCKETS, LIC_CORES, LIC_HOSTS, LIC_SE_BANDWIDTH, LIC_METERED_SE_BANDWIDTH. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `linuxserver_configuration` - (Optional) Allowed with any value in enterprise, enterprise with cloud services edition.
+* `maintenance_mode` - (Optional) Cloud is in maintenance mode. Field introduced in 20.1.7,21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 22.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `metrics_polling_interval` - (Optional) Cloud metrics collector polling interval in seconds. Field introduced in 22.1.1. Unit is seconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mgmt_ip_v4_enabled` - (Optional) Enable ipv4 on the management interface of the serviceengine. Defaults to dhcp if no static config on network present. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `mgmt_ip_v6_enabled` - (Optional) Enable ipv6 on the management interface of the serviceengine. Defaults to autocfg if no static config on network present. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `mtu` - (Optional) Mtu setting for the cloud. Unit is bytes. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nsxt_configuration` - (Optional) Nsx-t cloud platform configuration. Field introduced in 20.1.1. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `ntp_configuration` - (Optional) Ntp configuration for the cloud. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_name_prefix` - (Optional) Default prefix for all automatically created objects in this cloud. This prefix can be overridden by the se-group template. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `prefer_static_routes` - (Optional) Prefer static routes over interface routes during virtualservice placement. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `proxy_configuration` - (Optional) Allowed with any value in enterprise, enterprise with cloud services edition.
+* `rancher_configuration` - (Optional) Allowed with any value in enterprise, enterprise with cloud services edition.
+* `resolve_fqdn_to_ipv6` - (Optional) Resolve ipv6 address for pool member fqdns. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_group_template_ref` - (Optional) The service engine group to use as template. It is a reference to an object of type serviceenginegroup. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `state_based_dns_registration` - (Optional) Dns records for vips are added/deleted based on the operational state of the vips. Field introduced in 17.1.12. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vca_configuration` - (Optional) Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vcenter_configuration` - (Optional) Allowed with any value in enterprise, essentials, enterprise with cloud services edition.
+* `vmc_deployment` - (Optional) This deployment is vmware on aws cloud. Field introduced in 20.1.5, 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -84,5 +83,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_cloudconnectoruser.html.markdown b/website/docs/r/avi_cloudconnectoruser.html.markdown
index d34aa2890..a56365f26 100644
--- a/website/docs/r/avi_cloudconnectoruser.html.markdown
+++ b/website/docs/r/avi_cloudconnectoruser.html.markdown
@@ -27,19 +27,18 @@ resource "avi_cloudconnectoruser" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `azure_serviceprincipal` - (Optional) Field introduced in 17.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `azure_userpass` - (Optional) Field introduced in 17.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `gcp_credentials` - (Optional) Credentials for google cloud platform. Field introduced in 18.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `nsxt_credentials` - (Optional) Credentials to talk to nsx-t manager. Field introduced in 20.1.1. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `oci_credentials` - (Optional) Credentials for oracle cloud infrastructure. Field introduced in 18.2.1,18.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `password` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `private_key` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `public_key` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tencent_credentials` - (Optional) Credentials for tencent cloud. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vcenter_credentials` - (Optional) Credentials to talk to vcenter. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `azure_serviceprincipal` - (Optional) Field introduced in 17.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `azure_userpass` - (Optional) Field introduced in 17.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `gcp_credentials` - (Optional) Credentials for google cloud platform. Field introduced in 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `nsxt_credentials` - (Optional) Credentials to talk to nsx-t manager. Field introduced in 20.1.1. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `password` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `private_key` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `public_key` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tencent_credentials` - (Optional) Credentials for tencent cloud. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vcenter_credentials` - (Optional) Credentials to talk to vcenter. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -54,5 +53,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_cloudproperties.html.markdown b/website/docs/r/avi_cloudproperties.html.markdown
index b23740f66..a9d57a0c5 100644
--- a/website/docs/r/avi_cloudproperties.html.markdown
+++ b/website/docs/r/avi_cloudproperties.html.markdown
@@ -27,11 +27,11 @@ resource "avi_cloudproperties" "foo" {
 
 The following arguments are supported:
 
-* `cc_props` - (Optional) Cloudconnector properties. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cc_vtypes` - (Optional) Cloud types supported by cloudconnector. Enum options - CLOUD_NONE, CLOUD_VCENTER, CLOUD_OPENSTACK, CLOUD_AWS, CLOUD_VCA, CLOUD_APIC, CLOUD_MESOS, CLOUD_LINUXSERVER, CLOUD_DOCKER_UCP, CLOUD_RANCHER, CLOUD_OSHIFT_K8S, CLOUD_AZURE, CLOUD_GCP, CLOUD_NSXT. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `hyp_props` - (Optional) Hypervisor properties. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `info` - (Optional) Properties specific to a cloud type. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `cc_props` - (Optional) Cloudconnector properties. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cc_vtypes` - (Optional) Cloud types supported by cloudconnector. Enum options - CLOUD_NONE, CLOUD_VCENTER, CLOUD_OPENSTACK, CLOUD_AWS, CLOUD_VCA, CLOUD_APIC, CLOUD_MESOS, CLOUD_LINUXSERVER, CLOUD_DOCKER_UCP, CLOUD_RANCHER, CLOUD_OSHIFT_K8S, CLOUD_AZURE, CLOUD_GCP, CLOUD_NSXT. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `hyp_props` - (Optional) Hypervisor properties. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `info` - (Optional) Properties specific to a cloud type. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -46,5 +46,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_cluster.html.markdown b/website/docs/r/avi_cluster.html.markdown
index 43a0aee9f..44d7396bf 100644
--- a/website/docs/r/avi_cluster.html.markdown
+++ b/website/docs/r/avi_cluster.html.markdown
@@ -27,12 +27,12 @@ resource "avi_cluster" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nodes` - (Required) Minimum of 1 items required. Maximum of 7 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `rejoin_nodes_automatically` - (Optional) Re-join cluster nodes automatically in the event one of the node is reset to factory. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `virtual_ip` - (Optional) A v4 virtual ip address. This v4 ip address will be dynamically reconfigured so that it always is the ip of the cluster leader. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `virtual_ip6` - (Optional) A v6 virtual ip address. This v6 ip address will be dynamically reconfigured so that it always is the ip of the cluster leader. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nodes` - (Required) Minimum of 1 items required. Maximum of 7 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rejoin_nodes_automatically` - (Optional) Re-join cluster nodes automatically in the event one of the node is reset to factory. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `virtual_ip` - (Optional) A v4 virtual ip address for the cluster that always points to the v4 ip of the leader node in cluster. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `virtual_ip6` - (Optional) A v6 virtual ip address for the cluster that always points to the v6 ip of the leader node in cluster. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -47,5 +47,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_clusterclouddetails.html.markdown b/website/docs/r/avi_clusterclouddetails.html.markdown
index f6b71649d..88a13ade8 100644
--- a/website/docs/r/avi_clusterclouddetails.html.markdown
+++ b/website/docs/r/avi_clusterclouddetails.html.markdown
@@ -27,10 +27,10 @@ resource "avi_clusterclouddetails" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `azure_info` - (Optional) Azure info to configure cluster_vip on the controller. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `azure_info` - (Optional) Azure info to configure cluster_vip on the controller. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -45,5 +45,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_controllerportalregistration.html.markdown b/website/docs/r/avi_controllerportalregistration.html.markdown
index 5fa3ab19e..1ca4123cf 100644
--- a/website/docs/r/avi_controllerportalregistration.html.markdown
+++ b/website/docs/r/avi_controllerportalregistration.html.markdown
@@ -27,10 +27,10 @@ resource "avi_controllerportalregistration" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `asset` - (Optional) Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `portal_auth` - (Optional) Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `asset` - (Optional) Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `portal_auth` - (Optional) Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -45,5 +45,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_controllerproperties.html.markdown b/website/docs/r/avi_controllerproperties.html.markdown
index 5542d8149..0691f7a0d 100644
--- a/website/docs/r/avi_controllerproperties.html.markdown
+++ b/website/docs/r/avi_controllerproperties.html.markdown
@@ -27,116 +27,113 @@ resource "avi_controllerproperties" "foo" {
 
 The following arguments are supported:
 
-* `alert_manager_use_evms` - (Optional) Enable to use event manager as source of eventsdisable to use log manager as source of events. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `allow_admin_network_updates` - (Optional) Allow non-admin tenants to update admin vrfcontext and network objects. Field introduced in 18.2.7, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `allow_ip_forwarding` - (Optional) Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `allow_unauthenticated_apis` - (Optional) Allow unauthenticated access for special apis. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `allow_unauthenticated_nodes` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `api_idle_timeout` - (Optional) Allowed values are 0-1440. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `api_perf_logging_threshold` - (Optional) Threshold to log request timing in portal_performance.log and server-timing response header. Any stage taking longer than 1% of the threshold will be included in the server-timing header. Field introduced in 18.1.4, 18.2.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `appviewx_compat_mode` - (Optional) Export configuration in appviewx compatibility mode. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `async_patch_merge_period` - (Optional) Period for which asynchronous patch requests are queued. Allowed values are 30-120. Special values are 0 - deactivated. Field introduced in 18.2.11, 20.1.3. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `async_patch_request_cleanup_duration` - (Optional) Duration for which asynchronous patch requests should be kept, after being marked as success or fail. Allowed values are 5-120. Field introduced in 18.2.11, 20.1.3. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `attach_ip_retry_interval` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `attach_ip_retry_limit` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `bm_use_ansible` - (Optional) Use ansible for se creation in baremetal. Field introduced in 17.2.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `check_vsvip_fqdn_syntax` - (Optional) Enforce vsvip fqdn syntax checks. Field introduced in 20.1.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `cleanup_expired_authtoken_timeout_period` - (Optional) Period for auth token cleanup job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cleanup_sessions_timeout_period` - (Optional) Period for sessions cleanup job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_discovery_interval` - (Optional) Time in minutes to wait between consecutive cloud discovery cycles. Allowed values are 1-1440. Field introduced in 22.1.5, 30.2.1. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `cloud_reconcile` - (Optional) Enable/disable periodic reconcile for all the clouds. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_reconcile_interval` - (Optional) Time in minutes to wait between consecutive cloud reconcile cycles. Allowed values are 1-1440. Field introduced in 22.1.5, 30.2.1. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `cluster_ip_gratuitous_arp_period` - (Optional) Period for cluster ip gratuitous arp job. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `consistency_check_timeout_period` - (Optional) Period for consistency check job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `controller_resource_info_collection_period` - (Optional) Periodically collect stats. Field introduced in 20.1.3. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `crashed_se_reboot` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dead_se_detection_timer` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `default_minimum_api_timeout` - (Optional) Minimum api timeout value.if this value is not 60, it will be the default timeout for all apis that do not have a specific timeout.if an api has a specific timeout but is less than this value, this value will become the new timeout. Allowed values are 60-3600. Field introduced in 18.2.6. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `del_offline_se_after_reboot_delay` - (Optional) The amount of time the controller will wait before deleting an offline se after it has been rebooted. For unresponsive ses, the total time will be  unresponsive_se_reboot + del_offline_se_after_reboot_delay. For crashed ses, the total time will be crashed_se_reboot + del_offline_se_after_reboot_delay. Field introduced in 20.1.5. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `detach_ip_retry_interval` - (Optional) Amount of time to wait after last detach ip failure before attempting next detach ip retry. Field introduced in 21.1.3. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `detach_ip_retry_limit` - (Optional) Maximum number of detach ip retries. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `detach_ip_timeout` - (Optional) Time to wait before marking detach ip as failed. Field introduced in 21.1.3. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dns_refresh_period` - (Optional) Period for refresh pool and gslb dns job. Unit is min. Allowed in enterprise edition with any value, essentials edition(allowed values- 60), basic edition(allowed values- 60), enterprise with cloud services edition.
-* `dummy` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `edit_system_limits` - (Optional) Allow editing of system limits. Keep in mind that these system limits have been carefully selected based on rigorous testing in our testig environments. Modifying these limits could destabilize your cluster. Do this at your own risk!. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_api_sharding` - (Optional) This setting enables the controller leader to shard api requests to the followers (if any). Field introduced in 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_memory_balancer` - (Optional) Enable/disable memory balancer. Field introduced in 17.2.8. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_per_process_stop` - (Optional) Enable stopping of individual processes if process cross the given threshold limit, even when the total controller memory usage is belowits threshold limit. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_resmgr_log_cache_print` - (Optional) Enable printing of cached logs inside resource manager. Used for debugging purposes only. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `event_manager_max_goroutines` - (Optional) Maximum number of goroutines for event manager process. Allowed values are 1-64. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `event_manager_max_subscribers` - (Optional) Maximum number of subscribers for event manager process. Allowed values are 1-6. Special values are 0 - disabled. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `event_manager_processing_time_threshold` - (Optional) Log instances for event manager processing delay; recorded whenever event processing delay exceeds configured interval specified in seconds. Allowed values are 1-5. Special values are 0 - disabled. Field introduced in 30.2.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `false_positive_learning_config` - (Optional) False positive learning configuration. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `fatal_error_lease_time` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `federated_datastore_cleanup_duration` - (Optional) Federated datastore will not cleanup diffs unless they are at least this duration in the past. Field introduced in 20.1.1. Unit is hours. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `file_object_cleanup_period` - (Optional) Period for file object cleanup job. Field introduced in 20.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fileobject_max_file_versions` - (Optional) This is the max number of file versions that will be retained for a file referenced by the local fileobject. Subsequent uploads of file will result in the file rotation of the older version and the latest version retained. Example  when a file upload is done for the first time, there will be a v1 version. Subsequent uploads will get mapped to v1, v2 and v3 versions. On the fourth upload of the file, the v1 will be file rotated and v2, v3 and v4 will be retained. Allowed values are 1-5. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gslb_purge_batch_size` - (Optional) Batch size for the vs_mgr to perform datastrorecleanup during a gslb purge. Allowed values are 50-1200. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gslb_purge_sleep_time_ms` - (Optional) Sleep time in the vs_mgr during a federatedpurge rpc call. Allowed values are 50-100. Field introduced in 22.1.3. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ignore_vrf_in_networksubnetlist` - (Optional) Ignore the vrf_context filter for /networksubnetlist api. Field introduced in 22.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `max_dead_se_in_grp` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_pcap_per_tenant` - (Optional) Maximum number of pcap files stored per tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_se_spawn_interval_delay` - (Optional) Maximum delay possible to add to se_spawn_retry_interval after successive se spawn failure. Field introduced in 20.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_seq_attach_ip_failures` - (Optional) Maximum number of consecutive attach ip failures that halts vs placement. Field introduced in 17.2.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_seq_vnic_failures` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_threads_cc_vip_bg_worker` - (Optional) Maximum number of threads in threadpool used by cloud connector ccvipbgworker. Allowed values are 1-100. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `permission_scoped_shared_admin_networks` - (Optional) Network and vrfcontext objects from the admin tenant will not be shared to non-admin tenants unless admin permissions are granted. Field introduced in 18.2.7, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `persistence_key_rotate_period` - (Optional) Period for rotate app persistence keys job. Allowed values are 1-1051200. Special values are 0 - disabled. Unit is min. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `portal_request_burst_limit` - (Optional) Burst limit on number of incoming requests. 0 to disable. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `portal_request_rate_limit` - (Optional) Maximum average number of requests allowed per second. 0 to disable. Field introduced in 20.1.1. Unit is per_second. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `portal_token` - (Optional) Token used for uploading tech-support to portal. Field introduced in 16.4.6,17.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `postgres_vacuum_period` - (Optional) Period for which postgres vacuum are executed. Allowed values are 30-40320. Special values are 0 - deactivated. Field introduced in 22.1.3. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `process_locked_useraccounts_timeout_period` - (Optional) Period for process locked user accounts job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `process_pki_profile_timeout_period` - (Optional) Period for process pki profile job. Field introduced in 18.1.1. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `query_host_fail` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `resmgr_log_caching_period` - (Optional) Period for each cycle of log caching in resource manager. At the end of each cycle, the in memory cached log history will be cleared. Field introduced in 20.1.5. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `restrict_cloud_read_access` - (Optional) Restrict read access to cloud. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `safenet_hsm_version` - (Optional) Version of the safenet package installed on the controller. Field introduced in 16.5.2,17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_create_timeout` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_failover_attempt_interval` - (Optional) Interval between attempting failovers to an se. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_from_marketplace` - (Optional) This setting decides whether se is to be deployed from the cloud marketplace or to be created by the controller. The setting is applicable only when byol license is selected. Enum options - MARKETPLACE, IMAGE_SE. Field introduced in 18.1.4, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_offline_del` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_spawn_retry_interval` - (Optional) Default retry period before attempting another service engine spawn in se group. Field introduced in 20.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_upgrade_flow_cleanup_timeout` - (Optional) Timeout for flows cleanup by serviceengine during upgrade.internal knob  to be exercised under the surveillance of vmware avi support team. Field introduced in 22.1.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_vnic_cooldown` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_vnic_gc_wait_time` - (Optional) Duration to wait after last vnic addition before proceeding with vnic garbage collection. Used for testing purposes. Field introduced in 20.1.4. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `secure_channel_cleanup_timeout` - (Optional) Period for secure channel cleanup job. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `secure_channel_controller_token_timeout` - (Optional) Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `secure_channel_se_token_timeout` - (Optional) Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `seupgrade_copy_buffer_size` - (Optional) This parameter defines the buffer size during se image downloads in a segroup. It is used to pace the se downloads so that controller network/cpu bandwidth is a bounded operation. Field introduced in 22.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `seupgrade_copy_pool_size` - (Optional) This parameter defines the number of simultaneous se image downloads in a segroup. It is used to pace the se downloads so that controller network/cpu bandwidth is a bounded operation. A value of 0 will disable the pacing scheme and all the se(s) in the segroup will attempt to download the image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `seupgrade_fabric_pool_size` - (Optional) The pool size is used to control the number of concurrent segroup upgrades. This field value takes affect upon controller warm reboot. Allowed values are 2-20. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `seupgrade_segroup_min_dead_timeout` - (Optional) Time to wait before marking segroup upgrade as stuck. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `shared_ssl_certificates` - (Optional) Ssl certificates in the admin tenant can be used in non-admin tenants. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `soft_min_mem_per_se_limit` - (Optional) Soft limit on the minimum se memory that an se needs to have on se register. Field introduced in 30.1.1. Unit is mb. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ssl_certificate_expiry_warning_days` - (Optional) Number of days for ssl certificate expiry warning. Unit is days. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `system_report_cleanup_interval` - (Optional) Time in minutes to wait between cleanup of systemreports. Allowed values are 15-300. Field introduced in 22.1.6, 30.2.1. Unit is min. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `system_report_limit` - (Optional) Number of systemreports retained in the system. Once the number of system reports exceed this threshold, the oldest systemreport will be removed and the latest one retained. I.e. The systemreport will be rotated and the reports don't exceed the threshold. Allowed values are 5-50. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `unresponsive_se_reboot` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `update_dns_entry_retry_limit` - (Optional) Number of times to retry a dns entry update/delete operation. Field introduced in 21.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `update_dns_entry_timeout` - (Optional) Timeout period for a dns entry update/delete operation. Field introduced in 21.1.4. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `upgrade_dns_ttl` - (Optional) Time to account for dns ttl during upgrade. This is in addition to vs_scalein_timeout_for_upgrade in se_group. Field introduced in 17.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials edition(allowed values- 5), basic edition(allowed values- 5), enterprise with cloud services edition.
-* `upgrade_fat_se_lease_time` - (Optional) Amount of time controller waits for a large-sized se (>=128gb memory) to reconnect after it is rebooted during upgrade. Field introduced in 18.2.10, 20.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upgrade_lease_time` - (Optional) Amount of time controller waits for a regular-sized se (<128gb memory) to reconnect after it is rebooted during upgrade. Starting 18.2.10/20.1.1, the default time has increased from 360 seconds to 600 seconds. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upgrade_se_per_vs_scale_ops_txn_time` - (Optional) This parameter defines the upper-bound value of the vs scale-in or vs scale-out operation executed in the sescalein and sescale context. User can tweak this parameter to a higher value if the segroup gets suspended due to sescalein or sescaleout timeout failure typically associated with high number of vs(es) scaled out. Field introduced in 18.2.10, 20.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `user_agent_cache_config` - (Optional) Configuration for user-agent cache used in bot management. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vnic_op_fail_time` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_awaiting_se_timeout` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_key_rotate_period` - (Optional) Period for rotate vs keys job. Allowed values are 1-1051200. Special values are 0 - disabled. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_scaleout_ready_check_interval` - (Optional) Interval for checking scaleout_ready status while controller is waiting for scaleoutready rpc from the service engine. Field introduced in 18.2.2. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_attach_ip_fail` - (Optional) Time to wait before marking attach ip operation on an se as failed. Field introduced in 17.2.2. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_bootup_fail` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_bootup_fail_patch` - (Optional) Wait for longer for patch ses to boot up. Field introduced in 30.2.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vs_se_create_fail` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_ping_fail` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_vnic_fail` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_vnic_ip_fail` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vsphere_ha_detection_timeout` - (Optional) Vsphere ha monitor detection timeout. If vsphere_ha_enabled is true and the controller is not able to reach the se, placement will wait for this duration for vsphere_ha_inprogress to be marked true before taking corrective action. Field introduced in 20.1.7, 21.1.3. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vsphere_ha_recovery_timeout` - (Optional) Vsphere ha monitor recovery timeout. Once vsphere_ha_inprogress is set to true (meaning host failure detected and vsphere ha will recover the service engine), placement will wait for at least this duration for the se to reconnect to the controller before taking corrective action. Field introduced in 20.1.7, 21.1.3. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vsphere_ha_timer_interval` - (Optional) Vsphere ha monitor timer interval for sending cc_check_se_status to cloud connector. Field introduced in 20.1.7, 21.1.3. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `warmstart_se_reconnect_wait_time` - (Optional) Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `warmstart_vs_resync_wait_time` - (Optional) Timeout for warmstart vs resync. Field introduced in 18.1.4, 18.2.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `alert_manager_use_evms` - (Optional) Enable to use event manager as source of eventsdisable to use log manager as source of events. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `allow_admin_network_updates` - (Optional) Allow non-admin tenants to update admin vrfcontext and network objects. Field introduced in 18.2.7, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allow_ip_forwarding` - (Optional) Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allow_unauthenticated_apis` - (Optional) Allow unauthenticated access for special apis. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allow_unauthenticated_nodes` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `api_idle_timeout` - (Optional) Allowed values are 0-1440. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `api_perf_logging_threshold` - (Optional) Threshold to log request timing in portal_performance.log and server-timing response header. Any stage taking longer than 1% of the threshold will be included in the server-timing header. Field introduced in 18.1.4, 18.2.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `appviewx_compat_mode` - (Optional) Export configuration in appviewx compatibility mode. Field introduced in 17.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `archive_retention_framework_period` - (Optional) Period for archive and retention framework job. Allowed values are 1-240. Field introduced in 31.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `async_patch_merge_period` - (Optional) Period for which asynchronous patch requests are queued. Allowed values are 30-120. Special values are 0 - deactivated. Field introduced in 18.2.11, 20.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `async_patch_request_cleanup_duration` - (Optional) Duration for which asynchronous patch requests should be kept, after being marked as success or fail. Allowed values are 5-120. Field introduced in 18.2.11, 20.1.3. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `attach_ip_retry_interval` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `attach_ip_retry_limit` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `bm_use_ansible` - (Optional) Use ansible for se creation in baremetal. Field introduced in 17.2.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `check_vsvip_fqdn_syntax` - (Optional) Enforce vsvip fqdn syntax checks. Field introduced in 20.1.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cleanup_expired_authtoken_timeout_period` - (Optional) Period for auth token cleanup job. Field introduced in 18.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cleanup_sessions_timeout_period` - (Optional) Period for sessions cleanup job. Field introduced in 18.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_discovery_interval` - (Optional) Time in minutes to wait between consecutive cloud discovery cycles. Allowed values are 1-1440. Field introduced in 22.1.5, 30.2.1. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cloud_reconcile` - (Optional) Enable/disable periodic reconcile for all the clouds. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_reconcile_interval` - (Optional) Time in minutes to wait between consecutive cloud reconcile cycles. Allowed values are 1-1440. Field introduced in 22.1.5, 30.2.1. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cluster_ip_gratuitous_arp_period` - (Optional) Period for cluster ip gratuitous arp job. Allowed values are 1-1440. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `consistency_check_timeout_period` - (Optional) Period for consistency check job. Field introduced in 18.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_resource_info_collection_period` - (Optional) Periodically collect stats. Field introduced in 20.1.3. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `crashed_se_reboot` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dead_se_detection_timer` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `default_minimum_api_timeout` - (Optional) Minimum api timeout value.if this value is not 60, it will be the default timeout for all apis that do not have a specific timeout.if an api has a specific timeout but is less than this value, this value will become the new timeout. Allowed values are 60-3600. Field introduced in 18.2.6. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `del_offline_se_after_reboot_delay` - (Optional) The amount of time the controller will wait before deleting an offline se after it has been rebooted. For unresponsive ses, the total time will be  unresponsive_se_reboot + del_offline_se_after_reboot_delay. For crashed ses, the total time will be crashed_se_reboot + del_offline_se_after_reboot_delay. Field introduced in 20.1.5. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `detach_ip_retry_interval` - (Optional) Amount of time to wait after last detach ip failure before attempting next detach ip retry. Field introduced in 21.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `detach_ip_retry_limit` - (Optional) Maximum number of detach ip retries. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `detach_ip_timeout` - (Optional) Time to wait before marking detach ip as failed. Field introduced in 21.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dns_refresh_period` - (Optional) Period for refresh pool and gslb dns job. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 60), basic (allowed values- 60) edition.
+* `dummy` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `edit_system_limits` - (Optional) Allow editing of system limits. Keep in mind that these system limits have been carefully selected based on rigorous testing in our testig environments. Modifying these limits could destabilize your cluster. Do this at your own risk!. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_api_sharding` - (Optional) This setting enables the controller leader to shard api requests to the followers (if any). Field introduced in 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_memory_balancer` - (Optional) Enable/disable memory balancer. Field introduced in 17.2.8. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_nsx_streaming_agent` - (Optional) When set to true, avi controller will connect to dynamic config streaming agent on nsx manager to get live updates. If it cannot connect, it will fallback to using rest apis based periodic polling. Dynamic streaming is supported from nsx version 4.2.1 onwards. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_per_process_stop` - (Optional) Enable stopping of individual processes if process cross the given threshold limit, even when the total controller memory usage is belowits threshold limit. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_resmgr_log_cache_print` - (Optional) Enable printing of cached logs inside resource manager. Used for debugging purposes only. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `event_manager_max_goroutines` - (Optional) Maximum number of goroutines for event manager process. Allowed values are 1-64. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `event_manager_max_subscribers` - (Optional) Maximum number of subscribers for event manager process. Allowed values are 1-6. Special values are 0 - disabled. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `event_manager_processing_time_threshold` - (Optional) Log instances for event manager processing delay; recorded whenever event processing delay exceeds configured interval specified in seconds. Allowed values are 1-5. Special values are 0 - disabled. Field introduced in 30.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `false_positive_learning_config` - (Optional) False positive learning configuration. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `fatal_error_lease_time` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `federated_datastore_cleanup_duration` - (Optional) Federated datastore will not cleanup diffs unless they are at least this duration in the past. Field introduced in 20.1.1. Unit is hours. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `file_object_cleanup_period` - (Optional) Period for file object cleanup job. Field introduced in 20.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fileobject_max_file_versions` - (Optional) This is the max number of file versions that will be retained for a file referenced by the local fileobject. Subsequent uploads of file will result in the file rotation of the older version and the latest version retained. Example  when a file upload is done for the first time, there will be a v1 version. Subsequent uploads will get mapped to v1, v2 and v3 versions. On the fourth upload of the file, the v1 will be file rotated and v2, v3 and v4 will be retained. Allowed values are 1-5. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gslb_fileobject_max_version_count` - (Optional) Number of version copies for a givenfile object of gslb_geo_db type. Allowed values are 2-50000. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gslb_purge_batch_size` - (Optional) Batch size for the vs_mgr to perform datastrorecleanup during a gslb purge. Allowed values are 50-1200. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gslb_purge_sleep_time_ms` - (Optional) Sleep time in the vs_mgr during a federatedpurge rpc call. Allowed values are 50-100. Field introduced in 22.1.3. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ignore_vrf_in_networksubnetlist` - (Optional) Ignore the vrf_context filter for /networksubnetlist api. Field introduced in 22.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `max_dead_se_in_grp` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_pcap_per_tenant` - (Optional) Maximum number of pcap files stored per tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_se_spawn_interval_delay` - (Optional) Maximum delay possible to add to se_spawn_retry_interval after successive se spawn failure. Field introduced in 20.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_seq_attach_ip_failures` - (Optional) Maximum number of consecutive attach ip failures that halts vs placement. Field introduced in 17.2.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_seq_vnic_failures` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_threads_cc_vip_bg_worker` - (Optional) Maximum number of threads in threadpool used by cloud connector ccvipbgworker. Allowed values are 1-100. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `permission_scoped_shared_admin_networks` - (Optional) Network and vrfcontext objects from the admin tenant will not be shared to non-admin tenants unless admin permissions are granted. Field introduced in 18.2.7, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `persistence_key_rotate_period` - (Optional) Period for rotate app persistence keys job. Allowed values are 1-1051200. Special values are 0 - disabled. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `portal_request_burst_limit` - (Optional) Burst limit on number of incoming requests. 0 to disable. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `portal_request_rate_limit` - (Optional) Maximum average number of requests allowed per second. 0 to disable. Field introduced in 20.1.1. Unit is per_second. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `portal_token` - (Optional) Token used for uploading tech-support to portal. Field introduced in 16.4.6,17.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `postgres_vacuum_period` - (Optional) Period for which postgres vacuum are executed. Allowed values are 30-40320. Special values are 0 - deactivated. Field introduced in 22.1.3. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `process_locked_useraccounts_timeout_period` - (Optional) Period for process locked user accounts job. Field introduced in 18.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `process_pki_profile_timeout_period` - (Optional) Period for process pki profile job. Field introduced in 18.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `query_host_fail` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `resmgr_log_caching_period` - (Optional) Period for each cycle of log caching in resource manager. At the end of each cycle, the in memory cached log history will be cleared. Field introduced in 20.1.5. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `restrict_cloud_read_access` - (Optional) Restrict read access to cloud. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `safenet_hsm_version` - (Optional) Version of the safenet package installed on the controller. Field introduced in 16.5.2,17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_create_timeout` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_failover_attempt_interval` - (Optional) Interval between attempting failovers to an se. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_from_marketplace` - (Optional) This setting decides whether se is to be deployed from the cloud marketplace or to be created by the controller. The setting is applicable only when byol license is selected. Enum options - MARKETPLACE, IMAGE_SE. Field introduced in 18.1.4, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_offline_del` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_spawn_retry_interval` - (Optional) Default retry period before attempting another service engine spawn in se group. Field introduced in 20.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_upgrade_flow_cleanup_timeout` - (Optional) Timeout for flows cleanup by serviceengine during upgrade.internal knob  to be exercised under the surveillance of vmware avi support team. Field introduced in 22.1.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_vnic_cooldown` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_vnic_gc_wait_time` - (Optional) Duration to wait after last vnic addition before proceeding with vnic garbage collection. Used for testing purposes. Field introduced in 20.1.4. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `secure_channel_cleanup_timeout` - (Optional) Period for secure channel cleanup job. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `secure_channel_controller_token_timeout` - (Optional) Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `secure_channel_se_token_timeout` - (Optional) Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `shared_ssl_certificates` - (Optional) Ssl certificates in the admin tenant can be used in non-admin tenants. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `skip_beego_perf_collection` - (Optional) Skip api performance collection for requests going through the apiserver. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `soft_min_mem_per_se_limit` - (Optional) Soft limit on the minimum se memory that an se needs to have on se register. Field introduced in 30.1.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ssl_certificate_expiry_warning_days` - (Optional) Number of days for ssl certificate expiry warning. Unit is days. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `statecache_properties` - (Optional) Configure statecache behavior for config, se, resmgr. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `unresponsive_se_reboot` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `update_dns_entry_retry_limit` - (Optional) Number of times to retry a dns entry update/delete operation. Field introduced in 21.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `update_dns_entry_timeout` - (Optional) Timeout period for a dns entry update/delete operation. Field introduced in 21.1.4. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `upgrade_dns_ttl` - (Optional) Time to account for dns ttl during upgrade. This is in addition to vs_scalein_timeout_for_upgrade in se_group. Field introduced in 17.1.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 5), basic (allowed values- 5) edition.
+* `upgrade_se_per_vs_scale_ops_txn_time` - (Optional) This parameter defines the upper-bound value of the vs scale-in or vs scale-out operation executed in the sescalein and sescale context. User can tweak this parameter to a higher value if the segroup gets suspended due to sescalein or sescaleout timeout failure typically associated with high number of vs(es) scaled out. Field introduced in 18.2.10, 20.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `user_agent_cache_config` - (Optional) Configuration for user-agent cache used in bot management. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vnic_op_fail_time` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_awaiting_se_timeout` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_key_rotate_period` - (Optional) Period for rotate vs keys job. Allowed values are 1-1051200. Special values are 0 - disabled. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_scaleout_ready_check_interval` - (Optional) Interval for checking scaleout_ready status while controller is waiting for scaleoutready rpc from the service engine. Field introduced in 18.2.2. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_attach_ip_fail` - (Optional) Time to wait before marking attach ip operation on an se as failed. Field introduced in 17.2.2. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_bootup_fail` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_bootup_fail_patch` - (Optional) Wait for longer for patch ses to boot up. Field introduced in 30.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vs_se_create_fail` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_ping_fail` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_vnic_fail` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_vnic_ip_fail` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vsphere_ha_detection_timeout` - (Optional) Vsphere ha monitor detection timeout. If vsphere_ha_enabled is true and the controller is not able to reach the se, placement will wait for this duration for vsphere_ha_inprogress to be marked true before taking corrective action. Field introduced in 20.1.7, 21.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vsphere_ha_recovery_timeout` - (Optional) Vsphere ha monitor recovery timeout. Once vsphere_ha_inprogress is set to true (meaning host failure detected and vsphere ha will recover the service engine), placement will wait for at least this duration for the se to reconnect to the controller before taking corrective action. Field introduced in 20.1.7, 21.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vsphere_ha_timer_interval` - (Optional) Vsphere ha monitor timer interval for sending cc_check_se_status to cloud connector. Field introduced in 20.1.7, 21.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `warmstart_se_reconnect_wait_time` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `warmstart_vs_resync_wait_time` - (Optional) Timeout for warmstart vs resync. Field introduced in 18.1.4, 18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -151,5 +148,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_controllersite.html.markdown b/website/docs/r/avi_controllersite.html.markdown
index e474546bd..408ddd40a 100644
--- a/website/docs/r/avi_controllersite.html.markdown
+++ b/website/docs/r/avi_controllersite.html.markdown
@@ -27,11 +27,11 @@ resource "avi_controllersite" "foo" {
 
 The following arguments are supported:
 
-* `address` - (Required) Ip address or a dns resolvable, fully qualified domain name of the site controller cluster. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Required) Name for the site controller cluster. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `port` - (Optional) The controller site cluster's rest api port number. Allowed values are 1-65535. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Reference for the tenant. It is a reference to an object of type tenant. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `address` - (Required) Ip address or a dns resolvable, fully qualified domain name of the site controller cluster. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name for the site controller cluster. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `port` - (Optional) The controller site cluster's rest api port number. Allowed values are 1-65535. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Reference for the tenant. It is a reference to an object of type tenant. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -46,5 +46,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Reference for the site controller cluster. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Reference for the site controller cluster. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_csrfpolicy.html.markdown b/website/docs/r/avi_csrfpolicy.html.markdown
index 605faf544..801cb951c 100644
--- a/website/docs/r/avi_csrfpolicy.html.markdown
+++ b/website/docs/r/avi_csrfpolicy.html.markdown
@@ -27,13 +27,14 @@ resource "avi_csrfpolicy" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) The name of this csrf protection policy. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `rules` - (Required) Rules to control which requests undergo csrf protection.if the client's request doesn't match with any rules matchtarget, bypass_csrf action is applied. Field introduced in 30.2.1. Minimum of 1 items required. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `cookie_name` - (Optional) Name of the cookie to be used for csrf token. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - (Optional) Human-readable description of this csrf protection policy. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) The unique identifier of the tenant to which this policy belongs. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `token_validity_time_min` - (Optional) Csrf token is rotated when this time expires. Tokens will be acceptable for twice the token_validity_time time. Allowed values are 10-1440. Special values are 0- unlimited. Field introduced in 30.2.1. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) The name of this csrf protection policy. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `rules` - (Required) Rules to control which requests undergo csrf protection.if the client's request doesn't match with any rules matchtarget, bypass_csrf action is applied. Field introduced in 30.2.1. Minimum of 1 items required. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cookie_name` - (Optional) Name of the cookie to be used for csrf token. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `csrf_file_ref` - (Optional) The file object that contains csrf javascript content. Must be of type 'csrf'. It is a reference to an object of type fileobject. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - (Optional) Human-readable description of this csrf protection policy. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) The unique identifier of the tenant to which this policy belongs. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `token_validity_time_min` - (Optional) A csrf token is rotated when this amount of time has passed. Even after that, tokens will be accepted until twice this amount of time has passed. Note, however, that other timeouts from the underlying session layer also affect how long a given token can be used. A token will be invalidated (rotated or deleted) after one of 'token_validity_time_min' (this value), 'session_establishment_timeout', 'session_idle_timeout', 'session_maximum_timeout' is reached, whichever occurs first. Allowed values are 10-1440. Special values are 0- unlimited. Field introduced in 30.2.1. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -48,5 +49,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  A unique identifier to this csrf protection policy. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  A unique identifier to this csrf protection policy. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_customipamdnsprofile.html.markdown b/website/docs/r/avi_customipamdnsprofile.html.markdown
index 23fa4d85d..90cff9223 100644
--- a/website/docs/r/avi_customipamdnsprofile.html.markdown
+++ b/website/docs/r/avi_customipamdnsprofile.html.markdown
@@ -27,11 +27,11 @@ resource "avi_customipamdnsprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the custom ipam dns profile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `script_uri` - (Required) Script uri of form controller //ipamdnsscripts/<file-name>, file-name must have a .py extension and conform to pep8 naming convention. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `script_params` - (Optional) Parameters that are always passed to the ipam/dns script. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the custom ipam dns profile. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `script_uri` - (Required) Script uri of form controller //ipamdnsscripts/<file-name>, file-name must have a .py extension and conform to pep8 naming convention. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `script_params` - (Optional) Parameters that are always passed to the ipam/dns script. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -46,5 +46,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_dnspolicy.html.markdown b/website/docs/r/avi_dnspolicy.html.markdown
index 028c29257..490341060 100644
--- a/website/docs/r/avi_dnspolicy.html.markdown
+++ b/website/docs/r/avi_dnspolicy.html.markdown
@@ -27,14 +27,14 @@ resource "avi_dnspolicy" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the dns policy. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `created_by` - (Optional) Creator name. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - (Optional) Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `internal` - (Optional) The dns policy is created and modified by internal modules only. This should not be modified by users. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `rule` - (Optional) Dns rules. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the dns policy. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - (Optional) Creator name. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `internal` - (Optional) The dns policy is created and modified by internal modules only. This should not be modified by users. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rule` - (Optional) Dns rules. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -49,5 +49,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the dns policy. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the dns policy. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_dynamicdnsrecord.html.markdown b/website/docs/r/avi_dynamicdnsrecord.html.markdown
index cd8de08db..866b56048 100644
--- a/website/docs/r/avi_dynamicdnsrecord.html.markdown
+++ b/website/docs/r/avi_dynamicdnsrecord.html.markdown
@@ -27,25 +27,25 @@ resource "avi_dynamicdnsrecord" "foo" {
 
 The following arguments are supported:
 
-* `algorithm` - (Optional) Specifies the algorithm to pick the ip address(es) to be returned,when multiple entries are configured. This does not apply if num_records_in_response is 0. Default is round-robin. Enum options - DNS_RECORD_RESPONSE_ROUND_ROBIN, DNS_RECORD_RESPONSE_CONSISTENT_HASH. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `cname` - (Optional) Canonical name in cname record. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `delegated` - (Optional) Configured fqdns are delegated domains (i.e. They represent a zone cut). Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - (Optional) Details of dns record. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dns_vs_uuid` - (Optional) Uuid of the dns vs. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `fqdn` - (Optional) Fully qualified domain name. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ip6_address` - (Optional) Ipv6 address in aaaa record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ip_address` - (Optional) Ip address in a record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `metadata` - (Optional) Internal metadata for the dns record. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mx_records` - (Optional) Mx record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - (Optional) Dynamicdnsrecord name, needed for a top level uuid protobuf, for display in shell. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ns` - (Optional) Name server information in ns record. Field introduced in 20.1.3. Maximum of 13 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `num_records_in_response` - (Optional) Specifies the number of records returned by the dns service.enter 0 to return all records. Default is 0. Allowed values are 0-20. Special values are 0- return all records. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `service_locators` - (Optional) Service locator info in srv record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant_uuid from dns vs's tenant_uuid. It is a reference to an object of type tenant. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ttl` - (Optional) Time to live for this dns record. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `txt_records` - (Optional) Text record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `type` - (Optional) Dns record type. Enum options - DNS_RECORD_OTHER, DNS_RECORD_A, DNS_RECORD_NS, DNS_RECORD_CNAME, DNS_RECORD_SOA, DNS_RECORD_PTR, DNS_RECORD_HINFO, DNS_RECORD_MX, DNS_RECORD_TXT, DNS_RECORD_RP, DNS_RECORD_DNSKEY, DNS_RECORD_AAAA, DNS_RECORD_SRV, DNS_RECORD_OPT, DNS_RECORD_RRSIG, DNS_RECORD_AXFR, DNS_RECORD_ANY. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `wildcard_match` - (Optional) Enable wild-card match of fqdn  if an exact match is not found in the dns table, the longest match is chosen by wild-carding the fqdn in the dns request. Default is false. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `algorithm` - (Optional) Specifies the algorithm to pick the ip address(es) to be returned,when multiple entries are configured. This does not apply if num_records_in_response is 0. Default is round-robin. Enum options - DNS_RECORD_RESPONSE_ROUND_ROBIN, DNS_RECORD_RESPONSE_CONSISTENT_HASH. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cname` - (Optional) Canonical name in cname record. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `delegated` - (Optional) Configured fqdns are delegated domains (i.e. They represent a zone cut). Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - (Optional) Details of dns record. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dns_vs_uuid` - (Optional) Uuid of the dns vs. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `fqdn` - (Optional) Fully qualified domain name. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ip6_address` - (Optional) Ipv6 address in aaaa record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ip_address` - (Optional) Ip address in a record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `metadata` - (Optional) Internal metadata for the dns record. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `mx_records` - (Optional) Mx record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Optional) Dynamicdnsrecord name, needed for a top level uuid protobuf, for display in shell. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ns` - (Optional) Name server information in ns record. Field introduced in 20.1.3. Maximum of 13 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `num_records_in_response` - (Optional) Specifies the number of records returned by the dns service.enter 0 to return all records. Default is 0. Allowed values are 0-20. Special values are 0- return all records. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `service_locators` - (Optional) Service locator info in srv record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant_uuid from dns vs's tenant_uuid. It is a reference to an object of type tenant. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ttl` - (Optional) Time to live for this dns record. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `txt_records` - (Optional) Text record. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `type` - (Optional) Dns record type. Enum options - DNS_RECORD_OTHER, DNS_RECORD_A, DNS_RECORD_NS, DNS_RECORD_CNAME, DNS_RECORD_SOA, DNS_RECORD_PTR, DNS_RECORD_HINFO, DNS_RECORD_MX, DNS_RECORD_TXT, DNS_RECORD_RP, DNS_RECORD_DNSKEY, DNS_RECORD_AAAA, DNS_RECORD_SRV, DNS_RECORD_OPT, DNS_RECORD_RRSIG, DNS_RECORD_AXFR, DNS_RECORD_ANY. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `wildcard_match` - (Optional) Enable wild-card match of fqdn  if an exact match is not found in the dns table, the longest match is chosen by wild-carding the fqdn in the dns request. Default is false. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -60,5 +60,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the dns record. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Uuid of the dns record. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_errorpagebody.html.markdown b/website/docs/r/avi_errorpagebody.html.markdown
index 040dfb8cc..769e694f4 100644
--- a/website/docs/r/avi_errorpagebody.html.markdown
+++ b/website/docs/r/avi_errorpagebody.html.markdown
@@ -27,12 +27,12 @@ resource "avi_errorpagebody" "foo" {
 
 The following arguments are supported:
 
-* `error_page_body` - (Required) Error page body sent to client when match. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Required) Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `format` - (Optional) Format of an error page body html or json. Enum options - ERROR_PAGE_FORMAT_HTML, ERROR_PAGE_FORMAT_JSON. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `error_page_body` - (Required) Error page body sent to client when match. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `format` - (Optional) Format of an error page body html or json. Enum options - ERROR_PAGE_FORMAT_HTML, ERROR_PAGE_FORMAT_JSON. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -47,5 +47,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_errorpageprofile.html.markdown b/website/docs/r/avi_errorpageprofile.html.markdown
index da3e5182b..70f5f8fb5 100644
--- a/website/docs/r/avi_errorpageprofile.html.markdown
+++ b/website/docs/r/avi_errorpageprofile.html.markdown
@@ -27,11 +27,11 @@ resource "avi_errorpageprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `error_pages` - (Optional) Defined error pages for http status codes. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `error_pages` - (Optional) Defined error pages for http status codes. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -46,5 +46,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_federationcheckpoint.html.markdown b/website/docs/r/avi_federationcheckpoint.html.markdown
index 64bc5d6a3..3f3af7eb2 100644
--- a/website/docs/r/avi_federationcheckpoint.html.markdown
+++ b/website/docs/r/avi_federationcheckpoint.html.markdown
@@ -27,12 +27,12 @@ resource "avi_federationcheckpoint" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the checkpoint. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `date` - (Optional) Date when the checkpoint was created. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - (Optional) Description for this checkpoint. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_federated` - (Optional) This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the checkpoint. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `date` - (Optional) Date when the checkpoint was created. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Description for this checkpoint. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_federated` - (Optional) This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -47,5 +47,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the checkpoint. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the checkpoint. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_fileobject.html.markdown b/website/docs/r/avi_fileobject.html.markdown
index c930c415c..31a369e3a 100644
--- a/website/docs/r/avi_fileobject.html.markdown
+++ b/website/docs/r/avi_fileobject.html.markdown
@@ -27,22 +27,26 @@ resource "avi_fileobject" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the file object. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - (Required) Type of the file. Enum options - OTHER_FILE_TYPES, IP_REPUTATION, GEO_DB, TECH_SUPPORT, HSMPACKAGES, IPAMDNSSCRIPTS, CONTROLLER_IMAGE, CRL_DATA. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- other_file_types), basic edition(allowed values- other_file_types), enterprise with cloud services edition.
-* `checksum` - (Optional) Sha1 checksum of the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `compressed` - (Optional) This field indicates whether the file is gzip-compressed. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `created` - (Optional) Timestamp of creation for the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `crl_info` - (Optional) This field contains certificate revocation list metadata. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - (Optional) Description of the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `expires_at` - (Optional) Timestamp when the file will be no longer needed and can be removed by the system. If this is set, a garbage collector process will try to remove the file after this time. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_federated` - (Optional) This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `path` - (Optional) Path to the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `read_only` - (Optional) Enforce read-only on the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `restrict_download` - (Optional) Flag to allow/restrict download of the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `size` - (Optional) Size of the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `version` - (Optional) Version of the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the file object. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - (Required) Type of the file. Enum options - OTHER_FILE_TYPES, IP_REPUTATION, GEO_DB, TECH_SUPPORT, HSMPACKAGES, IPAMDNSSCRIPTS, CONTROLLER_IMAGE, CRL_DATA, IP_REPUTATION_IPV6, GSLB_GEO_DB, CSRF_JS. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- other_file_types), basic (allowed values- other_file_types) edition.
+* `checksum` - (Optional) Sha1 checksum of the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `child_refs` - (Optional) Avi internal formatted/converted files. It is a reference to an object of type fileobject. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `compressed` - (Optional) This field indicates whether the file is gzip-compressed. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created` - (Optional) Timestamp of creation for the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `crl_info` - (Optional) This field contains certificate revocation list metadata. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - (Optional) Description of the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `events` - (Optional) List of all fileobject events. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `expires_at` - (Optional) Timestamp when the file will be no longer needed and can be removed by the system. If this is set, a garbage collector process will try to remove the file after this time. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `gslb_geodb_format` - (Optional) This field indicates the file format of gslb geodb file type. Enum options - GSLB_GEODB_FILE_FORMAT_AVI, GSLB_GEODB_FILE_FORMAT_MAXMIND_CITY, GSLB_GEODB_FILE_FORMAT_MAXMIND_CITY_V6, GSLB_GEODB_FILE_FORMAT_MAXMIND_CITY_V4_AND_V6, GSLB_GEODB_FILE_FORMAT_AVI_V6, GSLB_GEODB_FILE_FORMAT_AVI_V4_AND_V6. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `has_parent` - (Optional) This field indicates if the the given fileobjecthas a parent fileobject or not. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_federated` - (Optional) This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `path` - (Optional) Path to the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `read_only` - (Optional) Enforce read-only on the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `restrict_download` - (Optional) Flag to allow/restrict download of the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `size` - (Optional) Size of the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `version` - (Optional) Version of the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -57,5 +61,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the file. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the file. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_geodb.html.markdown b/website/docs/r/avi_geodb.html.markdown
index 4c0338c42..4c41bbbcb 100644
--- a/website/docs/r/avi_geodb.html.markdown
+++ b/website/docs/r/avi_geodb.html.markdown
@@ -27,12 +27,12 @@ resource "avi_geodb" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Geo database name. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - (Optional) Description. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `files` - (Optional) Geo database files. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `is_federated` - (Optional) This field indicates that this object is replicated across gslb federation. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mappings` - (Optional) Custom mappings of geo values. All mappings which start with the prefix 'system-' (any case) are reserved for system default objects and may be overwritten. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) Geo database name. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - (Optional) Description. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `files` - (Optional) Geo database files. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_federated` - (Optional) This field indicates that this object is replicated across gslb federation. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `mappings` - (Optional) Custom mappings of geo values. All mappings which start with the prefix 'system-' (any case) are reserved for system default objects and may be overwritten. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -47,5 +47,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of this object. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Uuid of this object. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_gslb.html.markdown b/website/docs/r/avi_gslb.html.markdown
index a858b8b11..7a2a19992 100644
--- a/website/docs/r/avi_gslb.html.markdown
+++ b/website/docs/r/avi_gslb.html.markdown
@@ -27,27 +27,29 @@ resource "avi_gslb" "foo" {
 
 The following arguments are supported:
 
-* `leader_cluster_uuid` - (Required) Mark this site as leader of gslb configuration. This site is the one among the avi sites. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Required) Name for the gslb object. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sites` - (Required) Select avi site member belonging to this gslb. Minimum of 1 items required. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `async_interval` - (Optional) Frequency with which messages are propagated to vs mgr. Value of 0 disables async behavior and rpc are sent inline. Allowed values are 0-5. Field introduced in 18.2.3. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `clear_on_max_retries` - (Optional) Max retries after which the remote site is treated as a fresh start. In fresh start all the configs are downloaded. Allowed values are 1-1024. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `client_ip_addr_group` - (Optional) Group to specify if the client ip addresses are public or private. Field introduced in 17.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dns_configs` - (Optional) Sub domain configuration for the gslb. Gslb service's fqdn must be a match one of these subdomains. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_config_by_members` - (Optional) Allows enable/disable of gslbservice pool groups and pool members from the gslb follower members. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `error_resync_interval` - (Optional) Frequency with which errored messages are resynced to follower sites. Value of 0 disables resync behavior. Allowed values are 60-3600. Special values are 0 - disable. Field introduced in 18.2.3. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fileobject_max_file_versions` - (Optional) This is the max number of file versions that will be retained for a file referenced by the federated fileobject. Subsequent uploads of file will result in the file rotation of the older version and the latest version retained. Example  when a file upload is done for the first time, there will be a v1 version. Subsequent uploads will get mapped to v1, v2 and v3 versions. On the fourth upload of the file, the v1 will be file rotated and v2, v3 and v4 will be retained. Allowed values are 1-5. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `is_federated` - (Optional) This field indicates that this object is replicated across gslb federation. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `maintenance_mode` - (Optional) This field disables the configuration operations on the leader for all federated objects. Cud operations on gslb, gslbservice, gslbgeodbprofile and other federated objects will be rejected. The rest-api disabling helps in upgrade scenarios where we don't want configuration sync operations to the gslb member when the member is being upgraded. This configuration programmatically blocks the leader from accepting new gslb configuration when member sites are undergoing upgrade. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `replication_policy` - (Optional) Policy for replicating configuration to the active follower sites. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `send_interval` - (Optional) Frequency with which group members communicate. Allowed values are 1-3600. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `send_interval_prior_to_maintenance_mode` - (Optional) The user can specify a send-interval while entering maintenance mode. The validity of this 'maintenance send-interval' is only during maintenance mode. When the user leaves maintenance mode, the original send-interval is reinstated. This internal variable is used to store the original send-interval. Field introduced in 18.2.3. Unit is sec. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_scoped` - (Optional) This field indicates tenant visibility for gs pool member selection across the gslb federated objects.tenant scope can be set only during the gslb create and cannot be changed once it is set. Field introduced in 18.2.12,20.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `third_party_sites` - (Optional) Third party site member belonging to this gslb. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `view_id` - (Optional) The view-id is used in change-leader mode to differentiate partitioned groups while they have the same gslb namespace. Each partitioned group will be able to operate independently by using the view-id. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `leader_cluster_uuid` - (Required) Mark this site as leader of gslb configuration. This site is the one among the avi sites. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name for the gslb object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sites` - (Required) Select avi site member belonging to this gslb. Minimum of 1 items required. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `async_interval` - (Optional) Frequency with which messages are propagated to vs mgr. Value of 0 disables async behavior and rpc are sent inline. Allowed values are 0-5. Field introduced in 18.2.3. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `clear_on_max_retries` - (Optional) Max retries after which the remote site is treated as a fresh start. In fresh start all the configs are downloaded. Allowed values are 1-1024. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `client_ip_addr_group` - (Optional) Group to specify if the client ip addresses are public or private. Field introduced in 17.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_configs` - (Optional) Sub domain configuration for the gslb. Gslb service's fqdn must be a match one of these subdomains. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_config_by_members` - (Optional) Allows enable/disable of gslbservice pool groups and pool members from the gslb follower members. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `error_resync_interval` - (Optional) Frequency with which errored messages are resynced to follower sites. Value of 0 disables resync behavior. Allowed values are 60-3600. Special values are 0 - disable. Field introduced in 18.2.3. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fileobject_max_file_versions` - (Optional) This is the max number of file versions that will be retained for a file referenced by the federated fileobject. Subsequent uploads of file will result in the file rotation of the older version and the latest version retained. Example  when a file upload is done for the first time, there will be a v1 version. Subsequent uploads will get mapped to v1, v2 and v3 versions. On the fourth upload of the file, the v1 will be file rotated and v2, v3 and v4 will be retained. Allowed values are 1-5. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gs_member_fqdn_resolution_on_se` - (Optional) If this knob is enabled, gslb service member fqdn will be resolved by the service engines hosting the gslb service. Each service engine will resolve and consume the resolved ip addresses locally. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_federated` - (Optional) This field indicates that this object is replicated across gslb federation. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `maintenance_mode` - (Optional) This field disables the configuration operations on the leader for all federated objects. Cud operations on gslb, gslbservice, gslbgeodbprofile and other federated objects will be rejected. The rest-api disabling helps in upgrade scenarios where we don't want configuration sync operations to the gslb member when the member is being upgraded. This configuration programmatically blocks the leader from accepting new gslb configuration when member sites are undergoing upgrade. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `replication_policy` - (Optional) Policy for replicating configuration to the active follower sites. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `send_interval` - (Optional) Frequency with which group members communicate. Allowed values are 1-3600. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `send_interval_prior_to_maintenance_mode` - (Optional) The user can specify a send-interval while entering maintenance mode. The validity of this 'maintenance send-interval' is only during maintenance mode. When the user leaves maintenance mode, the original send-interval is reinstated. This internal variable is used to store the original send-interval. Field introduced in 18.2.3. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `short_probe_interval` - (Optional) Wait time between two consecutive short probe health checks. Allowed values are 1-3600. Field introduced in 31.1.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_scoped` - (Optional) This field indicates tenant visibility for gs pool member selection across the gslb federated objects.tenant scope can be set only during the gslb create and cannot be changed once it is set. Field introduced in 18.2.12,20.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `third_party_sites` - (Optional) Third party site member belonging to this gslb. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `view_id` - (Optional) The view-id is used in change-leader mode to differentiate partitioned groups while they have the same gslb namespace. Each partitioned group will be able to operate independently by using the view-id. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -62,5 +64,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the gslb object. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the gslb object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_gslbcrmruntime.html.markdown b/website/docs/r/avi_gslbcrmruntime.html.markdown
new file mode 100644
index 000000000..73f89a00f
--- /dev/null
+++ b/website/docs/r/avi_gslbcrmruntime.html.markdown
@@ -0,0 +1,56 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "Avi: avi_gslbcrmruntime"
+sidebar_current: "docs-avi-resource-gslbcrmruntime"
+description: |-
+  Creates and manages Avi GslbCRMRuntime.
+---
+
+# avi_gslbcrmruntime
+
+The GslbCRMRuntime resource allows the creation and management of Avi GslbCRMRuntime
+
+## Example Usage
+
+```hcl
+resource "avi_gslbcrmruntime" "foo" {
+    name = "terraform-example-foo"
+    tenant_ref = "/api/tenant/?name=admin"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `cluster_uuid` - (Optional) This field tracks the site_uuid for local/remote site. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `events` - (Optional) Events captured wrt to config replication. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `fds_info` - (Optional) Federated data store related info. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `local_info` - (Optional) Represents local info for the site. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Optional) The name of db entry. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_uuid` - (Optional) Gslb crm runtime object uuid. Points to the gslb to which this belongs. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `remote_info` - (Optional) Respresents remote site's info wrt to replication. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `replication_policy` - (Optional) Policy for replicating configuration to the active follower sites. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `site_name` - (Optional) This field tracks the site name. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `status_info` - (Optional) Crm operational status. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
+
+### Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:
+
+* `create` - (Defaults to 40 mins) Used when creating the AMI
+* `update` - (Defaults to 40 mins) Used when updating the AMI
+* `delete` - (Defaults to 90 mins) Used when deregistering the AMI
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `uuid` -  The uuid of db entry. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/r/avi_gslbgeodbprofile.html.markdown b/website/docs/r/avi_gslbgeodbprofile.html.markdown
index ff64d6385..7b2b88ccf 100644
--- a/website/docs/r/avi_gslbgeodbprofile.html.markdown
+++ b/website/docs/r/avi_gslbgeodbprofile.html.markdown
@@ -27,13 +27,13 @@ resource "avi_gslbgeodbprofile" "foo" {
 
 The following arguments are supported:
 
-* `entries` - (Required) List of geodb entries. An entry can either be a geodb file or an ip address group with geo properties. Field introduced in 17.1.1. Minimum of 1 items required. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Required) A user-friendly name for the geodb profile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_federated` - (Optional) This field indicates that this object is replicated across gslb federation. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `entries` - (Required) List of geodb entries. An entry can either be a geodb file or an ip address group with geo properties. Field introduced in 17.1.1. Minimum of 1 items required. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) A user-friendly name for the geodb profile. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_federated` - (Optional) This field indicates that this object is replicated across gslb federation. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -48,5 +48,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the geodb profile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the geodb profile. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_gslbhsmruntime.html.markdown b/website/docs/r/avi_gslbhsmruntime.html.markdown
new file mode 100644
index 000000000..6641a2bef
--- /dev/null
+++ b/website/docs/r/avi_gslbhsmruntime.html.markdown
@@ -0,0 +1,56 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "Avi: avi_gslbhsmruntime"
+sidebar_current: "docs-avi-resource-gslbhsmruntime"
+description: |-
+  Creates and manages Avi GslbHSMRuntime.
+---
+
+# avi_gslbhsmruntime
+
+The GslbHSMRuntime resource allows the creation and management of Avi GslbHSMRuntime
+
+## Example Usage
+
+```hcl
+resource "avi_gslbhsmruntime" "foo" {
+    name = "terraform-example-foo"
+    tenant_ref = "/api/tenant/?name=admin"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `cluster_uuid` - (Optional) The site controller cluster uuid. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enabled` - (Optional) Represents whether hsm is enabled/disabled. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `events` - (Optional) Events captured wrt to config replication. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `local_info` - (Optional) Represents local info for the site. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Optional) The name of db entry. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_uuid` - (Optional) Gslb hsm runtime object uuid. Points to the gslb to which this belongs. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `oper_status` - (Optional) Gslb site operational status, represents whether site is up or down. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `remote_info` - (Optional) Remote info is basically updated by grw. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `send_interval` - (Optional) Frequency with which group members communicate. This field shadows glb_cfg.send_interval. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `site_name` - (Optional) The gslb site name. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
+
+### Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:
+
+* `create` - (Defaults to 40 mins) Used when creating the AMI
+* `update` - (Defaults to 40 mins) Used when updating the AMI
+* `delete` - (Defaults to 90 mins) Used when deregistering the AMI
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `uuid` -  The uuid of db entry. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/r/avi_gslbservice.html.markdown b/website/docs/r/avi_gslbservice.html.markdown
index a4d59edc3..82d2016fd 100644
--- a/website/docs/r/avi_gslbservice.html.markdown
+++ b/website/docs/r/avi_gslbservice.html.markdown
@@ -27,32 +27,35 @@ resource "avi_gslbservice" "foo" {
 
 The following arguments are supported:
 
-* `domain_names` - (Required) Fully qualified domain name of the gslb service. Minimum of 1 items required. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `groups` - (Required) Select list of pools belonging to this gslb service. Minimum of 1 items required. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Required) Name for the gslb service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `application_persistence_profile_ref` - (Optional) The federated application persistence associated with gslbservice site persistence functionality. It is a reference to an object of type applicationpersistenceprofile. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `controller_health_status_enabled` - (Optional) Gs member's overall health status is derived based on a combination of controller and datapath health-status inputs. Note that the datapath status is determined by the association of health monitor profiles. Only the controller provided status is determined through this configuration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `created_by` - (Optional) Creator name. Field introduced in 17.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `down_response` - (Optional) Response to the client query when the gslb service is down. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enabled` - (Optional) Enable or disable the gslb service. If the gslb service is enabled, then the vips are sent in the dns responses based on reachability and configured algorithm. If the gslb service is disabled, then the vips are no longer available in the dns response. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `health_monitor_refs` - (Optional) Verify vs health by applying one or more health monitors. Active monitors generate synthetic traffic from dns service engine and to mark a vs up or down based on the response. It is a reference to an object of type healthmonitor. Maximum of 6 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `health_monitor_scope` - (Optional) Health monitor probe can be executed for all the members or it can be executed only for third-party members. This operational mode is useful to reduce the number of health monitor probes in case of a hybrid scenario. In such a case, avi members can have controller derived status while non-avi members can be probed by via health monitor probes in dataplane. Enum options - GSLB_SERVICE_HEALTH_MONITOR_ALL_MEMBERS, GSLB_SERVICE_HEALTH_MONITOR_ONLY_NON_AVI_MEMBERS. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `hm_off` - (Optional) This field is an internal field and is used in se. Field introduced in 18.2.2. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `is_federated` - (Optional) This field indicates that this object is replicated across gslb federation. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `min_members` - (Optional) The minimum number of members to distribute traffic to. Allowed values are 1-65535. Special values are 0 - disable. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `num_dns_ip` - (Optional) Number of ip addresses of this gslb service to be returned by the dns service. Enter 0 to return all ip addresses. Allowed values are 1-20. Special values are 0- return all ip addresses. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pki_profile_ref` - (Optional) Pki profile associated with the gslb service. It is a reference to an object of type pkiprofile. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pool_algorithm` - (Optional) The load balancing algorithm will pick a gslb pool within the gslb service list of available pools. Enum options - GSLB_SERVICE_ALGORITHM_PRIORITY, GSLB_SERVICE_ALGORITHM_GEO. Field introduced in 17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `resolve_cname` - (Optional) This field indicates that for a cname query, respond with resolved cnames in the additional section with a records. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `site_persistence_enabled` - (Optional) Enable site-persistence for the gslbservice. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `topology_policy_enabled` - (Optional) When enabled, topology policy rules are used for member selection first. If no valid member is found using the topology policy rules, configured gslb algorithms for pool selection and member selection are used. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ttl` - (Optional) Ttl value (in seconds) for records served for this gslb service by the dns service. Allowed values are 0-86400. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `use_edns_client_subnet` - (Optional) Use the client ip subnet from the edns option as source ipaddress for client geo-location and consistent hash algorithm. Default is true. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `wildcard_match` - (Optional) Enable wild-card match of fqdn  if an exact match is not found in the dns table, the longest match is chosen by wild-carding the fqdn in the dns request. Default is false. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `domain_names` - (Required) Fully qualified domain name of the gslb service. Minimum of 1 items required. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `groups` - (Required) Select list of pools belonging to this gslb service. Minimum of 1 items required. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name for the gslb service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `application_persistence_profile_ref` - (Optional) The federated application persistence associated with gslbservice site persistence functionality. It is a reference to an object of type applicationpersistenceprofile. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_health_status_enabled` - (Optional) Gs member's overall health status is derived based on a combination of controller and datapath health-status inputs. Note that the datapath status is determined by the association of health monitor profiles. Only the controller provided status is determined through this configuration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - (Optional) Creator name. Field introduced in 17.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `down_response` - (Optional) Response to the client query when the gslb service is down. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enabled` - (Optional) Enable or disable the gslb service. If the gslb service is enabled, then the vips are sent in the dns responses based on reachability and configured algorithm. If the gslb service is disabled, then the vips are no longer available in the dns response. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `health_monitor_refs` - (Optional) Verify vs health by applying one or more health monitors. Active monitors generate synthetic traffic from dns service engine and to mark a vs up or down based on the response. It is a reference to an object of type healthmonitor. Maximum of 6 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `health_monitor_scope` - (Optional) Health monitor probe can be executed for all the members or it can be executed only for third-party members. This operational mode is useful to reduce the number of health monitor probes in case of a hybrid scenario. In such a case, avi members can have controller derived status while non-avi members can be probed by via health monitor probes in dataplane. Enum options - GSLB_SERVICE_HEALTH_MONITOR_ALL_MEMBERS, GSLB_SERVICE_HEALTH_MONITOR_ONLY_NON_AVI_MEMBERS. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `hm_off` - (Optional) This field is an internal field and is used in se. Field introduced in 18.2.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `include_additional_records` - (Optional) If enabled, provide the srv target's resolved ip in the response srv gslb service. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_federated` - (Optional) This field indicates that this object is replicated across gslb federation. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `min_members` - (Optional) The minimum number of members to distribute traffic to. Allowed values are 1-65535. Special values are 0 - disable. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `num_dns_ip` - (Optional) Number of ip addresses of this gslb service to be returned by the dns service. Enter 0 to return all ip addresses. Allowed values are 1-20. Special values are 0- return all ip addresses. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pki_profile_ref` - (Optional) Pki profile associated with the gslb service. It is a reference to an object of type pkiprofile. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pool_algorithm` - (Optional) The load balancing algorithm will pick a gslb pool within the gslb service list of available pools. Enum options - GSLB_SERVICE_ALGORITHM_PRIORITY, GSLB_SERVICE_ALGORITHM_GEO. Field introduced in 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `record_type` - (Optional) Field to specify the type of gslb service. Enum options - GSLB_SERVICE_RECORD_TYPE_A_AAAA_CNAME, GSLB_SERVICE_RECORD_TYPE_SRV. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `resolve_cname` - (Optional) This field indicates that for a cname query, respond with resolved cnames in the additional section with a records. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `site_persistence_enabled` - (Optional) Enable site-persistence for the gslbservice. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `topology_policy_enabled` - (Optional) When enabled, topology policy rules are used for member selection first. If no valid member is found using the topology policy rules, configured gslb algorithms for pool selection and member selection are used. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ttl` - (Optional) Ttl value (in seconds) for records served for this gslb service by the dns service. Allowed values are 0-86400. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_edns_client_subnet` - (Optional) Use the client ip subnet from the edns option as source ipaddress for client geo-location and consistent hash algorithm. Default is true. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vrf_uuid_for_gs` - (Optional) Vrf name of the dns vs to which this gs is bound to. In case it is bound to multiple dns vses on the se, this field will be inherited from the first dns vs in the configuration order. Field introduced in 31.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `wildcard_match` - (Optional) Enable wild-card match of fqdn  if an exact match is not found in the dns table, the longest match is chosen by wild-carding the fqdn in the dns request. Default is false. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -67,5 +70,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the gslb service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the gslb service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_gslbsmruntime.html.markdown b/website/docs/r/avi_gslbsmruntime.html.markdown
new file mode 100644
index 000000000..959e594a5
--- /dev/null
+++ b/website/docs/r/avi_gslbsmruntime.html.markdown
@@ -0,0 +1,67 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "Avi: avi_gslbsmruntime"
+sidebar_current: "docs-avi-resource-gslbsmruntime"
+description: |-
+  Creates and manages Avi GslbSMRuntime.
+---
+
+# avi_gslbsmruntime
+
+The GslbSMRuntime resource allows the creation and management of Avi GslbSMRuntime
+
+## Example Usage
+
+```hcl
+resource "avi_gslbsmruntime" "foo" {
+    name = "terraform-example-foo"
+    tenant_ref = "/api/tenant/?name=admin"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `leader_cluster_uuid` - (Required) Mark this site as leader of gslb configuration. This site is the one among the avi sites. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cluster_leader` - (Optional) The controller cluster leader node uuid. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cluster_uuid` - (Optional) The site controller cluster uuid. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dns_configs` - (Optional) Sub domain configuration for the gslb. Gslb service's fqdn must be a match one of these subdomains. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dns_info` - (Optional) Dns info at the site. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enabled` - (Optional) Activate/de-activate state retrieved from the cfg. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `events` - (Optional) Captures sm related events. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `health_monitor_info` - (Optional) This field will provide information on origin(site name) of the health monitoring information. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `member_type` - (Optional) The site's member type  a leader is set to active while all members are set to passive. Enum options - GSLB_ACTIVE_MEMBER, GSLB_PASSIVE_MEMBER. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Optional) The name of db entry. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `node_uuid` - (Optional) The controller cluster node uuid that processes the site.sites are sharded across the cluster nodes. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `num_of_retries` - (Optional) Number of retry attempts to reach the remote site. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_uuid` - (Optional) Gslb sm runtime object uuid. Points to the gslb to which this belongs. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `oper_status` - (Optional) Gslb site operational status, represents whether site is up or down. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `remote_info` - (Optional) Remote info is basically updated by grw. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `role` - (Optional) Site role  leader or follower. Enum options - GSLB_LEADER, GSLB_MEMBER, GSLB_NOT_A_MEMBER. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `site_name` - (Optional) The gslb site name. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `site_type` - (Optional) Indicates if it is avi site or third-party. Enum options - GSLB_AVI_SITE, GSLB_THIRD_PARTY_SITE. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `state` - (Optional) Represents the state of the site. Enum options - SITE_STATE_NULL, SITE_STATE_JOIN_IN_PROGRESS, SITE_STATE_LEAVE_IN_PROGRESS, SITE_STATE_INIT, SITE_STATE_UNREACHABLE, SITE_STATE_MMODE, SITE_STATE_DISABLE_IN_PROGRESS, SITE_STATE_DISABLED, SITE_STATE_HS_IN_PROGRESS. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sw_version` - (Optional) Current software version of the site. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `view_id` - (Optional) The view-id is used in change-leader mode to differentiate partitioned groups while they have the same gslb namespace. Each partitioned group will be able to operate independently by using the view-id. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
+
+### Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:
+
+* `create` - (Defaults to 40 mins) Used when creating the AMI
+* `update` - (Defaults to 40 mins) Used when updating the AMI
+* `delete` - (Defaults to 90 mins) Used when deregistering the AMI
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `uuid` -  The uuid of db entry. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/r/avi_hardwaresecuritymodulegroup.html.markdown b/website/docs/r/avi_hardwaresecuritymodulegroup.html.markdown
index 7314bc1d6..d36661b81 100644
--- a/website/docs/r/avi_hardwaresecuritymodulegroup.html.markdown
+++ b/website/docs/r/avi_hardwaresecuritymodulegroup.html.markdown
@@ -27,11 +27,11 @@ resource "avi_hardwaresecuritymodulegroup" "foo" {
 
 The following arguments are supported:
 
-* `hsm` - (Required) Hardware security module configuration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Required) Name of the hsm group configuration object. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `hsm` - (Required) Hardware security module configuration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the hsm group configuration object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -46,5 +46,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the hsm group configuration object. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the hsm group configuration object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_healthmonitor.html.markdown b/website/docs/r/avi_healthmonitor.html.markdown
index 03f3c4efc..0d0378fbc 100644
--- a/website/docs/r/avi_healthmonitor.html.markdown
+++ b/website/docs/r/avi_healthmonitor.html.markdown
@@ -27,40 +27,42 @@ resource "avi_healthmonitor" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) A user friendly name for this health monitor. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - (Required) Type of the health monitor. Enum options - HEALTH_MONITOR_PING, HEALTH_MONITOR_TCP, HEALTH_MONITOR_HTTP, HEALTH_MONITOR_HTTPS, HEALTH_MONITOR_EXTERNAL, HEALTH_MONITOR_UDP, HEALTH_MONITOR_DNS, HEALTH_MONITOR_GSLB, HEALTH_MONITOR_SIP, HEALTH_MONITOR_RADIUS, HEALTH_MONITOR_SMTP, HEALTH_MONITOR_SMTPS, HEALTH_MONITOR_POP3, HEALTH_MONITOR_POP3S, HEALTH_MONITOR_IMAP, HEALTH_MONITOR_IMAPS, HEALTH_MONITOR_FTP, HEALTH_MONITOR_FTPS, HEALTH_MONITOR_LDAP, HEALTH_MONITOR_LDAPS... Allowed in enterprise edition with any value, essentials edition(allowed values- health_monitor_ping,health_monitor_tcp,health_monitor_udp), basic edition(allowed values- health_monitor_ping,health_monitor_tcp,health_monitor_udp,health_monitor_http,health_monitor_https), enterprise with cloud services edition.
-* `allow_duplicate_monitors` - (Optional) By default, multiple instances of the same healthmonitor to the same server are suppressed intelligently. In rare cases, the monitor may have specific constructs that go beyond the server keys (ip, port, etc.) during which such suppression is not desired. Use this knob to allow duplicates. Field introduced in 18.2.8. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `authentication` - (Optional) Authentication information for username/password. Field introduced in 20.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `disable_quickstart` - (Optional) During addition of a server or healthmonitors or during bootup, avi performs sequential health checks rather than waiting for send-interval to kick in, to mark the server up as soon as possible. This knob may be used to turn this feature off. Field introduced in 18.2.7. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `dns_monitor` - (Optional) Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `external_monitor` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `failed_checks` - (Optional) Number of continuous failed health checks before the server is marked down. Allowed values are 1-50. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ftp_monitor` - (Optional) Health monitor for ftp. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ftps_monitor` - (Optional) Health monitor for ftps. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `http_monitor` - (Optional) Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `https_monitor` - (Optional) Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `imap_monitor` - (Optional) Health monitor for imap. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `imaps_monitor` - (Optional) Health monitor for imaps. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `is_federated` - (Optional) This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `ldap_monitor` - (Optional) Health monitor for ldap. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ldaps_monitor` - (Optional) Health monitor for ldaps. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `monitor_port` - (Optional) Use this port instead of the port defined for the server in the pool. If the monitor succeeds to this port, the load balanced traffic will still be sent to the port of the server defined within the pool. Allowed values are 1-65535. Special values are 0 - use server port. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pop3_monitor` - (Optional) Health monitor for pop3. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pop3s_monitor` - (Optional) Health monitor for pop3s. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `radius_monitor` - (Optional) Health monitor for radius. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `receive_timeout` - (Optional) A valid response from the server is expected within the receive timeout window. This timeout must be less than the send interval. If server status is regularly flapping up and down, consider increasing this value. Allowed values are 1-2400. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sctp_monitor` - (Optional) Health monitor for sctp. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `send_interval` - (Optional) Frequency, in seconds, that monitors are sent to a server. Allowed values are 1-3600. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sip_monitor` - (Optional) Health monitor for sip. Field introduced in 17.2.8, 18.1.3, 18.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `smtp_monitor` - (Optional) Health monitor for smtp. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `smtps_monitor` - (Optional) Health monitor for smtps. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `successful_checks` - (Optional) Number of continuous successful health checks before server is marked up. Allowed values are 1-50. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tcp_monitor` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `udp_monitor` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) A user friendly name for this health monitor. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - (Required) Type of the health monitor. Enum options - HEALTH_MONITOR_PING, HEALTH_MONITOR_TCP, HEALTH_MONITOR_HTTP, HEALTH_MONITOR_HTTPS, HEALTH_MONITOR_EXTERNAL, HEALTH_MONITOR_UDP, HEALTH_MONITOR_DNS, HEALTH_MONITOR_GSLB, HEALTH_MONITOR_SIP, HEALTH_MONITOR_RADIUS, HEALTH_MONITOR_SMTP, HEALTH_MONITOR_SMTPS, HEALTH_MONITOR_POP3, HEALTH_MONITOR_POP3S, HEALTH_MONITOR_IMAP, HEALTH_MONITOR_IMAPS, HEALTH_MONITOR_FTP, HEALTH_MONITOR_FTPS, HEALTH_MONITOR_LDAP, HEALTH_MONITOR_LDAPS... Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- health_monitor_ping,health_monitor_tcp,health_monitor_udp), basic (allowed values- health_monitor_ping,health_monitor_tcp,health_monitor_udp,health_monitor_http,health_monitor_https) edition.
+* `allow_duplicate_monitors` - (Optional) By default, multiple instances of the same healthmonitor to the same server are suppressed intelligently. In rare cases, the monitor may have specific constructs that go beyond the server keys (ip, port, etc.) during which such suppression is not desired. Use this knob to allow duplicates. Field introduced in 18.2.8. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `authentication` - (Optional) Authentication information for username/password. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disable_quickstart` - (Optional) During addition of a server or healthmonitors or during bootup, avi performs sequential health checks rather than waiting for send-interval to kick in, to mark the server up as soon as possible. This knob may be used to turn this feature off. Field introduced in 18.2.7. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `dns_monitor` - (Optional) Allowed with any value in enterprise, enterprise with cloud services edition.
+* `external_monitor` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `failed_checks` - (Optional) Number of continuous failed health checks before the server is marked down. Allowed values are 1-50. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ftp_monitor` - (Optional) Health monitor for ftp. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ftps_monitor` - (Optional) Health monitor for ftps. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `http2_monitor` - (Optional) Health monitor for http2. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `http2s_monitor` - (Optional) Health monitor for http2s. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `http_monitor` - (Optional) Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `https_monitor` - (Optional) Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `imap_monitor` - (Optional) Health monitor for imap. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `imaps_monitor` - (Optional) Health monitor for imaps. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_federated` - (Optional) This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 17.1.3. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `ldap_monitor` - (Optional) Health monitor for ldap. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ldaps_monitor` - (Optional) Health monitor for ldaps. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `monitor_port` - (Optional) Use this port instead of the port defined for the server in the pool. If the monitor succeeds to this port, the load balanced traffic will still be sent to the port of the server defined within the pool. Allowed values are 1-65535. Special values are 0 - use server port. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pop3_monitor` - (Optional) Health monitor for pop3. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pop3s_monitor` - (Optional) Health monitor for pop3s. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `radius_monitor` - (Optional) Health monitor for radius. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `receive_timeout` - (Optional) A valid response from the server is expected within the receive timeout window. This timeout must be less than the send interval. If server status is regularly flapping up and down, consider increasing this value. Allowed values are 1-2400. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sctp_monitor` - (Optional) Health monitor for sctp. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `send_interval` - (Optional) Frequency, in seconds, that monitors are sent to a server. Allowed values are 1-3600. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sip_monitor` - (Optional) Health monitor for sip. Field introduced in 17.2.8, 18.1.3, 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `smtp_monitor` - (Optional) Health monitor for smtp. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `smtps_monitor` - (Optional) Health monitor for smtps. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `successful_checks` - (Optional) Number of continuous successful health checks before server is marked up. Allowed values are 1-50. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tcp_monitor` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `udp_monitor` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -75,5 +77,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the health monitor. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the health monitor. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_httppolicyset.html.markdown b/website/docs/r/avi_httppolicyset.html.markdown
index 53643d310..5909a2cca 100644
--- a/website/docs/r/avi_httppolicyset.html.markdown
+++ b/website/docs/r/avi_httppolicyset.html.markdown
@@ -27,19 +27,19 @@ resource "avi_httppolicyset" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the http policy set. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_config_cksum` - (Optional) Checksum of cloud configuration for pool. Internally set by cloud connector. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `created_by` - (Optional) Creator name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `geo_db_ref` - (Optional) Geo database. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `http_request_policy` - (Optional) Http request policy for the virtual service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `http_response_policy` - (Optional) Http response policy for the virtual service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `http_security_policy` - (Optional) Http security policy for the virtual service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ip_reputation_db_ref` - (Optional) Ip reputation database. It is a reference to an object of type ipreputationdb. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `is_internal_policy` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the http policy set. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_config_cksum` - (Optional) Checksum of cloud configuration for pool. Internally set by cloud connector. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - (Optional) Creator name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `geo_db_ref` - (Optional) Geo database. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `http_request_policy` - (Optional) Http request policy for the virtual service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `http_response_policy` - (Optional) Http response policy for the virtual service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `http_security_policy` - (Optional) Http security policy for the virtual service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ip_reputation_db_ref` - (Optional) Ip reputation database. It is a reference to an object of type ipreputationdb. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_internal_policy` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -54,5 +54,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the http policy set. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the http policy set. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_icapprofile.html.markdown b/website/docs/r/avi_icapprofile.html.markdown
index 934b927d2..91755b4aa 100644
--- a/website/docs/r/avi_icapprofile.html.markdown
+++ b/website/docs/r/avi_icapprofile.html.markdown
@@ -27,23 +27,23 @@ resource "avi_icapprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the icap profile. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pool_group_ref` - (Required) The pool group which is used to connect to icap servers. It is a reference to an object of type poolgroup. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `service_uri` - (Required) The path and query component of the icap url. Host name and port will be taken from the pool. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `allow_204` - (Optional) Allow icap server to send 204 response as described in rfc 3507 section 4.5. Service engine will buffer the complete request if alllow_204 is enabled. If disabled, preview_size request body will be buffered if enable_preview is set to true, and rest of the request body will be streamed to the icap server. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `buffer_size` - (Optional) The maximum buffer size for the http request body. If the request body exceeds this size, the request will not be checked by the icap server. In this case, the configured action will be executed and a significant log entry will be generated. Allowed values are 1-51200. Field introduced in 20.1.1. Unit is kb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `buffer_size_exceed_action` - (Optional) Decide what should happen if the request body size exceeds the configured buffer size. If this is set to fail open, the request will not be checked by the icap server. If this is set to fail closed, the request will be rejected with 413 status code. Enum options - ICAP_FAIL_OPEN, ICAP_FAIL_CLOSED. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - (Optional) The cloud where this object belongs to. This must match the cloud referenced in the pool group below. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) A description for this icap profile. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_preview` - (Optional) Use the icap preview feature as described in rfc 3507 section 4.5. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fail_action` - (Optional) Decide what should happen if there is a problem with the icap server like communication timeout, protocol error, pool error, etc. If the icap server responds with 4xx-5xx error code the configured fail action is performed. If this is set to fail open, the request will continue, but will create a significant log entry. If this is set to fail closed, the request will be rejected with a 500 status code. Enum options - ICAP_FAIL_OPEN, ICAP_FAIL_CLOSED. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nsx_defender_config` - (Optional) Nsxdefender specific icap configurations. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `preview_size` - (Optional) The icap preview size as described in rfc 3507 section 4.5. This should not exceed the size supported by the icap server. If this is set to 0, only the http header will be sent to the icap server as a preview. To disable preview completely, set the enable-preview option to false.if vendor is lastline, recommended preview size is 1000 bytes,minimum preview size is 10 bytes. Allowed values are 0-5000. Field introduced in 20.1.1. Unit is bytes. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `response_timeout` - (Optional) Maximum time, client's request will be paused for icap processing. If this timeout is exceeded, the request to the icap server will be aborted and the configured fail action is executed. Allowed values are 50-3600000. Field introduced in 20.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `slow_response_warning_threshold` - (Optional) If the icap request takes longer than this value, this request will generate a significant log entry. Allowed values are 50-3600000. Field introduced in 20.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant which this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vendor` - (Optional) The vendor of the icap server. Enum options - ICAP_VENDOR_GENERIC, ICAP_VENDOR_OPSWAT, ICAP_VENDOR_LASTLINE. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the icap profile. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pool_group_ref` - (Required) The pool group which is used to connect to icap servers. It is a reference to an object of type poolgroup. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_uri` - (Required) The path and query component of the icap url. Host name and port will be taken from the pool. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allow_204` - (Optional) Allow icap server to send 204 response as described in rfc 3507 section 4.5. Service engine will buffer the complete request if alllow_204 is enabled. If disabled, preview_size request body will be buffered if enable_preview is set to true, and rest of the request body will be streamed to the icap server. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `buffer_size` - (Optional) The maximum buffer size for the http request body. If the request body exceeds this size, the request will not be checked by the icap server. In this case, the configured action will be executed and a significant log entry will be generated. Allowed values are 1-51200. Field introduced in 20.1.1. Unit is kb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `buffer_size_exceed_action` - (Optional) Decide what should happen if the request body size exceeds the configured buffer size. If this is set to fail open, the request will not be checked by the icap server. If this is set to fail closed, the request will be rejected with 413 status code. Enum options - ICAP_FAIL_OPEN, ICAP_FAIL_CLOSED. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) The cloud where this object belongs to. This must match the cloud referenced in the pool group below. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) A description for this icap profile. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_preview` - (Optional) Use the icap preview feature as described in rfc 3507 section 4.5. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fail_action` - (Optional) Decide what should happen if there is a problem with the icap server like communication timeout, protocol error, pool error, etc. If the icap server responds with 4xx-5xx error code the configured fail action is performed. If this is set to fail open, the request will continue, but will create a significant log entry. If this is set to fail closed, the request will be rejected with a 500 status code. Enum options - ICAP_FAIL_OPEN, ICAP_FAIL_CLOSED. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nsx_defender_config` - (Optional) Nsxdefender specific icap configurations. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `preview_size` - (Optional) The icap preview size as described in rfc 3507 section 4.5. This should not exceed the size supported by the icap server. If this is set to 0, only the http header will be sent to the icap server as a preview. To disable preview completely, set the enable-preview option to false.if vendor is lastline, recommended preview size is 1000 bytes,minimum preview size is 10 bytes. Allowed values are 0-5000. Field introduced in 20.1.1. Unit is bytes. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `response_timeout` - (Optional) Maximum time, client's request will be paused for icap processing. If this timeout is exceeded, the request to the icap server will be aborted and the configured fail action is executed. Allowed values are 50-3600000. Field introduced in 20.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `slow_response_warning_threshold` - (Optional) If the icap request takes longer than this value, this request will generate a significant log entry. Allowed values are 50-3600000. Field introduced in 20.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant which this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vendor` - (Optional) The vendor of the icap server. Enum options - ICAP_VENDOR_GENERIC, ICAP_VENDOR_OPSWAT, ICAP_VENDOR_LASTLINE. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -58,5 +58,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the icap profile. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the icap profile. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_image.html.markdown b/website/docs/r/avi_image.html.markdown
index 73ddc35d9..96d9ac3fc 100644
--- a/website/docs/r/avi_image.html.markdown
+++ b/website/docs/r/avi_image.html.markdown
@@ -27,27 +27,27 @@ resource "avi_image" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_info_values` - (Optional) This field describes the cloud info specific to the base image. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `controller_info` - (Optional) Controller package details. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `controller_patch_name` - (Optional) Mandatory controller patch name that is applied along with this base image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `controller_patch_ref` - (Optional) It references the controller-patch associated with the uber image. It is a reference to an object of type image. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `duration` - (Optional) Time taken to upload the image in seconds. Field introduced in 21.1.3. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `end_time` - (Optional) Image upload end time. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `events` - (Optional) Image events for image upload operation. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `fips_mode_transition_applicable` - (Optional) Specifies whether fips mode can be enabled on this image. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `img_state` - (Optional) Status of the image. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `migrations` - (Optional) This field describes the api migration related information. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `progress` - (Optional) Image upload progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 21.1.3. Unit is percent. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_info` - (Optional) Se package details. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_patch_name` - (Optional) Mandatory serviceengine patch name that is applied along with this base image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_patch_ref` - (Optional) It references the service engine patch associated with the uber image. It is a reference to an object of type image. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `start_time` - (Optional) Image upload start time. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tasks_completed` - (Optional) Completed set of tasks for image upload. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `total_tasks` - (Optional) Total number of tasks for image upload. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `type` - (Optional) Type of the image patch/system. Enum options - IMAGE_TYPE_PATCH, IMAGE_TYPE_SYSTEM, IMAGE_TYPE_MUST_CHECK. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uber_bundle` - (Optional) Status to check if the image is an uber bundle. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_info_values` - (Optional) This field describes the cloud info specific to the base image. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_info` - (Optional) Controller package details. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_patch_name` - (Optional) Mandatory controller patch name that is applied along with this base image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_patch_ref` - (Optional) It references the controller-patch associated with the uber image. It is a reference to an object of type image. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `duration` - (Optional) Time taken to upload the image in seconds. Field introduced in 21.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `end_time` - (Optional) Image upload end time. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `events` - (Optional) Image events for image upload operation. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `fips_mode_transition_applicable` - (Optional) Specifies whether fips mode can be enabled on this image. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `img_state` - (Optional) Status of the image. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `migrations` - (Optional) This field describes the api migration related information. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `progress` - (Optional) Image upload progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 21.1.3. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_info` - (Optional) Se package details. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_patch_name` - (Optional) Mandatory serviceengine patch name that is applied along with this base image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_patch_ref` - (Optional) It references the service engine patch associated with the uber image. It is a reference to an object of type image. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `start_time` - (Optional) Image upload start time. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks_completed` - (Optional) Completed set of tasks for image upload. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `total_tasks` - (Optional) Total number of tasks for image upload. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `type` - (Optional) Type of the image patch/system. Enum options - IMAGE_TYPE_PATCH, IMAGE_TYPE_SYSTEM, IMAGE_TYPE_MUST_CHECK. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uber_bundle` - (Optional) Status to check if the image is an uber bundle. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -62,5 +62,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_inventoryfaultconfig.html.markdown b/website/docs/r/avi_inventoryfaultconfig.html.markdown
index 2b83e4374..f33fe1c8e 100644
--- a/website/docs/r/avi_inventoryfaultconfig.html.markdown
+++ b/website/docs/r/avi_inventoryfaultconfig.html.markdown
@@ -27,12 +27,12 @@ resource "avi_inventoryfaultconfig" "foo" {
 
 The following arguments are supported:
 
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `controller_faults` - (Optional) Configure controller faults. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - (Optional) Name. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `serviceengine_faults` - (Optional) Configure serviceengine faults. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant. It is a reference to an object of type tenant. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `virtualservice_faults` - (Optional) Configure virtualservice faults. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_faults` - (Optional) Configure controller faults. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Optional) Name. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `serviceengine_faults` - (Optional) Configure serviceengine faults. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant. It is a reference to an object of type tenant. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `virtualservice_faults` - (Optional) Configure virtualservice faults. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -47,5 +47,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid auto generated. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Uuid auto generated. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_ipaddrgroup.html.markdown b/website/docs/r/avi_ipaddrgroup.html.markdown
index 24c1da726..178ce5399 100644
--- a/website/docs/r/avi_ipaddrgroup.html.markdown
+++ b/website/docs/r/avi_ipaddrgroup.html.markdown
@@ -27,18 +27,18 @@ resource "avi_ipaddrgroup" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the ip address group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `addrs` - (Optional) Configure ip address(es). Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `country_codes` - (Optional) Populate the ip address ranges from the geo database for this country. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ip_ports` - (Optional) Configure (ip address, port) tuple(s). Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `marathon_app_name` - (Optional) Populate ip addresses from tasks of this marathon app. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `marathon_service_port` - (Optional) Task port associated with marathon service port. If marathon app has multiple service ports, this is required. Else, the first task port is used. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `prefixes` - (Optional) Configure ip address prefix(es). Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ranges` - (Optional) Configure ip address range(s). Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the ip address group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `addrs` - (Optional) Configure ip address(es). Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `country_codes` - (Optional) Populate the ip address ranges from the geo database for this country. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ip_ports` - (Optional) Configure (ip address, port) tuple(s). Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `marathon_app_name` - (Optional) Populate ip addresses from tasks of this marathon app. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `marathon_service_port` - (Optional) Task port associated with marathon service port. If marathon app has multiple service ports, this is required. Else, the first task port is used. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `prefixes` - (Optional) Configure ip address prefix(es). Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ranges` - (Optional) Configure ip address range(s). Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -53,5 +53,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the ip address group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the ip address group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_ipamdnsproviderprofile.html.markdown b/website/docs/r/avi_ipamdnsproviderprofile.html.markdown
index 75569b476..f6c27db4f 100644
--- a/website/docs/r/avi_ipamdnsproviderprofile.html.markdown
+++ b/website/docs/r/avi_ipamdnsproviderprofile.html.markdown
@@ -27,22 +27,22 @@ resource "avi_ipamdnsproviderprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name for the ipam/dns provider profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - (Required) Provider type for the ipam/dns provider profile. Enum options - IPAMDNS_TYPE_INFOBLOX, IPAMDNS_TYPE_AWS, IPAMDNS_TYPE_OPENSTACK, IPAMDNS_TYPE_GCP, IPAMDNS_TYPE_INFOBLOX_DNS, IPAMDNS_TYPE_CUSTOM, IPAMDNS_TYPE_CUSTOM_DNS, IPAMDNS_TYPE_AZURE, IPAMDNS_TYPE_OCI, IPAMDNS_TYPE_TENCENT, IPAMDNS_TYPE_INTERNAL, IPAMDNS_TYPE_INTERNAL_DNS, IPAMDNS_TYPE_AWS_DNS, IPAMDNS_TYPE_AZURE_DNS. Allowed in enterprise edition with any value, essentials edition(allowed values- ipamdns_type_internal), basic edition(allowed values- ipamdns_type_internal), enterprise with cloud services edition.
-* `allocate_ip_in_vrf` - (Optional) If this flag is set, only allocate ip from networks in the virtual service vrf. Applicable for avi vantage ipam only. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `aws_profile` - (Optional) Provider details if type is aws. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `azure_profile` - (Optional) Provider details if type is microsoft azure. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `custom_profile` - (Optional) Provider details if type is custom. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `gcp_profile` - (Optional) Provider details if type is google cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `infoblox_profile` - (Optional) Provider details if type is infoblox. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `internal_profile` - (Optional) Provider details if type is avi. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `oci_profile` - (Optional) Provider details for oracle cloud. Field introduced in 18.2.1,18.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `openstack_profile` - (Optional) Provider details if type is openstack. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `proxy_configuration` - (Optional) Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tencent_profile` - (Optional) Provider details for tencent cloud. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name for the ipam/dns provider profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - (Required) Provider type for the ipam/dns provider profile. Enum options - IPAMDNS_TYPE_INFOBLOX, IPAMDNS_TYPE_AWS, IPAMDNS_TYPE_OPENSTACK, IPAMDNS_TYPE_GCP, IPAMDNS_TYPE_INFOBLOX_DNS, IPAMDNS_TYPE_CUSTOM, IPAMDNS_TYPE_CUSTOM_DNS, IPAMDNS_TYPE_AZURE, IPAMDNS_TYPE_OCI, IPAMDNS_TYPE_TENCENT, IPAMDNS_TYPE_INTERNAL, IPAMDNS_TYPE_INTERNAL_DNS, IPAMDNS_TYPE_AWS_DNS, IPAMDNS_TYPE_AZURE_DNS. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- ipamdns_type_internal), basic (allowed values- ipamdns_type_internal) edition.
+* `allocate_ip_in_vrf` - (Optional) If this flag is set, only allocate ip from networks in the virtual service vrf. Applicable for avi ipam only. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `aws_profile` - (Optional) Provider details if type is aws. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `azure_profile` - (Optional) Provider details if type is microsoft azure. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `custom_profile` - (Optional) Provider details if type is custom. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `gcp_profile` - (Optional) Provider details if type is google cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `infoblox_profile` - (Optional) Provider details if type is infoblox. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `internal_profile` - (Optional) Provider details if type is avi. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `oci_profile` - (Optional) Provider details for oracle cloud. Field introduced in 18.2.1,18.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `openstack_profile` - (Optional) Provider details if type is openstack. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `proxy_configuration` - (Optional) Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tencent_profile` - (Optional) Provider details for tencent cloud. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -57,5 +57,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the ipam/dns provider profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the ipam/dns provider profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_ipreputationdb.html.markdown b/website/docs/r/avi_ipreputationdb.html.markdown
index 1b16bb3dd..04f6d0b64 100644
--- a/website/docs/r/avi_ipreputationdb.html.markdown
+++ b/website/docs/r/avi_ipreputationdb.html.markdown
@@ -27,16 +27,19 @@ resource "avi_ipreputationdb" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Ip reputation db name. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vendor` - (Required) Organization providing ip reputation data. Enum options - IP_REPUTATION_VENDOR_WEBROOT. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `base_file_refs` - (Optional) Ip reputation db base file. It is a reference to an object of type fileobject. Field introduced in 20.1.1. Maximum of 1 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Description. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `incremental_file_refs` - (Optional) Ip reputation db incremental update files. It is a reference to an object of type fileobject. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `service_status` - (Optional) If this object is managed by the ip reputation service, this field contain the status of this syncronization. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `version` - (Optional) A version number for this database object. This is informal for the consumer of this api only, a tool which manages this object can store version information here. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Ip reputation db name. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vendor` - (Required) Organization providing ip reputation data. Enum options - IP_REPUTATION_VENDOR_WEBROOT. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `base_file_refs` - (Optional) Ip reputation db base file. It is a reference to an object of type fileobject. Field introduced in 20.1.1. Maximum of 1 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `base_file_v6_refs` - (Optional) Ip reputation db base file for ipv6. It is a reference to an object of type fileobject. Field introduced in 31.1.1. Maximum of 1 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Description. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `incremental_file_refs` - (Optional) Ip reputation db incremental update files. It is a reference to an object of type fileobject. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `incremental_file_v6_refs` - (Optional) Ip reputation db incremental update files for ipv6. It is a reference to an object of type fileobject. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_status` - (Optional) If this object is managed by the ip reputation service, this field contain the status of this syncronization. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `v6_version` - (Optional) A version number for ipv6 files for the object. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `version` - (Optional) A version number for this database object. This is informal for the consumer of this api only, a tool which manages this object can store version information here. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -51,5 +54,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of this object. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of this object. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_jwtserverprofile.html.markdown b/website/docs/r/avi_jwtserverprofile.html.markdown
index f3c998f39..be3662e6b 100644
--- a/website/docs/r/avi_jwtserverprofile.html.markdown
+++ b/website/docs/r/avi_jwtserverprofile.html.markdown
@@ -27,14 +27,14 @@ resource "avi_jwtserverprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the jwt profile. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `controller_internal_auth` - (Optional) Jwt auth configuration for profile_type controller_internal_auth. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `is_federated` - (Optional) This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster. If the field is set to true, then the object is replicated across the federation. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `issuer` - (Optional) Uniquely identifiable name of the token issuer, only allowed with profile_type client_auth. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `jwks_keys` - (Optional) Jwks key set used for validating the jwt, only allowed with profile_type client_auth. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `jwt_profile_type` - (Optional) Type of jwt server profile which defines the usage type. Enum options - CLIENT_AUTH, CONTROLLER_INTERNAL_AUTH. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) Name of the jwt profile. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_internal_auth` - (Optional) Jwt auth configuration for profile_type controller_internal_auth. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_federated` - (Optional) This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster. If the field is set to true, then the object is replicated across the federation. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `issuer` - (Optional) Uniquely identifiable name of the token issuer, only allowed with profile_type client_auth. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `jwks_keys` - (Optional) Jwks key set used for validating the jwt, only allowed with profile_type client_auth. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `jwt_profile_type` - (Optional) Type of jwt server profile which defines the usage type. Enum options - CLIENT_AUTH, CONTROLLER_INTERNAL_AUTH. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -49,5 +49,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the jwtprofile. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Uuid of the jwtprofile. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_l4policyset.html.markdown b/website/docs/r/avi_l4policyset.html.markdown
index e8b0f22b8..85c8c50ae 100644
--- a/website/docs/r/avi_l4policyset.html.markdown
+++ b/website/docs/r/avi_l4policyset.html.markdown
@@ -27,14 +27,14 @@ resource "avi_l4policyset" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the l4 policy set. Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `created_by` - (Optional) Creator name. Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - (Optional) Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_internal_policy` - (Optional) Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `l4_connection_policy` - (Optional) Policy to apply when a new transport connection is setup. Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the l4 policy set. Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - (Optional) Creator name. Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_internal_policy` - (Optional) Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `l4_connection_policy` - (Optional) Policy to apply when a new transport connection is setup. Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -49,5 +49,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Id of the l4 policy set. Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Id of the l4 policy set. Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_labelgroup.html.markdown b/website/docs/r/avi_labelgroup.html.markdown
index f11a8ffbb..2849c731e 100644
--- a/website/docs/r/avi_labelgroup.html.markdown
+++ b/website/docs/r/avi_labelgroup.html.markdown
@@ -27,9 +27,9 @@ resource "avi_labelgroup" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the label group. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `labels` - (Optional) List of allowed or suggested labels for the label group. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) Name of the label group. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `labels` - (Optional) List of allowed or suggested labels for the label group. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -44,5 +44,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the label group. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Uuid of the label group. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_licenseledgerdetails.html.markdown b/website/docs/r/avi_licenseledgerdetails.html.markdown
index 9860dd6f8..afd43f06a 100644
--- a/website/docs/r/avi_licenseledgerdetails.html.markdown
+++ b/website/docs/r/avi_licenseledgerdetails.html.markdown
@@ -27,9 +27,9 @@ resource "avi_licenseledgerdetails" "foo" {
 
 The following arguments are supported:
 
-* `escrow_infos` - (Optional) Maintain information about reservation against cookie. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_infos` - (Optional) Maintain information about consumed licenses against se_uuid. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tier_usages` - (Optional) License usage per tier. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `escrow_infos` - (Optional) Maintain information about reservation against cookie. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_infos` - (Optional) Maintain information about consumed licenses against se_uuid. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tier_usages` - (Optional) License usage per tier. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -44,5 +44,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid for reference. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid for reference. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_licensestatus.html.markdown b/website/docs/r/avi_licensestatus.html.markdown
index 8e6900fe1..28da92cdc 100644
--- a/website/docs/r/avi_licensestatus.html.markdown
+++ b/website/docs/r/avi_licensestatus.html.markdown
@@ -27,11 +27,10 @@ resource "avi_licensestatus" "foo" {
 
 The following arguments are supported:
 
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `essentials_enforced_at` - (Optional) License enforcement date when we upgrade controller to 31.1.1 and license tier is essential before upgrade. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `saas_status` - (Optional) Saas licensing status. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `service_update` - (Optional) Pulse license service update. Field introduced in 21.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_uuid` - (Optional) Tenant uuid. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `saas_status` - (Optional) Saas licensing status. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `service_update` - (Optional) Pulse license service update. Field introduced in 21.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_uuid` - (Optional) Tenant uuid. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -46,5 +45,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Uuid. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_localworkerfdsversion.html.markdown b/website/docs/r/avi_localworkerfdsversion.html.markdown
new file mode 100644
index 000000000..5f3fdc954
--- /dev/null
+++ b/website/docs/r/avi_localworkerfdsversion.html.markdown
@@ -0,0 +1,49 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "Avi: avi_localworkerfdsversion"
+sidebar_current: "docs-avi-resource-localworkerfdsversion"
+description: |-
+  Creates and manages Avi LocalWorkerFdsVersion.
+---
+
+# avi_localworkerfdsversion
+
+The LocalWorkerFdsVersion resource allows the creation and management of Avi LocalWorkerFdsVersion
+
+## Example Usage
+
+```hcl
+resource "avi_localworkerfdsversion" "foo" {
+    name = "terraform-example-foo"
+    tenant_ref = "/api/tenant/?name=admin"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `name` - (Optional) Default glw fds version name. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `timeline` - (Optional) Fds timeline maintained by glw. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `version` - (Optional) Fds version maintained by glw. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
+
+### Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:
+
+* `create` - (Defaults to 40 mins) Used when creating the AMI
+* `update` - (Defaults to 40 mins) Used when updating the AMI
+* `delete` - (Defaults to 90 mins) Used when deregistering the AMI
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `uuid` -  Default glw fds version uuid. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/r/avi_memorybalancerrequest.html.markdown b/website/docs/r/avi_memorybalancerrequest.html.markdown
index 9e4a4b5ba..554279f97 100644
--- a/website/docs/r/avi_memorybalancerrequest.html.markdown
+++ b/website/docs/r/avi_memorybalancerrequest.html.markdown
@@ -27,14 +27,14 @@ resource "avi_memorybalancerrequest" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of controller process. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `controller_info` - (Optional) Current details regarding controller. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `node_uuid` - (Optional) Uuid of node. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `process_info` - (Optional) Current process information of the controller process. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `process_instance` - (Optional) Instance of the controller process. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Uuid of tenant object. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `timestamp` - (Optional) Time at which memory balancer request was created/updated. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) Name of controller process. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_info` - (Optional) Current details regarding controller. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `node_uuid` - (Optional) Uuid of node. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `process_info` - (Optional) Current process information of the controller process. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `process_instance` - (Optional) Instance of the controller process. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Uuid of tenant object. It is a reference to an object of type tenant. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `timestamp` - (Optional) Time at which memory balancer request was created/updated. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -49,5 +49,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of memory balancer request object. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Uuid of memory balancer request object. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_microservicegroup.html.markdown b/website/docs/r/avi_microservicegroup.html.markdown
index 459f3d20b..48e24f9da 100644
--- a/website/docs/r/avi_microservicegroup.html.markdown
+++ b/website/docs/r/avi_microservicegroup.html.markdown
@@ -27,12 +27,12 @@ resource "avi_microservicegroup" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the microservice group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `created_by` - (Optional) Creator name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `service_refs` - (Optional) Configure microservice(es). It is a reference to an object of type microservice. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the microservice group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - (Optional) Creator name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_refs` - (Optional) Configure microservice(es). It is a reference to an object of type microservice. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -47,5 +47,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the microservice group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the microservice group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_natpolicy.html.markdown b/website/docs/r/avi_natpolicy.html.markdown
index f62795b52..5b6f4af06 100644
--- a/website/docs/r/avi_natpolicy.html.markdown
+++ b/website/docs/r/avi_natpolicy.html.markdown
@@ -27,13 +27,13 @@ resource "avi_natpolicy" "foo" {
 
 The following arguments are supported:
 
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `created_by` - (Optional) Creator name. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - (Optional) Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - (Optional) Name of the nat policy. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `rules` - (Optional) Nat policy rules. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - (Optional) Creator name. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Optional) Name of the nat policy. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rules` - (Optional) Nat policy rules. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -48,5 +48,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the nat policy. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the nat policy. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_network.html.markdown b/website/docs/r/avi_network.html.markdown
index 02532fc2a..141f2c4a9 100644
--- a/website/docs/r/avi_network.html.markdown
+++ b/website/docs/r/avi_network.html.markdown
@@ -27,20 +27,20 @@ resource "avi_network" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `attrs` - (Optional) Key/value network attributes. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `configured_subnets` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dhcp_enabled` - (Optional) Select the ip address management scheme for this network. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `exclude_discovered_subnets` - (Optional) When selected, excludes all discovered subnets in this network from consideration for virtual service placement. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ip6_autocfg_enabled` - (Optional) Enable ipv6 auto configuration. Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `synced_from_se` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_dvs` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vimgrnw_ref` - (Optional) It is a reference to an object of type vimgrnwruntime. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `vrf_context_ref` - (Optional) It is a reference to an object of type vrfcontext. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `attrs` - (Optional) Key/value network attributes. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configured_subnets` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dhcp_enabled` - (Optional) Select the ip address management scheme for this network. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `exclude_discovered_subnets` - (Optional) When selected, excludes all discovered subnets in this network from consideration for virtual service placement. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ip6_autocfg_enabled` - (Optional) Enable ipv6 auto configuration. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `synced_from_se` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_dvs` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vimgrnw_ref` - (Optional) It is a reference to an object of type vimgrnwruntime. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vrf_context_ref` - (Optional) It is a reference to an object of type vrfcontext. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -55,5 +55,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_networkprofile.html.markdown b/website/docs/r/avi_networkprofile.html.markdown
index 0c96ee323..3944442f3 100644
--- a/website/docs/r/avi_networkprofile.html.markdown
+++ b/website/docs/r/avi_networkprofile.html.markdown
@@ -27,13 +27,13 @@ resource "avi_networkprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) The name of the network profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `profile` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `connection_mirror` - (Optional) When enabled, avi mirrors all tcp fastpath connections to standby. Applicable only in legacy ha mode. Field introduced in 18.1.3,18.2.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic, enterprise with cloud services edition.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) The name of the network profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `profile` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `connection_mirror` - (Optional) When enabled, avi mirrors all tcp fastpath connections to standby. Applicable only in legacy ha mode. Field introduced in 18.1.3,18.2.1. Allowed with any value in enterprise, basic, enterprise with cloud services edition. Allowed in essentials (allowed values- false) edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -48,5 +48,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the network profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the network profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_networksecuritypolicy.html.markdown b/website/docs/r/avi_networksecuritypolicy.html.markdown
index 130976234..329716a8d 100644
--- a/website/docs/r/avi_networksecuritypolicy.html.markdown
+++ b/website/docs/r/avi_networksecuritypolicy.html.markdown
@@ -27,17 +27,17 @@ resource "avi_networksecuritypolicy" "foo" {
 
 The following arguments are supported:
 
-* `cloud_config_cksum` - (Optional) Checksum of cloud configuration for network sec policy. Internally set by cloud connector. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `created_by` - (Optional) Creator name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `geo_db_ref` - (Optional) Geo database. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `internal` - (Optional) Network security policy is created and modified by internal modules only. Should not be modified by users. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ip_reputation_db_ref` - (Optional) Ip reputation database. It is a reference to an object of type ipreputationdb. Field introduced in 20.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `name` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `rules` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `cloud_config_cksum` - (Optional) Checksum of cloud configuration for network sec policy. Internally set by cloud connector. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - (Optional) Creator name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `geo_db_ref` - (Optional) Geo database. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `internal` - (Optional) Network security policy is created and modified by internal modules only. Should not be modified by users. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ip_reputation_db_ref` - (Optional) Ip reputation database. It is a reference to an object of type ipreputationdb. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rules` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -52,5 +52,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_networkservice.html.markdown b/website/docs/r/avi_networkservice.html.markdown
index f2ab8d6af..0b000dfdc 100644
--- a/website/docs/r/avi_networkservice.html.markdown
+++ b/website/docs/r/avi_networkservice.html.markdown
@@ -27,15 +27,15 @@ resource "avi_networkservice" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the networkservice. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_group_ref` - (Required) Service engine group to which the service is applied. It is a reference to an object of type serviceenginegroup. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `service_type` - (Required) Indicates the type of networkservice. Enum options - ROUTING_SERVICE. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vrf_ref` - (Required) Vrf context to which the service is scoped. It is a reference to an object of type vrfcontext. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `routing_service` - (Optional) Routing information of the networkservice. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the networkservice. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_group_ref` - (Required) Service engine group to which the service is applied. It is a reference to an object of type serviceenginegroup. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_type` - (Required) Indicates the type of networkservice. Enum options - ROUTING_SERVICE. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vrf_ref` - (Required) Vrf context to which the service is scoped. It is a reference to an object of type vrfcontext. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `routing_service` - (Optional) Routing information of the networkservice. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -50,5 +50,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the networkservice. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the networkservice. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_nsxtsegmentruntime.html.markdown b/website/docs/r/avi_nsxtsegmentruntime.html.markdown
index 98c1893a8..50921a011 100644
--- a/website/docs/r/avi_nsxtsegmentruntime.html.markdown
+++ b/website/docs/r/avi_nsxtsegmentruntime.html.markdown
@@ -27,26 +27,26 @@ resource "avi_nsxtsegmentruntime" "foo" {
 
 The following arguments are supported:
 
-* `cloud_ref` - (Optional) Nsxt segment belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dhcp6_ranges` - (Optional) V6 dhcp ranges configured in nsxt. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dhcp_enabled` - (Optional) Ip address management scheme for this segment associated network. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dhcp_ranges` - (Optional) Dhcp ranges configured in nsxt. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Optional) Segment object name. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nw_name` - (Optional) Network name. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nw_ref` - (Optional) Corresponding network object in avi. It is a reference to an object of type network. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `opaque_network_id` - (Optional) Opaque network id. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `origin_id` - (Optional) Origin id applicable to security only cloud. Field introduced in 22.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `security_only_nsxt` - (Optional) Nsxt segment belongs to security only cloud. Field introduced in 22.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `segment_gw` - (Optional) Segment gateway. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `segment_gw6` - (Optional) V6 segment gateway. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `segment_id` - (Optional) Segment id. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `segname` - (Optional) Segment name. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `subnet` - (Optional) Segment cidr. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `subnet6` - (Optional) V6 segment cidr. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Nsxt segment belongs to tenant. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tier1_id` - (Optional) Tier1 router id. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vlan_ids` - (Optional) Segment vlan ids. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vrf_context_ref` - (Optional) Corresponding vrf context object in avi. It is a reference to an object of type vrfcontext. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) Nsxt segment belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dhcp6_ranges` - (Optional) V6 dhcp ranges configured in nsxt. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dhcp_enabled` - (Optional) Ip address management scheme for this segment associated network. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dhcp_ranges` - (Optional) Dhcp ranges configured in nsxt. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Optional) Segment object name. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nw_name` - (Optional) Network name. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nw_ref` - (Optional) Corresponding network object in avi. It is a reference to an object of type network. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `opaque_network_id` - (Optional) Opaque network id. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `origin_id` - (Optional) Origin id applicable to security only cloud. Field introduced in 22.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `security_only_nsxt` - (Optional) Nsxt segment belongs to security only cloud. Field introduced in 22.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `segment_gw` - (Optional) Segment gateway. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `segment_gw6` - (Optional) V6 segment gateway. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `segment_id` - (Optional) Segment id. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `segname` - (Optional) Segment name. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `subnet` - (Optional) Segment cidr. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `subnet6` - (Optional) V6 segment cidr. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Nsxt segment belongs to tenant. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tier1_id` - (Optional) Tier1 router id. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vlan_ids` - (Optional) Segment vlan ids. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vrf_context_ref` - (Optional) Corresponding vrf context object in avi. It is a reference to an object of type vrfcontext. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -61,5 +61,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_pkiprofile.html.markdown b/website/docs/r/avi_pkiprofile.html.markdown
index 2ce046f05..434680c90 100644
--- a/website/docs/r/avi_pkiprofile.html.markdown
+++ b/website/docs/r/avi_pkiprofile.html.markdown
@@ -27,18 +27,18 @@ resource "avi_pkiprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the pki profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `allow_pki_errors` - (Optional) Exempt errors during certificate verification. Enum options - ALLOW_EXPIRED_CRL, ALLOW_ALL_ERRORS. Field introduced in 30.1.1. Maximum of 1 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ca_certs` - (Optional) List of certificate authorities (root and intermediate) trusted that is used for certificate validation. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `created_by` - (Optional) Creator name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `crl_check` - (Optional) When enabled, avi will verify via crl checks that certificates in the trust chain have not been revoked. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `crl_file_refs` - (Optional) Refers to fileobject containing crl body. It is a reference to an object of type fileobject. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ignore_peer_chain` - (Optional) When enabled, avi will not trust intermediate and root certs presented by a client. Instead, only the chain certs configured in the certificate authority section will be used to verify trust of the client's cert. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition. Special default for essentials edition is true, basic edition is true, enterprise is false.
-* `is_federated` - (Optional) This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `validate_only_leaf_crl` - (Optional) When enabled, avi will only validate the revocation status of the leaf certificate using crl. To enable validation for the entire chain, disable this option and provide all the relevant crls. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
+* `name` - (Required) Name of the pki profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allow_pki_errors` - (Optional) Exempt errors during certificate verification. Enum options - ALLOW_EXPIRED_CRL, ALLOW_ALL_ERRORS. Field introduced in 30.1.1. Maximum of 1 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ca_certs` - (Optional) List of certificate authorities (root and intermediate) trusted that is used for certificate validation. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - (Optional) Creator name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `crl_check` - (Optional) When enabled, avi will verify via crl checks that certificates in the trust chain have not been revoked. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `crl_file_refs` - (Optional) Refers to fileobject containing crl body. It is a reference to an object of type fileobject. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ignore_peer_chain` - (Optional) When enabled, avi will not trust intermediate and root certs presented by a client. Instead, only the chain certs configured in the certificate authority section will be used to verify trust of the client's cert. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition. Special default for essentials edition is true, basic edition is true, enterprise edition is false.
+* `is_federated` - (Optional) This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `validate_only_leaf_crl` - (Optional) When enabled, avi will only validate the revocation status of the leaf certificate using crl. To enable validation for the entire chain, disable this option and provide all the relevant crls. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
 
 
 ### Timeouts
@@ -53,5 +53,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_pool.html.markdown b/website/docs/r/avi_pool.html.markdown
index a28ae332f..1c1b817f2 100644
--- a/website/docs/r/avi_pool.html.markdown
+++ b/website/docs/r/avi_pool.html.markdown
@@ -27,79 +27,80 @@ resource "avi_pool" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) The name of the pool. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `analytics_policy` - (Optional) Determines analytics settings for the pool. Field introduced in 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `analytics_profile_ref` - (Optional) Specifies settings related to analytics. It is a reference to an object of type analyticsprofile. Field introduced in 18.1.4,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `append_port` - (Optional) Allows the option to append port to hostname in the host header while sending a request to the server. By default, port is appended for non-default ports. This setting will apply for pool's 'rewrite host header to server name', 'rewrite host header to sni' features and server's 'rewrite host header' settings as well as http healthmonitors attached to pools. Enum options - NON_DEFAULT_80_443, NEVER, ALWAYS. Field introduced in 21.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- never), basic edition(allowed values- never), enterprise with cloud services edition. Special default for essentials edition is never, basic edition is never, enterprise is non_default_80_443.
-* `application_persistence_profile_ref` - (Optional) Persistence will ensure the same user sticks to the same server for a desired duration of time. It is a reference to an object of type applicationpersistenceprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `autoscale_launch_config_ref` - (Optional) If configured then avi will trigger orchestration of pool server creation and deletion. It is a reference to an object of type autoscalelaunchconfig. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `autoscale_networks` - (Optional) Network ids for the launch configuration. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `autoscale_policy_ref` - (Optional) Reference to server autoscale policy. It is a reference to an object of type serverautoscalepolicy. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `capacity_estimation` - (Optional) Inline estimation of capacity of servers. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `capacity_estimation_ttfb_thresh` - (Optional) The maximum time-to-first-byte of a server. Allowed values are 1-5000. Special values are 0 - automatic. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `cloud_config_cksum` - (Optional) Checksum of cloud configuration for pool. Internally set by cloud connector. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `conn_pool_properties` - (Optional) Connnection pool properties. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `connection_ramp_duration` - (Optional) Duration for which new connections will be gradually ramped up to a server recently brought online. Useful for lb algorithms that are least connection based. Allowed values are 1-300. Special values are 0 - immediate. Unit is min. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition. Special default for essentials edition is 0, basic edition is 0, enterprise is 10.
-* `created_by` - (Optional) Creator name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `default_server_port` - (Optional) Traffic sent to servers will use this destination server port unless overridden by the server's specific port attribute. The ssl checkbox enables avi to server encryption. Allowed values are 1-65535. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `delete_server_on_dns_refresh` - (Optional) Indicates whether existing ips are disabled(false) or deleted(true) on dns hostname refreshdetail -- on a dns refresh, some ips set on pool may no longer be returned by the resolver. These ips are deleted from the pool when this knob is set to true. They are disabled, if the knob is set to false. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `description` - (Optional) A description of the pool. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `domain_name` - (Optional) Comma separated list of domain names which will be used to verify the common names or subject alternative names presented by server certificates. It is performed only when common name check host_check_enabled is enabled. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `east_west` - (Optional) Inherited config from virtualservice. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_http2` - (Optional) Enable http/2 for traffic from virtualservice to all backend servers in this pool. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `enabled` - (Optional) Enable or disable the pool. Disabling will terminate all open connections and pause health monitors. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `external_autoscale_groups` - (Optional) Names of external auto-scale groups for pool servers. Currently available only for aws and azure. Field introduced in 17.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fail_action` - (Optional) Enable an action - close connection, http redirect or local http response - when a pool failure happens. By default, a connection will be closed, in case the pool experiences a failure. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fewest_tasks_feedback_delay` - (Optional) Periodicity of feedback for fewest tasks server selection algorithm. Allowed values are 1-300. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `graceful_disable_timeout` - (Optional) Used to gracefully disable a server. Virtual service waits for the specified time before terminating the existing connections  to the servers that are disabled. Allowed values are 1-7200. Special values are 0 - immediate, -1 - infinite. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `graceful_hm_down_disable_timeout` - (Optional) Time interval for gracefully closing the connections on server, when health monitoring marks the server down. Allowed values are 1-432000. Special values are 0 - immediate, -1 - infinite. Field introduced in 30.2.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gslb_sp_enabled` - (Optional) Indicates if the pool is a site-persistence pool. Field introduced in 17.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `health_monitor_refs` - (Optional) Verify server health by applying one or more health monitors. Active monitors generate synthetic traffic from each service engine and mark a server up or down based on the response. The passive monitor listens only to client to server communication. It raises or lowers the ratio of traffic destined to a server based on successful responses. It is a reference to an object of type healthmonitor. Maximum of 50 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `horizon_profile` - (Optional) Horizon uag configuration. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `host_check_enabled` - (Optional) Enable common name check for server certificate. If enabled and no explicit domain name is specified, avi will use the incoming host header to do the match. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `http2_properties` - (Optional) Http2 pool properties. 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.
-* `ignore_server_port` - (Optional) Ignore the server port in building the load balancing state.applicable only for consistent hash load balancing algorithm or disable port translation (use_service_port) use cases. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `inline_health_monitor` - (Optional) The passive monitor will monitor client to server connections and requests and adjust traffic load to servers based on successful responses. This may alter the expected behavior of the lb method, such as round robin. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ipaddrgroup_ref` - (Optional) Use list of servers from ip address group. It is a reference to an object of type ipaddrgroup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `lb_algo_rr_per_se` - (Optional) Do round robin load load balancing at se level instead of the default per core load balancing. Field introduced in 21.1.5, 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `lb_algorithm` - (Optional) The load balancing algorithm will pick a server within the pool's list of available servers. Values lb_algorithm_nearest_server and lb_algorithm_topology are only allowed for gslb pool. Enum options - LB_ALGORITHM_LEAST_CONNECTIONS, LB_ALGORITHM_ROUND_ROBIN, LB_ALGORITHM_FASTEST_RESPONSE, LB_ALGORITHM_CONSISTENT_HASH, LB_ALGORITHM_LEAST_LOAD, LB_ALGORITHM_FEWEST_SERVERS, LB_ALGORITHM_RANDOM, LB_ALGORITHM_FEWEST_TASKS, LB_ALGORITHM_NEAREST_SERVER, LB_ALGORITHM_CORE_AFFINITY, LB_ALGORITHM_TOPOLOGY. Allowed in enterprise edition with any value, essentials edition(allowed values- lb_algorithm_least_connections,lb_algorithm_round_robin,lb_algorithm_consistent_hash), basic edition(allowed values- lb_algorithm_least_connections,lb_algorithm_round_robin,lb_algorithm_consistent_hash), enterprise with cloud services edition.
-* `lb_algorithm_consistent_hash_hdr` - (Optional) Http header name to be used for the hash key. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `lb_algorithm_core_nonaffinity` - (Optional) Degree of non-affinity for core affinity based server selection. Allowed values are 1-65535. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials edition(allowed values- 2), basic edition(allowed values- 2), enterprise with cloud services edition.
-* `lb_algorithm_hash` - (Optional) Criteria used as a key for determining the hash between the client and  server. Enum options - LB_ALGORITHM_CONSISTENT_HASH_SOURCE_IP_ADDRESS, LB_ALGORITHM_CONSISTENT_HASH_SOURCE_IP_ADDRESS_AND_PORT, LB_ALGORITHM_CONSISTENT_HASH_URI, LB_ALGORITHM_CONSISTENT_HASH_CUSTOM_HEADER, LB_ALGORITHM_CONSISTENT_HASH_CUSTOM_STRING, LB_ALGORITHM_CONSISTENT_HASH_CALLID. Allowed in enterprise edition with any value, essentials edition(allowed values- lb_algorithm_consistent_hash_source_ip_address), basic edition(allowed values- lb_algorithm_consistent_hash_source_ip_address), enterprise with cloud services edition.
-* `lookup_server_by_name` - (Optional) Allow server lookup by name. Field introduced in 17.1.11,17.2.4. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `max_concurrent_connections_per_server` - (Optional) The maximum number of concurrent connections allowed to each server within the pool. Note  applied value will be no less than the number of service engines that the pool is placed on. If set to 0, no limit is applied. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_conn_rate_per_server` - (Optional) Rate limit connections to each server. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `min_health_monitors_up` - (Optional) Minimum number of health monitors in up state to mark server up. Field introduced in 18.2.1, 17.2.12. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `min_servers_up` - (Optional) Minimum number of servers in up state for marking the pool up. Field introduced in 18.2.1, 17.2.12. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `networks` - (Optional) (internal-use) networks designated as containing servers for this pool. The servers may be further narrowed down by a filter. This field is used internally by avi, not editable by the user. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nsx_securitygroup` - (Optional) A list of nsx groups where the servers for the pool are created. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pki_profile_ref` - (Optional) Avi will validate the ssl certificate present by a server against the selected pki profile. It is a reference to an object of type pkiprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `placement_networks` - (Optional) Manually select the networks and subnets used to provide reachability to the pool's servers. Specify the subnet using the following syntax  10-1-1-0/24. Use static routes in vrf configuration when pool servers are not directly connected but routable from the service engine. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pool_type` - (Optional) Type or purpose, the pool is to be used for. Enum options - POOL_TYPE_GENERIC_APP, POOL_TYPE_OAUTH. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `request_queue_depth` - (Optional) Minimum number of requests to be queued when pool is full. Allowed in enterprise edition with any value, essentials edition(allowed values- 128), basic edition(allowed values- 128), enterprise with cloud services edition.
-* `request_queue_enabled` - (Optional) Enable request queue when pool is full. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `resolve_pool_by_dns` - (Optional) This field is used as a flag to create a job for jobmanager. Field introduced in 18.2.10,20.1.2. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `rewrite_host_header_to_server_name` - (Optional) Rewrite incoming host header to server name of the server to which the request is proxied. Enabling this feature rewrites host header for requests to all servers in the pool. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `rewrite_host_header_to_sni` - (Optional) If sni server name is specified, rewrite incoming host header to the sni server name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `routing_pool` - (Optional) Enable to do routing when this pool is selected to send traffic. No servers present in routing pool. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `server_disable_type` - (Optional) Server graceful disable timeout behaviour. Enum options - DISALLOW_NEW_CONNECTION, ALLOW_NEW_CONNECTION_IF_PERSISTENCE_PRESENT. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `server_name` - (Optional) Fully qualified dns hostname which will be used in the tls sni extension in server connections if sni is enabled. If no value is specified, avi will use the incoming host header instead. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `server_reselect` - (Optional) Server reselect configuration for http requests. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `server_timeout` - (Optional) Server timeout value specifies the time within which a server connection needs to be established and a request-response exchange completes between avi and the server. Value of 0 results in using default timeout of 60 minutes. Allowed values are 0-21600000. Field introduced in 18.1.5,18.2.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `servers` - (Optional) The pool directs load balanced traffic to this list of destination servers. The servers can be configured by ip address, name, network or via ip address group. Maximum of 5000 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `service_metadata` - (Optional) Metadata pertaining to the service provided by this pool. In openshift/kubernetes environments, app metadata info is stored. Any user input to this field will be overwritten by avi vantage. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sni_enabled` - (Optional) Enable tls sni for server connections. If disabled, avi will not send the sni extension as part of the handshake. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sp_gs_info` - (Optional) Gslb service associated with the site persistence pool. 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.
-* `ssl_key_and_certificate_ref` - (Optional) Service engines will present a client ssl certificate to the server. It is a reference to an object of type sslkeyandcertificate. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssl_profile_ref` - (Optional) When enabled, avi re-encrypts traffic to the backend servers. The specific ssl profile defines which ciphers and ssl versions will be supported. It is a reference to an object of type sslprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tier1_lr` - (Optional) This tier1_lr field should be set same as virtualservice associated for nsx-t. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `use_service_port` - (Optional) Do not translate the client's destination port when sending the connection to the server. Monitor port needs to be specified for health monitors. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic, enterprise with cloud services edition.
-* `use_service_ssl_mode` - (Optional) This applies only when use_service_port is set to true. If enabled, ssl mode of the connection to the server is decided by the ssl mode on the virtualservice service port, on which the request was received. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vrf_ref` - (Optional) Virtual routing context that the pool is bound to. This is used to provide the isolation of the set of networks the pool is attached to. The pool inherits the virtual routing context of the virtual service, and this field is used only internally, and is set by pb-transform. It is a reference to an object of type vrfcontext. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) The name of the pool. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `analytics_policy` - (Optional) Determines analytics settings for the pool. Field introduced in 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `analytics_profile_ref` - (Optional) Specifies settings related to analytics. It is a reference to an object of type analyticsprofile. Field introduced in 18.1.4,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `append_port` - (Optional) Allows the option to append port to hostname in the host header while sending a request to the server. By default, port is appended for non-default ports. This setting will apply for pool's 'rewrite host header to server name', 'rewrite host header to sni' features and server's 'rewrite host header' settings as well as http healthmonitors attached to pools. Enum options - NON_DEFAULT_80_443, NEVER, ALWAYS. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- never), basic (allowed values- never) edition. Special default for essentials edition is never, basic edition is never, enterprise edition is non_default_80_443.
+* `application_persistence_profile_ref` - (Optional) Persistence will ensure the same user sticks to the same server for a desired duration of time. It is a reference to an object of type applicationpersistenceprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `autoscale_launch_config_ref` - (Optional) If configured then avi will trigger orchestration of pool server creation and deletion. It is a reference to an object of type autoscalelaunchconfig. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `autoscale_networks` - (Optional) Network ids for the launch configuration. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `autoscale_policy_ref` - (Optional) Reference to server autoscale policy. It is a reference to an object of type serverautoscalepolicy. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `capacity_estimation` - (Optional) Inline estimation of capacity of servers. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `capacity_estimation_ttfb_thresh` - (Optional) The maximum time-to-first-byte of a server. Allowed values are 1-5000. Special values are 0 - automatic. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `cloud_config_cksum` - (Optional) Checksum of cloud configuration for pool. Internally set by cloud connector. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `conn_pool_properties` - (Optional) Connnection pool properties. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `connection_ramp_duration` - (Optional) Duration for which new connections will be gradually ramped up to a server recently brought online. Useful for lb algorithms that are least connection based. Allowed values are 1-300. Special values are 0 - immediate. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition. Special default for essentials edition is 0, basic edition is 0, enterprise edition is 10.
+* `created_by` - (Optional) Creator name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `default_server_port` - (Optional) Traffic sent to servers will use this destination server port unless overridden by the server's specific port attribute. The ssl checkbox enables avi to server encryption. Allowed values are 1-65535. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `delete_server_on_dns_refresh` - (Optional) Indicates whether existing ips are disabled(false) or deleted(true) on dns hostname refreshdetail -- on a dns refresh, some ips set on pool may no longer be returned by the resolver. These ips are deleted from the pool when this knob is set to true. They are disabled, if the knob is set to false. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `description` - (Optional) A description of the pool. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `domain_name` - (Optional) Comma separated list of domain names which will be used to verify the common names or subject alternative names presented by server certificates. It is performed only when common name check host_check_enabled is enabled. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `east_west` - (Optional) Inherited config from virtualservice. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_http2` - (Optional) Enable http/2 for traffic from virtualservice to all backend servers in this pool. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `enabled` - (Optional) Enable or disable the pool. Disabling will terminate all open connections and pause health monitors. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `external_autoscale_groups` - (Optional) Names of external auto-scale groups for pool servers. Currently available only for aws and azure. Field introduced in 17.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fail_action` - (Optional) Enable an action - close connection, http redirect or local http response - when a pool failure happens. By default, a connection will be closed, in case the pool experiences a failure. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fewest_tasks_feedback_delay` - (Optional) Periodicity of feedback for fewest tasks server selection algorithm. Allowed values are 1-300. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `graceful_disable_timeout` - (Optional) Used to gracefully disable a server. Virtual service waits for the specified time before terminating the existing connections  to the servers that are disabled. Not used anymore .graceful_disable_timeout_sec is introduced. Allowed values are 1-7200. Special values are 0 - immediate, -1 - infinite. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `graceful_disable_timeout_sec` - (Optional) Used to gracefully disable a server. Virtual service waits for the specified time before terminating the existing connections  to the servers that are disabled. Allowed values are 1-432000. Special values are 0 - immediate, -1 - infinite. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `graceful_hm_down_disable_timeout` - (Optional) Time interval for gracefully closing the connections on server, when health monitoring marks the server down. Allowed values are 1-432000. Special values are 0 - immediate, -1 - infinite. Field introduced in 30.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gslb_sp_enabled` - (Optional) Indicates if the pool is a site-persistence pool. Field introduced in 17.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `health_monitor_refs` - (Optional) Verify server health by applying one or more health monitors. Active monitors generate synthetic traffic from each service engine and mark a server up or down based on the response. The passive monitor listens only to client to server communication. It raises or lowers the ratio of traffic destined to a server based on successful responses. It is a reference to an object of type healthmonitor. Maximum of 50 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `horizon_profile` - (Optional) Horizon uag configuration. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `host_check_enabled` - (Optional) Enable common name check for server certificate. If enabled and no explicit domain name is specified, avi will use the incoming host header to do the match. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `http2_properties` - (Optional) Http2 pool properties. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ignore_server_port` - (Optional) Ignore the server port in building the load balancing state.applicable only for consistent hash load balancing algorithm or disable port translation (use_service_port) use cases. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `inline_health_monitor` - (Optional) The passive monitor will monitor client to server connections and requests and adjust traffic load to servers based on successful responses. This may alter the expected behavior of the lb method, such as round robin. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ipaddrgroup_ref` - (Optional) Use list of servers from ip address group. It is a reference to an object of type ipaddrgroup. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `lb_algo_rr_per_se` - (Optional) Do load balancing at se level instead of the default per core load balancing. Field introduced in 21.1.5, 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `lb_algorithm` - (Optional) The load balancing algorithm will pick a server within the pool's list of available servers. Values lb_algorithm_nearest_server and lb_algorithm_topology are only allowed for gslb pool. Enum options - LB_ALGORITHM_LEAST_CONNECTIONS, LB_ALGORITHM_ROUND_ROBIN, LB_ALGORITHM_FASTEST_RESPONSE, LB_ALGORITHM_CONSISTENT_HASH, LB_ALGORITHM_LEAST_LOAD, LB_ALGORITHM_FEWEST_SERVERS, LB_ALGORITHM_RANDOM, LB_ALGORITHM_FEWEST_TASKS, LB_ALGORITHM_NEAREST_SERVER, LB_ALGORITHM_CORE_AFFINITY, LB_ALGORITHM_TOPOLOGY. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- lb_algorithm_least_connections,lb_algorithm_round_robin,lb_algorithm_consistent_hash), basic (allowed values- lb_algorithm_least_connections,lb_algorithm_round_robin,lb_algorithm_consistent_hash) edition.
+* `lb_algorithm_consistent_hash_hdr` - (Optional) Http header name to be used for the hash key. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `lb_algorithm_core_nonaffinity` - (Optional) Degree of non-affinity for core affinity based server selection. Allowed values are 1-65535. Field introduced in 17.1.3. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 2), basic (allowed values- 2) edition.
+* `lb_algorithm_hash` - (Optional) Criteria used as a key for determining the hash between the client and  server. Enum options - LB_ALGORITHM_CONSISTENT_HASH_SOURCE_IP_ADDRESS, LB_ALGORITHM_CONSISTENT_HASH_SOURCE_IP_ADDRESS_AND_PORT, LB_ALGORITHM_CONSISTENT_HASH_URI, LB_ALGORITHM_CONSISTENT_HASH_CUSTOM_HEADER, LB_ALGORITHM_CONSISTENT_HASH_CUSTOM_STRING, LB_ALGORITHM_CONSISTENT_HASH_CALLID. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- lb_algorithm_consistent_hash_source_ip_address), basic (allowed values- lb_algorithm_consistent_hash_source_ip_address) edition.
+* `lookup_server_by_name` - (Optional) Allow server lookup by name. Field introduced in 17.1.11,17.2.4. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_concurrent_connections_per_server` - (Optional) The maximum number of concurrent connections allowed to each server within the pool. Note  applied value will be no less than the number of service engines that the pool is placed on. If set to 0, no limit is applied. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_conn_rate_per_server` - (Optional) Rate limit connections to each server. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `min_health_monitors_up` - (Optional) Minimum number of health monitors in up state to mark server up. Field introduced in 18.2.1, 17.2.12. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `min_servers_up` - (Optional) Minimum number of servers in up state for marking the pool up. Field introduced in 18.2.1, 17.2.12. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `networks` - (Optional) (internal-use) networks designated as containing servers for this pool. The servers may be further narrowed down by a filter. This field is used internally by avi, not editable by the user. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nsx_securitygroup` - (Optional) A list of nsx groups where the servers for the pool are created. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pki_profile_ref` - (Optional) Avi will validate the ssl certificate present by a server against the selected pki profile. It is a reference to an object of type pkiprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `placement_networks` - (Optional) Manually select the networks and subnets used to provide reachability to the pool's servers. Specify the subnet using the following syntax  10-1-1-0/24. Use static routes in vrf configuration when pool servers are not directly connected but routable from the service engine. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pool_type` - (Optional) Type or purpose, the pool is to be used for. Enum options - POOL_TYPE_GENERIC_APP, POOL_TYPE_OAUTH. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `request_queue_depth` - (Optional) Minimum number of requests to be queued when pool is full. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 128), basic (allowed values- 128) edition.
+* `request_queue_enabled` - (Optional) Enable request queue when pool is full. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `resolve_pool_by_dns` - (Optional) This field is used as a flag to create a job for jobmanager. Field introduced in 18.2.10,20.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rewrite_host_header_to_server_name` - (Optional) Rewrite incoming host header to server name of the server to which the request is proxied. Enabling this feature rewrites host header for requests to all servers in the pool. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rewrite_host_header_to_sni` - (Optional) If sni server name is specified, rewrite incoming host header to the sni server name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `routing_pool` - (Optional) Enable to do routing when this pool is selected to send traffic. No servers present in routing pool. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `server_disable_type` - (Optional) Server graceful disable timeout behaviour. Enum options - DISALLOW_NEW_CONNECTION, ALLOW_NEW_CONNECTION_IF_PERSISTENCE_PRESENT. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `server_name` - (Optional) Fully qualified dns hostname which will be used in the tls sni extension in server connections if sni is enabled. If no value is specified, avi will use the incoming host header instead. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `server_reselect` - (Optional) Server reselect configuration for http requests. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `server_timeout` - (Optional) Server timeout value specifies the time within which a server connection needs to be established and a request-response exchange completes between avi and the server. Value of 0 results in using default timeout of 60 minutes. Allowed values are 0-21600000. Field introduced in 18.1.5,18.2.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `servers` - (Optional) The pool directs load balanced traffic to this list of destination servers. The servers can be configured by ip address, name, network or via ip address group. Maximum of 5000 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_metadata` - (Optional) Metadata pertaining to the service provided by this pool. In openshift/kubernetes environments, app metadata info is stored. Any user input to this field will be overwritten by avi vantage. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sni_enabled` - (Optional) Enable tls sni for server connections. If disabled, avi will not send the sni extension as part of the handshake. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sp_gs_info` - (Optional) Gslb service associated with the site persistence pool. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_key_and_certificate_ref` - (Optional) Service engines will present a client ssl certificate to the server. It is a reference to an object of type sslkeyandcertificate. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_profile_ref` - (Optional) When enabled, avi re-encrypts traffic to the backend servers. The specific ssl profile defines which ciphers and ssl versions will be supported. It is a reference to an object of type sslprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tier1_lr` - (Optional) This tier1_lr field should be set same as virtualservice associated for nsx-t. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_service_port` - (Optional) Do not translate the client's destination port when sending the connection to the server. Monitor port needs to be specified for health monitors. Allowed with any value in enterprise, basic, enterprise with cloud services edition. Allowed in essentials (allowed values- false) edition.
+* `use_service_ssl_mode` - (Optional) This applies only when use_service_port is set to true. If enabled, ssl mode of the connection to the server is decided by the ssl mode on the virtualservice service port, on which the request was received. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vrf_ref` - (Optional) Virtual routing context that the pool is bound to. This is used to provide the isolation of the set of networks the pool is attached to. The pool inherits the virtual routing context of the virtual service, and this field is used only internally, and is set by pb-transform. It is a reference to an object of type vrfcontext. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -114,5 +115,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the pool. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the pool. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_poolgroup.html.markdown b/website/docs/r/avi_poolgroup.html.markdown
index 8eb59c1d5..e24631ff8 100644
--- a/website/docs/r/avi_poolgroup.html.markdown
+++ b/website/docs/r/avi_poolgroup.html.markdown
@@ -27,22 +27,22 @@ resource "avi_poolgroup" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) The name of the pool group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_config_cksum` - (Optional) Checksum of cloud configuration for poolgroup. Internally set by cloud connector. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `created_by` - (Optional) Name of the user who created the object. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `deactivate_primary_pool_on_down` - (Optional) Deactivate primary pool for selection when down until it is activated by user via clear poolgroup command. Field introduced in 20.1.7, 21.1.2, 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `deployment_policy_ref` - (Optional) When setup autoscale manager will automatically promote new pools into production when deployment goals are met. It is a reference to an object of type poolgroupdeploymentpolicy. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - (Optional) Description of pool group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fail_action` - (Optional) Enable an action - close connection, http redirect, or local http response - when a pool group failure happens. By default, a connection will be closed, in case the pool group experiences a failure. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `implicit_priority_labels` - (Optional) Whether an implicit set of priority labels is generated. Field introduced in 17.1.9,17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `members` - (Optional) List of pool group members object of type poolgroupmember. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `min_servers` - (Optional) The minimum number of servers to distribute traffic to. Allowed values are 1-65535. Special values are 0 - disable. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `priority_labels_ref` - (Optional) Uuid of the priority labels. If not provided, pool group member priority label will be interpreted as a number with a larger number considered higher priority. It is a reference to an object of type prioritylabels. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `service_metadata` - (Optional) Metadata pertaining to the service provided by this poolgroup. In openshift/kubernetes environments, app metadata info is stored. Any user input to this field will be overwritten by avi vantage. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) The name of the pool group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_config_cksum` - (Optional) Checksum of cloud configuration for poolgroup. Internally set by cloud connector. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - (Optional) Name of the user who created the object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `deactivate_primary_pool_on_down` - (Optional) Deactivate primary pool for selection when down until it is activated by user via clear poolgroup command. Field introduced in 20.1.7, 21.1.2, 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `deployment_policy_ref` - (Optional) When setup autoscale manager will automatically promote new pools into production when deployment goals are met. It is a reference to an object of type poolgroupdeploymentpolicy. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - (Optional) Description of pool group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fail_action` - (Optional) Enable an action - close connection, http redirect, or local http response - when a pool group failure happens. By default, a connection will be closed, in case the pool group experiences a failure. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `implicit_priority_labels` - (Optional) Whether an implicit set of priority labels is generated. Field introduced in 17.1.9,17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `members` - (Optional) List of pool group members object of type poolgroupmember. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `min_servers` - (Optional) The minimum number of servers to distribute traffic to. Allowed values are 1-65535. Special values are 0 - disable. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `priority_labels_ref` - (Optional) Uuid of the priority labels. If not provided, pool group member priority label will be interpreted as a number with a larger number considered higher priority. It is a reference to an object of type prioritylabels. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `service_metadata` - (Optional) Metadata pertaining to the service provided by this poolgroup. In openshift/kubernetes environments, app metadata info is stored. Any user input to this field will be overwritten by avi vantage. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -57,5 +57,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the pool group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the pool group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_poolgroupdeploymentpolicy.html.markdown b/website/docs/r/avi_poolgroupdeploymentpolicy.html.markdown
index efb653cab..b69a5f895 100644
--- a/website/docs/r/avi_poolgroupdeploymentpolicy.html.markdown
+++ b/website/docs/r/avi_poolgroupdeploymentpolicy.html.markdown
@@ -27,18 +27,18 @@ resource "avi_poolgroupdeploymentpolicy" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) The name of the pool group deployment policy. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `auto_disable_old_prod_pools` - (Optional) It will automatically disable old production pools once there is a new production candidate. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `evaluation_duration` - (Optional) Duration of evaluation period for automatic deployment. Allowed values are 60-86400. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `rules` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scheme` - (Optional) Deployment scheme. Enum options - BLUE_GREEN, CANARY. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `target_test_traffic_ratio` - (Optional) Target traffic ratio before pool is made production. Allowed values are 1-100. Unit is ratio. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `test_traffic_ratio_rampup` - (Optional) Ratio of the traffic that is sent to the pool under test. Test ratio of 100 means blue green. Allowed values are 1-100. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `webhook_ref` - (Optional) Webhook configured with url that avi controller will pass back information about pool group, old and new pool information and current deployment rule results. It is a reference to an object of type webhook. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) The name of the pool group deployment policy. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_disable_old_prod_pools` - (Optional) It will automatically disable old production pools once there is a new production candidate. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `evaluation_duration` - (Optional) Duration of evaluation period for automatic deployment. Allowed values are 60-86400. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rules` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scheme` - (Optional) Deployment scheme. Enum options - BLUE_GREEN, CANARY. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `target_test_traffic_ratio` - (Optional) Target traffic ratio before pool is made production. Allowed values are 1-100. Unit is ratio. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `test_traffic_ratio_rampup` - (Optional) Ratio of the traffic that is sent to the pool under test. Test ratio of 100 means blue green. Allowed values are 1-100. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `webhook_ref` - (Optional) Webhook configured with url that avi controller will pass back information about pool group, old and new pool information and current deployment rule results. It is a reference to an object of type webhook. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -53,5 +53,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the pool group deployment policy. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the pool group deployment policy. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_prioritylabels.html.markdown b/website/docs/r/avi_prioritylabels.html.markdown
index 77220094e..7e85677d6 100644
--- a/website/docs/r/avi_prioritylabels.html.markdown
+++ b/website/docs/r/avi_prioritylabels.html.markdown
@@ -27,13 +27,13 @@ resource "avi_prioritylabels" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) The name of the priority labels. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) A description of the priority labels. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `equivalent_labels` - (Optional) Equivalent priority labels in descending order. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) The name of the priority labels. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) A description of the priority labels. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `equivalent_labels` - (Optional) Equivalent priority labels in descending order. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -48,5 +48,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the priority labels. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the priority labels. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_protocolparser.html.markdown b/website/docs/r/avi_protocolparser.html.markdown
index 2291be20e..e687387e8 100644
--- a/website/docs/r/avi_protocolparser.html.markdown
+++ b/website/docs/r/avi_protocolparser.html.markdown
@@ -27,12 +27,12 @@ resource "avi_protocolparser" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the protocol parser. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `parser_code` - (Required) Command script provided inline. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Description of the protocol parser. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant uuid of the protocol parser. It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the protocol parser. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `parser_code` - (Required) Command script provided inline. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Description of the protocol parser. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant uuid of the protocol parser. It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -47,5 +47,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the protocol parser. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the protocol parser. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_retentionpolicy.html.markdown b/website/docs/r/avi_retentionpolicy.html.markdown
new file mode 100644
index 000000000..83e8ca4d7
--- /dev/null
+++ b/website/docs/r/avi_retentionpolicy.html.markdown
@@ -0,0 +1,51 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "Avi: avi_retentionpolicy"
+sidebar_current: "docs-avi-resource-retentionpolicy"
+description: |-
+  Creates and manages Avi RetentionPolicy.
+---
+
+# avi_retentionpolicy
+
+The RetentionPolicy resource allows the creation and management of Avi RetentionPolicy
+
+## Example Usage
+
+```hcl
+resource "avi_retentionpolicy" "foo" {
+    name = "terraform-example-foo"
+    tenant_ref = "/api/tenant/?name=admin"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `policy` - (Required) Policy specification. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enabled` - (Optional) Enables the policy. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `history` - (Optional) History of previous runs. Field introduced in 31.1.1. Maximum of 10 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Optional) Name of the policy. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `summary` - (Optional) Details of most recent run. Field introduced in 31.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
+
+### Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:
+
+* `create` - (Defaults to 40 mins) Used when creating the AMI
+* `update` - (Defaults to 40 mins) Used when updating the AMI
+* `delete` - (Defaults to 90 mins) Used when deregistering the AMI
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `uuid` -  Uuid identifier for the policy. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/r/avi_rmcloudopsproto.html.markdown b/website/docs/r/avi_rmcloudopsproto.html.markdown
index a966da09b..f3546cd59 100644
--- a/website/docs/r/avi_rmcloudopsproto.html.markdown
+++ b/website/docs/r/avi_rmcloudopsproto.html.markdown
@@ -27,10 +27,11 @@ resource "avi_rmcloudopsproto" "foo" {
 
 The following arguments are supported:
 
-* `last_queried_se_creation_limit` - (Optional) The most recent value of concurrent se creation limit from cloudconnectorstatus. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Optional) Cloud name. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pending_se_creation_count` - (Optional) Number of se creations in progress. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pending_vnic_op_count` - (Optional) Number of vnic operations in progress (both add and delete). Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `last_queried_se_creation_limit` - (Optional) The most recent value of concurrent se creation limit from cloudconnectorstatus. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Optional) Cloud name. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pending_se_creation_count` - (Optional) Number of se creations in progress. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pending_vnic_op_count` - (Optional) Number of vnic operations in progress (both add and delete). Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_create_limit_reached` - (Optional) Se creation limit reached. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -45,5 +46,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Cloud uuid. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Cloud uuid. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_role.html.markdown b/website/docs/r/avi_role.html.markdown
index 68e0178d7..e4f43db8d 100644
--- a/website/docs/r/avi_role.html.markdown
+++ b/website/docs/r/avi_role.html.markdown
@@ -27,12 +27,12 @@ resource "avi_role" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `allow_unlabelled_access` - (Optional) Allow access to unlabelled objects. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `filters` - (Optional) Filters for granular object access control based on object labels. Multiple filters are merged using the and operator. If empty, all objects according to the privileges will be accessible to the user. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `privileges` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allow_unlabelled_access` - (Optional) Allow access to unlabelled objects. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `filters` - (Optional) Filters for granular object access control based on object labels. Multiple filters are merged using the and operator. If empty, all objects according to the privileges will be accessible to the user. Field introduced in 20.1.3. Maximum of 4 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `privileges` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -47,5 +47,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_scheduler.html.markdown b/website/docs/r/avi_scheduler.html.markdown
index bc6255010..4183d9fae 100644
--- a/website/docs/r/avi_scheduler.html.markdown
+++ b/website/docs/r/avi_scheduler.html.markdown
@@ -27,18 +27,18 @@ resource "avi_scheduler" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of scheduler. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `backup_config_ref` - (Optional) Backup configuration to be executed by this scheduler. It is a reference to an object of type backupconfiguration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `enabled` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `end_date_time` - (Optional) Scheduler end date and time. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `frequency` - (Optional) Frequency at which custom scheduler will run. Allowed values are 0-60. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `frequency_unit` - (Optional) Unit at which custom scheduler will run. Enum options - SCHEDULER_FREQUENCY_UNIT_MIN, SCHEDULER_FREQUENCY_UNIT_HOUR, SCHEDULER_FREQUENCY_UNIT_DAY, SCHEDULER_FREQUENCY_UNIT_WEEK, SCHEDULER_FREQUENCY_UNIT_MONTH. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `run_mode` - (Optional) Scheduler run mode. Enum options - RUN_MODE_PERIODIC, RUN_MODE_AT, RUN_MODE_NOW. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `run_script_ref` - (Optional) Control script to be executed by this scheduler. It is a reference to an object of type alertscriptconfig. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scheduler_action` - (Optional) Define scheduler action. Enum options - SCHEDULER_ACTION_RUN_A_SCRIPT, SCHEDULER_ACTION_BACKUP. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `start_date_time` - (Optional) Scheduler start date and time. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of scheduler. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `backup_config_ref` - (Optional) Backup configuration to be executed by this scheduler. It is a reference to an object of type backupconfiguration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enabled` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `end_date_time` - (Optional) Scheduler end date and time. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `frequency` - (Optional) Frequency at which custom scheduler will run. Allowed values are 0-60. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `frequency_unit` - (Optional) Unit at which custom scheduler will run. Enum options - SCHEDULER_FREQUENCY_UNIT_MIN, SCHEDULER_FREQUENCY_UNIT_HOUR, SCHEDULER_FREQUENCY_UNIT_DAY, SCHEDULER_FREQUENCY_UNIT_WEEK, SCHEDULER_FREQUENCY_UNIT_MONTH. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `run_mode` - (Optional) Scheduler run mode. Enum options - RUN_MODE_PERIODIC, RUN_MODE_AT, RUN_MODE_NOW. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `run_script_ref` - (Optional) Control script to be executed by this scheduler. It is a reference to an object of type alertscriptconfig. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scheduler_action` - (Optional) Define scheduler action. Enum options - SCHEDULER_ACTION_RUN_A_SCRIPT, SCHEDULER_ACTION_BACKUP. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `start_date_time` - (Optional) Scheduler start date and time. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -53,5 +53,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_securitymanagerdata.html.markdown b/website/docs/r/avi_securitymanagerdata.html.markdown
index c8eff6090..b16b865d2 100644
--- a/website/docs/r/avi_securitymanagerdata.html.markdown
+++ b/website/docs/r/avi_securitymanagerdata.html.markdown
@@ -27,9 +27,9 @@ resource "avi_securitymanagerdata" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Virtualservice name. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `app_learning_info` - (Optional) Information about various applications. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Virtualservice name. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `app_learning_info` - (Optional) Information about various applications. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -44,5 +44,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Virtualservice uuid. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Virtualservice uuid. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_securitypolicy.html.markdown b/website/docs/r/avi_securitypolicy.html.markdown
index e4108713a..4df80c039 100644
--- a/website/docs/r/avi_securitypolicy.html.markdown
+++ b/website/docs/r/avi_securitypolicy.html.markdown
@@ -27,18 +27,18 @@ resource "avi_securitypolicy" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) The name of the security policy. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Security policy is used to specify various configuration information used to perform distributed denial of service (ddos) attacks detection and mitigation. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dns_amplification_denyports` - (Optional) Source ports and port ranges to deny in dns amplification attacks. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dns_attacks` - (Optional) Attacks utilizing the dns protocol operations. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dns_policy_index` - (Optional) Index of the dns policy to use for the mitigation rules applied to the dns attacks. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `network_security_policy_index` - (Optional) Index of the network security policy to use for the mitigation rules applied to the attacks. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `oper_mode` - (Optional) Mode of dealing with the attacks - perform detection only, or detect and mitigate the attacks. Enum options - DETECTION, MITIGATION. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tcp_attacks` - (Optional) Attacks utilizing the tcp protocol operations. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenancy of the security policy. It is a reference to an object of type tenant. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `udp_attacks` - (Optional) Attacks utilizing the udp protocol operations. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) The name of the security policy. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Security policy is used to specify various configuration information used to perform distributed denial of service (ddos) attacks detection and mitigation. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_amplification_denyports` - (Optional) Source ports and port ranges to deny in dns amplification attacks. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_attacks` - (Optional) Attacks utilizing the dns protocol operations. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_policy_index` - (Optional) Index of the dns policy to use for the mitigation rules applied to the dns attacks. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `network_security_policy_index` - (Optional) Index of the network security policy to use for the mitigation rules applied to the attacks. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `oper_mode` - (Optional) Mode of dealing with the attacks - perform detection only, or detect and mitigate the attacks. Enum options - DETECTION, MITIGATION. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tcp_attacks` - (Optional) Attacks utilizing the tcp protocol operations. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenancy of the security policy. It is a reference to an object of type tenant. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `udp_attacks` - (Optional) Attacks utilizing the udp protocol operations. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -53,5 +53,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  The uuid of the security policy. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  The uuid of the security policy. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_seproperties.html.markdown b/website/docs/r/avi_seproperties.html.markdown
index 5966fbe2e..589723ec4 100644
--- a/website/docs/r/avi_seproperties.html.markdown
+++ b/website/docs/r/avi_seproperties.html.markdown
@@ -26,10 +26,10 @@ resource "avi_seproperties" "foo" {
 
 The following arguments are supported:
 
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `se_agent_properties` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_bootup_properties` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_runtime_properties` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_agent_properties` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_bootup_properties` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_runtime_properties` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -44,5 +44,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_serverautoscalepolicy.html.markdown b/website/docs/r/avi_serverautoscalepolicy.html.markdown
index 138dc6715..00ce205f6 100644
--- a/website/docs/r/avi_serverautoscalepolicy.html.markdown
+++ b/website/docs/r/avi_serverautoscalepolicy.html.markdown
@@ -27,25 +27,25 @@ resource "avi_serverautoscalepolicy" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `delay_for_server_garbage_collection` - (Optional) Delay in minutes after which a down server will be removed from pool. Value 0 disables this functionality. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `intelligent_autoscale` - (Optional) Use avi intelligent autoscale algorithm where autoscale is performed by comparing load on the pool against estimated capacity of all the servers. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `intelligent_scalein_margin` - (Optional) Maximum extra capacity as percentage of load used by the intelligent scheme. Scale-in is triggered when available capacity is more than this margin. Allowed values are 1-99. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `intelligent_scaleout_margin` - (Optional) Minimum extra capacity as percentage of load used by the intelligent scheme. Scale-out is triggered when available capacity is less than this margin. Allowed values are 1-99. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `max_scalein_adjustment_step` - (Optional) Maximum number of servers to scale-in simultaneously. The actual number of servers to scale-in is chosen such that target number of servers is always more than or equal to the min_size. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_scaleout_adjustment_step` - (Optional) Maximum number of servers to scale-out simultaneously. The actual number of servers to scale-out is chosen such that target number of servers is always less than or equal to the max_size. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_size` - (Optional) Maximum number of servers after scale-out. Allowed values are 0-400. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `min_size` - (Optional) No scale-in happens once number of operationally up servers reach min_servers. Allowed values are 0-400. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scalein_alertconfig_refs` - (Optional) Trigger scale-in when alerts due to any of these alert configurations are raised. It is a reference to an object of type alertconfig. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scalein_cooldown` - (Optional) Cooldown period during which no new scale-in is triggered to allow previous scale-in to successfully complete. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scaleout_alertconfig_refs` - (Optional) Trigger scale-out when alerts due to any of these alert configurations are raised. It is a reference to an object of type alertconfig. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scaleout_cooldown` - (Optional) Cooldown period during which no new scale-out is triggered to allow previous scale-out to successfully complete. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `scheduled_scalings` - (Optional) Scheduled-based scale-in/out policy. During scheduled intervals, metrics based autoscale is not enabled and number of servers will be solely derived from schedulescale policy. Field introduced in 21.1.1. Maximum of 1 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `use_predicted_load` - (Optional) Use predicted load rather than current load. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `delay_for_server_garbage_collection` - (Optional) Delay in minutes after which a down server will be removed from pool. Value 0 disables this functionality. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `intelligent_autoscale` - (Optional) Use avi intelligent autoscale algorithm where autoscale is performed by comparing load on the pool against estimated capacity of all the servers. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `intelligent_scalein_margin` - (Optional) Maximum extra capacity as percentage of load used by the intelligent scheme. Scale-in is triggered when available capacity is more than this margin. Allowed values are 1-99. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `intelligent_scaleout_margin` - (Optional) Minimum extra capacity as percentage of load used by the intelligent scheme. Scale-out is triggered when available capacity is less than this margin. Allowed values are 1-99. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_scalein_adjustment_step` - (Optional) Maximum number of servers to scale-in simultaneously. The actual number of servers to scale-in is chosen such that target number of servers is always more than or equal to the min_size. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_scaleout_adjustment_step` - (Optional) Maximum number of servers to scale-out simultaneously. The actual number of servers to scale-out is chosen such that target number of servers is always less than or equal to the max_size. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_size` - (Optional) Maximum number of servers after scale-out. Allowed values are 0-400. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `min_size` - (Optional) No scale-in happens once number of operationally up servers reach min_servers. Allowed values are 0-400. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scalein_alertconfig_refs` - (Optional) Trigger scale-in when alerts due to any of these alert configurations are raised. It is a reference to an object of type alertconfig. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scalein_cooldown` - (Optional) Cooldown period during which no new scale-in is triggered to allow previous scale-in to successfully complete. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scaleout_alertconfig_refs` - (Optional) Trigger scale-out when alerts due to any of these alert configurations are raised. It is a reference to an object of type alertconfig. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scaleout_cooldown` - (Optional) Cooldown period during which no new scale-out is triggered to allow previous scale-out to successfully complete. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `scheduled_scalings` - (Optional) Scheduled-based scale-in/out policy. During scheduled intervals, metrics based autoscale is not enabled and number of servers will be solely derived from schedulescale policy. Field introduced in 21.1.1. Maximum of 1 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_predicted_load` - (Optional) Use predicted load rather than current load. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -60,5 +60,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_serviceauthprofile.html.markdown b/website/docs/r/avi_serviceauthprofile.html.markdown
index 7621c56dd..9e7f12c07 100644
--- a/website/docs/r/avi_serviceauthprofile.html.markdown
+++ b/website/docs/r/avi_serviceauthprofile.html.markdown
@@ -27,12 +27,12 @@ resource "avi_serviceauthprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the service auth profile. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `type` - (Required) Type of the service auth profile. Enum options - SERVICE_AUTH_OAUTH. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Description for the service auth profile. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `service_oauth_profile` - (Optional) Oauth profile - common endpoint information for service authentication. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant ref for the service auth profile. It is a reference to an object of type tenant. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) Name of the service auth profile. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `type` - (Required) Type of the service auth profile. Enum options - SERVICE_AUTH_OAUTH. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 30.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Description for the service auth profile. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `service_oauth_profile` - (Optional) Oauth profile - common endpoint information for service authentication. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant ref for the service auth profile. It is a reference to an object of type tenant. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -47,5 +47,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the service auth profile. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Uuid of the service auth profile. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_serviceengine.html.markdown b/website/docs/r/avi_serviceengine.html.markdown
index 6bc7bf91f..91e7c1651 100644
--- a/website/docs/r/avi_serviceengine.html.markdown
+++ b/website/docs/r/avi_serviceengine.html.markdown
@@ -27,23 +27,23 @@ resource "avi_serviceengine" "foo" {
 
 The following arguments are supported:
 
-* `availability_zone` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `container_mode` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `container_type` - (Optional) Enum options - container_type_bridge, container_type_host, container_type_host_dpdk. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `controller_created` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `controller_ip` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `data_vnics` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_state` - (Optional) Inorder to disable se set this field appropriately. Enum options - SE_STATE_ENABLED, SE_STATE_DISABLED_FOR_PLACEMENT, SE_STATE_DISABLED, SE_STATE_DISABLED_FORCE. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `flavor` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `host_ref` - (Optional) It is a reference to an object of type vimgrhostruntime. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `hypervisor` - (Optional) Enum options - default, vmware_esx, kvm, vmware_vsan, xen. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `mgmt_vnic` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nsxt_no_hotplug` - (Optional) If set to true, controller does not hotplugg the vnics. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `resources` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_group_ref` - (Optional) It is a reference to an object of type serviceenginegroup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `availability_zone` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `container_mode` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `container_type` - (Optional) Enum options - container_type_bridge, container_type_host, container_type_host_dpdk. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_created` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_ip` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `data_vnics` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_state` - (Optional) Inorder to disable se set this field appropriately. Enum options - SE_STATE_ENABLED, SE_STATE_DISABLED_FOR_PLACEMENT, SE_STATE_DISABLED, SE_STATE_DISABLED_FORCE, SE_STATE_DISABLED_WITH_SCALEIN, SE_STATE_DISABLED_NO_TRAFFIC, SE_STATE_DISABLED_FORCE_WITH_MIGRATE. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `flavor` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `host_ref` - (Optional) It is a reference to an object of type vimgrhostruntime. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `hypervisor` - (Optional) Enum options - default, vmware_esx, kvm, vmware_vsan, xen. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mgmt_vnic` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nsxt_no_hotplug` - (Optional) If set to true, controller does not hotplugg the vnics. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `resources` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_group_ref` - (Optional) It is a reference to an object of type serviceenginegroup. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -58,5 +58,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_serviceenginegroup.html.markdown b/website/docs/r/avi_serviceenginegroup.html.markdown
index b34fa1212..67590e793 100644
--- a/website/docs/r/avi_serviceenginegroup.html.markdown
+++ b/website/docs/r/avi_serviceenginegroup.html.markdown
@@ -27,294 +27,300 @@ resource "avi_serviceenginegroup" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `accelerated_networking` - (Optional) Enable accelerated networking option for azure se. Accelerated networking enables single root i/o virtualization (sr-iov) to a se vm. This improves networking performance. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `active_standby` - (Optional) Service engines in active/standby mode for ha failover. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `aggressive_failure_detection` - (Optional) Enable aggressive failover configuration for ha. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `algo` - (Optional) In compact placement, virtual services are placed on existing ses until max_vs_per_se limit is reached. In distributed placement, virtual services are placed on new ses until max_se limit is reached. Once this limit is reached, virtual services are placed on ses with least load. Enum options - PLACEMENT_ALGO_PACKED, PLACEMENT_ALGO_DISTRIBUTED. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `allow_burst` - (Optional) Allow ses to be created using burst license. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `app_cache_percent` - (Optional) A percent value of total se memory reserved for applicationcaching. This is an se bootup property and requires se restart.requires se reboot. Allowed values are 0 - 100. Special values are 0- disable. Field introduced in 18.2.3. Unit is percent. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition. Special default for essentials edition is 0, basic edition is 0, enterprise is 10.
-* `app_cache_threshold` - (Optional) The max memory that can be allocated for the app cache. This value will act as an upper bound on the cache size specified in app_cache_percent. Special values are 0- disable. Field introduced in 20.1.1. Unit is gb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `app_learning_memory_percent` - (Optional) A percent value of total se memory reserved for application learning. This is an se bootup property and requires se restart. Allowed values are 0 - 10. Field introduced in 18.2.3. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `archive_shm_limit` - (Optional) Amount of se memory in gb until which shared memory is collected in core archive. Field introduced in 17.1.3. Unit is gb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `async_ssl` - (Optional) Ssl handshakes will be handled by dedicated ssl threads.requires se reboot. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `async_ssl_threads` - (Optional) Number of async ssl threads per se_dp.requires se reboot. Allowed values are 1-16. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `auto_rebalance` - (Optional) If set, virtual services will be automatically migrated when load on an se is less than minimum or more than maximum thresholds. Only alerts are generated when the auto_rebalance is not set. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `auto_rebalance_capacity_per_se` - (Optional) Capacities of se for auto rebalance for each criteria. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `auto_rebalance_criteria` - (Optional) Set of criteria for se auto rebalance. Enum options - SE_AUTO_REBALANCE_CPU, SE_AUTO_REBALANCE_PPS, SE_AUTO_REBALANCE_MBPS, SE_AUTO_REBALANCE_OPEN_CONNS, SE_AUTO_REBALANCE_CPS. Field introduced in 17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `auto_rebalance_interval` - (Optional) Frequency of rebalance, if 'auto rebalance' is enabled. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `auto_redistribute_active_standby_load` - (Optional) Redistribution of virtual services from the takeover se to the replacement se can cause momentary traffic loss. If the auto-redistribute load option is left in its default off state, any desired rebalancing requires calls to rest api. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `availability_zone_refs` - (Optional) Availability zones for virtual service high availability. It is a reference to an object of type availabilityzone. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `baremetal_dispatcher_handles_flows` - (Optional) Control if dispatcher core also handles tcp flows in baremetal se. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `bgp_peer_monitor_failover_enabled` - (Optional) Enable bgp peer monitoring based failover. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `bgp_state_update_interval` - (Optional) Bgp peer state update interval. Allowed values are 5-100. Field introduced in 17.2.14,18.1.5,18.2.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `buffer_se` - (Optional) Excess service engine capacity provisioned for ha failover. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `compress_ip_rules_for_each_ns_subnet` - (Optional) Compress ip rules into a single subnet based ip rule for each north-south ipam subnet configured in pcap mode in openshift/kubernetes node. Field introduced in 18.2.9, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `config_debugs_on_all_cores` - (Optional) Enable config debugs on all cores of se. Field introduced in 17.2.13,18.1.5,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `connection_memory_percentage` - (Optional) Percentage of memory for connection state. This will come at the expense of memory used for http in-memory cache. Allowed values are 10-90. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `core_shm_app_cache` - (Optional) Include shared memory for app cache in core file.requires se reboot. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `core_shm_app_learning` - (Optional) Include shared memory for app learning in core file.requires se reboot. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cpu_reserve` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cpu_socket_affinity` - (Optional) Allocate all the cpu cores for the service engine virtual machines  on the same cpu socket. Applicable only for vcenter cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `custom_securitygroups_data` - (Optional) Custom security groups to be associated with data vnics for se instances in openstack and aws clouds. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `custom_securitygroups_mgmt` - (Optional) Custom security groups to be associated with management vnic for se instances in openstack and aws clouds. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `custom_tag` - (Optional) Custom tag will be used to create the tags for se instance in aws. Note this is not the same as the prefix for se name. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `data_network_id` - (Optional) Subnet used to spin up the data nic for service engines, used only for azure cloud. Overrides the cloud level setting for service engine subnet. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `datascript_timeout` - (Optional) Number of instructions before datascript times out. Allowed values are 0-100000000. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `deactivate_ipv6_discovery` - (Optional) If activated, ipv6 address and route discovery are deactivated.requires se reboot. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `deactivate_kni_filtering_at_dispatcher` - (Optional) Deactivate filtering of packets to kni interface. To be used under surveillance of avi support. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dedicated_dispatcher_core` - (Optional) Dedicate the core that handles packet receive/transmit from the network to just the dispatching function. Don't use it for tcp/ip and ssl functions. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `disable_avi_securitygroups` - (Optional) By default, avi creates and manages security groups along with custom sg provided by user. Set this to true to disallow avi to create and manage new security groups. Avi will only make use of custom security groups provided by user. This option is supported for aws and openstack cloud types. Field introduced in 17.2.13,18.1.4,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `disable_csum_offloads` - (Optional) Stop using tcp/udp and ip checksum offload features of nics. Field introduced in 17.1.14, 17.2.5, 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `disable_flow_probes` - (Optional) Disable flow probes for scaled out vs'es. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `disable_gro` - (Optional) Disable generic receive offload (gro) in dpdk poll-mode driver packet receive path. Gro can be enabled on nics that do not support lro (large receive offload) or do not gain performance boost from lro. Gro is on by default on nics in a system with 8 vcpus or higher. Field introduced in 17.2.5, 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `disable_se_memory_check` - (Optional) If set, disable the config memory check done in service engine. Field introduced in 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `disable_tso` - (Optional) Disable tcp segmentation offload (tso) in dpdk poll-mode driver packet transmit path. Tso is on by default on nics that support it. Field introduced in 17.2.5, 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `disk_per_se` - (Optional) Amount of disk space for each of the service engine virtual machines. Unit is gb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `distribute_load_active_standby` - (Optional) Use both the active and standby service engines for virtual service placement in the legacy active standby ha mode. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `distribute_queues` - (Optional) Distributes queue ownership among cores so multiple cores handle dispatcher duties. Requires se reboot. Deprecated from 18.2.8, instead use max_queues_per_vnic. Field introduced in 17.2.8. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `distribute_vnics` - (Optional) Distributes vnic ownership among cores so multiple cores handle dispatcher duties.requires se reboot. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `downstream_send_timeout` - (Optional) Timeout for downstream to become writable. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dp_aggressive_deq_interval_msec` - (Optional) Dequeue interval for receive queue from se_dp in aggressive mode. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `dp_aggressive_enq_interval_msec` - (Optional) Enqueue interval for request queue to se_dp in aggressive mode. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `dp_aggressive_hb_frequency` - (Optional) Frequency of se - se hb messages when aggressive failure mode detection is enabled. Field introduced in 20.1.3. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dp_aggressive_hb_timeout_count` - (Optional) Consecutive hb failures after which failure is reported to controller,when aggressive failure mode detection is enabled. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dp_deq_interval_msec` - (Optional) Dequeue interval for receive queue from se_dp. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `dp_enq_interval_msec` - (Optional) Enqueue interval for request queue to se_dp. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `dp_hb_frequency` - (Optional) Frequency of se - se hb messages when aggressive failure mode detection is not enabled. Field introduced in 20.1.3. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dp_hb_timeout_count` - (Optional) Consecutive hb failures after which failure is reported to controller, when aggressive failure mode detection is not enabled. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dpdk_gro_timeout_interval` - (Optional) The timeout for gro coalescing interval. 0 indicates non-timer based gro. Allowed values are 0-900. Field introduced in 22.1.1. Unit is microseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_gratarp_permanent` - (Optional) Enable gratarp for vip_ip. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_hsm_log` - (Optional) Enable hsm luna engine logs. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_hsm_priming` - (Optional) (this is a beta feature). Enable hsm key priming. If enabled, key handles on the hsm will be synced to se before processing client connections. Field introduced in 17.2.7, 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_multi_lb` - (Optional) Applicable only for azure cloud with basic sku lb. If set, additional azure lbs will be automatically created if resources in existing lb are exhausted. Field introduced in 17.2.10, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_pcap_tx_ring` - (Optional) Enable tx ring support in pcap mode of operation. Tso feature is not supported with tx ring enabled. Deprecated from 18.2.8, instead use pcap_tx_mode. Requires se reboot. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ephemeral_portrange_end` - (Optional) End local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ephemeral_portrange_start` - (Optional) Start local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `extra_config_multiplier` - (Optional) Multiplier for extra config to support large vs/pool config. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `extra_shared_config_memory` - (Optional) Extra config memory to support large geo db configuration. Field introduced in 17.1.1. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `flow_table_new_syn_max_entries` - (Optional) Maximum number of flow table entries that have not completed tcp three-way handshake yet. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `free_list_size` - (Optional) Number of entries in the free list. Field introduced in 17.2.10, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `gcp_config` - (Optional) Google cloud platform, service engine group configuration. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gratarp_permanent_periodicity` - (Optional) Gratarp periodicity for vip-ip. Allowed values are 5-30. Field introduced in 18.2.3. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `grpc_channel_connect_timeout` - (Optional) Timeout in seconds that se waits for a grpc channel to connect to server, before it retries. Allowed values are 5-45. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gve_enabled` - (Optional) Deploys google virtual ethernet (gve) - gvnic for all supported intances types in gcp. Applies only to newly created se's. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ha_mode` - (Optional) High availability mode for all the virtual services using this service engine group. Enum options - HA_MODE_SHARED_PAIR, HA_MODE_SHARED, HA_MODE_LEGACY_ACTIVE_STANDBY. Allowed in enterprise edition with any value, essentials edition(allowed values- ha_mode_legacy_active_standby), basic edition(allowed values- ha_mode_legacy_active_standby), enterprise with cloud services edition. Special default for essentials edition is ha_mode_legacy_active_standby, basic edition is ha_mode_legacy_active_standby, enterprise is ha_mode_shared.
-* `handle_per_pkt_attack` - (Optional) Configuration to handle per packet attack handling.for example, dns reflection attack is a type of attack where a response packet is sent to the dns vs.this configuration tells if such packets should be dropped without further processing. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `hardwaresecuritymodulegroup_ref` - (Optional) It is a reference to an object of type hardwaresecuritymodulegroup. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `heap_minimum_config_memory` - (Optional) Minimum required heap memory to apply any configuration. Allowed values are 0-100. Field introduced in 18.1.2. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `hm_on_standby` - (Optional) Enable active health monitoring from the standby se for all placed virtual services. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition. Special default for essentials edition is false, basic edition is false, enterprise is true.
-* `host_attribute_key` - (Optional) Key of a (key, value) pair identifying a label for a set of nodes usually in container clouds. Needs to be specified together with host_attribute_value. Ses can be configured differently including ha modes across different se groups. May also be used for isolation between different classes of virtualservices. Virtualservices' se group may be specified via annotations/labels. A openshift/kubernetes namespace maybe annotated with a matching se group label as openshift.io/node-selector  apptype=prod. When multiple se groups are used in a cloud with host attributes specified,just a single se group can exist as a match-all se group without a host_attribute_key. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `host_attribute_value` - (Optional) Value of a (key, value) pair identifying a label for a set of nodes usually in container clouds. Needs to be specified together with host_attribute_key. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `host_gateway_monitor` - (Optional) Enable the host gateway monitor when service engine is deployed as docker container. Disabled by default. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `http_rum_console_log` - (Optional) Enable javascript console logs on the client browser when collecting client insights. Field introduced in 21.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `http_rum_min_content_length` - (Optional) Minimum response size content length to sample for client insights. Field introduced in 21.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 64), basic edition(allowed values- 64), enterprise with cloud services edition.
-* `hybrid_rss_mode` - (Optional) Toggles se hybrid only mode of operation in dpdk mode with rss configured;where-in each se datapath instance operates as a standalone hybrid instance performing both dispatcher and proxy function. Requires reboot. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `hypervisor` - (Optional) Override default hypervisor. Enum options - DEFAULT, VMWARE_ESX, KVM, VMWARE_VSAN, XEN. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ignore_docker_mac_change` - (Optional) Ignore docker mac change. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `ignore_rtt_threshold` - (Optional) Ignore rtt samples if it is above threshold. Field introduced in 17.1.6,17.2.2. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ingress_access_data` - (Optional) Program se security group ingress rules to allow vip data access from remote cidr type. Enum options - SG_INGRESS_ACCESS_NONE, SG_INGRESS_ACCESS_ALL, SG_INGRESS_ACCESS_VPC. Field introduced in 17.1.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ingress_access_mgmt` - (Optional) Program se security group ingress rules to allow ssh/icmp management access from remote cidr type. Enum options - SG_INGRESS_ACCESS_NONE, SG_INGRESS_ACCESS_ALL, SG_INGRESS_ACCESS_VPC. Field introduced in 17.1.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `instance_flavor` - (Optional) Instance/flavor name for se instance. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `instance_flavor_info` - (Optional) Additional information associated with instance_flavor. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `iptables` - (Optional) Iptable rules. Maximum of 128 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `kni_allowed_server_ports` - (Optional) Port ranges for any servers running in inband linuxserver clouds. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `l7_conns_per_core` - (Optional) Number of l7 connections that can be cached per core. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `l7_resvd_listen_conns_per_core` - (Optional) Number of reserved l7 listener connections per core. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `labels` - (Optional) Labels associated with this se group. Field introduced in 20.1.1. Maximum of 1 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `lbaction_num_requests_to_dispatch` - (Optional) Number of requests to dispatch from the request. Queue at a regular interval. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `lbaction_rq_per_request_max_retries` - (Optional) Maximum retries per request in the request queue. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `least_load_core_selection` - (Optional) Select core with least load for new flow. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `license_tier` - (Optional) Specifies the license tier which would be used. This field by default inherits the value from cloud. Enum options - ENTERPRISE_16, ENTERPRISE, ENTERPRISE_18, BASIC, ESSENTIALS, ENTERPRISE_WITH_CLOUD_SERVICES. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `license_type` - (Optional) If no license type is specified then default license enforcement for the cloud type is chosen. Enum options - LIC_BACKEND_SERVERS, LIC_SOCKETS, LIC_CORES, LIC_HOSTS, LIC_SE_BANDWIDTH, LIC_METERED_SE_BANDWIDTH. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `log_agent_compress_logs` - (Optional) Flag to indicate if log files are compressed upon full on the service engine. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_debug_enabled` - (Optional) Enable debug logs by default on service engine. This includes all other debugging logs. Debug logs can also be explcitly enabled from the cli shell. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_file_sz_appl` - (Optional) Maximum application log file size before rollover. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_file_sz_conn` - (Optional) Maximum connection log file size before rollover. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_file_sz_debug` - (Optional) Maximum debug log file size before rollover. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_file_sz_event` - (Optional) Maximum event log file size before rollover. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_log_storage_min_sz` - (Optional) Minimum storage allocated for logs irrespective of memory and cores. Field introduced in 21.1.1. Unit is mb. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_max_concurrent_rsync` - (Optional) Maximum concurrent rsync requests initiated from log-agent to the controller. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_max_storage_excess_percent` - (Optional) Excess percentage threshold of disk size to trigger cleanup of logs on the service engine. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_max_storage_ignore_percent` - (Optional) Maximum storage on the disk not allocated for logs on the service engine. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_min_storage_per_vs` - (Optional) Minimum storage allocated to any given virtualservice on the service engine. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_sleep_interval` - (Optional) Internal timer to stall log-agent and prevent it from hogging cpu cycles on the service engine. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_trace_enabled` - (Optional) Enable trace logs by default on service engine. Configuration operations are logged along with other important logs by service engine. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_agent_unknown_vs_timer` - (Optional) Timeout to purge unknown virtual service logs from the service engine. Field introduced in 21.1.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `log_disksz` - (Optional) Maximum disk capacity (in mb) to be allocated to an se. This is exclusively used for debug and log data. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `log_malloc_failure` - (Optional) Se will log memory allocation related failure to the se_trace file, wherever available. Field introduced in 20.1.2. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `log_message_max_file_list_size` - (Optional) Maximum number of file names in a log message. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.7. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `max_concurrent_external_hm` - (Optional) Maximum number of external health monitors that can run concurrently in a service engine. This helps control the cpu and memory use by external health monitors. Special values are 0- value will be internally calculated based on cpu and memory. Field introduced in 18.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_cpu_usage` - (Optional) When cpu usage on an se exceeds this threshold, virtual services hosted on this se may be rebalanced to other ses to reduce load. A new se may be created as part of this process. Allowed values are 40-90. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_memory_per_mempool` - (Optional) Max bytes that can be allocated in a single mempool. Field introduced in 18.1.5. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_num_http_sessions_to_store` - (Optional) Maximum number of http session that will be created. Each session uses about 1kb in the key-value storage in shared memory. Setting this value too high can lead to exhaustion of shared memory and affect services. Allowed values are 1-2000000. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `max_num_se_dps` - (Optional) Configures the maximum number of se_dp processes that handles traffic. If not configured, defaults to the number of cpus on the se. If decreased, it will only take effect after se reboot. Allowed values are 1-128. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `max_public_ips_per_lb` - (Optional) Applicable to azure platform only. Maximum number of public ips per azure lb. Field introduced in 17.2.12, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_queues_per_vnic` - (Optional) Maximum number of queues per vnic setting to '0' utilises all queues that are distributed across dispatcher cores. Allowed values are 0,1,2,4,8,16. Field introduced in 18.2.7, 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 1), basic edition(allowed values- 1), enterprise with cloud services edition.
-* `max_rules_per_lb` - (Optional) Applicable to azure platform only. Maximum number of rules per azure lb. Field introduced in 17.2.12, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_scaleout_per_vs` - (Optional) Maximum number of active service engines for the virtual service. Allowed values are 1-64. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_se` - (Optional) Maximum number of services engines in this group. Allowed values are 0-1000. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_skb_frags` - (Optional) Maximum of number of 4 kb pages allocated to the linux kernel gro subsystem for packet coalescing. This parameter is limited to supported kernels only. Requires se reboot. Allowed values are 1-17. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `max_vs_per_se` - (Optional) Maximum number of virtual services that can be placed on a single service engine. Allowed values are 1-1000. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `mem_reserve` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `memory_for_config_update` - (Optional) Indicates the percent of memory reserved for config updates. Allowed values are 0-100. Field introduced in 18.1.2. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `memory_per_se` - (Optional) Amount of memory for each of the service engine virtual machines. Changes to this setting do not affect existing ses. Allowed values are 2048-262144. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `metrics_collection_mode` - (Optional) Metrics collection mode, 0 = pull mode. Se_agent pulls metrics from se_dp,  1 = push mode. Se_dp pushes metrics to se_agent. 9 = special value to reset collection state in push mode. Allowed values are 0-1. Special values are 9- reset metrics collection state. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mgmt_network_ref` - (Optional) Management network to use for avi service engines. It is a reference to an object of type network. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `mgmt_subnet` - (Optional) Management subnet to use for avi service engines. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `min_cpu_usage` - (Optional) When cpu usage on an se falls below the minimum threshold, virtual services hosted on the se may be consolidated onto other underutilized ses. After consolidation, unused service engines may then be eligible for deletion. Allowed values are 20-60. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `min_scaleout_per_vs` - (Optional) Minimum number of active service engines for the virtual service. Allowed values are 1-64. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `min_se` - (Optional) Minimum number of services engines in this group (relevant for se autorebalance only). Allowed values are 0-1000. Field introduced in 17.2.13,18.1.3,18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `minimum_connection_memory` - (Optional) Indicates the percent of memory reserved for connections. Allowed values are 0-100. Field introduced in 18.1.2. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `multicast_enable` - (Optional) This knob enables the service engine to process multicast traffic(for vmware hypervisor). Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `n_log_streaming_threads` - (Optional) Number of threads to use for log streaming. Allowed values are 1-100. Field introduced in 17.2.12, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `netlink_poller_threads` - (Optional) Number of threads to poll for netlink messages excluding the thread for default namespace. Requires se reboot. Allowed values are 1-32. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `netlink_sock_buf_size` - (Optional) Socket buffer size for the netlink sockets. Requires se reboot. Allowed values are 1-128. Field introduced in 21.1.1. Unit is mega_bytes. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ngx_free_connection_stack` - (Optional) Free the connection stack. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `non_significant_log_throttle` - (Optional) This setting limits the number of non-significant logs generated per second per core on this se. Default is 100 logs per second. Set it to zero (0) to deactivate throttling. Field introduced in 17.1.3. Unit is per_second. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ns_helper_deq_interval_msec` - (Optional) Dequeue interval for receive queue from ns helper. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `ntp_sync_fail_event` - (Optional) Toggle se ntp synchronization failure events generation. Disabled by default. Field introduced in 22.1.2. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `ntp_sync_status_interval` - (Optional) Configures the interval at which se synchronization status with ntp server(s) is verified. A value of zero disables se ntp synchronization status validation. Allowed values are 120-900. Special values are 0- disable. Field introduced in 22.1.2. Unit is sec. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `num_dispatcher_cores` - (Optional) Number of dispatcher cores (0,1,2,4,8 or 16). If set to 0, then number of dispatcher cores is deduced automatically.requires se reboot. Allowed values are 0,1,2,4,8,16. Field introduced in 17.2.12, 18.1.3, 18.2.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `num_dispatcher_queues` - (Optional) Number of queues to each dispatcher. Allowed values are 1-2. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `num_flow_cores_sum_changes_to_ignore` - (Optional) Number of changes in num flow cores sum to ignore. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `objsync_config` - (Optional) Configuration knobs for interse object distribution. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `objsync_port` - (Optional) Tcp port on se management interface for interse object distribution. Supported only for externally managed security groups. Not supported on full access deployments. Requires se reboot. Allowed values are 1024-65535. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `openstack_availability_zones` - (Optional) Field introduced in 17.1.1. Maximum of 5 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `openstack_mgmt_network_name` - (Optional) Avi management network name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `openstack_mgmt_network_uuid` - (Optional) Management network uuid. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `os_reserved_memory` - (Optional) Amount of extra memory to be reserved for use by the operating system on a service engine. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `path_mtu_discovery_v4` - (Optional) Enable path mtu discovery feature for ipv4. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `path_mtu_discovery_v6` - (Optional) Enable path mtu discovery feature for ipv6. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pcap_tx_mode` - (Optional) Determines the pcap transmit mode of operation. Requires se reboot. Enum options - PCAP_TX_AUTO, PCAP_TX_SOCKET, PCAP_TX_RING. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pcap_tx_ring_rd_balancing_factor` - (Optional) In pcap mode, reserve a configured portion of tx ring resources for itself and the remaining portion for the rx ring to achieve better balance in terms of queue depth. Requires se reboot. Allowed values are 10-100. Field introduced in 20.1.3. Unit is percent. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `per_app` - (Optional) Per-app se mode is designed for deploying dedicated load balancers per app (vs). In this mode, each se is limited to a max of 2 vss. Vcpus in per-app ses count towards licensing usage at 25% rate. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `per_vs_admission_control` - (Optional) Enable/disable per vs level admission control.enabling this feature will cause the connection and packet throttling on a particular vs that has high packet buffer consumption. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `placement_mode` - (Optional) If placement mode is 'auto', virtual services are automatically placed on service engines. Enum options - PLACEMENT_MODE_AUTO. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `realtime_se_metrics` - (Optional) Enable or deactivate real time se metrics. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `reboot_on_panic` - (Optional) Reboot the vm or host on kernel panic. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `replay_vrf_routes_interval` - (Optional) Routes in vrf are replayed at the specified interval. This should be increased if there are large number of routes. Allowed values are 0-3000. Field introduced in 22.1.3. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `resync_time_interval` - (Optional) Time interval to re-sync se's time with wall clock time. Allowed values are 8-600000. Field introduced in 20.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sdb_flush_interval` - (Optional) Sdb pipeline flush interval. Allowed values are 1-10000. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `sdb_pipeline_size` - (Optional) Sdb pipeline size. Allowed values are 1-10000. 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.
-* `sdb_scan_count` - (Optional) Sdb scan count. Allowed values are 1-1000. 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.
-* `se_bandwidth_type` - (Optional) Select the se bandwidth for the bandwidth license. Enum options - SE_BANDWIDTH_UNLIMITED, SE_BANDWIDTH_25M, SE_BANDWIDTH_200M, SE_BANDWIDTH_1000M, SE_BANDWIDTH_10000M. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials edition(allowed values- se_bandwidth_unlimited), basic edition(allowed values- se_bandwidth_unlimited), enterprise with cloud services edition.
-* `se_debug_trace_sz` - (Optional) Use to cap the size of debug ring min(se_debug_trace_sz, num_dispatcher_cores). Only applicable to > 8g systems. Requires se reboot. Allowed values are 1,2,4,8,255. Field introduced in 22.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_delayed_flow_delete` - (Optional) Delay the cleanup of flowtable entry. To be used under surveillance of avi support. Field introduced in 20.1.2. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `se_deprovision_delay` - (Optional) Duration to preserve unused service engine virtual machines before deleting them. If traffic to a virtual service were to spike up abruptly, this se would still be available to be utilized again rather than creating a new se. If this value is set to 0, controller will never delete any ses and administrator has to manually cleanup unused ses. Allowed values are 0-525600. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dos_profile` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dp_hm_drops` - (Optional) Internal only. Used to simulate se - se hb failure. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_dp_if_state_poll_interval` - (Optional) Number of jiffies between polling interface state. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `se_dp_isolation` - (Optional) Toggle support to run se datapath instances in isolation on exclusive cpus. This improves latency and performance. However, this could reduce the total number of se_dp instances created on that se instance. Supported for >= 8 cpus. Requires se reboot. Field introduced in 20.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_dp_isolation_num_non_dp_cpus` - (Optional) Number of cpus for non se-dp tasks in se datapath isolation mode. Translates total cpus minus 'num_non_dp_cpus' for datapath use. It is recommended to reserve an even number of cpus for hyper-threaded processors. Requires se reboot. Allowed values are 1-8. Special values are 0- auto. Field introduced in 20.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_dp_log_nf_enqueue_percent` - (Optional) Internal buffer full indicator on the service engine beyond which the unfiltered logs are abandoned. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_dp_log_udf_enqueue_percent` - (Optional) Internal buffer full indicator on the service engine beyond which the user filtered logs are abandoned. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_dp_max_hb_version` - (Optional) The highest supported se-se heartbeat protocol version. This version is reported by secondary se to primary se in heartbeat response messages. Allowed values are 1-3. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dp_vnic_queue_stall_event_sleep` - (Optional) Time (in seconds) service engine waits for after generating a vnic transmit queue stall event before resetting thenic. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dp_vnic_queue_stall_threshold` - (Optional) Number of consecutive transmit failures to look for before generating a vnic transmit queue stall event. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dp_vnic_queue_stall_timeout` - (Optional) Time (in milliseconds) to wait for network/nic recovery on detecting a transmit queue stall after which service engine resets the nic. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dp_vnic_restart_on_queue_stall_count` - (Optional) Number of consecutive transmit queue stall events in se_dp_vnic_stall_se_restart_window to look for before restarting se. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dp_vnic_stall_se_restart_window` - (Optional) Window of time (in seconds) during which se_dp_vnic_restart_on_queue_stall_count number of consecutive stalls results in a se restart. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dpdk_pmd` - (Optional) Determines if dpdk pool mode driver should be used or not   0  automatically determine based on hypervisor/nic type 1  unconditionally use dpdk poll mode driver 2  don't use dpdk poll mode driver.requires se reboot. Allowed values are 0-2. Field introduced in 18.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_dump_core_on_assert` - (Optional) Enable core dump on assert. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `se_emulated_cores` - (Optional) Use this to emulate more/less cpus than is actually available. One datapath process is started for each core. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `se_flow_probe_retries` - (Optional) Flow probe retry count if no replies are received.requires se reboot. Allowed values are 0-5. Field introduced in 18.1.4, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_flow_probe_retry_timer` - (Optional) Timeout in milliseconds for flow probe retries.requires se reboot. Allowed values are 20-50. Field introduced in 18.2.5. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_group_analytics_policy` - (Optional) Analytics policy for serviceenginegroup. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_hyperthreaded_mode` - (Optional) Controls the distribution of se data path processes on cpus which support hyper-threading. Requires hyper-threading to be enabled at host level. Requires se reboot. For more details please refer to se placement kb. Enum options - SE_CPU_HT_AUTO, SE_CPU_HT_SPARSE_DISPATCHER_PRIORITY, SE_CPU_HT_SPARSE_PROXY_PRIORITY, SE_CPU_HT_PACKED_CORES. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_ip_encap_ipc` - (Optional) Determines if se-se ipc messages are encapsulated in an ip header       0        automatically determine based on hypervisor type    1        use ip encap unconditionally    ~[0,1]   don't use ip encaprequires se reboot. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_kni_burst_factor` - (Optional) This knob controls the resource availability and burst size used between se datapath and kni. This helps in minimising packet drops when there is higher kni traffic (non-vip traffic from and to linux). The factor takes the following values      0-default. 1-doubles the burst size and kni resources. 2-quadruples the burst size and kni resources. Allowed values are 0-2. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_l3_encap_ipc` - (Optional) Determines if se-se ipc messages use se interface ip instead of vip        0        automatically determine based on hypervisor type    1        use se interface ip unconditionally    ~[0,1]   don't use se interface iprequires se reboot. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_log_buffer_app_blocking_dequeue` - (Optional) Internal flag that blocks dataplane until all application logs are flushed to log-agent process. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_log_buffer_conn_blocking_dequeue` - (Optional) Internal flag that blocks dataplane until all connection logs are flushed to log-agent process. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_log_buffer_events_blocking_dequeue` - (Optional) Internal flag that blocks dataplane until all outstanding events are flushed to log-agent process. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_lro` - (Optional) Enable or disable large receive optimization for vnics.supported on vmxnet3.requires se reboot. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_mp_ring_retry_count` - (Optional) The retry count for the multi-producer enqueue before yielding the cpu. To be used under surveillance of avi support. Field introduced in 20.1.3. Allowed in enterprise edition with any value, essentials edition(allowed values- 500), basic edition(allowed values- 500), enterprise with cloud services edition.
-* `se_mtu` - (Optional) Mtu for the vnics of ses in the se group. Allowed values are 512-9000. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_name_prefix` - (Optional) Prefix to use for virtual machine name of service engines. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_packet_buffer_max` - (Optional) Internal use only. Used to artificially reduce the available number of packet buffers. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `se_pcap_lookahead` - (Optional) Enables lookahead mode of packet receive in pcap mode. Introduced to overcome an issue with hv_netvsc driver. Lookahead mode attempts to ensure that application and kernel's view of the receive rings are consistent. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_pcap_pkt_count` - (Optional) Max number of packets the pcap interface can hold and if the value is 0 the optimum value will be chosen. The optimum value will be chosen based on se-memory, cloud type and number of interfaces.requires se reboot. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_pcap_pkt_sz` - (Optional) Max size of each packet in the pcap interface. Requires se reboot. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_pcap_qdisc_bypass` - (Optional) Bypass the kernel's traffic control layer, to deliver packets directly to the driver. Enabling this feature results in egress packets not being captured in host tcpdump. Note   brief packet reordering or loss may occur upon toggle. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_pcap_reinit_frequency` - (Optional) Frequency in seconds at which periodically a pcap reinit check is triggered. May be used in conjunction with the configuration pcap_reinit_threshold. (valid range   15 mins - 12 hours, 0 - disables). Allowed values are 900-43200. Special values are 0- disable. Field introduced in 17.2.13, 18.1.3, 18.2.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_pcap_reinit_threshold` - (Optional) Threshold for input packet receive errors in pcap mode exceeding which a pcap reinit is triggered. If not set, an unconditional reinit is performed. This value is checked every pcap_reinit_frequency interval. Field introduced in 17.2.13, 18.1.3, 18.2.1. Unit is metric_count. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_probe_port` - (Optional) Tcp port on se where echo service will be run. Field introduced in 17.2.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_rl_prop` - (Optional) Rate limiter properties. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_rum_sampling_nav_interval` - (Optional) Minimum time to wait on server between taking sampleswhen sampling the navigation timing data from the end user client. Field introduced in 18.2.6. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_rum_sampling_nav_percent` - (Optional) Percentage of navigation timing data from the end user client, used for sampling to get client insights. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_rum_sampling_res_interval` - (Optional) Minimum time to wait on server between taking sampleswhen sampling the resource timing data from the end user client. Field introduced in 18.2.6. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_rum_sampling_res_percent` - (Optional) Percentage of resource timing data from the end user client used for sampling to get client insight. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_sb_dedicated_core` - (Optional) Sideband traffic will be handled by a dedicated core.requires se reboot. Field introduced in 16.5.2, 17.1.9, 17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_sb_threads` - (Optional) Number of sideband threads per se.requires se reboot. Allowed values are 1-128. Field introduced in 16.5.2, 17.1.9, 17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_thread_multiplier` - (Optional) Multiplier for se threads based on vcpu. Allowed values are 1-10. Allowed in enterprise edition with any value, essentials edition(allowed values- 1), basic edition(allowed values- 1), enterprise with cloud services edition.
-* `se_time_tracker_props` - (Optional) Time tracker properties for latency audit. Field introduced in 22.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `se_tracert_port_range` - (Optional) Traceroute port range. Field introduced in 17.2.8. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_tunnel_mode` - (Optional) Determines if direct secondary return (dsr) from secondary se is active or not  0  automatically determine based on hypervisor type. 1  enable tunnel mode - dsr is unconditionally disabled. 2  disable tunnel mode - dsr is unconditionally enabled. Tunnel mode can be enabled or disabled at run-time. Allowed values are 0-2. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- 0), basic edition(allowed values- 0), enterprise with cloud services edition.
-* `se_tunnel_udp_port` - (Optional) Udp port for tunneled packets from secondary to primary se in docker bridge mode.requires se reboot. Field introduced in 17.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_tx_batch_size` - (Optional) Number of packets to batch for transmit to the nic. Requires se reboot. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_txq_threshold` - (Optional) Once the tx queue of the dispatcher reaches this threshold, hardware queues are not polled for further packets. To be used under surveillance of avi support. Allowed values are 512-32768. Field introduced in 20.1.2. Allowed in enterprise edition with any value, essentials edition(allowed values- 2048), basic edition(allowed values- 2048), enterprise with cloud services edition.
-* `se_udp_encap_ipc` - (Optional) Determines if se-se ipc messages are encapsulated in a udp header  0  automatically determine based on hypervisor type. 1  use udp encap unconditionally.requires se reboot. Allowed values are 0-1. Field introduced in 17.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_use_dpdk` - (Optional) Determines if dpdk library should be used or not   0  automatically determine based on hypervisor type 1  use dpdk if pcap is not enabled 2  don't use dpdk. Allowed values are 0-2. Field introduced in 18.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_vnic_tx_sw_queue_flush_frequency` - (Optional) Configure the frequency in milliseconds of software transmit spillover queue flush when enabled. This is necessary to flush any packets in the spillover queue in the absence of a packet transmit in the normal course of operation. Allowed values are 50-500. Special values are 0- disable. Field introduced in 20.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_vnic_tx_sw_queue_size` - (Optional) Configure the size of software transmit spillover queue when enabled. Requires se reboot. Allowed values are 128-2048. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_vs_hb_max_pkts_in_batch` - (Optional) Maximum number of aggregated vs heartbeat packets to send in a batch. Allowed values are 1-256. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_vs_hb_max_vs_in_pkt` - (Optional) Maximum number of virtualservices for which heartbeat messages are aggregated in one packet. Allowed values are 1-1024. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `self_se_election` - (Optional) Enable ses to elect a primary amongst themselves in the absence of a connectivity to controller. Field introduced in 18.1.2. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `send_se_ready_timeout` - (Optional) Timeout for sending se_ready without ns helper registration completion. Allowed values are 10-600. Field introduced in 21.1.1. Unit is seconds. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `service_ip6_subnets` - (Optional) Ipv6 subnets assigned to the se group. Required for vs group placement. Field introduced in 18.1.1. Maximum of 128 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `service_ip_subnets` - (Optional) Subnets assigned to the se group. Required for vs group placement. Field introduced in 17.1.1. Maximum of 128 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `shm_minimum_config_memory` - (Optional) Minimum required shared memory to apply any configuration. Allowed values are 0-100. Field introduced in 18.1.2. Unit is mb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `significant_log_throttle` - (Optional) This setting limits the number of significant logs generated per second per core on this se. Default is 100 logs per second. Set it to zero (0) to deactivate throttling. Field introduced in 17.1.3. Unit is per_second. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssl_preprocess_sni_hostname` - (Optional) (beta) preprocess ssl client hello for sni hostname extension.if set to true, this will apply sni child's ssl protocol(s), if they are different from sni parent's allowed ssl protocol(s). Field introduced in 17.2.12, 18.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssl_sess_cache_per_vs` - (Optional) Number of ssl sessions that can be cached per vs. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `transient_shared_memory_max` - (Optional) The threshold for the transient shared config memory in the se. Allowed values are 0-100. Field introduced in 20.1.1. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `udf_log_throttle` - (Optional) This setting limits the number of udf logs generated per second per core on this se. Udf logs are generated due to the configured client log filters or the rules with logging enabled. Default is 100 logs per second. Set it to zero (0) to deactivate throttling. Field introduced in 17.1.3. Unit is per_second. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upstream_connect_timeout` - (Optional) Timeout for backend connection. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `upstream_connpool_enable` - (Optional) Enable upstream connection pool,. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `upstream_read_timeout` - (Optional) Timeout for data to be received from backend. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `upstream_send_timeout` - (Optional) Timeout for upstream to become writable. Field introduced in 21.1.1. Unit is milliseconds. Allowed in enterprise edition with any value, essentials edition(allowed values- 3600000), basic edition(allowed values- 3600000), enterprise with cloud services edition.
-* `use_dp_util_for_scaleout` - (Optional) If enabled, the datapath cpu utilization is consulted by the auto scale-out logic. 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.
-* `use_hyperthreaded_cores` - (Optional) Enables the use of hyper-threaded cores on se. Requires se reboot. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `use_legacy_netlink` - (Optional) Enable legacy model of netlink notifications. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `use_objsync` - (Optional) Enable interse objsyc distribution framework. Field introduced in 20.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `use_standard_alb` - (Optional) Use standard sku azure load balancer. By default cloud level flag is set. If not set, it inherits/uses the use_standard_alb flag from the cloud. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `user_agent_cache_config` - (Optional) Configuration for user-agent cache used in bot management. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `user_defined_metric_age` - (Optional) Defines in seconds how long before an unused user-defined-metric is garbage collected. Field introduced in 21.1.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vcenter_clusters` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_datastore_mode` - (Optional) Enum options - vcenter_datastore_any, vcenter_datastore_local, vcenter_datastore_shared. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_datastores` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_datastores_include` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_folder` - (Optional) Folder to place all the service engine virtual machines in vcenter. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_hosts` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_parking_vnic_pg` - (Optional) Parking port group to be used by 9 vnics at the time of se creation. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vcenters` - (Optional) Vcenter information for scoping at host/cluster level. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcpus_per_se` - (Optional) Number of vcpus for each of the service engine virtual machines. Changes to this setting do not affect existing ses. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vip_asg` - (Optional) When vip_asg is set, vip configuration will be managed by avi.user will be able to configure vip_asg or vips individually at the time of create. Field introduced in 17.2.12, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vnic_dhcp_ip_check_interval` - (Optional) Dhcp ip check interval. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `vnic_dhcp_ip_max_retries` - (Optional) Dhcp ip max retries. 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.
-* `vnic_ip_delete_interval` - (Optional) Wait interval before deleting ip. Field introduced in 21.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `vnic_probe_interval` - (Optional) Probe vnic interval. Field introduced in 21.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `vnic_rpc_retry_interval` - (Optional) Time interval for retrying the failed vnic rpc requests. Field introduced in 21.1.1. Unit is sec. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `vnicdb_cmd_history_size` - (Optional) Size of vnicdb command history. Allowed values are 0-65535. 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.
-* `vs_host_redundancy` - (Optional) Ensure primary and secondary service engines are deployed on different physical hosts. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition. Special default for essentials edition is true, basic edition is true, enterprise is true.
-* `vs_scalein_timeout` - (Optional) Time to wait for the scaled in se to drain existing flows before marking the scalein done. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_scalein_timeout_for_upgrade` - (Optional) During se upgrade, time to wait for the scaled-in se to drain existing flows before marking the scalein done. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_scaleout_timeout` - (Optional) Time to wait for the scaled out se to become ready before marking the scaleout done. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_primary_switchover_additional_wait_time` - (Optional) Wait time for primary switchover ready notification after flows are completed. In certain deployments, there may be an additional delay to accept traffic. For example, for bgp, some time is needed for route advertisement. Allowed values are 0-300. Field introduced in 30.2.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vs_se_scalein_additional_wait_time` - (Optional) Wait time for sending scalein ready notification after flows are completed. In certain deployments, there may be an additional delay to accept traffic. For example, for bgp, some time is needed for route advertisement. Allowed values are 0-300. Field introduced in 30.2.1. Unit is sec. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vs_se_scaleout_additional_wait_time` - (Optional) Wait time for sending scaleout ready notification after virtual service is marked up. In certain deployments, there may be an additional delay to accept traffic. For example, for bgp, some time is needed for route advertisement. Allowed values are 0-300. Field introduced in 18.1.5,18.2.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_se_scaleout_ready_timeout` - (Optional) Timeout in seconds for service engine to sendscaleout ready notification of a virtual service. Allowed values are 0-90. Field introduced in 18.1.5,18.2.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_switchover_timeout` - (Optional) During se upgrade in a legacy active/standby segroup, time to wait for the new primary se to accept flows before marking the switchover done. Field introduced in 17.2.13,18.1.4,18.2.1. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vss_placement` - (Optional) Parameters to place virtual services on only a subset of the cores of an se. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vss_placement_enabled` - (Optional) If set, virtual services will be placed on only a subset of the cores of an se. Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `waf_mempool` - (Optional) Enable memory pool for waf.requires se reboot. Field introduced in 17.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `waf_mempool_size` - (Optional) Memory pool size used for waf.requires se reboot. Field introduced in 17.2.3. Unit is kb. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `accelerated_networking` - (Optional) Enable accelerated networking option for azure se. Accelerated networking enables single root i/o virtualization (sr-iov) to a se vm. This improves networking performance. Field introduced in 17.2.14,18.1.5,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `active_standby` - (Optional) Service engines in active/standby mode for ha failover. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `aggressive_failure_detection` - (Optional) Enable aggressive failover configuration for ha. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `algo` - (Optional) In compact placement, virtual services are placed on existing ses until max_vs_per_se limit is reached. In distributed placement, virtual services are placed on new ses until max_se limit is reached. Once this limit is reached, virtual services are placed on ses with least load. Enum options - PLACEMENT_ALGO_PACKED, PLACEMENT_ALGO_DISTRIBUTED. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allow_burst` - (Optional) Allow ses to be created using burst license. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `app_cache_percent` - (Optional) A percent value of total se memory reserved for applicationcaching. This is an se bootup property and requires se restart.requires se reboot. Allowed values are 0 - 100. Special values are 0- disable. Field introduced in 18.2.3. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition. Special default for essentials edition is 0, basic edition is 0, enterprise edition is 10.
+* `app_cache_threshold` - (Optional) The max memory that can be allocated for the app cache. This value will act as an upper bound on the cache size specified in app_cache_percent. Special values are 0- disable. Field introduced in 20.1.1. Unit is gb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `app_learning_memory_percent` - (Optional) A percent value of total se memory reserved for application learning. This is an se bootup property and requires se restart. Allowed values are 0 - 10. Field introduced in 18.2.3. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `archive_shm_limit` - (Optional) Amount of se memory in gb until which shared memory is collected in core archive. Field introduced in 17.1.3. Unit is gb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `arp_cache_timeout` - (Optional) Timeout in seconds for idle arp entries. Allowed values are 0-86400. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `async_ssl` - (Optional) Ssl handshakes will be handled by dedicated ssl threads.requires se reboot. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `async_ssl_threads` - (Optional) Number of async ssl threads per se_dp.requires se reboot. Allowed values are 1-16. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_rebalance` - (Optional) If set, virtual services will be automatically migrated when load on an se is less than minimum or more than maximum thresholds. Only alerts are generated when the auto_rebalance is not set. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `auto_rebalance_capacity_per_se` - (Optional) Capacities of se for auto rebalance for each criteria. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_rebalance_criteria` - (Optional) Set of criteria for se auto rebalance. Enum options - SE_AUTO_REBALANCE_CPU, SE_AUTO_REBALANCE_PPS, SE_AUTO_REBALANCE_MBPS, SE_AUTO_REBALANCE_OPEN_CONNS, SE_AUTO_REBALANCE_CPS. Field introduced in 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_rebalance_interval` - (Optional) Frequency of rebalance, if 'auto rebalance' is enabled. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_redistribute_active_standby_load` - (Optional) Redistribution of virtual services from the takeover se to the replacement se can cause momentary traffic loss. If the auto-redistribute load option is left in its default off state, any desired rebalancing requires calls to rest api. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `availability_zone_refs` - (Optional) Availability zones for virtual service high availability. It is a reference to an object of type availabilityzone. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `baremetal_dispatcher_handles_flows` - (Optional) Control if dispatcher core also handles tcp flows in baremetal se. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `bgp_peer_monitor_failover_enabled` - (Optional) Enable bgp peer monitoring based failover. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `bgp_state_update_interval` - (Optional) Bgp peer state update interval. Allowed values are 5-100. Field introduced in 17.2.14,18.1.5,18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `buffer_se` - (Optional) Excess service engine capacity provisioned for ha failover. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `compress_ip_rules_for_each_ns_subnet` - (Optional) Compress ip rules into a single subnet based ip rule for each north-south ipam subnet configured in pcap mode in openshift/kubernetes node. Field introduced in 18.2.9, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `config_debugs_on_all_cores` - (Optional) Enable config debugs on all cores of se. Field introduced in 17.2.13,18.1.5,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `connection_memory_percentage` - (Optional) Percentage of memory for connection state. This will come at the expense of memory used for http in-memory cache. Allowed values are 10-90. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `core_shm_app_cache` - (Optional) Include shared memory for app cache in core file.requires se reboot. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `core_shm_app_learning` - (Optional) Include shared memory for app learning in core file.requires se reboot. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cpu_reserve` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cpu_socket_affinity` - (Optional) Allocate all the cpu cores for the service engine virtual machines  on the same cpu socket. Applicable only for vcenter cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `custom_securitygroups_data` - (Optional) Custom security groups to be associated with data vnics for se instances in openstack and aws clouds. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `custom_securitygroups_mgmt` - (Optional) Custom security groups to be associated with management vnic for se instances in openstack and aws clouds. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `custom_tag` - (Optional) Custom tag will be used to create the tags for se instance in aws. Note this is not the same as the prefix for se name. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `data_network_id` - (Optional) Subnet used to spin up the data nic for service engines, used only for azure cloud. Overrides the cloud level setting for service engine subnet. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `datascript_timeout` - (Optional) Number of instructions before datascript times out. Allowed values are 0-100000000. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `deactivate_ipv6_discovery` - (Optional) If activated, ipv6 address and route discovery are deactivated.requires se reboot. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `deactivate_kni_filtering_at_dispatcher` - (Optional) Deactivate filtering of packets to kni interface. To be used under surveillance of avi support. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dedicated_dispatcher_core` - (Optional) Dedicate the core that handles packet receive/transmit from the network to just the dispatching function. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disable_avi_securitygroups` - (Optional) By default, avi creates and manages security groups along with custom sg provided by user. Set this to true to disallow avi to create and manage new security groups. Avi will only make use of custom security groups provided by user. This option is supported for aws and openstack cloud types. Field introduced in 17.2.13,18.1.4,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disable_csum_offloads` - (Optional) Stop using tcp/udp and ip checksum offload features of nics. Field introduced in 17.1.14, 17.2.5, 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disable_flow_probes` - (Optional) Disable flow probes for scaled out vs'es. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `disable_gro` - (Optional) Disable generic receive offload (gro) in dpdk poll-mode driver packet receive path. Gro can be enabled on nics that do not support lro (large receive offload) or do not gain performance boost from lro. Gro is on by default on nics in a system with 8 vcpus or higher. Field introduced in 17.2.5, 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disable_se_memory_check` - (Optional) If set, disable the config memory check done in service engine. Field introduced in 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disable_tso` - (Optional) Disable tcp segmentation offload (tso) in dpdk poll-mode driver packet transmit path. Tso is on by default on nics that support it. Field introduced in 17.2.5, 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disk_per_se` - (Optional) Amount of disk space for each of the service engine virtual machines. Unit is gb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `distribute_load_active_standby` - (Optional) Use both the active and standby service engines for virtual service placement in the legacy active standby ha mode. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `distribute_queues` - (Optional) Distributes queue ownership among cores so multiple cores handle dispatcher duties. Requires se reboot. Deprecated from 18.2.8, instead use max_queues_per_vnic. Field introduced in 17.2.8. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `distribute_vnics` - (Optional) Distributes vnic ownership among cores so multiple cores handle dispatcher duties.requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `downstream_send_timeout` - (Optional) Timeout for downstream to become writable. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dp_aggressive_deq_interval_msec` - (Optional) Dequeue interval for receive queue from se_dp in aggressive mode. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dp_aggressive_enq_interval_msec` - (Optional) Enqueue interval for request queue to se_dp in aggressive mode. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dp_aggressive_hb_frequency` - (Optional) Frequency of se - se hb messages when aggressive failure mode detection is enabled. Field introduced in 20.1.3. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dp_aggressive_hb_timeout_count` - (Optional) Consecutive hb failures after which failure is reported to controller,when aggressive failure mode detection is enabled. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dp_deq_interval_msec` - (Optional) Dequeue interval for receive queue from se_dp. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dp_enq_interval_msec` - (Optional) Enqueue interval for request queue to se_dp. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dp_hb_frequency` - (Optional) Frequency of se - se hb messages when aggressive failure mode detection is not enabled. Field introduced in 20.1.3. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dp_hb_timeout_count` - (Optional) Consecutive hb failures after which failure is reported to controller, when aggressive failure mode detection is not enabled. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dpdk_gro_timeout_interval` - (Optional) The timeout for gro coalescing interval. 0 indicates non-timer based gro. Allowed values are 0-900. Field introduced in 22.1.1. Unit is microseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_gratarp_permanent` - (Optional) Enable gratarp for vip_ip. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_hsm_log` - (Optional) Enable hsm luna engine logs. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_hsm_priming` - (Optional) (this is a beta feature). Enable hsm key priming. If enabled, key handles on the hsm will be synced to se before processing client connections. Field introduced in 17.2.7, 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_multi_lb` - (Optional) Applicable only for azure cloud with basic sku lb. If set, additional azure lbs will be automatically created if resources in existing lb are exhausted. Field introduced in 17.2.10, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_pcap_tx_ring` - (Optional) Enable tx ring support in pcap mode of operation. Tso feature is not supported with tx ring enabled. Deprecated from 18.2.8, instead use pcap_tx_mode. Requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_qat` - (Optional) This knob enables the service engine to use qat offloads (if the host cpu is capable, and the qat device is exposed). Requires se reboot. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ephemeral_portrange_end` - (Optional) End local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ephemeral_portrange_start` - (Optional) Start local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `extra_config_multiplier` - (Optional) Multiplier for extra config to support large vs/pool config. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `extra_shared_config_memory` - (Optional) Extra config memory to support large geo db configuration. Field introduced in 17.1.1. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `flow_table_new_syn_max_entries` - (Optional) Maximum number of flow table entries that have not completed tcp three-way handshake yet. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `free_list_size` - (Optional) Number of entries in the free list. Field introduced in 17.2.10, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `gcp_config` - (Optional) Google cloud platform, service engine group configuration. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gratarp_permanent_periodicity` - (Optional) Gratarp periodicity for vip-ip. Allowed values are 5-30. Field introduced in 18.2.3. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `grpc_channel_connect_timeout` - (Optional) Timeout in seconds that se waits for a grpc channel to connect to server, before it retries. Allowed values are 5-45. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gve_enabled` - (Optional) Deploys google virtual ethernet (gve) - gvnic for all supported intances types in gcp. Applies only to newly created se's. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ha_mode` - (Optional) High availability mode for all the virtual services using this service engine group. Enum options - HA_MODE_SHARED_PAIR, HA_MODE_SHARED, HA_MODE_LEGACY_ACTIVE_STANDBY. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- ha_mode_legacy_active_standby), basic (allowed values- ha_mode_legacy_active_standby) edition. Special default for essentials edition is ha_mode_legacy_active_standby, basic edition is ha_mode_legacy_active_standby, enterprise edition is ha_mode_shared.
+* `handle_per_pkt_attack` - (Optional) Configuration to handle per packet attack handling.for example, dns reflection attack is a type of attack where a response packet is sent to the dns vs.this configuration tells if such packets should be dropped without further processing. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `hardwaresecuritymodulegroup_ref` - (Optional) It is a reference to an object of type hardwaresecuritymodulegroup. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `heap_minimum_config_memory` - (Optional) Minimum required heap memory to apply any configuration. Allowed values are 0-100. Field introduced in 18.1.2. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `hm_on_standby` - (Optional) Enable active health monitoring from the standby se for all placed virtual services. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition. Special default for essentials edition is false, basic edition is false, enterprise edition is true.
+* `host_attribute_key` - (Optional) Key of a (key, value) pair identifying a label for a set of nodes usually in container clouds. Needs to be specified together with host_attribute_value. Ses can be configured differently including ha modes across different se groups. May also be used for isolation between different classes of virtualservices. Virtualservices' se group may be specified via annotations/labels. A openshift/kubernetes namespace maybe annotated with a matching se group label as openshift.io/node-selector  apptype=prod. When multiple se groups are used in a cloud with host attributes specified,just a single se group can exist as a match-all se group without a host_attribute_key. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `host_attribute_value` - (Optional) Value of a (key, value) pair identifying a label for a set of nodes usually in container clouds. Needs to be specified together with host_attribute_key. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `host_gateway_monitor` - (Optional) Enable the host gateway monitor when service engine is deployed as docker container. Disabled by default. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `http_rum_console_log` - (Optional) Enable javascript console logs on the client browser when collecting client insights. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `http_rum_min_content_length` - (Optional) Minimum response size content length to sample for client insights. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 64), basic (allowed values- 64) edition.
+* `hybrid_rss_mode` - (Optional) Toggles se hybrid only mode of operation in dpdk mode with rss configured;where-in each se datapath instance operates as a standalone hybrid instance performing both dispatcher and proxy function. Requires reboot. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `hypervisor` - (Optional) Override default hypervisor. Enum options - DEFAULT, VMWARE_ESX, KVM, VMWARE_VSAN, XEN. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ignore_docker_mac_change` - (Optional) Ignore docker mac change. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ignore_rtt_threshold` - (Optional) Ignore rtt samples if it is above threshold. Field introduced in 17.1.6,17.2.2. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ingress_access_data` - (Optional) Program se security group ingress rules to allow vip data access from remote cidr type. Enum options - SG_INGRESS_ACCESS_NONE, SG_INGRESS_ACCESS_ALL, SG_INGRESS_ACCESS_VPC. Field introduced in 17.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ingress_access_mgmt` - (Optional) Program se security group ingress rules to allow ssh/icmp management access from remote cidr type. Enum options - SG_INGRESS_ACCESS_NONE, SG_INGRESS_ACCESS_ALL, SG_INGRESS_ACCESS_VPC. Field introduced in 17.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `instance_flavor` - (Optional) Instance/flavor name for se instance. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `instance_flavor_info` - (Optional) Additional information associated with instance_flavor. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `iptables` - (Optional) Iptable rules. Maximum of 128 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `kni_allowed_server_ports` - (Optional) Port ranges for any servers running in inband linuxserver clouds. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `kv_val_max_len` - (Optional) Max length allowed for the value in a kv pair. Allowed values are 128,256,512,1024,2048,4096,8192. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `l7_conns_per_core` - (Optional) Number of l7 connections that can be cached per core. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `l7_resvd_listen_conns_per_core` - (Optional) Number of reserved l7 listener connections per core. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `labels` - (Optional) Labels associated with this se group. Field introduced in 20.1.1. Maximum of 1 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `lbaction_num_requests_to_dispatch` - (Optional) Number of requests to dispatch from the request. Queue at a regular interval. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `lbaction_rq_per_request_max_retries` - (Optional) Maximum retries per request in the request queue. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `least_load_core_selection` - (Optional) Select core with least load for new flow. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `license_tier` - (Optional) Specifies the license tier which would be used. This field by default inherits the value from cloud. Enum options - ENTERPRISE_16, ENTERPRISE, ENTERPRISE_18, BASIC, ESSENTIALS, ENTERPRISE_WITH_CLOUD_SERVICES. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `license_type` - (Optional) If no license type is specified then default license enforcement for the cloud type is chosen. Enum options - LIC_BACKEND_SERVERS, LIC_SOCKETS, LIC_CORES, LIC_HOSTS, LIC_SE_BANDWIDTH, LIC_METERED_SE_BANDWIDTH. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `log_agent_compress_logs` - (Optional) Flag to indicate if log files are compressed upon full on the service engine. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_debug_enabled` - (Optional) Enable debug logs by default on service engine. This includes all other debugging logs. Debug logs can also be explcitly enabled from the cli shell. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_file_sz_appl` - (Optional) Maximum application log file size before rollover. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_file_sz_conn` - (Optional) Maximum connection log file size before rollover. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_file_sz_debug` - (Optional) Maximum debug log file size before rollover. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_file_sz_event` - (Optional) Maximum event log file size before rollover. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_log_storage_min_sz` - (Optional) Minimum storage allocated for logs irrespective of memory and cores. Field introduced in 21.1.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_max_concurrent_rsync` - (Optional) Maximum concurrent rsync requests initiated from log-agent to the controller. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_max_storage_excess_percent` - (Optional) Excess percentage threshold of disk size to trigger cleanup of logs on the service engine. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_max_storage_ignore_percent` - (Optional) Maximum storage on the disk not allocated for logs on the service engine. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_min_storage_per_vs` - (Optional) Minimum storage allocated to any given virtualservice on the service engine. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_sleep_interval` - (Optional) Internal timer to stall log-agent and prevent it from hogging cpu cycles on the service engine. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_trace_enabled` - (Optional) Enable trace logs by default on service engine. Configuration operations are logged along with other important logs by service engine. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_agent_unknown_vs_timer` - (Optional) Timeout to purge unknown virtual service logs from the service engine. Field introduced in 21.1.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_disksz` - (Optional) Maximum disk capacity (in mb) to be allocated to an se. This is exclusively used for debug and log data. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `log_malloc_failure` - (Optional) Se will log memory allocation related failure to the se_trace file, wherever available. Field introduced in 20.1.2. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `log_message_max_file_list_size` - (Optional) Maximum number of file names in a log message. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_concurrent_external_hm` - (Optional) Maximum number of external health monitors that can run concurrently in a service engine. This helps control the cpu and memory use by external health monitors. Special values are 0- value will be internally calculated based on cpu and memory. Field introduced in 18.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_cpu_usage` - (Optional) When cpu usage on an se exceeds this threshold, virtual services hosted on this se may be rebalanced to other ses to reduce load. A new se may be created as part of this process. Allowed values are 40-90. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_memory_per_mempool` - (Optional) Max bytes that can be allocated in a single mempool. Field introduced in 18.1.5. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_num_http_sessions_to_store` - (Optional) Maximum number of http session that will be created. Each session uses about 1kb in the key-value storage in shared memory. Setting this value too high can lead to exhaustion of shared memory and affect services. Allowed values are 1-2000000. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `max_num_se_dps` - (Optional) Configures the maximum number of se_dp processes that handles traffic. If not configured, defaults to the number of cpus on the se. If decreased, it will only take effect after se reboot. Allowed values are 1-128. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `max_public_ips_per_lb` - (Optional) Applicable to azure platform only. Maximum number of public ips per azure lb. Field introduced in 17.2.12, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_queues_per_vnic` - (Optional) Maximum number of queues per vnic setting to '0' utilises all queues that are distributed across dispatcher cores. Allowed values are 0,1,2,4,8,16. Field introduced in 18.2.7, 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1), basic (allowed values- 1) edition.
+* `max_rules_per_lb` - (Optional) Applicable to azure platform only. Maximum number of rules per azure lb. Field introduced in 17.2.12, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_scaleout_per_vs` - (Optional) Maximum number of active service engines for the virtual service. Allowed values are 1-64. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_se` - (Optional) Maximum number of services engines in this group. Allowed values are 0-1000. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_skb_frags` - (Optional) Maximum of number of 4 kb pages allocated to the linux kernel gro subsystem for packet coalescing. This parameter is limited to supported kernels only. Requires se reboot. Allowed values are 1-17. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `max_vs_per_se` - (Optional) Maximum number of virtual services that can be placed on a single service engine. Allowed values are 1-1000. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mem_reserve` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `memory_for_config_update` - (Optional) Indicates the percent of memory reserved for config updates. Allowed values are 0-100. Field introduced in 18.1.2. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `memory_per_se` - (Optional) Amount of memory for each of the service engine virtual machines. Changes to this setting do not affect existing ses. Allowed values are 2048-262144. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `metrics_collection_mode` - (Optional) Metrics collection mode, 0 = pull mode. Se_agent pulls metrics from se_dp,  1 = push mode. Se_dp pushes metrics to se_agent. 9 = special value to reset collection state in push mode. Allowed values are 0-1. Special values are 9- reset metrics collection state. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `mgmt_network_ref` - (Optional) Management network to use for avi service engines. It is a reference to an object of type network. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mgmt_subnet` - (Optional) Management subnet to use for avi service engines. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `min_cpu_usage` - (Optional) When cpu usage on an se falls below the minimum threshold, virtual services hosted on the se may be consolidated onto other underutilized ses. After consolidation, unused service engines may then be eligible for deletion. Allowed values are 20-60. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `min_scaleout_per_vs` - (Optional) Minimum number of active service engines for the virtual service. Allowed values are 1-64. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `min_se` - (Optional) Minimum number of services engines in this group (relevant for se autorebalance only). Allowed values are 0-1000. Field introduced in 17.2.13,18.1.3,18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `minimum_connection_memory` - (Optional) Indicates the percent of memory reserved for connections. Allowed values are 0-100. Field introduced in 18.1.2. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `multicast_enable` - (Optional) This knob enables the service engine to process multicast traffic(for vmware hypervisor). Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `n_log_streaming_threads` - (Optional) Number of threads to use for log streaming. Allowed values are 1-100. Field introduced in 17.2.12, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nd6_cache_timeout` - (Optional) Timeout in seconds for idle nd6 entries. Allowed values are 0-86400. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `netlink_poller_threads` - (Optional) Number of threads to poll for netlink messages excluding the thread for default namespace. Requires se reboot. Allowed values are 1-32. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `netlink_sock_buf_size` - (Optional) Socket buffer size for the netlink sockets. Requires se reboot. Allowed values are 1-128. Field introduced in 21.1.1. Unit is mega_bytes. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ngx_free_connection_stack` - (Optional) Free the connection stack. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `non_significant_log_throttle` - (Optional) This setting limits the number of non-significant logs generated per second per core on this se. Default is 100 logs per second. Set it to zero (0) to deactivate throttling. Field introduced in 17.1.3. Unit is per_second. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ns_helper_deq_interval_msec` - (Optional) Dequeue interval for receive queue from ns helper. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ntp_sync_fail_event` - (Optional) Toggle se ntp synchronization failure events generation. Disabled by default. Field introduced in 22.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ntp_sync_status_interval` - (Optional) Configures the interval at which se synchronization status with ntp server(s) is verified. A value of zero disables se ntp synchronization status validation. Allowed values are 120-900. Special values are 0- disable. Field introduced in 22.1.2. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `num_dispatcher_cores` - (Optional) Number of dispatcher cores (0,1,2,4,8 or 16). If set to 0, then number of dispatcher cores is deduced automatically.requires se reboot. Allowed values are 0,1,2,4,8,16. Field introduced in 17.2.12, 18.1.3, 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `num_dispatcher_queues` - (Optional) Number of queues to each dispatcher. Allowed values are 1-2. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `num_flow_cores_sum_changes_to_ignore` - (Optional) Number of changes in num flow cores sum to ignore. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `objsync_config` - (Optional) Configuration knobs for interse object distribution. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `objsync_port` - (Optional) Tcp port on se management interface for interse object distribution. Supported only for externally managed security groups. Not supported on full access deployments. Requires se reboot. Allowed values are 1024-65535. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `openstack_availability_zones` - (Optional) Field introduced in 17.1.1. Maximum of 5 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `openstack_mgmt_network_name` - (Optional) Avi management network name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `openstack_mgmt_network_uuid` - (Optional) Management network uuid. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `os_reserved_memory` - (Optional) Amount of extra memory to be reserved for use by the operating system on a service engine. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `path_mtu_discovery_v4` - (Optional) Enable path mtu discovery feature for ipv4. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `path_mtu_discovery_v6` - (Optional) Enable path mtu discovery feature for ipv6. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pcap_tx_mode` - (Optional) Determines the pcap transmit mode of operation. Requires se reboot. Enum options - PCAP_TX_AUTO, PCAP_TX_SOCKET, PCAP_TX_RING. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pcap_tx_ring_rd_balancing_factor` - (Optional) In pcap mode, reserve a configured portion of tx ring resources for itself and the remaining portion for the rx ring to achieve better balance in terms of queue depth. Requires se reboot. Allowed values are 10-100. Field introduced in 20.1.3. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `per_app` - (Optional) Per-app se mode is designed for deploying dedicated load balancers per app (vs). In this mode, each se is limited to a max of 2 vss. Vcpus in per-app ses count towards licensing usage at 25% rate. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `per_vs_admission_control` - (Optional) Enable/disable per vs level admission control.enabling this feature will cause the connection and packet throttling on a particular vs that has high packet buffer consumption. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `placement_mode` - (Optional) If placement mode is 'auto', virtual services are automatically placed on service engines. Enum options - PLACEMENT_MODE_AUTO. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pre_upgrade_se_available_mem_threshold` - (Optional) Available memory threshold on se in mb, to get qualified for upgrade operation. Adjusting this knob will override the internal value of available memory threshold for se, thereby qualifying it for upgrade operation. '0' is a special auto value, which will indicate that memory threshold is calculated based on total memory size of the se. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `realtime_se_metrics` - (Optional) Enable or deactivate real time se metrics. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `reboot_on_panic` - (Optional) Reboot the vm or host on kernel panic. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `replay_vrf_routes_interval` - (Optional) Routes in vrf are replayed at the specified interval. This should be increased if there are large number of routes. Allowed values are 0-3000. Field introduced in 22.1.3. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `resync_time_interval` - (Optional) Time interval to re-sync se's time with wall clock time. Allowed values are 8-600000. Field introduced in 20.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sdb_flush_interval` - (Optional) Sdb pipeline flush interval. Allowed values are 1-10000. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sdb_pipeline_size` - (Optional) Sdb pipeline size. Allowed values are 1-10000. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sdb_scan_count` - (Optional) Sdb scan count. Allowed values are 1-1000. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_bandwidth_type` - (Optional) Select the se bandwidth for the bandwidth license. Enum options - SE_BANDWIDTH_UNLIMITED, SE_BANDWIDTH_25M, SE_BANDWIDTH_200M, SE_BANDWIDTH_1000M, SE_BANDWIDTH_10000M. Field introduced in 17.2.5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- se_bandwidth_unlimited), basic (allowed values- se_bandwidth_unlimited) edition.
+* `se_debug_trace_sz` - (Optional) Use to cap the size of debug ring min(se_debug_trace_sz, num_dispatcher_cores). Only applicable to > 8g systems. Requires se reboot. Allowed values are 1,2,4,8,255. Field introduced in 22.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_delayed_flow_delete` - (Optional) Delay the cleanup of flowtable entry. To be used under surveillance of avi support. Field introduced in 20.1.2. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `se_deprovision_delay` - (Optional) Duration to preserve unused service engine virtual machines before deleting them. If traffic to a virtual service were to spike up abruptly, this se would still be available to be utilized again rather than creating a new se. If this value is set to 0, controller will never delete any ses and administrator has to manually cleanup unused ses. Allowed values are 0-525600. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dos_profile` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dp_hm_drops` - (Optional) Internal only. Used to simulate se - se hb failure. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_dp_if_state_poll_interval` - (Optional) Number of jiffies between polling interface state. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dp_isolation` - (Optional) Toggle support to run se datapath instances in isolation on exclusive cpus. This improves latency and performance. However, this could reduce the total number of se_dp instances created on that se instance. Supported for >= 8 cpus. Requires se reboot. Field introduced in 20.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_dp_isolation_num_non_dp_cpus` - (Optional) Number of cpus for non se-dp tasks in se datapath isolation mode. Translates total cpus minus 'num_non_dp_cpus' for datapath use. It is recommended to reserve an even number of cpus for hyper-threaded processors. Requires se reboot. Allowed values are 1-8. Special values are 0- auto. Field introduced in 20.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_dp_log_nf_enqueue_percent` - (Optional) Internal buffer full indicator on the service engine beyond which the unfiltered logs are abandoned. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_dp_log_udf_enqueue_percent` - (Optional) Internal buffer full indicator on the service engine beyond which the user filtered logs are abandoned. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_dp_max_hb_version` - (Optional) The highest supported se-se heartbeat protocol version. This version is reported by secondary se to primary se in heartbeat response messages. Allowed values are 1-3. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dp_vnic_queue_stall_event_sleep` - (Optional) Time (in seconds) service engine waits for after generating a vnic transmit queue stall event before resetting thenic. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dp_vnic_queue_stall_threshold` - (Optional) Number of consecutive transmit failures to look for before generating a vnic transmit queue stall event. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dp_vnic_queue_stall_timeout` - (Optional) Time (in milliseconds) to wait for network/nic recovery on detecting a transmit queue stall after which service engine resets the nic. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dp_vnic_restart_on_queue_stall_count` - (Optional) Number of consecutive transmit queue stall events in se_dp_vnic_stall_se_restart_window to look for before restarting se. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dp_vnic_stall_se_restart_window` - (Optional) Window of time (in seconds) during which se_dp_vnic_restart_on_queue_stall_count number of consecutive stalls results in a se restart. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dpdk_pmd` - (Optional) Determines if dpdk pool mode driver should be used or not   0  automatically determine based on hypervisor/nic type 1  unconditionally use dpdk poll mode driver 2  don't use dpdk poll mode driver.requires se reboot. Allowed values are 0-2. Field introduced in 18.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_dump_core_on_assert` - (Optional) Enable core dump on assert. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_emulated_cores` - (Optional) Use this to emulate more/less cpus than is actually available. One datapath process is started for each core. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `se_flow_probe_retries` - (Optional) Flow probe retry count if no replies are received.requires se reboot. Allowed values are 0-5. Field introduced in 18.1.4, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_flow_probe_retry_timer` - (Optional) Timeout in milliseconds for flow probe retries.requires se reboot. Allowed values are 20-50. Field introduced in 18.2.5. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_group_analytics_policy` - (Optional) Analytics policy for serviceenginegroup. Field introduced in 20.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_hyperthreaded_mode` - (Optional) Controls the distribution of se data path processes on cpus which support hyper-threading. Requires hyper-threading to be enabled at host level. Requires se reboot. For more details please refer to se placement kb. Enum options - SE_CPU_HT_AUTO, SE_CPU_HT_SPARSE_DISPATCHER_PRIORITY, SE_CPU_HT_SPARSE_PROXY_PRIORITY, SE_CPU_HT_PACKED_CORES. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_ip_encap_ipc` - (Optional) Determines if se-se ipc messages are encapsulated in an ip header       0        automatically determine based on hypervisor type    1        use ip encap unconditionally    ~[0,1]   don't use ip encaprequires se reboot. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_kni_burst_factor` - (Optional) This knob controls the resource availability and burst size used between se datapath and kni. This helps in minimising packet drops when there is higher kni traffic (non-vip traffic from and to linux). The factor takes the following values      0-default. 1-doubles the burst size and kni resources. 2-quadruples the burst size and kni resources. 3-increases the burst size and kni resources by a factor of eight. Allowed values are 0-3. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_l3_encap_ipc` - (Optional) Determines if se-se ipc messages use se interface ip instead of vip        0        automatically determine based on hypervisor type    1        use se interface ip unconditionally    ~[0,1]   don't use se interface iprequires se reboot. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_log_buffer_app_blocking_dequeue` - (Optional) Internal flag that blocks dataplane until all application logs are flushed to log-agent process. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_log_buffer_conn_blocking_dequeue` - (Optional) Internal flag that blocks dataplane until all connection logs are flushed to log-agent process. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_log_buffer_events_blocking_dequeue` - (Optional) Internal flag that blocks dataplane until all outstanding events are flushed to log-agent process. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_lro` - (Optional) Enable or disable large receive optimization for vnics.supported on vmxnet3.requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_mp_ring_retry_count` - (Optional) The retry count for the multi-producer enqueue before yielding the cpu. To be used under surveillance of avi support. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 500), basic (allowed values- 500) edition.
+* `se_mtu` - (Optional) Mtu for the vnics of ses in the se group. Allowed values are 512-9000. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_name_prefix` - (Optional) Prefix to use for virtual machine name of service engines. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_packet_buffer_max` - (Optional) Internal use only. Used to artificially reduce the available number of packet buffers. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_pcap_lookahead` - (Optional) Enables lookahead mode of packet receive in pcap mode. Introduced to overcome an issue with hv_netvsc driver. Lookahead mode attempts to ensure that application and kernel's view of the receive rings are consistent. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_pcap_pkt_count` - (Optional) Max number of packets the pcap interface can hold and if the value is 0 the optimum value will be chosen. The optimum value will be chosen based on se-memory, cloud type and number of interfaces.requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_pcap_pkt_sz` - (Optional) Max size of each packet in the pcap interface. Requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_pcap_qdisc_bypass` - (Optional) Bypass the kernel's traffic control layer, to deliver packets directly to the driver. Enabling this feature results in egress packets not being captured in host tcpdump. Note   brief packet reordering or loss may occur upon toggle. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_pcap_reinit_frequency` - (Optional) Frequency in seconds at which periodically a pcap reinit check is triggered. May be used in conjunction with the configuration pcap_reinit_threshold. (valid range   15 mins - 12 hours, 0 - disables). Allowed values are 900-43200. Special values are 0- disable. Field introduced in 17.2.13, 18.1.3, 18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_pcap_reinit_threshold` - (Optional) Threshold for input packet receive errors in pcap mode exceeding which a pcap reinit is triggered. If not set, an unconditional reinit is performed. This value is checked every pcap_reinit_frequency interval. Field introduced in 17.2.13, 18.1.3, 18.2.1. Unit is metric_count. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_probe_port` - (Optional) Tcp port on se where echo service will be run. Field introduced in 17.2.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_rl_prop` - (Optional) Rate limiter properties. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_rum_sampling_nav_interval` - (Optional) Minimum time to wait on server between taking sampleswhen sampling the navigation timing data from the end user client. Field introduced in 18.2.6. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_rum_sampling_nav_percent` - (Optional) Percentage of navigation timing data from the end user client, used for sampling to get client insights. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_rum_sampling_res_interval` - (Optional) Minimum time to wait on server between taking sampleswhen sampling the resource timing data from the end user client. Field introduced in 18.2.6. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_rum_sampling_res_percent` - (Optional) Percentage of resource timing data from the end user client used for sampling to get client insight. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_sb_dedicated_core` - (Optional) Sideband traffic will be handled by a dedicated core.requires se reboot. Field introduced in 16.5.2, 17.1.9, 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_sb_threads` - (Optional) Number of sideband threads per se.requires se reboot. Allowed values are 1-128. Field introduced in 16.5.2, 17.1.9, 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_thread_multiplier` - (Optional) Multiplier for se threads based on vcpu. Allowed values are 1-10. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1), basic (allowed values- 1) edition.
+* `se_time_tracker_props` - (Optional) Time tracker properties for latency audit. Field introduced in 22.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_tracert_port_range` - (Optional) Traceroute port range. Field introduced in 17.2.8. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_tunnel_mode` - (Optional) Determines if direct secondary return (dsr) from secondary se is active or not  0  automatically determine based on hypervisor type. 1  enable tunnel mode - dsr is unconditionally disabled. 2  disable tunnel mode - dsr is unconditionally enabled. Tunnel mode can be enabled or disabled at run-time. Allowed values are 0-2. Field introduced in 17.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 0), basic (allowed values- 0) edition.
+* `se_tunnel_udp_port` - (Optional) Udp port for tunneled packets from secondary to primary se in docker bridge mode.requires se reboot. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_tx_batch_size` - (Optional) Number of packets to batch for transmit to the nic. Requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_txq_threshold` - (Optional) Once the tx queue of the dispatcher reaches this threshold, hardware queues are not polled for further packets. To be used under surveillance of avi support. Allowed values are 512-32768. Field introduced in 20.1.2. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 2048), basic (allowed values- 2048) edition.
+* `se_udp_encap_ipc` - (Optional) Determines if se-se ipc messages are encapsulated in a udp header  0  automatically determine based on hypervisor type. 1  use udp encap unconditionally.requires se reboot. Allowed values are 0-1. Field introduced in 17.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_use_dpdk` - (Optional) Determines if dpdk library should be used or not   0  automatically determine based on hypervisor type 1  use dpdk if pcap is not enabled 2  don't use dpdk. Allowed values are 0-2. Field introduced in 18.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_vnic_tx_sw_queue_flush_frequency` - (Optional) Configure the frequency in milliseconds of software transmit spillover queue flush when enabled. This is necessary to flush any packets in the spillover queue in the absence of a packet transmit in the normal course of operation. Allowed values are 50-500. Special values are 0- disable. Field introduced in 20.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_vnic_tx_sw_queue_size` - (Optional) Configure the size of software transmit spillover queue when enabled. Requires se reboot. Allowed values are 128-2048. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_vs_hb_max_pkts_in_batch` - (Optional) Maximum number of aggregated vs heartbeat packets to send in a batch. Allowed values are 1-256. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_vs_hb_max_vs_in_pkt` - (Optional) Maximum number of virtualservices for which heartbeat messages are aggregated in one packet. Allowed values are 1-1024. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `self_se_election` - (Optional) Enable ses to elect a primary amongst themselves in the absence of a connectivity to controller. Field introduced in 18.1.2. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `send_se_ready_timeout` - (Optional) Timeout for sending se_ready without ns helper registration completion. Allowed values are 10-600. Field introduced in 21.1.1. Unit is seconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_ip6_subnets` - (Optional) Ipv6 subnets assigned to the se group. Required for vs group placement. Field introduced in 18.1.1. Maximum of 128 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_ip_subnets` - (Optional) Subnets assigned to the se group. Required for vs group placement. Field introduced in 17.1.1. Maximum of 128 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `shm_minimum_config_memory` - (Optional) Minimum required shared memory to apply any configuration. Allowed values are 0-100. Field introduced in 18.1.2. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `significant_log_throttle` - (Optional) This setting limits the number of significant logs generated per second per core on this se. Default is 100 logs per second. Set it to zero (0) to deactivate throttling. Field introduced in 17.1.3. Unit is per_second. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_preprocess_sni_hostname` - (Optional) (beta) preprocess ssl client hello for sni hostname extension.if set to true, this will apply sni child's ssl protocol(s), if they are different from sni parent's allowed ssl protocol(s). Field introduced in 17.2.12, 18.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_sess_cache_per_vs` - (Optional) Number of ssl sessions that can be cached per vs. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `transient_shared_memory_max` - (Optional) The threshold for the transient shared config memory in the se. Allowed values are 0-100. Field introduced in 20.1.1. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `udf_log_throttle` - (Optional) This setting limits the number of udf logs generated per second per core on this se. Udf logs are generated due to the configured client log filters or the rules with logging enabled. Default is 100 logs per second. Set it to zero (0) to deactivate throttling. Field introduced in 17.1.3. Unit is per_second. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `upstream_connect_timeout` - (Optional) Timeout for backend connection. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `upstream_connpool_enable` - (Optional) Enable upstream connection pool,. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `upstream_read_timeout` - (Optional) Timeout for data to be received from backend. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `upstream_send_timeout` - (Optional) Timeout for upstream to become writable. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 3600000), basic (allowed values- 3600000) edition.
+* `use_dp_util_for_scaleout` - (Optional) If enabled, the datapath cpu utilization is consulted by the auto scale-out logic. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_hyperthreaded_cores` - (Optional) Enables the use of hyper-threaded cores on se. Requires se reboot. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_legacy_netlink` - (Optional) Enable legacy model of netlink notifications. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `use_objsync` - (Optional) Enable interse objsyc distribution framework. Field introduced in 20.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `use_standard_alb` - (Optional) Use standard sku azure load balancer. By default cloud level flag is set. If not set, it inherits/uses the use_standard_alb flag from the cloud. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `user_agent_cache_config` - (Optional) Configuration for user-agent cache used in bot management. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `user_defined_metric_age` - (Optional) Defines in seconds how long before an unused user-defined-metric is garbage collected. Field introduced in 21.1.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vcenter_clusters` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_datastore_mode` - (Optional) Enum options - vcenter_datastore_any, vcenter_datastore_local, vcenter_datastore_shared. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_datastores` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_datastores_include` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_folder` - (Optional) Folder to place all the service engine virtual machines in vcenter. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_hosts` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_parking_vnic_pg` - (Optional) Parking port group to be used by 9 vnics at the time of se creation. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vcenters` - (Optional) Vcenter information for scoping at host/cluster level. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcpus_per_se` - (Optional) Number of vcpus for each of the service engine virtual machines. Changes to this setting do not affect existing ses. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vip_asg` - (Optional) When vip_asg is set, vip configuration will be managed by avi.user will be able to configure vip_asg or vips individually at the time of create. Field introduced in 17.2.12, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vnic_dhcp_ip_check_interval` - (Optional) Dhcp ip check interval. Allowed values are 1-1000. Field introduced in 21.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vnic_dhcp_ip_max_retries` - (Optional) Dhcp ip max retries. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vnic_ip_delete_interval` - (Optional) Wait interval before deleting ip. Field introduced in 21.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vnic_probe_interval` - (Optional) Probe vnic interval. Field introduced in 21.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vnic_rpc_retry_interval` - (Optional) Time interval for retrying the failed vnic rpc requests. Field introduced in 21.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vnicdb_cmd_history_size` - (Optional) Size of vnicdb command history. Allowed values are 0-65535. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_host_redundancy` - (Optional) Ensure primary and secondary service engines are deployed on different physical hosts. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition. Special default for essentials edition is true, basic edition is true, enterprise edition is true.
+* `vs_scalein_timeout` - (Optional) Time to wait for the scaled in se to drain existing flows before marking the scalein done. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_scalein_timeout_for_upgrade` - (Optional) During se upgrade, time to wait for the scaled-in se to drain existing flows before marking the scalein done. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_scaleout_timeout` - (Optional) Time to wait for the scaled out se to become ready before marking the scaleout done. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_primary_switchover_additional_wait_time` - (Optional) Wait time for primary switchover ready notification after flows are completed. In certain deployments, there may be an additional delay to accept traffic. For example, for bgp, some time is needed for route advertisement. Allowed values are 0-300. Field introduced in 30.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vs_se_scalein_additional_wait_time` - (Optional) Wait time for sending scalein ready notification after flows are completed. In certain deployments, there may be an additional delay to accept traffic. For example, for bgp, some time is needed for route advertisement. Allowed values are 0-300. Field introduced in 30.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vs_se_scaleout_additional_wait_time` - (Optional) Wait time for sending scaleout ready notification after virtual service is marked up. In certain deployments, there may be an additional delay to accept traffic. For example, for bgp, some time is needed for route advertisement. Allowed values are 0-300. Field introduced in 18.1.5,18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_se_scaleout_ready_timeout` - (Optional) Timeout in seconds for service engine to sendscaleout ready notification of a virtual service. Allowed values are 0-90. Field introduced in 18.1.5,18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_switchover_timeout` - (Optional) During se upgrade in a legacy active/standby segroup, time to wait for the new primary se to accept flows before marking the switchover done. Field introduced in 17.2.13,18.1.4,18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vss_placement` - (Optional) Parameters to place virtual services on only a subset of the cores of an se. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vss_placement_enabled` - (Optional) If set, virtual services will be placed on only a subset of the cores of an se. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `waf_mempool` - (Optional) Enable memory pool for waf.requires se reboot. Field introduced in 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `waf_mempool_size` - (Optional) Memory pool size used for waf.requires se reboot. Field introduced in 17.2.3. Unit is kb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `waf_use_jit_for_pcre` - (Optional) Use the jit compiler for pcre regular expressions in waf. Setting this to false will impact performance. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -329,5 +335,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_siteversion.html.markdown b/website/docs/r/avi_siteversion.html.markdown
index af1388e55..169c0c6d0 100644
--- a/website/docs/r/avi_siteversion.html.markdown
+++ b/website/docs/r/avi_siteversion.html.markdown
@@ -27,17 +27,17 @@ resource "avi_siteversion" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the site. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `datetime` - (Optional) This field represents the creation time of the federateddiff. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `prev_target_version` - (Optional) Previous targer version for a site. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `replication_state` - (Optional) Replication state for a site. Enum options - REPLICATION_STATE_FASTFORWARD, REPLICATION_STATE_FORCESYNC, REPLICATION_STATE_STREAMING, REPLICATION_STATE_SUSPENDED, REPLICATION_STATE_INIT, REPLICATION_STATE_WAIT, REPLICATION_STATE_NOT_APPLICABLE. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `site_id` - (Optional) Cluster uuid of the site. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `target_timeline` - (Optional) Target timeline of the site. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `target_version` - (Optional) Target version of the site. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `timeline` - (Optional) Timeline of the site. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `version` - (Optional) Version of the site. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `version_type` - (Optional) Type of message for which version is maintained. Enum options - CONFIG_VERSION, HEALTH_STATUS_VERSION. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the site. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `datetime` - (Optional) This field represents the creation time of the federateddiff. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `prev_target_version` - (Optional) Previous targer version for a site. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `replication_state` - (Optional) Replication state for a site. Enum options - REPLICATION_STATE_FASTFORWARD, REPLICATION_STATE_FORCESYNC, REPLICATION_STATE_STREAMING, REPLICATION_STATE_SUSPENDED, REPLICATION_STATE_INIT, REPLICATION_STATE_WAIT, REPLICATION_STATE_NOT_APPLICABLE, REPLICATION_STATE_SYNC_STALLED. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `site_id` - (Optional) Cluster uuid of the site. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `target_timeline` - (Optional) Target timeline of the site. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `target_version` - (Optional) Target version of the site. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `timeline` - (Optional) Timeline of the site. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `version` - (Optional) Version of the site. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `version_type` - (Optional) Type of message for which version is maintained. Enum options - CONFIG_VERSION, HEALTH_STATUS_VERSION. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -52,5 +52,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the siteversion object. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the siteversion object. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_snmptrapprofile.html.markdown b/website/docs/r/avi_snmptrapprofile.html.markdown
index d310c5b2a..38cafd269 100644
--- a/website/docs/r/avi_snmptrapprofile.html.markdown
+++ b/website/docs/r/avi_snmptrapprofile.html.markdown
@@ -27,10 +27,10 @@ resource "avi_snmptrapprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) A user-friendly name of the snmp trap configuration. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `trap_servers` - (Optional) The ip address or hostname of the snmp trap destination server. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) A user-friendly name of the snmp trap configuration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `trap_servers` - (Optional) The ip address or hostname of the snmp trap destination server. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -45,5 +45,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the snmp trap profile object. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the snmp trap profile object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_sslkeyandcertificate.html.markdown b/website/docs/r/avi_sslkeyandcertificate.html.markdown
index cfdffbf8d..eb536d66d 100644
--- a/website/docs/r/avi_sslkeyandcertificate.html.markdown
+++ b/website/docs/r/avi_sslkeyandcertificate.html.markdown
@@ -27,33 +27,33 @@ resource "avi_sslkeyandcertificate" "foo" {
 
 The following arguments are supported:
 
-* `certificate` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ca_certs` - (Optional) Ca certificates in certificate chain. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `certificate_base64` - (Optional) States if the certificate is base64 encoded. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `certificate_management_profile_ref` - (Optional) It is a reference to an object of type certificatemanagementprofile. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `created_by` - (Optional) Creator name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dynamic_params` - (Optional) Dynamic parameters needed for certificate management profile. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_ocsp_stapling` - (Optional) Enables ocsp stapling. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `enckey_base64` - (Optional) Encrypted private key corresponding to the private key (e.g. Those generated by an hsm such as thales nshield). Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enckey_name` - (Optional) Name of the encrypted private key (e.g. Those generated by an hsm such as thales nshield). Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `format` - (Optional) Format of the key/certificate file. Enum options - SSL_PEM, SSL_PKCS12. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `hardwaresecuritymodulegroup_ref` - (Optional) It is a reference to an object of type hardwaresecuritymodulegroup. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `import_key_to_hsm` - (Optional) Flag to enable private key import to hsm while importing the certificate. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `is_federated` - (Optional) It specifies whether the object has to be replicated to the gslb followers. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `key` - (Optional) Private key. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `key_base64` - (Optional) States if the private key is base64 encoded. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `key_params` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `key_passphrase` - (Optional) Passphrase used to encrypt the private key. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `ocsp_config` - (Optional) Configuration related to ocsp. Field introduced in 20.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ocsp_error_status` - (Optional) Error reported during ocsp status query. Enum options - OCSP_ERR_CERTSTATUS_GOOD, OCSP_ERR_CERTSTATUS_REVOKED, OCSP_ERR_CERTSTATUS_UNKNOWN, OCSP_ERR_CERTSTATUS_SERVERFAIL_ERR, OCSP_ERR_CERTSTATUS_JOBDB, OCSP_ERR_CERTSTATUS_DISABLED, OCSP_ERR_CERTSTATUS_GETCERT, OCSP_ERR_CERTSTATUS_NONVSCERT, OCSP_ERR_CERTSTATUS_SELFSIGNED, OCSP_ERR_CERTSTATUS_CERTFINISH, OCSP_ERR_CERTSTATUS_CACERT, OCSP_ERR_CERTSTATUS_REQUEST, OCSP_ERR_CERTSTATUS_ISSUER_REVOKED, OCSP_ERR_CERTSTATUS_PARSE_CERT, OCSP_ERR_CERTSTATUS_HTTP_REQ, OCSP_ERR_CERTSTATUS_URL_LIST, OCSP_ERR_CERTSTATUS_HTTP_SEND, OCSP_ERR_CERTSTATUS_HTTP_RECV, OCSP_ERR_CERTSTATUS_HTTP_RESP. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- ocsp_err_certstatus_disabled), basic edition(allowed values- ocsp_err_certstatus_disabled), enterprise with cloud services edition.
-* `ocsp_responder_url_list_from_certs` - (Optional) This is an internal field to store the ocsp responder urls contained in the certificate. Field introduced in 20.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ocsp_response_info` - (Optional) Information related to ocsp response. Field introduced in 20.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `status` - (Optional) Enum options - ssl_certificate_finished, ssl_certificate_pending. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - (Optional) Enum options - ssl_certificate_type_virtualservice, ssl_certificate_type_system, ssl_certificate_type_ca. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `certificate` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ca_certs` - (Optional) Ca certificates in certificate chain. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `certificate_base64` - (Optional) States if the certificate is base64 encoded. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `certificate_management_profile_ref` - (Optional) It is a reference to an object of type certificatemanagementprofile. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - (Optional) Creator name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dynamic_params` - (Optional) Dynamic parameters needed for certificate management profile. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_ocsp_stapling` - (Optional) Enables ocsp stapling. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `enckey_base64` - (Optional) Encrypted private key corresponding to the private key (e.g. Those generated by an hsm such as thales nshield). Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enckey_name` - (Optional) Name of the encrypted private key (e.g. Those generated by an hsm such as thales nshield). Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `format` - (Optional) Format of the key/certificate file. Enum options - SSL_PEM, SSL_PKCS12. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `hardwaresecuritymodulegroup_ref` - (Optional) It is a reference to an object of type hardwaresecuritymodulegroup. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `import_key_to_hsm` - (Optional) Flag to enable private key import to hsm while importing the certificate. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `is_federated` - (Optional) It specifies whether the object has to be replicated to the gslb followers. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `key` - (Optional) Private key. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `key_base64` - (Optional) States if the private key is base64 encoded. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `key_params` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `key_passphrase` - (Optional) Passphrase used to encrypt the private key. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ocsp_config` - (Optional) Configuration related to ocsp. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ocsp_error_status` - (Optional) Error reported during ocsp status query. Enum options - OCSP_ERR_CERTSTATUS_GOOD, OCSP_ERR_CERTSTATUS_REVOKED, OCSP_ERR_CERTSTATUS_UNKNOWN, OCSP_ERR_CERTSTATUS_SERVERFAIL_ERR, OCSP_ERR_CERTSTATUS_JOBDB, OCSP_ERR_CERTSTATUS_DISABLED, OCSP_ERR_CERTSTATUS_GETCERT, OCSP_ERR_CERTSTATUS_NONVSCERT, OCSP_ERR_CERTSTATUS_SELFSIGNED, OCSP_ERR_CERTSTATUS_CERTFINISH, OCSP_ERR_CERTSTATUS_CACERT, OCSP_ERR_CERTSTATUS_REQUEST, OCSP_ERR_CERTSTATUS_ISSUER_REVOKED, OCSP_ERR_CERTSTATUS_PARSE_CERT, OCSP_ERR_CERTSTATUS_HTTP_REQ, OCSP_ERR_CERTSTATUS_URL_LIST, OCSP_ERR_CERTSTATUS_HTTP_SEND, OCSP_ERR_CERTSTATUS_HTTP_RECV, OCSP_ERR_CERTSTATUS_HTTP_RESP. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- ocsp_err_certstatus_disabled), basic (allowed values- ocsp_err_certstatus_disabled) edition.
+* `ocsp_responder_url_list_from_certs` - (Optional) This is an internal field to store the ocsp responder urls contained in the certificate. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ocsp_response_info` - (Optional) Information related to ocsp response. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `status` - (Optional) Enum options - ssl_certificate_finished, ssl_certificate_pending. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - (Optional) Enum options - ssl_certificate_type_virtualservice, ssl_certificate_type_system, ssl_certificate_type_ca. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -68,5 +68,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_sslprofile.html.markdown b/website/docs/r/avi_sslprofile.html.markdown
index 576626909..aed80e5da 100644
--- a/website/docs/r/avi_sslprofile.html.markdown
+++ b/website/docs/r/avi_sslprofile.html.markdown
@@ -27,27 +27,27 @@ resource "avi_sslprofile" "foo" {
 
 The following arguments are supported:
 
-* `accepted_versions` - (Required) Set of versions accepted by the server. Minimum of 1 items required. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `accepted_ciphers` - (Optional) Ciphers suites represented as defined by https //www.openssl.org/docs/man1.1.1/man1/ciphers.html. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cipher_enums` - (Optional) Enum options - tls_ecdhe_ecdsa_with_aes_128_gcm_sha256, tls_ecdhe_ecdsa_with_aes_256_gcm_sha384, tls_ecdhe_rsa_with_aes_128_gcm_sha256, tls_ecdhe_rsa_with_aes_256_gcm_sha384, tls_ecdhe_ecdsa_with_aes_128_cbc_sha256, tls_ecdhe_ecdsa_with_aes_256_cbc_sha384, tls_ecdhe_rsa_with_aes_128_cbc_sha256, tls_ecdhe_rsa_with_aes_256_cbc_sha384, tls_rsa_with_aes_128_gcm_sha256, tls_rsa_with_aes_256_gcm_sha384, tls_rsa_with_aes_128_cbc_sha256, tls_rsa_with_aes_256_cbc_sha256, tls_ecdhe_ecdsa_with_aes_128_cbc_sha, tls_ecdhe_ecdsa_with_aes_256_cbc_sha, tls_ecdhe_rsa_with_aes_128_cbc_sha, tls_ecdhe_rsa_with_aes_256_cbc_sha, tls_rsa_with_aes_128_cbc_sha, tls_rsa_with_aes_256_cbc_sha, tls_rsa_with_3des_ede_cbc_sha, tls_aes_256_gcm_sha384... Allowed in enterprise edition with any value, essentials edition(allowed values- tls_ecdhe_ecdsa_with_aes_128_gcm_sha256,tls_ecdhe_ecdsa_with_aes_256_gcm_sha384,tls_ecdhe_rsa_with_aes_128_gcm_sha256,tls_ecdhe_rsa_with_aes_256_gcm_sha384,tls_ecdhe_ecdsa_with_aes_128_cbc_sha256,tls_ecdhe_ecdsa_with_aes_256_cbc_sha384,tls_ecdhe_rsa_with_aes_128_cbc_sha256,tls_ecdhe_rsa_with_aes_256_cbc_sha384,tls_rsa_with_aes_128_gcm_sha256,tls_rsa_with_aes_256_gcm_sha384,tls_rsa_with_aes_128_cbc_sha256,tls_rsa_with_aes_256_cbc_sha256,tls_ecdhe_ecdsa_with_aes_128_cbc_sha,tls_ecdhe_ecdsa_with_aes_256_cbc_sha,tls_ecdhe_rsa_with_aes_128_cbc_sha,tls_ecdhe_rsa_with_aes_256_cbc_sha,tls_rsa_with_aes_128_cbc_sha,tls_rsa_with_aes_256_cbc_sha,tls_rsa_with_3des_ede_cbc_sha), basic edition(allowed values- tls_ecdhe_ecdsa_with_aes_128_gcm_sha256,tls_ecdhe_ecdsa_with_aes_256_gcm_sha384,tls_ecdhe_rsa_with_aes_128_gcm_sha256,tls_ecdhe_rsa_with_aes_256_gcm_sha384,tls_ecdhe_ecdsa_with_aes_128_cbc_sha256,tls_ecdhe_ecdsa_with_aes_256_cbc_sha384,tls_ecdhe_rsa_with_aes_128_cbc_sha256,tls_ecdhe_rsa_with_aes_256_cbc_sha384,tls_rsa_with_aes_128_gcm_sha256,tls_rsa_with_aes_256_gcm_sha384,tls_rsa_with_aes_128_cbc_sha256,tls_rsa_with_aes_256_cbc_sha256,tls_ecdhe_ecdsa_with_aes_128_cbc_sha,tls_ecdhe_ecdsa_with_aes_256_cbc_sha,tls_ecdhe_rsa_with_aes_128_cbc_sha,tls_ecdhe_rsa_with_aes_256_cbc_sha,tls_rsa_with_aes_128_cbc_sha,tls_rsa_with_aes_256_cbc_sha,tls_rsa_with_3des_ede_cbc_sha), enterprise with cloud services edition.
-* `ciphersuites` - (Optional) Tls 1.3 ciphers suites represented as defined by u(https //www.openssl.org/docs/man1.1.1/man1/ciphers.html). Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is tls_aes_256_gcm_sha384-tls_aes_128_gcm_sha256, basic edition is tls_aes_256_gcm_sha384-tls_aes_128_gcm_sha256, enterprise is tls_aes_256_gcm_sha384-tls_chacha20_poly1305_sha256-tls_aes_128_gcm_sha256.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dhparam` - (Optional) Dh parameters used in ssl. At this time, it is not configurable and is set to 2048 bits. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ec_named_curve` - (Optional) Elliptic curve cryptography namedcurves (tls supported groups)represented as defined by rfc 8422-section 5.1.1 andhttps //www.openssl.org/docs/man1.1.0/man3/ssl_ctx_set1_curves.html. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_early_data` - (Optional) Enable early data processing for tls1.3 connections. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `enable_ssl_session_reuse` - (Optional) Enable ssl session re-use. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_federated` - (Optional) It specifies whether the object has to be replicated to the gslb followers. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `prefer_client_cipher_ordering` - (Optional) Prefer the ssl cipher ordering presented by the client during the ssl handshake over the one specified in the ssl profile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `send_close_notify` - (Optional) Send 'close notify' alert message for a clean shutdown of the ssl connection. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `signature_algorithm` - (Optional) Signature algorithms represented as defined by rfc5246-section 7.4.1.4.1 andhttps //www.openssl.org/docs/man1.1.0/man3/ssl_ctx_set1_client_sigalgs_list.html. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ssl_rating` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssl_session_timeout` - (Optional) The amount of time in seconds before an ssl session expires. Unit is sec. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tags` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - (Optional) Ssl profile type. Enum options - SSL_PROFILE_TYPE_APPLICATION, SSL_PROFILE_TYPE_SYSTEM. Field introduced in 17.2.8. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `accepted_versions` - (Required) Set of versions accepted by the server. Minimum of 1 items required. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `accepted_ciphers` - (Optional) Ciphers suites represented as defined by https //www.openssl.org/docs/man1.1.1/man1/ciphers.html. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cipher_enums` - (Optional) Enum options - tls_ecdhe_ecdsa_with_aes_128_gcm_sha256, tls_ecdhe_ecdsa_with_aes_256_gcm_sha384, tls_ecdhe_rsa_with_aes_128_gcm_sha256, tls_ecdhe_rsa_with_aes_256_gcm_sha384, tls_ecdhe_ecdsa_with_aes_128_cbc_sha256, tls_ecdhe_ecdsa_with_aes_256_cbc_sha384, tls_ecdhe_rsa_with_aes_128_cbc_sha256, tls_ecdhe_rsa_with_aes_256_cbc_sha384, tls_rsa_with_aes_128_gcm_sha256, tls_rsa_with_aes_256_gcm_sha384, tls_rsa_with_aes_128_cbc_sha256, tls_rsa_with_aes_256_cbc_sha256, tls_ecdhe_ecdsa_with_aes_128_cbc_sha, tls_ecdhe_ecdsa_with_aes_256_cbc_sha, tls_ecdhe_rsa_with_aes_128_cbc_sha, tls_ecdhe_rsa_with_aes_256_cbc_sha, tls_rsa_with_aes_128_cbc_sha, tls_rsa_with_aes_256_cbc_sha, tls_rsa_with_3des_ede_cbc_sha, tls_aes_256_gcm_sha384... Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- tls_ecdhe_ecdsa_with_aes_128_gcm_sha256,tls_ecdhe_ecdsa_with_aes_256_gcm_sha384,tls_ecdhe_rsa_with_aes_128_gcm_sha256,tls_ecdhe_rsa_with_aes_256_gcm_sha384,tls_ecdhe_ecdsa_with_aes_128_cbc_sha256,tls_ecdhe_ecdsa_with_aes_256_cbc_sha384,tls_ecdhe_rsa_with_aes_128_cbc_sha256,tls_ecdhe_rsa_with_aes_256_cbc_sha384,tls_rsa_with_aes_128_gcm_sha256,tls_rsa_with_aes_256_gcm_sha384,tls_rsa_with_aes_128_cbc_sha256,tls_rsa_with_aes_256_cbc_sha256,tls_ecdhe_ecdsa_with_aes_128_cbc_sha,tls_ecdhe_ecdsa_with_aes_256_cbc_sha,tls_ecdhe_rsa_with_aes_128_cbc_sha,tls_ecdhe_rsa_with_aes_256_cbc_sha,tls_rsa_with_aes_128_cbc_sha,tls_rsa_with_aes_256_cbc_sha,tls_rsa_with_3des_ede_cbc_sha), basic (allowed values- tls_ecdhe_ecdsa_with_aes_128_gcm_sha256,tls_ecdhe_ecdsa_with_aes_256_gcm_sha384,tls_ecdhe_rsa_with_aes_128_gcm_sha256,tls_ecdhe_rsa_with_aes_256_gcm_sha384,tls_ecdhe_ecdsa_with_aes_128_cbc_sha256,tls_ecdhe_ecdsa_with_aes_256_cbc_sha384,tls_ecdhe_rsa_with_aes_128_cbc_sha256,tls_ecdhe_rsa_with_aes_256_cbc_sha384,tls_rsa_with_aes_128_gcm_sha256,tls_rsa_with_aes_256_gcm_sha384,tls_rsa_with_aes_128_cbc_sha256,tls_rsa_with_aes_256_cbc_sha256,tls_ecdhe_ecdsa_with_aes_128_cbc_sha,tls_ecdhe_ecdsa_with_aes_256_cbc_sha,tls_ecdhe_rsa_with_aes_128_cbc_sha,tls_ecdhe_rsa_with_aes_256_cbc_sha,tls_rsa_with_aes_128_cbc_sha,tls_rsa_with_aes_256_cbc_sha,tls_rsa_with_3des_ede_cbc_sha) edition.
+* `ciphersuites` - (Optional) Tls 1.3 ciphers suites represented as defined by u(https //www.openssl.org/docs/man1.1.1/man1/ciphers.html). Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is tls_aes_256_gcm_sha384-tls_aes_128_gcm_sha256, basic edition is tls_aes_256_gcm_sha384-tls_aes_128_gcm_sha256, enterprise edition is tls_aes_256_gcm_sha384-tls_chacha20_poly1305_sha256-tls_aes_128_gcm_sha256.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dhparam` - (Optional) Dh parameters used in ssl. At this time, it is not configurable and is set to 2048 bits. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ec_named_curve` - (Optional) Elliptic curve cryptography namedcurves (tls supported groups)represented as defined by rfc 8422-section 5.1.1 andhttps //www.openssl.org/docs/man1.1.0/man3/ssl_ctx_set1_curves.html. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_early_data` - (Optional) Enable early data processing for tls1.3 connections. Field introduced in 18.2.6. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `enable_ssl_session_reuse` - (Optional) Enable ssl session re-use. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_federated` - (Optional) It specifies whether the object has to be replicated to the gslb followers. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `prefer_client_cipher_ordering` - (Optional) Prefer the ssl cipher ordering presented by the client during the ssl handshake over the one specified in the ssl profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `send_close_notify` - (Optional) Send 'close notify' alert message for a clean shutdown of the ssl connection. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `signature_algorithm` - (Optional) Signature algorithms represented as defined by rfc5246-section 7.4.1.4.1 andhttps //www.openssl.org/docs/man1.1.0/man3/ssl_ctx_set1_client_sigalgs_list.html. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ssl_rating` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_session_timeout` - (Optional) The amount of time in seconds before an ssl session expires. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tags` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - (Optional) Ssl profile type. Enum options - SSL_PROFILE_TYPE_APPLICATION, SSL_PROFILE_TYPE_SYSTEM. Field introduced in 17.2.8. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -62,5 +62,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_ssopolicy.html.markdown b/website/docs/r/avi_ssopolicy.html.markdown
index 4a8361146..ac0764c62 100644
--- a/website/docs/r/avi_ssopolicy.html.markdown
+++ b/website/docs/r/avi_ssopolicy.html.markdown
@@ -27,13 +27,13 @@ resource "avi_ssopolicy" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the sso policy. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `authentication_policy` - (Optional) Authentication policy settings. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `authorization_policy` - (Optional) Authorization policy settings. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - (Optional) Sso policy type. Enum options - SSO_TYPE_SAML, SSO_TYPE_PINGACCESS, SSO_TYPE_JWT, SSO_TYPE_LDAP, SSO_TYPE_OAUTH. Field introduced in 18.2.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition(allowed values- sso_type_saml, sso_type_jwt, sso_type_ldap, sso_type_oauth), enterprise with cloud services edition.
+* `name` - (Required) Name of the sso policy. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `authentication_policy` - (Optional) Authentication policy settings. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `authorization_policy` - (Optional) Authorization policy settings. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Uuid of the tenant. It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - (Optional) Sso policy type. Enum options - SSO_TYPE_SAML, SSO_TYPE_PINGACCESS, SSO_TYPE_JWT, SSO_TYPE_LDAP, SSO_TYPE_OAUTH. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, enterprise with cloud services edition. Allowed in basic (allowed values- sso_type_saml, sso_type_jwt, sso_type_ldap, sso_type_oauth) edition.
 
 
 ### Timeouts
@@ -48,5 +48,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the sso policy. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the sso policy. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_statediffoperation.html.markdown b/website/docs/r/avi_statediffoperation.html.markdown
index b99b9d205..b75dfec8d 100644
--- a/website/docs/r/avi_statediffoperation.html.markdown
+++ b/website/docs/r/avi_statediffoperation.html.markdown
@@ -27,13 +27,13 @@ resource "avi_statediffoperation" "foo" {
 
 The following arguments are supported:
 
-* `events` - (Optional) Info for each statediff event. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - (Optional) Name of statediff operation. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `node_uuid` - (Optional) Uuid of node for statediff operation entry. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `operation` - (Optional) Type of statediff operation. Enum options - FB_UPGRADE, FB_ROLLBACK, FB_PATCH, FB_ROLLBACK_PATCH. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `phase` - (Optional) Phase of statediff operation. Enum options - FB_PRE_SNAPSHOT, FB_POST_SNAPSHOT. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `status` - (Optional) Status of statediff operation. Enum options - FB_INIT, FB_IN_PROGRESS, FB_COMPLETED, FB_FAILED, FB_COMPLETED_WITH_ERRORS. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `events` - (Optional) Info for each statediff event. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Optional) Name of statediff operation. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `node_uuid` - (Optional) Uuid of node for statediff operation entry. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `operation` - (Optional) Type of statediff operation. Enum options - FB_UPGRADE, FB_ROLLBACK, FB_PATCH, FB_ROLLBACK_PATCH. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `phase` - (Optional) Phase of statediff operation. Enum options - FB_PRE_SNAPSHOT, FB_POST_SNAPSHOT. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `status` - (Optional) Status of statediff operation. Enum options - FB_INIT, FB_IN_PROGRESS, FB_COMPLETED, FB_FAILED, FB_COMPLETED_WITH_ERRORS. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -48,5 +48,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Unique identifier for statediff entry. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Unique identifier for statediff entry. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_statediffsnapshot.html.markdown b/website/docs/r/avi_statediffsnapshot.html.markdown
index 948f27724..810a8fde5 100644
--- a/website/docs/r/avi_statediffsnapshot.html.markdown
+++ b/website/docs/r/avi_statediffsnapshot.html.markdown
@@ -27,22 +27,22 @@ resource "avi_statediffsnapshot" "foo" {
 
 The following arguments are supported:
 
-* `gslb_name` - (Optional) Name of gslb object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gslb_uuid` - (Optional) Reference to base gslb object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - (Optional) Name of statediff operation. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pool_name` - (Optional) Name of pool object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pool_uuid` - (Optional) Reference to base pool object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `post_snapshot` - (Optional) Post-upgrade snapshot for vs. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pre_snapshot` - (Optional) Pre-upgrade snapshot for vs. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_group_name` - (Optional) Name of seg object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_group_uuid` - (Optional) Reference to base seg object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_name` - (Optional) Name of seg object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_uuid` - (Optional) Reference to base se object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `snapshot_type` - (Optional) Type of snapshot eg. Vs_snapshot, se_snapshot etc. Enum options - FB_VS_SNAPSHOT, FB_SE_SNAPSHOT, FB_GSLB_SNAPSHOT, FB_POOL_SNAPSHOT. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `statediff_operation_ref` - (Optional) Statediff operation uuid for identifying the operation. It is a reference to an object of type statediffoperation. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vs_name` - (Optional) Name of vs object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vs_uuid` - (Optional) Reference to base vs object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `gslb_name` - (Optional) Name of gslb object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gslb_uuid` - (Optional) Reference to base gslb object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Optional) Name of statediff operation. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pool_name` - (Optional) Name of pool object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pool_uuid` - (Optional) Reference to base pool object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `post_snapshot` - (Optional) Post-upgrade snapshot for vs. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pre_snapshot` - (Optional) Pre-upgrade snapshot for vs. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_group_name` - (Optional) Name of seg object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_group_uuid` - (Optional) Reference to base seg object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_name` - (Optional) Name of seg object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_uuid` - (Optional) Reference to base se object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `snapshot_type` - (Optional) Type of snapshot eg. Vs_snapshot, se_snapshot etc. Enum options - FB_VS_SNAPSHOT, FB_SE_SNAPSHOT, FB_GSLB_SNAPSHOT, FB_POOL_SNAPSHOT. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `statediff_operation_ref` - (Optional) Statediff operation uuid for identifying the operation. It is a reference to an object of type statediffoperation. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vs_name` - (Optional) Name of vs object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vs_uuid` - (Optional) Reference to base vs object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -57,5 +57,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Unique identifier for statediff entry. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Unique identifier for statediff entry. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_stringgroup.html.markdown b/website/docs/r/avi_stringgroup.html.markdown
index f61370193..01770b51c 100644
--- a/website/docs/r/avi_stringgroup.html.markdown
+++ b/website/docs/r/avi_stringgroup.html.markdown
@@ -27,14 +27,14 @@ resource "avi_stringgroup" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the string group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - (Required) Type of stringgroup. Enum options - SG_TYPE_STRING, SG_TYPE_KEYVAL. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `kv` - (Optional) Configure key value in the string group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `longest_match` - (Optional) Enable the longest match, default is the shortest match. Field introduced in 18.2.8. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name of the string group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - (Required) Type of stringgroup. Enum options - SG_TYPE_STRING, SG_TYPE_KEYVAL. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `kv` - (Optional) Configure key value in the string group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `longest_match` - (Optional) Enable the longest match, default is the shortest match. Field introduced in 18.2.8. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -49,5 +49,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the string group. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the string group. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_systemconfiguration.html.markdown b/website/docs/r/avi_systemconfiguration.html.markdown
index 39fbbe0a0..eaf043524 100644
--- a/website/docs/r/avi_systemconfiguration.html.markdown
+++ b/website/docs/r/avi_systemconfiguration.html.markdown
@@ -26,35 +26,39 @@ resource "avi_systemconfiguration" "foo" {
 
 The following arguments are supported:
 
-* `admin_auth_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `common_criteria_mode` - (Optional) Common criteria mode's current state. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `controller_analytics_policy` - (Optional) Controller metrics event dynamic thresholds can be set here. Controller_cpu_high and controller_mem_high evets can take configured dynamic thresholds. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `default_license_tier` - (Optional) Specifies the default license tier which would be used by new clouds. Enum options - ENTERPRISE_16, ENTERPRISE, ENTERPRISE_18, BASIC, ESSENTIALS, ENTERPRISE_WITH_CLOUD_SERVICES. Field introduced in 17.2.5. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is essentials, basic edition is basic, enterprise is enterprise_with_cloud_services.
-* `dns_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dns_virtualservice_refs` - (Optional) Dns virtualservices hosting fqdn records for applications across avi vantage. If no virtualservices are provided, avi vantage will provide dns services for configured applications. Switching back to avi vantage from dns virtualservices is not allowed. It is a reference to an object of type virtualservice. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `docker_mode` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `email_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_cors` - (Optional) Enable cors header. Field introduced in 20.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `enable_host_header_check` - (Optional) Host header check. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_telemetry` - (Optional) Enables sending anonymous operational metrics to avi. Field introduced in 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `fips_mode` - (Optional) Fips mode current state. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `global_tenant_config` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `host_key_algorithm_exclude` - (Optional) Users can specify comma separated list of deprecated host key algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `kex_algorithm_exclude` - (Optional) Users can specify comma separated list of deprecated key exchange algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `linux_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `mgmt_ip_access_control` - (Optional) Configure ip access control for controller to restrict open access. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ntp_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `portal_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `proxy_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `rekey_time_limit` - (Optional) Users can specify and update the time limit of rekeylimit in sshd_config.if nothing is specified, the default setting will be none. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `rekey_volume_limit` - (Optional) Users can specify and update the size/volume limit of rekeylimit in sshd_config.if nothing is specified, the default setting will be default. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `secure_channel_configuration` - (Optional) Configure secure channel properties. Field introduced in 18.1.4, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `snmp_configuration` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssh_ciphers` - (Optional) Allowed ciphers list for ssh to the management interface on the controller and service engines. If this is not specified, all the default ciphers are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssh_hmacs` - (Optional) Allowed hmac list for ssh to the management interface on the controller and service engines. If this is not specified, all the default hmacs are allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `trusted_host_profiles_refs` - (Optional) Trusted host profiles for host header validation. Only function when enable_host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 22.1.7, 30.2.2, 31.1.1. Maximum of 20 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `welcome_workflow_complete` - (Optional) This flag is set once the initial controller setup workflow is complete. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `admin_auth_configuration` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `avi_email_login_password` - (Optional) Password for avi_email_login user. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `common_criteria_mode` - (Optional) Common criteria mode's current state. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_analytics_policy` - (Optional) Controller metrics event dynamic thresholds can be set here. Controller_cpu_high and controller_mem_high evets can take configured dynamic thresholds. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `default_license_tier` - (Optional) Specifies the default license tier which would be used by new clouds. Enum options - ENTERPRISE_16, ENTERPRISE, ENTERPRISE_18, BASIC, ESSENTIALS, ENTERPRISE_WITH_CLOUD_SERVICES. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is essentials, basic edition is basic, enterprise edition is enterprise_with_cloud_services.
+* `dns_configuration` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_virtualservice_refs` - (Optional) Dns virtualservices hosting fqdn records for applications across avi vantage. If no virtualservices are provided, avi vantage will provide dns services for configured applications. Switching back to avi vantage from dns virtualservices is not allowed. It is a reference to an object of type virtualservice. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `docker_mode` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `email_configuration` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_cors` - (Optional) Enable cors header. Field introduced in 20.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_host_header_check` - (Optional) Validates the host header against a list of trusted domains. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `fips_mode` - (Optional) Fips mode current state. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `global_tenant_config` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `host_key_algorithm_exclude` - (Optional) Users can specify comma separated list of deprecated host key algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `kex_algorithm_exclude` - (Optional) Users can specify comma separated list of deprecated key exchange algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `legacy_ssl_support` - (Optional) Allow outgoing connections from controller to servers using tls 1.0/1.1. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `linux_configuration` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mgmt_ip_access_control` - (Optional) Configure ip access control for controller to restrict open access. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ntp_configuration` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `portal_configuration` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `proxy_configuration` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `rekey_time_limit` - (Optional) Users can specify and update the time limit of rekeylimit in sshd_config.if nothing is specified, the default setting will be none. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `rekey_volume_limit` - (Optional) Users can specify and update the size/volume limit of rekeylimit in sshd_config.if nothing is specified, the default setting will be default. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sddcmanager_fqdn` - (Optional) Fqdn of sddc manager in vcf responsible for management of this alb controller cluster. Field introduced in 22.1.6,31.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `secure_channel_configuration` - (Optional) Configure secure channel properties. Field introduced in 18.1.4, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `snmp_configuration` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssh_ciphers` - (Optional) Allowed ciphers list for ssh to the management interface on the controller and service engines. If this is not specified, all the default ciphers are allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssh_hmacs` - (Optional) Allowed hmac list for ssh to the management interface on the controller and service engines. If this is not specified, all the default hmacs are allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `telemetry_configuration` - (Optional) Telemetry configuration. Field introduced in 31.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `trusted_host_profiles_refs` - (Optional) Trusted host profiles for host header validation. Only works when host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 31.1.1. Maximum of 20 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `truststore_pkiprofile_ref` - (Optional) Reference to pkiprofile used for validating the ca certificates for external comminications from avi load balancer controller  this acts as trust store for avi load balancer controller. It is a reference to an object of type pkiprofile. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `welcome_workflow_complete` - (Optional) This flag is set once the initial controller setup workflow is complete. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -69,5 +73,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_systemlimits.html.markdown b/website/docs/r/avi_systemlimits.html.markdown
index 0f82641f5..2e7932636 100644
--- a/website/docs/r/avi_systemlimits.html.markdown
+++ b/website/docs/r/avi_systemlimits.html.markdown
@@ -27,10 +27,10 @@ resource "avi_systemlimits" "foo" {
 
 The following arguments are supported:
 
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `controller_limits` - (Optional) System limits for the entire controller cluster. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `controller_sizes` - (Optional) Possible controller sizes. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `serviceengine_limits` - (Optional) System limits that apply to a serviceengine. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_limits` - (Optional) System limits for the entire controller cluster. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `controller_sizes` - (Optional) Possible controller sizes. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `serviceengine_limits` - (Optional) System limits that apply to a serviceengine. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -45,5 +45,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid for the system limits object. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid for the system limits object. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_systemreport.html.markdown b/website/docs/r/avi_systemreport.html.markdown
index e51ce0a4a..abc0f9d2f 100644
--- a/website/docs/r/avi_systemreport.html.markdown
+++ b/website/docs/r/avi_systemreport.html.markdown
@@ -27,18 +27,21 @@ resource "avi_systemreport" "foo" {
 
 The following arguments are supported:
 
-* `archive_ref` - (Optional) Relative path to the report archive file on filesystem.the archive includes exported system configuration and current object as json. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `controller_patch_image_ref` - (Optional) Controller patch image associated with the report. It is a reference to an object of type image. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `downloadable` - (Optional) Indicates whether this report is downloadable as an archive. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `events` - (Optional) List of events associated with the report. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `image_ref` - (Optional) System image associated with the report. It is a reference to an object of type image. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - (Optional) Name of the report derived from operation in a readable format. Ex  upgrade_system_1a5c. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `readiness_reports` - (Optional) Readiness state of the system. Ex  upgrade pre-check results. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_patch_image_ref` - (Optional) Se patch image associated with the report. It is a reference to an object of type image. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `state` - (Optional) Report state combines all applicable states. Ex  readiness_reports.system_readiness.state. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `summary` - (Optional) Summary of the report. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tasks` - (Optional) List of tasks associated with the report. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `archive_ref` - (Optional) Relative path to the report archive file on filesystem.the archive includes exported system configuration and current object as json. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `controller_patch_image_ref` - (Optional) Controller patch image associated with the report. It is a reference to an object of type image. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `downloadable` - (Optional) Indicates whether this report is downloadable as an archive. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dryrun_info` - (Optional) Dry-run report. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `events` - (Optional) List of events associated with the report. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `image_ref` - (Optional) System image associated with the report. It is a reference to an object of type image. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Optional) Name of the report derived from operation in a readable format. Ex  upgrade_system_1a5c. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `operation` - (Optional) Nature of operation. Ex  controller upgrade, system patch, etc. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `readiness_reports` - (Optional) Readiness state of the system. Ex  upgrade pre-check results. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_patch_image_ref` - (Optional) Se patch image associated with the report. It is a reference to an object of type image. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `state` - (Optional) Report state combines all applicable states. Ex  readiness_reports.system_readiness.state. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `summary` - (Optional) Summary of the report. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks` - (Optional) List of tasks associated with the report. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `type` - (Optional) Type of report. Pre-checks, dry-run or an upgrade operation. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -53,5 +56,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid identifier for the report. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Uuid identifier for the report. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_taskjournal.html.markdown b/website/docs/r/avi_taskjournal.html.markdown
index 14467079f..d37ff4293 100644
--- a/website/docs/r/avi_taskjournal.html.markdown
+++ b/website/docs/r/avi_taskjournal.html.markdown
@@ -27,15 +27,16 @@ resource "avi_taskjournal" "foo" {
 
 The following arguments are supported:
 
-* `summary` - (Required) Summary of journal. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `errors` - (Optional) List of errors in the process. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `image_ref` - (Optional) Image uuid for identifying the current base image. It is a reference to an object of type image. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `info` - (Optional) Detailed information of journal. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - (Optional) Name for the task journal. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `obj_cloud_ref` - (Optional) Cloud that this object belongs to. It is a reference to an object of type cloud. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `operation` - (Optional) Operation for which the task journal created. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `patch_image_ref` - (Optional) Image uuid for identifying the current patch. It is a reference to an object of type image. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `summary` - (Required) Summary of journal. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `errors` - (Optional) List of errors in the process. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `image_ref` - (Optional) Image uuid for identifying the current base image. It is a reference to an object of type image. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `info` - (Optional) Detailed information of journal. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Optional) Name for the task journal. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_cloud_ref` - (Optional) Cloud that this object belongs to. It is a reference to an object of type cloud. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `operation` - (Optional) Operation for which the task journal created. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `patch_image_ref` - (Optional) Image uuid for identifying the current patch. It is a reference to an object of type image. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks` - (Optional) List of all the tasks executed with details. For example, details of tasks to be executed for upgrade filecopy. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -50,5 +51,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid identifier for the task journal. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Uuid identifier for the task journal. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_tenant.html.markdown b/website/docs/r/avi_tenant.html.markdown
index 0d11d5da5..b5505c98d 100644
--- a/website/docs/r/avi_tenant.html.markdown
+++ b/website/docs/r/avi_tenant.html.markdown
@@ -27,15 +27,15 @@ resource "avi_tenant" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `attrs` - (Optional) Key/value tenant attributes. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `config_settings` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `created_by` - (Optional) Creator of this tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enforce_label_group` - (Optional) The referred label groups are enforced on the tenant if this is set to true.if this is set to false, the label groups are suggested for the tenant. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `label_group_refs` - (Optional) The label_groups to be enforced on the tenant. This is strictly enforced only if enforce_label_group is set to true. It is a reference to an object of type labelgroup. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `local` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `attrs` - (Optional) Key/value tenant attributes. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `config_settings` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - (Optional) Creator of this tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enforce_label_group` - (Optional) The referred label groups are enforced on the tenant if this is set to true.if this is set to false, the label groups are suggested for the tenant. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `label_group_refs` - (Optional) The label_groups to be enforced on the tenant. This is strictly enforced only if enforce_label_group is set to true. It is a reference to an object of type labelgroup. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `local` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -50,5 +50,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_tenantsystemconfiguration.html.markdown b/website/docs/r/avi_tenantsystemconfiguration.html.markdown
index 12ce41682..0ecb05b5a 100644
--- a/website/docs/r/avi_tenantsystemconfiguration.html.markdown
+++ b/website/docs/r/avi_tenantsystemconfiguration.html.markdown
@@ -27,10 +27,10 @@ resource "avi_tenantsystemconfiguration" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the tenant system configuration object. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `dns_virtualservice_refs` - (Optional) Dns virtual services hosting fqdn records for applications configured within this tenant. It is a reference to an object of type virtualservice. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Unique identifier of the tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) Name of the tenant system configuration object. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 30.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_virtualservice_refs` - (Optional) Dns virtual services hosting fqdn records for applications configured within this tenant. It is a reference to an object of type virtualservice. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Unique identifier of the tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -45,5 +45,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Tenant system configuration uuid. Field introduced in 30.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Tenant system configuration uuid. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_testsedatastorelevel1.html.markdown b/website/docs/r/avi_testsedatastorelevel1.html.markdown
index 67d541902..17132131c 100644
--- a/website/docs/r/avi_testsedatastorelevel1.html.markdown
+++ b/website/docs/r/avi_testsedatastorelevel1.html.markdown
@@ -27,10 +27,10 @@ resource "avi_testsedatastorelevel1" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `test_se_datastore_level_2_ref` - (Optional) It is a reference to an object of type testsedatastorelevel2. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `test_se_datastore_level_2_ref` - (Optional) It is a reference to an object of type testsedatastorelevel2. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -45,5 +45,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_testsedatastorelevel2.html.markdown b/website/docs/r/avi_testsedatastorelevel2.html.markdown
index 5593d78b1..072b1eb1b 100644
--- a/website/docs/r/avi_testsedatastorelevel2.html.markdown
+++ b/website/docs/r/avi_testsedatastorelevel2.html.markdown
@@ -27,10 +27,10 @@ resource "avi_testsedatastorelevel2" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `test_se_datastore_level_3_refs` - (Optional) It is a reference to an object of type testsedatastorelevel3. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `test_se_datastore_level_3_refs` - (Optional) It is a reference to an object of type testsedatastorelevel3. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -45,5 +45,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_testsedatastorelevel3.html.markdown b/website/docs/r/avi_testsedatastorelevel3.html.markdown
index d116cecd3..0ba3263e7 100644
--- a/website/docs/r/avi_testsedatastorelevel3.html.markdown
+++ b/website/docs/r/avi_testsedatastorelevel3.html.markdown
@@ -27,9 +27,9 @@ resource "avi_testsedatastorelevel3" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -44,5 +44,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_trafficcloneprofile.html.markdown b/website/docs/r/avi_trafficcloneprofile.html.markdown
index 616533938..4af49bfee 100644
--- a/website/docs/r/avi_trafficcloneprofile.html.markdown
+++ b/website/docs/r/avi_trafficcloneprofile.html.markdown
@@ -27,13 +27,13 @@ resource "avi_trafficcloneprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name for the traffic clone profile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `clone_servers` - (Optional) Field introduced in 17.1.1. Maximum of 10 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `preserve_client_ip` - (Optional) Specifies if client ip needs to be preserved to clone destination. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name for the traffic clone profile. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `clone_servers` - (Optional) Field introduced in 17.1.1. Maximum of 10 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `preserve_client_ip` - (Optional) Specifies if client ip needs to be preserved to clone destination. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -48,5 +48,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the traffic clone profile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the traffic clone profile. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_trustedhostprofile.html.markdown b/website/docs/r/avi_trustedhostprofile.html.markdown
index fa203d1b0..32d407826 100644
--- a/website/docs/r/avi_trustedhostprofile.html.markdown
+++ b/website/docs/r/avi_trustedhostprofile.html.markdown
@@ -27,10 +27,10 @@ resource "avi_trustedhostprofile" "foo" {
 
 The following arguments are supported:
 
-* `hosts` - (Required) List of host ip(v4/v6) addresses or fqdns. Field introduced in 22.1.7, 30.2.2, 31.1.1. Minimum of 1 items required. Maximum of 20 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - (Required) Trustedhostprofile name. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant ref for trusted host profile. It is a reference to an object of type tenant. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `hosts` - (Required) List of host ip(v4/v6) addresses or fqdns. Field introduced in 31.1.1. Minimum of 1 items required. Maximum of 20 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Required) Trustedhostprofile name. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 31.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant ref for trusted host profile. It is a reference to an object of type tenant. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -45,5 +45,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Trustedhostprofile uuid. Field introduced in 22.1.7, 30.2.2, 31.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Trustedhostprofile uuid. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_upgradeprofile.html.markdown b/website/docs/r/avi_upgradeprofile.html.markdown
new file mode 100644
index 000000000..efd9e6783
--- /dev/null
+++ b/website/docs/r/avi_upgradeprofile.html.markdown
@@ -0,0 +1,50 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "Avi: avi_upgradeprofile"
+sidebar_current: "docs-avi-resource-upgradeprofile"
+description: |-
+  Creates and manages Avi UpgradeProfile.
+---
+
+# avi_upgradeprofile
+
+The UpgradeProfile resource allows the creation and management of Avi UpgradeProfile
+
+## Example Usage
+
+```hcl
+resource "avi_upgradeprofile" "foo" {
+    name = "terraform-example-foo"
+    tenant_ref = "/api/tenant/?name=admin"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `controller_params` - (Optional) List of controller upgrade related configurable parameters. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dry_run` - (Optional) List of dryrun related configurable parameters. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `image` - (Optional) List of image related configurable parameters. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pre_checks` - (Optional) List of upgrade pre-checks related configurable parameters. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `service_engine` - (Optional) List of service engine upgrade related configurable parameters. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
+
+### Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:
+
+* `create` - (Defaults to 40 mins) Used when creating the AMI
+* `update` - (Defaults to 40 mins) Used when updating the AMI
+* `delete` - (Defaults to 90 mins) Used when deregistering the AMI
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `uuid` -  Uuid identifier for the upgradeprofile object. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/r/avi_upgradestatusinfo.html.markdown b/website/docs/r/avi_upgradestatusinfo.html.markdown
index 8bbf03605..a8fd234c2 100644
--- a/website/docs/r/avi_upgradestatusinfo.html.markdown
+++ b/website/docs/r/avi_upgradestatusinfo.html.markdown
@@ -27,53 +27,56 @@ resource "avi_upgradestatusinfo" "foo" {
 
 The following arguments are supported:
 
-* `after_reboot_rollback_fnc` - (Optional) Backward compatible abort function name. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `after_reboot_task_name` - (Optional) Backward compatible task dict name. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `clean` - (Optional) Flag for clean installation. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `duration` - (Optional) Duration of upgrade operation in seconds. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_patch_rollback` - (Optional) Check if the patch rollback is possible on this node. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_rollback` - (Optional) Check if the rollback is possible on this node. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `end_time` - (Optional) End time of upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enqueue_time` - (Optional) Enqueue time of upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fips_mode` - (Optional) Fips mode for the entire system. Field introduced in 20.1.5. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `history` - (Optional) Record of past operations on this node. Field introduced in 20.1.4. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `image_path` - (Optional) Image path of current base image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `image_ref` - (Optional) Image uuid for identifying the current base image. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Optional) Name of the system such as cluster name, se group name and se name. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `node_type` - (Optional) Type of the system such as controller_cluster, se_group or se. Enum options - NODE_CONTROLLER_CLUSTER, NODE_SE_GROUP, NODE_SE_TYPE. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `obj_cloud_ref` - (Optional) Cloud that this object belongs to. It is a reference to an object of type cloud. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `params` - (Optional) Parameters associated with the upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `patch_image_path` - (Optional) Image path of current patch image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `patch_image_ref` - (Optional) Image uuid for identifying the current patch.example  base-image is 18.2.6 and a patch 6p1 is applied, then this field will indicate the 6p1 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `patch_list` - (Optional) List of patches applied to this node. Example  base-image is 18.2.6 and a patch 6p1 is applied, then a patch 6p5 applied. This field will indicate the [{'6p1', '6p1_image_uuid'}, {'6p5', '6p5_image_uuid'}] value. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `patch_reboot` - (Optional) Flag for patch op with reboot. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `patch_version` - (Optional) Current patch version applied to this node. Example  base-image is 18.2.6 and a patch 6p1 is applied, then this field will indicate the 6p1 value. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `prev_image_path` - (Optional) Image path of previous base image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `prev_patch_image_path` - (Optional) Image path of previous patch image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `previous_image_ref` - (Optional) Image uuid for identifying previous base image.example  base-image was 18.2.5 and an upgrade was done to 18.2.6, then this field will indicate the 18.2.5 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `previous_patch_image_ref` - (Optional) Image uuid for identifying previous patch.example  base-image was 18.2.6 with a patch 6p1. Upgrade was initiated to 18.2.8 with patch 8p1. The previous_image field will contain 18.2.6 and this field will indicate the 6p1 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `previous_patch_list` - (Optional) List of patches applied to this node on previous major version. Field introduced in 18.2.8, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `previous_patch_version` - (Optional) Previous patch version applied to this node.example  base-image was 18.2.6 with a patch 6p1. Upgrade was initiated to 18.2.8 with patch 8p1. The previous_image field will contain 18.2.6 and this field will indicate the 6p1 value. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `previous_version` - (Optional) Previous version prior to upgrade.example  base-image was 18.2.5 and an upgrade was done to 18.2.6, then this field will indicate the 18.2.5 value. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `progress` - (Optional) Upgrade operations progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 18.2.8, 20.1.1. Unit is percent. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `reason` - (Optional) Descriptive reason for the upgrade state. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `se_patch_image_path` - (Optional) Image path of se patch image.(required in case of reimage and upgrade + patch). Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_patch_image_ref` - (Optional) Image uuid for identifying the current se patch required in case of system upgrade(re-image) with se patch. It is a reference to an object of type image. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_upgrade_events` - (Optional) Serviceenginegroup upgrade errors. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `seg_params` - (Optional) Se_patch may be different from the controller_patch. It has to be saved in the journal for subsequent consumption. The segroup params will be saved in the controller entry as seg_params. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `seg_status` - (Optional) Detailed segroup status. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `start_time` - (Optional) Start time of upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `state` - (Optional) Current status of the upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `statediff_ref` - (Optional) Record of pre/post snapshot captured for current upgrade operation. It is a reference to an object of type statediffoperation. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `system` - (Optional) Flag is set only in the cluster if the upgrade is initiated as a system-upgrade. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `system_report_refs` - (Optional) Tracks the list of reports created for node. It is a reference to an object of type systemreport. Field introduced in 22.1.6, 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tasks_completed` - (Optional) Completed set of tasks in the upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `total_tasks` - (Optional) Total number of tasks in the upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upgrade_events` - (Optional) Events performed for upgrade operation. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upgrade_ops` - (Optional) Upgrade operations requested. Enum options - UPGRADE, PATCH, ROLLBACK, ROLLBACKPATCH, SEGROUP_RESUME, EVAL_UPGRADE, EVAL_PATCH, EVAL_ROLLBACK, EVAL_ROLLBACKPATCH, EVAL_SEGROUP_RESUME, EVAL_RESTORE, RESTORE. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upgrade_readiness` - (Optional) Upgrade readiness check execution detail. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `version` - (Optional) Current base image applied to this node. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `after_reboot_rollback_fnc` - (Optional) Backward compatible abort function name. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `after_reboot_task_name` - (Optional) Backward compatible task dict name. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `clean` - (Optional) Flag for clean installation. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dryrun_info` - (Optional) Upgrade dry-run operation details. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `duration` - (Optional) Duration of upgrade operation in seconds. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_patch_rollback` - (Optional) Check if the patch rollback is possible on this node. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_rollback` - (Optional) Check if the rollback is possible on this node. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `end_time` - (Optional) End time of upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enqueue_time` - (Optional) Enqueue time of upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fips_mode` - (Optional) Fips mode for the entire system. Field introduced in 20.1.5. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `history` - (Optional) Record of past operations on this node. Field introduced in 20.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `image_path` - (Optional) Image path of current base image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `image_ref` - (Optional) Image uuid for identifying the current base image. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Optional) Name of the system such as cluster name, se group name and se name. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `node_type` - (Optional) Type of the system such as controller_cluster, se_group or se. Enum options - NODE_CONTROLLER_CLUSTER, NODE_SE_GROUP, NODE_SE_TYPE. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `obj_cloud_ref` - (Optional) Cloud that this object belongs to. It is a reference to an object of type cloud. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `params` - (Optional) Parameters associated with the upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `patch_image_path` - (Optional) Image path of current patch image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `patch_image_ref` - (Optional) Image uuid for identifying the current patch.example  base-image is 18.2.6 and a patch 6p1 is applied, then this field will indicate the 6p1 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `patch_list` - (Optional) List of patches applied to this node. Example  base-image is 18.2.6 and a patch 6p1 is applied, then a patch 6p5 applied. This field will indicate the [{'6p1', '6p1_image_uuid'}, {'6p5', '6p5_image_uuid'}] value. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `patch_reboot` - (Optional) Flag for patch op with reboot. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `patch_version` - (Optional) Current patch version applied to this node. Example  base-image is 18.2.6 and a patch 6p1 is applied, then this field will indicate the 6p1 value. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `prev_image_path` - (Optional) Image path of previous base image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `prev_patch_image_path` - (Optional) Image path of previous patch image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `prev_remote_image_ref` - (Optional) Remote image reference of previous base image. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `previous_image_ref` - (Optional) Image uuid for identifying previous base image.example  base-image was 18.2.5 and an upgrade was done to 18.2.6, then this field will indicate the 18.2.5 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `previous_patch_image_ref` - (Optional) Image uuid for identifying previous patch.example  base-image was 18.2.6 with a patch 6p1. Upgrade was initiated to 18.2.8 with patch 8p1. The previous_image field will contain 18.2.6 and this field will indicate the 6p1 value. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `previous_patch_list` - (Optional) List of patches applied to this node on previous major version. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `previous_patch_version` - (Optional) Previous patch version applied to this node.example  base-image was 18.2.6 with a patch 6p1. Upgrade was initiated to 18.2.8 with patch 8p1. The previous_image field will contain 18.2.6 and this field will indicate the 6p1 value. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `previous_version` - (Optional) Previous version prior to upgrade.example  base-image was 18.2.5 and an upgrade was done to 18.2.6, then this field will indicate the 18.2.5 value. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `progress` - (Optional) Upgrade operations progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 18.2.8, 20.1.1. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `reason` - (Optional) Descriptive reason for the upgrade state. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `remote_image_ref` - (Optional) Remote image reference of current base image. Field introduced in 30.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_patch_image_path` - (Optional) Image path of se patch image.(required in case of reimage and upgrade + patch). Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_patch_image_ref` - (Optional) Image uuid for identifying the current se patch required in case of system upgrade(re-image) with se patch. It is a reference to an object of type image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_upgrade_events` - (Optional) Serviceenginegroup upgrade errors. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `seg_params` - (Optional) Se_patch may be different from the controller_patch. It has to be saved in the journal for subsequent consumption. The segroup params will be saved in the controller entry as seg_params. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `seg_status` - (Optional) Detailed segroup status. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `start_time` - (Optional) Start time of upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `state` - (Optional) Current status of the upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `statediff_ref` - (Optional) Record of pre/post snapshot captured for current upgrade operation. It is a reference to an object of type statediffoperation. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `system` - (Optional) Flag is set only in the cluster if the upgrade is initiated as a system-upgrade. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `system_report_refs` - (Optional) Tracks the list of reports created for node. It is a reference to an object of type systemreport. Field introduced in 22.1.6, 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks_completed` - (Optional) Completed set of tasks in the upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `total_tasks` - (Optional) Total number of tasks in the upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `upgrade_events` - (Optional) Events performed for upgrade operation. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `upgrade_ops` - (Optional) Upgrade operations requested. Enum options - UPGRADE, PATCH, ROLLBACK, ROLLBACKPATCH, SEGROUP_RESUME, EVAL_UPGRADE, EVAL_PATCH, EVAL_ROLLBACK, EVAL_ROLLBACKPATCH, EVAL_SEGROUP_RESUME, EVAL_RESTORE, RESTORE, UPGRADE_DRYRUN. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `upgrade_readiness` - (Optional) Upgrade readiness check execution detail. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `version` - (Optional) Current base image applied to this node. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -88,5 +91,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid identifier for the system such as cluster, se group and se. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid identifier for the system such as cluster, se group and se. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_upgradestatussummary.html.markdown b/website/docs/r/avi_upgradestatussummary.html.markdown
index cac41f11e..27e095886 100644
--- a/website/docs/r/avi_upgradestatussummary.html.markdown
+++ b/website/docs/r/avi_upgradestatussummary.html.markdown
@@ -27,21 +27,21 @@ resource "avi_upgradestatussummary" "foo" {
 
 The following arguments are supported:
 
-* `enable_patch_rollback` - (Optional) Check if the patch rollback is possible on this node. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_rollback` - (Optional) Check if the rollback is possible on this node. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `end_time` - (Optional) End time of upgrade operations. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `image_ref` - (Optional) Image uuid for identifying the current base image. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Optional) Name of the system such as cluster name, se group name and se name. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `node_type` - (Optional) Type of the system such as controller_cluster, se_group or se. Enum options - NODE_CONTROLLER_CLUSTER, NODE_SE_GROUP, NODE_SE_TYPE. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `obj_cloud_ref` - (Optional) Cloud that this object belongs to. It is a reference to an object of type cloud. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `patch_image_ref` - (Optional) Image uuid for identifying the current patch. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `start_time` - (Optional) Start time of upgrade operations. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `state` - (Optional) Current status of the upgrade operations. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tasks_completed` - (Optional) Upgrade tasks completed. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `total_tasks` - (Optional) Total upgrade tasks. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `upgrade_ops` - (Optional) Upgrade operations requested. Enum options - UPGRADE, PATCH, ROLLBACK, ROLLBACKPATCH, SEGROUP_RESUME, EVAL_UPGRADE, EVAL_PATCH, EVAL_ROLLBACK, EVAL_ROLLBACKPATCH, EVAL_SEGROUP_RESUME, EVAL_RESTORE, RESTORE. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `version` - (Optional) Current base image applied to this node. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `enable_patch_rollback` - (Optional) Check if the patch rollback is possible on this node. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_rollback` - (Optional) Check if the rollback is possible on this node. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `end_time` - (Optional) End time of upgrade operations. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `image_ref` - (Optional) Image uuid for identifying the current base image. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Optional) Name of the system such as cluster name, se group name and se name. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `node_type` - (Optional) Type of the system such as controller_cluster, se_group or se. Enum options - NODE_CONTROLLER_CLUSTER, NODE_SE_GROUP, NODE_SE_TYPE. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `obj_cloud_ref` - (Optional) Cloud that this object belongs to. It is a reference to an object of type cloud. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `patch_image_ref` - (Optional) Image uuid for identifying the current patch. It is a reference to an object of type image. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `start_time` - (Optional) Start time of upgrade operations. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `state` - (Optional) Current status of the upgrade operations. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tasks_completed` - (Optional) Upgrade tasks completed. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `total_tasks` - (Optional) Total upgrade tasks. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `upgrade_ops` - (Optional) Upgrade operations requested. Enum options - UPGRADE, PATCH, ROLLBACK, ROLLBACKPATCH, SEGROUP_RESUME, EVAL_UPGRADE, EVAL_PATCH, EVAL_ROLLBACK, EVAL_ROLLBACKPATCH, EVAL_SEGROUP_RESUME, EVAL_RESTORE, RESTORE, UPGRADE_DRYRUN. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `version` - (Optional) Current base image applied to this node. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -56,5 +56,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid identifier for the system such as cluster, se group and se. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid identifier for the system such as cluster, se group and se. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_user.html.markdown b/website/docs/r/avi_user.html.markdown
index f2fc1f2bf..9ca78fb17 100644
--- a/website/docs/r/avi_user.html.markdown
+++ b/website/docs/r/avi_user.html.markdown
@@ -27,29 +27,29 @@ resource "avi_user" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `access` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `anonymous_user` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `date_joined` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `default_tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `email` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `full_name` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_active` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_internal_user` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_staff` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_superuser` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `local` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `logged_in` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `password` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `passwordless` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `recovery_token` - (Optional) Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `service_user` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `token_expiration_date` - (Optional) Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `ui_property` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `uid` - (Optional) Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `unix_crypt_password` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `user_profile_ref` - (Optional) It is a reference to an object of type useraccountprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `username` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `access` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `anonymous_user` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `date_joined` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `default_tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `email` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `full_name` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_active` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_internal_user` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_staff` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_superuser` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `local` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `logged_in` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `password` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `passwordless` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `recovery_token` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_user` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `token_expiration_date` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ui_property` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `uid` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `unix_crypt_password` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `user_profile_ref` - (Optional) It is a reference to an object of type useraccountprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `username` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -64,5 +64,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_useraccountprofile.html.markdown b/website/docs/r/avi_useraccountprofile.html.markdown
index 1bf988361..36560c4f2 100644
--- a/website/docs/r/avi_useraccountprofile.html.markdown
+++ b/website/docs/r/avi_useraccountprofile.html.markdown
@@ -27,14 +27,14 @@ resource "avi_useraccountprofile" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `account_lock_timeout` - (Optional) Lock timeout period (in minutes). Default is 30 minutes. Unit is min. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `credentials_timeout_threshold` - (Optional) The time period after which credentials expire. Default is 180 days. Unit is days. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `login_failure_count_expiry_window` - (Optional) The configurable time window beyond which we need to pop all the login failure timestamps from the login_failure_timestamps. Special values are 0 - do not reset login_failure_counts on the basis of time. Field introduced in 22.1.1. Unit is min. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `max_concurrent_sessions` - (Optional) Maximum number of concurrent sessions allowed. There are unlimited sessions by default. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_login_failure_count` - (Optional) Number of login attempts before lockout. Default is 3 attempts. Allowed values are 3-20. Special values are 0- unlimited login attempts allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `max_password_history_count` - (Optional) Maximum number of passwords to be maintained in the password history. Default is 4 passwords. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `account_lock_timeout` - (Optional) Lock timeout period (in minutes). Default is 30 minutes. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `credentials_timeout_threshold` - (Optional) The time period after which credentials expire. Default is 180 days. Unit is days. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `login_failure_count_expiry_window` - (Optional) The configurable time window beyond which we need to pop all the login failure timestamps from the login_failure_timestamps. Special values are 0 - do not reset login_failure_counts on the basis of time. Field introduced in 22.1.1. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `max_concurrent_sessions` - (Optional) Maximum number of concurrent sessions allowed. There are unlimited sessions by default. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_login_failure_count` - (Optional) Number of login attempts before lockout. Default is 3 attempts. Allowed values are 3-20. Special values are 0- unlimited login attempts allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_password_history_count` - (Optional) Maximum number of passwords to be maintained in the password history. Default is 4 passwords. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -49,5 +49,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_vcenterserver.html.markdown b/website/docs/r/avi_vcenterserver.html.markdown
index 6092d8b49..3a70bde7e 100644
--- a/website/docs/r/avi_vcenterserver.html.markdown
+++ b/website/docs/r/avi_vcenterserver.html.markdown
@@ -27,13 +27,13 @@ resource "avi_vcenterserver" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Availabilty zone where vcenter list belongs to. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - (Optional) Vcenter belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `content_lib` - (Optional) Vcenter template to create service engine. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Vcenter belongs to tenant. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_credentials_ref` - (Optional) Credentials to access vcenter. It is a reference to an object of type cloudconnectoruser. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vcenter_url` - (Optional) Vcenter hostname or ip address. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Availabilty zone where vcenter list belongs to. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) Vcenter belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `content_lib` - (Optional) Vcenter template to create service engine. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Vcenter belongs to tenant. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_credentials_ref` - (Optional) Credentials to access vcenter. It is a reference to an object of type cloudconnectoruser. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vcenter_url` - (Optional) Vcenter hostname or ip address. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -48,5 +48,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Vcenter config uuid. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Vcenter config uuid. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_virtualservice.html.markdown b/website/docs/r/avi_virtualservice.html.markdown
index 9ff5d721e..a90bc07e4 100644
--- a/website/docs/r/avi_virtualservice.html.markdown
+++ b/website/docs/r/avi_virtualservice.html.markdown
@@ -27,101 +27,101 @@ resource "avi_virtualservice" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name for the virtual service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `active_standby_se_tag` - (Optional) This configuration only applies if the virtualservice is in legacy active standby ha mode and load distribution among active standby is enabled. This field is used to tag the virtualservice so that virtualservices with the same tag will share the same active serviceengine. Virtualservices with different tags will have different active serviceengines. If one of the serviceengine's in the serviceenginegroup fails, all virtualservices will end up using the same active serviceengine. Redistribution of the virtualservices can be either manual or automated when the failed serviceengine recovers. Redistribution is based on the auto redistribute property of the serviceenginegroup. Enum options - ACTIVE_STANDBY_SE_1, ACTIVE_STANDBY_SE_2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `advertise_down_vs` - (Optional) Keep advertising virtual service via bgp even if it is marked down by health monitor. This setting takes effect for future virtual service flaps. To advertise current vses that are down, please disable and re-enable the virtual service. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `allow_invalid_client_cert` - (Optional) Process request even if invalid client certificate is presented. Datascript apis need to be used for processing of such requests. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `analytics_policy` - (Optional) Determines analytics settings for the application. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `analytics_profile_ref` - (Optional) Specifies settings related to analytics. It is a reference to an object of type analyticsprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `application_profile_ref` - (Optional) Enable application layer specific features for the virtual service. It is a reference to an object of type applicationprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is system-l4-application.
-* `azure_availability_set` - (Optional) (internal-use)applicable for azure only. Azure availability set to which this vs is associated. Internally set by the cloud connector. Field introduced in 17.2.12, 18.1.2. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `bgp_local_preference` - (Optional) Local_pref to be used for vsvip advertised. Applicable only over ibgp. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `bgp_num_as_path_prepend` - (Optional) Number of times the local as should be prepended additionally to vsvip. Applicable only over ebgp. Allowed values are 1-10. Field introduced in 30.2.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `bgp_peer_labels` - (Optional) Select bgp peers, using peer label, for vsvip advertisement. Field introduced in 20.1.5. Maximum of 128 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `bot_policy_ref` - (Optional) Bot detection policy for the virtual service. It is a reference to an object of type botdetectionpolicy. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `bulk_sync_kvcache` - (Optional) (this is a beta feature). Sync key-value cache to the new ses when vs is scaled out. For ex  ssl sessions are stored using vs's key-value cache. When the vs is scaled out, the ssl session information is synced to the new se, allowing existing ssl sessions to be reused on the new se. Field introduced in 17.2.7, 18.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `close_client_conn_on_config_update` - (Optional) Close client connection on vs config update. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `cloud_config_cksum` - (Optional) Checksum of cloud configuration for vs. Internally set by cloud connector. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `cloud_type` - (Optional) Enum options - cloud_none, cloud_vcenter, cloud_openstack, cloud_aws, cloud_vca, cloud_apic, cloud_mesos, cloud_linuxserver, cloud_docker_ucp, cloud_rancher, cloud_oshift_k8s, cloud_azure, cloud_gcp, cloud_nsxt. Allowed in enterprise edition with any value, essentials edition(allowed values- cloud_none,cloud_vcenter), basic edition(allowed values- cloud_none,cloud_nsxt), enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `connections_rate_limit` - (Optional) Rate limit the incoming connections to this virtual service. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `content_rewrite` - (Optional) Profile used to match and rewrite strings in request and/or response body. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `created_by` - (Optional) Creator name. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `csrf_policy_ref` - (Optional) Csrf protection policy for the virtual service. It is a reference to an object of type csrfpolicy. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `delay_fairness` - (Optional) Select the algorithm for qos fairness. This determines how multiple virtual services sharing the same service engines will prioritize traffic over a congested network. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `dns_info` - (Optional) Service discovery specific data including fully qualified domain name, type and time-to-live of the dns record. Note that only one of fqdn and dns_info setting is allowed. Maximum of 1000 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `dns_policies` - (Optional) Dns policies applied on the dns traffic of the virtual service. Field introduced in 17.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `east_west_placement` - (Optional) Force placement on all se's in service group (mesos mode only). Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `enable_autogw` - (Optional) Response traffic to clients will be sent back to the source mac address of the connection, rather than statically sent to a default gateway. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition. Special default for essentials edition is false, basic edition is false, enterprise is true.
-* `enable_rhi` - (Optional) Enable route health injection using the bgp config in the vrf context. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_rhi_snat` - (Optional) Enable route health injection for source nat'ted floating ip address using the bgp config in the vrf context. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enable_session` - (Optional) Enable http sessions for this virtual service. If enabled, a session cookie will be added to http responses and persistent key-value store will be activated. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `enabled` - (Optional) Enable or disable the virtual service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `error_page_profile_ref` - (Optional) Error page profile to be used for this virtualservice.this profile is used to send the custom error page to the client generated by the proxy. It is a reference to an object of type errorpageprofile. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `flow_dist` - (Optional) Criteria for flow distribution among ses. Enum options - LOAD_AWARE, CONSISTENT_HASH_SOURCE_IP_ADDRESS, CONSISTENT_HASH_SOURCE_IP_ADDRESS_AND_PORT. Allowed in enterprise edition with any value, essentials edition(allowed values- load_aware), basic edition(allowed values- load_aware), enterprise with cloud services edition.
-* `flow_label_type` - (Optional) Criteria for flow labelling. Enum options - NO_LABEL, APPLICATION_LABEL, SERVICE_LABEL. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `fqdn` - (Optional) Dns resolvable, fully qualified domain name of the virtualservice. Only one of 'fqdn' and 'dns_info' configuration is allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `host_name_xlate` - (Optional) Translate the host name sent to the servers to this value. Translate the host name sent from servers back to the value used by the client. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `http_policies` - (Optional) Http policies applied on the data traffic of the virtual service. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `icap_request_profile_refs` - (Optional) The config settings for the icap server when checking the http request. It is a reference to an object of type icapprofile. Field introduced in 20.1.1. Maximum of 1 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ign_pool_net_reach` - (Optional) Ignore pool servers network reachability constraints for virtual service placement. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `jwt_config` - (Optional) Application-specific config for jwt validation. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `l4_policies` - (Optional) L4 policies applied to the data traffic of the virtual service. Field introduced in 17.2.7. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ldap_vs_config` - (Optional) Application-specific ldap config. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `limit_doser` - (Optional) Limit potential dos attackers who exceed max_cps_per_client significantly to a fraction of max_cps_per_client for a while. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `max_cps_per_client` - (Optional) Maximum connections per second per client ip. Allowed values are 10-1000. Special values are 0- unlimited. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `microservice_ref` - (Optional) Microservice representing the virtual service. It is a reference to an object of type microservice. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `min_pools_up` - (Optional) Minimum number of up pools to mark vs up. Field introduced in 18.2.1, 17.2.12. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `network_profile_ref` - (Optional) Determines network settings such as protocol, tcp or udp, and related options for the protocol. It is a reference to an object of type networkprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is system-tcp-fast-path.
-* `network_security_policy_ref` - (Optional) Network security policies for the virtual service. It is a reference to an object of type networksecuritypolicy. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `nsx_securitygroup` - (Optional) A list of nsx groups representing the clients which can access the virtual ip of the virtual service. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `oauth_vs_config` - (Optional) Virtualservice specific oauth config. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `performance_limits` - (Optional) Optional settings that determine performance limits like max connections or bandwdith etc. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pool_group_ref` - (Optional) The pool group is an object that contains pools. It is a reference to an object of type poolgroup. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `pool_ref` - (Optional) The pool is an object that contains destination servers and related attributes such as load-balancing and persistence. It is a reference to an object of type pool. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `remove_listening_port_on_vs_down` - (Optional) Remove listening port if virtualservice is down. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `requests_rate_limit` - (Optional) Rate limit the incoming requests to this virtual service. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `revoke_vip_route` - (Optional) Revoke the advertisement of virtual service via the cloud if it is marked down by health monitor. Supported for nsxt clouds only.this setting takes effect for future virtual service flaps. To advertise current vses that are down, please disable and re-enable the virtual service. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `saml_sp_config` - (Optional) Application-specific saml config. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `scaleout_ecmp` - (Optional) Disable re-distribution of flows across service engines for a virtual service. Enable if the network itself performs flow hashing with ecmp in environments such as gcp. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `se_group_ref` - (Optional) The service engine group to use for this virtual service. Moving to a new se group is disruptive to existing connections for this vs. It is a reference to an object of type serviceenginegroup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `security_policy_ref` - (Optional) Security policy applied on the traffic of the virtual service. This policy is used to perform security actions such as distributed denial of service (ddos) attack mitigation, etc. It is a reference to an object of type securitypolicy. Field introduced in 18.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `server_network_profile_ref` - (Optional) Determines the network settings profile for the server side of tcp proxied connections. Leave blank to use the same settings as the client to vs side of the connection. It is a reference to an object of type networkprofile. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `service_metadata` - (Optional) Metadata pertaining to the service provided by this virtual service. In openshift/kubernetes environments, egress pod info is stored. Any user input to this field will be overwritten by avi vantage. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `service_pool_select` - (Optional) Select pool based on destination port. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `services` - (Optional) List of services defined for this virtual service. Maximum of 2048 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sideband_profile` - (Optional) Sideband configuration to be used for this virtualservice.it can be used for sending traffic to sideband vips for external inspection etc. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `snat_ip` - (Optional) Nat'ted floating source ip address(es) for upstream connection to servers. Maximum of 32 items allowed. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `snat_ip6_addresses` - (Optional) Ipv6 address for se snat. Field introduced in 30.2.1. Maximum of 32 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `sp_pool_refs` - (Optional) Gslb pools used to manage site-persistence functionality. Each site-persistence pool contains the virtualservices in all the other sites, that is auto-generated by the gslb manager. This is a read-only field for the user. It is a reference to an object of type pool. Field introduced in 17.2.2. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `ssl_key_and_certificate_refs` - (Optional) Select or create one or two certificates, ec and/or rsa, that will be presented to ssl/tls terminated connections. It is a reference to an object of type sslkeyandcertificate. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssl_profile_ref` - (Optional) Determines the set of ssl versions and ciphers to accept for ssl/tls terminated connections. It is a reference to an object of type sslprofile. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ssl_profile_selectors` - (Optional) Select ssl profile based on client ip address match. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ssl_sess_cache_avg_size` - (Optional) Expected number of ssl session cache entries (may be exceeded). Allowed values are 1024-16383. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `sso_policy_ref` - (Optional) The sso policy attached to the virtualservice. It is a reference to an object of type ssopolicy. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `static_dns_records` - (Optional) List of static dns records applied to this virtual service. These are static entries and no health monitoring is performed against the ip addresses. Maximum of 1000 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `test_se_datastore_level_1_ref` - (Optional) Used for testing se datastore upgrade 2.0 functionality. It is a reference to an object of type testsedatastorelevel1. Field introduced in 18.2.6. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `topology_policies` - (Optional) Topology policies applied on the dns traffic of the virtual service based ongslb topology algorithm. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `traffic_clone_profile_ref` - (Optional) Server network or list of servers for cloning traffic. It is a reference to an object of type trafficcloneprofile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `traffic_enabled` - (Optional) Knob to enable the virtual service traffic on its assigned service engines. This setting is effective only when the enabled flag is set to true. Field introduced in 17.2.8. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `type` - (Optional) Specify if this is a normal virtual service, or if it is the parent or child of an sni-enabled virtual hosted virtual service. Enum options - VS_TYPE_NORMAL, VS_TYPE_VH_PARENT, VS_TYPE_VH_CHILD. Allowed in enterprise edition with any value, essentials edition(allowed values- vs_type_normal), basic edition(allowed values- vs_type_normal,vs_type_vh_parent), enterprise with cloud services edition.
-* `use_bridge_ip_as_vip` - (Optional) Use bridge ip as vip on each host in mesos deployments. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `use_vip_as_snat` - (Optional) Use the virtual ip as the snat ip for health monitoring and sending traffic to the backend servers instead of the service engine interface ip. The caveat of enabling this option is that the virtualservice cannot be configued in an active-active ha mode. Dns based multi vip solution has to be used for ha & non-disruptive upgrade purposes. Field introduced in 17.1.9,17.2.3. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic, enterprise with cloud services edition.
-* `vh_domain_name` - (Optional) The exact name requested from the client's sni-enabled tls hello domain name field. If this is a match, the parent vs will forward the connection to this child vs. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vh_matches` - (Optional) Match criteria to select this child vs. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vh_parent_vs_ref` - (Optional) Specifies the virtual service acting as virtual hosting (sni) parent. It is a reference to an object of type virtualservice. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vh_type` - (Optional) Specify if the virtual hosting vs is of type sni or enhanced. Enum options - VS_TYPE_VH_SNI, VS_TYPE_VH_ENHANCED. Field introduced in 20.1.3. Allowed in enterprise edition with any value, basic edition(allowed values- vs_type_vh_sni,vs_type_vh_enhanced), enterprise with cloud services edition.
-* `vip` - (Optional) List of virtual service ips. While creating a 'shared vs',please use vsvip_ref to point to the shared entities. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vrf_context_ref` - (Optional) Virtual routing context that the virtual service is bound to. This is used to provide the isolation of the set of networks the application is attached to. It is a reference to an object of type vrfcontext. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vs_datascripts` - (Optional) Datascripts applied on the data traffic of the virtual service. Allowed in enterprise edition with any value, basic, enterprise with cloud services edition.
-* `vsvip_cloud_config_cksum` - (Optional) Checksum of cloud configuration for vsvip. Internally set by cloud connector. Field introduced in 17.2.9, 18.1.2. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `vsvip_ref` - (Optional) Mostly used during the creation of shared vs, this field refers to entities that can be shared across virtual services. It is a reference to an object of type vsvip. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `waf_policy_ref` - (Optional) Waf policy for the virtual service. It is a reference to an object of type wafpolicy. Field introduced in 17.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `weight` - (Optional) The quality of service weight to assign to traffic transmitted from this virtual service. A higher weight will prioritize traffic versus other virtual services sharing the same service engines. Allowed values are 1-128. Allowed in enterprise edition with any value, essentials edition(allowed values- 1), basic edition(allowed values- 1), enterprise with cloud services edition.
+* `name` - (Required) Name for the virtual service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `active_standby_se_tag` - (Optional) This configuration only applies if the virtualservice is in legacy active standby ha mode and load distribution among active standby is enabled. This field is used to tag the virtualservice so that virtualservices with the same tag will share the same active serviceengine. Virtualservices with different tags will have different active serviceengines. If one of the serviceengine's in the serviceenginegroup fails, all virtualservices will end up using the same active serviceengine. Redistribution of the virtualservices can be either manual or automated when the failed serviceengine recovers. Redistribution is based on the auto redistribute property of the serviceenginegroup. Enum options - ACTIVE_STANDBY_SE_1, ACTIVE_STANDBY_SE_2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `advertise_down_vs` - (Optional) Keep advertising virtual service via bgp even if it is marked down by health monitor. This setting takes effect for future virtual service flaps. To advertise current vses that are down, please disable and re-enable the virtual service. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `allow_invalid_client_cert` - (Optional) Process request even if invalid client certificate is presented. Datascript apis need to be used for processing of such requests. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `analytics_policy` - (Optional) Determines analytics settings for the application. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `analytics_profile_ref` - (Optional) Specifies settings related to analytics. It is a reference to an object of type analyticsprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `application_profile_ref` - (Optional) Enable application layer specific features for the virtual service. It is a reference to an object of type applicationprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is system-l4-application.
+* `azure_availability_set` - (Optional) (internal-use)applicable for azure only. Azure availability set to which this vs is associated. Internally set by the cloud connector. Field introduced in 17.2.12, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `bgp_local_preference` - (Optional) Local_pref to be used for vsvip advertised. Applicable only over ibgp. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `bgp_num_as_path_prepend` - (Optional) Number of times the local as should be prepended additionally to vsvip. Applicable only over ebgp. Allowed values are 1-10. Field introduced in 30.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `bgp_peer_labels` - (Optional) Select bgp peers, using peer label, for vsvip advertisement. Field introduced in 20.1.5. Maximum of 128 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `bot_policy_ref` - (Optional) Bot detection policy for the virtual service. It is a reference to an object of type botdetectionpolicy. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `bulk_sync_kvcache` - (Optional) (this is a beta feature). Sync key-value cache to the new ses when vs is scaled out. For ex  ssl sessions are stored using vs's key-value cache. When the vs is scaled out, the ssl session information is synced to the new se, allowing existing ssl sessions to be reused on the new se. Field introduced in 17.2.7, 18.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `close_client_conn_on_config_update` - (Optional) Close client connection on vs config update. Field introduced in 17.2.4. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `cloud_config_cksum` - (Optional) Checksum of cloud configuration for vs. Internally set by cloud connector. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cloud_type` - (Optional) Enum options - cloud_none, cloud_vcenter, cloud_openstack, cloud_aws, cloud_vca, cloud_apic, cloud_mesos, cloud_linuxserver, cloud_docker_ucp, cloud_rancher, cloud_oshift_k8s, cloud_azure, cloud_gcp, cloud_nsxt. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- cloud_none,cloud_vcenter), basic (allowed values- cloud_none,cloud_nsxt) edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `connections_rate_limit` - (Optional) Rate limit the incoming connections to this virtual service. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `content_rewrite` - (Optional) Profile used to match and rewrite strings in request and/or response body. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `created_by` - (Optional) Creator name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `csrf_policy_ref` - (Optional) Csrf protection policy for the virtual service. It is a reference to an object of type csrfpolicy. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `delay_fairness` - (Optional) Select the algorithm for qos fairness. This determines how multiple virtual services sharing the same service engines will prioritize traffic over a congested network. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_info` - (Optional) Service discovery specific data including fully qualified domain name, type and time-to-live of the dns record. Note that only one of fqdn and dns_info setting is allowed. Maximum of 1000 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `dns_policies` - (Optional) Dns policies applied on the dns traffic of the virtual service. Field introduced in 17.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `east_west_placement` - (Optional) Force placement on all se's in service group (mesos mode only). Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `enable_autogw` - (Optional) Response traffic to clients will be sent back to the source mac address of the connection, rather than statically sent to a default gateway. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition. Special default for essentials edition is false, basic edition is false, enterprise edition is true.
+* `enable_rhi` - (Optional) Enable route health injection using the bgp config in the vrf context. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_rhi_snat` - (Optional) Enable route health injection for source nat'ted floating ip address using the bgp config in the vrf context. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_session` - (Optional) Enable http sessions for this virtual service. If enabled, a session cookie will be added to http responses and persistent key-value store will be activated. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enabled` - (Optional) Enable or disable the virtual service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `error_page_profile_ref` - (Optional) Error page profile to be used for this virtualservice.this profile is used to send the custom error page to the client generated by the proxy. It is a reference to an object of type errorpageprofile. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `flow_dist` - (Optional) Criteria for flow distribution among ses. Enum options - LOAD_AWARE, CONSISTENT_HASH_SOURCE_IP_ADDRESS, CONSISTENT_HASH_SOURCE_IP_ADDRESS_AND_PORT. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- load_aware), basic (allowed values- load_aware) edition.
+* `flow_label_type` - (Optional) Criteria for flow labelling. Enum options - NO_LABEL, APPLICATION_LABEL, SERVICE_LABEL. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fqdn` - (Optional) Dns resolvable, fully qualified domain name of the virtualservice. Only one of 'fqdn' and 'dns_info' configuration is allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `host_name_xlate` - (Optional) Translate the host name sent to the servers to this value. Translate the host name sent from servers back to the value used by the client. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `http_policies` - (Optional) Http policies applied on the data traffic of the virtual service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `icap_request_profile_refs` - (Optional) The config settings for the icap server when checking the http request. It is a reference to an object of type icapprofile. Field introduced in 20.1.1. Maximum of 1 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ign_pool_net_reach` - (Optional) Ignore pool servers network reachability constraints for virtual service placement. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `jwt_config` - (Optional) Application-specific config for jwt validation. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `l4_policies` - (Optional) L4 policies applied to the data traffic of the virtual service. Field introduced in 17.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ldap_vs_config` - (Optional) Application-specific ldap config. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `limit_doser` - (Optional) Limit potential dos attackers who exceed max_cps_per_client significantly to a fraction of max_cps_per_client for a while. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_cps_per_client` - (Optional) Maximum connections per second per client ip. Allowed values are 10-1000. Special values are 0- unlimited. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `microservice_ref` - (Optional) Microservice representing the virtual service. It is a reference to an object of type microservice. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `min_pools_up` - (Optional) Minimum number of up pools to mark vs up. Field introduced in 18.2.1, 17.2.12. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `network_profile_ref` - (Optional) Determines network settings such as protocol, tcp or udp, and related options for the protocol. It is a reference to an object of type networkprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is system-tcp-fast-path.
+* `network_security_policy_ref` - (Optional) Network security policies for the virtual service. It is a reference to an object of type networksecuritypolicy. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `nsx_securitygroup` - (Optional) A list of nsx groups representing the clients which can access the virtual ip of the virtual service. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `oauth_vs_config` - (Optional) Virtualservice specific oauth config. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `performance_limits` - (Optional) Optional settings that determine performance limits like max connections or bandwdith etc. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pool_group_ref` - (Optional) The pool group is an object that contains pools. It is a reference to an object of type poolgroup. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `pool_ref` - (Optional) The pool is an object that contains destination servers and related attributes such as load-balancing and persistence. It is a reference to an object of type pool. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `remove_listening_port_on_vs_down` - (Optional) Remove listening port if virtualservice is down. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `requests_rate_limit` - (Optional) Rate limit the incoming requests to this virtual service. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `revoke_vip_route` - (Optional) Revoke the advertisement of virtual service via the cloud if it is marked down by health monitor. Supported for nsxt clouds only.this setting takes effect for future virtual service flaps. To advertise current vses that are down, please disable and re-enable the virtual service. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `saml_sp_config` - (Optional) Application-specific saml config. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `scaleout_ecmp` - (Optional) Disable re-distribution of flows across service engines for a virtual service. Enable if the network itself performs flow hashing with ecmp in environments such as gcp. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_group_ref` - (Optional) The service engine group to use for this virtual service. Moving to a new se group is disruptive to existing connections for this vs. It is a reference to an object of type serviceenginegroup. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `security_policy_ref` - (Optional) Security policy applied on the traffic of the virtual service. This policy is used to perform security actions such as distributed denial of service (ddos) attack mitigation, etc. It is a reference to an object of type securitypolicy. Field introduced in 18.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `server_network_profile_ref` - (Optional) Determines the network settings profile for the server side of tcp proxied connections. Leave blank to use the same settings as the client to vs side of the connection. It is a reference to an object of type networkprofile. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `service_metadata` - (Optional) Metadata pertaining to the service provided by this virtual service. In openshift/kubernetes environments, egress pod info is stored. Any user input to this field will be overwritten by avi vantage. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_pool_select` - (Optional) Select pool based on destination port. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `services` - (Optional) List of services defined for this virtual service. Maximum of 2048 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sideband_profile` - (Optional) Sideband configuration to be used for this virtualservice.it can be used for sending traffic to sideband vips for external inspection etc. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `snat_ip` - (Optional) Nat'ted floating source ip address(es) for upstream connection to servers. Maximum of 32 items allowed. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `snat_ip6_addresses` - (Optional) Ipv6 address for se snat. Field introduced in 30.2.1. Maximum of 32 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sp_pool_refs` - (Optional) Gslb pools used to manage site-persistence functionality. Each site-persistence pool contains the virtualservices in all the other sites, that is auto-generated by the gslb manager. This is a read-only field for the user. It is a reference to an object of type pool. Field introduced in 17.2.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_key_and_certificate_refs` - (Optional) Select or create one or two certificates, ec and/or rsa, that will be presented to ssl/tls terminated connections. It is a reference to an object of type sslkeyandcertificate. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_profile_ref` - (Optional) Determines the set of ssl versions and ciphers to accept for ssl/tls terminated connections. It is a reference to an object of type sslprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ssl_profile_selectors` - (Optional) Select ssl profile based on client ip address match. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ssl_sess_cache_avg_size` - (Optional) Expected number of ssl session cache entries (may be exceeded). Allowed values are 1024-16383. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sso_policy_ref` - (Optional) The sso policy attached to the virtualservice. It is a reference to an object of type ssopolicy. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `static_dns_records` - (Optional) List of static dns records applied to this virtual service. These are static entries and no health monitoring is performed against the ip addresses. Maximum of 2000 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `test_se_datastore_level_1_ref` - (Optional) Used for testing se datastore upgrade 2.0 functionality. It is a reference to an object of type testsedatastorelevel1. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `topology_policies` - (Optional) Topology policies applied on the dns traffic of the virtual service based ongslb topology algorithm. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `traffic_clone_profile_ref` - (Optional) Server network or list of servers for cloning traffic. It is a reference to an object of type trafficcloneprofile. Field introduced in 17.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `traffic_enabled` - (Optional) Knob to enable the virtual service traffic on its assigned service engines. This setting is effective only when the enabled flag is set to true. Field introduced in 17.2.8. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `type` - (Optional) Specify if this is a normal virtual service, or if it is the parent or child of an sni-enabled virtual hosted virtual service. Enum options - VS_TYPE_NORMAL, VS_TYPE_VH_PARENT, VS_TYPE_VH_CHILD. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- vs_type_normal), basic (allowed values- vs_type_normal,vs_type_vh_parent) edition.
+* `use_bridge_ip_as_vip` - (Optional) Use bridge ip as vip on each host in mesos deployments. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `use_vip_as_snat` - (Optional) Use the virtual ip as the snat ip for health monitoring and sending traffic to the backend servers instead of the service engine interface ip. The caveat of enabling this option is that the virtualservice cannot be configued in an active-active ha mode. Dns based multi vip solution has to be used for ha & non-disruptive upgrade purposes. Field introduced in 17.1.9,17.2.3. Allowed with any value in enterprise, basic, enterprise with cloud services edition. Allowed in essentials (allowed values- false) edition.
+* `vh_domain_name` - (Optional) The exact name requested from the client's sni-enabled tls hello domain name field. If this is a match, the parent vs will forward the connection to this child vs. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vh_matches` - (Optional) Match criteria to select this child vs. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vh_parent_vs_ref` - (Optional) Specifies the virtual service acting as virtual hosting (sni) parent. It is a reference to an object of type virtualservice. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vh_type` - (Optional) Specify if the virtual hosting vs is of type sni or enhanced. Enum options - VS_TYPE_VH_SNI, VS_TYPE_VH_ENHANCED. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in basic (allowed values- vs_type_vh_sni,vs_type_vh_enhanced) edition.
+* `vip` - (Optional) List of virtual service ips. While creating a 'shared vs',please use vsvip_ref to point to the shared entities. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vrf_context_ref` - (Optional) Virtual routing context that the virtual service is bound to. This is used to provide the isolation of the set of networks the application is attached to. It is a reference to an object of type vrfcontext. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vs_datascripts` - (Optional) Datascripts applied on the data traffic of the virtual service. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
+* `vsvip_cloud_config_cksum` - (Optional) Checksum of cloud configuration for vsvip. Internally set by cloud connector. Field introduced in 17.2.9, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vsvip_ref` - (Optional) Mostly used during the creation of shared vs, this field refers to entities that can be shared across virtual services. It is a reference to an object of type vsvip. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `waf_policy_ref` - (Optional) Waf policy for the virtual service. It is a reference to an object of type wafpolicy. Field introduced in 17.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `weight` - (Optional) The quality of service weight to assign to traffic transmitted from this virtual service. A higher weight will prioritize traffic versus other virtual services sharing the same service engines. Allowed values are 1-128. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- 1), basic (allowed values- 1) edition.
 
 
 ### Timeouts
@@ -136,5 +136,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the virtualservice. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the virtualservice. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_vrfcontext.html.markdown b/website/docs/r/avi_vrfcontext.html.markdown
index 8c3a91721..bdc83b5ca 100644
--- a/website/docs/r/avi_vrfcontext.html.markdown
+++ b/website/docs/r/avi_vrfcontext.html.markdown
@@ -27,21 +27,21 @@ resource "avi_vrfcontext" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `attrs` - (Optional) Key/value vrfcontext attributes. Field introduced in 20.1.2. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `bfd_profile` - (Optional) Bfd configuration profile. Field introduced in 20.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `bgp_profile` - (Optional) Bgp local and peer info. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `debugvrfcontext` - (Optional) Configure debug flags for vrf. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `gateway_mon` - (Optional) Configure ping based heartbeat check for gateway in service engines of vrf. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `internal_gateway_monitor` - (Optional) Configure ping based heartbeat check for all default gateways in service engines of vrf. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `lldp_enable` - (Optional) Enable lldp. Field introduced in 18.2.10, 20.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- true), basic edition(allowed values- true), enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `static_routes` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `system_default` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `attrs` - (Optional) Key/value vrfcontext attributes. Field introduced in 20.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `bfd_profile` - (Optional) Bfd configuration profile. Field introduced in 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `bgp_profile` - (Optional) Bgp local and peer info. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `debugvrfcontext` - (Optional) Configure debug flags for vrf. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `gateway_mon` - (Optional) Configure ping based heartbeat check for gateway in service engines of vrf. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `internal_gateway_monitor` - (Optional) Configure ping based heartbeat check for all default gateways in service engines of vrf. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `lldp_enable` - (Optional) Enable lldp. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `static_routes` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `system_default` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -56,5 +56,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_vsdatascriptset.html.markdown b/website/docs/r/avi_vsdatascriptset.html.markdown
index 5c8d777aa..3988548e0 100644
--- a/website/docs/r/avi_vsdatascriptset.html.markdown
+++ b/website/docs/r/avi_vsdatascriptset.html.markdown
@@ -27,24 +27,24 @@ resource "avi_vsdatascriptset" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name for the virtual service datascript collection. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `created_by` - (Optional) Creator name. Field introduced in 17.1.11,17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `datascript` - (Optional) Datascripts to execute. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `description` - (Optional) Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `geo_db_ref` - (Optional) Geo location mapping database used by this datascriptset. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ip_reputation_db_ref` - (Optional) Ip reputation database that can be used by datascript functions. It is a reference to an object of type ipreputationdb. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ipgroup_refs` - (Optional) Uuid of ip groups that could be referred by vsdatascriptset objects. It is a reference to an object of type ipaddrgroup. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `pki_profile_refs` - (Optional) Uuids of pkiprofile objects that could be referred by vsdatascriptset objects. It is a reference to an object of type pkiprofile. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `pool_group_refs` - (Optional) Uuid of pool groups that could be referred by vsdatascriptset objects. It is a reference to an object of type poolgroup. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pool_refs` - (Optional) Uuid of pools that could be referred by vsdatascriptset objects. It is a reference to an object of type pool. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `protocol_parser_refs` - (Optional) List of protocol parsers that could be referred by vsdatascriptset objects. It is a reference to an object of type protocolparser. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `rate_limiters` - (Optional) The rate limit definitions needed for this datascript. The name is composed of the virtual service name and the datascript name. Field introduced in 18.2.9. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ssl_key_certificate_refs` - (Optional) Uuids of sslkeyandcertificate objects that could be referred by vsdatascriptset objects. It is a reference to an object of type sslkeyandcertificate. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `ssl_profile_refs` - (Optional) Uuids of sslprofile objects that could be referred by vsdatascriptset objects. It is a reference to an object of type sslprofile. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `string_group_refs` - (Optional) Uuid of string groups that could be referred by vsdatascriptset objects. It is a reference to an object of type stringgroup. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name for the virtual service datascript collection. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - (Optional) Creator name. Field introduced in 17.1.11,17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `datascript` - (Optional) Datascripts to execute. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `geo_db_ref` - (Optional) Geo location mapping database used by this datascriptset. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ip_reputation_db_ref` - (Optional) Ip reputation database that can be used by datascript functions. It is a reference to an object of type ipreputationdb. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ipgroup_refs` - (Optional) Uuid of ip groups that could be referred by vsdatascriptset objects. It is a reference to an object of type ipaddrgroup. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pki_profile_refs` - (Optional) Uuids of pkiprofile objects that could be referred by vsdatascriptset objects. It is a reference to an object of type pkiprofile. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `pool_group_refs` - (Optional) Uuid of pool groups that could be referred by vsdatascriptset objects. It is a reference to an object of type poolgroup. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pool_refs` - (Optional) Uuid of pools that could be referred by vsdatascriptset objects. It is a reference to an object of type pool. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `protocol_parser_refs` - (Optional) List of protocol parsers that could be referred by vsdatascriptset objects. It is a reference to an object of type protocolparser. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `rate_limiters` - (Optional) The rate limit definitions needed for this datascript. The name is composed of the virtual service name and the datascript name. Field introduced in 18.2.9. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ssl_key_certificate_refs` - (Optional) Uuids of sslkeyandcertificate objects that could be referred by vsdatascriptset objects. It is a reference to an object of type sslkeyandcertificate. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `ssl_profile_refs` - (Optional) Uuids of sslprofile objects that could be referred by vsdatascriptset objects. It is a reference to an object of type sslprofile. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `string_group_refs` - (Optional) Uuid of string groups that could be referred by vsdatascriptset objects. It is a reference to an object of type stringgroup. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -59,5 +59,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the virtual service datascript collection. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the virtual service datascript collection. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_vsgs.html.markdown b/website/docs/r/avi_vsgs.html.markdown
index e63306a2c..2a17b6071 100644
--- a/website/docs/r/avi_vsgs.html.markdown
+++ b/website/docs/r/avi_vsgs.html.markdown
@@ -27,14 +27,14 @@ resource "avi_vsgs" "foo" {
 
 The following arguments are supported:
 
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.3. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `geodb_uuid` - (Optional) Gslb geodb being associated using this object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gs_uuid` - (Optional) Gslb service being associated using this object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `gslb_uuid` - (Optional) Gslb being associated using this object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - (Optional) Name of the vs-gs association object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `type` - (Optional) Type of the vs-gs association object. Enum options - VSGS_TYPE_GSLB, VSGS_TYPE_GS, VSGS_TYPE_GEO_DB. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vs_uuid` - (Optional) Virtual service being associated using this object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `geodb_uuid` - (Optional) Gslb geodb being associated using this object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gs_uuid` - (Optional) Gslb service being associated using this object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gslb_uuid` - (Optional) Gslb being associated using this object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Optional) Name of the vs-gs association object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant. It is a reference to an object of type tenant. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `type` - (Optional) Type of the vs-gs association object. Enum options - VSGS_TYPE_GSLB, VSGS_TYPE_GS, VSGS_TYPE_GEO_DB. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `vs_uuid` - (Optional) Virtual service being associated using this object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -49,5 +49,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the vs-gs association object. Field introduced in 21.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Uuid of the vs-gs association object. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_vsvip.html.markdown b/website/docs/r/avi_vsvip.html.markdown
index 2a038ad8f..8eeeb168f 100644
--- a/website/docs/r/avi_vsvip.html.markdown
+++ b/website/docs/r/avi_vsvip.html.markdown
@@ -27,22 +27,21 @@ resource "avi_vsvip" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name for the vsvip object. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `bgp_local_preference` - (Optional) Local_pref to be used for vsvip advertised. Applicable only over ibgp. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `bgp_num_as_path_prepend` - (Optional) Number of times the local as should be prepended additionally to vsvip. Applicable only over ebgp. Allowed values are 1-10. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `bgp_peer_labels` - (Optional) Select bgp peers, using peer label, for vsvip advertisement. Field introduced in 20.1.5. Maximum of 128 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `dns_info` - (Optional) Service discovery specific data including fully qualified domain name, type and time-to-live of the dns record. This takes effect only if dns profile isassociated with cloud. Field introduced in 17.1.1. Maximum of 1000 items allowed. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `east_west_placement` - (Optional) Force placement on all service engines in the service engine group (container clouds only). Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials edition(allowed values- false), basic edition(allowed values- false), enterprise with cloud services edition.
-* `ipam_selector` - (Optional) Determines the set of ipam networks to use for this vsvip. Selector type must be selector_ipam and only one label is supported. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tier1_lr` - (Optional) This sets the placement scope of virtualservice to given tier1 logical router in nsx-t. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `use_standard_alb` - (Optional) This overrides the cloud level default and needs to match the se group value in which it will be used if the se group use_standard_alb value is set. This is only used when fip is used for vs on azure cloud. Field introduced in 18.2.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `vip` - (Optional) List of virtual service ips and other shareable entities. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vrf_context_ref` - (Optional) Virtual routing context that the virtual service is bound to. This is used to provide the isolation of the set of networks the application is attached to. It is a reference to an object of type vrfcontext. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `vsvip_cloud_config_cksum` - (Optional) Checksum of cloud configuration for vsvip. Internally set by cloud connector. Field introduced in 17.2.9, 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Name for the vsvip object. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `bgp_local_preference` - (Optional) Local_pref to be used for vsvip advertised. Applicable only over ibgp. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `bgp_num_as_path_prepend` - (Optional) Number of times the local as should be prepended additionally to vsvip. Applicable only over ebgp. Allowed values are 1-10. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `bgp_peer_labels` - (Optional) Select bgp peers, using peer label, for vsvip advertisement. Field introduced in 20.1.5. Maximum of 128 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) It is a reference to an object of type cloud. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dns_info` - (Optional) Service discovery specific data including fully qualified domain name, type and time-to-live of the dns record. This takes effect only if dns profile isassociated with cloud. Field introduced in 17.1.1. Maximum of 1000 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `east_west_placement` - (Optional) Force placement on all service engines in the service engine group (container clouds only). Field introduced in 17.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `ipam_selector` - (Optional) Determines the set of ipam networks to use for this vsvip. Selector type must be selector_ipam and only one label is supported. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tier1_lr` - (Optional) This sets the placement scope of virtualservice to given tier1 logical router in nsx-t. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vip` - (Optional) List of virtual service ips and other shareable entities. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vrf_context_ref` - (Optional) Virtual routing context that the virtual service is bound to. This is used to provide the isolation of the set of networks the application is attached to. It is a reference to an object of type vrfcontext. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vsvip_cloud_config_cksum` - (Optional) Checksum of cloud configuration for vsvip. Internally set by cloud connector. Field introduced in 17.2.9, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -57,5 +56,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the vsvip object. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the vsvip object. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_wafapplicationsignatureprovider.html.markdown b/website/docs/r/avi_wafapplicationsignatureprovider.html.markdown
index 00a3943c6..5a99beff7 100644
--- a/website/docs/r/avi_wafapplicationsignatureprovider.html.markdown
+++ b/website/docs/r/avi_wafapplicationsignatureprovider.html.markdown
@@ -27,14 +27,14 @@ resource "avi_wafapplicationsignatureprovider" "foo" {
 
 The following arguments are supported:
 
-* `available_applications` - (Optional) Available application names and the ruleset version, when the rules for an application changed the last time. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `filter_rules_on_import` - (Optional) If this is set to false, all provided rules are imported when updating this object. If this is set to true, only newer rules are considered for import. Newer rules are rules where the rule id is not in the range of 2,000,000 to 2,080,000 or where the rule has a tag with a cve from 2013 or newer. All other rules are ignored on rule import. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `name` - (Optional) Name of application specific ruleset provider. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `ruleset_version` - (Optional) Version of signatures. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `service_status` - (Optional) If this object is managed by the application signatures update service, this field contain the status of this syncronization. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `signatures` - (Optional) The waf rules. Not visible in the api. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `available_applications` - (Optional) Available application names and the ruleset version, when the rules for an application changed the last time. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `filter_rules_on_import` - (Optional) If this is set to false, all provided rules are imported when updating this object. If this is set to true, only newer rules are considered for import. Newer rules are rules where the rule id is not in the range of 2,000,000 to 2,080,000 or where the rule has a tag with a cve from 2013 or newer. All other rules are ignored on rule import. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Optional) Name of application specific ruleset provider. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ruleset_version` - (Optional) Version of signatures. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `service_status` - (Optional) If this object is managed by the application signatures update service, this field contain the status of this syncronization. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `signatures` - (Optional) The waf rules. Not visible in the api. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -49,5 +49,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_wafcrs.html.markdown b/website/docs/r/avi_wafcrs.html.markdown
index 5c9f0f258..a750e0408 100644
--- a/website/docs/r/avi_wafcrs.html.markdown
+++ b/website/docs/r/avi_wafcrs.html.markdown
@@ -27,20 +27,20 @@ resource "avi_wafcrs" "foo" {
 
 The following arguments are supported:
 
-* `description` - (Required) A short description of this ruleset. Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `integrity` - (Required) Integrity protection value. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Required) The name of this ruleset object. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `release_date` - (Required) The release date of this version in rfc 3339 / iso 8601 format. Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `version` - (Required) The version of this ruleset object. Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `allowed_request_content_type_charsets` - (Optional) Allowed request content type character sets in waf. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `files` - (Optional) List of data files used for waf rules. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `groups` - (Optional) Waf rules are sorted in groups based on their characterization. Field introduced in 18.1.1. Maximum of 64 items allowed. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `integrity_values` - (Optional) Integrity protection values for crs. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `restricted_extensions` - (Optional) Waf restricted file extensions. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `restricted_headers` - (Optional) Waf restricted http headers. Field introduced in 30.2.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `description` - (Required) A short description of this ruleset. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `integrity` - (Required) Integrity protection value. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) The name of this ruleset object. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `release_date` - (Required) The release date of this version in rfc 3339 / iso 8601 format. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `version` - (Required) The version of this ruleset object. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allowed_request_content_type_charsets` - (Optional) Allowed request content type character sets in waf. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `files` - (Optional) List of data files used for waf rules. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `groups` - (Optional) Waf rules are sorted in groups based on their characterization. Field introduced in 18.1.1. Maximum of 64 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `integrity_values` - (Optional) Integrity protection values for crs. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `restricted_extensions` - (Optional) Waf restricted file extensions. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `restricted_headers` - (Optional) Waf restricted http headers. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -55,5 +55,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_wafpolicy.html.markdown b/website/docs/r/avi_wafpolicy.html.markdown
index 0c67bd191..d8ead9a2a 100644
--- a/website/docs/r/avi_wafpolicy.html.markdown
+++ b/website/docs/r/avi_wafpolicy.html.markdown
@@ -27,35 +27,35 @@ resource "avi_wafpolicy" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `waf_profile_ref` - (Required) Waf profile for waf policy. It is a reference to an object of type wafprofile. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `allow_mode_delegation` - (Optional) Allow rules to overwrite the policy mode. This must be set if the policy mode is set to enforcement. Field introduced in 18.1.5, 18.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `allowlist` - (Optional) A set of rules which describe conditions under which the request will bypass the waf. This will be processed in the request header phase before any other waf related code. Field introduced in 20.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `application_signatures` - (Optional) Application specific signatures. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `auto_update_crs` - (Optional) If this flag is set, the system will try to keep the crs version used in this policy up-to-date. If a newer crs object is available on this controller, the system will issue the crs upgrade process for this waf policy. It will not update polices if the current crs version is crs-version-not-applicable. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `bypass_static_extensions` - (Optional) Enable the functionality to bypass waf for static file extensions. Field introduced in 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `confidence_override` - (Optional) Configure thresholds for confidence labels. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `created_by` - (Optional) Creator name. Field introduced in 17.2.4. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `crs_overrides` - (Optional) Override attributes for crs rules. Field introduced in 20.1.6. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `description` - (Optional) Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_app_learning` - (Optional) Enable application learning for this waf policy. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_auto_rule_updates` - (Optional) Enable application learning based rule updates on the waf profile. Rules will be programmed in dedicated waf learning group. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable_regex_learning` - (Optional) Enable dynamic regex generation for positive security model rules. This is an experimental feature and shouldn't be used in production. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `failure_mode` - (Optional) Waf policy failure mode. This can be 'open' or 'closed'. Enum options - WAF_FAILURE_MODE_OPEN, WAF_FAILURE_MODE_CLOSED. Field introduced in 18.1.2. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `geo_db_ref` - (Optional) Geo location mapping database used by this wafpolicy. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `learning_params` - (Optional) Parameters for tuning application learning. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `min_confidence` - (Optional) Minimum confidence label required for auto rule updates. Enum options - CONFIDENCE_VERY_HIGH, CONFIDENCE_HIGH, CONFIDENCE_PROBABLE, CONFIDENCE_LOW, CONFIDENCE_NONE. Field introduced in 20.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `mode` - (Optional) Waf policy mode. This can be detection or enforcement. It can be overwritten by rules if allow_mode_delegation is set. Enum options - WAF_MODE_DETECTION_ONLY, WAF_MODE_ENFORCEMENT. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `paranoia_level` - (Optional) Waf ruleset paranoia  mode. This is used to select rules based on the paranoia-level tag. Enum options - WAF_PARANOIA_LEVEL_LOW, WAF_PARANOIA_LEVEL_MEDIUM, WAF_PARANOIA_LEVEL_HIGH, WAF_PARANOIA_LEVEL_EXTREME. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `positive_security_model` - (Optional) The positive security model. This is used to describe how the request or parts of the request should look like. It is executed in the request body phase of avi waf. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `post_crs_groups` - (Optional) Waf rules are categorized in to groups based on their characterization. These groups are created by the user and will be enforced after the crs groups. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `pre_crs_groups` - (Optional) Waf rules are categorized in to groups based on their characterization. These groups are created by the user and will be  enforced before the crs groups. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `required_data_files` - (Optional) The data files and types referred in this waf policy. 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.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `updated_crs_rules_in_detection_mode` - (Optional) While updating crs, the system will make sure that new rules are added in detection mode. It only has an effect if the policy is in enforcement mode. In this case, the update will set new rules into detection mode by adding crs_overrides for the new rules. If this flag is not set or if the policy mode is detection, rules will be added without new crs_overrides. This option is used for the auto_update_crs workflow as well as for the ui based crs update workflow. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `waf_crs_ref` - (Optional) Waf core ruleset used for the crs part of this policy. It is a reference to an object of type wafcrs. Field introduced in 18.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `waf_profile_ref` - (Required) Waf profile for waf policy. It is a reference to an object of type wafprofile. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allow_mode_delegation` - (Optional) Allow rules to overwrite the policy mode. This must be set if the policy mode is set to enforcement. Field introduced in 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allowlist` - (Optional) A set of rules which describe conditions under which the request will bypass the waf. This will be processed in the request header phase before any other waf related code. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `application_signatures` - (Optional) Application specific signatures. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_update_crs` - (Optional) If this flag is set, the system will try to keep the crs version used in this policy up-to-date. If a newer crs object is available on this controller, the system will issue the crs upgrade process for this waf policy. It will not update polices if the current crs version is crs-version-not-applicable. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `bypass_static_extensions` - (Optional) Enable the functionality to bypass waf for static file extensions. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `confidence_override` - (Optional) Configure thresholds for confidence labels. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `created_by` - (Optional) Creator name. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `crs_overrides` - (Optional) Override attributes for crs rules. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - (Optional) Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_app_learning` - (Optional) Enable application learning for this waf policy. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_auto_rule_updates` - (Optional) Enable application learning based rule updates on the waf profile. Rules will be programmed in dedicated waf learning group. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_regex_learning` - (Optional) Enable dynamic regex generation for positive security model rules. This is an experimental feature and shouldn't be used in production. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `failure_mode` - (Optional) Waf policy failure mode. This can be 'open' or 'closed'. Enum options - WAF_FAILURE_MODE_OPEN, WAF_FAILURE_MODE_CLOSED. Field introduced in 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `geo_db_ref` - (Optional) Geo location mapping database used by this wafpolicy. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `learning_params` - (Optional) Parameters for tuning application learning. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `min_confidence` - (Optional) Minimum confidence label required for auto rule updates. Enum options - CONFIDENCE_VERY_HIGH, CONFIDENCE_HIGH, CONFIDENCE_PROBABLE, CONFIDENCE_LOW, CONFIDENCE_NONE. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mode` - (Optional) Waf policy mode. This can be detection or enforcement. It can be overwritten by rules if allow_mode_delegation is set. Enum options - WAF_MODE_DETECTION_ONLY, WAF_MODE_ENFORCEMENT. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `paranoia_level` - (Optional) Waf ruleset paranoia  mode. This is used to select rules based on the paranoia-level tag. Enum options - WAF_PARANOIA_LEVEL_LOW, WAF_PARANOIA_LEVEL_MEDIUM, WAF_PARANOIA_LEVEL_HIGH, WAF_PARANOIA_LEVEL_EXTREME. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `positive_security_model` - (Optional) The positive security model. This is used to describe how the request or parts of the request should look like. It is executed in the request body phase of avi waf. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `post_crs_groups` - (Optional) Waf rules are categorized in to groups based on their characterization. These groups are created by the user and will be enforced after the crs groups. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `pre_crs_groups` - (Optional) Waf rules are categorized in to groups based on their characterization. These groups are created by the user and will be  enforced before the crs groups. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `required_data_files` - (Optional) The data files and types referred in this waf policy. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `updated_crs_rules_in_detection_mode` - (Optional) While updating crs, the system will make sure that new rules are added in detection mode. It only has an effect if the policy is in enforcement mode. In this case, the update will set new rules into detection mode by adding crs_overrides for the new rules. If this flag is not set or if the policy mode is detection, rules will be added without new crs_overrides. This option is used for the auto_update_crs workflow as well as for the ui based crs update workflow. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `waf_crs_ref` - (Optional) Waf core ruleset used for the crs part of this policy. It is a reference to an object of type wafcrs. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -70,5 +70,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_wafpolicypsmgroup.html.markdown b/website/docs/r/avi_wafpolicypsmgroup.html.markdown
index d8191697f..4513c860c 100644
--- a/website/docs/r/avi_wafpolicypsmgroup.html.markdown
+++ b/website/docs/r/avi_wafpolicypsmgroup.html.markdown
@@ -27,16 +27,16 @@ resource "avi_wafpolicypsmgroup" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) User defined name of the group. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Free-text comment about this group. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `enable` - (Optional) Enable or disable this waf rule group. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `hit_action` - (Optional) If a rule in this group matches the match_value pattern, this action will be executed. Allowed actions are waf_action_no_op and waf_action_allow_parameter. Enum options - WAF_ACTION_NO_OP, WAF_ACTION_BLOCK, WAF_ACTION_ALLOW_PARAMETER. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `is_learning_group` - (Optional) This field indicates that this group is used for learning. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `locations` - (Optional) Positive security model locations. These are used to partition the application name space. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `miss_action` - (Optional) If a rule in this group does not match the match_value pattern, this action will be executed. Allowed actions are waf_action_no_op and waf_action_block. Enum options - WAF_ACTION_NO_OP, WAF_ACTION_BLOCK, WAF_ACTION_ALLOW_PARAMETER. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) User defined name of the group. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Free-text comment about this group. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable` - (Optional) Enable or disable this waf rule group. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `hit_action` - (Optional) If a rule in this group matches the match_value pattern, this action will be executed. Allowed actions are waf_action_no_op and waf_action_allow_parameter. Enum options - WAF_ACTION_NO_OP, WAF_ACTION_BLOCK, WAF_ACTION_ALLOW_PARAMETER. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `is_learning_group` - (Optional) This field indicates that this group is used for learning. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `locations` - (Optional) Positive security model locations. These are used to partition the application name space. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `miss_action` - (Optional) If a rule in this group does not match the match_value pattern, this action will be executed. Allowed actions are waf_action_no_op and waf_action_block. Enum options - WAF_ACTION_NO_OP, WAF_ACTION_BLOCK, WAF_ACTION_ALLOW_PARAMETER. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant that this object belongs to. It is a reference to an object of type tenant. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -51,5 +51,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of this object. Field introduced in 18.2.3. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of this object. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_wafprofile.html.markdown b/website/docs/r/avi_wafprofile.html.markdown
index 368b42ae7..878f190ba 100644
--- a/website/docs/r/avi_wafprofile.html.markdown
+++ b/website/docs/r/avi_wafprofile.html.markdown
@@ -27,13 +27,13 @@ resource "avi_wafprofile" "foo" {
 
 The following arguments are supported:
 
-* `config` - (Required) Config params for waf. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `name` - (Required) Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `files` - (Optional) List of data files used for waf rules. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `config` - (Required) Config params for waf. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `files` - (Optional) List of data files used for waf rules. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -48,5 +48,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Field introduced in 17.2.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_webapput.html.markdown b/website/docs/r/avi_webapput.html.markdown
index 954a2c342..aae917857 100644
--- a/website/docs/r/avi_webapput.html.markdown
+++ b/website/docs/r/avi_webapput.html.markdown
@@ -27,22 +27,23 @@ resource "avi_webapput" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Name of the webapput object-level0. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `default_first_int` - (Optional) Default uint64 field. Field introduced in 30.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `default_second_int` - (Optional) Default int64 field. Field introduced in 30.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `default_string` - (Optional) Default string field. Field introduced in 30.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `default_third_int` - (Optional) Default int32 field. Field introduced in 30.1.2. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mandatory_test` - (Optional) Optional message for nested f_mandatory test cases defined at level1. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `mandatory_tests` - (Optional) Repeated message for nested f_mandatory test cases-level1. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `sensitive_test` - (Optional) Optional message for nested f_sensitive test cases defined at level1. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `sensitive_tests` - (Optional) Repeated message for nested f_sensitive test cases-level1. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `skip_optional_check_tests` - (Optional) Optional bool for nested skip_optional_check test cases-level1. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `string_length_test` - (Optional) Optional message for nested  max string length test cases. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `string_length_tests` - (Optional) Repeated message for nested  max string length test cases. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant of the webapput object-level0. It is a reference to an object of type tenant. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `test_sensitive_string` - (Optional) The string for sensitive (secret) field. Object-level0. Field introduced in 22.1.3. Allowed in enterprise edition with any value, enterprise with cloud services edition.
-* `test_string` - (Optional) The maximum string length. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `name` - (Required) Name of the webapput object-level0. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `cloud_ref` - (Optional) Cloud of the webapput object-level0. It is a reference to an object of type cloud. Field introduced in 30.2.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `default_first_int` - (Optional) Default uint64 field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `default_second_int` - (Optional) Default int64 field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `default_string` - (Optional) Default string field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `default_third_int` - (Optional) Default int32 field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `mandatory_test` - (Optional) Optional message for nested f_mandatory test cases defined at level1. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `mandatory_tests` - (Optional) Repeated message for nested f_mandatory test cases-level1. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sensitive_test` - (Optional) Optional message for nested f_sensitive test cases defined at level1. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sensitive_tests` - (Optional) Repeated message for nested f_sensitive test cases-level1. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `skip_optional_check_tests` - (Optional) Optional bool for nested skip_optional_check test cases-level1. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `string_length_test` - (Optional) Optional message for nested  max string length test cases. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `string_length_tests` - (Optional) Repeated message for nested  max string length test cases. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant of the webapput object-level0. It is a reference to an object of type tenant. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `test_sensitive_string` - (Optional) The string for sensitive (secret) field. Object-level0. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `test_string` - (Optional) The maximum string length. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -57,5 +58,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the webapput object-level0. Field introduced in 21.1.5, 22.1.1. Allowed in enterprise edition with any value, enterprise with cloud services edition.
+* `uuid` -  Uuid of the webapput object-level0. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_webhook.html.markdown b/website/docs/r/avi_webhook.html.markdown
index e2477b274..81cd7a231 100644
--- a/website/docs/r/avi_webhook.html.markdown
+++ b/website/docs/r/avi_webhook.html.markdown
@@ -27,13 +27,13 @@ resource "avi_webhook" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) The name of the webhook profile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `callback_url` - (Optional) Callback url for the webhook. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. 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.
-* `description` - (Optional) Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed in enterprise edition with any value, essentials edition with any value, basic edition with any value, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
-* `verification_token` - (Optional) Verification token sent back with the callback asquery parameters. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) The name of the webhook profile. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `callback_url` - (Optional) Callback url for the webhook. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `verification_token` - (Optional) Verification token sent back with the callback asquery parameters. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -48,5 +48,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid of the webhook profile. Field introduced in 17.1.1. Allowed in enterprise edition with any value, essentials, basic, enterprise with cloud services edition.
+* `uuid` -  Uuid of the webhook profile. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 

From 0f0a3fba7e3eab77ec90de395d14a6be6328fbb4 Mon Sep 17 00:00:00 2001
From: avijenkins <gurunath-reddy.kambala@broadcom.com>
Date: Thu, 26 Jun 2025 09:01:34 +0000
Subject: [PATCH 02/12] Updated assets for terraform

Signed-off-by: avijenkins <gurunath-reddy.kambala@broadcom.com>
---
 avi/data_source_avi_snmptrapprofile_test.go   |   9 +
 ... => datasource_avi_apiratelimitprofile.go} |  15 +-
 ...ource_avi_applicationpersistenceprofile.go |   4 +
 avi/datasource_avi_controllerproperties.go    |  16 +
 avi/datasource_avi_gslb.go                    |   5 -
 avi/datasource_avi_healthmonitor.go           |   5 +
 avi/datasource_avi_image.go                   |   5 +
 avi/datasource_avi_pool.go                    |   6 +-
 avi/datasource_avi_ratelimitconfiguration.go  |  60 +++
 avi/datasource_avi_serviceenginegroup.go      |  22 +-
 avi/datasource_avi_systemconfiguration.go     |  17 +
 avi/datasource_avi_taskjournal.go             |   5 +
 avi/datasource_avi_user.go                    |   4 +
 avi/datasource_avi_virtualservice.go          |   5 -
 avi/datasource_avi_wafpolicy.go               |   2 +-
 avi/datasource_avi_wafpolicypsmgroup.go       |   4 +
 avi/provider.go                               |   6 +-
 avi/resource_avi_alertsyslogconfig_test.go    |  10 +
 avi/resource_avi_apiratelimitprofile.go       | 108 ++++
 ...ource_avi_applicationpersistenceprofile.go |   6 +
 avi/resource_avi_controllerproperties.go      |  24 +
 avi/resource_avi_federationcheckpoint.go      | 108 ----
 avi/resource_avi_gslb.go                      |   6 -
 avi/resource_avi_healthmonitor.go             |   6 +
 avi/resource_avi_image.go                     |   6 +
 avi/resource_avi_pool.go                      |  11 +-
 avi/resource_avi_ratelimitconfiguration.go    | 122 +++++
 avi/resource_avi_rest_dependants.go           | 495 +++++++++++++++++-
 avi/resource_avi_serviceenginegroup.go        |  28 +-
 avi/resource_avi_snmptrapprofile_test.go      |  18 +
 avi/resource_avi_systemconfiguration.go       |  23 +
 avi/resource_avi_taskjournal.go               |   5 +
 avi/resource_avi_user.go                      |   6 +
 avi/resource_avi_virtualservice.go            |   5 -
 avi/resource_avi_wafpolicy.go                 |   2 +-
 avi/resource_avi_wafpolicypsmgroup.go         |   5 +
 go.mod                                        |   2 +-
 go.sum                                        |   2 +
 website/avi.erb                               |  18 +-
 .../d/avi_apiratelimitprofile.html.markdown   |  42 ++
 ...pplicationpersistenceprofile.html.markdown |   1 +
 website/docs/d/avi_cloud.html.markdown        |   2 +-
 .../d/avi_controllerproperties.html.markdown  |   4 +
 website/docs/d/avi_gslb.html.markdown         |   1 -
 .../docs/d/avi_healthmonitor.html.markdown    |   1 +
 website/docs/d/avi_image.html.markdown        |   1 +
 website/docs/d/avi_pool.html.markdown         |   2 +-
 .../avi_ratelimitconfiguration.html.markdown  |  45 ++
 .../d/avi_serviceenginegroup.html.markdown    |   5 +-
 .../d/avi_systemconfiguration.html.markdown   |   4 +
 website/docs/d/avi_taskjournal.html.markdown  |   1 +
 website/docs/d/avi_user.html.markdown         |   1 +
 .../docs/d/avi_virtualservice.html.markdown   |   1 -
 website/docs/d/avi_wafpolicy.html.markdown    |   4 +-
 .../d/avi_wafpolicypsmgroup.html.markdown     |   1 +
 .../r/avi_apiratelimitprofile.html.markdown   |  51 ++
 ...pplicationpersistenceprofile.html.markdown |   1 +
 website/docs/r/avi_cloud.html.markdown        |   2 +-
 .../r/avi_controllerproperties.html.markdown  |   4 +
 website/docs/r/avi_gslb.html.markdown         |   1 -
 .../docs/r/avi_healthmonitor.html.markdown    |   1 +
 website/docs/r/avi_image.html.markdown        |   1 +
 website/docs/r/avi_pool.html.markdown         |   2 +-
 .../avi_ratelimitconfiguration.html.markdown  |  54 ++
 .../r/avi_serviceenginegroup.html.markdown    |   5 +-
 .../r/avi_systemconfiguration.html.markdown   |   4 +
 website/docs/r/avi_taskjournal.html.markdown  |   1 +
 website/docs/r/avi_user.html.markdown         |   1 +
 .../docs/r/avi_virtualservice.html.markdown   |   1 -
 website/docs/r/avi_wafpolicy.html.markdown    |   4 +-
 .../r/avi_wafpolicypsmgroup.html.markdown     |   1 +
 71 files changed, 1268 insertions(+), 188 deletions(-)
 rename avi/{datasource_avi_federationcheckpoint.go => datasource_avi_apiratelimitprofile.go} (77%)
 create mode 100644 avi/datasource_avi_ratelimitconfiguration.go
 create mode 100644 avi/resource_avi_apiratelimitprofile.go
 delete mode 100644 avi/resource_avi_federationcheckpoint.go
 create mode 100644 avi/resource_avi_ratelimitconfiguration.go
 create mode 100644 website/docs/d/avi_apiratelimitprofile.html.markdown
 create mode 100644 website/docs/d/avi_ratelimitconfiguration.html.markdown
 create mode 100644 website/docs/r/avi_apiratelimitprofile.html.markdown
 create mode 100644 website/docs/r/avi_ratelimitconfiguration.html.markdown

diff --git a/avi/data_source_avi_snmptrapprofile_test.go b/avi/data_source_avi_snmptrapprofile_test.go
index 26399b32c..f4c0490ff 100644
--- a/avi/data_source_avi_snmptrapprofile_test.go
+++ b/avi/data_source_avi_snmptrapprofile_test.go
@@ -33,6 +33,15 @@ data "avi_tenant" "default_tenant"{
 resource "avi_snmptrapprofile" "testSnmpTrapProfile" {
 	name = "test-snmp-test-abc"
 	tenant_ref = data.avi_tenant.default_tenant.id
+	trap_servers {
+	community = "abc"
+	ip_addr {
+		addr = "10.10.10.2"
+		type = "V4"
+	}
+	port = "162"
+	version = "SNMP_VER2"
+}
 }
 
 data "avi_snmptrapprofile" "testSnmpTrapProfile" {
diff --git a/avi/datasource_avi_federationcheckpoint.go b/avi/datasource_avi_apiratelimitprofile.go
similarity index 77%
rename from avi/datasource_avi_federationcheckpoint.go
rename to avi/datasource_avi_apiratelimitprofile.go
index 275fc859a..ea379b305 100644
--- a/avi/datasource_avi_federationcheckpoint.go
+++ b/avi/datasource_avi_apiratelimitprofile.go
@@ -5,24 +5,20 @@ package avi
 
 import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
-func dataSourceAviFederationCheckpoint() *schema.Resource {
+func dataSourceAviApiRateLimitProfile() *schema.Resource {
 	return &schema.Resource{
-		Read: ResourceAviFederationCheckpointRead,
+		Read: ResourceAviApiRateLimitProfileRead,
 		Schema: map[string]*schema.Schema{
 			"configpb_attributes": {
 				Type:     schema.TypeSet,
 				Computed: true,
 				Elem:     ResourceConfigPbAttributesSchema(),
 			},
-			"date": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"description": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"is_federated": {
+			"enabled": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
@@ -31,6 +27,11 @@ func dataSourceAviFederationCheckpoint() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"rate_limit_configuration_refs": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 			"tenant_ref": {
 				Type:     schema.TypeString,
 				Optional: true,
diff --git a/avi/datasource_avi_applicationpersistenceprofile.go b/avi/datasource_avi_applicationpersistenceprofile.go
index 994fe3641..3a2947800 100644
--- a/avi/datasource_avi_applicationpersistenceprofile.go
+++ b/avi/datasource_avi_applicationpersistenceprofile.go
@@ -61,6 +61,10 @@ func dataSourceAviApplicationPersistenceProfile() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"persistence_update_interval": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"server_hm_down_recovery": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_controllerproperties.go b/avi/datasource_avi_controllerproperties.go
index 156a14a81..0f2823678 100644
--- a/avi/datasource_avi_controllerproperties.go
+++ b/avi/datasource_avi_controllerproperties.go
@@ -45,6 +45,10 @@ func dataSourceAviControllerProperties() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"async_cert_chaining_interval": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"async_patch_merge_period": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -215,6 +219,14 @@ func dataSourceAviControllerProperties() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"log_records_additional_buffer_space": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"log_records_purge_interval": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"max_dead_se_in_grp": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -353,6 +365,10 @@ func dataSourceAviControllerProperties() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceSCPropertiesSchema(),
 			},
+			"telemetry_interval": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"unresponsive_se_reboot": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_gslb.go b/avi/datasource_avi_gslb.go
index 01d097b0b..f2c6bd645 100644
--- a/avi/datasource_avi_gslb.go
+++ b/avi/datasource_avi_gslb.go
@@ -69,11 +69,6 @@ func dataSourceAviGslb() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
-			"replication_policy": {
-				Type:     schema.TypeSet,
-				Computed: true,
-				Elem:     ResourceReplicationPolicySchema(),
-			},
 			"send_interval": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_healthmonitor.go b/avi/datasource_avi_healthmonitor.go
index b0a5897e8..fa8e6511e 100644
--- a/avi/datasource_avi_healthmonitor.go
+++ b/avi/datasource_avi_healthmonitor.go
@@ -104,6 +104,11 @@ func dataSourceAviHealthMonitor() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceRoleFilterMatchLabelSchema(),
 			},
+			"monitor_ip": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceIpAddrSchema(),
+			},
 			"monitor_port": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_image.go b/avi/datasource_avi_image.go
index ce5cb0655..59d6ceab1 100644
--- a/avi/datasource_avi_image.go
+++ b/avi/datasource_avi_image.go
@@ -27,6 +27,11 @@ func dataSourceAviImage() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"dryrun_info": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourcePackageDetailsSchema(),
+			},
 			"duration": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_pool.go b/avi/datasource_avi_pool.go
index b0dee855b..83e543aae 100644
--- a/avi/datasource_avi_pool.go
+++ b/avi/datasource_avi_pool.go
@@ -122,15 +122,15 @@ func dataSourceAviPool() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"graceful_disable_timeout": {
+			"graceful_disable_timeout_sec": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"graceful_disable_timeout_sec": {
+			"graceful_hm_down_disable_timeout": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"graceful_hm_down_disable_timeout": {
+			"gslb_pool_type": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
diff --git a/avi/datasource_avi_ratelimitconfiguration.go b/avi/datasource_avi_ratelimitconfiguration.go
new file mode 100644
index 000000000..8bda4ed64
--- /dev/null
+++ b/avi/datasource_avi_ratelimitconfiguration.go
@@ -0,0 +1,60 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func dataSourceAviRateLimitConfiguration() *schema.Resource {
+	return &schema.Resource{
+		Read: ResourceAviRateLimitConfigurationRead,
+		Schema: map[string]*schema.Schema{
+			"burst": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"configpb_attributes": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceConfigPbAttributesSchema(),
+			},
+			"description": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"http_methods": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"resource": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"tenant_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"token_refill_rate": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceTokenRefillRateSchema(),
+			},
+			"type": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
diff --git a/avi/datasource_avi_serviceenginegroup.go b/avi/datasource_avi_serviceenginegroup.go
index b2ad480a9..32a5e6b1b 100644
--- a/avi/datasource_avi_serviceenginegroup.go
+++ b/avi/datasource_avi_serviceenginegroup.go
@@ -666,6 +666,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceObjSyncConfigSchema(),
 			},
+			"objsync_mode": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"objsync_port": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -732,6 +736,11 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"reserved_configuration": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceReservedConfigurationSchema(),
+			},
 			"resync_time_interval": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -740,6 +749,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"sdb_key_timeout": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"sdb_pipeline_size": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -1076,10 +1089,6 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"use_objsync": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"use_standard_alb": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -1203,6 +1212,11 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"vsphere_storage_policies": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceVsphereStoragePolicySchema(),
+			},
 			"vss_placement": {
 				Type:     schema.TypeSet,
 				Computed: true,
diff --git a/avi/datasource_avi_systemconfiguration.go b/avi/datasource_avi_systemconfiguration.go
index 55fc7e481..3e519abe9 100644
--- a/avi/datasource_avi_systemconfiguration.go
+++ b/avi/datasource_avi_systemconfiguration.go
@@ -141,6 +141,23 @@ func dataSourceAviSystemConfiguration() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+			"sync_dns_to_se": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"sync_kex_host_to_se": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"sync_syslog_to_se": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"syslog_servers": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceIpAddrSchema(),
+			},
 			"telemetry_configuration": {
 				Type:     schema.TypeSet,
 				Computed: true,
diff --git a/avi/datasource_avi_taskjournal.go b/avi/datasource_avi_taskjournal.go
index b2566a6a9..e5029f67e 100644
--- a/avi/datasource_avi_taskjournal.go
+++ b/avi/datasource_avi_taskjournal.go
@@ -60,6 +60,11 @@ func dataSourceAviTaskJournal() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"warnings": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceJournalErrorSchema(),
+			},
 		},
 	}
 }
diff --git a/avi/datasource_avi_user.go b/avi/datasource_avi_user.go
index a9a5b9a69..1a51bdae3 100644
--- a/avi/datasource_avi_user.go
+++ b/avi/datasource_avi_user.go
@@ -30,6 +30,10 @@ func dataSourceAviUser() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"enable_config_warnings": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"full_name": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_virtualservice.go b/avi/datasource_avi_virtualservice.go
index f7aaba730..371693d83 100644
--- a/avi/datasource_avi_virtualservice.go
+++ b/avi/datasource_avi_virtualservice.go
@@ -224,11 +224,6 @@ func dataSourceAviVirtualService() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"nsx_securitygroup": {
-				Type:     schema.TypeList,
-				Computed: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
-			},
 			"oauth_vs_config": {
 				Type:     schema.TypeSet,
 				Computed: true,
diff --git a/avi/datasource_avi_wafpolicy.go b/avi/datasource_avi_wafpolicy.go
index 9029f10b9..05e37d351 100644
--- a/avi/datasource_avi_wafpolicy.go
+++ b/avi/datasource_avi_wafpolicy.go
@@ -126,7 +126,7 @@ func dataSourceAviWafPolicy() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
-			"updated_crs_rules_in_detection_mode": {
+			"use_evaluation_mode_on_crs_update": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
diff --git a/avi/datasource_avi_wafpolicypsmgroup.go b/avi/datasource_avi_wafpolicypsmgroup.go
index 7c392840d..dae4933cc 100644
--- a/avi/datasource_avi_wafpolicypsmgroup.go
+++ b/avi/datasource_avi_wafpolicypsmgroup.go
@@ -30,6 +30,10 @@ func dataSourceAviWafPolicyPSMGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"location_match_miss_action": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"locations": {
 				Type:     schema.TypeList,
 				Computed: true,
diff --git a/avi/provider.go b/avi/provider.go
index 4a3f52251..4ab7f5cfd 100644
--- a/avi/provider.go
+++ b/avi/provider.go
@@ -131,7 +131,6 @@ func Provider() *schema.Provider {
 			"avi_errorpageprofile":                dataSourceAviErrorPageProfile(),
 			"avi_systemlimits":                    dataSourceAviSystemLimits(),
 			"avi_tenant":                          dataSourceAviTenant(),
-			"avi_federationcheckpoint":            dataSourceAviFederationCheckpoint(),
 			"avi_siteversion":                     dataSourceAviSiteVersion(),
 			"avi_hardwaresecuritymodulegroup":     dataSourceAviHardwareSecurityModuleGroup(),
 			"avi_applicationpersistenceprofile":   dataSourceAviApplicationPersistenceProfile(),
@@ -156,6 +155,8 @@ func Provider() *schema.Provider {
 			"avi_applicationprofile":              dataSourceAviApplicationProfile(),
 			"avi_albservicesjob":                  dataSourceAviALBServicesJob(),
 			"avi_jwtserverprofile":                dataSourceAviJWTServerProfile(),
+			"avi_ratelimitconfiguration":          dataSourceAviRateLimitConfiguration(),
+			"avi_apiratelimitprofile":             dataSourceAviApiRateLimitProfile(),
 			"avi_cloud":                           dataSourceAviCloud(),
 			"avi_cloudconnectoruser":              dataSourceAviCloudConnectorUser(),
 			"avi_availabilityzone":                dataSourceAviAvailabilityZone(),
@@ -258,7 +259,6 @@ func Provider() *schema.Provider {
 			"avi_errorpageprofile":                resourceAviErrorPageProfile(),
 			"avi_systemlimits":                    resourceAviSystemLimits(),
 			"avi_tenant":                          resourceAviTenant(),
-			"avi_federationcheckpoint":            resourceAviFederationCheckpoint(),
 			"avi_siteversion":                     resourceAviSiteVersion(),
 			"avi_hardwaresecuritymodulegroup":     resourceAviHardwareSecurityModuleGroup(),
 			"avi_applicationpersistenceprofile":   resourceAviApplicationPersistenceProfile(),
@@ -283,6 +283,8 @@ func Provider() *schema.Provider {
 			"avi_applicationprofile":              resourceAviApplicationProfile(),
 			"avi_albservicesjob":                  resourceAviALBServicesJob(),
 			"avi_jwtserverprofile":                resourceAviJWTServerProfile(),
+			"avi_ratelimitconfiguration":          resourceAviRateLimitConfiguration(),
+			"avi_apiratelimitprofile":             resourceAviApiRateLimitProfile(),
 			"avi_cloud":                           resourceAviCloud(),
 			"avi_cloudconnectoruser":              resourceAviCloudConnectorUser(),
 			"avi_availabilityzone":                resourceAviAvailabilityZone(),
diff --git a/avi/resource_avi_alertsyslogconfig_test.go b/avi/resource_avi_alertsyslogconfig_test.go
index 300425ee4..5576c6ae5 100644
--- a/avi/resource_avi_alertsyslogconfig_test.go
+++ b/avi/resource_avi_alertsyslogconfig_test.go
@@ -98,6 +98,11 @@ resource "avi_alertsyslogconfig" "testalertsyslogconfig" {
 	name = "asyc-test"
 	description= "test alert syslog"
 	tenant_ref= "${data.avi_tenant.default_tenant.id}"
+	syslog_servers {
+		udp = "true"
+		syslog_server_port = "443"
+		syslog_server = "10.10.3.10"
+	}
 }
 `
 
@@ -110,5 +115,10 @@ resource "avi_alertsyslogconfig" "testalertsyslogconfig" {
 	name = "asyc-abc"
 	description= "test alert syslog"
 	tenant_ref= "${data.avi_tenant.default_tenant.id}"
+	syslog_servers {
+		udp = "true"
+		syslog_server_port = "443"
+		syslog_server = "10.10.3.10"
+	}
 }
 `
diff --git a/avi/resource_avi_apiratelimitprofile.go b/avi/resource_avi_apiratelimitprofile.go
new file mode 100644
index 000000000..013e2bf3d
--- /dev/null
+++ b/avi/resource_avi_apiratelimitprofile.go
@@ -0,0 +1,108 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
+)
+
+func ResourceApiRateLimitProfileSchema() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"configpb_attributes": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceConfigPbAttributesSchema(),
+		},
+		"description": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"enabled": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "true",
+			ValidateFunc: validateBool,
+		},
+		"name": {
+			Type:     schema.TypeString,
+			Required: true,
+		},
+		"rate_limit_configuration_refs": {
+			Type:     schema.TypeList,
+			Required: true,
+			Elem:     &schema.Schema{Type: schema.TypeString},
+		},
+		"tenant_ref": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+	}
+}
+
+func resourceAviApiRateLimitProfile() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAviApiRateLimitProfileCreate,
+		Read:   ResourceAviApiRateLimitProfileRead,
+		Update: resourceAviApiRateLimitProfileUpdate,
+		Delete: resourceAviApiRateLimitProfileDelete,
+		Schema: ResourceApiRateLimitProfileSchema(),
+		Importer: &schema.ResourceImporter{
+			State: ResourceApiRateLimitProfileImporter,
+		},
+	}
+}
+
+func ResourceApiRateLimitProfileImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
+	s := ResourceApiRateLimitProfileSchema()
+	return ResourceImporter(d, m, "apiratelimitprofile", s)
+}
+
+func ResourceAviApiRateLimitProfileRead(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceApiRateLimitProfileSchema()
+	err := APIRead(d, meta, "apiratelimitprofile", s)
+	if err != nil {
+		log.Printf("[ERROR] in reading object %v\n", err)
+	}
+	return err
+}
+
+func resourceAviApiRateLimitProfileCreate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceApiRateLimitProfileSchema()
+	err := APICreate(d, meta, "apiratelimitprofile", s)
+	if err == nil {
+		err = ResourceAviApiRateLimitProfileRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviApiRateLimitProfileUpdate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceApiRateLimitProfileSchema()
+	var err error
+	err = APIUpdate(d, meta, "apiratelimitprofile", s)
+	if err == nil {
+		err = ResourceAviApiRateLimitProfileRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviApiRateLimitProfileDelete(d *schema.ResourceData, meta interface{}) error {
+	var err error
+	if APIDeleteSystemDefaultCheck(d) {
+		return nil
+	}
+	err = APIDelete(d, meta, "apiratelimitprofile")
+	if err != nil {
+		log.Printf("[ERROR] in deleting object %v\n", err)
+	}
+	return err
+}
diff --git a/avi/resource_avi_applicationpersistenceprofile.go b/avi/resource_avi_applicationpersistenceprofile.go
index c4f30ea6e..f9b74685e 100644
--- a/avi/resource_avi_applicationpersistenceprofile.go
+++ b/avi/resource_avi_applicationpersistenceprofile.go
@@ -70,6 +70,12 @@ func ResourceApplicationPersistenceProfileSchema() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Required: true,
 		},
+		"persistence_update_interval": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Computed:     true,
+			ValidateFunc: validateInteger,
+		},
 		"server_hm_down_recovery": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_controllerproperties.go b/avi/resource_avi_controllerproperties.go
index 723e8d8d8..5a25b4dfa 100644
--- a/avi/resource_avi_controllerproperties.go
+++ b/avi/resource_avi_controllerproperties.go
@@ -64,6 +64,12 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema {
 			Default:      "60",
 			ValidateFunc: validateInteger,
 		},
+		"async_cert_chaining_interval": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "0",
+			ValidateFunc: validateInteger,
+		},
 		"async_patch_merge_period": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -316,6 +322,18 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema {
 			Default:      "false",
 			ValidateFunc: validateBool,
 		},
+		"log_records_additional_buffer_space": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "0",
+			ValidateFunc: validateInteger,
+		},
+		"log_records_purge_interval": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "600",
+			ValidateFunc: validateInteger,
+		},
 		"max_dead_se_in_grp": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -518,6 +536,12 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema {
 			Computed: true,
 			Elem:     ResourceSCPropertiesSchema(),
 		},
+		"telemetry_interval": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "1440",
+			ValidateFunc: validateInteger,
+		},
 		"unresponsive_se_reboot": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_federationcheckpoint.go b/avi/resource_avi_federationcheckpoint.go
deleted file mode 100644
index b291e4691..000000000
--- a/avi/resource_avi_federationcheckpoint.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2019 VMware, Inc.
-// SPDX-License-Identifier: Mozilla Public License 2.0
-
-package avi
-
-import (
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"log"
-)
-
-func ResourceFederationCheckpointSchema() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"configpb_attributes": {
-			Type:     schema.TypeSet,
-			Optional: true,
-			Computed: true,
-			Elem:     ResourceConfigPbAttributesSchema(),
-		},
-		"date": {
-			Type:     schema.TypeString,
-			Optional: true,
-			Computed: true,
-		},
-		"description": {
-			Type:     schema.TypeString,
-			Optional: true,
-			Computed: true,
-		},
-		"is_federated": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "true",
-			ValidateFunc: validateBool,
-		},
-		"name": {
-			Type:     schema.TypeString,
-			Required: true,
-		},
-		"tenant_ref": {
-			Type:     schema.TypeString,
-			Optional: true,
-			Computed: true,
-		},
-		"uuid": {
-			Type:     schema.TypeString,
-			Optional: true,
-			Computed: true,
-		},
-	}
-}
-
-func resourceAviFederationCheckpoint() *schema.Resource {
-	return &schema.Resource{
-		Create: resourceAviFederationCheckpointCreate,
-		Read:   ResourceAviFederationCheckpointRead,
-		Update: resourceAviFederationCheckpointUpdate,
-		Delete: resourceAviFederationCheckpointDelete,
-		Schema: ResourceFederationCheckpointSchema(),
-		Importer: &schema.ResourceImporter{
-			State: ResourceFederationCheckpointImporter,
-		},
-	}
-}
-
-func ResourceFederationCheckpointImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
-	s := ResourceFederationCheckpointSchema()
-	return ResourceImporter(d, m, "federationcheckpoint", s)
-}
-
-func ResourceAviFederationCheckpointRead(d *schema.ResourceData, meta interface{}) error {
-	s := ResourceFederationCheckpointSchema()
-	err := APIRead(d, meta, "federationcheckpoint", s)
-	if err != nil {
-		log.Printf("[ERROR] in reading object %v\n", err)
-	}
-	return err
-}
-
-func resourceAviFederationCheckpointCreate(d *schema.ResourceData, meta interface{}) error {
-	s := ResourceFederationCheckpointSchema()
-	err := APICreate(d, meta, "federationcheckpoint", s)
-	if err == nil {
-		err = ResourceAviFederationCheckpointRead(d, meta)
-	}
-	return err
-}
-
-func resourceAviFederationCheckpointUpdate(d *schema.ResourceData, meta interface{}) error {
-	s := ResourceFederationCheckpointSchema()
-	var err error
-	err = APIUpdate(d, meta, "federationcheckpoint", s)
-	if err == nil {
-		err = ResourceAviFederationCheckpointRead(d, meta)
-	}
-	return err
-}
-
-func resourceAviFederationCheckpointDelete(d *schema.ResourceData, meta interface{}) error {
-	var err error
-	if APIDeleteSystemDefaultCheck(d) {
-		return nil
-	}
-	err = APIDelete(d, meta, "federationcheckpoint")
-	if err != nil {
-		log.Printf("[ERROR] in deleting object %v\n", err)
-	}
-	return err
-}
diff --git a/avi/resource_avi_gslb.go b/avi/resource_avi_gslb.go
index 27d1a26e4..bebc0cfd7 100644
--- a/avi/resource_avi_gslb.go
+++ b/avi/resource_avi_gslb.go
@@ -88,12 +88,6 @@ func ResourceGslbSchema() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Required: true,
 		},
-		"replication_policy": {
-			Type:     schema.TypeSet,
-			Optional: true,
-			Computed: true,
-			Elem:     ResourceReplicationPolicySchema(),
-		},
 		"send_interval": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_healthmonitor.go b/avi/resource_avi_healthmonitor.go
index 990c500a7..5fc4cc22a 100644
--- a/avi/resource_avi_healthmonitor.go
+++ b/avi/resource_avi_healthmonitor.go
@@ -128,6 +128,12 @@ func ResourceHealthMonitorSchema() map[string]*schema.Schema {
 			Optional: true,
 			Elem:     ResourceRoleFilterMatchLabelSchema(),
 		},
+		"monitor_ip": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceIpAddrSchema(),
+		},
 		"monitor_port": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_image.go b/avi/resource_avi_image.go
index f13f26654..5a8639c03 100644
--- a/avi/resource_avi_image.go
+++ b/avi/resource_avi_image.go
@@ -31,6 +31,12 @@ func ResourceImageSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"dryrun_info": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourcePackageDetailsSchema(),
+		},
 		"duration": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_pool.go b/avi/resource_avi_pool.go
index f24e44bb4..b2918c440 100644
--- a/avi/resource_avi_pool.go
+++ b/avi/resource_avi_pool.go
@@ -154,12 +154,6 @@ func ResourcePoolSchema() map[string]*schema.Schema {
 			Default:      "10",
 			ValidateFunc: validateInteger,
 		},
-		"graceful_disable_timeout": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "1",
-			ValidateFunc: validateInteger,
-		},
 		"graceful_disable_timeout_sec": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -172,6 +166,11 @@ func ResourcePoolSchema() map[string]*schema.Schema {
 			Default:      "-1",
 			ValidateFunc: validateInteger,
 		},
+		"gslb_pool_type": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
 		"gslb_sp_enabled": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_ratelimitconfiguration.go b/avi/resource_avi_ratelimitconfiguration.go
new file mode 100644
index 000000000..31f35d3f5
--- /dev/null
+++ b/avi/resource_avi_ratelimitconfiguration.go
@@ -0,0 +1,122 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
+)
+
+func ResourceRateLimitConfigurationSchema() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"burst": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "1",
+			ValidateFunc: validateInteger,
+		},
+		"configpb_attributes": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceConfigPbAttributesSchema(),
+		},
+		"description": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"http_methods": {
+			Type:     schema.TypeList,
+			Required: true,
+			Elem:     &schema.Schema{Type: schema.TypeString},
+		},
+		"name": {
+			Type:     schema.TypeString,
+			Required: true,
+		},
+		"resource": {
+			Type:     schema.TypeString,
+			Required: true,
+		},
+		"tenant_ref": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"token_refill_rate": {
+			Type:     schema.TypeSet,
+			Required: true,
+			Elem:     ResourceTokenRefillRateSchema(),
+		},
+		"type": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Default:  "RATE_LIMITER_API_CATEGORY",
+		},
+		"uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+	}
+}
+
+func resourceAviRateLimitConfiguration() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAviRateLimitConfigurationCreate,
+		Read:   ResourceAviRateLimitConfigurationRead,
+		Update: resourceAviRateLimitConfigurationUpdate,
+		Delete: resourceAviRateLimitConfigurationDelete,
+		Schema: ResourceRateLimitConfigurationSchema(),
+		Importer: &schema.ResourceImporter{
+			State: ResourceRateLimitConfigurationImporter,
+		},
+	}
+}
+
+func ResourceRateLimitConfigurationImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
+	s := ResourceRateLimitConfigurationSchema()
+	return ResourceImporter(d, m, "ratelimitconfiguration", s)
+}
+
+func ResourceAviRateLimitConfigurationRead(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceRateLimitConfigurationSchema()
+	err := APIRead(d, meta, "ratelimitconfiguration", s)
+	if err != nil {
+		log.Printf("[ERROR] in reading object %v\n", err)
+	}
+	return err
+}
+
+func resourceAviRateLimitConfigurationCreate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceRateLimitConfigurationSchema()
+	err := APICreate(d, meta, "ratelimitconfiguration", s)
+	if err == nil {
+		err = ResourceAviRateLimitConfigurationRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviRateLimitConfigurationUpdate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceRateLimitConfigurationSchema()
+	var err error
+	err = APIUpdate(d, meta, "ratelimitconfiguration", s)
+	if err == nil {
+		err = ResourceAviRateLimitConfigurationRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviRateLimitConfigurationDelete(d *schema.ResourceData, meta interface{}) error {
+	var err error
+	if APIDeleteSystemDefaultCheck(d) {
+		return nil
+	}
+	err = APIDelete(d, meta, "ratelimitconfiguration")
+	if err != nil {
+		log.Printf("[ERROR] in deleting object %v\n", err)
+	}
+	return err
+}
diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go
index 454d9db0c..622167841 100644
--- a/avi/resource_avi_rest_dependants.go
+++ b/avi/resource_avi_rest_dependants.go
@@ -7737,6 +7737,12 @@ func ResourceControllerFaultsSchema() *schema.Resource {
 				Default:      "true",
 				ValidateFunc: validateBool,
 			},
+			"system_limits_faults": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "true",
+				ValidateFunc: validateBool,
+			},
 		},
 	}
 }
@@ -11466,7 +11472,7 @@ func ResourceDryRunParamsSchema() *schema.Resource {
 			"memory": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Default:      "2",
+				Default:      "6",
 				ValidateFunc: validateFloat,
 			},
 			"num_cpu": {
@@ -11758,6 +11764,12 @@ func ResourceEventDetailsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceRequestLimiterEventInfoSchema(),
 			},
+			"apiserver_request_ratelimit_event_info": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceRequestLimiterEventInfoSchema(),
+			},
 			"app_signature_event_data": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -12376,6 +12388,30 @@ func ResourceEventDetailsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceNetworkSubnetInfoSchema(),
 			},
+			"nsxt_dfw_group_details": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceNsxtDFWGroupDetailsSchema(),
+			},
+			"nsxt_dfw_service_details": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceNsxtDFWServiceDetailsSchema(),
+			},
+			"nsxt_dfw_tag_segment_port": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceNsxtDFWTagSegmentPortSchema(),
+			},
+			"nsxt_dfw_tag_vm_details": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceNsxtDFWTagVMSchema(),
+			},
 			"nsxt_endpoint_details": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -12742,6 +12778,12 @@ func ResourceEventDetailsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceSeProcessCrashedDetailsSchema(),
 			},
+			"se_rate_limiter_drop_details": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceSeRateLimiterDropDetailsSchema(),
+			},
 			"se_reconcile_details": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -12934,6 +12976,12 @@ func ResourceEventDetailsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceCloudSyncServicesSchema(),
 			},
+			"system_limit_object_counts": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceSystemLimitObjectCountsSchema(),
+			},
 			"system_report_event_details": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -12982,6 +13030,12 @@ func ResourceEventDetailsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceUpgradeStatusInfoSchema(),
 			},
+			"usage_metering_event_details": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceUsageMeteringEventDetailsSchema(),
+			},
 			"vca_infra_details": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -14852,6 +14906,11 @@ func ResourceGslbPoolSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"gslb_pool_type": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "GSLB_POOL_TYPE_GENERIC",
+			},
 			"manual_resume": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -15259,6 +15318,18 @@ func ResourceGslbServiceDownResponseSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceIpAddrSchema(),
 			},
+			"public_fallback_ip": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceIpAddrSchema(),
+			},
+			"public_fallback_ip6": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceIpAddrSchema(),
+			},
 			"type": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -20012,7 +20083,8 @@ func ResourceJWTValidationParamsSchema() *schema.Resource {
 		Schema: map[string]*schema.Schema{
 			"audience": {
 				Type:     schema.TypeString,
-				Required: true,
+				Optional: true,
+				Computed: true,
 			},
 		},
 	}
@@ -20214,6 +20286,11 @@ func ResourceJournalSummarySchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"state": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"status": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -20223,6 +20300,12 @@ func ResourceJournalSummarySchema() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"warning_count": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
 		},
 	}
 }
@@ -20256,6 +20339,11 @@ func ResourceJournalTaskSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"state": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"status": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -20276,6 +20364,37 @@ func ResourceJournalTaskSchema() *schema.Resource {
 	}
 }
 
+func ResourceJsonParsingLimitsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"max_nesting_level": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "0",
+				ValidateFunc: validateInteger,
+			},
+			"max_subelements": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "0",
+				ValidateFunc: validateInteger,
+			},
+			"max_total_elements": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "0",
+				ValidateFunc: validateInteger,
+			},
+			"max_value_length": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "0",
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
 func ResourceJwtLogSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -20322,6 +20441,22 @@ func ResourceKeyValueSchema() *schema.Resource {
 	}
 }
 
+func ResourceKeyValueConfigurationSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"key": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"value": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
 func ResourceKeyValueTupleSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -21610,6 +21745,11 @@ func ResourceLogManagerDebugFilterSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"telemetry_trace_log_level": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -23968,7 +24108,7 @@ func ResourceNsxtConfigurationSchema() *schema.Resource {
 			"automate_dfw_objects": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Default:      "false",
+				Default:      "true",
 				ValidateFunc: validateBool,
 			},
 			"automate_dfw_rules": {
@@ -24014,6 +24154,12 @@ func ResourceNsxtConfigurationSchema() *schema.Resource {
 				Optional: true,
 				Default:  "default",
 			},
+			"streamline_dfw_objects": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateBool,
+			},
 			"verify_certificate": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -24055,6 +24201,79 @@ func ResourceNsxtCredentialsSchema() *schema.Resource {
 	}
 }
 
+func ResourceNsxtDFWGroupDetailsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"error_string": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"group": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func ResourceNsxtDFWServiceDetailsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"error_string": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"service": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func ResourceNsxtDFWTagSegmentPortSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"error_string": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"path": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"vsuuids": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+		},
+	}
+}
+
+func ResourceNsxtDFWTagVMSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"error_string": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceNsxtDatastoresSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -24864,6 +25083,11 @@ func ResourceOIDCConfigSchema() *schema.Resource {
 				Default:      "true",
 				ValidateFunc: validateBool,
 			},
+			"userid_claim_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"userinfo": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -25850,6 +26074,24 @@ func ResourceOperationalStatusSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceTimeStampSchema(),
 			},
+			"num_vs_completed": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"num_vs_failed": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"num_vs_total": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
 			"reason": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -26371,6 +26613,12 @@ func ResourcePatchControllerParamsSchema() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"dryrun": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 			"prechecks_only": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -26474,6 +26722,12 @@ func ResourcePatchSystemParamsSchema() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"dryrun": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 			"prechecks_only": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -26998,6 +27252,12 @@ func ResourcePortalConfigurationSchema() *schema.Resource {
 				Default:      "true",
 				ValidateFunc: validateBool,
 			},
+			"enable_rate_limiter": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 			"http_port": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -27894,11 +28154,6 @@ func ResourceReplaceStringVarSchema() *schema.Resource {
 func ResourceReplicationPolicySchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
-			"checkpoint_ref": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-			},
 			"replication_mode": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -28092,6 +28347,18 @@ func ResourceRequestLimiterEventInfoSchema() *schema.Resource {
 	}
 }
 
+func ResourceReservedConfigurationSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"key_value_configurations": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceKeyValueConfigurationSchema(),
+			},
+		},
+	}
+}
+
 func ResourceResponseMatchTargetSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -32533,6 +32800,24 @@ func ResourceSeProcessCrashedDetailsSchema() *schema.Resource {
 	}
 }
 
+func ResourceSeRateLimiterDropDetailsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"num_pkts_dropped": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"se_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceSeRateLimitersSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -35903,6 +36188,12 @@ func ResourceSupportedMigrationsSchema() *schema.Resource {
 				Default:      "1",
 				ValidateFunc: validateFloat,
 			},
+			"dryrun_total_memory_required": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "12",
+				ValidateFunc: validateFloat,
+			},
 			"max_active_versions": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -36056,6 +36347,62 @@ func ResourceSwitchoverFailEventDetailsSchema() *schema.Resource {
 	}
 }
 
+func ResourceSystemLimitObjectCountSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"current_count": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"limit": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"limit_description": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"limit_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"recommended_max_limit": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func ResourceSystemLimitObjectCountsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"object_counts": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceSystemLimitObjectCountSchema(),
+			},
+		},
+	}
+}
+
 func ResourceTCPApplicationProfileSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -36702,6 +37049,24 @@ func ResourceTlsFingerprintMatchSchema() *schema.Resource {
 	}
 }
 
+func ResourceTokenRefillRateSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"interval": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "PER_MINUTE_INTERVAL",
+			},
+			"refill_rate": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "1",
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
 func ResourceTrueClientIPConfigSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -37325,6 +37690,45 @@ func ResourceUpgradeSystemParamsSchema() *schema.Resource {
 	}
 }
 
+func ResourceUsageMeteringCloudSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"status": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func ResourceUsageMeteringEventDetailsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"clouds": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceUsageMeteringCloudSchema(),
+			},
+			"message": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"trigger": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceUserActivitySchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -37718,6 +38122,11 @@ func ResourceVIMgrGuestNicRuntimeSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"segment_port": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"type": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -42250,6 +42659,23 @@ func ResourceVsgsOpsInfoSchema() *schema.Resource {
 	}
 }
 
+func ResourceVsphereStoragePolicySchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"vcenter_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"vsphere_storage_policy_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceVssPlacementSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -42490,6 +42916,12 @@ func ResourceWafConfigSchema() *schema.Resource {
 				Default:      "0",
 				ValidateFunc: validateInteger,
 			},
+			"enable_json_parsing_limits": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 			"enforce_max_body_size": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -42502,6 +42934,17 @@ func ResourceWafConfigSchema() *schema.Resource {
 				Default:      "true",
 				ValidateFunc: validateBool,
 			},
+			"json_parsing_limits": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceJsonParsingLimitsSchema(),
+			},
+			"match_element_sub_parsers": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceWafMatchElementSubParserSchema(),
+			},
 			"max_execution_time": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -42837,6 +43280,42 @@ func ResourceWafLogSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"used_body_parser": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "WAF_REQUEST_PARSER_DO_NOT_PARSE",
+			},
+		},
+	}
+}
+
+func ResourceWafMatchElementSubParserSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"index": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validateInteger,
+			},
+			"match_case": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "SENSITIVE",
+			},
+			"match_element": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"match_op": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "EQUALS",
+			},
+			"sub_parser": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "WAF_REQUEST_PARSER_AUTO_DETECT",
+			},
 		},
 	}
 }
diff --git a/avi/resource_avi_serviceenginegroup.go b/avi/resource_avi_serviceenginegroup.go
index 321e4ba78..a9cfdf823 100644
--- a/avi/resource_avi_serviceenginegroup.go
+++ b/avi/resource_avi_serviceenginegroup.go
@@ -947,6 +947,11 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Computed: true,
 			Elem:     ResourceObjSyncConfigSchema(),
 		},
+		"objsync_mode": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Default:  "OBJSYNC_ENABLED",
+		},
 		"objsync_port": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -1038,6 +1043,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Default:      "1000",
 			ValidateFunc: validateInteger,
 		},
+		"reserved_configuration": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceReservedConfigurationSchema(),
+		},
 		"resync_time_interval": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -1050,6 +1061,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Default:      "100",
 			ValidateFunc: validateInteger,
 		},
+		"sdb_key_timeout": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "60",
+			ValidateFunc: validateInteger,
+		},
 		"sdb_pipeline_size": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -1536,12 +1553,6 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Default:      "false",
 			ValidateFunc: validateBool,
 		},
-		"use_objsync": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "true",
-			ValidateFunc: validateBool,
-		},
 		"use_standard_alb": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -1710,6 +1721,11 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Default:      "300",
 			ValidateFunc: validateInteger,
 		},
+		"vsphere_storage_policies": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceVsphereStoragePolicySchema(),
+		},
 		"vss_placement": {
 			Type:     schema.TypeSet,
 			Optional: true,
diff --git a/avi/resource_avi_snmptrapprofile_test.go b/avi/resource_avi_snmptrapprofile_test.go
index 4678b40de..be32321a1 100644
--- a/avi/resource_avi_snmptrapprofile_test.go
+++ b/avi/resource_avi_snmptrapprofile_test.go
@@ -97,6 +97,15 @@ data "avi_tenant" "default_tenant"{
 resource "avi_snmptrapprofile" "testSnmpTrapProfile" {
 	name = "test-snmp-test-abc"
 	tenant_ref = data.avi_tenant.default_tenant.id
+	trap_servers {
+	community = "abc"
+	ip_addr {
+		addr = "10.10.10.2"
+		type = "V4"
+	}
+	port = "162"
+	version = "SNMP_VER2"
+}
 }
 `
 
@@ -107,5 +116,14 @@ data "avi_tenant" "default_tenant"{
 resource "avi_snmptrapprofile" "testSnmpTrapProfile" {
 	name = "test-snmp-updated"
 	tenant_ref = data.avi_tenant.default_tenant.id
+	trap_servers {
+	community = "abc"
+	ip_addr {
+		addr = "10.10.10.2"
+		type = "V4"
+	}
+	port = "162"
+	version = "SNMP_VER2"
+}
 }
 `
diff --git a/avi/resource_avi_systemconfiguration.go b/avi/resource_avi_systemconfiguration.go
index af6140304..fdcdccfb3 100644
--- a/avi/resource_avi_systemconfiguration.go
+++ b/avi/resource_avi_systemconfiguration.go
@@ -176,6 +176,29 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema {
 			Optional: true,
 			Elem:     &schema.Schema{Type: schema.TypeString},
 		},
+		"sync_dns_to_se": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
+		"sync_kex_host_to_se": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
+		"sync_syslog_to_se": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
+		"syslog_servers": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceIpAddrSchema(),
+		},
 		"telemetry_configuration": {
 			Type:     schema.TypeSet,
 			Optional: true,
diff --git a/avi/resource_avi_taskjournal.go b/avi/resource_avi_taskjournal.go
index 31ae8d7f1..88b220acb 100644
--- a/avi/resource_avi_taskjournal.go
+++ b/avi/resource_avi_taskjournal.go
@@ -66,6 +66,11 @@ func ResourceTaskJournalSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"warnings": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceJournalErrorSchema(),
+		},
 	}
 }
 
diff --git a/avi/resource_avi_user.go b/avi/resource_avi_user.go
index bd5830150..0a367c440 100644
--- a/avi/resource_avi_user.go
+++ b/avi/resource_avi_user.go
@@ -36,6 +36,12 @@ func ResourceUserSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"enable_config_warnings": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "true",
+			ValidateFunc: validateBool,
+		},
 		"full_name": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_virtualservice.go b/avi/resource_avi_virtualservice.go
index 4c5326c57..edc72a397 100644
--- a/avi/resource_avi_virtualservice.go
+++ b/avi/resource_avi_virtualservice.go
@@ -282,11 +282,6 @@ func ResourceVirtualServiceSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
-		"nsx_securitygroup": {
-			Type:     schema.TypeList,
-			Optional: true,
-			Elem:     &schema.Schema{Type: schema.TypeString},
-		},
 		"oauth_vs_config": {
 			Type:     schema.TypeSet,
 			Optional: true,
diff --git a/avi/resource_avi_wafpolicy.go b/avi/resource_avi_wafpolicy.go
index a3b7c80b8..2b1e80093 100644
--- a/avi/resource_avi_wafpolicy.go
+++ b/avi/resource_avi_wafpolicy.go
@@ -151,7 +151,7 @@ func ResourceWafPolicySchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
-		"updated_crs_rules_in_detection_mode": {
+		"use_evaluation_mode_on_crs_update": {
 			Type:         schema.TypeString,
 			Optional:     true,
 			Default:      "true",
diff --git a/avi/resource_avi_wafpolicypsmgroup.go b/avi/resource_avi_wafpolicypsmgroup.go
index 56e08c3a5..4920bdb4d 100644
--- a/avi/resource_avi_wafpolicypsmgroup.go
+++ b/avi/resource_avi_wafpolicypsmgroup.go
@@ -38,6 +38,11 @@ func ResourceWafPolicyPSMGroupSchema() map[string]*schema.Schema {
 			Default:      "false",
 			ValidateFunc: validateBool,
 		},
+		"location_match_miss_action": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Default:  "WAF_ACTION_NO_OP",
+		},
 		"locations": {
 			Type:     schema.TypeList,
 			Optional: true,
diff --git a/go.mod b/go.mod
index aec5bb295..de1c5ce1f 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ toolchain go1.23.2
 
 require (
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0
-	github.com/vmware/alb-sdk v0.0.0-20250125055329-911aef493be4
+	github.com/vmware/alb-sdk v0.0.0-20250610083806-8447580290e5
 )
 
 require (
diff --git a/go.sum b/go.sum
index 7e26efc99..648e4da50 100644
--- a/go.sum
+++ b/go.sum
@@ -206,6 +206,8 @@ github.com/vmware/alb-sdk v0.0.0-20240605102317-cc857152bc67 h1:AbMBmnIbvNTVS6u9
 github.com/vmware/alb-sdk v0.0.0-20240605102317-cc857152bc67/go.mod h1:fuRb4saDY/xy/UMeMvyKYmcplNknEL9ysaqYSw7reNE=
 github.com/vmware/alb-sdk v0.0.0-20250125055329-911aef493be4 h1:yT0eZ66Rc1uYRf3ruBWk/5BTBMARnCbxSn/2VPsc5ag=
 github.com/vmware/alb-sdk v0.0.0-20250125055329-911aef493be4/go.mod h1:4f6ExD6/N+8aP4Km/foEpCVlYqpiz+ogXL4QHbC03Xw=
+github.com/vmware/alb-sdk v0.0.0-20250610083806-8447580290e5 h1:Pp+dny+PjeW6XQyZu+HQB7X2lFB8WZlt2ky9uQlm8qc=
+github.com/vmware/alb-sdk v0.0.0-20250610083806-8447580290e5/go.mod h1:4f6ExD6/N+8aP4Km/foEpCVlYqpiz+ogXL4QHbC03Xw=
 github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
 github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
 github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
diff --git a/website/avi.erb b/website/avi.erb
index 30f61030e..345da9da4 100644
--- a/website/avi.erb
+++ b/website/avi.erb
@@ -196,9 +196,6 @@
             </li>
                       <li<%= sidebar_current("docs-avi-tenant") %>>
               <a href="/docs/providers/avi/d/avi_tenant.html">Tenant</a>
-            </li>
-                      <li<%= sidebar_current("docs-avi-federationcheckpoint") %>>
-              <a href="/docs/providers/avi/d/avi_federationcheckpoint.html">FederationCheckpoint</a>
             </li>
                       <li<%= sidebar_current("docs-avi-siteversion") %>>
               <a href="/docs/providers/avi/d/avi_siteversion.html">SiteVersion</a>
@@ -271,6 +268,12 @@
             </li>
                       <li<%= sidebar_current("docs-avi-jwtserverprofile") %>>
               <a href="/docs/providers/avi/d/avi_jwtserverprofile.html">JWTServerProfile</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-ratelimitconfiguration") %>>
+              <a href="/docs/providers/avi/d/avi_ratelimitconfiguration.html">RateLimitConfiguration</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-apiratelimitprofile") %>>
+              <a href="/docs/providers/avi/d/avi_apiratelimitprofile.html">ApiRateLimitProfile</a>
             </li>
                       <li<%= sidebar_current("docs-avi-cloud") %>>
               <a href="/docs/providers/avi/d/avi_cloud.html">Cloud</a>
@@ -577,9 +580,6 @@
             </li>
 		              <li<%= sidebar_current("docs-avi-tenant") %>>
               <a href="/docs/providers/avi/r/avi_tenant.html">Tenant</a>
-            </li>
-		              <li<%= sidebar_current("docs-avi-federationcheckpoint") %>>
-              <a href="/docs/providers/avi/r/avi_federationcheckpoint.html">FederationCheckpoint</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-siteversion") %>>
               <a href="/docs/providers/avi/r/avi_siteversion.html">SiteVersion</a>
@@ -652,6 +652,12 @@
             </li>
 		              <li<%= sidebar_current("docs-avi-jwtserverprofile") %>>
               <a href="/docs/providers/avi/r/avi_jwtserverprofile.html">JWTServerProfile</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-ratelimitconfiguration") %>>
+              <a href="/docs/providers/avi/r/avi_ratelimitconfiguration.html">RateLimitConfiguration</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-apiratelimitprofile") %>>
+              <a href="/docs/providers/avi/r/avi_apiratelimitprofile.html">ApiRateLimitProfile</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-cloud") %>>
               <a href="/docs/providers/avi/r/avi_cloud.html">Cloud</a>
diff --git a/website/docs/d/avi_apiratelimitprofile.html.markdown b/website/docs/d/avi_apiratelimitprofile.html.markdown
new file mode 100644
index 000000000..22ba6df16
--- /dev/null
+++ b/website/docs/d/avi_apiratelimitprofile.html.markdown
@@ -0,0 +1,42 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "AVI: avi_apiratelimitprofile"
+sidebar_current: "docs-avi-datasource-apiratelimitprofile"
+description: |-
+  Get information of Avi ApiRateLimitProfile.
+---
+
+# avi_apiratelimitprofile
+
+This data source is used to to get avi_apiratelimitprofile objects.
+
+## Example Usage
+
+```hcl
+data "avi_apiratelimitprofile" "foo_apiratelimitprofile" {
+    uuid = "apiratelimitprofile-f9cf6b3e-a411-436f-95e2-2982ba2b217b"
+    name = "foo"
+}
+```
+
+## Argument Reference
+
+* `name` - (Optional) Search ApiRateLimitProfile by name.
+* `uuid` - (Optional) Search ApiRateLimitProfile by uuid.
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Description for the api rate limit profile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enabled` - Activate/deactivate the api rate limit profile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of the api rate limit profile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `rate_limit_configuration_refs` - List of the rate limiter configuration uuids. It is a reference to an object of type ratelimitconfiguration. Field introduced in 31.2.1. Minimum of 1 items required. Maximum of 100 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant ref for the api rate limit profile. It is a reference to an object of type tenant. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid of the api rate limit profile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/d/avi_applicationpersistenceprofile.html.markdown b/website/docs/d/avi_applicationpersistenceprofile.html.markdown
index da0282e2e..fbb063fd0 100644
--- a/website/docs/d/avi_applicationpersistenceprofile.html.markdown
+++ b/website/docs/d/avi_applicationpersistenceprofile.html.markdown
@@ -43,6 +43,7 @@ In addition to all arguments above, the following attributes are exported:
 * `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `name` - A user-friendly name for the persistence profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `persistence_type` - Method used to persist clients to the same server for a duration of time or a session. Enum options - PERSISTENCE_TYPE_CLIENT_IP_ADDRESS, PERSISTENCE_TYPE_HTTP_COOKIE, PERSISTENCE_TYPE_TLS, PERSISTENCE_TYPE_CLIENT_IPV6_ADDRESS, PERSISTENCE_TYPE_CUSTOM_HTTP_HEADER, PERSISTENCE_TYPE_APP_COOKIE, PERSISTENCE_TYPE_GSLB_SITE, PERSISTENCE_TYPE_APP_DIAMETER. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- persistence_type_client_ip_address,persistence_type_http_cookie), basic (allowed values- persistence_type_client_ip_address,persistence_type_http_cookie) edition.
+* `persistence_update_interval` - Interval in minutes at which refreshed persistence entries are synced to peer ses. If not set, it willsync at an interval of timeout/2. Allowed values are 1-30. Field introduced in 30.2.4. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `server_hm_down_recovery` - Specifies behavior when a persistent server has been marked down by a health monitor. Enum options - HM_DOWN_PICK_NEW_SERVER, HM_DOWN_ABORT_CONNECTION, HM_DOWN_CONTINUE_PERSISTENT_SERVER. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- hm_down_pick_new_server), basic (allowed values- hm_down_pick_new_server) edition.
 * `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `uuid` - Uuid of the persistence profile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_cloud.html.markdown b/website/docs/d/avi_cloud.html.markdown
index 53c598a5a..21930442e 100644
--- a/website/docs/d/avi_cloud.html.markdown
+++ b/website/docs/d/avi_cloud.html.markdown
@@ -62,7 +62,7 @@ In addition to all arguments above, the following attributes are exported:
 * `name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `nsxt_configuration` - Nsx-t cloud platform configuration. Field introduced in 20.1.1. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
 * `ntp_configuration` - Ntp configuration for the cloud. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `obj_name_prefix` - Default prefix for all automatically created objects in this cloud. This prefix can be overridden by the se-group template. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `obj_name_prefix` - Default prefix for all automatically created objects in this cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `prefer_static_routes` - Prefer static routes over interface routes during virtualservice placement. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `proxy_configuration` - Allowed with any value in enterprise, enterprise with cloud services edition.
 * `rancher_configuration` - Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_controllerproperties.html.markdown b/website/docs/d/avi_controllerproperties.html.markdown
index 7b9bf3332..46392a169 100644
--- a/website/docs/d/avi_controllerproperties.html.markdown
+++ b/website/docs/d/avi_controllerproperties.html.markdown
@@ -41,6 +41,7 @@ In addition to all arguments above, the following attributes are exported:
 * `api_perf_logging_threshold` - Threshold to log request timing in portal_performance.log and server-timing response header. Any stage taking longer than 1% of the threshold will be included in the server-timing header. Field introduced in 18.1.4, 18.2.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `appviewx_compat_mode` - Export configuration in appviewx compatibility mode. Field introduced in 17.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
 * `archive_retention_framework_period` - Period for archive and retention framework job. Allowed values are 1-240. Field introduced in 31.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `async_cert_chaining_interval` - Time in seconds to wait before starting async certificate chaining. Allowed values are 0-120. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `async_patch_merge_period` - Period for which asynchronous patch requests are queued. Allowed values are 30-120. Special values are 0 - deactivated. Field introduced in 18.2.11, 20.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `async_patch_request_cleanup_duration` - Duration for which asynchronous patch requests should be kept, after being marked as success or fail. Allowed values are 5-120. Field introduced in 18.2.11, 20.1.3. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `attach_ip_retry_interval` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
@@ -83,6 +84,8 @@ In addition to all arguments above, the following attributes are exported:
 * `gslb_purge_batch_size` - Batch size for the vs_mgr to perform datastrorecleanup during a gslb purge. Allowed values are 50-1200. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `gslb_purge_sleep_time_ms` - Sleep time in the vs_mgr during a federatedpurge rpc call. Allowed values are 50-100. Field introduced in 22.1.3. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ignore_vrf_in_networksubnetlist` - Ignore the vrf_context filter for /networksubnetlist api. Field introduced in 22.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_records_additional_buffer_space` - Additional buffer space (up to 10 gb) to be allocated to store logs on a controller. Allowed values are 0-10000. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_records_purge_interval` - Frequency (in seconds) to clean up log files on controller node. By default, 600 seconds. Allowed values are 1-100000. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `max_dead_se_in_grp` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `max_pcap_per_tenant` - Maximum number of pcap files stored per tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `max_se_spawn_interval_delay` - Maximum delay possible to add to se_spawn_retry_interval after successive se spawn failure. Field introduced in 20.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
@@ -117,6 +120,7 @@ In addition to all arguments above, the following attributes are exported:
 * `soft_min_mem_per_se_limit` - Soft limit on the minimum se memory that an se needs to have on se register. Field introduced in 30.1.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ssl_certificate_expiry_warning_days` - Number of days for ssl certificate expiry warning. Unit is days. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `statecache_properties` - Configure statecache behavior for config, se, resmgr. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `telemetry_interval` - Period for telemetry job. Allowed values are 1-1440. Field introduced in 31.2.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `unresponsive_se_reboot` - Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `update_dns_entry_retry_limit` - Number of times to retry a dns entry update/delete operation. Field introduced in 21.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `update_dns_entry_timeout` - Timeout period for a dns entry update/delete operation. Field introduced in 21.1.4. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_gslb.html.markdown b/website/docs/d/avi_gslb.html.markdown
index 3518cf185..6e3cc554d 100644
--- a/website/docs/d/avi_gslb.html.markdown
+++ b/website/docs/d/avi_gslb.html.markdown
@@ -46,7 +46,6 @@ In addition to all arguments above, the following attributes are exported:
 * `leader_cluster_uuid` - Mark this site as leader of gslb configuration. This site is the one among the avi sites. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `maintenance_mode` - This field disables the configuration operations on the leader for all federated objects. Cud operations on gslb, gslbservice, gslbgeodbprofile and other federated objects will be rejected. The rest-api disabling helps in upgrade scenarios where we don't want configuration sync operations to the gslb member when the member is being upgraded. This configuration programmatically blocks the leader from accepting new gslb configuration when member sites are undergoing upgrade. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `name` - Name for the gslb object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `replication_policy` - Policy for replicating configuration to the active follower sites. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `send_interval` - Frequency with which group members communicate. Allowed values are 1-3600. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `send_interval_prior_to_maintenance_mode` - The user can specify a send-interval while entering maintenance mode. The validity of this 'maintenance send-interval' is only during maintenance mode. When the user leaves maintenance mode, the original send-interval is reinstated. This internal variable is used to store the original send-interval. Field introduced in 18.2.3. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `short_probe_interval` - Wait time between two consecutive short probe health checks. Allowed values are 1-3600. Field introduced in 31.1.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_healthmonitor.html.markdown b/website/docs/d/avi_healthmonitor.html.markdown
index 6b084b756..f0057239d 100644
--- a/website/docs/d/avi_healthmonitor.html.markdown
+++ b/website/docs/d/avi_healthmonitor.html.markdown
@@ -52,6 +52,7 @@ In addition to all arguments above, the following attributes are exported:
 * `ldap_monitor` - Health monitor for ldap. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ldaps_monitor` - Health monitor for ldaps. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `monitor_ip` - Destination ip address to be monitored instead of the pool member ip. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `monitor_port` - Use this port instead of the port defined for the server in the pool. If the monitor succeeds to this port, the load balanced traffic will still be sent to the port of the server defined within the pool. Allowed values are 1-65535. Special values are 0 - use server port. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `name` - A user friendly name for this health monitor. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `pop3_monitor` - Health monitor for pop3. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_image.html.markdown b/website/docs/d/avi_image.html.markdown
index 1953a5906..b2ec41f36 100644
--- a/website/docs/d/avi_image.html.markdown
+++ b/website/docs/d/avi_image.html.markdown
@@ -36,6 +36,7 @@ In addition to all arguments above, the following attributes are exported:
 * `controller_info` - Controller package details. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `controller_patch_name` - Mandatory controller patch name that is applied along with this base image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `controller_patch_ref` - It references the controller-patch associated with the uber image. It is a reference to an object of type image. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dryrun_info` - Dry-run package details. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `duration` - Time taken to upload the image in seconds. Field introduced in 21.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `end_time` - Image upload end time. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `events` - Image events for image upload operation. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_pool.html.markdown b/website/docs/d/avi_pool.html.markdown
index b1e075bcb..d8d0c9a6a 100644
--- a/website/docs/d/avi_pool.html.markdown
+++ b/website/docs/d/avi_pool.html.markdown
@@ -59,9 +59,9 @@ In addition to all arguments above, the following attributes are exported:
 * `external_autoscale_groups` - Names of external auto-scale groups for pool servers. Currently available only for aws and azure. Field introduced in 17.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `fail_action` - Enable an action - close connection, http redirect or local http response - when a pool failure happens. By default, a connection will be closed, in case the pool experiences a failure. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `fewest_tasks_feedback_delay` - Periodicity of feedback for fewest tasks server selection algorithm. Allowed values are 1-300. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `graceful_disable_timeout` - Used to gracefully disable a server. Virtual service waits for the specified time before terminating the existing connections  to the servers that are disabled. Not used anymore .graceful_disable_timeout_sec is introduced. Allowed values are 1-7200. Special values are 0 - immediate, -1 - infinite. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `graceful_disable_timeout_sec` - Used to gracefully disable a server. Virtual service waits for the specified time before terminating the existing connections  to the servers that are disabled. Allowed values are 1-432000. Special values are 0 - immediate, -1 - infinite. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `graceful_hm_down_disable_timeout` - Time interval for gracefully closing the connections on server, when health monitoring marks the server down. Allowed values are 1-432000. Special values are 0 - immediate, -1 - infinite. Field introduced in 30.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gslb_pool_type` - Specifies the pool type (generic/private/public). The public ips of the members can be specified in seperate pool of type public.this would allow features like health monitoring to be enabled independantly for the public ips.this is only applicable for gslb pools. Enum options - GSLB_POOL_TYPE_GENERIC, GSLB_POOL_TYPE_PRIVATE, GSLB_POOL_TYPE_PUBLIC. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `gslb_sp_enabled` - Indicates if the pool is a site-persistence pool. Field introduced in 17.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `health_monitor_refs` - Verify server health by applying one or more health monitors. Active monitors generate synthetic traffic from each service engine and mark a server up or down based on the response. The passive monitor listens only to client to server communication. It raises or lowers the ratio of traffic destined to a server based on successful responses. It is a reference to an object of type healthmonitor. Maximum of 50 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `horizon_profile` - Horizon uag configuration. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_ratelimitconfiguration.html.markdown b/website/docs/d/avi_ratelimitconfiguration.html.markdown
new file mode 100644
index 000000000..c041d0a8a
--- /dev/null
+++ b/website/docs/d/avi_ratelimitconfiguration.html.markdown
@@ -0,0 +1,45 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "AVI: avi_ratelimitconfiguration"
+sidebar_current: "docs-avi-datasource-ratelimitconfiguration"
+description: |-
+  Get information of Avi RateLimitConfiguration.
+---
+
+# avi_ratelimitconfiguration
+
+This data source is used to to get avi_ratelimitconfiguration objects.
+
+## Example Usage
+
+```hcl
+data "avi_ratelimitconfiguration" "foo_ratelimitconfiguration" {
+    uuid = "ratelimitconfiguration-f9cf6b3e-a411-436f-95e2-2982ba2b217b"
+    name = "foo"
+}
+```
+
+## Argument Reference
+
+* `name` - (Optional) Search RateLimitConfiguration by name.
+* `uuid` - (Optional) Search RateLimitConfiguration by uuid.
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `burst` - The maximum request per second(rps) user intends to support for this category.this is not guaranteed as this will be the minimum of the rps supported by the resources in the category and this value.if user doesn't provide then it will be minimum value of the resources in this category. Allowed values are 1-1000. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - Description for the rate limit configuration. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `http_methods` - List of http method(s) of the resources that need to be rate limited. Enum options - HTTP_METHOD_GET, HTTP_METHOD_HEAD, HTTP_METHOD_PUT, HTTP_METHOD_DELETE, HTTP_METHOD_POST, HTTP_METHOD_OPTIONS, HTTP_METHOD_TRACE, HTTP_METHOD_CONNECT, HTTP_METHOD_PATCH, HTTP_METHOD_PROPFIND, HTTP_METHOD_PROPPATCH, HTTP_METHOD_MKCOL, HTTP_METHOD_COPY, HTTP_METHOD_MOVE, HTTP_METHOD_LOCK, HTTP_METHOD_UNLOCK. Field introduced in 31.2.1. Minimum of 1 items required. Maximum of 5 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of the rate limit configuration(unique). Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `resource` - Ratelimitresource which needs to be rate limited. Enum options - RATE_LIMIT_VIRTUALSERVICE, RATE_LIMIT_POOL, RATE_LIMIT_LOGIN, RATE_LIMIT_AUTHTOKEN, RATE_LIMIT_HEALTHMONITOR, RATE_LIMIT_CLUSTER_RUNTIME, RATE_LIMIT_AUTHPROFILE, RATE_LIMIT_ALERT. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant ref for the auth rate limit configuration. It is a reference to an object of type tenant. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `token_refill_rate` - Token refill rate. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `type` - Type of the rate limiter, for now we only support api categorization based. Enum options - RATE_LIMITER_API_CATEGORY. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid of the rate limit configuration. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/d/avi_serviceenginegroup.html.markdown b/website/docs/d/avi_serviceenginegroup.html.markdown
index 3596b01dd..3b014d670 100644
--- a/website/docs/d/avi_serviceenginegroup.html.markdown
+++ b/website/docs/d/avi_serviceenginegroup.html.markdown
@@ -194,6 +194,7 @@ In addition to all arguments above, the following attributes are exported:
 * `num_dispatcher_queues` - Number of queues to each dispatcher. Allowed values are 1-2. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `num_flow_cores_sum_changes_to_ignore` - Number of changes in num flow cores sum to ignore. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `objsync_config` - Configuration knobs for interse object distribution. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `objsync_mode` - Enables se-se object syncing. Enum options - OBJSYNC_DISABLED, OBJSYNC_ENABLED, OBJSYNC_AUTO. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `objsync_port` - Tcp port on se management interface for interse object distribution. Supported only for externally managed security groups. Not supported on full access deployments. Requires se reboot. Allowed values are 1024-65535. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `openstack_availability_zones` - Field introduced in 17.1.1. Maximum of 5 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `openstack_mgmt_network_name` - Avi management network name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
@@ -210,8 +211,10 @@ In addition to all arguments above, the following attributes are exported:
 * `realtime_se_metrics` - Enable or deactivate real time se metrics. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `reboot_on_panic` - Reboot the vm or host on kernel panic. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `replay_vrf_routes_interval` - Routes in vrf are replayed at the specified interval. This should be increased if there are large number of routes. Allowed values are 0-3000. Field introduced in 22.1.3. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `reserved_configuration` - Reserved configuration used for internal configuration purposes. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `resync_time_interval` - Time interval to re-sync se's time with wall clock time. Allowed values are 8-600000. Field introduced in 20.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `sdb_flush_interval` - Sdb pipeline flush interval. Allowed values are 1-10000. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sdb_key_timeout` - The time in seconds controller redis server persists the key. Allowed values are 60-600. Field introduced in 30.2.4. Unit is seconds. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `sdb_pipeline_size` - Sdb pipeline size. Allowed values are 1-10000. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `sdb_scan_count` - Sdb scan count. Allowed values are 1-1000. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `se_bandwidth_type` - Select the se bandwidth for the bandwidth license. Enum options - SE_BANDWIDTH_UNLIMITED, SE_BANDWIDTH_25M, SE_BANDWIDTH_200M, SE_BANDWIDTH_1000M, SE_BANDWIDTH_10000M. Field introduced in 17.2.5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- se_bandwidth_unlimited), basic (allowed values- se_bandwidth_unlimited) edition.
@@ -294,7 +297,6 @@ In addition to all arguments above, the following attributes are exported:
 * `use_dp_util_for_scaleout` - If enabled, the datapath cpu utilization is consulted by the auto scale-out logic. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `use_hyperthreaded_cores` - Enables the use of hyper-threaded cores on se. Requires se reboot. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `use_legacy_netlink` - Enable legacy model of netlink notifications. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `use_objsync` - Enable interse objsyc distribution framework. Field introduced in 20.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `use_standard_alb` - Use standard sku azure load balancer. By default cloud level flag is set. If not set, it inherits/uses the use_standard_alb flag from the cloud. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `user_agent_cache_config` - Configuration for user-agent cache used in bot management. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `user_defined_metric_age` - Defines in seconds how long before an unused user-defined-metric is garbage collected. Field introduced in 21.1.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
@@ -324,6 +326,7 @@ In addition to all arguments above, the following attributes are exported:
 * `vs_se_scaleout_additional_wait_time` - Wait time for sending scaleout ready notification after virtual service is marked up. In certain deployments, there may be an additional delay to accept traffic. For example, for bgp, some time is needed for route advertisement. Allowed values are 0-300. Field introduced in 18.1.5,18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `vs_se_scaleout_ready_timeout` - Timeout in seconds for service engine to sendscaleout ready notification of a virtual service. Allowed values are 0-90. Field introduced in 18.1.5,18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `vs_switchover_timeout` - During se upgrade in a legacy active/standby segroup, time to wait for the new primary se to accept flows before marking the switchover done. Field introduced in 17.2.13,18.1.4,18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vsphere_storage_policies` - Vsphere vm storage policy uuid to be associated to the service engine. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `vss_placement` - Parameters to place virtual services on only a subset of the cores of an se. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `vss_placement_enabled` - If set, virtual services will be placed on only a subset of the cores of an se. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `waf_mempool` - Enable memory pool for waf.requires se reboot. Field introduced in 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_systemconfiguration.html.markdown b/website/docs/d/avi_systemconfiguration.html.markdown
index c6554ee48..54927a4e6 100644
--- a/website/docs/d/avi_systemconfiguration.html.markdown
+++ b/website/docs/d/avi_systemconfiguration.html.markdown
@@ -61,6 +61,10 @@ In addition to all arguments above, the following attributes are exported:
 * `snmp_configuration` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `ssh_ciphers` - Allowed ciphers list for ssh to the management interface on the controller and service engines. If this is not specified, all the default ciphers are allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `ssh_hmacs` - Allowed hmac list for ssh to the management interface on the controller and service engines. If this is not specified, all the default hmacs are allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sync_dns_to_se` - Ability to sync the dns to ses. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sync_kex_host_to_se` - Ability to sync the kexalgorithms & hostkeyalgorithms to ses. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sync_syslog_to_se` - Ability to sync the syslog server config to ses. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `syslog_servers` - The destination syslog server ip(v4/v6) address or fqdn. Provide in the format ip port. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `telemetry_configuration` - Telemetry configuration. Field introduced in 31.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `trusted_host_profiles_refs` - Trusted host profiles for host header validation. Only works when host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 31.1.1. Maximum of 20 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `truststore_pkiprofile_ref` - Reference to pkiprofile used for validating the ca certificates for external comminications from avi load balancer controller  this acts as trust store for avi load balancer controller. It is a reference to an object of type pkiprofile. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_taskjournal.html.markdown b/website/docs/d/avi_taskjournal.html.markdown
index 64318c10a..2f0ed463e 100644
--- a/website/docs/d/avi_taskjournal.html.markdown
+++ b/website/docs/d/avi_taskjournal.html.markdown
@@ -43,4 +43,5 @@ In addition to all arguments above, the following attributes are exported:
 * `tasks` - List of all the tasks executed with details. For example, details of tasks to be executed for upgrade filecopy. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `tenant_ref` - Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `uuid` - Uuid identifier for the task journal. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `warnings` - List of warnings in the process. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_user.html.markdown b/website/docs/d/avi_user.html.markdown
index 39ed60066..b9c97330f 100644
--- a/website/docs/d/avi_user.html.markdown
+++ b/website/docs/d/avi_user.html.markdown
@@ -37,6 +37,7 @@ In addition to all arguments above, the following attributes are exported:
 * `date_joined` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `default_tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `email` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_config_warnings` - Flag to enable or disable config warnings. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `full_name` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `is_active` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `is_internal_user` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_virtualservice.html.markdown b/website/docs/d/avi_virtualservice.html.markdown
index ca8df7941..16e381bd9 100644
--- a/website/docs/d/avi_virtualservice.html.markdown
+++ b/website/docs/d/avi_virtualservice.html.markdown
@@ -84,7 +84,6 @@ In addition to all arguments above, the following attributes are exported:
 * `name` - Name for the virtual service. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `network_profile_ref` - Determines network settings such as protocol, tcp or udp, and related options for the protocol. It is a reference to an object of type networkprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is system-tcp-fast-path.
 * `network_security_policy_ref` - Network security policies for the virtual service. It is a reference to an object of type networksecuritypolicy. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `nsx_securitygroup` - A list of nsx groups representing the clients which can access the virtual ip of the virtual service. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `oauth_vs_config` - Virtualservice specific oauth config. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `performance_limits` - Optional settings that determine performance limits like max connections or bandwdith etc. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `pool_group_ref` - The pool group is an object that contains pools. It is a reference to an object of type poolgroup. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_wafpolicy.html.markdown b/website/docs/d/avi_wafpolicy.html.markdown
index 068ceed4e..98fb37f23 100644
--- a/website/docs/d/avi_wafpolicy.html.markdown
+++ b/website/docs/d/avi_wafpolicy.html.markdown
@@ -50,7 +50,7 @@ In addition to all arguments above, the following attributes are exported:
 * `learning_params` - Parameters for tuning application learning. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `min_confidence` - Minimum confidence label required for auto rule updates. Enum options - CONFIDENCE_VERY_HIGH, CONFIDENCE_HIGH, CONFIDENCE_PROBABLE, CONFIDENCE_LOW, CONFIDENCE_NONE. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `mode` - Waf policy mode. This can be detection or enforcement. It can be overwritten by rules if allow_mode_delegation is set. Enum options - WAF_MODE_DETECTION_ONLY, WAF_MODE_ENFORCEMENT. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mode` - Waf policy mode. This can be detection or enforcement. It can be overwritten by rules if allow_mode_delegation is set. Enum options - WAF_MODE_DETECTION_ONLY, WAF_MODE_ENFORCEMENT, WAF_MODE_EVALUATION. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `name` - Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `paranoia_level` - Waf ruleset paranoia  mode. This is used to select rules based on the paranoia-level tag. Enum options - WAF_PARANOIA_LEVEL_LOW, WAF_PARANOIA_LEVEL_MEDIUM, WAF_PARANOIA_LEVEL_HIGH, WAF_PARANOIA_LEVEL_EXTREME. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `positive_security_model` - The positive security model. This is used to describe how the request or parts of the request should look like. It is executed in the request body phase of avi waf. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
@@ -58,7 +58,7 @@ In addition to all arguments above, the following attributes are exported:
 * `pre_crs_groups` - Waf rules are categorized in to groups based on their characterization. These groups are created by the user and will be  enforced before the crs groups. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `required_data_files` - The data files and types referred in this waf policy. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `updated_crs_rules_in_detection_mode` - While updating crs, the system will make sure that new rules are added in detection mode. It only has an effect if the policy is in enforcement mode. In this case, the update will set new rules into detection mode by adding crs_overrides for the new rules. If this flag is not set or if the policy mode is detection, rules will be added without new crs_overrides. This option is used for the auto_update_crs workflow as well as for the ui based crs update workflow. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `use_evaluation_mode_on_crs_update` - While updating crs, the system will make sure that new rules are added in evaluation mode. A crs update will set new rules into evaluation mode by adding crs_overrides for the new rules. If this flag is not set or if the old crs object was empty, the new rules will be added without crs_overrides. This option is used for the auto_update_crs workflow as well as for the ui based crs update workflow. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `uuid` - Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `waf_crs_ref` - Waf core ruleset used for the crs part of this policy. It is a reference to an object of type wafcrs. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `waf_profile_ref` - Waf profile for waf policy. It is a reference to an object of type wafprofile. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_wafpolicypsmgroup.html.markdown b/website/docs/d/avi_wafpolicypsmgroup.html.markdown
index 259005a92..b96a58cff 100644
--- a/website/docs/d/avi_wafpolicypsmgroup.html.markdown
+++ b/website/docs/d/avi_wafpolicypsmgroup.html.markdown
@@ -37,6 +37,7 @@ In addition to all arguments above, the following attributes are exported:
 * `enable` - Enable or disable this waf rule group. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `hit_action` - If a rule in this group matches the match_value pattern, this action will be executed. Allowed actions are waf_action_no_op and waf_action_allow_parameter. Enum options - WAF_ACTION_NO_OP, WAF_ACTION_BLOCK, WAF_ACTION_ALLOW_PARAMETER. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `is_learning_group` - This field indicates that this group is used for learning. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `location_match_miss_action` - If there is no location matching the request, this action will be executed. Allowed actions are waf_action_no_op and waf_action_block. Enum options - WAF_ACTION_NO_OP, WAF_ACTION_BLOCK, WAF_ACTION_ALLOW_PARAMETER. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `locations` - Positive security model locations. These are used to partition the application name space. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `miss_action` - If a rule in this group does not match the match_value pattern, this action will be executed. Allowed actions are waf_action_no_op and waf_action_block. Enum options - WAF_ACTION_NO_OP, WAF_ACTION_BLOCK, WAF_ACTION_ALLOW_PARAMETER. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_apiratelimitprofile.html.markdown b/website/docs/r/avi_apiratelimitprofile.html.markdown
new file mode 100644
index 000000000..465cf1706
--- /dev/null
+++ b/website/docs/r/avi_apiratelimitprofile.html.markdown
@@ -0,0 +1,51 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "Avi: avi_apiratelimitprofile"
+sidebar_current: "docs-avi-resource-apiratelimitprofile"
+description: |-
+  Creates and manages Avi ApiRateLimitProfile.
+---
+
+# avi_apiratelimitprofile
+
+The ApiRateLimitProfile resource allows the creation and management of Avi ApiRateLimitProfile
+
+## Example Usage
+
+```hcl
+resource "avi_apiratelimitprofile" "foo" {
+    name = "terraform-example-foo"
+    tenant_ref = "/api/tenant/?name=admin"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `name` - (Required) Name of the api rate limit profile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `rate_limit_configuration_refs` - (Required) List of the rate limiter configuration uuids. It is a reference to an object of type ratelimitconfiguration. Field introduced in 31.2.1. Minimum of 1 items required. Maximum of 100 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Description for the api rate limit profile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enabled` - (Optional) Activate/deactivate the api rate limit profile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant ref for the api rate limit profile. It is a reference to an object of type tenant. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
+
+### Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:
+
+* `create` - (Defaults to 40 mins) Used when creating the AMI
+* `update` - (Defaults to 40 mins) Used when updating the AMI
+* `delete` - (Defaults to 90 mins) Used when deregistering the AMI
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `uuid` -  Uuid of the api rate limit profile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/r/avi_applicationpersistenceprofile.html.markdown b/website/docs/r/avi_applicationpersistenceprofile.html.markdown
index 8996d6bc6..52be07745 100644
--- a/website/docs/r/avi_applicationpersistenceprofile.html.markdown
+++ b/website/docs/r/avi_applicationpersistenceprofile.html.markdown
@@ -38,6 +38,7 @@ The following arguments are supported:
 * `ip_persistence_profile` - (Optional) Specifies the client ip persistence profile parameters. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `is_federated` - (Optional) This field describes the object's replication scope. If the field is set to false, then the object is visible within the controller-cluster and its associated service-engines. If the field is set to true, then the object is replicated across the federation. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `persistence_update_interval` - (Optional) Interval in minutes at which refreshed persistence entries are synced to peer ses. If not set, it willsync at an interval of timeout/2. Allowed values are 1-30. Field introduced in 30.2.4. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `server_hm_down_recovery` - (Optional) Specifies behavior when a persistent server has been marked down by a health monitor. Enum options - HM_DOWN_PICK_NEW_SERVER, HM_DOWN_ABORT_CONNECTION, HM_DOWN_CONTINUE_PERSISTENT_SERVER. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- hm_down_pick_new_server), basic (allowed values- hm_down_pick_new_server) edition.
 * `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_cloud.html.markdown b/website/docs/r/avi_cloud.html.markdown
index 80d8bbd98..6b8b0b3d0 100644
--- a/website/docs/r/avi_cloud.html.markdown
+++ b/website/docs/r/avi_cloud.html.markdown
@@ -58,7 +58,7 @@ The following arguments are supported:
 * `mtu` - (Optional) Mtu setting for the cloud. Unit is bytes. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `nsxt_configuration` - (Optional) Nsx-t cloud platform configuration. Field introduced in 20.1.1. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
 * `ntp_configuration` - (Optional) Ntp configuration for the cloud. Field introduced in 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `obj_name_prefix` - (Optional) Default prefix for all automatically created objects in this cloud. This prefix can be overridden by the se-group template. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `obj_name_prefix` - (Optional) Default prefix for all automatically created objects in this cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `prefer_static_routes` - (Optional) Prefer static routes over interface routes during virtualservice placement. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `proxy_configuration` - (Optional) Allowed with any value in enterprise, enterprise with cloud services edition.
 * `rancher_configuration` - (Optional) Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_controllerproperties.html.markdown b/website/docs/r/avi_controllerproperties.html.markdown
index 0691f7a0d..e62fff436 100644
--- a/website/docs/r/avi_controllerproperties.html.markdown
+++ b/website/docs/r/avi_controllerproperties.html.markdown
@@ -36,6 +36,7 @@ The following arguments are supported:
 * `api_perf_logging_threshold` - (Optional) Threshold to log request timing in portal_performance.log and server-timing response header. Any stage taking longer than 1% of the threshold will be included in the server-timing header. Field introduced in 18.1.4, 18.2.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `appviewx_compat_mode` - (Optional) Export configuration in appviewx compatibility mode. Field introduced in 17.1.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
 * `archive_retention_framework_period` - (Optional) Period for archive and retention framework job. Allowed values are 1-240. Field introduced in 31.1.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `async_cert_chaining_interval` - (Optional) Time in seconds to wait before starting async certificate chaining. Allowed values are 0-120. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `async_patch_merge_period` - (Optional) Period for which asynchronous patch requests are queued. Allowed values are 30-120. Special values are 0 - deactivated. Field introduced in 18.2.11, 20.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `async_patch_request_cleanup_duration` - (Optional) Duration for which asynchronous patch requests should be kept, after being marked as success or fail. Allowed values are 5-120. Field introduced in 18.2.11, 20.1.3. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `attach_ip_retry_interval` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
@@ -78,6 +79,8 @@ The following arguments are supported:
 * `gslb_purge_batch_size` - (Optional) Batch size for the vs_mgr to perform datastrorecleanup during a gslb purge. Allowed values are 50-1200. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `gslb_purge_sleep_time_ms` - (Optional) Sleep time in the vs_mgr during a federatedpurge rpc call. Allowed values are 50-100. Field introduced in 22.1.3. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ignore_vrf_in_networksubnetlist` - (Optional) Ignore the vrf_context filter for /networksubnetlist api. Field introduced in 22.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_records_additional_buffer_space` - (Optional) Additional buffer space (up to 10 gb) to be allocated to store logs on a controller. Allowed values are 0-10000. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_records_purge_interval` - (Optional) Frequency (in seconds) to clean up log files on controller node. By default, 600 seconds. Allowed values are 1-100000. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `max_dead_se_in_grp` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `max_pcap_per_tenant` - (Optional) Maximum number of pcap files stored per tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `max_se_spawn_interval_delay` - (Optional) Maximum delay possible to add to se_spawn_retry_interval after successive se spawn failure. Field introduced in 20.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
@@ -112,6 +115,7 @@ The following arguments are supported:
 * `soft_min_mem_per_se_limit` - (Optional) Soft limit on the minimum se memory that an se needs to have on se register. Field introduced in 30.1.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ssl_certificate_expiry_warning_days` - (Optional) Number of days for ssl certificate expiry warning. Unit is days. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `statecache_properties` - (Optional) Configure statecache behavior for config, se, resmgr. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `telemetry_interval` - (Optional) Period for telemetry job. Allowed values are 1-1440. Field introduced in 31.2.1. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `unresponsive_se_reboot` - (Optional) Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `update_dns_entry_retry_limit` - (Optional) Number of times to retry a dns entry update/delete operation. Field introduced in 21.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `update_dns_entry_timeout` - (Optional) Timeout period for a dns entry update/delete operation. Field introduced in 21.1.4. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_gslb.html.markdown b/website/docs/r/avi_gslb.html.markdown
index 7a2a19992..111702da7 100644
--- a/website/docs/r/avi_gslb.html.markdown
+++ b/website/docs/r/avi_gslb.html.markdown
@@ -42,7 +42,6 @@ The following arguments are supported:
 * `gs_member_fqdn_resolution_on_se` - (Optional) If this knob is enabled, gslb service member fqdn will be resolved by the service engines hosting the gslb service. Each service engine will resolve and consume the resolved ip addresses locally. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `is_federated` - (Optional) This field indicates that this object is replicated across gslb federation. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `maintenance_mode` - (Optional) This field disables the configuration operations on the leader for all federated objects. Cud operations on gslb, gslbservice, gslbgeodbprofile and other federated objects will be rejected. The rest-api disabling helps in upgrade scenarios where we don't want configuration sync operations to the gslb member when the member is being upgraded. This configuration programmatically blocks the leader from accepting new gslb configuration when member sites are undergoing upgrade. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `replication_policy` - (Optional) Policy for replicating configuration to the active follower sites. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `send_interval` - (Optional) Frequency with which group members communicate. Allowed values are 1-3600. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `send_interval_prior_to_maintenance_mode` - (Optional) The user can specify a send-interval while entering maintenance mode. The validity of this 'maintenance send-interval' is only during maintenance mode. When the user leaves maintenance mode, the original send-interval is reinstated. This internal variable is used to store the original send-interval. Field introduced in 18.2.3. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `short_probe_interval` - (Optional) Wait time between two consecutive short probe health checks. Allowed values are 1-3600. Field introduced in 31.1.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_healthmonitor.html.markdown b/website/docs/r/avi_healthmonitor.html.markdown
index 0d0378fbc..0feb638bf 100644
--- a/website/docs/r/avi_healthmonitor.html.markdown
+++ b/website/docs/r/avi_healthmonitor.html.markdown
@@ -49,6 +49,7 @@ The following arguments are supported:
 * `ldap_monitor` - (Optional) Health monitor for ldap. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ldaps_monitor` - (Optional) Health monitor for ldaps. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `monitor_ip` - (Optional) Destination ip address to be monitored instead of the pool member ip. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `monitor_port` - (Optional) Use this port instead of the port defined for the server in the pool. If the monitor succeeds to this port, the load balanced traffic will still be sent to the port of the server defined within the pool. Allowed values are 1-65535. Special values are 0 - use server port. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `pop3_monitor` - (Optional) Health monitor for pop3. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `pop3s_monitor` - (Optional) Health monitor for pop3s. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_image.html.markdown b/website/docs/r/avi_image.html.markdown
index 96d9ac3fc..e5d83fd7a 100644
--- a/website/docs/r/avi_image.html.markdown
+++ b/website/docs/r/avi_image.html.markdown
@@ -32,6 +32,7 @@ The following arguments are supported:
 * `controller_info` - (Optional) Controller package details. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `controller_patch_name` - (Optional) Mandatory controller patch name that is applied along with this base image. Field introduced in 18.2.10, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `controller_patch_ref` - (Optional) It references the controller-patch associated with the uber image. It is a reference to an object of type image. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `dryrun_info` - (Optional) Dry-run package details. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `duration` - (Optional) Time taken to upload the image in seconds. Field introduced in 21.1.3. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `end_time` - (Optional) Image upload end time. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `events` - (Optional) Image events for image upload operation. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_pool.html.markdown b/website/docs/r/avi_pool.html.markdown
index 1c1b817f2..e1e9d57d4 100644
--- a/website/docs/r/avi_pool.html.markdown
+++ b/website/docs/r/avi_pool.html.markdown
@@ -53,9 +53,9 @@ The following arguments are supported:
 * `external_autoscale_groups` - (Optional) Names of external auto-scale groups for pool servers. Currently available only for aws and azure. Field introduced in 17.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `fail_action` - (Optional) Enable an action - close connection, http redirect or local http response - when a pool failure happens. By default, a connection will be closed, in case the pool experiences a failure. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `fewest_tasks_feedback_delay` - (Optional) Periodicity of feedback for fewest tasks server selection algorithm. Allowed values are 1-300. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `graceful_disable_timeout` - (Optional) Used to gracefully disable a server. Virtual service waits for the specified time before terminating the existing connections  to the servers that are disabled. Not used anymore .graceful_disable_timeout_sec is introduced. Allowed values are 1-7200. Special values are 0 - immediate, -1 - infinite. Unit is min. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `graceful_disable_timeout_sec` - (Optional) Used to gracefully disable a server. Virtual service waits for the specified time before terminating the existing connections  to the servers that are disabled. Allowed values are 1-432000. Special values are 0 - immediate, -1 - infinite. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `graceful_hm_down_disable_timeout` - (Optional) Time interval for gracefully closing the connections on server, when health monitoring marks the server down. Allowed values are 1-432000. Special values are 0 - immediate, -1 - infinite. Field introduced in 30.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `gslb_pool_type` - (Optional) Specifies the pool type (generic/private/public). The public ips of the members can be specified in seperate pool of type public.this would allow features like health monitoring to be enabled independantly for the public ips.this is only applicable for gslb pools. Enum options - GSLB_POOL_TYPE_GENERIC, GSLB_POOL_TYPE_PRIVATE, GSLB_POOL_TYPE_PUBLIC. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `gslb_sp_enabled` - (Optional) Indicates if the pool is a site-persistence pool. Field introduced in 17.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `health_monitor_refs` - (Optional) Verify server health by applying one or more health monitors. Active monitors generate synthetic traffic from each service engine and mark a server up or down based on the response. The passive monitor listens only to client to server communication. It raises or lowers the ratio of traffic destined to a server based on successful responses. It is a reference to an object of type healthmonitor. Maximum of 50 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `horizon_profile` - (Optional) Horizon uag configuration. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_ratelimitconfiguration.html.markdown b/website/docs/r/avi_ratelimitconfiguration.html.markdown
new file mode 100644
index 000000000..5a49cb6ed
--- /dev/null
+++ b/website/docs/r/avi_ratelimitconfiguration.html.markdown
@@ -0,0 +1,54 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "Avi: avi_ratelimitconfiguration"
+sidebar_current: "docs-avi-resource-ratelimitconfiguration"
+description: |-
+  Creates and manages Avi RateLimitConfiguration.
+---
+
+# avi_ratelimitconfiguration
+
+The RateLimitConfiguration resource allows the creation and management of Avi RateLimitConfiguration
+
+## Example Usage
+
+```hcl
+resource "avi_ratelimitconfiguration" "foo" {
+    name = "terraform-example-foo"
+    tenant_ref = "/api/tenant/?name=admin"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `http_methods` - (Required) List of http method(s) of the resources that need to be rate limited. Enum options - HTTP_METHOD_GET, HTTP_METHOD_HEAD, HTTP_METHOD_PUT, HTTP_METHOD_DELETE, HTTP_METHOD_POST, HTTP_METHOD_OPTIONS, HTTP_METHOD_TRACE, HTTP_METHOD_CONNECT, HTTP_METHOD_PATCH, HTTP_METHOD_PROPFIND, HTTP_METHOD_PROPPATCH, HTTP_METHOD_MKCOL, HTTP_METHOD_COPY, HTTP_METHOD_MOVE, HTTP_METHOD_LOCK, HTTP_METHOD_UNLOCK. Field introduced in 31.2.1. Minimum of 1 items required. Maximum of 5 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Required) Name of the rate limit configuration(unique). Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `resource` - (Required) Ratelimitresource which needs to be rate limited. Enum options - RATE_LIMIT_VIRTUALSERVICE, RATE_LIMIT_POOL, RATE_LIMIT_LOGIN, RATE_LIMIT_AUTHTOKEN, RATE_LIMIT_HEALTHMONITOR, RATE_LIMIT_CLUSTER_RUNTIME, RATE_LIMIT_AUTHPROFILE, RATE_LIMIT_ALERT. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `token_refill_rate` - (Required) Token refill rate. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `burst` - (Optional) The maximum request per second(rps) user intends to support for this category.this is not guaranteed as this will be the minimum of the rps supported by the resources in the category and this value.if user doesn't provide then it will be minimum value of the resources in this category. Allowed values are 1-1000. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `description` - (Optional) Description for the rate limit configuration. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant ref for the auth rate limit configuration. It is a reference to an object of type tenant. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `type` - (Optional) Type of the rate limiter, for now we only support api categorization based. Enum options - RATE_LIMITER_API_CATEGORY. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
+
+### Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:
+
+* `create` - (Defaults to 40 mins) Used when creating the AMI
+* `update` - (Defaults to 40 mins) Used when updating the AMI
+* `delete` - (Defaults to 90 mins) Used when deregistering the AMI
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `uuid` -  Uuid of the rate limit configuration. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/r/avi_serviceenginegroup.html.markdown b/website/docs/r/avi_serviceenginegroup.html.markdown
index 67590e793..fa8d9f015 100644
--- a/website/docs/r/avi_serviceenginegroup.html.markdown
+++ b/website/docs/r/avi_serviceenginegroup.html.markdown
@@ -187,6 +187,7 @@ The following arguments are supported:
 * `num_dispatcher_queues` - (Optional) Number of queues to each dispatcher. Allowed values are 1-2. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `num_flow_cores_sum_changes_to_ignore` - (Optional) Number of changes in num flow cores sum to ignore. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `objsync_config` - (Optional) Configuration knobs for interse object distribution. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `objsync_mode` - (Optional) Enables se-se object syncing. Enum options - OBJSYNC_DISABLED, OBJSYNC_ENABLED, OBJSYNC_AUTO. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `objsync_port` - (Optional) Tcp port on se management interface for interse object distribution. Supported only for externally managed security groups. Not supported on full access deployments. Requires se reboot. Allowed values are 1024-65535. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `openstack_availability_zones` - (Optional) Field introduced in 17.1.1. Maximum of 5 items allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `openstack_mgmt_network_name` - (Optional) Avi management network name. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
@@ -203,8 +204,10 @@ The following arguments are supported:
 * `realtime_se_metrics` - (Optional) Enable or deactivate real time se metrics. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `reboot_on_panic` - (Optional) Reboot the vm or host on kernel panic. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `replay_vrf_routes_interval` - (Optional) Routes in vrf are replayed at the specified interval. This should be increased if there are large number of routes. Allowed values are 0-3000. Field introduced in 22.1.3. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `reserved_configuration` - (Optional) Reserved configuration used for internal configuration purposes. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `resync_time_interval` - (Optional) Time interval to re-sync se's time with wall clock time. Allowed values are 8-600000. Field introduced in 20.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `sdb_flush_interval` - (Optional) Sdb pipeline flush interval. Allowed values are 1-10000. Field introduced in 21.1.1. Unit is milliseconds. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sdb_key_timeout` - (Optional) The time in seconds controller redis server persists the key. Allowed values are 60-600. Field introduced in 30.2.4. Unit is seconds. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `sdb_pipeline_size` - (Optional) Sdb pipeline size. Allowed values are 1-10000. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `sdb_scan_count` - (Optional) Sdb scan count. Allowed values are 1-1000. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `se_bandwidth_type` - (Optional) Select the se bandwidth for the bandwidth license. Enum options - SE_BANDWIDTH_UNLIMITED, SE_BANDWIDTH_25M, SE_BANDWIDTH_200M, SE_BANDWIDTH_1000M, SE_BANDWIDTH_10000M. Field introduced in 17.2.5. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- se_bandwidth_unlimited), basic (allowed values- se_bandwidth_unlimited) edition.
@@ -287,7 +290,6 @@ The following arguments are supported:
 * `use_dp_util_for_scaleout` - (Optional) If enabled, the datapath cpu utilization is consulted by the auto scale-out logic. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `use_hyperthreaded_cores` - (Optional) Enables the use of hyper-threaded cores on se. Requires se reboot. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `use_legacy_netlink` - (Optional) Enable legacy model of netlink notifications. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `use_objsync` - (Optional) Enable interse objsyc distribution framework. Field introduced in 20.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `use_standard_alb` - (Optional) Use standard sku azure load balancer. By default cloud level flag is set. If not set, it inherits/uses the use_standard_alb flag from the cloud. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `user_agent_cache_config` - (Optional) Configuration for user-agent cache used in bot management. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `user_defined_metric_age` - (Optional) Defines in seconds how long before an unused user-defined-metric is garbage collected. Field introduced in 21.1.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
@@ -316,6 +318,7 @@ The following arguments are supported:
 * `vs_se_scaleout_additional_wait_time` - (Optional) Wait time for sending scaleout ready notification after virtual service is marked up. In certain deployments, there may be an additional delay to accept traffic. For example, for bgp, some time is needed for route advertisement. Allowed values are 0-300. Field introduced in 18.1.5,18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `vs_se_scaleout_ready_timeout` - (Optional) Timeout in seconds for service engine to sendscaleout ready notification of a virtual service. Allowed values are 0-90. Field introduced in 18.1.5,18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `vs_switchover_timeout` - (Optional) During se upgrade in a legacy active/standby segroup, time to wait for the new primary se to accept flows before marking the switchover done. Field introduced in 17.2.13,18.1.4,18.2.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `vsphere_storage_policies` - (Optional) Vsphere vm storage policy uuid to be associated to the service engine. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `vss_placement` - (Optional) Parameters to place virtual services on only a subset of the cores of an se. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `vss_placement_enabled` - (Optional) If set, virtual services will be placed on only a subset of the cores of an se. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `waf_mempool` - (Optional) Enable memory pool for waf.requires se reboot. Field introduced in 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_systemconfiguration.html.markdown b/website/docs/r/avi_systemconfiguration.html.markdown
index eaf043524..a3492fbb7 100644
--- a/website/docs/r/avi_systemconfiguration.html.markdown
+++ b/website/docs/r/avi_systemconfiguration.html.markdown
@@ -55,6 +55,10 @@ The following arguments are supported:
 * `snmp_configuration` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `ssh_ciphers` - (Optional) Allowed ciphers list for ssh to the management interface on the controller and service engines. If this is not specified, all the default ciphers are allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `ssh_hmacs` - (Optional) Allowed hmac list for ssh to the management interface on the controller and service engines. If this is not specified, all the default hmacs are allowed. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sync_dns_to_se` - (Optional) Ability to sync the dns to ses. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sync_kex_host_to_se` - (Optional) Ability to sync the kexalgorithms & hostkeyalgorithms to ses. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `sync_syslog_to_se` - (Optional) Ability to sync the syslog server config to ses. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `syslog_servers` - (Optional) The destination syslog server ip(v4/v6) address or fqdn. Provide in the format ip port. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `telemetry_configuration` - (Optional) Telemetry configuration. Field introduced in 31.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `trusted_host_profiles_refs` - (Optional) Trusted host profiles for host header validation. Only works when host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 31.1.1. Maximum of 20 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `truststore_pkiprofile_ref` - (Optional) Reference to pkiprofile used for validating the ca certificates for external comminications from avi load balancer controller  this acts as trust store for avi load balancer controller. It is a reference to an object of type pkiprofile. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_taskjournal.html.markdown b/website/docs/r/avi_taskjournal.html.markdown
index d37ff4293..adc069fc7 100644
--- a/website/docs/r/avi_taskjournal.html.markdown
+++ b/website/docs/r/avi_taskjournal.html.markdown
@@ -37,6 +37,7 @@ The following arguments are supported:
 * `patch_image_ref` - (Optional) Image uuid for identifying the current patch. It is a reference to an object of type image. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `tasks` - (Optional) List of all the tasks executed with details. For example, details of tasks to be executed for upgrade filecopy. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `tenant_ref` - (Optional) Tenant uuid associated with the object. It is a reference to an object of type tenant. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `warnings` - (Optional) List of warnings in the process. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
diff --git a/website/docs/r/avi_user.html.markdown b/website/docs/r/avi_user.html.markdown
index 9ca78fb17..8d84ef8f3 100644
--- a/website/docs/r/avi_user.html.markdown
+++ b/website/docs/r/avi_user.html.markdown
@@ -33,6 +33,7 @@ The following arguments are supported:
 * `date_joined` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `default_tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `email` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_config_warnings` - (Optional) Flag to enable or disable config warnings. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `full_name` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `is_active` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `is_internal_user` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_virtualservice.html.markdown b/website/docs/r/avi_virtualservice.html.markdown
index a90bc07e4..6d1ac3b3d 100644
--- a/website/docs/r/avi_virtualservice.html.markdown
+++ b/website/docs/r/avi_virtualservice.html.markdown
@@ -77,7 +77,6 @@ The following arguments are supported:
 * `min_pools_up` - (Optional) Minimum number of up pools to mark vs up. Field introduced in 18.2.1, 17.2.12. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `network_profile_ref` - (Optional) Determines network settings such as protocol, tcp or udp, and related options for the protocol. It is a reference to an object of type networkprofile. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is system-tcp-fast-path.
 * `network_security_policy_ref` - (Optional) Network security policies for the virtual service. It is a reference to an object of type networksecuritypolicy. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `nsx_securitygroup` - (Optional) A list of nsx groups representing the clients which can access the virtual ip of the virtual service. Field introduced in 17.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `oauth_vs_config` - (Optional) Virtualservice specific oauth config. Field introduced in 21.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `performance_limits` - (Optional) Optional settings that determine performance limits like max connections or bandwdith etc. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `pool_group_ref` - (Optional) The pool group is an object that contains pools. It is a reference to an object of type poolgroup. Allowed with any value in enterprise, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_wafpolicy.html.markdown b/website/docs/r/avi_wafpolicy.html.markdown
index d8ead9a2a..faa6266e7 100644
--- a/website/docs/r/avi_wafpolicy.html.markdown
+++ b/website/docs/r/avi_wafpolicy.html.markdown
@@ -47,14 +47,14 @@ The following arguments are supported:
 * `learning_params` - (Optional) Parameters for tuning application learning. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `min_confidence` - (Optional) Minimum confidence label required for auto rule updates. Enum options - CONFIDENCE_VERY_HIGH, CONFIDENCE_HIGH, CONFIDENCE_PROBABLE, CONFIDENCE_LOW, CONFIDENCE_NONE. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `mode` - (Optional) Waf policy mode. This can be detection or enforcement. It can be overwritten by rules if allow_mode_delegation is set. Enum options - WAF_MODE_DETECTION_ONLY, WAF_MODE_ENFORCEMENT. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `mode` - (Optional) Waf policy mode. This can be detection or enforcement. It can be overwritten by rules if allow_mode_delegation is set. Enum options - WAF_MODE_DETECTION_ONLY, WAF_MODE_ENFORCEMENT, WAF_MODE_EVALUATION. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `paranoia_level` - (Optional) Waf ruleset paranoia  mode. This is used to select rules based on the paranoia-level tag. Enum options - WAF_PARANOIA_LEVEL_LOW, WAF_PARANOIA_LEVEL_MEDIUM, WAF_PARANOIA_LEVEL_HIGH, WAF_PARANOIA_LEVEL_EXTREME. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `positive_security_model` - (Optional) The positive security model. This is used to describe how the request or parts of the request should look like. It is executed in the request body phase of avi waf. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `post_crs_groups` - (Optional) Waf rules are categorized in to groups based on their characterization. These groups are created by the user and will be enforced after the crs groups. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `pre_crs_groups` - (Optional) Waf rules are categorized in to groups based on their characterization. These groups are created by the user and will be  enforced before the crs groups. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `required_data_files` - (Optional) The data files and types referred in this waf policy. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `updated_crs_rules_in_detection_mode` - (Optional) While updating crs, the system will make sure that new rules are added in detection mode. It only has an effect if the policy is in enforcement mode. In this case, the update will set new rules into detection mode by adding crs_overrides for the new rules. If this flag is not set or if the policy mode is detection, rules will be added without new crs_overrides. This option is used for the auto_update_crs workflow as well as for the ui based crs update workflow. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `use_evaluation_mode_on_crs_update` - (Optional) While updating crs, the system will make sure that new rules are added in evaluation mode. A crs update will set new rules into evaluation mode by adding crs_overrides for the new rules. If this flag is not set or if the old crs object was empty, the new rules will be added without crs_overrides. This option is used for the auto_update_crs workflow as well as for the ui based crs update workflow. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `waf_crs_ref` - (Optional) Waf core ruleset used for the crs part of this policy. It is a reference to an object of type wafcrs. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
 
diff --git a/website/docs/r/avi_wafpolicypsmgroup.html.markdown b/website/docs/r/avi_wafpolicypsmgroup.html.markdown
index 4513c860c..9f9774b0f 100644
--- a/website/docs/r/avi_wafpolicypsmgroup.html.markdown
+++ b/website/docs/r/avi_wafpolicypsmgroup.html.markdown
@@ -33,6 +33,7 @@ The following arguments are supported:
 * `enable` - (Optional) Enable or disable this waf rule group. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `hit_action` - (Optional) If a rule in this group matches the match_value pattern, this action will be executed. Allowed actions are waf_action_no_op and waf_action_allow_parameter. Enum options - WAF_ACTION_NO_OP, WAF_ACTION_BLOCK, WAF_ACTION_ALLOW_PARAMETER. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `is_learning_group` - (Optional) This field indicates that this group is used for learning. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `location_match_miss_action` - (Optional) If there is no location matching the request, this action will be executed. Allowed actions are waf_action_no_op and waf_action_block. Enum options - WAF_ACTION_NO_OP, WAF_ACTION_BLOCK, WAF_ACTION_ALLOW_PARAMETER. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `locations` - (Optional) Positive security model locations. These are used to partition the application name space. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `miss_action` - (Optional) If a rule in this group does not match the match_value pattern, this action will be executed. Allowed actions are waf_action_no_op and waf_action_block. Enum options - WAF_ACTION_NO_OP, WAF_ACTION_BLOCK, WAF_ACTION_ALLOW_PARAMETER. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.

From 5f9459eadb9a1e5e5975d60691af80c674085e4a Mon Sep 17 00:00:00 2001
From: avijenkins <gurunath-reddy.kambala@broadcom.com>
Date: Wed, 2 Jul 2025 09:00:17 +0000
Subject: [PATCH 03/12] Updated assets for terraform

Signed-off-by: avijenkins <gurunath-reddy.kambala@broadcom.com>
---
 avi/datasource_avi_vsdatascriptset.go         | 10 +++
 avi/resource_avi_rest_dependants.go           | 64 +++++++++++++++++++
 avi/resource_avi_vsdatascriptset.go           | 10 +++
 go.mod                                        |  6 +-
 go.sum                                        |  2 +
 .../avi_ratelimitconfiguration.html.markdown  |  2 +-
 .../docs/d/avi_vsdatascriptset.html.markdown  |  2 +
 .../avi_ratelimitconfiguration.html.markdown  |  2 +-
 .../docs/r/avi_vsdatascriptset.html.markdown  |  2 +
 9 files changed, 94 insertions(+), 6 deletions(-)

diff --git a/avi/datasource_avi_vsdatascriptset.go b/avi/datasource_avi_vsdatascriptset.go
index 2dc035f62..77bfb59c6 100644
--- a/avi/datasource_avi_vsdatascriptset.go
+++ b/avi/datasource_avi_vsdatascriptset.go
@@ -75,6 +75,16 @@ func dataSourceAviVSDataScriptSet() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceRateLimiterSchema(),
 			},
+			"snat_ip6s": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceIpAddrSchema(),
+			},
+			"snat_ips": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceIpAddrSchema(),
+			},
 			"ssl_key_certificate_refs": {
 				Type:     schema.TypeList,
 				Computed: true,
diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go
index 622167841..2b91a003f 100644
--- a/avi/resource_avi_rest_dependants.go
+++ b/avi/resource_avi_rest_dependants.go
@@ -9231,6 +9231,12 @@ func ResourceDebugServiceEngineSchema() *schema.Resource {
 				Optional: true,
 				Elem:     ResourceDebugSeDataplaneSchema(),
 			},
+			"high_cpu_script_config": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceDebugServiceEngineSustainedCpuSpikeSchema(),
+			},
 			"mock_dl_fail_obj": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -9315,6 +9321,64 @@ func ResourceDebugServiceEngineSeDataStoreMockDlFailSchema() *schema.Resource {
 	}
 }
 
+func ResourceDebugServiceEngineSustainedCpuSpikeSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"cpu_filter": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"cpu_spike_percent": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"dis_enable": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
+			"manual_start": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateBool,
+			},
+			"pids": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeInt},
+			},
+			"process_names": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"sample_cooldown": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"sample_duration": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"spike_duration": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
 func ResourceDebugTraceMallocTypesSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
diff --git a/avi/resource_avi_vsdatascriptset.go b/avi/resource_avi_vsdatascriptset.go
index 7d5046286..e500a7f29 100644
--- a/avi/resource_avi_vsdatascriptset.go
+++ b/avi/resource_avi_vsdatascriptset.go
@@ -80,6 +80,16 @@ func ResourceVSDataScriptSetSchema() map[string]*schema.Schema {
 			Optional: true,
 			Elem:     ResourceRateLimiterSchema(),
 		},
+		"snat_ip6s": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceIpAddrSchema(),
+		},
+		"snat_ips": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceIpAddrSchema(),
+		},
 		"ssl_key_certificate_refs": {
 			Type:     schema.TypeList,
 			Optional: true,
diff --git a/go.mod b/go.mod
index de1c5ce1f..9363e9901 100644
--- a/go.mod
+++ b/go.mod
@@ -1,12 +1,10 @@
 module github.com/vmware/terraform-provider-avi
 
-go 1.22.2
-
-toolchain go1.23.2
+go 1.23.2
 
 require (
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.20.0
-	github.com/vmware/alb-sdk v0.0.0-20250610083806-8447580290e5
+	github.com/vmware/alb-sdk v0.0.0-20250627104848-3eff65e54cf6
 )
 
 require (
diff --git a/go.sum b/go.sum
index 648e4da50..962279427 100644
--- a/go.sum
+++ b/go.sum
@@ -208,6 +208,8 @@ github.com/vmware/alb-sdk v0.0.0-20250125055329-911aef493be4 h1:yT0eZ66Rc1uYRf3r
 github.com/vmware/alb-sdk v0.0.0-20250125055329-911aef493be4/go.mod h1:4f6ExD6/N+8aP4Km/foEpCVlYqpiz+ogXL4QHbC03Xw=
 github.com/vmware/alb-sdk v0.0.0-20250610083806-8447580290e5 h1:Pp+dny+PjeW6XQyZu+HQB7X2lFB8WZlt2ky9uQlm8qc=
 github.com/vmware/alb-sdk v0.0.0-20250610083806-8447580290e5/go.mod h1:4f6ExD6/N+8aP4Km/foEpCVlYqpiz+ogXL4QHbC03Xw=
+github.com/vmware/alb-sdk v0.0.0-20250627104848-3eff65e54cf6 h1:zWyNiVOo2x+8NMfiUGK1VgaMyFg1uEAVt3vvJuUKUwU=
+github.com/vmware/alb-sdk v0.0.0-20250627104848-3eff65e54cf6/go.mod h1:JIJgWAdD+NzyGU/cC5FOl7D8jXsNDuaAoi3zZtdGiMY=
 github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
 github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
 github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
diff --git a/website/docs/d/avi_ratelimitconfiguration.html.markdown b/website/docs/d/avi_ratelimitconfiguration.html.markdown
index c041d0a8a..dbb5fa228 100644
--- a/website/docs/d/avi_ratelimitconfiguration.html.markdown
+++ b/website/docs/d/avi_ratelimitconfiguration.html.markdown
@@ -37,7 +37,7 @@ In addition to all arguments above, the following attributes are exported:
 * `description` - Description for the rate limit configuration. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `http_methods` - List of http method(s) of the resources that need to be rate limited. Enum options - HTTP_METHOD_GET, HTTP_METHOD_HEAD, HTTP_METHOD_PUT, HTTP_METHOD_DELETE, HTTP_METHOD_POST, HTTP_METHOD_OPTIONS, HTTP_METHOD_TRACE, HTTP_METHOD_CONNECT, HTTP_METHOD_PATCH, HTTP_METHOD_PROPFIND, HTTP_METHOD_PROPPATCH, HTTP_METHOD_MKCOL, HTTP_METHOD_COPY, HTTP_METHOD_MOVE, HTTP_METHOD_LOCK, HTTP_METHOD_UNLOCK. Field introduced in 31.2.1. Minimum of 1 items required. Maximum of 5 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `name` - Name of the rate limit configuration(unique). Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `resource` - Ratelimitresource which needs to be rate limited. Enum options - RATE_LIMIT_VIRTUALSERVICE, RATE_LIMIT_POOL, RATE_LIMIT_LOGIN, RATE_LIMIT_AUTHTOKEN, RATE_LIMIT_HEALTHMONITOR, RATE_LIMIT_CLUSTER_RUNTIME, RATE_LIMIT_AUTHPROFILE, RATE_LIMIT_ALERT. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `resource` - Ratelimitresource which needs to be rate limited. Enum options - RATE_LIMIT_VIRTUALSERVICE, RATE_LIMIT_POOL, RATE_LIMIT_LOGIN, RATE_LIMIT_AUTHTOKEN, RATE_LIMIT_HEALTHMONITOR. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `tenant_ref` - Tenant ref for the auth rate limit configuration. It is a reference to an object of type tenant. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `token_refill_rate` - Token refill rate. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `type` - Type of the rate limiter, for now we only support api categorization based. Enum options - RATE_LIMITER_API_CATEGORY. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_vsdatascriptset.html.markdown b/website/docs/d/avi_vsdatascriptset.html.markdown
index ce66a86f8..b114fb967 100644
--- a/website/docs/d/avi_vsdatascriptset.html.markdown
+++ b/website/docs/d/avi_vsdatascriptset.html.markdown
@@ -46,6 +46,8 @@ In addition to all arguments above, the following attributes are exported:
 * `pool_refs` - Uuid of pools that could be referred by vsdatascriptset objects. It is a reference to an object of type pool. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `protocol_parser_refs` - List of protocol parsers that could be referred by vsdatascriptset objects. It is a reference to an object of type protocolparser. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `rate_limiters` - The rate limit definitions needed for this datascript. The name is composed of the virtual service name and the datascript name. Field introduced in 18.2.9. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `snat_ip6s` - Ipv6 address used by a vs-datascript in avi.l4.source_ip api. Field introduced in 31.2.1. Maximum of 8 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `snat_ips` - Ipv4 address used by a vs-datascript in avi.l4.source_ip api. Field introduced in 31.2.1. Maximum of 8 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ssl_key_certificate_refs` - Uuids of sslkeyandcertificate objects that could be referred by vsdatascriptset objects. It is a reference to an object of type sslkeyandcertificate. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ssl_profile_refs` - Uuids of sslprofile objects that could be referred by vsdatascriptset objects. It is a reference to an object of type sslprofile. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `string_group_refs` - Uuid of string groups that could be referred by vsdatascriptset objects. It is a reference to an object of type stringgroup. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_ratelimitconfiguration.html.markdown b/website/docs/r/avi_ratelimitconfiguration.html.markdown
index 5a49cb6ed..e9110cb23 100644
--- a/website/docs/r/avi_ratelimitconfiguration.html.markdown
+++ b/website/docs/r/avi_ratelimitconfiguration.html.markdown
@@ -29,7 +29,7 @@ The following arguments are supported:
 
 * `http_methods` - (Required) List of http method(s) of the resources that need to be rate limited. Enum options - HTTP_METHOD_GET, HTTP_METHOD_HEAD, HTTP_METHOD_PUT, HTTP_METHOD_DELETE, HTTP_METHOD_POST, HTTP_METHOD_OPTIONS, HTTP_METHOD_TRACE, HTTP_METHOD_CONNECT, HTTP_METHOD_PATCH, HTTP_METHOD_PROPFIND, HTTP_METHOD_PROPPATCH, HTTP_METHOD_MKCOL, HTTP_METHOD_COPY, HTTP_METHOD_MOVE, HTTP_METHOD_LOCK, HTTP_METHOD_UNLOCK. Field introduced in 31.2.1. Minimum of 1 items required. Maximum of 5 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `name` - (Required) Name of the rate limit configuration(unique). Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `resource` - (Required) Ratelimitresource which needs to be rate limited. Enum options - RATE_LIMIT_VIRTUALSERVICE, RATE_LIMIT_POOL, RATE_LIMIT_LOGIN, RATE_LIMIT_AUTHTOKEN, RATE_LIMIT_HEALTHMONITOR, RATE_LIMIT_CLUSTER_RUNTIME, RATE_LIMIT_AUTHPROFILE, RATE_LIMIT_ALERT. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `resource` - (Required) Ratelimitresource which needs to be rate limited. Enum options - RATE_LIMIT_VIRTUALSERVICE, RATE_LIMIT_POOL, RATE_LIMIT_LOGIN, RATE_LIMIT_AUTHTOKEN, RATE_LIMIT_HEALTHMONITOR. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `token_refill_rate` - (Required) Token refill rate. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `burst` - (Optional) The maximum request per second(rps) user intends to support for this category.this is not guaranteed as this will be the minimum of the rps supported by the resources in the category and this value.if user doesn't provide then it will be minimum value of the resources in this category. Allowed values are 1-1000. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_vsdatascriptset.html.markdown b/website/docs/r/avi_vsdatascriptset.html.markdown
index 3988548e0..854fb22a1 100644
--- a/website/docs/r/avi_vsdatascriptset.html.markdown
+++ b/website/docs/r/avi_vsdatascriptset.html.markdown
@@ -41,6 +41,8 @@ The following arguments are supported:
 * `pool_refs` - (Optional) Uuid of pools that could be referred by vsdatascriptset objects. It is a reference to an object of type pool. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `protocol_parser_refs` - (Optional) List of protocol parsers that could be referred by vsdatascriptset objects. It is a reference to an object of type protocolparser. Field introduced in 18.2.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `rate_limiters` - (Optional) The rate limit definitions needed for this datascript. The name is composed of the virtual service name and the datascript name. Field introduced in 18.2.9. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `snat_ip6s` - (Optional) Ipv6 address used by a vs-datascript in avi.l4.source_ip api. Field introduced in 31.2.1. Maximum of 8 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `snat_ips` - (Optional) Ipv4 address used by a vs-datascript in avi.l4.source_ip api. Field introduced in 31.2.1. Maximum of 8 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ssl_key_certificate_refs` - (Optional) Uuids of sslkeyandcertificate objects that could be referred by vsdatascriptset objects. It is a reference to an object of type sslkeyandcertificate. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ssl_profile_refs` - (Optional) Uuids of sslprofile objects that could be referred by vsdatascriptset objects. It is a reference to an object of type sslprofile. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `string_group_refs` - (Optional) Uuid of string groups that could be referred by vsdatascriptset objects. It is a reference to an object of type stringgroup. Allowed with any value in enterprise, enterprise with cloud services edition.

From a0ccacabcae030ce21f445c34a9bcf5a0a10bcd0 Mon Sep 17 00:00:00 2001
From: avijenkins <gurunath-reddy.kambala@broadcom.com>
Date: Mon, 7 Jul 2025 09:01:07 +0000
Subject: [PATCH 04/12] Updated assets for terraform

Signed-off-by: avijenkins <gurunath-reddy.kambala@broadcom.com>
---
 avi/datasource_avi_alertscriptconfig.go             | 4 ++++
 avi/datasource_avi_serviceenginegroup.go            | 4 ++++
 avi/resource_avi_alertscriptconfig.go               | 5 +++++
 avi/resource_avi_serviceenginegroup.go              | 6 ++++++
 website/docs/d/avi_alertscriptconfig.html.markdown  | 1 +
 website/docs/d/avi_serviceenginegroup.html.markdown | 1 +
 website/docs/r/avi_alertscriptconfig.html.markdown  | 1 +
 website/docs/r/avi_serviceenginegroup.html.markdown | 1 +
 8 files changed, 23 insertions(+)

diff --git a/avi/datasource_avi_alertscriptconfig.go b/avi/datasource_avi_alertscriptconfig.go
index 7c290b62a..5b2c84850 100644
--- a/avi/datasource_avi_alertscriptconfig.go
+++ b/avi/datasource_avi_alertscriptconfig.go
@@ -32,6 +32,10 @@ func dataSourceAviAlertScriptConfig() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"user_ref": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"uuid": {
 				Type:     schema.TypeString,
 				Optional: true,
diff --git a/avi/datasource_avi_serviceenginegroup.go b/avi/datasource_avi_serviceenginegroup.go
index 32a5e6b1b..c47404ea2 100644
--- a/avi/datasource_avi_serviceenginegroup.go
+++ b/avi/datasource_avi_serviceenginegroup.go
@@ -281,6 +281,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"enable_quantum_entropy": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"ephemeral_portrange_end": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/resource_avi_alertscriptconfig.go b/avi/resource_avi_alertscriptconfig.go
index 871b09040..4bc39cf36 100644
--- a/avi/resource_avi_alertscriptconfig.go
+++ b/avi/resource_avi_alertscriptconfig.go
@@ -36,6 +36,11 @@ func ResourceAlertScriptConfigSchema() map[string]*schema.Schema {
 			Computed:     true,
 			ValidateFunc: validateInteger,
 		},
+		"user_ref": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
 		"uuid": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_serviceenginegroup.go b/avi/resource_avi_serviceenginegroup.go
index a9cfdf823..8d6f560ba 100644
--- a/avi/resource_avi_serviceenginegroup.go
+++ b/avi/resource_avi_serviceenginegroup.go
@@ -400,6 +400,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Default:      "false",
 			ValidateFunc: validateBool,
 		},
+		"enable_quantum_entropy": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
 		"ephemeral_portrange_end": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/website/docs/d/avi_alertscriptconfig.html.markdown b/website/docs/d/avi_alertscriptconfig.html.markdown
index 8b4d5a185..73a0bd9b1 100644
--- a/website/docs/d/avi_alertscriptconfig.html.markdown
+++ b/website/docs/d/avi_alertscriptconfig.html.markdown
@@ -37,5 +37,6 @@ In addition to all arguments above, the following attributes are exported:
 * `name` - A user-friendly name of the script. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `tenant_ref` - It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `timeout` - Controlscript excution timeout. Field introduced in 22.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `user_ref` - Uuid of last editor user. It is a reference to an object of type user. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `uuid` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_serviceenginegroup.html.markdown b/website/docs/d/avi_serviceenginegroup.html.markdown
index 3b014d670..39b4546ea 100644
--- a/website/docs/d/avi_serviceenginegroup.html.markdown
+++ b/website/docs/d/avi_serviceenginegroup.html.markdown
@@ -100,6 +100,7 @@ In addition to all arguments above, the following attributes are exported:
 * `enable_multi_lb` - Applicable only for azure cloud with basic sku lb. If set, additional azure lbs will be automatically created if resources in existing lb are exhausted. Field introduced in 17.2.10, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_pcap_tx_ring` - Enable tx ring support in pcap mode of operation. Tso feature is not supported with tx ring enabled. Deprecated from 18.2.8, instead use pcap_tx_mode. Requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_qat` - This knob enables the service engine to use qat offloads (if the host cpu is capable, and the qat device is exposed). Requires se reboot. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_quantum_entropy` - This knob enables the service engine to use the quantinium library to locally generate quantum-hardened randomness for the linux kernel prng. Requires se reboot. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ephemeral_portrange_end` - End local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `ephemeral_portrange_start` - Start local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `extra_config_multiplier` - Multiplier for extra config to support large vs/pool config. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_alertscriptconfig.html.markdown b/website/docs/r/avi_alertscriptconfig.html.markdown
index dcad71fec..aa23fffcb 100644
--- a/website/docs/r/avi_alertscriptconfig.html.markdown
+++ b/website/docs/r/avi_alertscriptconfig.html.markdown
@@ -32,6 +32,7 @@ The following arguments are supported:
 * `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `timeout` - (Optional) Controlscript excution timeout. Field introduced in 22.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `user_ref` - (Optional) Uuid of last editor user. It is a reference to an object of type user. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
diff --git a/website/docs/r/avi_serviceenginegroup.html.markdown b/website/docs/r/avi_serviceenginegroup.html.markdown
index fa8d9f015..93eca4793 100644
--- a/website/docs/r/avi_serviceenginegroup.html.markdown
+++ b/website/docs/r/avi_serviceenginegroup.html.markdown
@@ -94,6 +94,7 @@ The following arguments are supported:
 * `enable_multi_lb` - (Optional) Applicable only for azure cloud with basic sku lb. If set, additional azure lbs will be automatically created if resources in existing lb are exhausted. Field introduced in 17.2.10, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_pcap_tx_ring` - (Optional) Enable tx ring support in pcap mode of operation. Tso feature is not supported with tx ring enabled. Deprecated from 18.2.8, instead use pcap_tx_mode. Requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_qat` - (Optional) This knob enables the service engine to use qat offloads (if the host cpu is capable, and the qat device is exposed). Requires se reboot. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_quantum_entropy` - (Optional) This knob enables the service engine to use the quantinium library to locally generate quantum-hardened randomness for the linux kernel prng. Requires se reboot. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ephemeral_portrange_end` - (Optional) End local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `ephemeral_portrange_start` - (Optional) Start local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `extra_config_multiplier` - (Optional) Multiplier for extra config to support large vs/pool config. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.

From 62ecc83281d8640049ef616c167da3d4b5b0bf07 Mon Sep 17 00:00:00 2001
From: avijenkins <gurunath-reddy.kambala@broadcom.com>
Date: Thu, 10 Jul 2025 09:08:56 +0000
Subject: [PATCH 05/12] Updated assets for terraform

Signed-off-by: avijenkins <gurunath-reddy.kambala@broadcom.com>
---
 avi/datasource_avi_serviceenginegroup.go          |  4 ++++
 avi/datasource_avi_sslprofile.go                  |  4 ++++
 avi/datasource_avi_wafpolicy.go                   |  4 ++++
 avi/resource_avi_rest_dependants.go               | 15 +++++++++++++++
 avi/resource_avi_serviceenginegroup.go            |  6 ++++++
 avi/resource_avi_sslprofile.go                    |  6 ++++++
 avi/resource_avi_wafpolicy.go                     |  6 ++++++
 .../docs/d/avi_serviceenginegroup.html.markdown   |  1 +
 website/docs/d/avi_sslprofile.html.markdown       |  1 +
 website/docs/d/avi_wafpolicy.html.markdown        |  1 +
 .../docs/r/avi_serviceenginegroup.html.markdown   |  1 +
 website/docs/r/avi_sslprofile.html.markdown       |  1 +
 website/docs/r/avi_wafpolicy.html.markdown        |  1 +
 13 files changed, 51 insertions(+)

diff --git a/avi/datasource_avi_serviceenginegroup.go b/avi/datasource_avi_serviceenginegroup.go
index c47404ea2..1f22fbf74 100644
--- a/avi/datasource_avi_serviceenginegroup.go
+++ b/avi/datasource_avi_serviceenginegroup.go
@@ -523,6 +523,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"max_cpu_load_adaptive_sampling": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"max_cpu_usage": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_sslprofile.go b/avi/datasource_avi_sslprofile.go
index 9a44e06ec..dd60bb88f 100644
--- a/avi/datasource_avi_sslprofile.go
+++ b/avi/datasource_avi_sslprofile.go
@@ -18,6 +18,10 @@ func dataSourceAviSSLProfile() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceSSLVersionSchema(),
 			},
+			"allow_legacy_renegotiation": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"cipher_enums": {
 				Type:     schema.TypeList,
 				Computed: true,
diff --git a/avi/datasource_avi_wafpolicy.go b/avi/datasource_avi_wafpolicy.go
index 05e37d351..f54c8c5c3 100644
--- a/avi/datasource_avi_wafpolicy.go
+++ b/avi/datasource_avi_wafpolicy.go
@@ -54,6 +54,10 @@ func dataSourceAviWafPolicy() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"enable_adaptive_sampling": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"enable_app_learning": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go
index 2b91a003f..6cb0419fc 100644
--- a/avi/resource_avi_rest_dependants.go
+++ b/avi/resource_avi_rest_dependants.go
@@ -7119,6 +7119,16 @@ func ResourceConnectionLogSchema() *schema.Resource {
 				Optional: true,
 				Elem:     &schema.Schema{Type: schema.TypeInt},
 			},
+			"dns_policy": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"dns_policy_rule_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"dns_qtype": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -7426,6 +7436,11 @@ func ResourceConnectionLogSchema() *schema.Resource {
 				Required:     true,
 				ValidateFunc: validateInteger,
 			},
+			"topology_policy_rule_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"total_bytes": {
 				Type:         schema.TypeString,
 				Optional:     true,
diff --git a/avi/resource_avi_serviceenginegroup.go b/avi/resource_avi_serviceenginegroup.go
index 8d6f560ba..6d1b9bc38 100644
--- a/avi/resource_avi_serviceenginegroup.go
+++ b/avi/resource_avi_serviceenginegroup.go
@@ -740,6 +740,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Computed:     true,
 			ValidateFunc: validateInteger,
 		},
+		"max_cpu_load_adaptive_sampling": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "80",
+			ValidateFunc: validateInteger,
+		},
 		"max_cpu_usage": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_sslprofile.go b/avi/resource_avi_sslprofile.go
index 3beae09e0..2309e4ad2 100644
--- a/avi/resource_avi_sslprofile.go
+++ b/avi/resource_avi_sslprofile.go
@@ -20,6 +20,12 @@ func ResourceSSLProfileSchema() map[string]*schema.Schema {
 			Required: true,
 			Elem:     ResourceSSLVersionSchema(),
 		},
+		"allow_legacy_renegotiation": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
 		"cipher_enums": {
 			Type:     schema.TypeList,
 			Optional: true,
diff --git a/avi/resource_avi_wafpolicy.go b/avi/resource_avi_wafpolicy.go
index 2b1e80093..f6db1a616 100644
--- a/avi/resource_avi_wafpolicy.go
+++ b/avi/resource_avi_wafpolicy.go
@@ -67,6 +67,12 @@ func ResourceWafPolicySchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"enable_adaptive_sampling": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
 		"enable_app_learning": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/website/docs/d/avi_serviceenginegroup.html.markdown b/website/docs/d/avi_serviceenginegroup.html.markdown
index 39b4546ea..ca0c64471 100644
--- a/website/docs/d/avi_serviceenginegroup.html.markdown
+++ b/website/docs/d/avi_serviceenginegroup.html.markdown
@@ -159,6 +159,7 @@ In addition to all arguments above, the following attributes are exported:
 * `log_message_max_file_list_size` - Maximum number of file names in a log message. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `max_concurrent_external_hm` - Maximum number of external health monitors that can run concurrently in a service engine. This helps control the cpu and memory use by external health monitors. Special values are 0- value will be internally calculated based on cpu and memory. Field introduced in 18.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_cpu_load_adaptive_sampling` - When adaptive sampling is enabled, specifies the max cpu load allowed for adaptive sampling. If the cpu load exceeds this value, no requests will be sampled. Allowed values are 1-100. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `max_cpu_usage` - When cpu usage on an se exceeds this threshold, virtual services hosted on this se may be rebalanced to other ses to reduce load. A new se may be created as part of this process. Allowed values are 40-90. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `max_memory_per_mempool` - Max bytes that can be allocated in a single mempool. Field introduced in 18.1.5. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `max_num_http_sessions_to_store` - Maximum number of http session that will be created. Each session uses about 1kb in the key-value storage in shared memory. Setting this value too high can lead to exhaustion of shared memory and affect services. Allowed values are 1-2000000. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_sslprofile.html.markdown b/website/docs/d/avi_sslprofile.html.markdown
index 44e57312f..06a457acf 100644
--- a/website/docs/d/avi_sslprofile.html.markdown
+++ b/website/docs/d/avi_sslprofile.html.markdown
@@ -34,6 +34,7 @@ In addition to all arguments above, the following attributes are exported:
 
 * `accepted_ciphers` - Ciphers suites represented as defined by https //www.openssl.org/docs/man1.1.1/man1/ciphers.html. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `accepted_versions` - Set of versions accepted by the server. Minimum of 1 items required. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allow_legacy_renegotiation` - Allow backend servers to use legacy renegotiation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `cipher_enums` - Enum options - tls_ecdhe_ecdsa_with_aes_128_gcm_sha256, tls_ecdhe_ecdsa_with_aes_256_gcm_sha384, tls_ecdhe_rsa_with_aes_128_gcm_sha256, tls_ecdhe_rsa_with_aes_256_gcm_sha384, tls_ecdhe_ecdsa_with_aes_128_cbc_sha256, tls_ecdhe_ecdsa_with_aes_256_cbc_sha384, tls_ecdhe_rsa_with_aes_128_cbc_sha256, tls_ecdhe_rsa_with_aes_256_cbc_sha384, tls_rsa_with_aes_128_gcm_sha256, tls_rsa_with_aes_256_gcm_sha384, tls_rsa_with_aes_128_cbc_sha256, tls_rsa_with_aes_256_cbc_sha256, tls_ecdhe_ecdsa_with_aes_128_cbc_sha, tls_ecdhe_ecdsa_with_aes_256_cbc_sha, tls_ecdhe_rsa_with_aes_128_cbc_sha, tls_ecdhe_rsa_with_aes_256_cbc_sha, tls_rsa_with_aes_128_cbc_sha, tls_rsa_with_aes_256_cbc_sha, tls_rsa_with_3des_ede_cbc_sha, tls_aes_256_gcm_sha384... Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- tls_ecdhe_ecdsa_with_aes_128_gcm_sha256,tls_ecdhe_ecdsa_with_aes_256_gcm_sha384,tls_ecdhe_rsa_with_aes_128_gcm_sha256,tls_ecdhe_rsa_with_aes_256_gcm_sha384,tls_ecdhe_ecdsa_with_aes_128_cbc_sha256,tls_ecdhe_ecdsa_with_aes_256_cbc_sha384,tls_ecdhe_rsa_with_aes_128_cbc_sha256,tls_ecdhe_rsa_with_aes_256_cbc_sha384,tls_rsa_with_aes_128_gcm_sha256,tls_rsa_with_aes_256_gcm_sha384,tls_rsa_with_aes_128_cbc_sha256,tls_rsa_with_aes_256_cbc_sha256,tls_ecdhe_ecdsa_with_aes_128_cbc_sha,tls_ecdhe_ecdsa_with_aes_256_cbc_sha,tls_ecdhe_rsa_with_aes_128_cbc_sha,tls_ecdhe_rsa_with_aes_256_cbc_sha,tls_rsa_with_aes_128_cbc_sha,tls_rsa_with_aes_256_cbc_sha,tls_rsa_with_3des_ede_cbc_sha), basic (allowed values- tls_ecdhe_ecdsa_with_aes_128_gcm_sha256,tls_ecdhe_ecdsa_with_aes_256_gcm_sha384,tls_ecdhe_rsa_with_aes_128_gcm_sha256,tls_ecdhe_rsa_with_aes_256_gcm_sha384,tls_ecdhe_ecdsa_with_aes_128_cbc_sha256,tls_ecdhe_ecdsa_with_aes_256_cbc_sha384,tls_ecdhe_rsa_with_aes_128_cbc_sha256,tls_ecdhe_rsa_with_aes_256_cbc_sha384,tls_rsa_with_aes_128_gcm_sha256,tls_rsa_with_aes_256_gcm_sha384,tls_rsa_with_aes_128_cbc_sha256,tls_rsa_with_aes_256_cbc_sha256,tls_ecdhe_ecdsa_with_aes_128_cbc_sha,tls_ecdhe_ecdsa_with_aes_256_cbc_sha,tls_ecdhe_rsa_with_aes_128_cbc_sha,tls_ecdhe_rsa_with_aes_256_cbc_sha,tls_rsa_with_aes_128_cbc_sha,tls_rsa_with_aes_256_cbc_sha,tls_rsa_with_3des_ede_cbc_sha) edition.
 * `ciphersuites` - Tls 1.3 ciphers suites represented as defined by u(https //www.openssl.org/docs/man1.1.1/man1/ciphers.html). Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is tls_aes_256_gcm_sha384-tls_aes_128_gcm_sha256, basic edition is tls_aes_256_gcm_sha384-tls_aes_128_gcm_sha256, enterprise edition is tls_aes_256_gcm_sha384-tls_chacha20_poly1305_sha256-tls_aes_128_gcm_sha256.
 * `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_wafpolicy.html.markdown b/website/docs/d/avi_wafpolicy.html.markdown
index 98fb37f23..a57aff4f9 100644
--- a/website/docs/d/avi_wafpolicy.html.markdown
+++ b/website/docs/d/avi_wafpolicy.html.markdown
@@ -42,6 +42,7 @@ In addition to all arguments above, the following attributes are exported:
 * `created_by` - Creator name. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `crs_overrides` - Override attributes for crs rules. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `description` - Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_adaptive_sampling` - Whether or not adaptive sampling should be enabled. If enabled, a varying percentage of requests will be subject to waf processing in evaluation mode. The se-group property max_cpu_load_adaptive_sampling limits the maximum load on the cpu allowed for adaptive sampling to take place. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `enable_app_learning` - Enable application learning for this waf policy. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_auto_rule_updates` - Enable application learning based rule updates on the waf profile. Rules will be programmed in dedicated waf learning group. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_regex_learning` - Enable dynamic regex generation for positive security model rules. This is an experimental feature and shouldn't be used in production. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_serviceenginegroup.html.markdown b/website/docs/r/avi_serviceenginegroup.html.markdown
index 93eca4793..6fa3caab7 100644
--- a/website/docs/r/avi_serviceenginegroup.html.markdown
+++ b/website/docs/r/avi_serviceenginegroup.html.markdown
@@ -153,6 +153,7 @@ The following arguments are supported:
 * `log_message_max_file_list_size` - (Optional) Maximum number of file names in a log message. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `max_concurrent_external_hm` - (Optional) Maximum number of external health monitors that can run concurrently in a service engine. This helps control the cpu and memory use by external health monitors. Special values are 0- value will be internally calculated based on cpu and memory. Field introduced in 18.2.7. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `max_cpu_load_adaptive_sampling` - (Optional) When adaptive sampling is enabled, specifies the max cpu load allowed for adaptive sampling. If the cpu load exceeds this value, no requests will be sampled. Allowed values are 1-100. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `max_cpu_usage` - (Optional) When cpu usage on an se exceeds this threshold, virtual services hosted on this se may be rebalanced to other ses to reduce load. A new se may be created as part of this process. Allowed values are 40-90. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `max_memory_per_mempool` - (Optional) Max bytes that can be allocated in a single mempool. Field introduced in 18.1.5. Unit is mb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `max_num_http_sessions_to_store` - (Optional) Maximum number of http session that will be created. Each session uses about 1kb in the key-value storage in shared memory. Setting this value too high can lead to exhaustion of shared memory and affect services. Allowed values are 1-2000000. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_sslprofile.html.markdown b/website/docs/r/avi_sslprofile.html.markdown
index aed80e5da..d7aa18676 100644
--- a/website/docs/r/avi_sslprofile.html.markdown
+++ b/website/docs/r/avi_sslprofile.html.markdown
@@ -30,6 +30,7 @@ The following arguments are supported:
 * `accepted_versions` - (Required) Set of versions accepted by the server. Minimum of 1 items required. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `name` - (Required) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `accepted_ciphers` - (Optional) Ciphers suites represented as defined by https //www.openssl.org/docs/man1.1.1/man1/ciphers.html. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `allow_legacy_renegotiation` - (Optional) Allow backend servers to use legacy renegotiation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `cipher_enums` - (Optional) Enum options - tls_ecdhe_ecdsa_with_aes_128_gcm_sha256, tls_ecdhe_ecdsa_with_aes_256_gcm_sha384, tls_ecdhe_rsa_with_aes_128_gcm_sha256, tls_ecdhe_rsa_with_aes_256_gcm_sha384, tls_ecdhe_ecdsa_with_aes_128_cbc_sha256, tls_ecdhe_ecdsa_with_aes_256_cbc_sha384, tls_ecdhe_rsa_with_aes_128_cbc_sha256, tls_ecdhe_rsa_with_aes_256_cbc_sha384, tls_rsa_with_aes_128_gcm_sha256, tls_rsa_with_aes_256_gcm_sha384, tls_rsa_with_aes_128_cbc_sha256, tls_rsa_with_aes_256_cbc_sha256, tls_ecdhe_ecdsa_with_aes_128_cbc_sha, tls_ecdhe_ecdsa_with_aes_256_cbc_sha, tls_ecdhe_rsa_with_aes_128_cbc_sha, tls_ecdhe_rsa_with_aes_256_cbc_sha, tls_rsa_with_aes_128_cbc_sha, tls_rsa_with_aes_256_cbc_sha, tls_rsa_with_3des_ede_cbc_sha, tls_aes_256_gcm_sha384... Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- tls_ecdhe_ecdsa_with_aes_128_gcm_sha256,tls_ecdhe_ecdsa_with_aes_256_gcm_sha384,tls_ecdhe_rsa_with_aes_128_gcm_sha256,tls_ecdhe_rsa_with_aes_256_gcm_sha384,tls_ecdhe_ecdsa_with_aes_128_cbc_sha256,tls_ecdhe_ecdsa_with_aes_256_cbc_sha384,tls_ecdhe_rsa_with_aes_128_cbc_sha256,tls_ecdhe_rsa_with_aes_256_cbc_sha384,tls_rsa_with_aes_128_gcm_sha256,tls_rsa_with_aes_256_gcm_sha384,tls_rsa_with_aes_128_cbc_sha256,tls_rsa_with_aes_256_cbc_sha256,tls_ecdhe_ecdsa_with_aes_128_cbc_sha,tls_ecdhe_ecdsa_with_aes_256_cbc_sha,tls_ecdhe_rsa_with_aes_128_cbc_sha,tls_ecdhe_rsa_with_aes_256_cbc_sha,tls_rsa_with_aes_128_cbc_sha,tls_rsa_with_aes_256_cbc_sha,tls_rsa_with_3des_ede_cbc_sha), basic (allowed values- tls_ecdhe_ecdsa_with_aes_128_gcm_sha256,tls_ecdhe_ecdsa_with_aes_256_gcm_sha384,tls_ecdhe_rsa_with_aes_128_gcm_sha256,tls_ecdhe_rsa_with_aes_256_gcm_sha384,tls_ecdhe_ecdsa_with_aes_128_cbc_sha256,tls_ecdhe_ecdsa_with_aes_256_cbc_sha384,tls_ecdhe_rsa_with_aes_128_cbc_sha256,tls_ecdhe_rsa_with_aes_256_cbc_sha384,tls_rsa_with_aes_128_gcm_sha256,tls_rsa_with_aes_256_gcm_sha384,tls_rsa_with_aes_128_cbc_sha256,tls_rsa_with_aes_256_cbc_sha256,tls_ecdhe_ecdsa_with_aes_128_cbc_sha,tls_ecdhe_ecdsa_with_aes_256_cbc_sha,tls_ecdhe_rsa_with_aes_128_cbc_sha,tls_ecdhe_rsa_with_aes_256_cbc_sha,tls_rsa_with_aes_128_cbc_sha,tls_rsa_with_aes_256_cbc_sha,tls_rsa_with_3des_ede_cbc_sha) edition.
 * `ciphersuites` - (Optional) Tls 1.3 ciphers suites represented as defined by u(https //www.openssl.org/docs/man1.1.1/man1/ciphers.html). Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition. Special default for essentials edition is tls_aes_256_gcm_sha384-tls_aes_128_gcm_sha256, basic edition is tls_aes_256_gcm_sha384-tls_aes_128_gcm_sha256, enterprise edition is tls_aes_256_gcm_sha384-tls_chacha20_poly1305_sha256-tls_aes_128_gcm_sha256.
 * `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_wafpolicy.html.markdown b/website/docs/r/avi_wafpolicy.html.markdown
index faa6266e7..fc383e6c8 100644
--- a/website/docs/r/avi_wafpolicy.html.markdown
+++ b/website/docs/r/avi_wafpolicy.html.markdown
@@ -39,6 +39,7 @@ The following arguments are supported:
 * `created_by` - (Optional) Creator name. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `crs_overrides` - (Optional) Override attributes for crs rules. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `description` - (Optional) Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_adaptive_sampling` - (Optional) Whether or not adaptive sampling should be enabled. If enabled, a varying percentage of requests will be subject to waf processing in evaluation mode. The se-group property max_cpu_load_adaptive_sampling limits the maximum load on the cpu allowed for adaptive sampling to take place. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `enable_app_learning` - (Optional) Enable application learning for this waf policy. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_auto_rule_updates` - (Optional) Enable application learning based rule updates on the waf profile. Rules will be programmed in dedicated waf learning group. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_regex_learning` - (Optional) Enable dynamic regex generation for positive security model rules. This is an experimental feature and shouldn't be used in production. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.

From a3b2cb83c3811b7c297a4b36c62563d9369ccd3d Mon Sep 17 00:00:00 2001
From: avijenkins <gurunath-reddy.kambala@broadcom.com>
Date: Fri, 11 Jul 2025 09:00:36 +0000
Subject: [PATCH 06/12] Updated assets for terraform

Signed-off-by: avijenkins <gurunath-reddy.kambala@broadcom.com>
---
 avi/datasource_avi_serviceenginegroup.go            | 4 ++++
 avi/resource_avi_serviceenginegroup.go              | 6 ++++++
 website/docs/d/avi_serviceenginegroup.html.markdown | 1 +
 website/docs/r/avi_serviceenginegroup.html.markdown | 1 +
 4 files changed, 12 insertions(+)

diff --git a/avi/datasource_avi_serviceenginegroup.go b/avi/datasource_avi_serviceenginegroup.go
index 1f22fbf74..c54c5a0ac 100644
--- a/avi/datasource_avi_serviceenginegroup.go
+++ b/avi/datasource_avi_serviceenginegroup.go
@@ -193,6 +193,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"disable_qat_bulk_crypto": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"disable_se_memory_check": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/resource_avi_serviceenginegroup.go b/avi/resource_avi_serviceenginegroup.go
index 6d1b9bc38..1e036c87b 100644
--- a/avi/resource_avi_serviceenginegroup.go
+++ b/avi/resource_avi_serviceenginegroup.go
@@ -268,6 +268,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Computed:     true,
 			ValidateFunc: validateBool,
 		},
+		"disable_qat_bulk_crypto": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
 		"disable_se_memory_check": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/website/docs/d/avi_serviceenginegroup.html.markdown b/website/docs/d/avi_serviceenginegroup.html.markdown
index ca0c64471..068b049c5 100644
--- a/website/docs/d/avi_serviceenginegroup.html.markdown
+++ b/website/docs/d/avi_serviceenginegroup.html.markdown
@@ -78,6 +78,7 @@ In addition to all arguments above, the following attributes are exported:
 * `disable_csum_offloads` - Stop using tcp/udp and ip checksum offload features of nics. Field introduced in 17.1.14, 17.2.5, 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `disable_flow_probes` - Disable flow probes for scaled out vs'es. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `disable_gro` - Disable generic receive offload (gro) in dpdk poll-mode driver packet receive path. Gro can be enabled on nics that do not support lro (large receive offload) or do not gain performance boost from lro. Gro is on by default on nics in a system with 8 vcpus or higher. Field introduced in 17.2.5, 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disable_qat_bulk_crypto` - This knob enables the qat offloads for tls application data. (if the host cpu is capable, and the qat device is exposed). Requires se reboot. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `disable_se_memory_check` - If set, disable the config memory check done in service engine. Field introduced in 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `disable_tso` - Disable tcp segmentation offload (tso) in dpdk poll-mode driver packet transmit path. Tso is on by default on nics that support it. Field introduced in 17.2.5, 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `disk_per_se` - Amount of disk space for each of the service engine virtual machines. Unit is gb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_serviceenginegroup.html.markdown b/website/docs/r/avi_serviceenginegroup.html.markdown
index 6fa3caab7..edc3e50ad 100644
--- a/website/docs/r/avi_serviceenginegroup.html.markdown
+++ b/website/docs/r/avi_serviceenginegroup.html.markdown
@@ -72,6 +72,7 @@ The following arguments are supported:
 * `disable_csum_offloads` - (Optional) Stop using tcp/udp and ip checksum offload features of nics. Field introduced in 17.1.14, 17.2.5, 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `disable_flow_probes` - (Optional) Disable flow probes for scaled out vs'es. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `disable_gro` - (Optional) Disable generic receive offload (gro) in dpdk poll-mode driver packet receive path. Gro can be enabled on nics that do not support lro (large receive offload) or do not gain performance boost from lro. Gro is on by default on nics in a system with 8 vcpus or higher. Field introduced in 17.2.5, 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `disable_qat_bulk_crypto` - (Optional) This knob enables the qat offloads for tls application data. (if the host cpu is capable, and the qat device is exposed). Requires se reboot. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `disable_se_memory_check` - (Optional) If set, disable the config memory check done in service engine. Field introduced in 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `disable_tso` - (Optional) Disable tcp segmentation offload (tso) in dpdk poll-mode driver packet transmit path. Tso is on by default on nics that support it. Field introduced in 17.2.5, 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `disk_per_se` - (Optional) Amount of disk space for each of the service engine virtual machines. Unit is gb. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.

From ea98e24bc3411852534f1fa945d1c8e8e7e6aa3a Mon Sep 17 00:00:00 2001
From: avijenkins <gurunath-reddy.kambala@broadcom.com>
Date: Tue, 15 Jul 2025 09:00:38 +0000
Subject: [PATCH 07/12] Updated assets for terraform

Signed-off-by: avijenkins <gurunath-reddy.kambala@broadcom.com>
---
 avi/resource_avi_pool_server.go                      | 4 ++++
 website/docs/d/avi_systemconfiguration.html.markdown | 2 +-
 website/docs/r/avi_systemconfiguration.html.markdown | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/avi/resource_avi_pool_server.go b/avi/resource_avi_pool_server.go
index 1013a84cc..d449346c7 100644
--- a/avi/resource_avi_pool_server.go
+++ b/avi/resource_avi_pool_server.go
@@ -386,6 +386,10 @@ func resourceAviServerReadAPI(d *schema.ResourceData, meta interface{}) (string,
 	ip := d.Get("ip").(string)
 	port := d.Get("port")
 
+	if port == "" {
+		port = nil
+	}
+
 	// find the server in the pool object.
 	var matchedServer *models.Server = nil
 	for i := 0; i < len(poolObj.Servers); i++ {
diff --git a/website/docs/d/avi_systemconfiguration.html.markdown b/website/docs/d/avi_systemconfiguration.html.markdown
index 54927a4e6..27fbbb8b8 100644
--- a/website/docs/d/avi_systemconfiguration.html.markdown
+++ b/website/docs/d/avi_systemconfiguration.html.markdown
@@ -64,7 +64,7 @@ In addition to all arguments above, the following attributes are exported:
 * `sync_dns_to_se` - Ability to sync the dns to ses. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `sync_kex_host_to_se` - Ability to sync the kexalgorithms & hostkeyalgorithms to ses. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `sync_syslog_to_se` - Ability to sync the syslog server config to ses. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `syslog_servers` - The destination syslog server ip(v4/v6) address or fqdn. Provide in the format ip port. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `syslog_servers` - The destination syslog server ip(v4/v6) address or fqdn. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `telemetry_configuration` - Telemetry configuration. Field introduced in 31.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `trusted_host_profiles_refs` - Trusted host profiles for host header validation. Only works when host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 31.1.1. Maximum of 20 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `truststore_pkiprofile_ref` - Reference to pkiprofile used for validating the ca certificates for external comminications from avi load balancer controller  this acts as trust store for avi load balancer controller. It is a reference to an object of type pkiprofile. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_systemconfiguration.html.markdown b/website/docs/r/avi_systemconfiguration.html.markdown
index a3492fbb7..43bcd9ae2 100644
--- a/website/docs/r/avi_systemconfiguration.html.markdown
+++ b/website/docs/r/avi_systemconfiguration.html.markdown
@@ -58,7 +58,7 @@ The following arguments are supported:
 * `sync_dns_to_se` - (Optional) Ability to sync the dns to ses. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `sync_kex_host_to_se` - (Optional) Ability to sync the kexalgorithms & hostkeyalgorithms to ses. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `sync_syslog_to_se` - (Optional) Ability to sync the syslog server config to ses. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `syslog_servers` - (Optional) The destination syslog server ip(v4/v6) address or fqdn. Provide in the format ip port. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `syslog_servers` - (Optional) The destination syslog server ip(v4/v6) address or fqdn. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `telemetry_configuration` - (Optional) Telemetry configuration. Field introduced in 31.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `trusted_host_profiles_refs` - (Optional) Trusted host profiles for host header validation. Only works when host_header_check is set to true. It is a reference to an object of type trustedhostprofile. Field introduced in 31.1.1. Maximum of 20 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `truststore_pkiprofile_ref` - (Optional) Reference to pkiprofile used for validating the ca certificates for external comminications from avi load balancer controller  this acts as trust store for avi load balancer controller. It is a reference to an object of type pkiprofile. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.

From b2a718498f7f3cf912a528a94691b9e8e8874690 Mon Sep 17 00:00:00 2001
From: avijenkins <gurunath-reddy.kambala@broadcom.com>
Date: Thu, 17 Jul 2025 09:07:57 +0000
Subject: [PATCH 08/12] Updated assets for terraform

Signed-off-by: avijenkins <gurunath-reddy.kambala@broadcom.com>
---
 avi/datasource_avi_serviceenginegroup.go      |  12 +
 avi/datasource_avi_techsupport.go             | 115 +++++
 avi/datasource_avi_techsupportmessage.go      |  26 ++
 avi/datasource_avi_techsupportprofile.go      |  58 +++
 avi/provider.go                               |   6 +
 avi/resource_avi_rest_dependants.go           | 435 +++++++++++++++++-
 avi/resource_avi_serviceenginegroup.go        |  18 +
 avi/resource_avi_techsupport.go               | 195 ++++++++
 avi/resource_avi_techsupportmessage.go        |  87 ++++
 avi/resource_avi_techsupportprofile.go        | 131 ++++++
 website/avi.erb                               |  18 +
 .../d/avi_serviceenginegroup.html.markdown    |   3 +
 website/docs/d/avi_techsupport.html.markdown  |  58 +++
 .../d/avi_techsupportmessage.html.markdown    |  38 ++
 .../d/avi_techsupportprofile.html.markdown    |  45 ++
 .../r/avi_serviceenginegroup.html.markdown    |   3 +
 website/docs/r/avi_techsupport.html.markdown  |  67 +++
 .../r/avi_techsupportmessage.html.markdown    |  47 ++
 .../r/avi_techsupportprofile.html.markdown    |  54 +++
 19 files changed, 1394 insertions(+), 22 deletions(-)
 create mode 100644 avi/datasource_avi_techsupport.go
 create mode 100644 avi/datasource_avi_techsupportmessage.go
 create mode 100644 avi/datasource_avi_techsupportprofile.go
 create mode 100644 avi/resource_avi_techsupport.go
 create mode 100644 avi/resource_avi_techsupportmessage.go
 create mode 100644 avi/resource_avi_techsupportprofile.go
 create mode 100644 website/docs/d/avi_techsupport.html.markdown
 create mode 100644 website/docs/d/avi_techsupportmessage.html.markdown
 create mode 100644 website/docs/d/avi_techsupportprofile.html.markdown
 create mode 100644 website/docs/r/avi_techsupport.html.markdown
 create mode 100644 website/docs/r/avi_techsupportmessage.html.markdown
 create mode 100644 website/docs/r/avi_techsupportprofile.html.markdown

diff --git a/avi/datasource_avi_serviceenginegroup.go b/avi/datasource_avi_serviceenginegroup.go
index c54c5a0ac..6d1cd76d3 100644
--- a/avi/datasource_avi_serviceenginegroup.go
+++ b/avi/datasource_avi_serviceenginegroup.go
@@ -66,15 +66,27 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeInt},
 			},
+			"auto_rebalance_cool_down_time": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"auto_rebalance_criteria": {
 				Type:     schema.TypeList,
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+			"auto_rebalance_dry_run_enabled": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"auto_rebalance_interval": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"auto_rebalance_raise_events_for_actions": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"auto_redistribute_active_standby_load": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_techsupport.go b/avi/datasource_avi_techsupport.go
new file mode 100644
index 000000000..54a19af5a
--- /dev/null
+++ b/avi/datasource_avi_techsupport.go
@@ -0,0 +1,115 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func dataSourceAviTechSupport() *schema.Resource {
+	return &schema.Resource{
+		Read: ResourceAviTechSupportRead,
+		Schema: map[string]*schema.Schema{
+			"case_number": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"description": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"duration": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"end_time": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"errors": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"level": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"node": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"obj_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"obj_uuid": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"output": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"params": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceTechSupportParamsSchema(),
+			},
+			"progress": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"size": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"start_time": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"state": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceTechSupportStateSchema(),
+			},
+			"tasks": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceTechSupportEventMapSchema(),
+			},
+			"tasks_completed": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"techsupport_readiness": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceReadinessCheckObjSchema(),
+			},
+			"tenant_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"total_tasks": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"warnings": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+		},
+	}
+}
diff --git a/avi/datasource_avi_techsupportmessage.go b/avi/datasource_avi_techsupportmessage.go
new file mode 100644
index 000000000..a0a30b4c5
--- /dev/null
+++ b/avi/datasource_avi_techsupportmessage.go
@@ -0,0 +1,26 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func dataSourceAviTechSupportMessage() *schema.Resource {
+	return &schema.Resource{
+		Read: ResourceAviTechSupportMessageRead,
+		Schema: map[string]*schema.Schema{
+			"status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"status_code": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"tech_support_ref": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
diff --git a/avi/datasource_avi_techsupportprofile.go b/avi/datasource_avi_techsupportprofile.go
new file mode 100644
index 000000000..211fe6823
--- /dev/null
+++ b/avi/datasource_avi_techsupportprofile.go
@@ -0,0 +1,58 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func dataSourceAviTechSupportProfile() *schema.Resource {
+	return &schema.Resource{
+		Read: ResourceAviTechSupportProfileRead,
+		Schema: map[string]*schema.Schema{
+			"archive_rules": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceArchiveRulesSchema(),
+			},
+			"collect_customer_files": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceCollectCustomerFilesSchema(),
+			},
+			"event_params": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceTechSupportEventParamsSchema(),
+			},
+			"file_size_threshold": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"max_disk_size_percent": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"min_free_disk_required": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"no_of_techsupport_retentions": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"simultaneous_invocations": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"task_timeout": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
diff --git a/avi/provider.go b/avi/provider.go
index 4ab7f5cfd..5199c276e 100644
--- a/avi/provider.go
+++ b/avi/provider.go
@@ -183,6 +183,9 @@ func Provider() *schema.Provider {
 			"avi_testsedatastorelevel2":           dataSourceAviTestSeDatastoreLevel2(),
 			"avi_testsedatastorelevel3":           dataSourceAviTestSeDatastoreLevel3(),
 			"avi_dynamicdnsrecord":                dataSourceAviDynamicDnsRecord(),
+			"avi_techsupportmessage":              dataSourceAviTechSupportMessage(),
+			"avi_techsupportprofile":              dataSourceAviTechSupportProfile(),
+			"avi_techsupport":                     dataSourceAviTechSupport(),
 			"avi_albservicesfiledownload":         dataSourceAviALBServicesFileDownload(),
 			"avi_labelgroup":                      dataSourceAviLabelGroup(),
 			"avi_seproperties":                    dataSourceAviSeProperties(),
@@ -311,6 +314,9 @@ func Provider() *schema.Provider {
 			"avi_testsedatastorelevel2":           resourceAviTestSeDatastoreLevel2(),
 			"avi_testsedatastorelevel3":           resourceAviTestSeDatastoreLevel3(),
 			"avi_dynamicdnsrecord":                resourceAviDynamicDnsRecord(),
+			"avi_techsupportmessage":              resourceAviTechSupportMessage(),
+			"avi_techsupportprofile":              resourceAviTechSupportProfile(),
+			"avi_techsupport":                     resourceAviTechSupport(),
 			"avi_albservicesfiledownload":         resourceAviALBServicesFileDownload(),
 			"avi_labelgroup":                      resourceAviLabelGroup(),
 			"avi_seproperties":                    resourceAviSeProperties(),
diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go
index 6cb0419fc..838275052 100644
--- a/avi/resource_avi_rest_dependants.go
+++ b/avi/resource_avi_rest_dependants.go
@@ -1758,6 +1758,11 @@ func ResourceApplicationLogSchema() *schema.Resource {
 				Required:     true,
 				ValidateFunc: validateInteger,
 			},
+			"request_body_updated": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "REQ_BODY_NOT_UPDATED",
+			},
 			"request_content_type": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -2112,6 +2117,36 @@ func ResourceApplicationLogSchema() *schema.Resource {
 	}
 }
 
+func ResourceArchivePolicySchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"source": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"threshold": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
+func ResourceArchiveRulesSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"rules": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceArchivePolicySchema(),
+			},
+		},
+	}
+}
+
 func ResourceAsyncPatchStateSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -6238,6 +6273,18 @@ func ResourceClustifyCheckEventSchema() *schema.Resource {
 	}
 }
 
+func ResourceCollectCustomerFilesSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"files": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceArchivePolicySchema(),
+			},
+		},
+	}
+}
+
 func ResourceCompressionFilterSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -7636,10 +7683,10 @@ func ResourceContentLibConfigSchema() *schema.Resource {
 func ResourceContentRewriteProfileSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
-			"rewritable_content_ref": {
-				Type:     schema.TypeString,
+			"req_rewrite_rules": {
+				Type:     schema.TypeList,
 				Optional: true,
-				Computed: true,
+				Elem:     ResourceReqContentRewriteRuleSchema(),
 			},
 			"rsp_rewrite_rules": {
 				Type:     schema.TypeList,
@@ -12683,6 +12730,12 @@ func ResourceEventDetailsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceSchedulerActionDetailsSchema(),
 			},
+			"se_autoscaler_event_details": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceSeAutoScalerEventDetailsSchema(),
+			},
 			"se_bgp_peer_down_details": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -13079,6 +13132,12 @@ func ResourceEventDetailsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceTechSupportEventSchema(),
 			},
+			"tech_support_event_details": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceTechSupportSchema(),
+			},
 			"tencent_info": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -27463,6 +27522,54 @@ func ResourcePostgresEventInfoSchema() *schema.Resource {
 	}
 }
 
+func ResourcePreChecksInfoSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"check_code": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"description": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"details": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"duration": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"end_time": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"error_details": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"start_time": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"state": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourcePreChecksParamsSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -28093,6 +28200,57 @@ func ResourceRateProfileSchema() *schema.Resource {
 	}
 }
 
+func ResourceReadinessCheckObjSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"checks": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourcePreChecksInfoSchema(),
+			},
+			"checks_completed": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"duration": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"end_time": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"progress": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "0",
+				ValidateFunc: validateInteger,
+			},
+			"start_time": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"state": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"total_checks": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
 func ResourceRebalanceMigrateEventDetailsSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -28385,6 +28543,40 @@ func ResourceReportTaskSchema() *schema.Resource {
 	}
 }
 
+func ResourceReqContentRewriteRuleSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"enable": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateBool,
+			},
+			"index": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"pairs": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceSearchReplacePairSchema(),
+			},
+			"rewritable_content_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceRequestLimiterEventInfoSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -29446,6 +29638,11 @@ func ResourceRspContentRewriteRuleSchema() *schema.Resource {
 				Optional: true,
 				Elem:     ResourceSearchReplacePairSchema(),
 			},
+			"rewritable_content_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -31002,6 +31199,26 @@ func ResourceSeAgentStateCachePropertiesSchema() *schema.Resource {
 	}
 }
 
+func ResourceSeAutoScalerEventDetailsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"actions": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceVipActionSchema(),
+			},
+			"request_source": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"se_group_uuid": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+		},
+	}
+}
+
 func ResourceSeBgpPeerDownDetailsSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -36788,13 +37005,56 @@ func ResourceTcpAttacksSchema() *schema.Resource {
 func ResourceTechSupportEventSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
-			"tech_support_status": {
+			"tech_support": {
 				Type:     schema.TypeSet,
 				Optional: true,
 				Computed: true,
-				Elem:     ResourceTechSupportStatusSchema(),
+				Elem:     ResourceTechSupportSchema(),
 			},
-			"tenant": {
+		},
+	}
+}
+
+func ResourceTechSupportEventMapSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"description": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"details": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"duration": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"end_time": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"start_time": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"status": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"sub_events": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceUpgradeEventSchema(),
+			},
+			"task_name": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
@@ -36803,7 +37063,32 @@ func ResourceTechSupportEventSchema() *schema.Resource {
 	}
 }
 
-func ResourceTechSupportStatusSchema() *schema.Resource {
+func ResourceTechSupportEventParamsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"collect_all_events": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
+			"days": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "2",
+				ValidateFunc: validateInteger,
+			},
+			"files": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "8",
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
+func ResourceTechSupportParamsSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
 			"case_number": {
@@ -36811,20 +37096,21 @@ func ResourceTechSupportStatusSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
-			"duration": {
+			"description": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-			"errors": {
-				Type:     schema.TypeList,
+			"duration": {
+				Type:     schema.TypeString,
 				Optional: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
+				Computed: true,
 			},
-			"key": {
-				Type:     schema.TypeString,
+			"event_params": {
+				Type:     schema.TypeSet,
 				Optional: true,
 				Computed: true,
+				Elem:     ResourceTechSupportEventParamsSchema(),
 			},
 			"level": {
 				Type:     schema.TypeString,
@@ -36836,40 +37122,59 @@ func ResourceTechSupportStatusSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
-			"node": {
+			"pattern": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-			"output": {
+			"skip_warnings": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateBool,
+			},
+			"slug": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-			"size": {
+			"start_timestamp": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-			"start_time": {
+			"tenant": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-			"status": {
+			"uuid": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-			"status_code": {
+		},
+	}
+}
+
+func ResourceTechSupportStateSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"last_changed_time": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceTimeStampSchema(),
+			},
+			"reason": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-			"warnings": {
-				Type:     schema.TypeList,
+			"state": {
+				Type:     schema.TypeString,
 				Optional: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
+				Computed: true,
 			},
 		},
 	}
@@ -39593,6 +39898,77 @@ func ResourceVipSchema() *schema.Resource {
 	}
 }
 
+func ResourceVipActionSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"action": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"from_se": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"new_vcpus": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"se_list": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"status": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"timestamp": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"to_new_se": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateBool,
+			},
+			"to_se": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"vip_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"vip_uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"vs_uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"waiting_for_sibling": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
+		},
+	}
+}
+
 func ResourceVipAutoscaleConfigurationSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -40742,6 +41118,11 @@ func ResourceVsMigrateParamsSchema() *schema.Resource {
 				Computed:     true,
 				ValidateFunc: validateInteger,
 			},
+			"source": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"to_host_ref": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -40909,6 +41290,11 @@ func ResourceVsScaleinParamsSchema() *schema.Resource {
 				Computed:     true,
 				ValidateFunc: validateBool,
 			},
+			"source": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"uuid": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -40938,6 +41324,11 @@ func ResourceVsScaleoutParamsSchema() *schema.Resource {
 				Computed:     true,
 				ValidateFunc: validateInteger,
 			},
+			"source": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"to_host_ref": {
 				Type:     schema.TypeString,
 				Optional: true,
diff --git a/avi/resource_avi_serviceenginegroup.go b/avi/resource_avi_serviceenginegroup.go
index 1e036c87b..99aca6d99 100644
--- a/avi/resource_avi_serviceenginegroup.go
+++ b/avi/resource_avi_serviceenginegroup.go
@@ -96,17 +96,35 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Optional: true,
 			Elem:     &schema.Schema{Type: schema.TypeInt},
 		},
+		"auto_rebalance_cool_down_time": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "15",
+			ValidateFunc: validateInteger,
+		},
 		"auto_rebalance_criteria": {
 			Type:     schema.TypeList,
 			Optional: true,
 			Elem:     &schema.Schema{Type: schema.TypeString},
 		},
+		"auto_rebalance_dry_run_enabled": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
 		"auto_rebalance_interval": {
 			Type:         schema.TypeString,
 			Optional:     true,
 			Default:      "300",
 			ValidateFunc: validateInteger,
 		},
+		"auto_rebalance_raise_events_for_actions": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
 		"auto_redistribute_active_standby_load": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_techsupport.go b/avi/resource_avi_techsupport.go
new file mode 100644
index 000000000..a32746e51
--- /dev/null
+++ b/avi/resource_avi_techsupport.go
@@ -0,0 +1,195 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
+)
+
+func ResourceTechSupportSchema() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"case_number": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"description": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"duration": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Computed:     true,
+			ValidateFunc: validateInteger,
+		},
+		"end_time": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"errors": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     &schema.Schema{Type: schema.TypeString},
+		},
+		"level": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"name": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"node": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"obj_name": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"obj_uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"output": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"params": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceTechSupportParamsSchema(),
+		},
+		"progress": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "0",
+			ValidateFunc: validateInteger,
+		},
+		"size": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Computed:     true,
+			ValidateFunc: validateFloat,
+		},
+		"start_time": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"state": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceTechSupportStateSchema(),
+		},
+		"tasks": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceTechSupportEventMapSchema(),
+		},
+		"tasks_completed": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Computed:     true,
+			ValidateFunc: validateInteger,
+		},
+		"techsupport_readiness": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceReadinessCheckObjSchema(),
+		},
+		"tenant_ref": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"total_tasks": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Computed:     true,
+			ValidateFunc: validateInteger,
+		},
+		"uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"warnings": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     &schema.Schema{Type: schema.TypeString},
+		},
+	}
+}
+
+func resourceAviTechSupport() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAviTechSupportCreate,
+		Read:   ResourceAviTechSupportRead,
+		Update: resourceAviTechSupportUpdate,
+		Delete: resourceAviTechSupportDelete,
+		Schema: ResourceTechSupportSchema(),
+		Importer: &schema.ResourceImporter{
+			State: ResourceTechSupportImporter,
+		},
+	}
+}
+
+func ResourceTechSupportImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
+	s := ResourceTechSupportSchema()
+	return ResourceImporter(d, m, "techsupport", s)
+}
+
+func ResourceAviTechSupportRead(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceTechSupportSchema()
+	err := APIRead(d, meta, "techsupport", s)
+	if err != nil {
+		log.Printf("[ERROR] in reading object %v\n", err)
+	}
+	return err
+}
+
+func resourceAviTechSupportCreate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceTechSupportSchema()
+	err := APICreate(d, meta, "techsupport", s)
+	if err == nil {
+		err = ResourceAviTechSupportRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviTechSupportUpdate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceTechSupportSchema()
+	var err error
+	err = APIUpdate(d, meta, "techsupport", s)
+	if err == nil {
+		err = ResourceAviTechSupportRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviTechSupportDelete(d *schema.ResourceData, meta interface{}) error {
+	var err error
+	if APIDeleteSystemDefaultCheck(d) {
+		return nil
+	}
+	err = APIDelete(d, meta, "techsupport")
+	if err != nil {
+		log.Printf("[ERROR] in deleting object %v\n", err)
+	}
+	return err
+}
diff --git a/avi/resource_avi_techsupportmessage.go b/avi/resource_avi_techsupportmessage.go
new file mode 100644
index 000000000..f1ca1d5c1
--- /dev/null
+++ b/avi/resource_avi_techsupportmessage.go
@@ -0,0 +1,87 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
+)
+
+func ResourceTechSupportMessageSchema() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"status": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"status_code": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+		"tech_support_ref": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+	}
+}
+
+func resourceAviTechSupportMessage() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAviTechSupportMessageCreate,
+		Read:   ResourceAviTechSupportMessageRead,
+		Update: resourceAviTechSupportMessageUpdate,
+		Delete: resourceAviTechSupportMessageDelete,
+		Schema: ResourceTechSupportMessageSchema(),
+		Importer: &schema.ResourceImporter{
+			State: ResourceTechSupportMessageImporter,
+		},
+	}
+}
+
+func ResourceTechSupportMessageImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
+	s := ResourceTechSupportMessageSchema()
+	return ResourceImporter(d, m, "techsupportmessage", s)
+}
+
+func ResourceAviTechSupportMessageRead(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceTechSupportMessageSchema()
+	err := APIRead(d, meta, "techsupportmessage", s)
+	if err != nil {
+		log.Printf("[ERROR] in reading object %v\n", err)
+	}
+	return err
+}
+
+func resourceAviTechSupportMessageCreate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceTechSupportMessageSchema()
+	err := APICreate(d, meta, "techsupportmessage", s)
+	if err == nil {
+		err = ResourceAviTechSupportMessageRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviTechSupportMessageUpdate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceTechSupportMessageSchema()
+	var err error
+	err = APIUpdate(d, meta, "techsupportmessage", s)
+	if err == nil {
+		err = ResourceAviTechSupportMessageRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviTechSupportMessageDelete(d *schema.ResourceData, meta interface{}) error {
+	var err error
+	if APIDeleteSystemDefaultCheck(d) {
+		return nil
+	}
+	err = APIDelete(d, meta, "techsupportmessage")
+	if err != nil {
+		log.Printf("[ERROR] in deleting object %v\n", err)
+	}
+	return err
+}
diff --git a/avi/resource_avi_techsupportprofile.go b/avi/resource_avi_techsupportprofile.go
new file mode 100644
index 000000000..08264d95b
--- /dev/null
+++ b/avi/resource_avi_techsupportprofile.go
@@ -0,0 +1,131 @@
+// Copyright 2019 VMware, Inc.
+// SPDX-License-Identifier: Mozilla Public License 2.0
+
+package avi
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"log"
+)
+
+func ResourceTechSupportProfileSchema() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"archive_rules": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceArchiveRulesSchema(),
+		},
+		"collect_customer_files": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceCollectCustomerFilesSchema(),
+		},
+		"event_params": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceTechSupportEventParamsSchema(),
+		},
+		"file_size_threshold": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "128",
+			ValidateFunc: validateInteger,
+		},
+		"max_disk_size_percent": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "10",
+			ValidateFunc: validateInteger,
+		},
+		"min_free_disk_required": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "5",
+			ValidateFunc: validateInteger,
+		},
+		"no_of_techsupport_retentions": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "1",
+			ValidateFunc: validateInteger,
+		},
+		"simultaneous_invocations": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "1",
+			ValidateFunc: validateInteger,
+		},
+		"task_timeout": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "180",
+			ValidateFunc: validateInteger,
+		},
+		"uuid": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+		},
+	}
+}
+
+func resourceAviTechSupportProfile() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAviTechSupportProfileCreate,
+		Read:   ResourceAviTechSupportProfileRead,
+		Update: resourceAviTechSupportProfileUpdate,
+		Delete: resourceAviTechSupportProfileDelete,
+		Schema: ResourceTechSupportProfileSchema(),
+		Importer: &schema.ResourceImporter{
+			State: ResourceTechSupportProfileImporter,
+		},
+	}
+}
+
+func ResourceTechSupportProfileImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
+	s := ResourceTechSupportProfileSchema()
+	return ResourceImporter(d, m, "techsupportprofile", s)
+}
+
+func ResourceAviTechSupportProfileRead(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceTechSupportProfileSchema()
+	err := APIRead(d, meta, "techsupportprofile", s)
+	if err != nil {
+		log.Printf("[ERROR] in reading object %v\n", err)
+	}
+	return err
+}
+
+func resourceAviTechSupportProfileCreate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceTechSupportProfileSchema()
+	err := APICreate(d, meta, "techsupportprofile", s)
+	if err == nil {
+		err = ResourceAviTechSupportProfileRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviTechSupportProfileUpdate(d *schema.ResourceData, meta interface{}) error {
+	s := ResourceTechSupportProfileSchema()
+	var err error
+	err = APIUpdate(d, meta, "techsupportprofile", s)
+	if err == nil {
+		err = ResourceAviTechSupportProfileRead(d, meta)
+	}
+	return err
+}
+
+func resourceAviTechSupportProfileDelete(d *schema.ResourceData, meta interface{}) error {
+	var err error
+	if APIDeleteSystemDefaultCheck(d) {
+		return nil
+	}
+	err = APIDelete(d, meta, "techsupportprofile")
+	if err != nil {
+		log.Printf("[ERROR] in deleting object %v\n", err)
+	}
+	return err
+}
diff --git a/website/avi.erb b/website/avi.erb
index 345da9da4..e0cceaf4d 100644
--- a/website/avi.erb
+++ b/website/avi.erb
@@ -352,6 +352,15 @@
             </li>
                       <li<%= sidebar_current("docs-avi-dynamicdnsrecord") %>>
               <a href="/docs/providers/avi/d/avi_dynamicdnsrecord.html">DynamicDnsRecord</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-techsupportmessage") %>>
+              <a href="/docs/providers/avi/d/avi_techsupportmessage.html">TechSupportMessage</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-techsupportprofile") %>>
+              <a href="/docs/providers/avi/d/avi_techsupportprofile.html">TechSupportProfile</a>
+            </li>
+                      <li<%= sidebar_current("docs-avi-techsupport") %>>
+              <a href="/docs/providers/avi/d/avi_techsupport.html">TechSupport</a>
             </li>
                       <li<%= sidebar_current("docs-avi-albservicesfiledownload") %>>
               <a href="/docs/providers/avi/d/avi_albservicesfiledownload.html">ALBServicesFileDownload</a>
@@ -736,6 +745,15 @@
             </li>
 		              <li<%= sidebar_current("docs-avi-dynamicdnsrecord") %>>
               <a href="/docs/providers/avi/r/avi_dynamicdnsrecord.html">DynamicDnsRecord</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-techsupportmessage") %>>
+              <a href="/docs/providers/avi/r/avi_techsupportmessage.html">TechSupportMessage</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-techsupportprofile") %>>
+              <a href="/docs/providers/avi/r/avi_techsupportprofile.html">TechSupportProfile</a>
+            </li>
+		              <li<%= sidebar_current("docs-avi-techsupport") %>>
+              <a href="/docs/providers/avi/r/avi_techsupport.html">TechSupport</a>
             </li>
 		              <li<%= sidebar_current("docs-avi-albservicesfiledownload") %>>
               <a href="/docs/providers/avi/r/avi_albservicesfiledownload.html">ALBServicesFileDownload</a>
diff --git a/website/docs/d/avi_serviceenginegroup.html.markdown b/website/docs/d/avi_serviceenginegroup.html.markdown
index 068b049c5..0855c54e4 100644
--- a/website/docs/d/avi_serviceenginegroup.html.markdown
+++ b/website/docs/d/avi_serviceenginegroup.html.markdown
@@ -48,8 +48,11 @@ In addition to all arguments above, the following attributes are exported:
 * `async_ssl_threads` - Number of async ssl threads per se_dp.requires se reboot. Allowed values are 1-16. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `auto_rebalance` - If set, virtual services will be automatically migrated when load on an se is less than minimum or more than maximum thresholds. Only alerts are generated when the auto_rebalance is not set. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
 * `auto_rebalance_capacity_per_se` - Capacities of se for auto rebalance for each criteria. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_rebalance_cool_down_time` - The time in minutes controller waits before rebalancing the vs again after a scalein/scaleout. Field introduced in 31.2.1. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `auto_rebalance_criteria` - Set of criteria for se auto rebalance. Enum options - SE_AUTO_REBALANCE_CPU, SE_AUTO_REBALANCE_PPS, SE_AUTO_REBALANCE_MBPS, SE_AUTO_REBALANCE_OPEN_CONNS, SE_AUTO_REBALANCE_CPS. Field introduced in 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_rebalance_dry_run_enabled` - If enabled, the controller will not perform the rebalance actions.it will only generate the actions and update that in the debug api.this is useful for testing the rebalance logic without actually performing the actions. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `auto_rebalance_interval` - Frequency of rebalance, if 'auto rebalance' is enabled. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_rebalance_raise_events_for_actions` - If enabled, the controller will raise events for rebalance actions. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `auto_redistribute_active_standby_load` - Redistribution of virtual services from the takeover se to the replacement se can cause momentary traffic loss. If the auto-redistribute load option is left in its default off state, any desired rebalancing requires calls to rest api. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
 * `availability_zone_refs` - Availability zones for virtual service high availability. It is a reference to an object of type availabilityzone. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `baremetal_dispatcher_handles_flows` - Control if dispatcher core also handles tcp flows in baremetal se. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_techsupport.html.markdown b/website/docs/d/avi_techsupport.html.markdown
new file mode 100644
index 000000000..d2ffcc4a9
--- /dev/null
+++ b/website/docs/d/avi_techsupport.html.markdown
@@ -0,0 +1,58 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "AVI: avi_techsupport"
+sidebar_current: "docs-avi-datasource-techsupport"
+description: |-
+  Get information of Avi TechSupport.
+---
+
+# avi_techsupport
+
+This data source is used to to get avi_techsupport objects.
+
+## Example Usage
+
+```hcl
+data "avi_techsupport" "foo_techsupport" {
+    uuid = "techsupport-f9cf6b3e-a411-436f-95e2-2982ba2b217b"
+    name = "foo"
+}
+```
+
+## Argument Reference
+
+* `name` - (Optional) Search TechSupport by name.
+* `uuid` - (Optional) Search TechSupport by uuid.
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `case_number` - 'customer case number for which this tech-upport is generated. ''useful for connected portal and other use-cases.'. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - User provided description to capture additional details and context regarding the tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `duration` - Total time taken for tech-support collection. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `end_time` - End timestamp of tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `errors` - Error logged during tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `level` - Name of the tech-support level. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `node` - Cluster member node on which the tech-support tarball bundle is saved. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_name` - Object name if one exists. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_uuid` - Tech-support collection object uuid specified for different objects such as se/vs/pool etc. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `output` - Tech-support collection output file path. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `params` - Tech-support params associated with latest tech-support collection.user passed params will have more preference. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `progress` - Tech-support collection progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `size` - Size of collected tech-support tarball. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `start_time` - Start timestamp of tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `state` - State of current/last tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks` - Events performed for tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks_completed` - Completed set of tasks in the tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `techsupport_readiness` - Techsupport readiness checks execution details. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant uuid associated with the tech-support. It is a reference to an object of type tenant. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `total_tasks` - Total number of tasks in the tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid identifier for the tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `warnings` - Warning logged during tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/d/avi_techsupportmessage.html.markdown b/website/docs/d/avi_techsupportmessage.html.markdown
new file mode 100644
index 000000000..6a6ef4af7
--- /dev/null
+++ b/website/docs/d/avi_techsupportmessage.html.markdown
@@ -0,0 +1,38 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "AVI: avi_techsupportmessage"
+sidebar_current: "docs-avi-datasource-techsupportmessage"
+description: |-
+  Get information of Avi TechSupportMessage.
+---
+
+# avi_techsupportmessage
+
+This data source is used to to get avi_techsupportmessage objects.
+
+## Example Usage
+
+```hcl
+data "avi_techsupportmessage" "foo_techsupportmessage" {
+    uuid = "techsupportmessage-f9cf6b3e-a411-436f-95e2-2982ba2b217b"
+    name = "foo"
+}
+```
+
+## Argument Reference
+
+* `name` - (Optional) Search TechSupportMessage by name.
+* `uuid` - (Optional) Search TechSupportMessage by uuid.
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `status` - 'tech-support status for the current invocation.'. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `status_code` - 'tech-support status code for the current invocation.'. 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_FAILED... Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tech_support_ref` - 'tech-support object ref.'. It is a reference to an object of type techsupport. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/d/avi_techsupportprofile.html.markdown b/website/docs/d/avi_techsupportprofile.html.markdown
new file mode 100644
index 000000000..2c9f4b0fc
--- /dev/null
+++ b/website/docs/d/avi_techsupportprofile.html.markdown
@@ -0,0 +1,45 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "AVI: avi_techsupportprofile"
+sidebar_current: "docs-avi-datasource-techsupportprofile"
+description: |-
+  Get information of Avi TechSupportProfile.
+---
+
+# avi_techsupportprofile
+
+This data source is used to to get avi_techsupportprofile objects.
+
+## Example Usage
+
+```hcl
+data "avi_techsupportprofile" "foo_techsupportprofile" {
+    uuid = "techsupportprofile-f9cf6b3e-a411-436f-95e2-2982ba2b217b"
+    name = "foo"
+}
+```
+
+## Argument Reference
+
+* `name` - (Optional) Search TechSupportProfile by name.
+* `uuid` - (Optional) Search TechSupportProfile by uuid.
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `archive_rules` - Defined policy for tech-support archive rules.these are predefined files which are exception for default file size thresholduser can add file path with custom threshold in allowed limits to be collected in bundlee.g. A file /var/sample.log is with size 450mb needs to be collected for each invocationuser should configure and add path in techsupportprofile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `collect_customer_files` - A list of user-specified file paths for collectionthat are not part of the predefined yaml configuration. This is useful forcollecting logs from third-party applications or other custom files.e.g. A file located at /var/sample.log which is not a part of pre-define yamluser should configure this path as source in collect_customer_files so that subsequent collectioncollect this file, once user no longer needed this file they can remove from techsupportprofile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `event_params` - Specify this params to set threshold for event files.user provided parameters will take precedence over the profile parameters. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `file_size_threshold` - Max file size threshold to archive in tech-support collectionfiles above this threshold will not be collected and an warning will be flagged. Allowed values are 128-512. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `max_disk_size_percent` - Max disk size in percent of total disk size reserved for the tech-support.the value is in percentage to make it agnostic of controller flavors.e.g. Small [disk=5 gb, ts space available = 500mb]large [ disk= 100gb, ts space available= 10gb]xl [disk=1tb, ts space available=100gb]. Allowed values are 10-25. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `min_free_disk_required` - Min free disk required for the tech-support invocation.the value is in percentage to make it agnostic of controller flavors.e.g. Small [disk=5 gb, ts space available = 250mb]large [ disk= 100gb, ts space available= 5gb]xl [disk=1tb, ts space available=50gb]. Allowed values are 5-10. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `no_of_techsupport_retentions` - Number of techsupport to retain from techsupport cleanup policy. Allowed values are 1-5. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `simultaneous_invocations` - Number of simultaneous tech-support invocation allowed. Allowed values are 1-2. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `task_timeout` - Generic timeout for tech-support task collection.this can be used for task, script executions etc.tweak the timeout value in cases of timeout observation in the logs. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid identifier for the tech-support profile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/r/avi_serviceenginegroup.html.markdown b/website/docs/r/avi_serviceenginegroup.html.markdown
index edc3e50ad..44a2966d3 100644
--- a/website/docs/r/avi_serviceenginegroup.html.markdown
+++ b/website/docs/r/avi_serviceenginegroup.html.markdown
@@ -42,8 +42,11 @@ The following arguments are supported:
 * `async_ssl_threads` - (Optional) Number of async ssl threads per se_dp.requires se reboot. Allowed values are 1-16. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `auto_rebalance` - (Optional) If set, virtual services will be automatically migrated when load on an se is less than minimum or more than maximum thresholds. Only alerts are generated when the auto_rebalance is not set. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
 * `auto_rebalance_capacity_per_se` - (Optional) Capacities of se for auto rebalance for each criteria. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_rebalance_cool_down_time` - (Optional) The time in minutes controller waits before rebalancing the vs again after a scalein/scaleout. Field introduced in 31.2.1. Unit is min. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `auto_rebalance_criteria` - (Optional) Set of criteria for se auto rebalance. Enum options - SE_AUTO_REBALANCE_CPU, SE_AUTO_REBALANCE_PPS, SE_AUTO_REBALANCE_MBPS, SE_AUTO_REBALANCE_OPEN_CONNS, SE_AUTO_REBALANCE_CPS. Field introduced in 17.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_rebalance_dry_run_enabled` - (Optional) If enabled, the controller will not perform the rebalance actions.it will only generate the actions and update that in the debug api.this is useful for testing the rebalance logic without actually performing the actions. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `auto_rebalance_interval` - (Optional) Frequency of rebalance, if 'auto rebalance' is enabled. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_rebalance_raise_events_for_actions` - (Optional) If enabled, the controller will raise events for rebalance actions. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `auto_redistribute_active_standby_load` - (Optional) Redistribution of virtual services from the takeover se to the replacement se can cause momentary traffic loss. If the auto-redistribute load option is left in its default off state, any desired rebalancing requires calls to rest api. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
 * `availability_zone_refs` - (Optional) Availability zones for virtual service high availability. It is a reference to an object of type availabilityzone. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `baremetal_dispatcher_handles_flows` - (Optional) Control if dispatcher core also handles tcp flows in baremetal se. Field introduced in 21.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_techsupport.html.markdown b/website/docs/r/avi_techsupport.html.markdown
new file mode 100644
index 000000000..2db47f642
--- /dev/null
+++ b/website/docs/r/avi_techsupport.html.markdown
@@ -0,0 +1,67 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "Avi: avi_techsupport"
+sidebar_current: "docs-avi-resource-techsupport"
+description: |-
+  Creates and manages Avi TechSupport.
+---
+
+# avi_techsupport
+
+The TechSupport resource allows the creation and management of Avi TechSupport
+
+## Example Usage
+
+```hcl
+resource "avi_techsupport" "foo" {
+    name = "terraform-example-foo"
+    tenant_ref = "/api/tenant/?name=admin"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `case_number` - (Optional) 'customer case number for which this tech-upport is generated. ''useful for connected portal and other use-cases.'. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - (Optional) User provided description to capture additional details and context regarding the tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `duration` - (Optional) Total time taken for tech-support collection. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `end_time` - (Optional) End timestamp of tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `errors` - (Optional) Error logged during tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `level` - (Optional) Name of the tech-support level. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Optional) Name of tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `node` - (Optional) Cluster member node on which the tech-support tarball bundle is saved. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_name` - (Optional) Object name if one exists. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_uuid` - (Optional) Tech-support collection object uuid specified for different objects such as se/vs/pool etc. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `output` - (Optional) Tech-support collection output file path. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `params` - (Optional) Tech-support params associated with latest tech-support collection.user passed params will have more preference. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `progress` - (Optional) Tech-support collection progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `size` - (Optional) Size of collected tech-support tarball. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `start_time` - (Optional) Start timestamp of tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `state` - (Optional) State of current/last tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks` - (Optional) Events performed for tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks_completed` - (Optional) Completed set of tasks in the tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `techsupport_readiness` - (Optional) Techsupport readiness checks execution details. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant uuid associated with the tech-support. It is a reference to an object of type tenant. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `total_tasks` - (Optional) Total number of tasks in the tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `warnings` - (Optional) Warning logged during tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
+
+### Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:
+
+* `create` - (Defaults to 40 mins) Used when creating the AMI
+* `update` - (Defaults to 40 mins) Used when updating the AMI
+* `delete` - (Defaults to 90 mins) Used when deregistering the AMI
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `uuid` -  Uuid identifier for the tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
diff --git a/website/docs/r/avi_techsupportmessage.html.markdown b/website/docs/r/avi_techsupportmessage.html.markdown
new file mode 100644
index 000000000..5b4f26317
--- /dev/null
+++ b/website/docs/r/avi_techsupportmessage.html.markdown
@@ -0,0 +1,47 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "Avi: avi_techsupportmessage"
+sidebar_current: "docs-avi-resource-techsupportmessage"
+description: |-
+  Creates and manages Avi TechSupportMessage.
+---
+
+# avi_techsupportmessage
+
+The TechSupportMessage resource allows the creation and management of Avi TechSupportMessage
+
+## Example Usage
+
+```hcl
+resource "avi_techsupportmessage" "foo" {
+    name = "terraform-example-foo"
+    tenant_ref = "/api/tenant/?name=admin"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `status` - (Optional) 'tech-support status for the current invocation.'. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `status_code` - (Optional) 'tech-support status code for the current invocation.'. 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_FAILED... Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tech_support_ref` - (Optional) 'tech-support object ref.'. It is a reference to an object of type techsupport. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+
+
+### Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:
+
+* `create` - (Defaults to 40 mins) Used when creating the AMI
+* `update` - (Defaults to 40 mins) Used when updating the AMI
+* `delete` - (Defaults to 90 mins) Used when deregistering the AMI
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+
diff --git a/website/docs/r/avi_techsupportprofile.html.markdown b/website/docs/r/avi_techsupportprofile.html.markdown
new file mode 100644
index 000000000..8a0670ad8
--- /dev/null
+++ b/website/docs/r/avi_techsupportprofile.html.markdown
@@ -0,0 +1,54 @@
+<!--
+    Copyright 2021 VMware, Inc.
+    SPDX-License-Identifier: Mozilla Public License 2.0
+-->
+---
+layout: "avi"
+page_title: "Avi: avi_techsupportprofile"
+sidebar_current: "docs-avi-resource-techsupportprofile"
+description: |-
+  Creates and manages Avi TechSupportProfile.
+---
+
+# avi_techsupportprofile
+
+The TechSupportProfile resource allows the creation and management of Avi TechSupportProfile
+
+## Example Usage
+
+```hcl
+resource "avi_techsupportprofile" "foo" {
+    name = "terraform-example-foo"
+    tenant_ref = "/api/tenant/?name=admin"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `archive_rules` - (Optional) Defined policy for tech-support archive rules.these are predefined files which are exception for default file size thresholduser can add file path with custom threshold in allowed limits to be collected in bundlee.g. A file /var/sample.log is with size 450mb needs to be collected for each invocationuser should configure and add path in techsupportprofile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `collect_customer_files` - (Optional) A list of user-specified file paths for collectionthat are not part of the predefined yaml configuration. This is useful forcollecting logs from third-party applications or other custom files.e.g. A file located at /var/sample.log which is not a part of pre-define yamluser should configure this path as source in collect_customer_files so that subsequent collectioncollect this file, once user no longer needed this file they can remove from techsupportprofile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `event_params` - (Optional) Specify this params to set threshold for event files.user provided parameters will take precedence over the profile parameters. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `file_size_threshold` - (Optional) Max file size threshold to archive in tech-support collectionfiles above this threshold will not be collected and an warning will be flagged. Allowed values are 128-512. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `max_disk_size_percent` - (Optional) Max disk size in percent of total disk size reserved for the tech-support.the value is in percentage to make it agnostic of controller flavors.e.g. Small [disk=5 gb, ts space available = 500mb]large [ disk= 100gb, ts space available= 10gb]xl [disk=1tb, ts space available=100gb]. Allowed values are 10-25. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `min_free_disk_required` - (Optional) Min free disk required for the tech-support invocation.the value is in percentage to make it agnostic of controller flavors.e.g. Small [disk=5 gb, ts space available = 250mb]large [ disk= 100gb, ts space available= 5gb]xl [disk=1tb, ts space available=50gb]. Allowed values are 5-10. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `no_of_techsupport_retentions` - (Optional) Number of techsupport to retain from techsupport cleanup policy. Allowed values are 1-5. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `simultaneous_invocations` - (Optional) Number of simultaneous tech-support invocation allowed. Allowed values are 1-2. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `task_timeout` - (Optional) Generic timeout for tech-support task collection.this can be used for task, script executions etc.tweak the timeout value in cases of timeout observation in the logs. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+
+
+### Timeouts
+
+The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/docs/configuration/resources.html#timeouts) for certain actions:
+
+* `create` - (Defaults to 40 mins) Used when creating the AMI
+* `update` - (Defaults to 40 mins) Used when updating the AMI
+* `delete` - (Defaults to 90 mins) Used when deregistering the AMI
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `uuid` -  Uuid identifier for the tech-support profile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+

From 2ea71643d8a6600c75de7ff12d7b1ca7f51af8a0 Mon Sep 17 00:00:00 2001
From: avijenkins <gurunath-reddy.kambala@broadcom.com>
Date: Tue, 22 Jul 2025 09:08:48 +0000
Subject: [PATCH 09/12] Updated assets for terraform

Signed-off-by: avijenkins <gurunath-reddy.kambala@broadcom.com>
---
 avi/datasource_avi_webapput.go            |  8 ++++----
 avi/resource_avi_rest_dependants.go       |  4 ++--
 avi/resource_avi_techsupportprofile.go    |  2 +-
 avi/resource_avi_webapput.go              | 16 ++++++++--------
 website/docs/d/avi_webapput.html.markdown |  4 ++--
 website/docs/r/avi_webapput.html.markdown |  4 ++--
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/avi/datasource_avi_webapput.go b/avi/datasource_avi_webapput.go
index e670f75d4..d71982729 100644
--- a/avi/datasource_avi_webapput.go
+++ b/avi/datasource_avi_webapput.go
@@ -19,19 +19,19 @@ func dataSourceAviWebappUT() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceConfigPbAttributesSchema(),
 			},
-			"default_first_int": {
+			"default_fifth_int": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"default_second_int": {
+			"default_first_int": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"default_string": {
+			"default_fourth_int": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"default_third_int": {
+			"default_string": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go
index 838275052..3be33ba3b 100644
--- a/avi/resource_avi_rest_dependants.go
+++ b/avi/resource_avi_rest_dependants.go
@@ -2120,7 +2120,7 @@ func ResourceApplicationLogSchema() *schema.Resource {
 func ResourceArchivePolicySchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
-			"source": {
+			"file_path": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
@@ -2128,7 +2128,7 @@ func ResourceArchivePolicySchema() *schema.Resource {
 			"threshold": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Computed:     true,
+				Default:      "128",
 				ValidateFunc: validateInteger,
 			},
 		},
diff --git a/avi/resource_avi_techsupportprofile.go b/avi/resource_avi_techsupportprofile.go
index 08264d95b..5aa691b28 100644
--- a/avi/resource_avi_techsupportprofile.go
+++ b/avi/resource_avi_techsupportprofile.go
@@ -49,7 +49,7 @@ func ResourceTechSupportProfileSchema() map[string]*schema.Schema {
 		"no_of_techsupport_retentions": {
 			Type:         schema.TypeString,
 			Optional:     true,
-			Default:      "1",
+			Default:      "4",
 			ValidateFunc: validateInteger,
 		},
 		"simultaneous_invocations": {
diff --git a/avi/resource_avi_webapput.go b/avi/resource_avi_webapput.go
index 6f2b5a435..196e7c3bf 100644
--- a/avi/resource_avi_webapput.go
+++ b/avi/resource_avi_webapput.go
@@ -21,16 +21,22 @@ func ResourceWebappUTSchema() map[string]*schema.Schema {
 			Computed: true,
 			Elem:     ResourceConfigPbAttributesSchema(),
 		},
+		"default_fifth_int": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "5",
+			ValidateFunc: validateInteger,
+		},
 		"default_first_int": {
 			Type:         schema.TypeString,
 			Optional:     true,
 			Default:      "1",
 			ValidateFunc: validateInteger,
 		},
-		"default_second_int": {
+		"default_fourth_int": {
 			Type:         schema.TypeString,
 			Optional:     true,
-			Default:      "2",
+			Default:      "4",
 			ValidateFunc: validateInteger,
 		},
 		"default_string": {
@@ -38,12 +44,6 @@ func ResourceWebappUTSchema() map[string]*schema.Schema {
 			Optional: true,
 			Default:  "default string",
 		},
-		"default_third_int": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "3",
-			ValidateFunc: validateInteger,
-		},
 		"mandatory_test": {
 			Type:     schema.TypeSet,
 			Optional: true,
diff --git a/website/docs/d/avi_webapput.html.markdown b/website/docs/d/avi_webapput.html.markdown
index 7a53cf923..bfcd2ba5a 100644
--- a/website/docs/d/avi_webapput.html.markdown
+++ b/website/docs/d/avi_webapput.html.markdown
@@ -36,10 +36,10 @@ In addition to all arguments above, the following attributes are exported:
 
 * `cloud_ref` - Cloud of the webapput object-level0. It is a reference to an object of type cloud. Field introduced in 30.2.2. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `default_fifth_int` - Default int32 field. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `default_first_int` - Default uint64 field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `default_second_int` - Default int64 field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `default_fourth_int` - Default int32 field. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `default_string` - Default string field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `default_third_int` - Default int32 field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `mandatory_test` - Optional message for nested f_mandatory test cases defined at level1. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `mandatory_tests` - Repeated message for nested f_mandatory test cases-level1. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `name` - Name of the webapput object-level0. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_webapput.html.markdown b/website/docs/r/avi_webapput.html.markdown
index aae917857..583c24af4 100644
--- a/website/docs/r/avi_webapput.html.markdown
+++ b/website/docs/r/avi_webapput.html.markdown
@@ -30,10 +30,10 @@ The following arguments are supported:
 * `name` - (Required) Name of the webapput object-level0. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `cloud_ref` - (Optional) Cloud of the webapput object-level0. It is a reference to an object of type cloud. Field introduced in 30.2.2. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `default_fifth_int` - (Optional) Default int32 field. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `default_first_int` - (Optional) Default uint64 field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `default_second_int` - (Optional) Default int64 field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `default_fourth_int` - (Optional) Default int32 field. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `default_string` - (Optional) Default string field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `default_third_int` - (Optional) Default int32 field. Field introduced in 30.1.2. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `mandatory_test` - (Optional) Optional message for nested f_mandatory test cases defined at level1. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `mandatory_tests` - (Optional) Repeated message for nested f_mandatory test cases-level1. Field introduced in 21.1.5, 22.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `sensitive_test` - (Optional) Optional message for nested f_sensitive test cases defined at level1. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.

From cd0a9e5e4ba556a2636705529579d7a395641ca2 Mon Sep 17 00:00:00 2001
From: avijenkins <gurunath-reddy.kambala@broadcom.com>
Date: Thu, 24 Jul 2025 09:07:55 +0000
Subject: [PATCH 10/12] Updated assets for terraform

Signed-off-by: avijenkins <gurunath-reddy.kambala@broadcom.com>
---
 avi/datasource_avi_availabilityzone.go        |   9 +-
 avi/datasource_avi_licenseledgerdetails.go    |  14 +++
 avi/datasource_avi_serviceenginegroup.go      |   9 +-
 avi/datasource_avi_systemconfiguration.go     |   9 ++
 avi/resource_avi_availabilityzone.go          |  10 +-
 avi/resource_avi_licenseledgerdetails.go      |  16 +++
 avi/resource_avi_rest_dependants.go           | 101 +++++++++++++++---
 avi/resource_avi_serviceenginegroup.go        |  12 +--
 avi/resource_avi_systemconfiguration.go       |  12 +++
 .../docs/d/avi_availabilityzone.html.markdown |   3 +-
 .../d/avi_licenseledgerdetails.html.markdown  |   3 +
 .../d/avi_serviceenginegroup.html.markdown    |   2 +-
 .../d/avi_systemconfiguration.html.markdown   |   2 +
 .../docs/r/avi_availabilityzone.html.markdown |   3 +-
 .../r/avi_licenseledgerdetails.html.markdown  |   3 +
 .../r/avi_serviceenginegroup.html.markdown    |   2 +-
 .../r/avi_systemconfiguration.html.markdown   |   2 +
 17 files changed, 181 insertions(+), 31 deletions(-)

diff --git a/avi/datasource_avi_availabilityzone.go b/avi/datasource_avi_availabilityzone.go
index 432a3432a..25b8bb099 100644
--- a/avi/datasource_avi_availabilityzone.go
+++ b/avi/datasource_avi_availabilityzone.go
@@ -14,11 +14,16 @@ func dataSourceAviAvailabilityZone() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceAZClusterSchema(),
 			},
-			"az_datastore": {
-				Type:     schema.TypeSet,
+			"az_datastores": {
+				Type:     schema.TypeList,
 				Computed: true,
 				Elem:     ResourceAZDatastoreSchema(),
 			},
+			"az_hosts": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceAZHostSchema(),
+			},
 			"cloud_ref": {
 				Type:     schema.TypeString,
 				Optional: true,
diff --git a/avi/datasource_avi_licenseledgerdetails.go b/avi/datasource_avi_licenseledgerdetails.go
index c1fb940cc..6bb9ceb4e 100644
--- a/avi/datasource_avi_licenseledgerdetails.go
+++ b/avi/datasource_avi_licenseledgerdetails.go
@@ -14,16 +14,30 @@ func dataSourceAviLicenseLedgerDetails() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceLicenseInfoSchema(),
 			},
+			"se_group_infos": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceSeGroupInfoSchema(),
+			},
 			"se_infos": {
 				Type:     schema.TypeList,
 				Computed: true,
 				Elem:     ResourceLicenseInfoSchema(),
 			},
+			"tenant_infos": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceLicenseReservationInfoSchema(),
+			},
 			"tier_usages": {
 				Type:     schema.TypeList,
 				Computed: true,
 				Elem:     ResourceLicenseTierUsageSchema(),
 			},
+			"total_licenses_reserved": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"uuid": {
 				Type:     schema.TypeString,
 				Optional: true,
diff --git a/avi/datasource_avi_serviceenginegroup.go b/avi/datasource_avi_serviceenginegroup.go
index 6d1cd76d3..e79651c63 100644
--- a/avi/datasource_avi_serviceenginegroup.go
+++ b/avi/datasource_avi_serviceenginegroup.go
@@ -297,10 +297,6 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"enable_quantum_entropy": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"ephemeral_portrange_end": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -454,6 +450,11 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"license_quota": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceQuotaConfigSchema(),
+			},
 			"license_tier": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_systemconfiguration.go b/avi/datasource_avi_systemconfiguration.go
index 3e519abe9..a5220e19f 100644
--- a/avi/datasource_avi_systemconfiguration.go
+++ b/avi/datasource_avi_systemconfiguration.go
@@ -63,6 +63,10 @@ func dataSourceAviSystemConfiguration() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"enable_license_quota": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"fips_mode": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -84,6 +88,11 @@ func dataSourceAviSystemConfiguration() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"license_quota": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceQuotaConfigSchema(),
+			},
 			"linux_configuration": {
 				Type:     schema.TypeSet,
 				Computed: true,
diff --git a/avi/resource_avi_availabilityzone.go b/avi/resource_avi_availabilityzone.go
index b1610d468..88da239f4 100644
--- a/avi/resource_avi_availabilityzone.go
+++ b/avi/resource_avi_availabilityzone.go
@@ -15,12 +15,16 @@ func ResourceAvailabilityZoneSchema() map[string]*schema.Schema {
 			Optional: true,
 			Elem:     ResourceAZClusterSchema(),
 		},
-		"az_datastore": {
-			Type:     schema.TypeSet,
+		"az_datastores": {
+			Type:     schema.TypeList,
 			Optional: true,
-			Computed: true,
 			Elem:     ResourceAZDatastoreSchema(),
 		},
+		"az_hosts": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceAZHostSchema(),
+		},
 		"cloud_ref": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_licenseledgerdetails.go b/avi/resource_avi_licenseledgerdetails.go
index bfe79fa65..b2f197c63 100644
--- a/avi/resource_avi_licenseledgerdetails.go
+++ b/avi/resource_avi_licenseledgerdetails.go
@@ -15,16 +15,32 @@ func ResourceLicenseLedgerDetailsSchema() map[string]*schema.Schema {
 			Optional: true,
 			Elem:     ResourceLicenseInfoSchema(),
 		},
+		"se_group_infos": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceSeGroupInfoSchema(),
+		},
 		"se_infos": {
 			Type:     schema.TypeList,
 			Optional: true,
 			Elem:     ResourceLicenseInfoSchema(),
 		},
+		"tenant_infos": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceLicenseReservationInfoSchema(),
+		},
 		"tier_usages": {
 			Type:     schema.TypeList,
 			Optional: true,
 			Elem:     ResourceLicenseTierUsageSchema(),
 		},
+		"total_licenses_reserved": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Computed:     true,
+			ValidateFunc: validateInteger,
+		},
 		"uuid": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go
index 3be33ba3b..0a182f586 100644
--- a/avi/resource_avi_rest_dependants.go
+++ b/avi/resource_avi_rest_dependants.go
@@ -500,6 +500,28 @@ func ResourceAZDatastoreSchema() *schema.Resource {
 				Default:      "false",
 				ValidateFunc: validateBool,
 			},
+			"vcenter_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func ResourceAZHostSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"host_ids": {
+				Type:     schema.TypeList,
+				Required: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"vcenter_ref": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -21446,6 +21468,24 @@ func ResourceLicenseInfoSchema() *schema.Resource {
 	}
 }
 
+func ResourceLicenseReservationInfoSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"reserved": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
+			"uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceLicenseServiceUpdateSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -27829,6 +27869,25 @@ func ResourceQueryMatchSchema() *schema.Resource {
 	}
 }
 
+func ResourceQuotaConfigSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"limit": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "-1",
+				ValidateFunc: validateInteger,
+			},
+			"reservation": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "0",
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
 func ResourceRancherConfigurationSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -30437,18 +30496,6 @@ func ResourceSaasLicensingInfoSchema() *schema.Resource {
 				Default:      "true",
 				ValidateFunc: validateBool,
 			},
-			"max_service_units": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				Default:      "0",
-				ValidateFunc: validateFloat,
-			},
-			"reserve_service_units": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				Default:      "0",
-				ValidateFunc: validateFloat,
-			},
 		},
 	}
 }
@@ -31653,6 +31700,30 @@ func ResourceSeGroupAnalyticsPolicySchema() *schema.Resource {
 	}
 }
 
+func ResourceSeGroupInfoSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"consumed": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateFloat,
+			},
+			"escrow": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateFloat,
+			},
+			"uuid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
 func ResourceSeGroupOptionsSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -37201,6 +37272,12 @@ func ResourceTelemetryConfigurationSchema() *schema.Resource {
 func ResourceTenantConfigurationSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
+			"license_quota": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceQuotaConfigSchema(),
+			},
 			"se_in_provider_context": {
 				Type:         schema.TypeString,
 				Optional:     true,
diff --git a/avi/resource_avi_serviceenginegroup.go b/avi/resource_avi_serviceenginegroup.go
index 99aca6d99..52f94d5e2 100644
--- a/avi/resource_avi_serviceenginegroup.go
+++ b/avi/resource_avi_serviceenginegroup.go
@@ -424,12 +424,6 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Default:      "false",
 			ValidateFunc: validateBool,
 		},
-		"enable_quantum_entropy": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "false",
-			ValidateFunc: validateBool,
-		},
 		"ephemeral_portrange_end": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -641,6 +635,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Default:      "true",
 			ValidateFunc: validateBool,
 		},
+		"license_quota": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceQuotaConfigSchema(),
+		},
 		"license_tier": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_systemconfiguration.go b/avi/resource_avi_systemconfiguration.go
index fdcdccfb3..1ce4457f9 100644
--- a/avi/resource_avi_systemconfiguration.go
+++ b/avi/resource_avi_systemconfiguration.go
@@ -81,6 +81,12 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema {
 			Default:      "false",
 			ValidateFunc: validateBool,
 		},
+		"enable_license_quota": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "true",
+			ValidateFunc: validateBool,
+		},
 		"fips_mode": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -109,6 +115,12 @@ func ResourceSystemConfigurationSchema() map[string]*schema.Schema {
 			Default:      "false",
 			ValidateFunc: validateBool,
 		},
+		"license_quota": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceQuotaConfigSchema(),
+		},
 		"linux_configuration": {
 			Type:     schema.TypeSet,
 			Optional: true,
diff --git a/website/docs/d/avi_availabilityzone.html.markdown b/website/docs/d/avi_availabilityzone.html.markdown
index 604f87ae9..ec8b59877 100644
--- a/website/docs/d/avi_availabilityzone.html.markdown
+++ b/website/docs/d/avi_availabilityzone.html.markdown
@@ -35,7 +35,8 @@ data "avi_availabilityzone" "foo_availabilityzone" {
 In addition to all arguments above, the following attributes are exported:
 
 * `az_clusters` - Group of clusters belongs to the az. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `az_datastore` - Datastores associated with the az. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `az_datastores` - Group of datastores associated with the az. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `az_hosts` - Group of hosts associated with the az. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `cloud_ref` - Availability zone belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `name` - Availabilty zone where vcenter list belongs to. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_licenseledgerdetails.html.markdown b/website/docs/d/avi_licenseledgerdetails.html.markdown
index 80cd7c0c5..b87ce1ac9 100644
--- a/website/docs/d/avi_licenseledgerdetails.html.markdown
+++ b/website/docs/d/avi_licenseledgerdetails.html.markdown
@@ -33,7 +33,10 @@ data "avi_licenseledgerdetails" "foo_licenseledgerdetails" {
 In addition to all arguments above, the following attributes are exported:
 
 * `escrow_infos` - Maintain information about reservation against cookie. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_group_infos` - Maintain information about se group. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `se_infos` - Maintain information about consumed licenses against se_uuid. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_infos` - Maintain information about tenant. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `tier_usages` - License usage per tier. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `total_licenses_reserved` - Total of max licenses reserved as per quota config of tenant/segroup. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `uuid` - Uuid for reference. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_serviceenginegroup.html.markdown b/website/docs/d/avi_serviceenginegroup.html.markdown
index 0855c54e4..3ce3c040e 100644
--- a/website/docs/d/avi_serviceenginegroup.html.markdown
+++ b/website/docs/d/avi_serviceenginegroup.html.markdown
@@ -104,7 +104,6 @@ In addition to all arguments above, the following attributes are exported:
 * `enable_multi_lb` - Applicable only for azure cloud with basic sku lb. If set, additional azure lbs will be automatically created if resources in existing lb are exhausted. Field introduced in 17.2.10, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_pcap_tx_ring` - Enable tx ring support in pcap mode of operation. Tso feature is not supported with tx ring enabled. Deprecated from 18.2.8, instead use pcap_tx_mode. Requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_qat` - This knob enables the service engine to use qat offloads (if the host cpu is capable, and the qat device is exposed). Requires se reboot. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `enable_quantum_entropy` - This knob enables the service engine to use the quantinium library to locally generate quantum-hardened randomness for the linux kernel prng. Requires se reboot. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ephemeral_portrange_end` - End local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `ephemeral_portrange_start` - Start local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `extra_config_multiplier` - Multiplier for extra config to support large vs/pool config. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
@@ -142,6 +141,7 @@ In addition to all arguments above, the following attributes are exported:
 * `lbaction_num_requests_to_dispatch` - Number of requests to dispatch from the request. Queue at a regular interval. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `lbaction_rq_per_request_max_retries` - Maximum retries per request in the request queue. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `least_load_core_selection` - Select core with least load for new flow. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `license_quota` - License quota for the se group. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `license_tier` - Specifies the license tier which would be used. This field by default inherits the value from cloud. Enum options - ENTERPRISE_16, ENTERPRISE, ENTERPRISE_18, BASIC, ESSENTIALS, ENTERPRISE_WITH_CLOUD_SERVICES. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `license_type` - If no license type is specified then default license enforcement for the cloud type is chosen. Enum options - LIC_BACKEND_SERVERS, LIC_SOCKETS, LIC_CORES, LIC_HOSTS, LIC_SE_BANDWIDTH, LIC_METERED_SE_BANDWIDTH. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `log_agent_compress_logs` - Flag to indicate if log files are compressed upon full on the service engine. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_systemconfiguration.html.markdown b/website/docs/d/avi_systemconfiguration.html.markdown
index 27fbbb8b8..04777031d 100644
--- a/website/docs/d/avi_systemconfiguration.html.markdown
+++ b/website/docs/d/avi_systemconfiguration.html.markdown
@@ -44,11 +44,13 @@ In addition to all arguments above, the following attributes are exported:
 * `email_configuration` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_cors` - Enable cors header. Field introduced in 20.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_host_header_check` - Validates the host header against a list of trusted domains. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_license_quota` - Enable license quota for the system. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `fips_mode` - Fips mode current state. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `global_tenant_config` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `host_key_algorithm_exclude` - Users can specify comma separated list of deprecated host key algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `kex_algorithm_exclude` - Users can specify comma separated list of deprecated key exchange algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `legacy_ssl_support` - Allow outgoing connections from controller to servers using tls 1.0/1.1. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `license_quota` - License quota for the system. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `linux_configuration` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `mgmt_ip_access_control` - Configure ip access control for controller to restrict open access. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `ntp_configuration` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_availabilityzone.html.markdown b/website/docs/r/avi_availabilityzone.html.markdown
index f4eb7a029..8c46362d1 100644
--- a/website/docs/r/avi_availabilityzone.html.markdown
+++ b/website/docs/r/avi_availabilityzone.html.markdown
@@ -29,7 +29,8 @@ The following arguments are supported:
 
 * `name` - (Required) Availabilty zone where vcenter list belongs to. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `az_clusters` - (Optional) Group of clusters belongs to the az. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `az_datastore` - (Optional) Datastores associated with the az. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `az_datastores` - (Optional) Group of datastores associated with the az. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `az_hosts` - (Optional) Group of hosts associated with the az. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `cloud_ref` - (Optional) Availability zone belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `tenant_ref` - (Optional) Availabilityzone belongs to tenant. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_licenseledgerdetails.html.markdown b/website/docs/r/avi_licenseledgerdetails.html.markdown
index afd43f06a..55da6dc96 100644
--- a/website/docs/r/avi_licenseledgerdetails.html.markdown
+++ b/website/docs/r/avi_licenseledgerdetails.html.markdown
@@ -28,8 +28,11 @@ resource "avi_licenseledgerdetails" "foo" {
 The following arguments are supported:
 
 * `escrow_infos` - (Optional) Maintain information about reservation against cookie. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `se_group_infos` - (Optional) Maintain information about se group. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `se_infos` - (Optional) Maintain information about consumed licenses against se_uuid. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tenant_infos` - (Optional) Maintain information about tenant. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `tier_usages` - (Optional) License usage per tier. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `total_licenses_reserved` - (Optional) Total of max licenses reserved as per quota config of tenant/segroup. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
diff --git a/website/docs/r/avi_serviceenginegroup.html.markdown b/website/docs/r/avi_serviceenginegroup.html.markdown
index 44a2966d3..004ef8130 100644
--- a/website/docs/r/avi_serviceenginegroup.html.markdown
+++ b/website/docs/r/avi_serviceenginegroup.html.markdown
@@ -98,7 +98,6 @@ The following arguments are supported:
 * `enable_multi_lb` - (Optional) Applicable only for azure cloud with basic sku lb. If set, additional azure lbs will be automatically created if resources in existing lb are exhausted. Field introduced in 17.2.10, 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_pcap_tx_ring` - (Optional) Enable tx ring support in pcap mode of operation. Tso feature is not supported with tx ring enabled. Deprecated from 18.2.8, instead use pcap_tx_mode. Requires se reboot. Field introduced in 18.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_qat` - (Optional) This knob enables the service engine to use qat offloads (if the host cpu is capable, and the qat device is exposed). Requires se reboot. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `enable_quantum_entropy` - (Optional) This knob enables the service engine to use the quantinium library to locally generate quantum-hardened randomness for the linux kernel prng. Requires se reboot. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ephemeral_portrange_end` - (Optional) End local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `ephemeral_portrange_start` - (Optional) Start local ephemeral port number for outbound connections. Field introduced in 17.2.13, 18.1.5, 18.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `extra_config_multiplier` - (Optional) Multiplier for extra config to support large vs/pool config. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
@@ -136,6 +135,7 @@ The following arguments are supported:
 * `lbaction_num_requests_to_dispatch` - (Optional) Number of requests to dispatch from the request. Queue at a regular interval. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `lbaction_rq_per_request_max_retries` - (Optional) Maximum retries per request in the request queue. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `least_load_core_selection` - (Optional) Select core with least load for new flow. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `license_quota` - (Optional) License quota for the se group. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `license_tier` - (Optional) Specifies the license tier which would be used. This field by default inherits the value from cloud. Enum options - ENTERPRISE_16, ENTERPRISE, ENTERPRISE_18, BASIC, ESSENTIALS, ENTERPRISE_WITH_CLOUD_SERVICES. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `license_type` - (Optional) If no license type is specified then default license enforcement for the cloud type is chosen. Enum options - LIC_BACKEND_SERVERS, LIC_SOCKETS, LIC_CORES, LIC_HOSTS, LIC_SE_BANDWIDTH, LIC_METERED_SE_BANDWIDTH. Field introduced in 17.2.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `log_agent_compress_logs` - (Optional) Flag to indicate if log files are compressed upon full on the service engine. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_systemconfiguration.html.markdown b/website/docs/r/avi_systemconfiguration.html.markdown
index 43bcd9ae2..acd3adb89 100644
--- a/website/docs/r/avi_systemconfiguration.html.markdown
+++ b/website/docs/r/avi_systemconfiguration.html.markdown
@@ -38,11 +38,13 @@ The following arguments are supported:
 * `email_configuration` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_cors` - (Optional) Enable cors header. Field introduced in 20.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_host_header_check` - (Optional) Validates the host header against a list of trusted domains. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `enable_license_quota` - (Optional) Enable license quota for the system. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `fips_mode` - (Optional) Fips mode current state. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `global_tenant_config` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `host_key_algorithm_exclude` - (Optional) Users can specify comma separated list of deprecated host key algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `kex_algorithm_exclude` - (Optional) Users can specify comma separated list of deprecated key exchange algorithm.if nothing is specified, all known algorithms provided by openssh will be supported.this change could only apply on the controller node. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `legacy_ssl_support` - (Optional) Allow outgoing connections from controller to servers using tls 1.0/1.1. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `license_quota` - (Optional) License quota for the system. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `linux_configuration` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `mgmt_ip_access_control` - (Optional) Configure ip access control for controller to restrict open access. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `ntp_configuration` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.

From cf46dd051ba806e5bd4aebd1579aab237957c4d8 Mon Sep 17 00:00:00 2001
From: avijenkins <gurunath-reddy.kambala@broadcom.com>
Date: Tue, 5 Aug 2025 05:35:26 +0000
Subject: [PATCH 11/12] Updated assets for terraform

Signed-off-by: avijenkins <gurunath-reddy.kambala@broadcom.com>
---
 avi/datasource_avi_gslb.go                    |  5 +++
 avi/datasource_avi_serviceenginegroup.go      |  4 ++
 avi/datasource_avi_techsupportprofile.go      |  5 ---
 avi/datasource_avi_wafpolicy.go               | 16 +++++--
 avi/datasource_avi_wafpolicypsmgroup.go       |  5 +++
 avi/resource_avi_gslb.go                      |  6 +++
 avi/resource_avi_rest_dependants.go           | 37 ++++++++++------
 avi/resource_avi_serviceenginegroup.go        |  8 +++-
 avi/resource_avi_techsupportprofile.go        |  6 ---
 avi/resource_avi_wafpolicy.go                 | 23 +++++++---
 avi/resource_avi_wafpolicypsmgroup.go         |  5 +++
 website/docs/d/avi_gslb.html.markdown         |  1 +
 .../d/avi_serviceenginegroup.html.markdown    |  3 +-
 website/docs/d/avi_techsupport.html.markdown  | 42 +++++++++----------
 .../d/avi_techsupportmessage.html.markdown    |  6 +--
 .../d/avi_techsupportprofile.html.markdown    | 17 ++++----
 .../docs/d/avi_vcenterserver.html.markdown    |  2 +-
 website/docs/d/avi_wafpolicy.html.markdown    |  4 +-
 .../d/avi_wafpolicypsmgroup.html.markdown     |  1 +
 website/docs/r/avi_gslb.html.markdown         |  1 +
 .../r/avi_serviceenginegroup.html.markdown    |  3 +-
 website/docs/r/avi_techsupport.html.markdown  | 42 +++++++++----------
 .../r/avi_techsupportmessage.html.markdown    |  6 +--
 .../r/avi_techsupportprofile.html.markdown    | 17 ++++----
 .../docs/r/avi_vcenterserver.html.markdown    |  2 +-
 website/docs/r/avi_wafpolicy.html.markdown    |  4 +-
 .../r/avi_wafpolicypsmgroup.html.markdown     |  1 +
 27 files changed, 166 insertions(+), 106 deletions(-)

diff --git a/avi/datasource_avi_gslb.go b/avi/datasource_avi_gslb.go
index f2c6bd645..8ab0d2c47 100644
--- a/avi/datasource_avi_gslb.go
+++ b/avi/datasource_avi_gslb.go
@@ -13,6 +13,11 @@ func dataSourceAviGslb() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"auto_tune_send_interval": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceAutoTuneSendIntervalSchema(),
+			},
 			"clear_on_max_retries": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_serviceenginegroup.go b/avi/datasource_avi_serviceenginegroup.go
index e79651c63..c753be545 100644
--- a/avi/datasource_avi_serviceenginegroup.go
+++ b/avi/datasource_avi_serviceenginegroup.go
@@ -888,6 +888,10 @@ func dataSourceAviServiceEngineGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"se_kernel_rss": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"se_kni_burst_factor": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_techsupportprofile.go b/avi/datasource_avi_techsupportprofile.go
index 211fe6823..af3eeb9fc 100644
--- a/avi/datasource_avi_techsupportprofile.go
+++ b/avi/datasource_avi_techsupportprofile.go
@@ -14,11 +14,6 @@ func dataSourceAviTechSupportProfile() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceArchiveRulesSchema(),
 			},
-			"collect_customer_files": {
-				Type:     schema.TypeSet,
-				Computed: true,
-				Elem:     ResourceCollectCustomerFilesSchema(),
-			},
 			"event_params": {
 				Type:     schema.TypeSet,
 				Computed: true,
diff --git a/avi/datasource_avi_wafpolicy.go b/avi/datasource_avi_wafpolicy.go
index f54c8c5c3..19aed0335 100644
--- a/avi/datasource_avi_wafpolicy.go
+++ b/avi/datasource_avi_wafpolicy.go
@@ -54,10 +54,6 @@ func dataSourceAviWafPolicy() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"enable_adaptive_sampling": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"enable_app_learning": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -70,10 +66,18 @@ func dataSourceAviWafPolicy() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"enable_streaming": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"failure_mode": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"fixed_sampling_rate": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"geo_db_ref": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -125,6 +129,10 @@ func dataSourceAviWafPolicy() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceWafPolicyRequiredDataFileSchema(),
 			},
+			"sampling_mode": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"tenant_ref": {
 				Type:     schema.TypeString,
 				Optional: true,
diff --git a/avi/datasource_avi_wafpolicypsmgroup.go b/avi/datasource_avi_wafpolicypsmgroup.go
index dae4933cc..1e3c90eec 100644
--- a/avi/datasource_avi_wafpolicypsmgroup.go
+++ b/avi/datasource_avi_wafpolicypsmgroup.go
@@ -9,6 +9,11 @@ func dataSourceAviWafPolicyPSMGroup() *schema.Resource {
 	return &schema.Resource{
 		Read: ResourceAviWafPolicyPSMGroupRead,
 		Schema: map[string]*schema.Schema{
+			"completely_described_match_elements": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 			"configpb_attributes": {
 				Type:     schema.TypeSet,
 				Computed: true,
diff --git a/avi/resource_avi_gslb.go b/avi/resource_avi_gslb.go
index bebc0cfd7..4d6232f9c 100644
--- a/avi/resource_avi_gslb.go
+++ b/avi/resource_avi_gslb.go
@@ -16,6 +16,12 @@ func ResourceGslbSchema() map[string]*schema.Schema {
 			Default:      "0",
 			ValidateFunc: validateInteger,
 		},
+		"auto_tune_send_interval": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceAutoTuneSendIntervalSchema(),
+		},
 		"clear_on_max_retries": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go
index 0a182f586..93e68819c 100644
--- a/avi/resource_avi_rest_dependants.go
+++ b/avi/resource_avi_rest_dependants.go
@@ -1287,6 +1287,12 @@ func ResourceAppLearningParamsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceBotDetectionMatchSchema(),
 			},
+			"learn_from_urls_without_args": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 			"max_params": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -2867,6 +2873,25 @@ func ResourceAutoScaleOpenStackSettingsSchema() *schema.Resource {
 	}
 }
 
+func ResourceAutoTuneSendIntervalSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"auto_tune_send_interval_timeout": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "300",
+				ValidateFunc: validateInteger,
+			},
+			"enabled": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "true",
+				ValidateFunc: validateBool,
+			},
+		},
+	}
+}
+
 func ResourceAvgUptimeChangeDetailsSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -6295,18 +6320,6 @@ func ResourceClustifyCheckEventSchema() *schema.Resource {
 	}
 }
 
-func ResourceCollectCustomerFilesSchema() *schema.Resource {
-	return &schema.Resource{
-		Schema: map[string]*schema.Schema{
-			"files": {
-				Type:     schema.TypeList,
-				Optional: true,
-				Elem:     ResourceArchivePolicySchema(),
-			},
-		},
-	}
-}
-
 func ResourceCompressionFilterSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
diff --git a/avi/resource_avi_serviceenginegroup.go b/avi/resource_avi_serviceenginegroup.go
index 52f94d5e2..bfd928e4c 100644
--- a/avi/resource_avi_serviceenginegroup.go
+++ b/avi/resource_avi_serviceenginegroup.go
@@ -289,7 +289,7 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 		"disable_qat_bulk_crypto": {
 			Type:         schema.TypeString,
 			Optional:     true,
-			Default:      "false",
+			Default:      "true",
 			ValidateFunc: validateBool,
 		},
 		"disable_se_memory_check": {
@@ -1263,6 +1263,12 @@ func ResourceServiceEngineGroupSchema() map[string]*schema.Schema {
 			Default:      "0",
 			ValidateFunc: validateInteger,
 		},
+		"se_kernel_rss": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Computed:     true,
+			ValidateFunc: validateBool,
+		},
 		"se_kni_burst_factor": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_techsupportprofile.go b/avi/resource_avi_techsupportprofile.go
index 5aa691b28..1cd75ce3f 100644
--- a/avi/resource_avi_techsupportprofile.go
+++ b/avi/resource_avi_techsupportprofile.go
@@ -16,12 +16,6 @@ func ResourceTechSupportProfileSchema() map[string]*schema.Schema {
 			Computed: true,
 			Elem:     ResourceArchiveRulesSchema(),
 		},
-		"collect_customer_files": {
-			Type:     schema.TypeSet,
-			Optional: true,
-			Computed: true,
-			Elem:     ResourceCollectCustomerFilesSchema(),
-		},
 		"event_params": {
 			Type:     schema.TypeSet,
 			Optional: true,
diff --git a/avi/resource_avi_wafpolicy.go b/avi/resource_avi_wafpolicy.go
index f6db1a616..a8012c073 100644
--- a/avi/resource_avi_wafpolicy.go
+++ b/avi/resource_avi_wafpolicy.go
@@ -67,12 +67,6 @@ func ResourceWafPolicySchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
-		"enable_adaptive_sampling": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "false",
-			ValidateFunc: validateBool,
-		},
 		"enable_app_learning": {
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -91,11 +85,23 @@ func ResourceWafPolicySchema() map[string]*schema.Schema {
 			Default:      "false",
 			ValidateFunc: validateBool,
 		},
+		"enable_streaming": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "false",
+			ValidateFunc: validateBool,
+		},
 		"failure_mode": {
 			Type:     schema.TypeString,
 			Optional: true,
 			Default:  "WAF_FAILURE_MODE_OPEN",
 		},
+		"fixed_sampling_rate": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "1",
+			ValidateFunc: validateInteger,
+		},
 		"geo_db_ref": {
 			Type:     schema.TypeString,
 			Optional: true,
@@ -152,6 +158,11 @@ func ResourceWafPolicySchema() map[string]*schema.Schema {
 			Optional: true,
 			Elem:     ResourceWafPolicyRequiredDataFileSchema(),
 		},
+		"sampling_mode": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Default:  "WAF_SAMPLING_MODE_NO_SAMPLING",
+		},
 		"tenant_ref": {
 			Type:     schema.TypeString,
 			Optional: true,
diff --git a/avi/resource_avi_wafpolicypsmgroup.go b/avi/resource_avi_wafpolicypsmgroup.go
index 4920bdb4d..ae28f3d20 100644
--- a/avi/resource_avi_wafpolicypsmgroup.go
+++ b/avi/resource_avi_wafpolicypsmgroup.go
@@ -10,6 +10,11 @@ import (
 
 func ResourceWafPolicyPSMGroupSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
+		"completely_described_match_elements": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     &schema.Schema{Type: schema.TypeString},
+		},
 		"configpb_attributes": {
 			Type:     schema.TypeSet,
 			Optional: true,
diff --git a/website/docs/d/avi_gslb.html.markdown b/website/docs/d/avi_gslb.html.markdown
index 6e3cc554d..854e2c075 100644
--- a/website/docs/d/avi_gslb.html.markdown
+++ b/website/docs/d/avi_gslb.html.markdown
@@ -33,6 +33,7 @@ data "avi_gslb" "foo_gslb" {
 In addition to all arguments above, the following attributes are exported:
 
 * `async_interval` - Frequency with which messages are propagated to vs mgr. Value of 0 disables async behavior and rpc are sent inline. Allowed values are 0-5. Field introduced in 18.2.3. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_tune_send_interval` - Automatically set the send interval value based on the load. Field introduced in 30.2.5, 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `clear_on_max_retries` - Max retries after which the remote site is treated as a fresh start. In fresh start all the configs are downloaded. Allowed values are 1-1024. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `client_ip_addr_group` - Group to specify if the client ip addresses are public or private. Field introduced in 17.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_serviceenginegroup.html.markdown b/website/docs/d/avi_serviceenginegroup.html.markdown
index 3ce3c040e..feabe9aab 100644
--- a/website/docs/d/avi_serviceenginegroup.html.markdown
+++ b/website/docs/d/avi_serviceenginegroup.html.markdown
@@ -66,7 +66,7 @@ In addition to all arguments above, the following attributes are exported:
 * `connection_memory_percentage` - Percentage of memory for connection state. This will come at the expense of memory used for http in-memory cache. Allowed values are 10-90. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `core_shm_app_cache` - Include shared memory for app cache in core file.requires se reboot. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `core_shm_app_learning` - Include shared memory for app learning in core file.requires se reboot. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `cpu_reserve` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cpu_reserve` - Set cpu shares for service engine virtual machines to high. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `cpu_socket_affinity` - Allocate all the cpu cores for the service engine virtual machines  on the same cpu socket. Applicable only for vcenter cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `custom_securitygroups_data` - Custom security groups to be associated with data vnics for se instances in openstack and aws clouds. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `custom_securitygroups_mgmt` - Custom security groups to be associated with management vnic for se instances in openstack and aws clouds. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
@@ -248,6 +248,7 @@ In addition to all arguments above, the following attributes are exported:
 * `se_group_analytics_policy` - Analytics policy for serviceenginegroup. Field introduced in 20.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `se_hyperthreaded_mode` - Controls the distribution of se data path processes on cpus which support hyper-threading. Requires hyper-threading to be enabled at host level. Requires se reboot. For more details please refer to se placement kb. Enum options - SE_CPU_HT_AUTO, SE_CPU_HT_SPARSE_DISPATCHER_PRIORITY, SE_CPU_HT_SPARSE_PROXY_PRIORITY, SE_CPU_HT_PACKED_CORES. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `se_ip_encap_ipc` - Determines if se-se ipc messages are encapsulated in an ip header       0        automatically determine based on hypervisor type    1        use ip encap unconditionally    ~[0,1]   don't use ip encaprequires se reboot. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_kernel_rss` - This knob enables kernel rss. When enabled flowtable entry is added to every disp cpu. Should be used under supervision. Requires se reboot. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `se_kni_burst_factor` - This knob controls the resource availability and burst size used between se datapath and kni. This helps in minimising packet drops when there is higher kni traffic (non-vip traffic from and to linux). The factor takes the following values      0-default. 1-doubles the burst size and kni resources. 2-quadruples the burst size and kni resources. 3-increases the burst size and kni resources by a factor of eight. Allowed values are 0-3. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `se_l3_encap_ipc` - Determines if se-se ipc messages use se interface ip instead of vip        0        automatically determine based on hypervisor type    1        use se interface ip unconditionally    ~[0,1]   don't use se interface iprequires se reboot. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `se_log_buffer_app_blocking_dequeue` - Internal flag that blocks dataplane until all application logs are flushed to log-agent process. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_techsupport.html.markdown b/website/docs/d/avi_techsupport.html.markdown
index d2ffcc4a9..67eb922de 100644
--- a/website/docs/d/avi_techsupport.html.markdown
+++ b/website/docs/d/avi_techsupport.html.markdown
@@ -32,27 +32,27 @@ data "avi_techsupport" "foo_techsupport" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `case_number` - 'customer case number for which this tech-upport is generated. ''useful for connected portal and other use-cases.'. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `description` - User provided description to capture additional details and context regarding the tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `duration` - Total time taken for tech-support collection. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `end_time` - End timestamp of tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `errors` - Error logged during tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `level` - Name of the tech-support level. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `name` - Name of tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `node` - Cluster member node on which the tech-support tarball bundle is saved. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `case_number` - 'customer case number for which this techsupport is generated. ''useful for connected portal and other use-cases.'. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - User provided description to capture additional details and context regarding the techsupport invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `duration` - Total time taken for techsupport collection. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `end_time` - End timestamp of techsupport collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `errors` - Error logged during techsupport collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `level` - Name of the techsupport level. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - Name of techsupport invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `node` - Cluster member node on which the techsupport tarball bundle is saved. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `obj_name` - Object name if one exists. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `obj_uuid` - Tech-support collection object uuid specified for different objects such as se/vs/pool etc. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `output` - Tech-support collection output file path. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `params` - Tech-support params associated with latest tech-support collection.user passed params will have more preference. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `progress` - Tech-support collection progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `size` - Size of collected tech-support tarball. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `start_time` - Start timestamp of tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `state` - State of current/last tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `tasks` - Events performed for tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `tasks_completed` - Completed set of tasks in the tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_uuid` - Techsupport collection object uuid specified for different objects such as se/vs/pool etc. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `output` - Techsupport collection output file path. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `params` - Techsupport params associated with latest techsupport collection. User passed params will have more preference. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `progress` - Techsupport collection progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `size` - Size of collected techsupport tarball. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `start_time` - Start timestamp of techsupport collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `state` - State of current/last techsupport invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks` - Events performed for techsupport collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks_completed` - Completed set of tasks in the techsupport collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `techsupport_readiness` - Techsupport readiness checks execution details. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `tenant_ref` - Tenant uuid associated with the tech-support. It is a reference to an object of type tenant. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `total_tasks` - Total number of tasks in the tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `uuid` - Uuid identifier for the tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `warnings` - Warning logged during tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - Tenant uuid associated with the techsupport. It is a reference to an object of type tenant. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `total_tasks` - Total number of tasks in the techsupport collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid identifier for the techsupport invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `warnings` - Warning logged during techsupport collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_techsupportmessage.html.markdown b/website/docs/d/avi_techsupportmessage.html.markdown
index 6a6ef4af7..8e95e8231 100644
--- a/website/docs/d/avi_techsupportmessage.html.markdown
+++ b/website/docs/d/avi_techsupportmessage.html.markdown
@@ -32,7 +32,7 @@ data "avi_techsupportmessage" "foo_techsupportmessage" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `status` - 'tech-support status for the current invocation.'. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `status_code` - 'tech-support status code for the current invocation.'. 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_FAILED... Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `tech_support_ref` - 'tech-support object ref.'. It is a reference to an object of type techsupport. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `status` - 'techsupport status for the current invocation.'. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `status_code` - 'techsupport status code for the current invocation.'. 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_FAILED... Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tech_support_ref` - 'techsupport object ref.'. It is a reference to an object of type techsupport. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_techsupportprofile.html.markdown b/website/docs/d/avi_techsupportprofile.html.markdown
index 2c9f4b0fc..5db6c7ad2 100644
--- a/website/docs/d/avi_techsupportprofile.html.markdown
+++ b/website/docs/d/avi_techsupportprofile.html.markdown
@@ -32,14 +32,13 @@ data "avi_techsupportprofile" "foo_techsupportprofile" {
 
 In addition to all arguments above, the following attributes are exported:
 
-* `archive_rules` - Defined policy for tech-support archive rules.these are predefined files which are exception for default file size thresholduser can add file path with custom threshold in allowed limits to be collected in bundlee.g. A file /var/sample.log is with size 450mb needs to be collected for each invocationuser should configure and add path in techsupportprofile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `collect_customer_files` - A list of user-specified file paths for collectionthat are not part of the predefined yaml configuration. This is useful forcollecting logs from third-party applications or other custom files.e.g. A file located at /var/sample.log which is not a part of pre-define yamluser should configure this path as source in collect_customer_files so that subsequent collectioncollect this file, once user no longer needed this file they can remove from techsupportprofile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `event_params` - Specify this params to set threshold for event files.user provided parameters will take precedence over the profile parameters. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `file_size_threshold` - Max file size threshold to archive in tech-support collectionfiles above this threshold will not be collected and an warning will be flagged. Allowed values are 128-512. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `max_disk_size_percent` - Max disk size in percent of total disk size reserved for the tech-support.the value is in percentage to make it agnostic of controller flavors.e.g. Small [disk=5 gb, ts space available = 500mb]large [ disk= 100gb, ts space available= 10gb]xl [disk=1tb, ts space available=100gb]. Allowed values are 10-25. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `min_free_disk_required` - Min free disk required for the tech-support invocation.the value is in percentage to make it agnostic of controller flavors.e.g. Small [disk=5 gb, ts space available = 250mb]large [ disk= 100gb, ts space available= 5gb]xl [disk=1tb, ts space available=50gb]. Allowed values are 5-10. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `archive_rules` - Define the policy for techsupport archive rules. These rules allow you to specify files that should be collected in the techsupport bundle, even if they exceed the default file size threshold. E.g. To ensure a 450mb file, such as /var/sample.log, is collected with every invocation, configure and add its path to the techsupportprofile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `event_params` - Specify this params to set threshold for event files. User provided parameters will take precedence over the profile parameters. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `file_size_threshold` - Max file size threshold to archive in techsupport collection. Files above this threshold will not be collected and an warning will be flagged. Allowed values are 128-512. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `max_disk_size_percent` - Max disk size in percent of total disk size reserved for the techsupport. The value is in percentage to make it agnostic of controller flavors. E.g. Small [disk=5 gb, ts space available = 500mb] large [ disk= 100gb, ts space available= 10gb] xl [disk=1tb, ts space available=100gb]. Allowed values are 10-25. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `min_free_disk_required` - Min free disk required for the techsupport invocation. The value is in percentage to make it agnostic of controller flavors. E.g. Small [disk=5 gb, ts space available = 250mb] large [ disk= 100gb, ts space available= 5gb] xl [disk=1tb, ts space available=50gb]. Allowed values are 5-10. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `no_of_techsupport_retentions` - Number of techsupport to retain from techsupport cleanup policy. Allowed values are 1-5. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `simultaneous_invocations` - Number of simultaneous tech-support invocation allowed. Allowed values are 1-2. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `task_timeout` - Generic timeout for tech-support task collection.this can be used for task, script executions etc.tweak the timeout value in cases of timeout observation in the logs. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `uuid` - Uuid identifier for the tech-support profile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `simultaneous_invocations` - Number of simultaneous techsupport invocation allowed. Allowed values are 1-2. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `task_timeout` - Generic timeout for techsupport task collection. This can be used for task, script executions etc. Tweak the timeout value in cases of timeout observation in the logs. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` - Uuid identifier for the techsupport profile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/d/avi_vcenterserver.html.markdown b/website/docs/d/avi_vcenterserver.html.markdown
index 15cd156b0..c112f654a 100644
--- a/website/docs/d/avi_vcenterserver.html.markdown
+++ b/website/docs/d/avi_vcenterserver.html.markdown
@@ -37,7 +37,7 @@ In addition to all arguments above, the following attributes are exported:
 * `cloud_ref` - Vcenter belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `content_lib` - Vcenter template to create service engine. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `name` - Availabilty zone where vcenter list belongs to. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - Vcenter name. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `tenant_ref` - Vcenter belongs to tenant. It is a reference to an object of type tenant. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `uuid` - Vcenter config uuid. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `vcenter_credentials_ref` - Credentials to access vcenter. It is a reference to an object of type cloudconnectoruser. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_wafpolicy.html.markdown b/website/docs/d/avi_wafpolicy.html.markdown
index a57aff4f9..9faa0bd89 100644
--- a/website/docs/d/avi_wafpolicy.html.markdown
+++ b/website/docs/d/avi_wafpolicy.html.markdown
@@ -42,11 +42,12 @@ In addition to all arguments above, the following attributes are exported:
 * `created_by` - Creator name. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `crs_overrides` - Override attributes for crs rules. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `description` - Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `enable_adaptive_sampling` - Whether or not adaptive sampling should be enabled. If enabled, a varying percentage of requests will be subject to waf processing in evaluation mode. The se-group property max_cpu_load_adaptive_sampling limits the maximum load on the cpu allowed for adaptive sampling to take place. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `enable_app_learning` - Enable application learning for this waf policy. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_auto_rule_updates` - Enable application learning based rule updates on the waf profile. Rules will be programmed in dedicated waf learning group. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_regex_learning` - Enable dynamic regex generation for positive security model rules. This is an experimental feature and shouldn't be used in production. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_streaming` - If this is set, waf will let requests be streamed to the backend servers. If not set, requests and responses will be buffered up to the configured maximum values. It can only be set if the wafpolicy is not set to enforcement mode. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `failure_mode` - Waf policy failure mode. This can be 'open' or 'closed'. Enum options - WAF_FAILURE_MODE_OPEN, WAF_FAILURE_MODE_CLOSED. Field introduced in 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fixed_sampling_rate` - If sampling_mode is set to fixed_sampling, this value determines the percentage of requests choosen for waf processing. Allowed values are 1-100. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `geo_db_ref` - Geo location mapping database used by this wafpolicy. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `learning_params` - Parameters for tuning application learning. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
@@ -58,6 +59,7 @@ In addition to all arguments above, the following attributes are exported:
 * `post_crs_groups` - Waf rules are categorized in to groups based on their characterization. These groups are created by the user and will be enforced after the crs groups. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `pre_crs_groups` - Waf rules are categorized in to groups based on their characterization. These groups are created by the user and will be  enforced before the crs groups. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `required_data_files` - The data files and types referred in this waf policy. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sampling_mode` - If and how waf should use sampling to restrict the number of requests checked. Enum options - WAF_SAMPLING_MODE_NO_SAMPLING, WAF_SAMPLING_MODE_ADAPTIVE_SAMPLING, WAF_SAMPLING_MODE_FIXED_SAMPLING. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `tenant_ref` - It is a reference to an object of type tenant. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `use_evaluation_mode_on_crs_update` - While updating crs, the system will make sure that new rules are added in evaluation mode. A crs update will set new rules into evaluation mode by adding crs_overrides for the new rules. If this flag is not set or if the old crs object was empty, the new rules will be added without crs_overrides. This option is used for the auto_update_crs workflow as well as for the ui based crs update workflow. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `uuid` - Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_wafpolicypsmgroup.html.markdown b/website/docs/d/avi_wafpolicypsmgroup.html.markdown
index b96a58cff..1b4ba22f9 100644
--- a/website/docs/d/avi_wafpolicypsmgroup.html.markdown
+++ b/website/docs/d/avi_wafpolicypsmgroup.html.markdown
@@ -32,6 +32,7 @@ data "avi_wafpolicypsmgroup" "foo_wafpolicypsmgroup" {
 
 In addition to all arguments above, the following attributes are exported:
 
+* `completely_described_match_elements` - A list of all match element collections which are completely described in the psm group. Every input value which matches one of the elements in this list but is not handled by a waf psm rule, will run the match_element miss_action. Allowed values are waf_variable_args. Enum options - WAF_VARIABLE_ARGS, WAF_VARIABLE_ARGS_GET, WAF_VARIABLE_ARGS_POST, WAF_VARIABLE_ARGS_NAMES, WAF_VARIABLE_REQUEST_COOKIES, WAF_VARIABLE_QUERY_STRING, WAF_VARIABLE_REQUEST_BASENAME, WAF_VARIABLE_REQUEST_URI, WAF_VARIABLE_PATH_INFO, WAF_VARIABLE_REQUEST_HEADERS. Field introduced in 31.2.1. Maximum of 1 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `description` - Free-text comment about this group. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable` - Enable or disable this waf rule group. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_gslb.html.markdown b/website/docs/r/avi_gslb.html.markdown
index 111702da7..49d08a001 100644
--- a/website/docs/r/avi_gslb.html.markdown
+++ b/website/docs/r/avi_gslb.html.markdown
@@ -31,6 +31,7 @@ The following arguments are supported:
 * `name` - (Required) Name for the gslb object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `sites` - (Required) Select avi site member belonging to this gslb. Minimum of 1 items required. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `async_interval` - (Optional) Frequency with which messages are propagated to vs mgr. Value of 0 disables async behavior and rpc are sent inline. Allowed values are 0-5. Field introduced in 18.2.3. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `auto_tune_send_interval` - (Optional) Automatically set the send interval value based on the load. Field introduced in 30.2.5, 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `clear_on_max_retries` - (Optional) Max retries after which the remote site is treated as a fresh start. In fresh start all the configs are downloaded. Allowed values are 1-1024. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `client_ip_addr_group` - (Optional) Group to specify if the client ip addresses are public or private. Field introduced in 17.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_serviceenginegroup.html.markdown b/website/docs/r/avi_serviceenginegroup.html.markdown
index 004ef8130..2d1bad7d8 100644
--- a/website/docs/r/avi_serviceenginegroup.html.markdown
+++ b/website/docs/r/avi_serviceenginegroup.html.markdown
@@ -60,7 +60,7 @@ The following arguments are supported:
 * `connection_memory_percentage` - (Optional) Percentage of memory for connection state. This will come at the expense of memory used for http in-memory cache. Allowed values are 10-90. Unit is percent. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `core_shm_app_cache` - (Optional) Include shared memory for app cache in core file.requires se reboot. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `core_shm_app_learning` - (Optional) Include shared memory for app learning in core file.requires se reboot. Field introduced in 18.2.8, 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `cpu_reserve` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `cpu_reserve` - (Optional) Set cpu shares for service engine virtual machines to high. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `cpu_socket_affinity` - (Optional) Allocate all the cpu cores for the service engine virtual machines  on the same cpu socket. Applicable only for vcenter cloud. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `custom_securitygroups_data` - (Optional) Custom security groups to be associated with data vnics for se instances in openstack and aws clouds. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `custom_securitygroups_mgmt` - (Optional) Custom security groups to be associated with management vnic for se instances in openstack and aws clouds. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
@@ -241,6 +241,7 @@ The following arguments are supported:
 * `se_group_analytics_policy` - (Optional) Analytics policy for serviceenginegroup. Field introduced in 20.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `se_hyperthreaded_mode` - (Optional) Controls the distribution of se data path processes on cpus which support hyper-threading. Requires hyper-threading to be enabled at host level. Requires se reboot. For more details please refer to se placement kb. Enum options - SE_CPU_HT_AUTO, SE_CPU_HT_SPARSE_DISPATCHER_PRIORITY, SE_CPU_HT_SPARSE_PROXY_PRIORITY, SE_CPU_HT_PACKED_CORES. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `se_ip_encap_ipc` - (Optional) Determines if se-se ipc messages are encapsulated in an ip header       0        automatically determine based on hypervisor type    1        use ip encap unconditionally    ~[0,1]   don't use ip encaprequires se reboot. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `se_kernel_rss` - (Optional) This knob enables kernel rss. When enabled flowtable entry is added to every disp cpu. Should be used under supervision. Requires se reboot. Field introduced in 31.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `se_kni_burst_factor` - (Optional) This knob controls the resource availability and burst size used between se datapath and kni. This helps in minimising packet drops when there is higher kni traffic (non-vip traffic from and to linux). The factor takes the following values      0-default. 1-doubles the burst size and kni resources. 2-quadruples the burst size and kni resources. 3-increases the burst size and kni resources by a factor of eight. Allowed values are 0-3. Field introduced in 18.2.6. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `se_l3_encap_ipc` - (Optional) Determines if se-se ipc messages use se interface ip instead of vip        0        automatically determine based on hypervisor type    1        use se interface ip unconditionally    ~[0,1]   don't use se interface iprequires se reboot. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `se_log_buffer_app_blocking_dequeue` - (Optional) Internal flag that blocks dataplane until all application logs are flushed to log-agent process. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_techsupport.html.markdown b/website/docs/r/avi_techsupport.html.markdown
index 2db47f642..621c64e56 100644
--- a/website/docs/r/avi_techsupport.html.markdown
+++ b/website/docs/r/avi_techsupport.html.markdown
@@ -27,28 +27,28 @@ resource "avi_techsupport" "foo" {
 
 The following arguments are supported:
 
-* `case_number` - (Optional) 'customer case number for which this tech-upport is generated. ''useful for connected portal and other use-cases.'. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `description` - (Optional) User provided description to capture additional details and context regarding the tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `duration` - (Optional) Total time taken for tech-support collection. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `end_time` - (Optional) End timestamp of tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `errors` - (Optional) Error logged during tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `level` - (Optional) Name of the tech-support level. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `name` - (Optional) Name of tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `node` - (Optional) Cluster member node on which the tech-support tarball bundle is saved. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `case_number` - (Optional) 'customer case number for which this techsupport is generated. ''useful for connected portal and other use-cases.'. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `description` - (Optional) User provided description to capture additional details and context regarding the techsupport invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `duration` - (Optional) Total time taken for techsupport collection. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `end_time` - (Optional) End timestamp of techsupport collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `errors` - (Optional) Error logged during techsupport collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `level` - (Optional) Name of the techsupport level. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `name` - (Optional) Name of techsupport invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `node` - (Optional) Cluster member node on which the techsupport tarball bundle is saved. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `obj_name` - (Optional) Object name if one exists. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `obj_uuid` - (Optional) Tech-support collection object uuid specified for different objects such as se/vs/pool etc. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `output` - (Optional) Tech-support collection output file path. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `params` - (Optional) Tech-support params associated with latest tech-support collection.user passed params will have more preference. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `progress` - (Optional) Tech-support collection progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `size` - (Optional) Size of collected tech-support tarball. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `start_time` - (Optional) Start timestamp of tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `state` - (Optional) State of current/last tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `tasks` - (Optional) Events performed for tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `tasks_completed` - (Optional) Completed set of tasks in the tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `obj_uuid` - (Optional) Techsupport collection object uuid specified for different objects such as se/vs/pool etc. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `output` - (Optional) Techsupport collection output file path. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `params` - (Optional) Techsupport params associated with latest techsupport collection. User passed params will have more preference. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `progress` - (Optional) Techsupport collection progress which holds value between 0-100. Allowed values are 0-100. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `size` - (Optional) Size of collected techsupport tarball. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `start_time` - (Optional) Start timestamp of techsupport collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `state` - (Optional) State of current/last techsupport invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks` - (Optional) Events performed for techsupport collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tasks_completed` - (Optional) Completed set of tasks in the techsupport collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `techsupport_readiness` - (Optional) Techsupport readiness checks execution details. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `tenant_ref` - (Optional) Tenant uuid associated with the tech-support. It is a reference to an object of type tenant. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `total_tasks` - (Optional) Total number of tasks in the tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `warnings` - (Optional) Warning logged during tech-support collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `tenant_ref` - (Optional) Tenant uuid associated with the techsupport. It is a reference to an object of type tenant. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `total_tasks` - (Optional) Total number of tasks in the techsupport collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `warnings` - (Optional) Warning logged during techsupport collection. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -63,5 +63,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid identifier for the tech-support invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` -  Uuid identifier for the techsupport invocation. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_techsupportmessage.html.markdown b/website/docs/r/avi_techsupportmessage.html.markdown
index 5b4f26317..71e32c7bb 100644
--- a/website/docs/r/avi_techsupportmessage.html.markdown
+++ b/website/docs/r/avi_techsupportmessage.html.markdown
@@ -27,9 +27,9 @@ resource "avi_techsupportmessage" "foo" {
 
 The following arguments are supported:
 
-* `status` - (Optional) 'tech-support status for the current invocation.'. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `status_code` - (Optional) 'tech-support status code for the current invocation.'. 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_FAILED... Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `tech_support_ref` - (Optional) 'tech-support object ref.'. It is a reference to an object of type techsupport. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `status` - (Optional) 'techsupport status for the current invocation.'. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `status_code` - (Optional) 'techsupport status code for the current invocation.'. 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_FAILED... Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `tech_support_ref` - (Optional) 'techsupport object ref.'. It is a reference to an object of type techsupport. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
diff --git a/website/docs/r/avi_techsupportprofile.html.markdown b/website/docs/r/avi_techsupportprofile.html.markdown
index 8a0670ad8..a5f176e15 100644
--- a/website/docs/r/avi_techsupportprofile.html.markdown
+++ b/website/docs/r/avi_techsupportprofile.html.markdown
@@ -27,15 +27,14 @@ resource "avi_techsupportprofile" "foo" {
 
 The following arguments are supported:
 
-* `archive_rules` - (Optional) Defined policy for tech-support archive rules.these are predefined files which are exception for default file size thresholduser can add file path with custom threshold in allowed limits to be collected in bundlee.g. A file /var/sample.log is with size 450mb needs to be collected for each invocationuser should configure and add path in techsupportprofile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `collect_customer_files` - (Optional) A list of user-specified file paths for collectionthat are not part of the predefined yaml configuration. This is useful forcollecting logs from third-party applications or other custom files.e.g. A file located at /var/sample.log which is not a part of pre-define yamluser should configure this path as source in collect_customer_files so that subsequent collectioncollect this file, once user no longer needed this file they can remove from techsupportprofile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `event_params` - (Optional) Specify this params to set threshold for event files.user provided parameters will take precedence over the profile parameters. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `file_size_threshold` - (Optional) Max file size threshold to archive in tech-support collectionfiles above this threshold will not be collected and an warning will be flagged. Allowed values are 128-512. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `max_disk_size_percent` - (Optional) Max disk size in percent of total disk size reserved for the tech-support.the value is in percentage to make it agnostic of controller flavors.e.g. Small [disk=5 gb, ts space available = 500mb]large [ disk= 100gb, ts space available= 10gb]xl [disk=1tb, ts space available=100gb]. Allowed values are 10-25. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `min_free_disk_required` - (Optional) Min free disk required for the tech-support invocation.the value is in percentage to make it agnostic of controller flavors.e.g. Small [disk=5 gb, ts space available = 250mb]large [ disk= 100gb, ts space available= 5gb]xl [disk=1tb, ts space available=50gb]. Allowed values are 5-10. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `archive_rules` - (Optional) Define the policy for techsupport archive rules. These rules allow you to specify files that should be collected in the techsupport bundle, even if they exceed the default file size threshold. E.g. To ensure a 450mb file, such as /var/sample.log, is collected with every invocation, configure and add its path to the techsupportprofile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `event_params` - (Optional) Specify this params to set threshold for event files. User provided parameters will take precedence over the profile parameters. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `file_size_threshold` - (Optional) Max file size threshold to archive in techsupport collection. Files above this threshold will not be collected and an warning will be flagged. Allowed values are 128-512. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `max_disk_size_percent` - (Optional) Max disk size in percent of total disk size reserved for the techsupport. The value is in percentage to make it agnostic of controller flavors. E.g. Small [disk=5 gb, ts space available = 500mb] large [ disk= 100gb, ts space available= 10gb] xl [disk=1tb, ts space available=100gb]. Allowed values are 10-25. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `min_free_disk_required` - (Optional) Min free disk required for the techsupport invocation. The value is in percentage to make it agnostic of controller flavors. E.g. Small [disk=5 gb, ts space available = 250mb] large [ disk= 100gb, ts space available= 5gb] xl [disk=1tb, ts space available=50gb]. Allowed values are 5-10. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `no_of_techsupport_retentions` - (Optional) Number of techsupport to retain from techsupport cleanup policy. Allowed values are 1-5. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `simultaneous_invocations` - (Optional) Number of simultaneous tech-support invocation allowed. Allowed values are 1-2. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `task_timeout` - (Optional) Generic timeout for tech-support task collection.this can be used for task, script executions etc.tweak the timeout value in cases of timeout observation in the logs. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `simultaneous_invocations` - (Optional) Number of simultaneous techsupport invocation allowed. Allowed values are 1-2. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `task_timeout` - (Optional) Generic timeout for techsupport task collection. This can be used for task, script executions etc. Tweak the timeout value in cases of timeout observation in the logs. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
 
 
 ### Timeouts
@@ -50,5 +49,5 @@ The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/d
 
 In addition to all arguments above, the following attributes are exported:
 
-* `uuid` -  Uuid identifier for the tech-support profile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `uuid` -  Uuid identifier for the techsupport profile. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 
diff --git a/website/docs/r/avi_vcenterserver.html.markdown b/website/docs/r/avi_vcenterserver.html.markdown
index 3a70bde7e..9ccdee102 100644
--- a/website/docs/r/avi_vcenterserver.html.markdown
+++ b/website/docs/r/avi_vcenterserver.html.markdown
@@ -27,7 +27,7 @@ resource "avi_vcenterserver" "foo" {
 
 The following arguments are supported:
 
-* `name` - (Required) Availabilty zone where vcenter list belongs to. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `name` - (Required) Vcenter name. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `cloud_ref` - (Optional) Vcenter belongs to cloud. It is a reference to an object of type cloud. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `content_lib` - (Optional) Vcenter template to create service engine. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_wafpolicy.html.markdown b/website/docs/r/avi_wafpolicy.html.markdown
index fc383e6c8..7676fd3a4 100644
--- a/website/docs/r/avi_wafpolicy.html.markdown
+++ b/website/docs/r/avi_wafpolicy.html.markdown
@@ -39,11 +39,12 @@ The following arguments are supported:
 * `created_by` - (Optional) Creator name. Field introduced in 17.2.4. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `crs_overrides` - (Optional) Override attributes for crs rules. Field introduced in 20.1.6. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `description` - (Optional) Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
-* `enable_adaptive_sampling` - (Optional) Whether or not adaptive sampling should be enabled. If enabled, a varying percentage of requests will be subject to waf processing in evaluation mode. The se-group property max_cpu_load_adaptive_sampling limits the maximum load on the cpu allowed for adaptive sampling to take place. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `enable_app_learning` - (Optional) Enable application learning for this waf policy. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_auto_rule_updates` - (Optional) Enable application learning based rule updates on the waf profile. Rules will be programmed in dedicated waf learning group. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable_regex_learning` - (Optional) Enable dynamic regex generation for positive security model rules. This is an experimental feature and shouldn't be used in production. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `enable_streaming` - (Optional) If this is set, waf will let requests be streamed to the backend servers. If not set, requests and responses will be buffered up to the configured maximum values. It can only be set if the wafpolicy is not set to enforcement mode. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `failure_mode` - (Optional) Waf policy failure mode. This can be 'open' or 'closed'. Enum options - WAF_FAILURE_MODE_OPEN, WAF_FAILURE_MODE_CLOSED. Field introduced in 18.1.2. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `fixed_sampling_rate` - (Optional) If sampling_mode is set to fixed_sampling, this value determines the percentage of requests choosen for waf processing. Allowed values are 1-100. Field introduced in 31.2.1. Unit is percent. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `geo_db_ref` - (Optional) Geo location mapping database used by this wafpolicy. It is a reference to an object of type geodb. Field introduced in 21.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `learning_params` - (Optional) Parameters for tuning application learning. Field introduced in 20.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
@@ -54,6 +55,7 @@ The following arguments are supported:
 * `post_crs_groups` - (Optional) Waf rules are categorized in to groups based on their characterization. These groups are created by the user and will be enforced after the crs groups. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `pre_crs_groups` - (Optional) Waf rules are categorized in to groups based on their characterization. These groups are created by the user and will be  enforced before the crs groups. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `required_data_files` - (Optional) The data files and types referred in this waf policy. Field introduced in 22.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `sampling_mode` - (Optional) If and how waf should use sampling to restrict the number of requests checked. Enum options - WAF_SAMPLING_MODE_NO_SAMPLING, WAF_SAMPLING_MODE_ADAPTIVE_SAMPLING, WAF_SAMPLING_MODE_FIXED_SAMPLING. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `tenant_ref` - (Optional) It is a reference to an object of type tenant. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `use_evaluation_mode_on_crs_update` - (Optional) While updating crs, the system will make sure that new rules are added in evaluation mode. A crs update will set new rules into evaluation mode by adding crs_overrides for the new rules. If this flag is not set or if the old crs object was empty, the new rules will be added without crs_overrides. This option is used for the auto_update_crs workflow as well as for the ui based crs update workflow. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `waf_crs_ref` - (Optional) Waf core ruleset used for the crs part of this policy. It is a reference to an object of type wafcrs. Field introduced in 18.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_wafpolicypsmgroup.html.markdown b/website/docs/r/avi_wafpolicypsmgroup.html.markdown
index 9f9774b0f..1bb3c2440 100644
--- a/website/docs/r/avi_wafpolicypsmgroup.html.markdown
+++ b/website/docs/r/avi_wafpolicypsmgroup.html.markdown
@@ -28,6 +28,7 @@ resource "avi_wafpolicypsmgroup" "foo" {
 The following arguments are supported:
 
 * `name` - (Required) User defined name of the group. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `completely_described_match_elements` - (Optional) A list of all match element collections which are completely described in the psm group. Every input value which matches one of the elements in this list but is not handled by a waf psm rule, will run the match_element miss_action. Allowed values are waf_variable_args. Enum options - WAF_VARIABLE_ARGS, WAF_VARIABLE_ARGS_GET, WAF_VARIABLE_ARGS_POST, WAF_VARIABLE_ARGS_NAMES, WAF_VARIABLE_REQUEST_COOKIES, WAF_VARIABLE_QUERY_STRING, WAF_VARIABLE_REQUEST_BASENAME, WAF_VARIABLE_REQUEST_URI, WAF_VARIABLE_PATH_INFO, WAF_VARIABLE_REQUEST_HEADERS. Field introduced in 31.2.1. Maximum of 1 items allowed. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `description` - (Optional) Free-text comment about this group. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `enable` - (Optional) Enable or disable this waf rule group. Field introduced in 18.2.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.

From 05d41021481c9c3972ff956e1f70a1b388787f4a Mon Sep 17 00:00:00 2001
From: avijenkins <gurunath-reddy.kambala@broadcom.com>
Date: Thu, 21 Aug 2025 09:01:04 +0000
Subject: [PATCH 12/12] Updated assets for terraform

Signed-off-by: avijenkins <gurunath-reddy.kambala@broadcom.com>
---
 avi/datasource_avi_analyticsprofile.go        |   4 +
 avi/datasource_avi_controllerproperties.go    |  14 +-
 avi/datasource_avi_gslb.go                    |   5 +
 avi/datasource_avi_gslbsmruntime.go           |   5 +
 ...asource_avi_hardwaresecuritymodulegroup.go |   5 +
 avi/resource_avi_analyticsprofile.go          |   6 +
 avi/resource_avi_controllerproperties.go      |  24 ++-
 avi/resource_avi_gslb.go                      |   6 +
 avi/resource_avi_gslbsmruntime.go             |   6 +
 ...esource_avi_hardwaresecuritymodulegroup.go |   5 +
 avi/resource_avi_rest_dependants.go           | 166 ++++++++++++++++++
 .../docs/d/avi_analyticsprofile.html.markdown |   1 +
 .../d/avi_controllerproperties.html.markdown  |   7 +-
 website/docs/d/avi_gslb.html.markdown         |   1 +
 .../docs/d/avi_gslbsmruntime.html.markdown    |   1 +
 ..._hardwaresecuritymodulegroup.html.markdown |   1 +
 .../docs/r/avi_analyticsprofile.html.markdown |   1 +
 .../r/avi_controllerproperties.html.markdown  |   7 +-
 website/docs/r/avi_gslb.html.markdown         |   1 +
 .../docs/r/avi_gslbsmruntime.html.markdown    |   1 +
 ..._hardwaresecuritymodulegroup.html.markdown |   1 +
 21 files changed, 260 insertions(+), 8 deletions(-)

diff --git a/avi/datasource_avi_analyticsprofile.go b/avi/datasource_avi_analyticsprofile.go
index 7221dd9ed..13c0f58b8 100644
--- a/avi/datasource_avi_analyticsprofile.go
+++ b/avi/datasource_avi_analyticsprofile.go
@@ -128,6 +128,10 @@ func dataSourceAviAnalyticsProfile() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"exclude_conn_drop_client_small_window_as_error": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"exclude_dns_policy_drop_as_significant": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_controllerproperties.go b/avi/datasource_avi_controllerproperties.go
index 0f2823678..638a1c1ba 100644
--- a/avi/datasource_avi_controllerproperties.go
+++ b/avi/datasource_avi_controllerproperties.go
@@ -219,7 +219,19 @@ func dataSourceAviControllerProperties() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"log_records_additional_buffer_space": {
+			"log_records_allocated_size": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"log_records_allocation_percentage_for_events": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"log_records_cleanup_target_percentage": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"log_records_frequent_cleanup_event_generation_threshold": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
diff --git a/avi/datasource_avi_gslb.go b/avi/datasource_avi_gslb.go
index 8ab0d2c47..73ad3cfcc 100644
--- a/avi/datasource_avi_gslb.go
+++ b/avi/datasource_avi_gslb.go
@@ -61,6 +61,11 @@ func dataSourceAviGslb() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"leader_change_info": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceLeaderChangeInfoSchema(),
+			},
 			"leader_cluster_uuid": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/avi/datasource_avi_gslbsmruntime.go b/avi/datasource_avi_gslbsmruntime.go
index 6c41e545e..339b79389 100644
--- a/avi/datasource_avi_gslbsmruntime.go
+++ b/avi/datasource_avi_gslbsmruntime.go
@@ -17,6 +17,11 @@ func dataSourceAviGslbSMRuntime() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"controller_size": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     ResourceControllerSizeSchema(),
+			},
 			"dns_configs": {
 				Type:     schema.TypeList,
 				Computed: true,
diff --git a/avi/datasource_avi_hardwaresecuritymodulegroup.go b/avi/datasource_avi_hardwaresecuritymodulegroup.go
index 049f2bda3..203929ae1 100644
--- a/avi/datasource_avi_hardwaresecuritymodulegroup.go
+++ b/avi/datasource_avi_hardwaresecuritymodulegroup.go
@@ -9,6 +9,11 @@ func dataSourceAviHardwareSecurityModuleGroup() *schema.Resource {
 	return &schema.Resource{
 		Read: ResourceAviHardwareSecurityModuleGroupRead,
 		Schema: map[string]*schema.Schema{
+			"ca_certs": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     ResourceSSLCertificateSchema(),
+			},
 			"configpb_attributes": {
 				Type:     schema.TypeSet,
 				Computed: true,
diff --git a/avi/resource_avi_analyticsprofile.go b/avi/resource_avi_analyticsprofile.go
index 48214838f..1dd13373a 100644
--- a/avi/resource_avi_analyticsprofile.go
+++ b/avi/resource_avi_analyticsprofile.go
@@ -183,6 +183,12 @@ func ResourceAnalyticsProfileSchema() map[string]*schema.Schema {
 			Default:      "false",
 			ValidateFunc: validateBool,
 		},
+		"exclude_conn_drop_client_small_window_as_error": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "true",
+			ValidateFunc: validateBool,
+		},
 		"exclude_dns_policy_drop_as_significant": {
 			Type:         schema.TypeString,
 			Optional:     true,
diff --git a/avi/resource_avi_controllerproperties.go b/avi/resource_avi_controllerproperties.go
index 5a25b4dfa..d43c8bd33 100644
--- a/avi/resource_avi_controllerproperties.go
+++ b/avi/resource_avi_controllerproperties.go
@@ -322,16 +322,34 @@ func ResourceControllerPropertiesSchema() map[string]*schema.Schema {
 			Default:      "false",
 			ValidateFunc: validateBool,
 		},
-		"log_records_additional_buffer_space": {
+		"log_records_allocated_size": {
 			Type:         schema.TypeString,
 			Optional:     true,
-			Default:      "0",
+			Computed:     true,
+			ValidateFunc: validateInteger,
+		},
+		"log_records_allocation_percentage_for_events": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "20",
+			ValidateFunc: validateInteger,
+		},
+		"log_records_cleanup_target_percentage": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "90",
+			ValidateFunc: validateInteger,
+		},
+		"log_records_frequent_cleanup_event_generation_threshold": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "2",
 			ValidateFunc: validateInteger,
 		},
 		"log_records_purge_interval": {
 			Type:         schema.TypeString,
 			Optional:     true,
-			Default:      "600",
+			Default:      "300",
 			ValidateFunc: validateInteger,
 		},
 		"max_dead_se_in_grp": {
diff --git a/avi/resource_avi_gslb.go b/avi/resource_avi_gslb.go
index 4d6232f9c..637688692 100644
--- a/avi/resource_avi_gslb.go
+++ b/avi/resource_avi_gslb.go
@@ -80,6 +80,12 @@ func ResourceGslbSchema() map[string]*schema.Schema {
 			Default:      "true",
 			ValidateFunc: validateBool,
 		},
+		"leader_change_info": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceLeaderChangeInfoSchema(),
+		},
 		"leader_cluster_uuid": {
 			Type:     schema.TypeString,
 			Required: true,
diff --git a/avi/resource_avi_gslbsmruntime.go b/avi/resource_avi_gslbsmruntime.go
index e00d16385..b481f30d8 100644
--- a/avi/resource_avi_gslbsmruntime.go
+++ b/avi/resource_avi_gslbsmruntime.go
@@ -20,6 +20,12 @@ func ResourceGslbSMRuntimeSchema() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"controller_size": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem:     ResourceControllerSizeSchema(),
+		},
 		"dns_configs": {
 			Type:     schema.TypeList,
 			Optional: true,
diff --git a/avi/resource_avi_hardwaresecuritymodulegroup.go b/avi/resource_avi_hardwaresecuritymodulegroup.go
index 263c83f8f..00ab069ea 100644
--- a/avi/resource_avi_hardwaresecuritymodulegroup.go
+++ b/avi/resource_avi_hardwaresecuritymodulegroup.go
@@ -10,6 +10,11 @@ import (
 
 func ResourceHardwareSecurityModuleGroupSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
+		"ca_certs": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem:     ResourceSSLCertificateSchema(),
+		},
 		"configpb_attributes": {
 			Type:     schema.TypeSet,
 			Optional: true,
diff --git a/avi/resource_avi_rest_dependants.go b/avi/resource_avi_rest_dependants.go
index 93e68819c..1c985dc7c 100644
--- a/avi/resource_avi_rest_dependants.go
+++ b/avi/resource_avi_rest_dependants.go
@@ -1709,6 +1709,11 @@ func ResourceApplicationLogSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"named_group": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"network_security_policy_rule_name": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -2023,6 +2028,11 @@ func ResourceApplicationLogSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"signature_algorithm": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"significance": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -7286,6 +7296,11 @@ func ResourceConnectionLogSchema() *schema.Resource {
 				Required:     true,
 				ValidateFunc: validateInteger,
 			},
+			"named_group": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"network_security_policy_rule_name": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -7467,6 +7482,11 @@ func ResourceConnectionLogSchema() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"signature_algorithm": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"significance": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -15862,6 +15882,12 @@ func ResourceGslbSiteHealthStatusSchema() *schema.Resource {
 				Optional: true,
 				Elem:     ResourceGslbPoolMemberRuntimeInfoSchema(),
 			},
+			"controller_size": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceControllerSizeSchema(),
+			},
 			"datapath_gsinfo": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -15873,6 +15899,11 @@ func ResourceGslbSiteHealthStatusSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceGslbDnsInfoSchema(),
 			},
+			"edges": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceSiteLinkSchema(),
+			},
 			"gap_table": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -16750,6 +16781,12 @@ func ResourceHSMSafenetLunaSchema() *schema.Resource {
 				Default:      "false",
 				ValidateFunc: validateBool,
 			},
+			"use_legacy_engine": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 		},
 	}
 }
@@ -21307,6 +21344,35 @@ func ResourceLdapUserBindSettingsSchema() *schema.Resource {
 	}
 }
 
+func ResourceLeaderChangeInfoSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"enabled": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "true",
+				ValidateFunc: validateBool,
+			},
+			"leader_candidates": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     ResourceSiteInfoSchema(),
+			},
+			"leader_change_mode": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "GSLB_LC_MODE_MANUAL",
+			},
+			"max_unsuccessful_probes": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "15",
+				ValidateFunc: validateInteger,
+			},
+		},
+	}
+}
+
 func ResourceLearningLogPolicySchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -22391,6 +22457,12 @@ func ResourceMemoryUsageSchema() *schema.Resource {
 				Computed:     true,
 				ValidateFunc: validateInteger,
 			},
+			"effective_ctlr_mem_used_percent": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateInteger,
+			},
 			"free": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -30364,6 +30436,18 @@ func ResourceSSLKeyECParamsSchema() *schema.Resource {
 	}
 }
 
+func ResourceSSLKeyMldsaParamsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"algorithm": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "SSL_KEY_MLDSA44",
+			},
+		},
+	}
+}
+
 func ResourceSSLKeyParamsSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -30377,6 +30461,12 @@ func ResourceSSLKeyParamsSchema() *schema.Resource {
 				Computed: true,
 				Elem:     ResourceSSLKeyECParamsSchema(),
 			},
+			"mldsa_params": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceSSLKeyMldsaParamsSchema(),
+			},
 			"rsa_params": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -35909,6 +35999,42 @@ func ResourceSipServiceApplicationProfileSchema() *schema.Resource {
 	}
 }
 
+func ResourceSiteInfoSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"cluster_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"site_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func ResourceSiteLinkSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"destination": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceSiteInfoSchema(),
+			},
+			"source": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Elem:     ResourceSiteInfoSchema(),
+			},
+		},
+	}
+}
+
 func ResourceSnmpConfigurationSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
@@ -37629,11 +37755,21 @@ func ResourceUDPProxyProfileSchema() *schema.Resource {
 func ResourceURIInfoSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
+			"method": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"param_info": {
 				Type:     schema.TypeList,
 				Optional: true,
 				Elem:     ResourceParamInfoSchema(),
 			},
+			"parser": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"uri_hits": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -42678,6 +42814,12 @@ func ResourceVserverL7MetricsObjSchema() *schema.Resource {
 				Computed:     true,
 				ValidateFunc: validateFloat,
 			},
+			"effective_sampling_rate": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateFloat,
+			},
 			"max_concurrent_sessions": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -42880,6 +43022,18 @@ func ResourceVserverL7MetricsObjSchema() *schema.Resource {
 				Computed:     true,
 				ValidateFunc: validateFloat,
 			},
+			"sum_num_optional_processing_admitted": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateFloat,
+			},
+			"sum_num_optional_processing_refused": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateFloat,
+			},
 			"sum_num_page_load_time_bucket1": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -42898,6 +43052,12 @@ func ResourceVserverL7MetricsObjSchema() *schema.Resource {
 				Computed:     true,
 				ValidateFunc: validateFloat,
 			},
+			"sum_optional_cpu_usage": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validateFloat,
+			},
 			"sum_other_client_txn_latency": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -44030,6 +44190,12 @@ func ResourceWafPSMRuleSchema() *schema.Resource {
 				Default:      "true",
 				ValidateFunc: validateBool,
 			},
+			"ignore_hit_action": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "false",
+				ValidateFunc: validateBool,
+			},
 			"index": {
 				Type:         schema.TypeString,
 				Required:     true,
diff --git a/website/docs/d/avi_analyticsprofile.html.markdown b/website/docs/d/avi_analyticsprofile.html.markdown
index 61ea6523b..803c9dc9a 100644
--- a/website/docs/d/avi_analyticsprofile.html.markdown
+++ b/website/docs/d/avi_analyticsprofile.html.markdown
@@ -61,6 +61,7 @@ In addition to all arguments above, the following attributes are exported:
 * `enable_server_analytics` - Enables analytics on backend servers. This may be desired in container environment when there are large number of ephemeral servers. Additionally, no healthscore of servers is computed when server analytics is enabled. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `enable_vs_analytics` - Enable virtualservice (frontend) analytics. This flag enables metrics and healthscore for virtualservice. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `exclude_client_close_before_request_as_error` - Exclude client closed connection before an http request could be completed from being classified as an error. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_conn_drop_client_small_window_as_error` - Exclude connection dropped by vs due to client advertises a very small window size from the errors. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
 * `exclude_dns_policy_drop_as_significant` - Exclude dns policy drops from the list of errors. Field introduced in 17.2.2. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
 * `exclude_gs_down_as_error` - Exclude queries to gslb services that are operationally down from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
 * `exclude_http_error_codes` - List of http status codes to be excluded from being classified as an error. Error connections or responses impacts health score, are included as significant logs, and may be classified as part of a dos attack. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_controllerproperties.html.markdown b/website/docs/d/avi_controllerproperties.html.markdown
index 46392a169..7925c101f 100644
--- a/website/docs/d/avi_controllerproperties.html.markdown
+++ b/website/docs/d/avi_controllerproperties.html.markdown
@@ -84,8 +84,11 @@ In addition to all arguments above, the following attributes are exported:
 * `gslb_purge_batch_size` - Batch size for the vs_mgr to perform datastrorecleanup during a gslb purge. Allowed values are 50-1200. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `gslb_purge_sleep_time_ms` - Sleep time in the vs_mgr during a federatedpurge rpc call. Allowed values are 50-100. Field introduced in 22.1.3. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ignore_vrf_in_networksubnetlist` - Ignore the vrf_context filter for /networksubnetlist api. Field introduced in 22.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `log_records_additional_buffer_space` - Additional buffer space (up to 10 gb) to be allocated to store logs on a controller. Allowed values are 0-10000. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `log_records_purge_interval` - Frequency (in seconds) to clean up log files on controller node. By default, 600 seconds. Allowed values are 1-100000. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_records_allocated_size` - Disk size to be allocated [1mb to 500gb] to store logs on a controller vm. Allowed values are 1000-500000000. Field introduced in 31.2.1. Unit is kb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_records_allocation_percentage_for_events` - Percentage of allocation (log_records_allocated_size)  for events on controller node. Allowed values are 10-50. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_records_cleanup_target_percentage` - Target percentage of allocated disk quota to reduce log file consumption to when cleanup is triggered. When disk usage exceeds 100% of the allocated quota, cleanup will reduce consumption to this percentage of the allocation. Allowed values are 30-90. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_records_frequent_cleanup_event_generation_threshold` - The threshold for raising an event on frequent cleanup of logs system. By default if two consecutive purger/ clean up runs find logs beyond allocated size then an event in raised. Allowed values are 2-100. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_records_purge_interval` - Frequency (in seconds) to clean up log files on controller node. Allowed values are 10-100000. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `max_dead_se_in_grp` - Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `max_pcap_per_tenant` - Maximum number of pcap files stored per tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `max_se_spawn_interval_delay` - Maximum delay possible to add to se_spawn_retry_interval after successive se spawn failure. Field introduced in 20.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_gslb.html.markdown b/website/docs/d/avi_gslb.html.markdown
index 854e2c075..abd7d25ac 100644
--- a/website/docs/d/avi_gslb.html.markdown
+++ b/website/docs/d/avi_gslb.html.markdown
@@ -44,6 +44,7 @@ In addition to all arguments above, the following attributes are exported:
 * `fileobject_max_file_versions` - This is the max number of file versions that will be retained for a file referenced by the federated fileobject. Subsequent uploads of file will result in the file rotation of the older version and the latest version retained. Example  when a file upload is done for the first time, there will be a v1 version. Subsequent uploads will get mapped to v1, v2 and v3 versions. On the fourth upload of the file, the v1 will be file rotated and v2, v3 and v4 will be retained. Allowed values are 1-5. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `gs_member_fqdn_resolution_on_se` - If this knob is enabled, gslb service member fqdn will be resolved by the service engines hosting the gslb service. Each service engine will resolve and consume the resolved ip addresses locally. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `is_federated` - This field indicates that this object is replicated across gslb federation. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `leader_change_info` - This field has leader change configuration info including mode, leader designate sites and other configurations for auto leader change like max short probe failures. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `leader_cluster_uuid` - Mark this site as leader of gslb configuration. This site is the one among the avi sites. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `maintenance_mode` - This field disables the configuration operations on the leader for all federated objects. Cud operations on gslb, gslbservice, gslbgeodbprofile and other federated objects will be rejected. The rest-api disabling helps in upgrade scenarios where we don't want configuration sync operations to the gslb member when the member is being upgraded. This configuration programmatically blocks the leader from accepting new gslb configuration when member sites are undergoing upgrade. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `name` - Name for the gslb object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_gslbsmruntime.html.markdown b/website/docs/d/avi_gslbsmruntime.html.markdown
index b44586450..09c769ad7 100644
--- a/website/docs/d/avi_gslbsmruntime.html.markdown
+++ b/website/docs/d/avi_gslbsmruntime.html.markdown
@@ -34,6 +34,7 @@ In addition to all arguments above, the following attributes are exported:
 
 * `cluster_leader` - The controller cluster leader node uuid. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `cluster_uuid` - The site controller cluster uuid. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `controller_size` - Possible controller size of peer controller. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `dns_configs` - Sub domain configuration for the gslb. Gslb service's fqdn must be a match one of these subdomains. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `dns_info` - Dns info at the site. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `enabled` - Activate/de-activate state retrieved from the cfg. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/d/avi_hardwaresecuritymodulegroup.html.markdown b/website/docs/d/avi_hardwaresecuritymodulegroup.html.markdown
index 8bbf61c54..4443fa468 100644
--- a/website/docs/d/avi_hardwaresecuritymodulegroup.html.markdown
+++ b/website/docs/d/avi_hardwaresecuritymodulegroup.html.markdown
@@ -32,6 +32,7 @@ data "avi_hardwaresecuritymodulegroup" "foo_hardwaresecuritymodulegroup" {
 
 In addition to all arguments above, the following attributes are exported:
 
+* `ca_certs` - List of certificates present in the ca chain that were used to sign custom client certificate. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `configpb_attributes` - Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `hsm` - Hardware security module configuration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `markers` - List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_analyticsprofile.html.markdown b/website/docs/r/avi_analyticsprofile.html.markdown
index 01c811834..dddf1fecb 100644
--- a/website/docs/r/avi_analyticsprofile.html.markdown
+++ b/website/docs/r/avi_analyticsprofile.html.markdown
@@ -57,6 +57,7 @@ The following arguments are supported:
 * `enable_server_analytics` - (Optional) Enables analytics on backend servers. This may be desired in container environment when there are large number of ephemeral servers. Additionally, no healthscore of servers is computed when server analytics is enabled. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `enable_vs_analytics` - (Optional) Enable virtualservice (frontend) analytics. This flag enables metrics and healthscore for virtualservice. Field introduced in 20.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `exclude_client_close_before_request_as_error` - (Optional) Exclude client closed connection before an http request could be completed from being classified as an error. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
+* `exclude_conn_drop_client_small_window_as_error` - (Optional) Exclude connection dropped by vs due to client advertises a very small window size from the errors. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- true), basic (allowed values- true) edition.
 * `exclude_dns_policy_drop_as_significant` - (Optional) Exclude dns policy drops from the list of errors. Field introduced in 17.2.2. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
 * `exclude_gs_down_as_error` - (Optional) Exclude queries to gslb services that are operationally down from the list of errors. Allowed with any value in enterprise, enterprise with cloud services edition. Allowed in essentials (allowed values- false), basic (allowed values- false) edition.
 * `exclude_http_error_codes` - (Optional) List of http status codes to be excluded from being classified as an error. Error connections or responses impacts health score, are included as significant logs, and may be classified as part of a dos attack. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_controllerproperties.html.markdown b/website/docs/r/avi_controllerproperties.html.markdown
index e62fff436..1a7de71d2 100644
--- a/website/docs/r/avi_controllerproperties.html.markdown
+++ b/website/docs/r/avi_controllerproperties.html.markdown
@@ -79,8 +79,11 @@ The following arguments are supported:
 * `gslb_purge_batch_size` - (Optional) Batch size for the vs_mgr to perform datastrorecleanup during a gslb purge. Allowed values are 50-1200. Field introduced in 22.1.3. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `gslb_purge_sleep_time_ms` - (Optional) Sleep time in the vs_mgr during a federatedpurge rpc call. Allowed values are 50-100. Field introduced in 22.1.3. Unit is milliseconds. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `ignore_vrf_in_networksubnetlist` - (Optional) Ignore the vrf_context filter for /networksubnetlist api. Field introduced in 22.1.4. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `log_records_additional_buffer_space` - (Optional) Additional buffer space (up to 10 gb) to be allocated to store logs on a controller. Allowed values are 0-10000. Field introduced in 31.2.1. Unit is mb. Allowed with any value in enterprise, enterprise with cloud services edition.
-* `log_records_purge_interval` - (Optional) Frequency (in seconds) to clean up log files on controller node. By default, 600 seconds. Allowed values are 1-100000. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_records_allocated_size` - (Optional) Disk size to be allocated [1mb to 500gb] to store logs on a controller vm. Allowed values are 1000-500000000. Field introduced in 31.2.1. Unit is kb. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_records_allocation_percentage_for_events` - (Optional) Percentage of allocation (log_records_allocated_size)  for events on controller node. Allowed values are 10-50. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_records_cleanup_target_percentage` - (Optional) Target percentage of allocated disk quota to reduce log file consumption to when cleanup is triggered. When disk usage exceeds 100% of the allocated quota, cleanup will reduce consumption to this percentage of the allocation. Allowed values are 30-90. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_records_frequent_cleanup_event_generation_threshold` - (Optional) The threshold for raising an event on frequent cleanup of logs system. By default if two consecutive purger/ clean up runs find logs beyond allocated size then an event in raised. Allowed values are 2-100. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `log_records_purge_interval` - (Optional) Frequency (in seconds) to clean up log files on controller node. Allowed values are 10-100000. Field introduced in 31.2.1. Unit is sec. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `max_dead_se_in_grp` - (Optional) Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `max_pcap_per_tenant` - (Optional) Maximum number of pcap files stored per tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `max_se_spawn_interval_delay` - (Optional) Maximum delay possible to add to se_spawn_retry_interval after successive se spawn failure. Field introduced in 20.1.1. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_gslb.html.markdown b/website/docs/r/avi_gslb.html.markdown
index 49d08a001..8d795296b 100644
--- a/website/docs/r/avi_gslb.html.markdown
+++ b/website/docs/r/avi_gslb.html.markdown
@@ -42,6 +42,7 @@ The following arguments are supported:
 * `fileobject_max_file_versions` - (Optional) This is the max number of file versions that will be retained for a file referenced by the federated fileobject. Subsequent uploads of file will result in the file rotation of the older version and the latest version retained. Example  when a file upload is done for the first time, there will be a v1 version. Subsequent uploads will get mapped to v1, v2 and v3 versions. On the fourth upload of the file, the v1 will be file rotated and v2, v3 and v4 will be retained. Allowed values are 1-5. Field introduced in 30.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `gs_member_fqdn_resolution_on_se` - (Optional) If this knob is enabled, gslb service member fqdn will be resolved by the service engines hosting the gslb service. Each service engine will resolve and consume the resolved ip addresses locally. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `is_federated` - (Optional) This field indicates that this object is replicated across gslb federation. Field introduced in 17.1.3. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `leader_change_info` - (Optional) This field has leader change configuration info including mode, leader designate sites and other configurations for auto leader change like max short probe failures. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `maintenance_mode` - (Optional) This field disables the configuration operations on the leader for all federated objects. Cud operations on gslb, gslbservice, gslbgeodbprofile and other federated objects will be rejected. The rest-api disabling helps in upgrade scenarios where we don't want configuration sync operations to the gslb member when the member is being upgraded. This configuration programmatically blocks the leader from accepting new gslb configuration when member sites are undergoing upgrade. Field introduced in 17.2.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `send_interval` - (Optional) Frequency with which group members communicate. Allowed values are 1-3600. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `send_interval_prior_to_maintenance_mode` - (Optional) The user can specify a send-interval while entering maintenance mode. The validity of this 'maintenance send-interval' is only during maintenance mode. When the user leaves maintenance mode, the original send-interval is reinstated. This internal variable is used to store the original send-interval. Field introduced in 18.2.3. Unit is sec. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_gslbsmruntime.html.markdown b/website/docs/r/avi_gslbsmruntime.html.markdown
index 959e594a5..109bbb872 100644
--- a/website/docs/r/avi_gslbsmruntime.html.markdown
+++ b/website/docs/r/avi_gslbsmruntime.html.markdown
@@ -30,6 +30,7 @@ The following arguments are supported:
 * `leader_cluster_uuid` - (Required) Mark this site as leader of gslb configuration. This site is the one among the avi sites. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `cluster_leader` - (Optional) The controller cluster leader node uuid. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `cluster_uuid` - (Optional) The site controller cluster uuid. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
+* `controller_size` - (Optional) Possible controller size of peer controller. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `dns_configs` - (Optional) Sub domain configuration for the gslb. Gslb service's fqdn must be a match one of these subdomains. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `dns_info` - (Optional) Dns info at the site. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `enabled` - (Optional) Activate/de-activate state retrieved from the cfg. Field introduced in 31.1.1. Allowed with any value in enterprise, enterprise with cloud services edition.
diff --git a/website/docs/r/avi_hardwaresecuritymodulegroup.html.markdown b/website/docs/r/avi_hardwaresecuritymodulegroup.html.markdown
index d36661b81..940f74723 100644
--- a/website/docs/r/avi_hardwaresecuritymodulegroup.html.markdown
+++ b/website/docs/r/avi_hardwaresecuritymodulegroup.html.markdown
@@ -29,6 +29,7 @@ The following arguments are supported:
 
 * `hsm` - (Required) Hardware security module configuration. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `name` - (Required) Name of the hsm group configuration object. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
+* `ca_certs` - (Optional) List of certificates present in the ca chain that were used to sign custom client certificate. Field introduced in 31.2.1. Allowed with any value in enterprise, enterprise with cloud services edition.
 * `configpb_attributes` - (Optional) Protobuf versioning for config pbs. Field introduced in 21.1.1. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `markers` - (Optional) List of labels to be used for granular rbac. Field introduced in 20.1.5. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.
 * `tenant_ref` - (Optional) It is a reference to an object of type tenant. Allowed with any value in enterprise, essentials, basic, enterprise with cloud services edition.