From 1745239cbe9ab75bb74a9aa3c5434d38f53cfff0 Mon Sep 17 00:00:00 2001
From: SDKAuto <sdkautomation@microsoft.com>
Date: Fri, 26 Feb 2021 08:39:53 +0000
Subject: [PATCH] CodeGen from PR 13166 in Azure/azure-rest-api-specs Merge
 b353336f78b47a9a9d83765d68a6b9b87ea76f95 into
 89f00c23e9b247304c490504f182aebd0dff4f4e

---
 .../azext_confluent/azext_metadata.json       |   4 +-
 .../generated/_client_factory.py              |   2 +-
 .../azext_confluent/generated/action.py       |   6 +
 .../azext_confluent/generated/commands.py     |  12 +-
 .../azext_confluent/generated/custom.py       |  15 +-
 .../azext_confluent/tests/__init__.py         |   8 +-
 .../tests/latest/example_steps.py             |  27 ++++
 .../tests/latest/test_confluent_scenario.py   |  13 +-
 .../test_confluent_scenario_coverage.md       |   8 -
 .../vendored_sdks/confluent/__init__.py       |   3 +
 .../vendored_sdks/confluent/_configuration.py |   7 +-
 .../confluent/_confluent_management_client.py |  18 +--
 .../vendored_sdks/confluent/_version.py       |   9 ++
 .../confluent/aio/_configuration.py           |   7 +-
 .../aio/_confluent_management_client.py       |  18 +--
 .../confluent/aio/operations/__init__.py      |   8 +-
 ... => _marketplace_agreements_operations.py} |  26 ++--
 .../operations/_organization_operations.py    |  64 +++-----
 ...=> _organization_operations_operations.py} |  10 +-
 .../confluent/models/__init__.py              |   3 -
 .../vendored_sdks/confluent/models/_models.py | 128 +++++++--------
 .../confluent/models/_models_py3.py           | 146 ++++++++----------
 .../confluent/operations/__init__.py          |   8 +-
 ... => _marketplace_agreements_operations.py} |  26 ++--
 .../operations/_organization_operations.py    |  64 +++-----
 ...=> _organization_operations_operations.py} |  10 +-
 src/confluent/gen.zip                         | Bin 7249 -> 0 bytes
 27 files changed, 309 insertions(+), 341 deletions(-)
 delete mode 100644 src/confluent/azext_confluent/tests/latest/test_confluent_scenario_coverage.md
 create mode 100644 src/confluent/azext_confluent/vendored_sdks/confluent/_version.py
 rename src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/{_marketplace_agreement_operations.py => _marketplace_agreements_operations.py} (89%)
 rename src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/{_organization_operation_operations.py => _organization_operations_operations.py} (93%)
 rename src/confluent/azext_confluent/vendored_sdks/confluent/operations/{_marketplace_agreement_operations.py => _marketplace_agreements_operations.py} (89%)
 rename src/confluent/azext_confluent/vendored_sdks/confluent/operations/{_organization_operation_operations.py => _organization_operations_operations.py} (93%)
 delete mode 100644 src/confluent/gen.zip

diff --git a/src/confluent/azext_confluent/azext_metadata.json b/src/confluent/azext_confluent/azext_metadata.json
index e8ea26c5e57..cfc30c747c7 100644
--- a/src/confluent/azext_confluent/azext_metadata.json
+++ b/src/confluent/azext_confluent/azext_metadata.json
@@ -1,4 +1,4 @@
 {
     "azext.isExperimental": true,
-    "azext.minCliCoreVersion": "2.17.0"
-}
+    "azext.minCliCoreVersion": "2.15.0"
+}
\ No newline at end of file
diff --git a/src/confluent/azext_confluent/generated/_client_factory.py b/src/confluent/azext_confluent/generated/_client_factory.py
index 632d3dd2346..da8c5ef5da6 100644
--- a/src/confluent/azext_confluent/generated/_client_factory.py
+++ b/src/confluent/azext_confluent/generated/_client_factory.py
@@ -17,7 +17,7 @@ def cf_confluent_cl(cli_ctx, *_):
 
 
 def cf_marketplace_agreement(cli_ctx, *_):
-    return cf_confluent_cl(cli_ctx).marketplace_agreement
+    return cf_confluent_cl(cli_ctx).marketplace_agreements
 
 
 def cf_organization(cli_ctx, *_):
diff --git a/src/confluent/azext_confluent/generated/action.py b/src/confluent/azext_confluent/generated/action.py
index 008d284b6eb..d3d8fa957db 100644
--- a/src/confluent/azext_confluent/generated/action.py
+++ b/src/confluent/azext_confluent/generated/action.py
@@ -43,6 +43,9 @@ def get_action(self, values, option_string):  # pylint: disable=no-self-use
                 d['term_unit'] = v[0]
             elif kl == 'status':
                 d['status'] = v[0]
+            else:
+                raise CLIError('Unsupported Key {} is provided for parameter offer_detail. All possible keys are: '
+                               'publisher-id, id, plan-id, plan-name, term-unit, status'.format(k))
         return d
 
 
@@ -69,4 +72,7 @@ def get_action(self, values, option_string):  # pylint: disable=no-self-use
                 d['last_name'] = v[0]
             elif kl == 'email-address':
                 d['email_address'] = v[0]
+            else:
+                raise CLIError('Unsupported Key {} is provided for parameter user_detail. All possible keys are: '
+                               'first-name, last-name, email-address'.format(k))
         return d
diff --git a/src/confluent/azext_confluent/generated/commands.py b/src/confluent/azext_confluent/generated/commands.py
index 3b6969d10f8..6ed92e6406f 100644
--- a/src/confluent/azext_confluent/generated/commands.py
+++ b/src/confluent/azext_confluent/generated/commands.py
@@ -17,11 +17,11 @@ def load_command_table(self, _):
 
     from azext_confluent.generated._client_factory import cf_marketplace_agreement
     confluent_marketplace_agreement = CliCommandType(
-        operations_tmpl='azext_confluent.vendored_sdks.confluent.operations._marketplace_agreement_operations#Marketpla'
-        'ceAgreementOperations.{}',
+        operations_tmpl='azext_confluent.vendored_sdks.confluent.operations._marketplace_agreements_operations#Marketpl'
+        'aceAgreementsOperations.{}',
         client_factory=cf_marketplace_agreement)
     with self.command_group('confluent terms', confluent_marketplace_agreement,
-                            client_factory=cf_marketplace_agreement, is_experimental=True) as g:
+                            client_factory=cf_marketplace_agreement) as g:
         g.custom_command('list', 'confluent_terms_list')
 
     from azext_confluent.generated._client_factory import cf_organization
@@ -29,11 +29,13 @@ def load_command_table(self, _):
         operations_tmpl='azext_confluent.vendored_sdks.confluent.operations._organization_operations#OrganizationOperat'
         'ions.{}',
         client_factory=cf_organization)
-    with self.command_group('confluent organization', confluent_organization, client_factory=cf_organization,
-                            is_experimental=True) as g:
+    with self.command_group('confluent organization', confluent_organization, client_factory=cf_organization) as g:
         g.custom_command('list', 'confluent_organization_list')
         g.custom_show_command('show', 'confluent_organization_show')
         g.custom_command('create', 'confluent_organization_create', supports_no_wait=True)
         g.custom_command('update', 'confluent_organization_update')
         g.custom_command('delete', 'confluent_organization_delete', supports_no_wait=True, confirmation=True)
         g.custom_wait_command('wait', 'confluent_organization_show')
+
+    with self.command_group('confluent', is_experimental=True):
+        pass
diff --git a/src/confluent/azext_confluent/generated/custom.py b/src/confluent/azext_confluent/generated/custom.py
index f24c3785de4..baefb6ef345 100644
--- a/src/confluent/azext_confluent/generated/custom.py
+++ b/src/confluent/azext_confluent/generated/custom.py
@@ -38,24 +38,27 @@ def confluent_organization_create(client,
                                   offer_detail=None,
                                   user_detail=None,
                                   no_wait=False):
+    body = {}
+    body['tags'] = tags
+    body['location'] = location
+    body['offer_detail'] = offer_detail
+    body['user_detail'] = user_detail
     return sdk_no_wait(no_wait,
                        client.begin_create,
                        resource_group_name=resource_group_name,
                        organization_name=organization_name,
-                       tags=tags,
-                       location=location,
-                       provisioning_state=None,
-                       offer_detail=offer_detail,
-                       user_detail=user_detail)
+                       body=body)
 
 
 def confluent_organization_update(client,
                                   resource_group_name,
                                   organization_name,
                                   tags=None):
+    body = {}
+    body['tags'] = tags
     return client.update(resource_group_name=resource_group_name,
                          organization_name=organization_name,
-                         tags=tags)
+                         body=body)
 
 
 def confluent_organization_delete(client,
diff --git a/src/confluent/azext_confluent/tests/__init__.py b/src/confluent/azext_confluent/tests/__init__.py
index 50e0627daff..70488e93851 100644
--- a/src/confluent/azext_confluent/tests/__init__.py
+++ b/src/confluent/azext_confluent/tests/__init__.py
@@ -31,8 +31,8 @@
 def try_manual(func):
     def import_manual_function(origin_func):
         from importlib import import_module
-        decorated_path = inspect.getfile(origin_func)
-        module_path = __path__[0]
+        decorated_path = inspect.getfile(origin_func).lower()
+        module_path = __path__[0].lower()
         if not decorated_path.startswith(module_path):
             raise Exception("Decorator can only be used in submodules!")
         manual_path = os.path.join(
@@ -46,7 +46,6 @@ def import_manual_function(origin_func):
     def get_func_to_call():
         func_to_call = func
         try:
-            func_to_call = import_manual_function(func)
             func_to_call = import_manual_function(func)
             logger.info("Found manual override for %s(...)", func.__name__)
         except (ImportError, AttributeError):
@@ -66,6 +65,9 @@ def wrapper(*args, **kwargs):
             ret = func_to_call(*args, **kwargs)
         except (AssertionError, AzureError, CliTestError, CliExecutionError, SystemExit,
                 JMESPathCheckAssertionError) as e:
+            use_exception_cache = os.getenv("TEST_EXCEPTION_CACHE")
+            if use_exception_cache is None or use_exception_cache.lower() != "true":
+                raise
             test_map[func.__name__]["end_dt"] = dt.datetime.utcnow()
             test_map[func.__name__]["result"] = FAILED
             test_map[func.__name__]["error_message"] = str(e).replace("\r\n", " ").replace("\n", " ")[:500]
diff --git a/src/confluent/azext_confluent/tests/latest/example_steps.py b/src/confluent/azext_confluent/tests/latest/example_steps.py
index 2a799e4d5c5..b7e9eff0f41 100644
--- a/src/confluent/azext_confluent/tests/latest/example_steps.py
+++ b/src/confluent/azext_confluent/tests/latest/example_steps.py
@@ -41,6 +41,23 @@ def step_organization_create(test, rg, checks=None):  # pylint: disable=unused-a
              checks=[])
 
 
+def step_organization_create(test, rg, checks=None):
+    if checks is None:
+        checks = []
+    test.cmd('az confluent organization create '
+             '--location "West US" '
+             '--offer-detail id="string" plan-id="string" plan-name="string" publisher-id="string" term-unit="string" '
+             '--user-detail email-address="contoso@microsoft.com" first-name="string" last-name="string" '
+             '--tags Environment="Dev" '
+             '--name "{myOrganization}" '
+             '--resource-group "{rg}"',
+             checks=[])
+    test.cmd('az confluent organization wait --created '
+             '--name "{myOrganization}" '
+             '--resource-group "{rg}"',
+             checks=checks)
+
+
 # EXAMPLE: /Organization/get/Organization_Get
 @try_manual
 def step_organization_show(test, rg, checks=None):  # pylint: disable=unused-argument
@@ -62,6 +79,16 @@ def step_organization_list(test, rg, checks=None):  # pylint: disable=unused-arg
              checks=checks)
 
 
+# EXAMPLE: /Organization/get/Organization_ListBySubscription
+@try_manual
+def step_organization_list2(test, rg, checks=None):
+    if checks is None:
+        checks = []
+    test.cmd('az confluent organization list '
+             '-g ""',
+             checks=checks)
+
+
 # EXAMPLE: /Organization/patch/Confluent_Update
 @try_manual
 def step_organization_update(test, rg, checks=None):  # pylint: disable=unused-argument
diff --git a/src/confluent/azext_confluent/tests/latest/test_confluent_scenario.py b/src/confluent/azext_confluent/tests/latest/test_confluent_scenario.py
index 41a89b24055..a3692c0eb44 100644
--- a/src/confluent/azext_confluent/tests/latest/test_confluent_scenario.py
+++ b/src/confluent/azext_confluent/tests/latest/test_confluent_scenario.py
@@ -15,7 +15,7 @@
 from .example_steps import step_organization_create
 from .example_steps import step_organization_show
 from .example_steps import step_organization_list
-from .example_steps import step_organization_list
+from .example_steps import step_organization_list2
 from .example_steps import step_organization_update
 from .example_steps import step_organization_delete
 from .. import (
@@ -69,6 +69,9 @@ def call_scenario(test, rg):
     step_organization_list(test, "", checks=[
         test.greater_than('length(@)', 0),
     ])
+    step_organization_list2(test, rg, checks=[
+        test.check('length(@)', 1),
+    ])
     step_organization_update(test, rg, checks=[
         test.check("location", "eastus2euap", case_sensitive=False),
         test.check("userDetail.emailAddress", "contoso@microsoft.com", case_sensitive=False),
@@ -85,13 +88,15 @@ def call_scenario(test, rg):
 @try_manual
 class ConfluentScenarioTest(ScenarioTest):
 
-    @ResourceGroupPreparer(name_prefix='clitestconfluent_myResourceGroup'[:7], key='rg', parameter_name='rg')
-    def test_confluent_Scenario(self, rg):
-
+    def __init__(self, *args, **kwargs):
+        super(ConfluentScenarioTest, self).__init__(*args, **kwargs)
         self.kwargs.update({
             'myOrganization': 'myOrganization',
         })
 
+
+    @ResourceGroupPreparer(name_prefix='clitestconfluent_myResourceGroup'[:7], key='rg', parameter_name='rg')
+    def test_confluent_Scenario(self, rg):
         call_scenario(self, rg)
         calc_coverage(__file__)
         raise_if()
diff --git a/src/confluent/azext_confluent/tests/latest/test_confluent_scenario_coverage.md b/src/confluent/azext_confluent/tests/latest/test_confluent_scenario_coverage.md
deleted file mode 100644
index 2c19227528c..00000000000
--- a/src/confluent/azext_confluent/tests/latest/test_confluent_scenario_coverage.md
+++ /dev/null
@@ -1,8 +0,0 @@
-|Scenario|Result|ErrorMessage|ErrorStack|ErrorNormalized|StartDt|EndDt|
-|step_terms_list|successed||||2020-12-23 09:29:24.145616|2020-12-23 09:29:24.545014|
-|step_organization_create|successed||||2020-12-23 09:29:24.545830|2020-12-23 09:29:24.758231|
-|step_organization_show|successed||||2020-12-23 09:29:24.758816|2020-12-23 09:29:24.824684|
-|step_organization_list|successed||||2020-12-23 09:29:24.892757|2020-12-23 09:29:24.958794|
-|step_organization_update|successed||||2020-12-23 09:29:24.959393|2020-12-23 09:29:25.029235|
-|step_organization_delete|successed||||2020-12-23 09:29:25.029809|2020-12-23 09:29:25.182171|
-Coverage: 6/6
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/__init__.py b/src/confluent/azext_confluent/vendored_sdks/confluent/__init__.py
index 64fa1c3df06..8531fdbc09a 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/__init__.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/__init__.py
@@ -7,6 +7,9 @@
 # --------------------------------------------------------------------------
 
 from ._confluent_management_client import ConfluentManagementClient
+from ._version import VERSION
+
+__version__ = VERSION
 __all__ = ['ConfluentManagementClient']
 
 try:
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/_configuration.py b/src/confluent/azext_confluent/vendored_sdks/confluent/_configuration.py
index 0e7a7f52990..b1e6095c8d3 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/_configuration.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/_configuration.py
@@ -12,13 +12,14 @@
 from azure.core.pipeline import policies
 from azure.mgmt.core.policies import ARMHttpLoggingPolicy
 
+from ._version import VERSION
+
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from typing import Any
 
     from azure.core.credentials import TokenCredential
 
-VERSION = "unknown"
 
 class ConfluentManagementClientConfiguration(Configuration):
     """Configuration for ConfluentManagementClient.
@@ -47,9 +48,9 @@ def __init__(
 
         self.credential = credential
         self.subscription_id = subscription_id
-        self.api_version = "2020-03-01-preview"
+        self.api_version = "2020-03-01"
         self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
-        kwargs.setdefault('sdk_moniker', 'confluentmanagementclient/{}'.format(VERSION))
+        kwargs.setdefault('sdk_moniker', 'mgmt-confluent/{}'.format(VERSION))
         self._configure(**kwargs)
 
     def _configure(
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/_confluent_management_client.py b/src/confluent/azext_confluent/vendored_sdks/confluent/_confluent_management_client.py
index 8cb2fd1a0b7..952287105b4 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/_confluent_management_client.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/_confluent_management_client.py
@@ -18,8 +18,8 @@
     from azure.core.credentials import TokenCredential
 
 from ._configuration import ConfluentManagementClientConfiguration
-from .operations import MarketplaceAgreementOperations
-from .operations import OrganizationOperationOperations
+from .operations import MarketplaceAgreementsOperations
+from .operations import OrganizationOperationsOperations
 from .operations import OrganizationOperations
 from . import models
 
@@ -27,12 +27,12 @@
 class ConfluentManagementClient(object):
     """ConfluentManagementClient.
 
-    :ivar marketplace_agreement: MarketplaceAgreementOperations operations
-    :vartype marketplace_agreement: confluent_management_client.operations.MarketplaceAgreementOperations
-    :ivar organization_operation: OrganizationOperationOperations operations
-    :vartype organization_operation: confluent_management_client.operations.OrganizationOperationOperations
+    :ivar marketplace_agreements: MarketplaceAgreementsOperations operations
+    :vartype marketplace_agreements: azure.mgmt.confluent.operations.MarketplaceAgreementsOperations
+    :ivar organization_operations: OrganizationOperationsOperations operations
+    :vartype organization_operations: azure.mgmt.confluent.operations.OrganizationOperationsOperations
     :ivar organization: OrganizationOperations operations
-    :vartype organization: confluent_management_client.operations.OrganizationOperations
+    :vartype organization: azure.mgmt.confluent.operations.OrganizationOperations
     :param credential: Credential needed for the client to connect to Azure.
     :type credential: ~azure.core.credentials.TokenCredential
     :param subscription_id: Microsoft Azure subscription id.
@@ -58,9 +58,9 @@ def __init__(
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
-        self.marketplace_agreement = MarketplaceAgreementOperations(
+        self.marketplace_agreements = MarketplaceAgreementsOperations(
             self._client, self._config, self._serialize, self._deserialize)
-        self.organization_operation = OrganizationOperationOperations(
+        self.organization_operations = OrganizationOperationsOperations(
             self._client, self._config, self._serialize, self._deserialize)
         self.organization = OrganizationOperations(
             self._client, self._config, self._serialize, self._deserialize)
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/_version.py b/src/confluent/azext_confluent/vendored_sdks/confluent/_version.py
new file mode 100644
index 00000000000..e5754a47ce6
--- /dev/null
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/_version.py
@@ -0,0 +1,9 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+VERSION = "1.0.0b1"
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/aio/_configuration.py b/src/confluent/azext_confluent/vendored_sdks/confluent/aio/_configuration.py
index f92f2a958c7..945f1e6ea10 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/aio/_configuration.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/aio/_configuration.py
@@ -12,11 +12,12 @@
 from azure.core.pipeline import policies
 from azure.mgmt.core.policies import ARMHttpLoggingPolicy
 
+from .._version import VERSION
+
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
-VERSION = "unknown"
 
 class ConfluentManagementClientConfiguration(Configuration):
     """Configuration for ConfluentManagementClient.
@@ -44,9 +45,9 @@ def __init__(
 
         self.credential = credential
         self.subscription_id = subscription_id
-        self.api_version = "2020-03-01-preview"
+        self.api_version = "2020-03-01"
         self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
-        kwargs.setdefault('sdk_moniker', 'confluentmanagementclient/{}'.format(VERSION))
+        kwargs.setdefault('sdk_moniker', 'mgmt-confluent/{}'.format(VERSION))
         self._configure(**kwargs)
 
     def _configure(
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/aio/_confluent_management_client.py b/src/confluent/azext_confluent/vendored_sdks/confluent/aio/_confluent_management_client.py
index 2386e6f920d..9e14a4e6ae1 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/aio/_confluent_management_client.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/aio/_confluent_management_client.py
@@ -16,8 +16,8 @@
     from azure.core.credentials_async import AsyncTokenCredential
 
 from ._configuration import ConfluentManagementClientConfiguration
-from .operations import MarketplaceAgreementOperations
-from .operations import OrganizationOperationOperations
+from .operations import MarketplaceAgreementsOperations
+from .operations import OrganizationOperationsOperations
 from .operations import OrganizationOperations
 from .. import models
 
@@ -25,12 +25,12 @@
 class ConfluentManagementClient(object):
     """ConfluentManagementClient.
 
-    :ivar marketplace_agreement: MarketplaceAgreementOperations operations
-    :vartype marketplace_agreement: confluent_management_client.aio.operations.MarketplaceAgreementOperations
-    :ivar organization_operation: OrganizationOperationOperations operations
-    :vartype organization_operation: confluent_management_client.aio.operations.OrganizationOperationOperations
+    :ivar marketplace_agreements: MarketplaceAgreementsOperations operations
+    :vartype marketplace_agreements: azure.mgmt.confluent.aio.operations.MarketplaceAgreementsOperations
+    :ivar organization_operations: OrganizationOperationsOperations operations
+    :vartype organization_operations: azure.mgmt.confluent.aio.operations.OrganizationOperationsOperations
     :ivar organization: OrganizationOperations operations
-    :vartype organization: confluent_management_client.aio.operations.OrganizationOperations
+    :vartype organization: azure.mgmt.confluent.aio.operations.OrganizationOperations
     :param credential: Credential needed for the client to connect to Azure.
     :type credential: ~azure.core.credentials_async.AsyncTokenCredential
     :param subscription_id: Microsoft Azure subscription id.
@@ -55,9 +55,9 @@ def __init__(
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
-        self.marketplace_agreement = MarketplaceAgreementOperations(
+        self.marketplace_agreements = MarketplaceAgreementsOperations(
             self._client, self._config, self._serialize, self._deserialize)
-        self.organization_operation = OrganizationOperationOperations(
+        self.organization_operations = OrganizationOperationsOperations(
             self._client, self._config, self._serialize, self._deserialize)
         self.organization = OrganizationOperations(
             self._client, self._config, self._serialize, self._deserialize)
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/__init__.py b/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/__init__.py
index d755f95eb5e..a48992bda8e 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/__init__.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/__init__.py
@@ -6,12 +6,12 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._marketplace_agreement_operations import MarketplaceAgreementOperations
-from ._organization_operation_operations import OrganizationOperationOperations
+from ._marketplace_agreements_operations import MarketplaceAgreementsOperations
+from ._organization_operations_operations import OrganizationOperationsOperations
 from ._organization_operations import OrganizationOperations
 
 __all__ = [
-    'MarketplaceAgreementOperations',
-    'OrganizationOperationOperations',
+    'MarketplaceAgreementsOperations',
+    'OrganizationOperationsOperations',
     'OrganizationOperations',
 ]
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_marketplace_agreement_operations.py b/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_marketplace_agreements_operations.py
similarity index 89%
rename from src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_marketplace_agreement_operations.py
rename to src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_marketplace_agreements_operations.py
index 1d656fad86c..c0a0946df45 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_marketplace_agreement_operations.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_marketplace_agreements_operations.py
@@ -19,14 +19,14 @@
 T = TypeVar('T')
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
-class MarketplaceAgreementOperations:
-    """MarketplaceAgreementOperations async operations.
+class MarketplaceAgreementsOperations:
+    """MarketplaceAgreementsOperations async operations.
 
     You should not instantiate this class directly. Instead, you should create a Client instance that
     instantiates it for you and attaches it as an attribute.
 
     :ivar models: Alias to model classes used in this operation group.
-    :type models: ~confluent_management_client.models
+    :type models: ~azure.mgmt.confluent.models
     :param client: Client for service requests.
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
@@ -51,7 +51,7 @@ def list(
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: An iterator like instance of either ConfluentAgreementResourceListResponse or the result of cls(response)
-        :rtype: ~azure.core.async_paging.AsyncItemPaged[~confluent_management_client.models.ConfluentAgreementResourceListResponse]
+        :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.confluent.models.ConfluentAgreementResourceListResponse]
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         cls = kwargs.pop('cls', None)  # type: ClsType["models.ConfluentAgreementResourceListResponse"]
@@ -59,7 +59,7 @@ def list(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
@@ -112,18 +112,18 @@ async def get_next(next_link=None):
 
     async def create(
         self,
-        properties: Optional["models.ConfluentAgreementProperties"] = None,
+        body: Optional["models.ConfluentAgreementResource"] = None,
         **kwargs
     ) -> "models.ConfluentAgreementResource":
-        """Create Confluent Marketplace agreement in the subscription.
+        """Accept marketplace terms.
 
-        Create Confluent Marketplace agreement in the subscription.
+        Accept marketplace terms.
 
-        :param properties: Represents the properties of the resource.
-        :type properties: ~confluent_management_client.models.ConfluentAgreementProperties
+        :param body: Confluent Agreement resource.
+        :type body: ~azure.mgmt.confluent.models.ConfluentAgreementResource
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: ConfluentAgreementResource, or the result of cls(response)
-        :rtype: ~confluent_management_client.models.ConfluentAgreementResource
+        :rtype: ~azure.mgmt.confluent.models.ConfluentAgreementResource
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         cls = kwargs.pop('cls', None)  # type: ClsType["models.ConfluentAgreementResource"]
@@ -131,9 +131,7 @@ async def create(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-
-        body = models.ConfluentAgreementResource(properties=properties)
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_organization_operations.py b/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_organization_operations.py
index cd327771a86..fe9e2a02e81 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_organization_operations.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_organization_operations.py
@@ -28,7 +28,7 @@ class OrganizationOperations:
     instantiates it for you and attaches it as an attribute.
 
     :ivar models: Alias to model classes used in this operation group.
-    :type models: ~confluent_management_client.models
+    :type models: ~azure.mgmt.confluent.models
     :param client: Client for service requests.
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
@@ -53,7 +53,7 @@ def list_by_subscription(
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: An iterator like instance of either OrganizationResourceListResult or the result of cls(response)
-        :rtype: ~azure.core.async_paging.AsyncItemPaged[~confluent_management_client.models.OrganizationResourceListResult]
+        :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.confluent.models.OrganizationResourceListResult]
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         cls = kwargs.pop('cls', None)  # type: ClsType["models.OrganizationResourceListResult"]
@@ -61,7 +61,7 @@ def list_by_subscription(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
@@ -125,7 +125,7 @@ def list_by_resource_group(
         :type resource_group_name: str
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: An iterator like instance of either OrganizationResourceListResult or the result of cls(response)
-        :rtype: ~azure.core.async_paging.AsyncItemPaged[~confluent_management_client.models.OrganizationResourceListResult]
+        :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.confluent.models.OrganizationResourceListResult]
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         cls = kwargs.pop('cls', None)  # type: ClsType["models.OrganizationResourceListResult"]
@@ -133,7 +133,7 @@ def list_by_resource_group(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
@@ -201,7 +201,7 @@ async def get(
         :type organization_name: str
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: OrganizationResource, or the result of cls(response)
-        :rtype: ~confluent_management_client.models.OrganizationResource
+        :rtype: ~azure.mgmt.confluent.models.OrganizationResource
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         cls = kwargs.pop('cls', None)  # type: ClsType["models.OrganizationResource"]
@@ -209,7 +209,7 @@ async def get(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         accept = "application/json"
 
         # Construct URL
@@ -250,11 +250,7 @@ async def _create_initial(
         self,
         resource_group_name: str,
         organization_name: str,
-        tags: Optional[Dict[str, str]] = None,
-        location: Optional[str] = None,
-        provisioning_state: Optional[Union[str, "models.ProvisionState"]] = None,
-        offer_detail: Optional["models.OfferDetail"] = None,
-        user_detail: Optional["models.UserDetail"] = None,
+        body: Optional["models.OrganizationResource"] = None,
         **kwargs
     ) -> "models.OrganizationResource":
         cls = kwargs.pop('cls', None)  # type: ClsType["models.OrganizationResource"]
@@ -262,9 +258,7 @@ async def _create_initial(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-
-        body = models.OrganizationResource(tags=tags, location=location, provisioning_state=provisioning_state, offer_detail=offer_detail, user_detail=user_detail)
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 
@@ -317,11 +311,7 @@ async def begin_create(
         self,
         resource_group_name: str,
         organization_name: str,
-        tags: Optional[Dict[str, str]] = None,
-        location: Optional[str] = None,
-        provisioning_state: Optional[Union[str, "models.ProvisionState"]] = None,
-        offer_detail: Optional["models.OfferDetail"] = None,
-        user_detail: Optional["models.UserDetail"] = None,
+        body: Optional["models.OrganizationResource"] = None,
         **kwargs
     ) -> AsyncLROPoller["models.OrganizationResource"]:
         """Create Organization resource.
@@ -332,16 +322,8 @@ async def begin_create(
         :type resource_group_name: str
         :param organization_name: Organization resource name.
         :type organization_name: str
-        :param tags: Organization resource tags.
-        :type tags: dict[str, str]
-        :param location: Location of Organization resource.
-        :type location: str
-        :param provisioning_state: Provision states for confluent RP.
-        :type provisioning_state: str or ~confluent_management_client.models.ProvisionState
-        :param offer_detail: Confluent offer detail.
-        :type offer_detail: ~confluent_management_client.models.OfferDetail
-        :param user_detail: Subscriber detail.
-        :type user_detail: ~confluent_management_client.models.UserDetail
+        :param body: Organization resource model.
+        :type body: ~azure.mgmt.confluent.models.OrganizationResource
         :keyword callable cls: A custom type or function that will be passed the direct response
         :keyword str continuation_token: A continuation token to restart a poller from a saved state.
         :keyword polling: True for ARMPolling, False for no polling, or a
@@ -349,7 +331,7 @@ async def begin_create(
         :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
         :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
         :return: An instance of AsyncLROPoller that returns either OrganizationResource or the result of cls(response)
-        :rtype: ~azure.core.polling.AsyncLROPoller[~confluent_management_client.models.OrganizationResource]
+        :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.confluent.models.OrganizationResource]
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         polling = kwargs.pop('polling', True)  # type: Union[bool, AsyncPollingMethod]
@@ -363,11 +345,7 @@ async def begin_create(
             raw_result = await self._create_initial(
                 resource_group_name=resource_group_name,
                 organization_name=organization_name,
-                tags=tags,
-                location=location,
-                provisioning_state=provisioning_state,
-                offer_detail=offer_detail,
-                user_detail=user_detail,
+                body=body,
                 cls=lambda x,y,z: x,
                 **kwargs
             )
@@ -406,7 +384,7 @@ async def update(
         self,
         resource_group_name: str,
         organization_name: str,
-        tags: Optional[Dict[str, str]] = None,
+        body: Optional["models.OrganizationResourceUpdate"] = None,
         **kwargs
     ) -> "models.OrganizationResource":
         """Update Organization resource.
@@ -417,11 +395,11 @@ async def update(
         :type resource_group_name: str
         :param organization_name: Organization resource name.
         :type organization_name: str
-        :param tags: ARM resource tags.
-        :type tags: dict[str, str]
+        :param body: Updated Organization resource.
+        :type body: ~azure.mgmt.confluent.models.OrganizationResourceUpdate
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: OrganizationResource, or the result of cls(response)
-        :rtype: ~confluent_management_client.models.OrganizationResource
+        :rtype: ~azure.mgmt.confluent.models.OrganizationResource
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         cls = kwargs.pop('cls', None)  # type: ClsType["models.OrganizationResource"]
@@ -429,9 +407,7 @@ async def update(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-
-        body = models.OrganizationResourceUpdate(tags=tags)
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 
@@ -487,7 +463,7 @@ async def _delete_initial(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         accept = "application/json"
 
         # Construct URL
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_organization_operation_operations.py b/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_organization_operations_operations.py
similarity index 93%
rename from src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_organization_operation_operations.py
rename to src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_organization_operations_operations.py
index 569fe905b18..aa0e7ad8d2d 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_organization_operation_operations.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/aio/operations/_organization_operations_operations.py
@@ -19,14 +19,14 @@
 T = TypeVar('T')
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
-class OrganizationOperationOperations:
-    """OrganizationOperationOperations async operations.
+class OrganizationOperationsOperations:
+    """OrganizationOperationsOperations async operations.
 
     You should not instantiate this class directly. Instead, you should create a Client instance that
     instantiates it for you and attaches it as an attribute.
 
     :ivar models: Alias to model classes used in this operation group.
-    :type models: ~confluent_management_client.models
+    :type models: ~azure.mgmt.confluent.models
     :param client: Client for service requests.
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
@@ -51,7 +51,7 @@ def list(
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: An iterator like instance of either OperationListResult or the result of cls(response)
-        :rtype: ~azure.core.async_paging.AsyncItemPaged[~confluent_management_client.models.OperationListResult]
+        :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.confluent.models.OperationListResult]
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         cls = kwargs.pop('cls', None)  # type: ClsType["models.OperationListResult"]
@@ -59,7 +59,7 @@ def list(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/models/__init__.py b/src/confluent/azext_confluent/vendored_sdks/confluent/models/__init__.py
index 74def73f0f6..cafee5127aa 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/models/__init__.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/models/__init__.py
@@ -7,7 +7,6 @@
 # --------------------------------------------------------------------------
 
 try:
-    from ._models_py3 import ConfluentAgreementProperties
     from ._models_py3 import ConfluentAgreementResource
     from ._models_py3 import ConfluentAgreementResourceListResponse
     from ._models_py3 import ErrorResponseBody
@@ -25,7 +24,6 @@
     from ._models_py3 import ResourceProviderDefaultErrorResponse
     from ._models_py3 import UserDetail
 except (SyntaxError, ImportError):
-    from ._models import ConfluentAgreementProperties  # type: ignore
     from ._models import ConfluentAgreementResource  # type: ignore
     from ._models import ConfluentAgreementResourceListResponse  # type: ignore
     from ._models import ErrorResponseBody  # type: ignore
@@ -49,7 +47,6 @@
 )
 
 __all__ = [
-    'ConfluentAgreementProperties',
     'ConfluentAgreementResource',
     'ConfluentAgreementResourceListResponse',
     'ErrorResponseBody',
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/models/_models.py b/src/confluent/azext_confluent/vendored_sdks/confluent/models/_models.py
index bc45061e120..8a8e9ff7e7e 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/models/_models.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/models/_models.py
@@ -10,9 +10,17 @@
 import msrest.serialization
 
 
-class ConfluentAgreementProperties(msrest.serialization.Model):
-    """Terms properties for Marketplace and Confluent.
+class ConfluentAgreementResource(msrest.serialization.Model):
+    """Confluent Agreements Resource.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
 
+    :ivar id: ARM id of the resource.
+    :vartype id: str
+    :ivar name: Name of the agreement.
+    :vartype name: str
+    :ivar type: The type of the resource.
+    :vartype type: str
     :param publisher: Publisher identifier string.
     :type publisher: str
     :param product: Product identifier string.
@@ -32,47 +40,6 @@ class ConfluentAgreementProperties(msrest.serialization.Model):
     :type accepted: bool
     """
 
-    _attribute_map = {
-        'publisher': {'key': 'publisher', 'type': 'str'},
-        'product': {'key': 'product', 'type': 'str'},
-        'plan': {'key': 'plan', 'type': 'str'},
-        'license_text_link': {'key': 'licenseTextLink', 'type': 'str'},
-        'privacy_policy_link': {'key': 'privacyPolicyLink', 'type': 'str'},
-        'retrieve_datetime': {'key': 'retrieveDatetime', 'type': 'iso-8601'},
-        'signature': {'key': 'signature', 'type': 'str'},
-        'accepted': {'key': 'accepted', 'type': 'bool'},
-    }
-
-    def __init__(
-        self,
-        **kwargs
-    ):
-        super(ConfluentAgreementProperties, self).__init__(**kwargs)
-        self.publisher = kwargs.get('publisher', None)
-        self.product = kwargs.get('product', None)
-        self.plan = kwargs.get('plan', None)
-        self.license_text_link = kwargs.get('license_text_link', None)
-        self.privacy_policy_link = kwargs.get('privacy_policy_link', None)
-        self.retrieve_datetime = kwargs.get('retrieve_datetime', None)
-        self.signature = kwargs.get('signature', None)
-        self.accepted = kwargs.get('accepted', None)
-
-
-class ConfluentAgreementResource(msrest.serialization.Model):
-    """Agreement Terms definition.
-
-    Variables are only populated by the server, and will be ignored when sending a request.
-
-    :ivar id: The ARM id of the resource.
-    :vartype id: str
-    :ivar name: The name of the agreement.
-    :vartype name: str
-    :ivar type: The type of the agreement.
-    :vartype type: str
-    :param properties: Represents the properties of the resource.
-    :type properties: ~confluent_management_client.models.ConfluentAgreementProperties
-    """
-
     _validation = {
         'id': {'readonly': True},
         'name': {'readonly': True},
@@ -83,7 +50,14 @@ class ConfluentAgreementResource(msrest.serialization.Model):
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
-        'properties': {'key': 'properties', 'type': 'ConfluentAgreementProperties'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'product': {'key': 'properties.product', 'type': 'str'},
+        'plan': {'key': 'properties.plan', 'type': 'str'},
+        'license_text_link': {'key': 'properties.licenseTextLink', 'type': 'str'},
+        'privacy_policy_link': {'key': 'properties.privacyPolicyLink', 'type': 'str'},
+        'retrieve_datetime': {'key': 'properties.retrieveDatetime', 'type': 'iso-8601'},
+        'signature': {'key': 'properties.signature', 'type': 'str'},
+        'accepted': {'key': 'properties.accepted', 'type': 'bool'},
     }
 
     def __init__(
@@ -94,14 +68,21 @@ def __init__(
         self.id = None
         self.name = None
         self.type = None
-        self.properties = kwargs.get('properties', None)
+        self.publisher = kwargs.get('publisher', None)
+        self.product = kwargs.get('product', None)
+        self.plan = kwargs.get('plan', None)
+        self.license_text_link = kwargs.get('license_text_link', None)
+        self.privacy_policy_link = kwargs.get('privacy_policy_link', None)
+        self.retrieve_datetime = kwargs.get('retrieve_datetime', None)
+        self.signature = kwargs.get('signature', None)
+        self.accepted = kwargs.get('accepted', None)
 
 
 class ConfluentAgreementResourceListResponse(msrest.serialization.Model):
-    """Response of a agreements operation.
+    """Response of a list operation.
 
     :param value: Results of a list operation.
-    :type value: list[~confluent_management_client.models.ConfluentAgreementResource]
+    :type value: list[~azure.mgmt.confluent.models.ConfluentAgreementResource]
     :param next_link: Link to the next set of results, if any.
     :type next_link: str
     """
@@ -132,7 +113,7 @@ class ErrorResponseBody(msrest.serialization.Model):
     :ivar target: Error target.
     :vartype target: str
     :ivar details: Error detail.
-    :vartype details: list[~confluent_management_client.models.ErrorResponseBody]
+    :vartype details: list[~azure.mgmt.confluent.models.ErrorResponseBody]
     """
 
     _validation = {
@@ -176,7 +157,7 @@ class OfferDetail(msrest.serialization.Model):
     :param status: SaaS Offer Status. Possible values include: "Started",
      "PendingFulfillmentStart", "InProgress", "Subscribed", "Suspended", "Reinstated", "Succeeded",
      "Failed", "Unsubscribed", "Updating".
-    :type status: str or ~confluent_management_client.models.SaaSOfferStatus
+    :type status: str or ~azure.mgmt.confluent.models.SaaSOfferStatus
     """
 
     _validation = {
@@ -244,7 +225,7 @@ class OperationListResult(msrest.serialization.Model):
     """Result of GET request to list Confluent operations.
 
     :param value: List of Confluent operations supported by the Microsoft.Confluent provider.
-    :type value: list[~confluent_management_client.models.OperationResult]
+    :type value: list[~azure.mgmt.confluent.models.OperationResult]
     :param next_link: URL to get the next set of operation list results if there are any.
     :type next_link: str
     """
@@ -269,12 +250,15 @@ class OperationResult(msrest.serialization.Model):
     :param name: Operation name: {provider}/{resource}/{operation}.
     :type name: str
     :param display: The object that represents the operation.
-    :type display: ~confluent_management_client.models.OperationDisplay
+    :type display: ~azure.mgmt.confluent.models.OperationDisplay
+    :param is_data_action: Indicates whether the operation is a data action.
+    :type is_data_action: bool
     """
 
     _attribute_map = {
         'name': {'key': 'name', 'type': 'str'},
         'display': {'key': 'display', 'type': 'OperationDisplay'},
+        'is_data_action': {'key': 'isDataAction', 'type': 'bool'},
     }
 
     def __init__(
@@ -284,6 +268,7 @@ def __init__(
         super(OperationResult, self).__init__(**kwargs)
         self.name = kwargs.get('name', None)
         self.display = kwargs.get('display', None)
+        self.is_data_action = kwargs.get('is_data_action', None)
 
 
 class OrganizationResource(msrest.serialization.Model):
@@ -303,18 +288,18 @@ class OrganizationResource(msrest.serialization.Model):
     :type location: str
     :ivar created_time: The creation time of the resource.
     :vartype created_time: ~datetime.datetime
-    :param provisioning_state: Provision states for confluent RP. Possible values include:
+    :ivar provisioning_state: Provision states for confluent RP. Possible values include:
      "Accepted", "Creating", "Updating", "Deleting", "Succeeded", "Failed", "Canceled", "Deleted",
      "NotSpecified".
-    :type provisioning_state: str or ~confluent_management_client.models.ProvisionState
+    :vartype provisioning_state: str or ~azure.mgmt.confluent.models.ProvisionState
     :ivar organization_id: Id of the Confluent organization.
     :vartype organization_id: str
     :ivar sso_url: SSO url for the Confluent organization.
     :vartype sso_url: str
     :param offer_detail: Confluent offer detail.
-    :type offer_detail: ~confluent_management_client.models.OfferDetail
+    :type offer_detail: ~azure.mgmt.confluent.models.OfferDetail
     :param user_detail: Subscriber detail.
-    :type user_detail: ~confluent_management_client.models.UserDetail
+    :type user_detail: ~azure.mgmt.confluent.models.UserDetail
     """
 
     _validation = {
@@ -322,6 +307,7 @@ class OrganizationResource(msrest.serialization.Model):
         'name': {'readonly': True},
         'type': {'readonly': True},
         'created_time': {'readonly': True},
+        'provisioning_state': {'readonly': True},
         'organization_id': {'readonly': True},
         'sso_url': {'readonly': True},
     }
@@ -351,7 +337,7 @@ def __init__(
         self.tags = kwargs.get('tags', None)
         self.location = kwargs.get('location', None)
         self.created_time = None
-        self.provisioning_state = kwargs.get('provisioning_state', None)
+        self.provisioning_state = None
         self.organization_id = None
         self.sso_url = None
         self.offer_detail = kwargs.get('offer_detail', None)
@@ -362,7 +348,7 @@ class OrganizationResourceListResult(msrest.serialization.Model):
     """The response of a list operation.
 
     :param value: Result of a list operation.
-    :type value: list[~confluent_management_client.models.OrganizationResource]
+    :type value: list[~azure.mgmt.confluent.models.OrganizationResource]
     :param next_link: Link to the next set of results, if any.
     :type next_link: str
     """
@@ -388,22 +374,23 @@ class OrganizationResourceProperties(msrest.serialization.Model):
 
     :ivar created_time: The creation time of the resource.
     :vartype created_time: ~datetime.datetime
-    :param provisioning_state: Provision states for confluent RP. Possible values include:
+    :ivar provisioning_state: Provision states for confluent RP. Possible values include:
      "Accepted", "Creating", "Updating", "Deleting", "Succeeded", "Failed", "Canceled", "Deleted",
      "NotSpecified".
-    :type provisioning_state: str or ~confluent_management_client.models.ProvisionState
+    :vartype provisioning_state: str or ~azure.mgmt.confluent.models.ProvisionState
     :ivar organization_id: Id of the Confluent organization.
     :vartype organization_id: str
     :ivar sso_url: SSO url for the Confluent organization.
     :vartype sso_url: str
     :param offer_detail: Confluent offer detail.
-    :type offer_detail: ~confluent_management_client.models.OfferDetail
+    :type offer_detail: ~azure.mgmt.confluent.models.OfferDetail
     :param user_detail: Subscriber detail.
-    :type user_detail: ~confluent_management_client.models.UserDetail
+    :type user_detail: ~azure.mgmt.confluent.models.UserDetail
     """
 
     _validation = {
         'created_time': {'readonly': True},
+        'provisioning_state': {'readonly': True},
         'organization_id': {'readonly': True},
         'sso_url': {'readonly': True},
     }
@@ -423,7 +410,7 @@ def __init__(
     ):
         super(OrganizationResourceProperties, self).__init__(**kwargs)
         self.created_time = None
-        self.provisioning_state = kwargs.get('provisioning_state', None)
+        self.provisioning_state = None
         self.organization_id = None
         self.sso_url = None
         self.offer_detail = kwargs.get('offer_detail', None)
@@ -437,22 +424,23 @@ class OrganizationResourcePropertiesautogenerated(OrganizationResourceProperties
 
     :ivar created_time: The creation time of the resource.
     :vartype created_time: ~datetime.datetime
-    :param provisioning_state: Provision states for confluent RP. Possible values include:
+    :ivar provisioning_state: Provision states for confluent RP. Possible values include:
      "Accepted", "Creating", "Updating", "Deleting", "Succeeded", "Failed", "Canceled", "Deleted",
      "NotSpecified".
-    :type provisioning_state: str or ~confluent_management_client.models.ProvisionState
+    :vartype provisioning_state: str or ~azure.mgmt.confluent.models.ProvisionState
     :ivar organization_id: Id of the Confluent organization.
     :vartype organization_id: str
     :ivar sso_url: SSO url for the Confluent organization.
     :vartype sso_url: str
     :param offer_detail: Confluent offer detail.
-    :type offer_detail: ~confluent_management_client.models.OfferDetail
+    :type offer_detail: ~azure.mgmt.confluent.models.OfferDetail
     :param user_detail: Subscriber detail.
-    :type user_detail: ~confluent_management_client.models.UserDetail
+    :type user_detail: ~azure.mgmt.confluent.models.UserDetail
     """
 
     _validation = {
         'created_time': {'readonly': True},
+        'provisioning_state': {'readonly': True},
         'organization_id': {'readonly': True},
         'sso_url': {'readonly': True},
     }
@@ -489,7 +477,7 @@ class OrganizationResourcePropertiesOfferDetail(OfferDetail):
     :param status: SaaS Offer Status. Possible values include: "Started",
      "PendingFulfillmentStart", "InProgress", "Subscribed", "Suspended", "Reinstated", "Succeeded",
      "Failed", "Unsubscribed", "Updating".
-    :type status: str or ~confluent_management_client.models.SaaSOfferStatus
+    :type status: str or ~azure.mgmt.confluent.models.SaaSOfferStatus
     """
 
     _validation = {
@@ -530,7 +518,7 @@ class UserDetail(msrest.serialization.Model):
     _validation = {
         'first_name': {'max_length': 50, 'min_length': 0},
         'last_name': {'max_length': 50, 'min_length': 0},
-        'email_address': {'pattern': r'^\S+@\S+\.\S+$'},
+        'email_address': {'pattern': r'\S+@\S+\.\S+'},
     }
 
     _attribute_map = {
@@ -563,7 +551,7 @@ class OrganizationResourcePropertiesUserDetail(UserDetail):
     _validation = {
         'first_name': {'max_length': 50, 'min_length': 0},
         'last_name': {'max_length': 50, 'min_length': 0},
-        'email_address': {'pattern': r'^\S+@\S+\.\S+$'},
+        'email_address': {'pattern': r'\S+@\S+\.\S+'},
     }
 
     _attribute_map = {
@@ -604,7 +592,7 @@ class ResourceProviderDefaultErrorResponse(msrest.serialization.Model):
     Variables are only populated by the server, and will be ignored when sending a request.
 
     :ivar error: Response body of Error.
-    :vartype error: ~confluent_management_client.models.ErrorResponseBody
+    :vartype error: ~azure.mgmt.confluent.models.ErrorResponseBody
     """
 
     _validation = {
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/models/_models_py3.py b/src/confluent/azext_confluent/vendored_sdks/confluent/models/_models_py3.py
index 857fc9379ee..10266cc8bf2 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/models/_models_py3.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/models/_models_py3.py
@@ -15,9 +15,17 @@
 from ._confluent_management_client_enums import *
 
 
-class ConfluentAgreementProperties(msrest.serialization.Model):
-    """Terms properties for Marketplace and Confluent.
+class ConfluentAgreementResource(msrest.serialization.Model):
+    """Confluent Agreements Resource.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
 
+    :ivar id: ARM id of the resource.
+    :vartype id: str
+    :ivar name: Name of the agreement.
+    :vartype name: str
+    :ivar type: The type of the resource.
+    :vartype type: str
     :param publisher: Publisher identifier string.
     :type publisher: str
     :param product: Product identifier string.
@@ -37,15 +45,24 @@ class ConfluentAgreementProperties(msrest.serialization.Model):
     :type accepted: bool
     """
 
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+    }
+
     _attribute_map = {
-        'publisher': {'key': 'publisher', 'type': 'str'},
-        'product': {'key': 'product', 'type': 'str'},
-        'plan': {'key': 'plan', 'type': 'str'},
-        'license_text_link': {'key': 'licenseTextLink', 'type': 'str'},
-        'privacy_policy_link': {'key': 'privacyPolicyLink', 'type': 'str'},
-        'retrieve_datetime': {'key': 'retrieveDatetime', 'type': 'iso-8601'},
-        'signature': {'key': 'signature', 'type': 'str'},
-        'accepted': {'key': 'accepted', 'type': 'bool'},
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'product': {'key': 'properties.product', 'type': 'str'},
+        'plan': {'key': 'properties.plan', 'type': 'str'},
+        'license_text_link': {'key': 'properties.licenseTextLink', 'type': 'str'},
+        'privacy_policy_link': {'key': 'properties.privacyPolicyLink', 'type': 'str'},
+        'retrieve_datetime': {'key': 'properties.retrieveDatetime', 'type': 'iso-8601'},
+        'signature': {'key': 'properties.signature', 'type': 'str'},
+        'accepted': {'key': 'properties.accepted', 'type': 'bool'},
     }
 
     def __init__(
@@ -61,7 +78,10 @@ def __init__(
         accepted: Optional[bool] = None,
         **kwargs
     ):
-        super(ConfluentAgreementProperties, self).__init__(**kwargs)
+        super(ConfluentAgreementResource, self).__init__(**kwargs)
+        self.id = None
+        self.name = None
+        self.type = None
         self.publisher = publisher
         self.product = product
         self.plan = plan
@@ -72,52 +92,11 @@ def __init__(
         self.accepted = accepted
 
 
-class ConfluentAgreementResource(msrest.serialization.Model):
-    """Agreement Terms definition.
-
-    Variables are only populated by the server, and will be ignored when sending a request.
-
-    :ivar id: The ARM id of the resource.
-    :vartype id: str
-    :ivar name: The name of the agreement.
-    :vartype name: str
-    :ivar type: The type of the agreement.
-    :vartype type: str
-    :param properties: Represents the properties of the resource.
-    :type properties: ~confluent_management_client.models.ConfluentAgreementProperties
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
-        'properties': {'key': 'properties', 'type': 'ConfluentAgreementProperties'},
-    }
-
-    def __init__(
-        self,
-        *,
-        properties: Optional["ConfluentAgreementProperties"] = None,
-        **kwargs
-    ):
-        super(ConfluentAgreementResource, self).__init__(**kwargs)
-        self.id = None
-        self.name = None
-        self.type = None
-        self.properties = properties
-
-
 class ConfluentAgreementResourceListResponse(msrest.serialization.Model):
-    """Response of a agreements operation.
+    """Response of a list operation.
 
     :param value: Results of a list operation.
-    :type value: list[~confluent_management_client.models.ConfluentAgreementResource]
+    :type value: list[~azure.mgmt.confluent.models.ConfluentAgreementResource]
     :param next_link: Link to the next set of results, if any.
     :type next_link: str
     """
@@ -151,7 +130,7 @@ class ErrorResponseBody(msrest.serialization.Model):
     :ivar target: Error target.
     :vartype target: str
     :ivar details: Error detail.
-    :vartype details: list[~confluent_management_client.models.ErrorResponseBody]
+    :vartype details: list[~azure.mgmt.confluent.models.ErrorResponseBody]
     """
 
     _validation = {
@@ -195,7 +174,7 @@ class OfferDetail(msrest.serialization.Model):
     :param status: SaaS Offer Status. Possible values include: "Started",
      "PendingFulfillmentStart", "InProgress", "Subscribed", "Suspended", "Reinstated", "Succeeded",
      "Failed", "Unsubscribed", "Updating".
-    :type status: str or ~confluent_management_client.models.SaaSOfferStatus
+    :type status: str or ~azure.mgmt.confluent.models.SaaSOfferStatus
     """
 
     _validation = {
@@ -275,7 +254,7 @@ class OperationListResult(msrest.serialization.Model):
     """Result of GET request to list Confluent operations.
 
     :param value: List of Confluent operations supported by the Microsoft.Confluent provider.
-    :type value: list[~confluent_management_client.models.OperationResult]
+    :type value: list[~azure.mgmt.confluent.models.OperationResult]
     :param next_link: URL to get the next set of operation list results if there are any.
     :type next_link: str
     """
@@ -303,12 +282,15 @@ class OperationResult(msrest.serialization.Model):
     :param name: Operation name: {provider}/{resource}/{operation}.
     :type name: str
     :param display: The object that represents the operation.
-    :type display: ~confluent_management_client.models.OperationDisplay
+    :type display: ~azure.mgmt.confluent.models.OperationDisplay
+    :param is_data_action: Indicates whether the operation is a data action.
+    :type is_data_action: bool
     """
 
     _attribute_map = {
         'name': {'key': 'name', 'type': 'str'},
         'display': {'key': 'display', 'type': 'OperationDisplay'},
+        'is_data_action': {'key': 'isDataAction', 'type': 'bool'},
     }
 
     def __init__(
@@ -316,11 +298,13 @@ def __init__(
         *,
         name: Optional[str] = None,
         display: Optional["OperationDisplay"] = None,
+        is_data_action: Optional[bool] = None,
         **kwargs
     ):
         super(OperationResult, self).__init__(**kwargs)
         self.name = name
         self.display = display
+        self.is_data_action = is_data_action
 
 
 class OrganizationResource(msrest.serialization.Model):
@@ -340,18 +324,18 @@ class OrganizationResource(msrest.serialization.Model):
     :type location: str
     :ivar created_time: The creation time of the resource.
     :vartype created_time: ~datetime.datetime
-    :param provisioning_state: Provision states for confluent RP. Possible values include:
+    :ivar provisioning_state: Provision states for confluent RP. Possible values include:
      "Accepted", "Creating", "Updating", "Deleting", "Succeeded", "Failed", "Canceled", "Deleted",
      "NotSpecified".
-    :type provisioning_state: str or ~confluent_management_client.models.ProvisionState
+    :vartype provisioning_state: str or ~azure.mgmt.confluent.models.ProvisionState
     :ivar organization_id: Id of the Confluent organization.
     :vartype organization_id: str
     :ivar sso_url: SSO url for the Confluent organization.
     :vartype sso_url: str
     :param offer_detail: Confluent offer detail.
-    :type offer_detail: ~confluent_management_client.models.OfferDetail
+    :type offer_detail: ~azure.mgmt.confluent.models.OfferDetail
     :param user_detail: Subscriber detail.
-    :type user_detail: ~confluent_management_client.models.UserDetail
+    :type user_detail: ~azure.mgmt.confluent.models.UserDetail
     """
 
     _validation = {
@@ -359,6 +343,7 @@ class OrganizationResource(msrest.serialization.Model):
         'name': {'readonly': True},
         'type': {'readonly': True},
         'created_time': {'readonly': True},
+        'provisioning_state': {'readonly': True},
         'organization_id': {'readonly': True},
         'sso_url': {'readonly': True},
     }
@@ -382,7 +367,6 @@ def __init__(
         *,
         tags: Optional[Dict[str, str]] = None,
         location: Optional[str] = None,
-        provisioning_state: Optional[Union[str, "ProvisionState"]] = None,
         offer_detail: Optional["OfferDetail"] = None,
         user_detail: Optional["UserDetail"] = None,
         **kwargs
@@ -394,7 +378,7 @@ def __init__(
         self.tags = tags
         self.location = location
         self.created_time = None
-        self.provisioning_state = provisioning_state
+        self.provisioning_state = None
         self.organization_id = None
         self.sso_url = None
         self.offer_detail = offer_detail
@@ -405,7 +389,7 @@ class OrganizationResourceListResult(msrest.serialization.Model):
     """The response of a list operation.
 
     :param value: Result of a list operation.
-    :type value: list[~confluent_management_client.models.OrganizationResource]
+    :type value: list[~azure.mgmt.confluent.models.OrganizationResource]
     :param next_link: Link to the next set of results, if any.
     :type next_link: str
     """
@@ -434,22 +418,23 @@ class OrganizationResourceProperties(msrest.serialization.Model):
 
     :ivar created_time: The creation time of the resource.
     :vartype created_time: ~datetime.datetime
-    :param provisioning_state: Provision states for confluent RP. Possible values include:
+    :ivar provisioning_state: Provision states for confluent RP. Possible values include:
      "Accepted", "Creating", "Updating", "Deleting", "Succeeded", "Failed", "Canceled", "Deleted",
      "NotSpecified".
-    :type provisioning_state: str or ~confluent_management_client.models.ProvisionState
+    :vartype provisioning_state: str or ~azure.mgmt.confluent.models.ProvisionState
     :ivar organization_id: Id of the Confluent organization.
     :vartype organization_id: str
     :ivar sso_url: SSO url for the Confluent organization.
     :vartype sso_url: str
     :param offer_detail: Confluent offer detail.
-    :type offer_detail: ~confluent_management_client.models.OfferDetail
+    :type offer_detail: ~azure.mgmt.confluent.models.OfferDetail
     :param user_detail: Subscriber detail.
-    :type user_detail: ~confluent_management_client.models.UserDetail
+    :type user_detail: ~azure.mgmt.confluent.models.UserDetail
     """
 
     _validation = {
         'created_time': {'readonly': True},
+        'provisioning_state': {'readonly': True},
         'organization_id': {'readonly': True},
         'sso_url': {'readonly': True},
     }
@@ -466,14 +451,13 @@ class OrganizationResourceProperties(msrest.serialization.Model):
     def __init__(
         self,
         *,
-        provisioning_state: Optional[Union[str, "ProvisionState"]] = None,
         offer_detail: Optional["OfferDetail"] = None,
         user_detail: Optional["UserDetail"] = None,
         **kwargs
     ):
         super(OrganizationResourceProperties, self).__init__(**kwargs)
         self.created_time = None
-        self.provisioning_state = provisioning_state
+        self.provisioning_state = None
         self.organization_id = None
         self.sso_url = None
         self.offer_detail = offer_detail
@@ -487,22 +471,23 @@ class OrganizationResourcePropertiesautogenerated(OrganizationResourceProperties
 
     :ivar created_time: The creation time of the resource.
     :vartype created_time: ~datetime.datetime
-    :param provisioning_state: Provision states for confluent RP. Possible values include:
+    :ivar provisioning_state: Provision states for confluent RP. Possible values include:
      "Accepted", "Creating", "Updating", "Deleting", "Succeeded", "Failed", "Canceled", "Deleted",
      "NotSpecified".
-    :type provisioning_state: str or ~confluent_management_client.models.ProvisionState
+    :vartype provisioning_state: str or ~azure.mgmt.confluent.models.ProvisionState
     :ivar organization_id: Id of the Confluent organization.
     :vartype organization_id: str
     :ivar sso_url: SSO url for the Confluent organization.
     :vartype sso_url: str
     :param offer_detail: Confluent offer detail.
-    :type offer_detail: ~confluent_management_client.models.OfferDetail
+    :type offer_detail: ~azure.mgmt.confluent.models.OfferDetail
     :param user_detail: Subscriber detail.
-    :type user_detail: ~confluent_management_client.models.UserDetail
+    :type user_detail: ~azure.mgmt.confluent.models.UserDetail
     """
 
     _validation = {
         'created_time': {'readonly': True},
+        'provisioning_state': {'readonly': True},
         'organization_id': {'readonly': True},
         'sso_url': {'readonly': True},
     }
@@ -519,12 +504,11 @@ class OrganizationResourcePropertiesautogenerated(OrganizationResourceProperties
     def __init__(
         self,
         *,
-        provisioning_state: Optional[Union[str, "ProvisionState"]] = None,
         offer_detail: Optional["OfferDetail"] = None,
         user_detail: Optional["UserDetail"] = None,
         **kwargs
     ):
-        super(OrganizationResourcePropertiesautogenerated, self).__init__(provisioning_state=provisioning_state, offer_detail=offer_detail, user_detail=user_detail, **kwargs)
+        super(OrganizationResourcePropertiesautogenerated, self).__init__(offer_detail=offer_detail, user_detail=user_detail, **kwargs)
 
 
 class OrganizationResourcePropertiesOfferDetail(OfferDetail):
@@ -543,7 +527,7 @@ class OrganizationResourcePropertiesOfferDetail(OfferDetail):
     :param status: SaaS Offer Status. Possible values include: "Started",
      "PendingFulfillmentStart", "InProgress", "Subscribed", "Suspended", "Reinstated", "Succeeded",
      "Failed", "Unsubscribed", "Updating".
-    :type status: str or ~confluent_management_client.models.SaaSOfferStatus
+    :type status: str or ~azure.mgmt.confluent.models.SaaSOfferStatus
     """
 
     _validation = {
@@ -591,7 +575,7 @@ class UserDetail(msrest.serialization.Model):
     _validation = {
         'first_name': {'max_length': 50, 'min_length': 0},
         'last_name': {'max_length': 50, 'min_length': 0},
-        'email_address': {'pattern': r'^\S+@\S+\.\S+$'},
+        'email_address': {'pattern': r'\S+@\S+\.\S+'},
     }
 
     _attribute_map = {
@@ -628,7 +612,7 @@ class OrganizationResourcePropertiesUserDetail(UserDetail):
     _validation = {
         'first_name': {'max_length': 50, 'min_length': 0},
         'last_name': {'max_length': 50, 'min_length': 0},
-        'email_address': {'pattern': r'^\S+@\S+\.\S+$'},
+        'email_address': {'pattern': r'\S+@\S+\.\S+'},
     }
 
     _attribute_map = {
@@ -675,7 +659,7 @@ class ResourceProviderDefaultErrorResponse(msrest.serialization.Model):
     Variables are only populated by the server, and will be ignored when sending a request.
 
     :ivar error: Response body of Error.
-    :vartype error: ~confluent_management_client.models.ErrorResponseBody
+    :vartype error: ~azure.mgmt.confluent.models.ErrorResponseBody
     """
 
     _validation = {
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/operations/__init__.py b/src/confluent/azext_confluent/vendored_sdks/confluent/operations/__init__.py
index d755f95eb5e..a48992bda8e 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/operations/__init__.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/operations/__init__.py
@@ -6,12 +6,12 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._marketplace_agreement_operations import MarketplaceAgreementOperations
-from ._organization_operation_operations import OrganizationOperationOperations
+from ._marketplace_agreements_operations import MarketplaceAgreementsOperations
+from ._organization_operations_operations import OrganizationOperationsOperations
 from ._organization_operations import OrganizationOperations
 
 __all__ = [
-    'MarketplaceAgreementOperations',
-    'OrganizationOperationOperations',
+    'MarketplaceAgreementsOperations',
+    'OrganizationOperationsOperations',
     'OrganizationOperations',
 ]
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_marketplace_agreement_operations.py b/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_marketplace_agreements_operations.py
similarity index 89%
rename from src/confluent/azext_confluent/vendored_sdks/confluent/operations/_marketplace_agreement_operations.py
rename to src/confluent/azext_confluent/vendored_sdks/confluent/operations/_marketplace_agreements_operations.py
index 991f6fc95e7..74bc132a23c 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_marketplace_agreement_operations.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_marketplace_agreements_operations.py
@@ -23,14 +23,14 @@
     T = TypeVar('T')
     ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
-class MarketplaceAgreementOperations(object):
-    """MarketplaceAgreementOperations operations.
+class MarketplaceAgreementsOperations(object):
+    """MarketplaceAgreementsOperations operations.
 
     You should not instantiate this class directly. Instead, you should create a Client instance that
     instantiates it for you and attaches it as an attribute.
 
     :ivar models: Alias to model classes used in this operation group.
-    :type models: ~confluent_management_client.models
+    :type models: ~azure.mgmt.confluent.models
     :param client: Client for service requests.
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
@@ -56,7 +56,7 @@ def list(
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: An iterator like instance of either ConfluentAgreementResourceListResponse or the result of cls(response)
-        :rtype: ~azure.core.paging.ItemPaged[~confluent_management_client.models.ConfluentAgreementResourceListResponse]
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.confluent.models.ConfluentAgreementResourceListResponse]
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         cls = kwargs.pop('cls', None)  # type: ClsType["models.ConfluentAgreementResourceListResponse"]
@@ -64,7 +64,7 @@ def list(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
@@ -117,19 +117,19 @@ def get_next(next_link=None):
 
     def create(
         self,
-        properties=None,  # type: Optional["models.ConfluentAgreementProperties"]
+        body=None,  # type: Optional["models.ConfluentAgreementResource"]
         **kwargs  # type: Any
     ):
         # type: (...) -> "models.ConfluentAgreementResource"
-        """Create Confluent Marketplace agreement in the subscription.
+        """Accept marketplace terms.
 
-        Create Confluent Marketplace agreement in the subscription.
+        Accept marketplace terms.
 
-        :param properties: Represents the properties of the resource.
-        :type properties: ~confluent_management_client.models.ConfluentAgreementProperties
+        :param body: Confluent Agreement resource.
+        :type body: ~azure.mgmt.confluent.models.ConfluentAgreementResource
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: ConfluentAgreementResource, or the result of cls(response)
-        :rtype: ~confluent_management_client.models.ConfluentAgreementResource
+        :rtype: ~azure.mgmt.confluent.models.ConfluentAgreementResource
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         cls = kwargs.pop('cls', None)  # type: ClsType["models.ConfluentAgreementResource"]
@@ -137,9 +137,7 @@ def create(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-
-        body = models.ConfluentAgreementResource(properties=properties)
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_organization_operations.py b/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_organization_operations.py
index 63ae48b5e75..a2c1f608c3f 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_organization_operations.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_organization_operations.py
@@ -32,7 +32,7 @@ class OrganizationOperations(object):
     instantiates it for you and attaches it as an attribute.
 
     :ivar models: Alias to model classes used in this operation group.
-    :type models: ~confluent_management_client.models
+    :type models: ~azure.mgmt.confluent.models
     :param client: Client for service requests.
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
@@ -58,7 +58,7 @@ def list_by_subscription(
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: An iterator like instance of either OrganizationResourceListResult or the result of cls(response)
-        :rtype: ~azure.core.paging.ItemPaged[~confluent_management_client.models.OrganizationResourceListResult]
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.confluent.models.OrganizationResourceListResult]
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         cls = kwargs.pop('cls', None)  # type: ClsType["models.OrganizationResourceListResult"]
@@ -66,7 +66,7 @@ def list_by_subscription(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
@@ -131,7 +131,7 @@ def list_by_resource_group(
         :type resource_group_name: str
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: An iterator like instance of either OrganizationResourceListResult or the result of cls(response)
-        :rtype: ~azure.core.paging.ItemPaged[~confluent_management_client.models.OrganizationResourceListResult]
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.confluent.models.OrganizationResourceListResult]
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         cls = kwargs.pop('cls', None)  # type: ClsType["models.OrganizationResourceListResult"]
@@ -139,7 +139,7 @@ def list_by_resource_group(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
@@ -208,7 +208,7 @@ def get(
         :type organization_name: str
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: OrganizationResource, or the result of cls(response)
-        :rtype: ~confluent_management_client.models.OrganizationResource
+        :rtype: ~azure.mgmt.confluent.models.OrganizationResource
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         cls = kwargs.pop('cls', None)  # type: ClsType["models.OrganizationResource"]
@@ -216,7 +216,7 @@ def get(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         accept = "application/json"
 
         # Construct URL
@@ -257,11 +257,7 @@ def _create_initial(
         self,
         resource_group_name,  # type: str
         organization_name,  # type: str
-        tags=None,  # type: Optional[Dict[str, str]]
-        location=None,  # type: Optional[str]
-        provisioning_state=None,  # type: Optional[Union[str, "models.ProvisionState"]]
-        offer_detail=None,  # type: Optional["models.OfferDetail"]
-        user_detail=None,  # type: Optional["models.UserDetail"]
+        body=None,  # type: Optional["models.OrganizationResource"]
         **kwargs  # type: Any
     ):
         # type: (...) -> "models.OrganizationResource"
@@ -270,9 +266,7 @@ def _create_initial(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-
-        body = models.OrganizationResource(tags=tags, location=location, provisioning_state=provisioning_state, offer_detail=offer_detail, user_detail=user_detail)
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 
@@ -325,11 +319,7 @@ def begin_create(
         self,
         resource_group_name,  # type: str
         organization_name,  # type: str
-        tags=None,  # type: Optional[Dict[str, str]]
-        location=None,  # type: Optional[str]
-        provisioning_state=None,  # type: Optional[Union[str, "models.ProvisionState"]]
-        offer_detail=None,  # type: Optional["models.OfferDetail"]
-        user_detail=None,  # type: Optional["models.UserDetail"]
+        body=None,  # type: Optional["models.OrganizationResource"]
         **kwargs  # type: Any
     ):
         # type: (...) -> LROPoller["models.OrganizationResource"]
@@ -341,16 +331,8 @@ def begin_create(
         :type resource_group_name: str
         :param organization_name: Organization resource name.
         :type organization_name: str
-        :param tags: Organization resource tags.
-        :type tags: dict[str, str]
-        :param location: Location of Organization resource.
-        :type location: str
-        :param provisioning_state: Provision states for confluent RP.
-        :type provisioning_state: str or ~confluent_management_client.models.ProvisionState
-        :param offer_detail: Confluent offer detail.
-        :type offer_detail: ~confluent_management_client.models.OfferDetail
-        :param user_detail: Subscriber detail.
-        :type user_detail: ~confluent_management_client.models.UserDetail
+        :param body: Organization resource model.
+        :type body: ~azure.mgmt.confluent.models.OrganizationResource
         :keyword callable cls: A custom type or function that will be passed the direct response
         :keyword str continuation_token: A continuation token to restart a poller from a saved state.
         :keyword polling: True for ARMPolling, False for no polling, or a
@@ -358,7 +340,7 @@ def begin_create(
         :paramtype polling: bool or ~azure.core.polling.PollingMethod
         :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
         :return: An instance of LROPoller that returns either OrganizationResource or the result of cls(response)
-        :rtype: ~azure.core.polling.LROPoller[~confluent_management_client.models.OrganizationResource]
+        :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.confluent.models.OrganizationResource]
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         polling = kwargs.pop('polling', True)  # type: Union[bool, PollingMethod]
@@ -372,11 +354,7 @@ def begin_create(
             raw_result = self._create_initial(
                 resource_group_name=resource_group_name,
                 organization_name=organization_name,
-                tags=tags,
-                location=location,
-                provisioning_state=provisioning_state,
-                offer_detail=offer_detail,
-                user_detail=user_detail,
+                body=body,
                 cls=lambda x,y,z: x,
                 **kwargs
             )
@@ -415,7 +393,7 @@ def update(
         self,
         resource_group_name,  # type: str
         organization_name,  # type: str
-        tags=None,  # type: Optional[Dict[str, str]]
+        body=None,  # type: Optional["models.OrganizationResourceUpdate"]
         **kwargs  # type: Any
     ):
         # type: (...) -> "models.OrganizationResource"
@@ -427,11 +405,11 @@ def update(
         :type resource_group_name: str
         :param organization_name: Organization resource name.
         :type organization_name: str
-        :param tags: ARM resource tags.
-        :type tags: dict[str, str]
+        :param body: Updated Organization resource.
+        :type body: ~azure.mgmt.confluent.models.OrganizationResourceUpdate
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: OrganizationResource, or the result of cls(response)
-        :rtype: ~confluent_management_client.models.OrganizationResource
+        :rtype: ~azure.mgmt.confluent.models.OrganizationResource
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         cls = kwargs.pop('cls', None)  # type: ClsType["models.OrganizationResource"]
@@ -439,9 +417,7 @@ def update(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-
-        body = models.OrganizationResourceUpdate(tags=tags)
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 
@@ -498,7 +474,7 @@ def _delete_initial(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         accept = "application/json"
 
         # Construct URL
diff --git a/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_organization_operation_operations.py b/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_organization_operations_operations.py
similarity index 93%
rename from src/confluent/azext_confluent/vendored_sdks/confluent/operations/_organization_operation_operations.py
rename to src/confluent/azext_confluent/vendored_sdks/confluent/operations/_organization_operations_operations.py
index e77662a47fe..c8e5c5a9b67 100644
--- a/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_organization_operation_operations.py
+++ b/src/confluent/azext_confluent/vendored_sdks/confluent/operations/_organization_operations_operations.py
@@ -23,14 +23,14 @@
     T = TypeVar('T')
     ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
-class OrganizationOperationOperations(object):
-    """OrganizationOperationOperations operations.
+class OrganizationOperationsOperations(object):
+    """OrganizationOperationsOperations operations.
 
     You should not instantiate this class directly. Instead, you should create a Client instance that
     instantiates it for you and attaches it as an attribute.
 
     :ivar models: Alias to model classes used in this operation group.
-    :type models: ~confluent_management_client.models
+    :type models: ~azure.mgmt.confluent.models
     :param client: Client for service requests.
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
@@ -56,7 +56,7 @@ def list(
 
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: An iterator like instance of either OperationListResult or the result of cls(response)
-        :rtype: ~azure.core.paging.ItemPaged[~confluent_management_client.models.OperationListResult]
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.confluent.models.OperationListResult]
         :raises: ~azure.core.exceptions.HttpResponseError
         """
         cls = kwargs.pop('cls', None)  # type: ClsType["models.OperationListResult"]
@@ -64,7 +64,7 @@ def list(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-03-01-preview"
+        api_version = "2020-03-01"
         accept = "application/json"
 
         def prepare_request(next_link=None):
diff --git a/src/confluent/gen.zip b/src/confluent/gen.zip
deleted file mode 100644
index d89790a8992dfaa1baae84618a42fbe1e94eb924..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7249
zcmeHMQE%He5O&vf58ejsVc5ff0fYj~Hef5*Q-J^mk|tSEr0KFI#Rde0z({AAjU);r
z<-{rS6Z*WTz3d0<AMBs(XY2>;j*?~Bmg6LA0<0(lMHYE?JRXmC{K$j7ho3eZR62XV
z{cL{}|GvUEzkqY&`7#+q86;-?U@7%CHPi;Q(O2+%x0EO1#5>3OZv5`yKc6=m^z>G-
z!a0xA2s~{d)owaoW4-rQnrm!Zreh_-p<!*m!}f)*q?QAN^(vK$8zB>yZAB5YM4Bnk
zphgh5$opLQkZ1^4mIR=f83NmXb~LGW*&#srVa^Q`iKR)Ed;`8=N=m~9QlX?MmxL7f
z9p}9^*Q|O0un-bJRj{LzaYe=U%MRPhjC_d}Mtza+X-+5=X}3M(NeG(7e9U~FX+Y_|
zREoMjfgv9WsTfZJb|!FmC%__!a>T&u=#x01QH+AJdy@LzY~O1(n*$|d=DJM8Xluia
z8hbHMG9F>u8r%JKYyaT+?gm@m=js$p8gU=CLIn_`3+wd|Onr;@TxiqWtcVL>z{r6-
z11i>Dgzar|%q~-5m-$2RPj&x=OrW#TWLVG&c_rF_QGH%bO+|g59ly4uB*yjQpxxpZ
ztXyEsc7*e)O{;6^h}V{)xBS(a8|hCf<cYYj9<ZKfX1!YBZ7V=Gs2`cEaC*KayyGEO
zdt`Z!tTj8<R<9RH-;RbkzmT84I&^A?<X`}*7l7d+Vj}1}+9;8P4#PQ5dJ7c^kD)@7
zouHkED4<G66VS^NVWxzO%HgUgyM-7#@9`kOC9eApPNl(6uo+K6g6qrJVFRJG>CGw-
z@rA0zt_%+~+f7D7$%Op3@9e;+&K4w_Id9`}b?PtcC{a<FDIa>Fl39v8D!g=7xEs0P
z5|^Es&oeFzF7|v{gPJM38#Rw#U%4V^$yd$dJ%uF;y*e0A59Qf?E(YrF-b{9lK(b&q
z3Xo66m^iHeJSF$JMpU_nuvwip8$D~xcpJB$%_mhCvT3ARVYA1R@nLqNeI-)b0sL=l
z6EbI20Jy>uDL4LbeS5M=^j@XG_0mmd3GZ`-<vrFohYhoSBy5BYVARWhI}DOh-@%Hy
zKzcW^>>3L*fCvm!Oul0)uHkPv=Y5(y?~(P!HCDf41J0tA@7+KCy8N=ypy%-__&~XC
zihDebJ9e&w{0JmIBp^}X2dQ&J!7nleE-rkRW?u)V6M%78%>EHpuOOYtjRy)+u0R!l
zWd@Q?WY58im88{7SM1ks#zUKon{iP7zH5#=FyE|~JhBu#B^qq!@T$awIgC<VXz;`!
z|MGd{<LVwEJPx5rTgRi_!y|9!*-O@E5|0bG8M^#L)4M(Sej`OveoPuYZy@lL!RvHc
z%XM3wVjG%_m<E%jW#Cv0%`?qqKrVn}%C*iR9!l~fKy-VBta*Z^(#U~*u3>{sTzWw-
zG)+`$Juhf>Ow(3t@;Of~TT7r!n{>hvmaxW;YdA_+NGsB{nX&CmprO;9f<x>C$K`1}
zSP@2yp#LL}G<2pIx+;L++l~c|u0?NKId~&^_3-Vs(k<$HfxwJJ7ufW+vIs5y7g4ms
zaVtQQR3a#OBYh}g6XOERyi&^2d9Mdp#~)|C^v@4**6Z<L?X0&VNJ5Oko1Ipd{ZK6D
zrS5cRf|mi6TAe?}r(1=(_Z(W50i8(_TAnj)-la^5i5Jr_9kth|%e=Y7y_1wmtnKOt
z=5!m;HfuMBZ5p_jDj10KehYV>l&LTc<u@)~JbT>II^KBvy30;s+;6E67X@xGksnVj
zJ(6Q9^DIke*CeWfVkSzpHADkC!=7knvohAXr)OMYnkfAJZ5fD(pf!86*xFdAnP%Hd
z+y@a4mDwFd*>$yjx*2Pi8>+H>vUO{t%!9oLpM2d|eqV*K4h!8}QCYmbTFy=PS9u|B
z7oT}<GA7+-Etf&}S$QEDC-~IMC~voBMa|!D6|(U4`zld0&;mi~yq5FWcPjetFIH$d
a=R<mmgb(%}eMW*F;orLljmDqf($~Kt>BUF@